diff options
| author | antelder <antelder@13f79535-47bb-0310-9956-ffa450edef68> | 2011-02-10 08:53:58 +0000 |
|---|---|---|
| committer | antelder <antelder@13f79535-47bb-0310-9956-ffa450edef68> | 2011-02-10 08:53:58 +0000 |
| commit | 48d0bb3a29e48cebd023cdc959de42260c360e14 (patch) | |
| tree | 4ab083582551a0eb41cdc05c7b6618023c3384ef /sca-java-2.x/trunk/samples | |
| parent | 9c14ddd98774833f3b3c6817f62b59f8bf3fc432 (diff) | |
Remove samples subfolder as its now in contrib and unreleased
git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1069288 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'sca-java-2.x/trunk/samples')
451 files changed, 0 insertions, 21838 deletions
diff --git a/sca-java-2.x/trunk/samples/learning-more/async/calculator-contribution/README b/sca-java-2.x/trunk/samples/learning-more/async/calculator-contribution/README deleted file mode 100644 index 7f1192d44a..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/async/calculator-contribution/README +++ /dev/null @@ -1,7 +0,0 @@ -Sample async implemenation.java -=============================== -This sample demonstrates the SCA Java asynchronous programming model - -See http://tuscany.apache.org/documentation-2x/20-beta-samples-documentation.html -for more information - diff --git a/sca-java-2.x/trunk/samples/learning-more/async/calculator-contribution/build.xml b/sca-java-2.x/trunk/samples/learning-more/async/calculator-contribution/build.xml deleted file mode 100644 index 5cea87e4c3..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/async/calculator-contribution/build.xml +++ /dev/null @@ -1,57 +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="sample-implementation-java-calculator-async-contribution" default="compile">
- <property name="tuscany.home" value="../../../.."/>
- <property name="jar.name" value="sample-implementation-java-calculator-async-contribution.jar" />
-
- <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-sca-api-*.jar" />
- </fileset>
- </classpath>
- </javac>
- <copy todir="target/classes">
- <fileset dir="src/main/resources"/>
- </copy>
- <jar destfile="target/${jar.name}" basedir="target/classes">
- <manifest>
- <attribute name="Main-Class" value="${main.class}" />
- </manifest>
- </jar>
- </target>
-</project>
-
-
diff --git a/sca-java-2.x/trunk/samples/learning-more/async/calculator-contribution/pom.xml b/sca-java-2.x/trunk/samples/learning-more/async/calculator-contribution/pom.xml deleted file mode 100644 index 20c04e9e70..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/async/calculator-contribution/pom.xml +++ /dev/null @@ -1,57 +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-samples</artifactId> - <version>2.0-SNAPSHOT</version> - <relativePath>../../../pom.xml</relativePath> - </parent> - <artifactId>sample-implementation-java-calculator-async-contribution</artifactId> - <name>Apache Tuscany SCA Sample implementation.java Calculator Async Contribution</name> - - <dependencies> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-sca-api</artifactId> - <version>2.0-SNAPSHOT</version> - </dependency> - - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>4.8.1</version> - <scope>test</scope> - </dependency> - </dependencies> - - <build> - <finalName>${project.artifactId}</finalName> - <plugins> - <plugin> - <groupId>org.apache.tuscany.maven.plugins</groupId> - <artifactId>maven-tuscany-plugin</artifactId> - <version>2.0-SNAPSHOT</version> - </plugin> - </plugins> - </build> - -</project> diff --git a/sca-java-2.x/trunk/samples/learning-more/async/calculator-contribution/src/main/java/calculator/CalculateReferenceAsync.java b/sca-java-2.x/trunk/samples/learning-more/async/calculator-contribution/src/main/java/calculator/CalculateReferenceAsync.java deleted file mode 100644 index a8a323ba04..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/async/calculator-contribution/src/main/java/calculator/CalculateReferenceAsync.java +++ /dev/null @@ -1,57 +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 java.util.concurrent.Future; - -import javax.xml.ws.AsyncHandler; -import javax.xml.ws.Response; - -import org.oasisopen.sca.annotation.Remotable; - -/** - * Async client version of the CalculatorService interface - * - */ - -@Remotable -public interface CalculateReferenceAsync { - - // Sync - public String calculate(Integer i1); - - // Aysnc Poll - public Response<String> calculateAsync(Integer i1); - - // Async Callback - public Future<String> calculateAsync(Integer i1, AsyncHandler<String> handler); - -/* TUSCANY-3757 - // Sync - public void print(Integer i1); - - // Aysnc Poll - public Response<Void> printAsync(Integer i1); - - // Async Callback - public Future<Void> printAsync(Integer i1, AsyncHandler<Void> handler); -*/ -} - diff --git a/sca-java-2.x/trunk/samples/learning-more/async/calculator-contribution/src/main/java/calculator/CalculatorAsyncHandler.java b/sca-java-2.x/trunk/samples/learning-more/async/calculator-contribution/src/main/java/calculator/CalculatorAsyncHandler.java deleted file mode 100644 index abaeef8062..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/async/calculator-contribution/src/main/java/calculator/CalculatorAsyncHandler.java +++ /dev/null @@ -1,36 +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 javax.xml.ws.AsyncHandler;
-import javax.xml.ws.Response;
-
-/**
- * Handles callbacks to the async client
- */
-
-public class CalculatorAsyncHandler implements AsyncHandler<String> {
- public void handleResponse(Response<String> res) {
- try {
- System.out.println("Async client callback patern: result in handler = " + res.get());
- } catch(Exception ex){
- System.out.println("Async client callback patern: exception in handler = " + ex.getMessage());
- }
- }
-}
diff --git a/sca-java-2.x/trunk/samples/learning-more/async/calculator-contribution/src/main/java/calculator/CalculatorClient.java b/sca-java-2.x/trunk/samples/learning-more/async/calculator-contribution/src/main/java/calculator/CalculatorClient.java deleted file mode 100644 index 6f4ffc0ca7..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/async/calculator-contribution/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 CalculatorServiceSync calculatorService; - - - @Reference - public void setCalculatorService(CalculatorServiceSync calculatorService) { - this.calculatorService = calculatorService; - } - - @Init - public void calculate() { - System.out.println("calculation=" + calculatorService.calculate(20)); - System.out.println("print"); - /* TUSCANY-3757 - calculatorService.print(27); - */ - } - - -} diff --git a/sca-java-2.x/trunk/samples/learning-more/async/calculator-contribution/src/main/java/calculator/CalculatorPrintAsyncHandler.java b/sca-java-2.x/trunk/samples/learning-more/async/calculator-contribution/src/main/java/calculator/CalculatorPrintAsyncHandler.java deleted file mode 100644 index 8faf390974..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/async/calculator-contribution/src/main/java/calculator/CalculatorPrintAsyncHandler.java +++ /dev/null @@ -1,36 +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 javax.xml.ws.AsyncHandler;
-import javax.xml.ws.Response;
-
-/**
- * Handles callbacks to the async client
- */
-
-public class CalculatorPrintAsyncHandler implements AsyncHandler<Void> {
- public void handleResponse(Response<Void> res) {
- try {
- System.out.println("Async client callback patern: result in print handler = " + res.get());
- } catch(Exception ex){
- System.out.println("Async client callback patern: exception in print handler = " + ex.getMessage());
- }
- }
-}
diff --git a/sca-java-2.x/trunk/samples/learning-more/async/calculator-contribution/src/main/java/calculator/CalculatorServiceAsync.java b/sca-java-2.x/trunk/samples/learning-more/async/calculator-contribution/src/main/java/calculator/CalculatorServiceAsync.java deleted file mode 100644 index bcb931e418..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/async/calculator-contribution/src/main/java/calculator/CalculatorServiceAsync.java +++ /dev/null @@ -1,36 +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.ResponseDispatch;
-import org.oasisopen.sca.annotation.AsyncInvocation;
-import org.oasisopen.sca.annotation.Remotable;
-
-/**
- * The async Calculator service interface.
- */
-
-@Remotable
-@AsyncInvocation
-public interface CalculatorServiceAsync {
- void calculateAsync(Integer n1, ResponseDispatch<String> response);
- /* TUSCANY-3757
- void printAsync(Integer n1, ResponseDispatch<Void> response);
- */
-}
diff --git a/sca-java-2.x/trunk/samples/learning-more/async/calculator-contribution/src/main/java/calculator/CalculatorServiceAsyncImpl.java b/sca-java-2.x/trunk/samples/learning-more/async/calculator-contribution/src/main/java/calculator/CalculatorServiceAsyncImpl.java deleted file mode 100644 index d865bcf454..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/async/calculator-contribution/src/main/java/calculator/CalculatorServiceAsyncImpl.java +++ /dev/null @@ -1,44 +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.ResponseDispatch; - -public class CalculatorServiceAsyncImpl implements CalculatorServiceAsync { - - @Override - public void calculateAsync(Integer n1, ResponseDispatch<String> response) { - int result = n1 + n1; - String retval = "async service invoked: " + n1 + " + " + n1 + " = " + result; - - response.sendResponse(retval); - } - -/* TUSCANY-3757 - @Override - - public void printAsync(Integer n1, ResponseDispatch<Void> response) { - int result = n1 + n1; - String retval = "async service invoked: " + n1 + " + " + n1 + " = " + result; - System.out.println(retval); - } -*/ - -} diff --git a/sca-java-2.x/trunk/samples/learning-more/async/calculator-contribution/src/main/java/calculator/CalculatorServiceProxyImpl.java b/sca-java-2.x/trunk/samples/learning-more/async/calculator-contribution/src/main/java/calculator/CalculatorServiceProxyImpl.java deleted file mode 100644 index 45e23b8e93..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/async/calculator-contribution/src/main/java/calculator/CalculatorServiceProxyImpl.java +++ /dev/null @@ -1,132 +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 java.util.concurrent.ExecutionException; -import java.util.concurrent.Future; - -import javax.xml.ws.Response; - -import org.oasisopen.sca.annotation.Reference; - -/** - * An implementation of the Calculator service which just proxies - * to sync and asyn versions of the calculator service. This proxy - * exercises the various async interface alternatives - */ -public class CalculatorServiceProxyImpl implements CalculatorServiceSync { - - @Reference - protected CalculateReferenceAsync calculatorServiceRefSync; - - @Reference - protected CalculateReferenceAsync calculatorServiceRefAsync; - - @Override - public String calculate(Integer n1) { - String result = null; - - // calculate using a sync service - System.out.println("Calling sync service for calculate"); - result = calculate(calculatorServiceRefSync, n1); - - // calculate using an aycn service - System.out.println("Calling async service for calculate"); - result += calculate(calculatorServiceRefAsync, n1); - - return result; - } - - // exercise sync and async versions of a service interface method - private String calculate(CalculateReferenceAsync calculatorRef, Integer n1) { - - // sync - String result = calculatorRef.calculate(1); - System.out.println("Sync client patern: result = " + result); - - // async poll - Response<String> response = calculatorRef.calculateAsync(20); - - while (!response.isDone()){ - System.out.println("Waiting for poll"); - try { - Thread.sleep(500); - } catch (Exception ex) { - // do nothing - } - } - - try { - result = response.get(); - System.out.println("Async client poll patern: result = " + result); - } catch (InterruptedException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } catch (ExecutionException e) { - // TODO Auto-generated catch block - e.printStackTrace(); - } - - // async callback - CalculatorAsyncHandler handler = new CalculatorAsyncHandler(); - Future<String> future = calculatorRef.calculateAsync(3, handler); - - while (!future.isDone()){ - System.out.println("Waiting for callback"); - try { - Thread.sleep(500); - } catch (Exception ex) { - // do nothing - } - } - - return result; - } - -/* TUSCANY-3757 - @Override -*/ - public void print(Integer n1) { - - // calculate using a sync service - System.out.println("Calling sync service for print"); - //print(calculatorServiceRefSync, n1); - - // calculate using an asycn service - System.out.println("Calling async service for print"); - //print(calculatorServiceRefAsync, n1); - } - -/* TUSCANY-3757 - // exercise sync and async versions of a service interface method - private void print(CalculateReferenceAsync calculatorRef, Integer n1) { - - // sync - calculatorRef.print(1); - - // async poll - Response<Void> response = calculatorRef.printAsync(20); - - // async callback - CalculatorPrintAsyncHandler handler = new CalculatorPrintAsyncHandler(); - Future<Void> future = calculatorRef.printAsync(3, handler); - - } -*/ -} diff --git a/sca-java-2.x/trunk/samples/learning-more/async/calculator-contribution/src/main/java/calculator/CalculatorServiceSync.java b/sca-java-2.x/trunk/samples/learning-more/async/calculator-contribution/src/main/java/calculator/CalculatorServiceSync.java deleted file mode 100644 index cded310a15..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/async/calculator-contribution/src/main/java/calculator/CalculatorServiceSync.java +++ /dev/null @@ -1,31 +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 sync Calculator service interface. - */ - -@Remotable -public interface CalculatorServiceSync { - String calculate(Integer n1); - void print(Integer n1); -} diff --git a/sca-java-2.x/trunk/samples/learning-more/async/calculator-contribution/src/main/java/calculator/CalculatorServiceSyncImpl.java b/sca-java-2.x/trunk/samples/learning-more/async/calculator-contribution/src/main/java/calculator/CalculatorServiceSyncImpl.java deleted file mode 100644 index 01e0d9f414..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/async/calculator-contribution/src/main/java/calculator/CalculatorServiceSyncImpl.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; - -public class CalculatorServiceSyncImpl implements CalculatorServiceSync { - - @Override - public String calculate(Integer n1) { - int result = n1 + n1; - String retval = "sync service invoked: " + n1 + " + " + n1 + " = " + result; - return retval; - } - - @Override - public void print(Integer n1) { - int result = n1 + n1; - String retval = "sync service invoked: " + n1 + " + " + n1 + " = " + result; - System.out.println(retval); - } - -} diff --git a/sca-java-2.x/trunk/samples/learning-more/async/calculator-contribution/src/main/resources/Calculator.composite b/sca-java-2.x/trunk/samples/learning-more/async/calculator-contribution/src/main/resources/Calculator.composite deleted file mode 100644 index 6117d436db..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/async/calculator-contribution/src/main/resources/Calculator.composite +++ /dev/null @@ -1,43 +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://docs.oasis-open.org/ns/opencsa/sca/200912"
- targetNamespace="http://sample"
- xmlns:sample="http://sample"
- xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200912"
- name="Calculator">
-
- <component name="CalculatorServiceComponent">
- <implementation.java class="calculator.CalculatorServiceProxyImpl"/>
- <reference name="calculatorServiceRefSync" target="CalculatorSync"/>
- <reference name="calculatorServiceRefAsync" target="CalculatorAsync"/>
- </component>
-
- <component name="CalculatorSync">
- <implementation.java class="calculator.CalculatorServiceSyncImpl"/>
- </component>
-
- <component name="CalculatorAsync">
- <implementation.java class="calculator.CalculatorServiceAsyncImpl"/>
- <service name="CalculatorServiceAsync">
- <binding.ws uri="http://localhost:8085/CalculatorAsync"/>
- </service>
- </component>
-
-</composite>
diff --git a/sca-java-2.x/trunk/samples/learning-more/async/calculator-contribution/src/main/resources/CalculatorClient.composite b/sca-java-2.x/trunk/samples/learning-more/async/calculator-contribution/src/main/resources/CalculatorClient.composite deleted file mode 100644 index 374ef27e2b..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/async/calculator-contribution/src/main/resources/CalculatorClient.composite +++ /dev/null @@ -1,30 +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://docs.oasis-open.org/ns/opencsa/sca/200912"
- targetNamespace="http://sample"
- xmlns:sample="http://sample"
- name="CalculatorClient">
-
- <component name="CalculatorClient">
- <implementation.java class="calculator.CalculatorClient"/>
- <reference name="calculatorService" target="CalculatorServiceComponent" />
- </component>
-
-</composite>
diff --git a/sca-java-2.x/trunk/samples/learning-more/async/calculator-contribution/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/samples/learning-more/async/calculator-contribution/src/main/resources/META-INF/sca-contribution.xml deleted file mode 100644 index 3e64787ce4..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/async/calculator-contribution/src/main/resources/META-INF/sca-contribution.xml +++ /dev/null @@ -1,24 +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. ---> -<contribution xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" - xmlns:sample="http://sample"> - <deployable composite="sample:Calculator"/> - <deployable composite="sample:CalculatorClient"/> -</contribution>
\ No newline at end of file diff --git a/sca-java-2.x/trunk/samples/learning-more/async/pom.xml b/sca-java-2.x/trunk/samples/learning-more/async/pom.xml deleted file mode 100644 index 265b9fea8c..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/async/pom.xml +++ /dev/null @@ -1,43 +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-samples-learning-more</artifactId> - <version>2.0-SNAPSHOT</version> - <relativePath>../pom.xml</relativePath> - </parent> - <artifactId>sample-tuscany-async</artifactId> - <packaging>pom</packaging> - <name>Apache Tuscany SCA Samples for Synchronous/Asynchronous invocation</name> - - <profiles> - <profile> - <id>default</id> - <activation> - <activeByDefault>true</activeByDefault> - </activation> - <modules> - <module>calculator-contribution</module> - </modules> - </profile> - </profiles> -</project> diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-comet/pom.xml b/sca-java-2.x/trunk/samples/learning-more/binding-comet/pom.xml deleted file mode 100644 index fefce3bdd2..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/binding-comet/pom.xml +++ /dev/null @@ -1,43 +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-samples-learning-more</artifactId>
- <version>2.0-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
- </parent>
- <artifactId>tuscany-samples-binding-comet</artifactId>
- <packaging>pom</packaging>
- <name>Apache Tuscany SCA Sample binding.comet</name>
-
- <profiles>
- <profile>
- <id>default</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
- <modules>
- <module>weather-webapp</module> - </modules>
- </profile>
- </profiles>
-</project>
diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-comet/weather-webapp/deploy.sh b/sca-java-2.x/trunk/samples/learning-more/binding-comet/weather-webapp/deploy.sh deleted file mode 100755 index eb53bd5c76..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/binding-comet/weather-webapp/deploy.sh +++ /dev/null @@ -1,20 +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 - -#!/bin/bash - -mvn clean install -appcfg.sh update target/comet-webapp
\ No newline at end of file diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-comet/weather-webapp/pom.xml b/sca-java-2.x/trunk/samples/learning-more/binding-comet/weather-webapp/pom.xml deleted file mode 100644 index cb538d02a0..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/binding-comet/weather-webapp/pom.xml +++ /dev/null @@ -1,55 +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 xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-samples</artifactId>
- <version>2.0-SNAPSHOT</version>
- <relativePath>../../../pom.xml</relativePath>
- </parent>
-
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>sample-binding-comet-weather-webapp</artifactId>
- <packaging>war</packaging>
- <version>1.0</version>
- <name>Apache Tuscany SCA Sample binding.comet Weather Webapp</name>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-base-runtime</artifactId>
- <version>2.0-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-binding-comet-runtime</artifactId>
- <version>2.0-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>javax</groupId>
- <artifactId>javaee-web-api</artifactId>
- <version>6.0</version>
- <scope>provided</scope>
- </dependency>
- </dependencies>
-
-</project>
-
diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-comet/weather-webapp/src/main/java/org/apache/tuscany/sca/sample/comet/Helper.java b/sca-java-2.x/trunk/samples/learning-more/binding-comet/weather-webapp/src/main/java/org/apache/tuscany/sca/sample/comet/Helper.java deleted file mode 100644 index eecc6044ea..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/binding-comet/weather-webapp/src/main/java/org/apache/tuscany/sca/sample/comet/Helper.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 org.apache.tuscany.sca.sample.comet; - -import java.util.Date; -import java.util.Random; - -public final class Helper { - - public static int randomInt(final int max) { - return (new Random(new Date().getTime()).nextInt(100)); - } - - private Helper() { - } - -} diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-comet/weather-webapp/src/main/java/org/apache/tuscany/sca/sample/comet/HumidityService.java b/sca-java-2.x/trunk/samples/learning-more/binding-comet/weather-webapp/src/main/java/org/apache/tuscany/sca/sample/comet/HumidityService.java deleted file mode 100644 index 00cbe73e82..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/binding-comet/weather-webapp/src/main/java/org/apache/tuscany/sca/sample/comet/HumidityService.java +++ /dev/null @@ -1,31 +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 org.apache.tuscany.sca.sample.comet; - -import org.apache.tuscany.sca.sample.comet.model.Location; -import org.apache.tuscany.sca.sample.comet.model.Response; -import org.oasisopen.sca.annotation.Remotable; - -@Remotable -public interface HumidityService { - - Response getHumidity(Location location); - -} diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-comet/weather-webapp/src/main/java/org/apache/tuscany/sca/sample/comet/PrecipitationService.java b/sca-java-2.x/trunk/samples/learning-more/binding-comet/weather-webapp/src/main/java/org/apache/tuscany/sca/sample/comet/PrecipitationService.java deleted file mode 100644 index afbdcbc8d7..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/binding-comet/weather-webapp/src/main/java/org/apache/tuscany/sca/sample/comet/PrecipitationService.java +++ /dev/null @@ -1,31 +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 org.apache.tuscany.sca.sample.comet; - -import org.apache.tuscany.sca.sample.comet.model.Location; -import org.apache.tuscany.sca.sample.comet.model.Response; -import org.oasisopen.sca.annotation.Remotable; - -@Remotable -public interface PrecipitationService { - - Response getPrecipitation(Location location); - -} diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-comet/weather-webapp/src/main/java/org/apache/tuscany/sca/sample/comet/PrecipitationServiceImpl.java b/sca-java-2.x/trunk/samples/learning-more/binding-comet/weather-webapp/src/main/java/org/apache/tuscany/sca/sample/comet/PrecipitationServiceImpl.java deleted file mode 100644 index 4278ef975b..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/binding-comet/weather-webapp/src/main/java/org/apache/tuscany/sca/sample/comet/PrecipitationServiceImpl.java +++ /dev/null @@ -1,39 +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 org.apache.tuscany.sca.sample.comet; - -import java.util.Date; - -import org.apache.tuscany.sca.sample.comet.model.Location; -import org.apache.tuscany.sca.sample.comet.model.Response; -import org.oasisopen.sca.annotation.Service; - -@Service(PrecipitationService.class) -public class PrecipitationServiceImpl implements PrecipitationService { - - @Override - public Response getPrecipitation(final Location location) { - final Response response = new Response(); - response.setDate(new Date()); - response.setData(Helper.randomInt(100) + "%"); - return response; - } - -} diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-comet/weather-webapp/src/main/java/org/apache/tuscany/sca/sample/comet/TemperatureHumidityServiceImpl.java b/sca-java-2.x/trunk/samples/learning-more/binding-comet/weather-webapp/src/main/java/org/apache/tuscany/sca/sample/comet/TemperatureHumidityServiceImpl.java deleted file mode 100644 index 55f935fa9f..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/binding-comet/weather-webapp/src/main/java/org/apache/tuscany/sca/sample/comet/TemperatureHumidityServiceImpl.java +++ /dev/null @@ -1,48 +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 org.apache.tuscany.sca.sample.comet; - -import java.util.Date; - -import org.apache.tuscany.sca.sample.comet.model.Location; -import org.apache.tuscany.sca.sample.comet.model.Response; -import org.oasisopen.sca.annotation.Service; - -@Service({TemperatureService.class, HumidityService.class}) -public class TemperatureHumidityServiceImpl implements TemperatureService, HumidityService { - - @Override - public Response getHumidity(final Location location) { - final Response response = new Response(); - response.setDate(new Date()); - response.setData(Helper.randomInt(90) + "%"); - return response; - } - - @Override - public Response getTemperature(final Location location, final int scale) { - final Response response = new Response(); - response.setDate(new Date()); - final String data = "" + Helper.randomInt(scale == TemperatureService.CELSIUS ? 40 : 150); - response.setData(data); - return response; - } - -} diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-comet/weather-webapp/src/main/java/org/apache/tuscany/sca/sample/comet/TemperatureService.java b/sca-java-2.x/trunk/samples/learning-more/binding-comet/weather-webapp/src/main/java/org/apache/tuscany/sca/sample/comet/TemperatureService.java deleted file mode 100644 index 092988213b..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/binding-comet/weather-webapp/src/main/java/org/apache/tuscany/sca/sample/comet/TemperatureService.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 org.apache.tuscany.sca.sample.comet; - -import org.apache.tuscany.sca.sample.comet.model.Location; -import org.apache.tuscany.sca.sample.comet.model.Response; -import org.oasisopen.sca.annotation.Remotable; - -@Remotable -public interface TemperatureService { - - public static final int CELSIUS = 1; - public static final int FAHRENHEIT = 2; - - Response getTemperature(Location location, int scale); - -} diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-comet/weather-webapp/src/main/java/org/apache/tuscany/sca/sample/comet/model/Location.java b/sca-java-2.x/trunk/samples/learning-more/binding-comet/weather-webapp/src/main/java/org/apache/tuscany/sca/sample/comet/model/Location.java deleted file mode 100644 index ff2da3a360..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/binding-comet/weather-webapp/src/main/java/org/apache/tuscany/sca/sample/comet/model/Location.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 org.apache.tuscany.sca.sample.comet.model; - -public class Location { - - private String city; - private String country; - - public String getCity() { - return this.city; - } - - public void setCity(final String city) { - this.city = city; - } - - public String getCountry() { - return this.country; - } - - public void setCountry(final String country) { - this.country = country; - } - -} diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-comet/weather-webapp/src/main/java/org/apache/tuscany/sca/sample/comet/model/Response.java b/sca-java-2.x/trunk/samples/learning-more/binding-comet/weather-webapp/src/main/java/org/apache/tuscany/sca/sample/comet/model/Response.java deleted file mode 100644 index aaa23f0b8a..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/binding-comet/weather-webapp/src/main/java/org/apache/tuscany/sca/sample/comet/model/Response.java +++ /dev/null @@ -1,45 +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 org.apache.tuscany.sca.sample.comet.model; - -import java.util.Date; - -public class Response { - - private Date date; - private String data; - - public Date getDate() { - return this.date; - } - - public void setDate(final Date date) { - this.date = date; - } - - public String getData() { - return this.data; - } - - public void setData(final String data) { - this.data = data; - } - -} diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-comet/weather-webapp/src/main/webapp/META-INF/MANIFEST.MF b/sca-java-2.x/trunk/samples/learning-more/binding-comet/weather-webapp/src/main/webapp/META-INF/MANIFEST.MF deleted file mode 100644 index 58630c02ef..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/binding-comet/weather-webapp/src/main/webapp/META-INF/MANIFEST.MF +++ /dev/null @@ -1,2 +0,0 @@ -Manifest-Version: 1.0
-
diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-comet/weather-webapp/src/main/webapp/WEB-INF/appengine-web.xml b/sca-java-2.x/trunk/samples/learning-more/binding-comet/weather-webapp/src/main/webapp/WEB-INF/appengine-web.xml deleted file mode 100644 index 8696f76c50..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/binding-comet/weather-webapp/src/main/webapp/WEB-INF/appengine-web.xml +++ /dev/null @@ -1,24 +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.
--->
-<appengine-web-app xmlns="http://appengine.google.com/ns/1.0">
- <application>tuscany-comet</application>
- <version>1</version>
- <sessions-enabled>true</sessions-enabled>
-</appengine-web-app>
\ No newline at end of file diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-comet/weather-webapp/src/main/webapp/WEB-INF/web.composite b/sca-java-2.x/trunk/samples/learning-more/binding-comet/weather-webapp/src/main/webapp/WEB-INF/web.composite deleted file mode 100644 index 05b2ddd0d7..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/binding-comet/weather-webapp/src/main/webapp/WEB-INF/web.composite +++ /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. ---> -<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" - xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.1" - targetNamespace="http://samples" - name="Stock"> - - <component name="c1"> - <implementation.java class="org.apache.tuscany.sca.sample.comet.TemperatureHumidityServiceImpl"/> - <service name="TemperatureService"> - <interface.java interface="org.apache.tuscany.sca.sample.comet.TemperatureService"/> - <tuscany:binding.comet/> - </service> - <service name="HumidityService"> - <interface.java interface="org.apache.tuscany.sca.sample.comet.HumidityService"/> - <tuscany:binding.comet/> - </service> - </component> - - <component name="c2"> - <implementation.java class="org.apache.tuscany.sca.sample.comet.PrecipitationServiceImpl"/> - <service name="PrecipitationService"> - <interface.java interface="org.apache.tuscany.sca.sample.comet.PrecipitationService"/> - <tuscany:binding.comet/> - </service> - </component> - -</composite>
\ No newline at end of file diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-comet/weather-webapp/src/main/webapp/WEB-INF/web.xml b/sca-java-2.x/trunk/samples/learning-more/binding-comet/weather-webapp/src/main/webapp/WEB-INF/web.xml deleted file mode 100644 index 25b06c457a..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/binding-comet/weather-webapp/src/main/webapp/WEB-INF/web.xml +++ /dev/null @@ -1,34 +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. ---> -<web-app xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://java.sun.com/xml/ns/javaee" xmlns:j2ee="http://java.sun.com/xml/ns/javaee" xmlns:web="http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_3.0.xsd" version="3.0"> - <display-name>Apache Tuscany Stock Comet Sample</display-name> - <filter> - <filter-name>tuscany</filter-name> - <filter-class>org.apache.tuscany.sca.host.webapp.TuscanyServletFilter</filter-class> - <async-supported>true</async-supported> - </filter> - <filter-mapping> - <filter-name>tuscany</filter-name> - <url-pattern>/*</url-pattern> - </filter-mapping> - <welcome-file-list> - <welcome-file>index.html</welcome-file> - </welcome-file-list> -</web-app>
\ No newline at end of file diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-comet/weather-webapp/src/main/webapp/index.html b/sca-java-2.x/trunk/samples/learning-more/binding-comet/weather-webapp/src/main/webapp/index.html deleted file mode 100644 index 0387e67adb..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/binding-comet/weather-webapp/src/main/webapp/index.html +++ /dev/null @@ -1,157 +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. ---> -<html> - <head> - <title>Apache Tuscany Comet Sample</title> - <!-- Tuscany Comet Javascript Toolkit is dependent on jQuery --> - <script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jquery/1.4.2/jquery.min.js"></script> - <script type="text/javascript" src="org.apache.tuscany.sca.cometComponentContext.js"></script> - <script type="text/javascript"> - $(document).ready(function() - { - // Initialization - var location = new Object(); - location.city = null; - location.country = null; - - document.getElementById('locationButton').disabled = true; - document.getElementById('tempCButton').disabled = true; - document.getElementById('tempFButton').disabled = true; - document.getElementById('humButton').disabled = true; - document.getElementById('precipButton').disabled = true; - - document.getElementById('locationButton').onclick = function(event) { - location.city = document.getElementById('city').value; - location.country = document.getElementById('country').value; - document.getElementById('locationButton').value = 'Switch location'; - document.getElementById('tempCButton').disabled = false; - document.getElementById('tempFButton').disabled = false; - document.getElementById('humButton').disabled = false; - document.getElementById('precipButton').disabled = false; - document.getElementById('tempCText').textContent = 'N/A'; - document.getElementById('tempCDate').textContent = ''; - document.getElementById('tempFText').textContent = 'N/A'; - document.getElementById('tempFDate').textContent = ''; - document.getElementById('humText').textContent = 'N/A'; - document.getElementById('humDate').textContent = ''; - document.getElementById('precipText').textContent = 'N/A'; - document.getElementById('precipDate').textContent = ''; - } - - // Tuscany Comet specific API - - document.getElementById('connect').onclick = function(event) { - /* transport can be : long-polling or streaming */ - SCA.TuscanyComet.connect(document.getElementById('transport').value); - document.getElementById('connect').disabled = true; - document.getElementById('transport').disabled = true; - document.getElementById('locationButton').disabled = false; - } - - - document.getElementById('tempCButton').onclick = function(event) { - SCA.CometComponentContext.TemperatureService.getTemperature(location, 1, updateTempC); - } - - document.getElementById('tempFButton').onclick = function(event) { - SCA.CometComponentContext.TemperatureService.getTemperature(location, 2, updateTempF); - } - - document.getElementById('humButton').onclick = function(event) { - SCA.CometComponentContext.HumidityService.getHumidity(location, updateHum); - } - - document.getElementById('precipButton').onclick = function(event) { - SCA.CometComponentContext.PrecipitationService.getPrecipitation(location, updatePrecip); - } - }); - - function updateTempC(response) { - document.getElementById('tempCText').textContent = response.data; - document.getElementById('tempCDate').textContent = response.date; - } - - function updateTempF(response) { - document.getElementById('tempFText').textContent = response.data; - document.getElementById('tempFDate').textContent = response.date; - } - - function updateHum(response) { - document.getElementById('humText').textContent = response.data; - document.getElementById('humDate').textContent = response.date; - } - - function updatePrecip(response) { - document.getElementById('precipText').textContent = response.data; - document.getElementById('precipDate').textContent = response.date; - } - </script> - </head> - <body> - <div id='sidebar'> - <h2>Apache Tuscany Comet Sample</h2> - <label>Select transport</label> - <select id="transport"> - <option id="streaming" value="streaming">http streaming</option> - <option id="long-polling" value="long-polling">long-polling</option> - </select> - <input id='connect' type='submit' value='Connect'/> - <h3>Weather Monitor</h3> - <p/> - <table> - <tr> - <td>City</td> - <td><input type="text" id='city' value='Brasov'/></td> - </tr> - <tr> - <td>Country</td> - <td><input type="text" id ='country' value='Romania'/></td> - </tr> - </table> - <input type="button" id='locationButton' value='Set location'/> - <p/> - <table> - <tr> - <th align="left">Temperature (Celsius):</th> - <td><span id='tempCText'>N/A</span></td> - <td><input type='button' id='tempCButton' value="Update"/></td> - <td><span id='tempCDate'></span> - </tr> - <tr> - <th align="left">Temperature (Fahrenheit):</th> - <td><span id='tempFText'>N/A</span></td> - <td><input type='button' id='tempFButton' value="Update"/></td> - <td><span id='tempFDate'></span> - </tr> - <tr> - <th align="left">Humidity:</th> - <td><span id='humText'>N/A</span></td> - <td><input type='button' id='humButton' value="Update"/></td> - <td><span id='humDate'></span> - </tr> - <tr> - <th align="left">Precipitation probability:</th> - <td><span id='precipText'>N/A</span></td> - <td><input type='button' id='precipButton' value="Update"/></td> - <td><span id='precipDate'></span> - </tr> - </table> - </div> - </body> -</html> diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-jms/helloworld-webapp/README b/sca-java-2.x/trunk/samples/learning-more/binding-jms/helloworld-webapp/README deleted file mode 100644 index 580d5e79c7..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/binding-jms/helloworld-webapp/README +++ /dev/null @@ -1,131 +0,0 @@ -JMS HelloWorld Sample -===================== -This sample demonstrates a simple webapp containing a hello world style client -and service using the JMS binding for request-response style messaging. - -The README in the samples directory (the directory three directories above this) provides -general instructions about building and running samples. Take a look there -first. - -As this sample provides a web app there is a manual step where the WAR file -that contains the sample is copied to your web app container. If you just want -to give this sample a go deploy the WAR file (target/helloworld-jms.war ) -to you web application server. Alternatevly, the sample pom.xml is configured -with the Jetty plugin so you can run the it with Jetty by simply doing "mvn jetty:run". - -Once the web app is deployed use your browser to visit the following URL; - -http://localhost:8080/helloworld-jms - -The port and hostname will of course vary depending on your local installation. - -Configuring the JMS resources ------------------------------ - -The sample requires JMS resources be manually configured in the server environment, these are: - -- a JMS connection factory named "ConnectionFactory" -- a JMS queue named "HelloWorldService" - -See the following for how to define these resources depending on the application server being used: - -Tuscany with embedded ActiveMQ broker -------------------------------------- - - -Apache Tomcat -------------- - -No configuration is necessary for Tomcat as the sample WAR includes everything pre-configured to run -an ActiveMQ embedded JMS broker and to configure the JMS resources in JNDI. - -The JNDI resources are configured in the META-INF/comtext.xml file, for more information on running -ActiveMQ in Tomcat see: http://activemq.apache.org/tomcat.html - - -Apache Geronimo ---------------- - -For Apache Geronimo 2.0.1 (2.0.2 fails to define JMS resources for me) - -Logon to the Geronimo Server Console (http://localhost:8080/console, uid system, pswd manager) - -In the Console Navigation on the left under Services click JMS Resources - -At the bottom of the JMS Resources panel click under Create a new JMS Resource Group click For ActiveMQ - -In Resource Group Name enter "MyRGN" and click next - -At JMS Resource Group click Add Connection Factory - -For JMS Factory Type choose javax.jms.ConnectionFactory and click Next - -In Connection Factory Name enter "ConnectionFactory" and click Next - -Click Add destination - -For JMS Destination Type choose javax.jms.Queue and click Next - -Enter "HelloWorldService" for both Message Destination Name and PhysicalName and click Next - -Click Deploy Now - -Thats it, you're done. - - -WebSphere ---------- - -To define the JMS resources in a new WebSphere Application Server 6.1 installation: - -1) First define a Service integration bus: - -Logon to the WebSphere Integrated Solutions Console (http://localhost:9060/ibm/console) - -On the Left hand menu expand Service integration, and click on Buses. - -In the Buses panel click on New - -Enter a name for the bus, eg MyBus, and click Next, and then click Finish and Save the changes. - -In the Buses panel click on MyBus - -Find the Topology secion and click on Bus members - -Click on Add, leave the defaults and click Next, Next, Next, Finish, and Save the changes. - -Restart WebSphere and when back up logon back on to the Integrated Solutions Console - -2) Now define the JMS rescources - -On the Left hand menu expand Resources, and JMS and click on Connection Facotories. - -In the Connection factories panel click New. - -Leave the Default messaging provider and click OK - -Enter "ConnectionFactory" in the Name and JNDI name and in the Bus name in the Connection pane choose MyBus and click OK - -On the Left hand menu in JMS click on Queues - -In the Queues panel click New, accept the defaults and click OK - -Enter "HelloWorldService" for the Name and JNDI name and in the Bus name in the Connection pane choose MyBus, -and then in the Queue name drop down list choose "Create SIB destination" - -In the Set queue attributes panel enter "HelloWorldService" for the Identifier and click Next, Next, and Finish - -That should take you back to the Queues panel where you can click OK to create the new JMS queue. - -Save the changes - -Restart WebSphere and you're done. - - - -Others... ---------- - - - - diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-jms/helloworld-webapp/pom.xml b/sca-java-2.x/trunk/samples/learning-more/binding-jms/helloworld-webapp/pom.xml deleted file mode 100644 index 751fffc4c9..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/binding-jms/helloworld-webapp/pom.xml +++ /dev/null @@ -1,96 +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-samples</artifactId> - <version>2.0-SNAPSHOT</version> - <relativePath>../../../pom.xml</relativePath> - </parent> - - <artifactId>sample-binding-jms-helloworld-webapp</artifactId> - <packaging>war</packaging> - <name>Apache Tuscany SCA Sample binding.jms HelloWorld WebApp</name> - - <dependencies> - - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-base-runtime</artifactId> - <version>2.0-SNAPSHOT</version> - </dependency> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-binding-jms-runtime</artifactId> - <version>2.0-SNAPSHOT</version> - </dependency> - - <dependency> - <groupId>org.apache.activemq</groupId> - <artifactId>activemq-all</artifactId> - <version>5.3.0</version> - <scope>runtime</scope> - </dependency> - - </dependencies> - - <build> - <finalName>helloworld-jms</finalName> - <plugins> - <plugin> - <groupId>org.mortbay.jetty</groupId> - <artifactId>maven-jetty-plugin</artifactId> - <version>6.1.18</version> - <configuration> - <contextPath>helloworld-jms</contextPath> - <stopKey>foo</stopKey> - <stopPort>9999</stopPort> - </configuration> - <executions> - <execution> - <id>start-jetty</id> - <phase>process-test-classes</phase> - <goals> - <goal>run</goal> - </goals> - <configuration> - <scanIntervalSeconds>0</scanIntervalSeconds> - <daemon>true</daemon> - <connectors> - <connector implementation="org.mortbay.jetty.nio.SelectChannelConnector"> - <port>8085</port> - </connector> - </connectors> - </configuration> - </execution> - <execution> - <id>stop-jetty</id> - <phase>prepare-package</phase> - <goals> - <goal>stop</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> - </build> - -</project> diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-jms/helloworld-webapp/src/main/java/sample/HelloWorldClient.java b/sca-java-2.x/trunk/samples/learning-more/binding-jms/helloworld-webapp/src/main/java/sample/HelloWorldClient.java deleted file mode 100644 index f209f11605..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/binding-jms/helloworld-webapp/src/main/java/sample/HelloWorldClient.java +++ /dev/null @@ -1,37 +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 sample;
-
-/**
- * The HelloWorld client implementation
- */
-public class HelloWorldClient implements HelloWorldService {
-
- HelloWorldService helloWorldRef;
-
- public String sayHello(String name) {
- System.out.println("HelloWorldClient.sayHello " + name);
- return helloWorldRef.sayHello(name);
- }
-
- public void setHelloWorldRef(HelloWorldService helloWorldRef) {
- System.out.println("HelloWorldClient.setHelloWorldService " + helloWorldRef);
- this.helloWorldRef = helloWorldRef;
- }
-}
\ No newline at end of file diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-jms/helloworld-webapp/src/main/java/sample/HelloWorldService.java b/sca-java-2.x/trunk/samples/learning-more/binding-jms/helloworld-webapp/src/main/java/sample/HelloWorldService.java deleted file mode 100644 index df2a852161..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/binding-jms/helloworld-webapp/src/main/java/sample/HelloWorldService.java +++ /dev/null @@ -1,29 +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 sample;
-
-import org.oasisopen.sca.annotation.Remotable;
-
-/**
- * The interface for the helloworld service
- */
-@Remotable
-public interface HelloWorldService {
- public String sayHello(String name);
-}
diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-jms/helloworld-webapp/src/main/java/sample/HelloWorldServiceImpl.java b/sca-java-2.x/trunk/samples/learning-more/binding-jms/helloworld-webapp/src/main/java/sample/HelloWorldServiceImpl.java deleted file mode 100644 index c09af51e23..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/binding-jms/helloworld-webapp/src/main/java/sample/HelloWorldServiceImpl.java +++ /dev/null @@ -1,31 +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 sample;
-
-/**
- * This class implements the HelloWorld service.
- */
-public class HelloWorldServiceImpl implements HelloWorldService {
-
- public String sayHello(String name) {
- System.out.println("HelloWorldServiceImpl.sayHello " + name);
- return "Hello " + name;
- }
-
-}
diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-jms/helloworld-webapp/src/main/webapp/META-INF/context.xml b/sca-java-2.x/trunk/samples/learning-more/binding-jms/helloworld-webapp/src/main/webapp/META-INF/context.xml deleted file mode 100644 index 7575edfc29..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/binding-jms/helloworld-webapp/src/main/webapp/META-INF/context.xml +++ /dev/null @@ -1,34 +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. ---> - -<!-- -This file configures the ActiveMQ JMS resources and is only required when -using Apache ActiveMQ as the JMS broker in Apache Tomcat. ---> - -<Context> - - <Resource name="ConnectionFactory" auth="Container" type="org.apache.activemq.ActiveMQConnectionFactory" description="JMS Connection Factory" - factory="org.apache.activemq.jndi.JNDIReferenceFactory" brokerURL="vm://localhost?broker.persistent=false" brokerName="LocalActiveMQBroker"/> - - <Resource name="HelloWorldService" auth="Container" type="org.apache.activemq.command.ActiveMQQueue" description="my Queue" - factory="org.apache.activemq.jndi.JNDIReferenceFactory" physicalName="RequestQueue"/> - -</Context>
\ No newline at end of file diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-jms/helloworld-webapp/src/main/webapp/WEB-INF/jetty-env.xml b/sca-java-2.x/trunk/samples/learning-more/binding-jms/helloworld-webapp/src/main/webapp/WEB-INF/jetty-env.xml deleted file mode 100644 index a8cd27f6c6..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/binding-jms/helloworld-webapp/src/main/webapp/WEB-INF/jetty-env.xml +++ /dev/null @@ -1,48 +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.
--->
-
-<!--
-This file configures the ActiveMQ JMS resources and is only required when
-using Apache ActiveMQ as the JMS broker in Jetty.
--->
-
-<!DOCTYPE Configure PUBLIC "-//Mort Bay Consulting//DTD Configure//EN" "http://jetty.mortbay.org/configure.dtd">
-
-<Configure class="org.mortbay.jetty.webapp.WebAppContext">
-
- <New id="cf" class="org.mortbay.jetty.plus.naming.Resource">
- <Arg>ConnectionFactory</Arg>
- <Arg>
- <New class="org.apache.activemq.ActiveMQConnectionFactory">
- <Arg>vm://localhost?broker.persistent=false</Arg>
- </New>
- </Arg>
- </New>
-
- <New id="myQueue" class="org.mortbay.jetty.plus.naming.Resource">
- <Arg>HelloWorldService</Arg>
- <Arg>
- <New class="org.apache.activemq.command.ActiveMQQueue">
- <Arg>DEMO</Arg>
- </New>
- </Arg>
- </New>
-
-</Configure>
diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-jms/helloworld-webapp/src/main/webapp/WEB-INF/web.composite b/sca-java-2.x/trunk/samples/learning-more/binding-jms/helloworld-webapp/src/main/webapp/WEB-INF/web.composite deleted file mode 100644 index b5d8c70d14..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/binding-jms/helloworld-webapp/src/main/webapp/WEB-INF/web.composite +++ /dev/null @@ -1,44 +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://docs.oasis-open.org/ns/opencsa/sca/200912"
- xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.1"
- targetNamespace="http://samples"
- name="Helloworld">
-
- <component name="foo">
- <implementation.web web-uri=""/>
- <reference name="service" target="HelloWorldClientComponent"/>
- </component>
-
- <component name="HelloWorldClientComponent">
- <implementation.java class="sample.HelloWorldClient"/>
- <reference name="helloWorldRef">
- <binding.jms uri="jms:queue:HelloWorldService"/>
- </reference>
- </component>
-
- <component name="HelloWorldServiceComponent">
- <implementation.java class="sample.HelloWorldServiceImpl" />
- <service name="HelloWorldService">
- <binding.jms />
- </service>
- </component>
-
-</composite>
diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-jms/helloworld-webapp/src/main/webapp/WEB-INF/web.xml b/sca-java-2.x/trunk/samples/learning-more/binding-jms/helloworld-webapp/src/main/webapp/WEB-INF/web.xml deleted file mode 100644 index 86710435ae..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/binding-jms/helloworld-webapp/src/main/webapp/WEB-INF/web.xml +++ /dev/null @@ -1,66 +0,0 @@ -<?xml version="1.0" encoding="ISO-8859-1"?>
-<!--
- * 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.
--->
-
-<!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web
-Application 2.3//EN" "http://java.sun.com/dtd/web-app_2_3.dtd">
-<web-app>
-
- <display-name>Apache Tuscany JMS Web Service Sample</display-name>
-
- <filter>
- <filter-name>tuscany</filter-name>
- <filter-class>org.apache.tuscany.sca.host.webapp.TuscanyServletFilter</filter-class>
- </filter>
-
- <filter-mapping>
- <filter-name>tuscany</filter-name>
- <url-pattern>/*</url-pattern>
- </filter-mapping>
-
- <welcome-file-list id="WelcomeFileList">
- <welcome-file>hello.jsp</welcome-file>
- </welcome-file-list>
-
- <!-- Uncomment this to use an appserver thread pool
- <resource-ref>
- <res-ref-name>wm/TuscanyWorkManager</res-ref-name>
- <res-type>commonj.work.WorkManager</res-type>
- <res-auth>Container</res-auth>
- <res-sharing-scope>Shareable</res-sharing-scope>
- </resource-ref>
- -->
-
- <!-- Uncomment these to use local jndi name aliases
- <resource-ref>
- <res-ref-name>ConnectionFactory</res-ref-name>
- <res-type>javax.jms.ConnectionFactory</res-type>
- <res-auth>Container</res-auth>
- <res-sharing-scope>Shareable</res-sharing-scope>
- </resource-ref>
-
- <resource-ref>
- <res-ref-name>HelloWorldService</res-ref-name>
- <res-type>javax.jms.Queue</res-type>
- <res-auth>Container</res-auth>
- <res-sharing-scope>Shareable</res-sharing-scope>
- </resource-ref>
- -->
-
-</web-app>
diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-jms/helloworld-webapp/src/main/webapp/hello.jsp b/sca-java-2.x/trunk/samples/learning-more/binding-jms/helloworld-webapp/src/main/webapp/hello.jsp deleted file mode 100644 index 9ae037f2c2..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/binding-jms/helloworld-webapp/src/main/webapp/hello.jsp +++ /dev/null @@ -1,41 +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.
---%>
-
-<%@ page contentType="text/html;charset=UTF-8" language="java" %>
-<%@ taglib uri="http://www.osoa.org/sca/sca_jsp.tld" prefix="sca" %>
-
-<sca:reference name="service" type="sample.HelloWorldService" />
-
-<html>
-<head><title>HelloWorld JMS sample</title></head>
-
-<body>
-
-If this sample is working correctly you should see "Hello World" on the next line...
-<p>
-<%= service.sayHello("world") %>
-<p>
-If you do not see "Hello World" on the line above then there has been a problem.
-<p>
-The sample requires JMS resources be manually configured in the server environment, these are:
-a JMS connection factory named "ConnectionFactory", and a destination queues named "HelloWorldService".
-See the sample README file for more information.
-
-</body>
-</html>
diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-jms/pom.xml b/sca-java-2.x/trunk/samples/learning-more/binding-jms/pom.xml deleted file mode 100644 index 760f74b2fc..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/binding-jms/pom.xml +++ /dev/null @@ -1,43 +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-samples-learning-more</artifactId>
- <version>2.0-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
- </parent>
- <artifactId>tuscany-sample-binding-jms</artifactId>
- <packaging>pom</packaging>
- <name>Apache Tuscany SCA Sample binding.jms</name>
-
- <profiles>
- <profile>
- <id>default</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
- <modules>
- <module>helloworld-webapp</module>
- </modules>
- </profile>
- </profiles>
-</project>
diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/README b/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/README deleted file mode 100644 index 18ba62d494..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/README +++ /dev/null @@ -1 +0,0 @@ -Please look at the README files in the subdirectories of this directory for descriptions of the sample contributions.
diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/calculator-contribution/README b/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/calculator-contribution/README deleted file mode 100644 index fe9aac7f3c..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/calculator-contribution/README +++ /dev/null @@ -1,8 +0,0 @@ -Calculator Sample Contribution
-==============================
-
-This sample contribution implements a simple calculator using SCA components.
-
-See http://tuscany.apache.org/documentation-2x/20-beta-samples-documentation.html
-for more information
-
diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/calculator-contribution/build.xml b/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/calculator-contribution/build.xml deleted file mode 100644 index 00abb659d6..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/calculator-contribution/build.xml +++ /dev/null @@ -1,57 +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="sample-binding-jsonrpc-calculator-contribution" default="compile">
- <property name="tuscany.home" value="../../../.."/>
- <property name="jar.name" value="sample-binding-jsonrpc-calculator-contribution.jar" />
-
- <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-sca-api-*.jar" />
- </fileset>
- </classpath>
- </javac>
- <copy todir="target/classes">
- <fileset dir="src/main/resources"/>
- </copy>
- <jar destfile="target/${jar.name}" basedir="target/classes">
- <manifest>
- <attribute name="Main-Class" value="${main.class}" />
- </manifest>
- </jar>
- </target>
-</project>
-
-
diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/calculator-contribution/pom.xml b/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/calculator-contribution/pom.xml deleted file mode 100644 index 8f0a042f21..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/calculator-contribution/pom.xml +++ /dev/null @@ -1,57 +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-samples</artifactId>
- <version>2.0-SNAPSHOT</version>
- <relativePath>../../../pom.xml</relativePath>
- </parent>
- <artifactId>sample-binding-jsonrpc-calculator-contribution</artifactId>
- <name>Apache Tuscany SCA Sample binding.jsonrpc Calculator Contribution</name>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-sca-api</artifactId>
- <version>2.0-SNAPSHOT</version>
- </dependency>
-
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.8.1</version>
- <scope>test</scope>
- </dependency>
-
- </dependencies>
-
- <build>
- <finalName>${project.artifactId}</finalName>
- <plugins>
- <plugin>
- <groupId>org.apache.tuscany.maven.plugins</groupId>
- <artifactId>maven-tuscany-plugin</artifactId>
- <version>2.0-SNAPSHOT</version>
- </plugin>
- </plugins>
- </build>
-</project>
diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/calculator-contribution/src/main/java/calculator/AddBean.java b/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/calculator-contribution/src/main/java/calculator/AddBean.java deleted file mode 100644 index bb39e961b4..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/calculator-contribution/src/main/java/calculator/AddBean.java +++ /dev/null @@ -1,88 +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;
-
-public class AddBean {
-
- protected double n1;
- protected double n2;
- protected double n3;
-
- protected Boolean b;
- protected String s;
- protected int x;
- protected Integer y;
-
- public double getN1() {
- return n1;
- }
-
- public void setN1(double n1) {
- this.n1 = n1;
- }
-
- public double getN2() {
- return n2;
- }
-
- public void setN2(double n2) {
- this.n2 = n2;
- }
-
- public double getN3() {
- return n3;
- }
-
- public void setN3(double n3) {
- this.n3 = n3;
- }
-
- public Boolean getB() {
- return b;
- }
-
- public void setB(Boolean b) {
- this.b = b;
- }
-
- public String getS() {
- return s;
- }
-
- public void setS(String s) {
- this.s = s;
- }
-
- public int getX() {
- return x;
- }
-
- public void setX(int x) {
- this.x = x;
- }
-
- public Integer getY() {
- return y;
- }
-
- public void setY(Integer y) {
- this.y = y;
- }
-}
diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/calculator-contribution/src/main/java/calculator/AddService.java b/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/calculator-contribution/src/main/java/calculator/AddService.java deleted file mode 100644 index 03e844d09c..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/calculator-contribution/src/main/java/calculator/AddService.java +++ /dev/null @@ -1,32 +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 Add service interface
- */
-@Remotable
-public interface AddService {
-
- double add(double n1, double n2);
- AddBean addComplexParam(AddBean aBean);
-
-}
diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/calculator-contribution/src/main/java/calculator/AddServiceImpl.java b/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/calculator-contribution/src/main/java/calculator/AddServiceImpl.java deleted file mode 100644 index 8eabfa6773..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/calculator-contribution/src/main/java/calculator/AddServiceImpl.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 calculator;
-
-import java.util.logging.Level;
-import java.util.logging.Logger;
-
-import org.oasisopen.sca.annotation.Service;
-
-/**
- * An implementation of the Add service
- */
-@Service(AddService.class)
-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;
- }
-
- public AddBean addComplexParam(AddBean aBean) {
- aBean.setN3(aBean.getN1() + aBean.getN2());
- return aBean;
- }
-
-}
diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/calculator-contribution/src/main/java/calculator/CalculatorClient.java b/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/calculator-contribution/src/main/java/calculator/CalculatorClient.java deleted file mode 100644 index 1df1f31c48..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/calculator-contribution/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));
- }
-
-}
diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/calculator-contribution/src/main/java/calculator/CalculatorService.java b/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/calculator-contribution/src/main/java/calculator/CalculatorService.java deleted file mode 100644 index 78eea39c71..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/calculator-contribution/src/main/java/calculator/CalculatorService.java +++ /dev/null @@ -1,37 +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/trunk/samples/learning-more/binding-jsonrpc/calculator-contribution/src/main/java/calculator/CalculatorServiceImpl.java b/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/calculator-contribution/src/main/java/calculator/CalculatorServiceImpl.java deleted file mode 100644 index d32cc73815..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/calculator-contribution/src/main/java/calculator/CalculatorServiceImpl.java +++ /dev/null @@ -1,86 +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.Reference;
-import org.oasisopen.sca.annotation.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) {
- AddBean aBean = new AddBean();
- // So data to test different types
- aBean.setB(true);
- aBean.setS("Fred");
- aBean.setX(27);
- aBean.setY(58);
-
- // the numbers to be added
- aBean.setN1(n1);
- aBean.setN2(n2);
-
- aBean = addService.addComplexParam(aBean);
-
- return aBean.getN3();
- //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);
- }
-
-}
diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/calculator-contribution/src/main/java/calculator/DivideService.java b/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/calculator-contribution/src/main/java/calculator/DivideService.java deleted file mode 100644 index ef6a8b375b..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/calculator-contribution/src/main/java/calculator/DivideService.java +++ /dev/null @@ -1,28 +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;
-
-/**
- * The divide service interface
- */
-public interface DivideService {
-
- double divide(double n1, double n2);
-
-}
diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/calculator-contribution/src/main/java/calculator/DivideServiceImpl.java b/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/calculator-contribution/src/main/java/calculator/DivideServiceImpl.java deleted file mode 100644 index ddd7b9cc6e..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/calculator-contribution/src/main/java/calculator/DivideServiceImpl.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 java.util.logging.Level;
-import java.util.logging.Logger;
-
-import org.oasisopen.sca.annotation.Service;
-
-/**
- * An implementation of the Divide service.
- */
-@Service(DivideService.class)
-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;
- }
-
-}
diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/calculator-contribution/src/main/java/calculator/MultiplyService.java b/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/calculator-contribution/src/main/java/calculator/MultiplyService.java deleted file mode 100644 index db568cc762..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/calculator-contribution/src/main/java/calculator/MultiplyService.java +++ /dev/null @@ -1,28 +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;
-
-/**
- * The interface for the multiply service
- */
-public interface MultiplyService {
-
- double multiply(double n1, double n2);
-
-}
diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/calculator-contribution/src/main/java/calculator/MultiplyServiceImpl.java b/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/calculator-contribution/src/main/java/calculator/MultiplyServiceImpl.java deleted file mode 100644 index cc0de498d3..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/calculator-contribution/src/main/java/calculator/MultiplyServiceImpl.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 java.util.logging.Level;
-import java.util.logging.Logger;
-
-import org.oasisopen.sca.annotation.Service;
-
-/**
- * An implementation of the Multiply service.
- */
-@Service(MultiplyService.class)
-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;
- }
-
-}
diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/calculator-contribution/src/main/java/calculator/SubtractService.java b/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/calculator-contribution/src/main/java/calculator/SubtractService.java deleted file mode 100644 index 56ee372fc4..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/calculator-contribution/src/main/java/calculator/SubtractService.java +++ /dev/null @@ -1,28 +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;
-
-/**
- * The interface for the multiply service
- */
-public interface SubtractService {
-
- double subtract(double n1, double n2);
-
-}
diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/calculator-contribution/src/main/java/calculator/SubtractServiceImpl.java b/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/calculator-contribution/src/main/java/calculator/SubtractServiceImpl.java deleted file mode 100644 index 22e95f7f54..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/calculator-contribution/src/main/java/calculator/SubtractServiceImpl.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 java.util.logging.Level;
-import java.util.logging.Logger;
-
-import org.oasisopen.sca.annotation.Service;
-
-/**
- * An implementation of the subtract service.
- */
-@Service(SubtractService.class)
-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;
- }
-
-}
diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/calculator-contribution/src/main/resources/Calculator.composite b/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/calculator-contribution/src/main/resources/Calculator.composite deleted file mode 100644 index 5f1add2431..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/calculator-contribution/src/main/resources/Calculator.composite +++ /dev/null @@ -1,53 +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://docs.oasis-open.org/ns/opencsa/sca/200912"
- targetNamespace="http://sample"
- xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.1"
- xmlns:sample="http://sample"
- name="Calculator">
-
- <component name="CalculatorServiceComponent">
- <implementation.java class="calculator.CalculatorServiceImpl"/>
- <reference name="addService" target="AddServiceComponent"/>
- <reference name="subtractService" target="SubtractServiceComponent" />
- <reference name="multiplyService" target="MultiplyServiceComponent" />
- <reference name="divideService" target="DivideServiceComponent" />
- </component>
-
- <component name="AddServiceComponent">
- <implementation.java class="calculator.AddServiceImpl"/>
- <service name="AddService">
- <tuscany:binding.jsonrpc uri="http://localhost:8085/AddServiceComponent/AddService"/>
- </service>
- </component>
-
- <component name="SubtractServiceComponent">
- <implementation.java class="calculator.SubtractServiceImpl"/>
- </component>
-
- <component name="MultiplyServiceComponent">
- <implementation.java class="calculator.MultiplyServiceImpl"/>
- </component>
-
- <component name="DivideServiceComponent">
- <implementation.java class="calculator.DivideServiceImpl"/>
- </component>
-
-</composite>
diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/calculator-contribution/src/main/resources/CalculatorClient.composite b/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/calculator-contribution/src/main/resources/CalculatorClient.composite deleted file mode 100644 index dfd32761be..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/calculator-contribution/src/main/resources/CalculatorClient.composite +++ /dev/null @@ -1,30 +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://docs.oasis-open.org/ns/opencsa/sca/200912"
- targetNamespace="http://sample"
- xmlns:sample="http://sample"
- name="CalculatorClient">
-
- <component name="CalculatorClient">
- <implementation.java class="calculator.CalculatorClient"/>
- <reference name="calculatorService" target="CalculatorServiceComponent" />
- </component>
-
-</composite>
diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/calculator-contribution/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/calculator-contribution/src/main/resources/META-INF/sca-contribution.xml deleted file mode 100644 index 70aab0e051..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/calculator-contribution/src/main/resources/META-INF/sca-contribution.xml +++ /dev/null @@ -1,24 +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.
--->
-<contribution xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
- xmlns:sample="http://sample">
- <deployable composite="sample:Calculator"/>
- <deployable composite="sample:CalculatorClient"/>
-</contribution>
\ No newline at end of file diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/calculator-contribution/src/test/java/calculator/CalculatorTestCase.java b/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/calculator-contribution/src/test/java/calculator/CalculatorTestCase.java deleted file mode 100644 index 1952eb4a6e..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/calculator-contribution/src/test/java/calculator/CalculatorTestCase.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 calculator;
-
-import static org.junit.Assert.assertEquals;
-
-import org.junit.Test;
-
-/**
- * A unit test of the basic Java implementation classes in this contribution
- * without using SCA
- */
-public class CalculatorTestCase {
-
- @Test
- public void testCalculator() throws Exception {
- AddService add = new AddServiceImpl();
- SubtractService subtract = new SubtractServiceImpl();
- MultiplyService multiply = new MultiplyServiceImpl();
- DivideService divide = new DivideServiceImpl();
-
- CalculatorServiceImpl calculator = new CalculatorServiceImpl();
-
- calculator.setAddService(add);
- calculator.setSubtractService(subtract);
- calculator.setMultiplyService(multiply);
- calculator.setDivideService(divide);
-
- assertEquals(calculator.add(3, 2), 5.0, 0);
- assertEquals(calculator.subtract(3, 2), 1.0, 0);
- assertEquals(calculator.multiply(3, 2), 6.0, 0);
- assertEquals(calculator.divide(3, 2), 1.5, 0);
- }
-}
diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/calculator-webapp/README b/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/calculator-webapp/README deleted file mode 100644 index fe9aac7f3c..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/calculator-webapp/README +++ /dev/null @@ -1,8 +0,0 @@ -Calculator Sample Contribution
-==============================
-
-This sample contribution implements a simple calculator using SCA components.
-
-See http://tuscany.apache.org/documentation-2x/20-beta-samples-documentation.html
-for more information
-
diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/calculator-webapp/pom.xml b/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/calculator-webapp/pom.xml deleted file mode 100644 index 92a4e61f63..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/calculator-webapp/pom.xml +++ /dev/null @@ -1,75 +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-samples</artifactId>
- <version>2.0-SNAPSHOT</version>
- <relativePath>../../../pom.xml</relativePath>
- </parent>
- <artifactId>sample-binding-jsonrpc-calculator-webapp</artifactId>
- <name>Apache Tuscany SCA Sample binding.jsonrpc Calculator WebApp</name>
- <packaging>war</packaging>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-base-runtime</artifactId>
- <version>2.0-SNAPSHOT</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-binding-jsonrpc-runtime</artifactId>
- <version>2.0-SNAPSHOT</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-web-javascript-dojo</artifactId>
- <version>2.0-SNAPSHOT</version>
- </dependency>
-
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.8.1</version>
- <scope>test</scope>
- </dependency>
-
- </dependencies>
-
- <build>
- <finalName>${project.artifactId}</finalName>
- <plugins>
- <plugin>
- <groupId>org.apache.tuscany.maven.plugins</groupId>
- <artifactId>maven-tuscany-plugin</artifactId>
- <version>2.0-SNAPSHOT</version>
- </plugin>
- <plugin>
- <groupId>org.mortbay.jetty</groupId>
- <artifactId>maven-jetty-plugin</artifactId>
- <version>6.1.18</version>
- </plugin>
- </plugins>
- </build>
-</project>
diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/calculator-webapp/src/main/java/calculator/AddBean.java b/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/calculator-webapp/src/main/java/calculator/AddBean.java deleted file mode 100644 index 71724ee7ae..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/calculator-webapp/src/main/java/calculator/AddBean.java +++ /dev/null @@ -1,90 +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;
-
-public class AddBean {
- private static final String DEFAULT_S = "default string";
- private static final Boolean DEFAULT_B = false;
-
- protected double n1;
- protected double n2;
- protected double n3;
-
- protected Boolean b;
- protected String s;
- protected int x;
- protected Integer y;
-
- public double getN1() {
- return n1;
- }
-
- public void setN1(double n1) {
- this.n1 = n1;
- }
-
- public double getN2() {
- return n2;
- }
-
- public void setN2(double n2) {
- this.n2 = n2;
- }
-
- public double getN3() {
- return n3;
- }
-
- public void setN3(double n3) {
- this.n3 = n3;
- }
-
- public Boolean getB() {
- return b;
- }
-
- public void setB(Boolean b) {
- this.b = b;
- }
-
- public String getS() {
- return s;
- }
-
- public void setS(String s) {
- this.s = s;
- }
-
- public int getX() {
- return x;
- }
-
- public void setX(int x) {
- this.x = x;
- }
-
- public Integer getY() {
- return y;
- }
-
- public void setY(Integer y) {
- this.y = y;
- }
-}
diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/calculator-webapp/src/main/java/calculator/AddService.java b/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/calculator-webapp/src/main/java/calculator/AddService.java deleted file mode 100644 index 03e844d09c..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/calculator-webapp/src/main/java/calculator/AddService.java +++ /dev/null @@ -1,32 +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 Add service interface
- */
-@Remotable
-public interface AddService {
-
- double add(double n1, double n2);
- AddBean addComplexParam(AddBean aBean);
-
-}
diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/calculator-webapp/src/main/java/calculator/AddServiceImpl.java b/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/calculator-webapp/src/main/java/calculator/AddServiceImpl.java deleted file mode 100644 index e16b352021..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/calculator-webapp/src/main/java/calculator/AddServiceImpl.java +++ /dev/null @@ -1,44 +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 java.util.logging.Level;
-import java.util.logging.Logger;
-
-import org.oasisopen.sca.annotation.Service;
-
-/**
- * An implementation of the Add service
- */
-@Service(AddService.class)
-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;
- }
-
- public AddBean addComplexParam(AddBean aBean) {
- aBean.setN3(aBean.getN1() + aBean.getN2());
- System.out.println("Adding " + aBean.getN1() + " to " + aBean.getN1() + " gives " + aBean.getN3());
- return aBean;
- }
-
-}
diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/calculator-webapp/src/main/java/calculator/CalculatorService.java b/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/calculator-webapp/src/main/java/calculator/CalculatorService.java deleted file mode 100644 index 78eea39c71..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/calculator-webapp/src/main/java/calculator/CalculatorService.java +++ /dev/null @@ -1,37 +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/trunk/samples/learning-more/binding-jsonrpc/calculator-webapp/src/main/java/calculator/CalculatorServiceImpl.java b/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/calculator-webapp/src/main/java/calculator/CalculatorServiceImpl.java deleted file mode 100644 index d32cc73815..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/calculator-webapp/src/main/java/calculator/CalculatorServiceImpl.java +++ /dev/null @@ -1,86 +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.Reference;
-import org.oasisopen.sca.annotation.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) {
- AddBean aBean = new AddBean();
- // So data to test different types
- aBean.setB(true);
- aBean.setS("Fred");
- aBean.setX(27);
- aBean.setY(58);
-
- // the numbers to be added
- aBean.setN1(n1);
- aBean.setN2(n2);
-
- aBean = addService.addComplexParam(aBean);
-
- return aBean.getN3();
- //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);
- }
-
-}
diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/calculator-webapp/src/main/java/calculator/DivideService.java b/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/calculator-webapp/src/main/java/calculator/DivideService.java deleted file mode 100644 index ef6a8b375b..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/calculator-webapp/src/main/java/calculator/DivideService.java +++ /dev/null @@ -1,28 +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;
-
-/**
- * The divide service interface
- */
-public interface DivideService {
-
- double divide(double n1, double n2);
-
-}
diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/calculator-webapp/src/main/java/calculator/DivideServiceImpl.java b/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/calculator-webapp/src/main/java/calculator/DivideServiceImpl.java deleted file mode 100644 index ddd7b9cc6e..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/calculator-webapp/src/main/java/calculator/DivideServiceImpl.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 java.util.logging.Level;
-import java.util.logging.Logger;
-
-import org.oasisopen.sca.annotation.Service;
-
-/**
- * An implementation of the Divide service.
- */
-@Service(DivideService.class)
-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;
- }
-
-}
diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/calculator-webapp/src/main/java/calculator/MultiplyService.java b/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/calculator-webapp/src/main/java/calculator/MultiplyService.java deleted file mode 100644 index db568cc762..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/calculator-webapp/src/main/java/calculator/MultiplyService.java +++ /dev/null @@ -1,28 +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;
-
-/**
- * The interface for the multiply service
- */
-public interface MultiplyService {
-
- double multiply(double n1, double n2);
-
-}
diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/calculator-webapp/src/main/java/calculator/MultiplyServiceImpl.java b/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/calculator-webapp/src/main/java/calculator/MultiplyServiceImpl.java deleted file mode 100644 index cc0de498d3..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/calculator-webapp/src/main/java/calculator/MultiplyServiceImpl.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 java.util.logging.Level;
-import java.util.logging.Logger;
-
-import org.oasisopen.sca.annotation.Service;
-
-/**
- * An implementation of the Multiply service.
- */
-@Service(MultiplyService.class)
-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;
- }
-
-}
diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/calculator-webapp/src/main/java/calculator/SubtractService.java b/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/calculator-webapp/src/main/java/calculator/SubtractService.java deleted file mode 100644 index 56ee372fc4..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/calculator-webapp/src/main/java/calculator/SubtractService.java +++ /dev/null @@ -1,28 +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;
-
-/**
- * The interface for the multiply service
- */
-public interface SubtractService {
-
- double subtract(double n1, double n2);
-
-}
diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/calculator-webapp/src/main/java/calculator/SubtractServiceImpl.java b/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/calculator-webapp/src/main/java/calculator/SubtractServiceImpl.java deleted file mode 100644 index 22e95f7f54..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/calculator-webapp/src/main/java/calculator/SubtractServiceImpl.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 java.util.logging.Level;
-import java.util.logging.Logger;
-
-import org.oasisopen.sca.annotation.Service;
-
-/**
- * An implementation of the subtract service.
- */
-@Service(SubtractService.class)
-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;
- }
-
-}
diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/calculator-webapp/src/main/webapp/WEB-INF/web.composite b/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/calculator-webapp/src/main/webapp/WEB-INF/web.composite deleted file mode 100644 index dc0df8756c..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/calculator-webapp/src/main/webapp/WEB-INF/web.composite +++ /dev/null @@ -1,53 +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://docs.oasis-open.org/ns/opencsa/sca/200912"
- targetNamespace="http://sample"
- xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.1"
- xmlns:sample="http://sample"
- name="Calculator">
-
- <component name="CalculatorServiceComponent">
- <implementation.java class="calculator.CalculatorServiceImpl"/>
- <reference name="addService" target="AddServiceComponent"/>
- <reference name="subtractService" target="SubtractServiceComponent" />
- <reference name="multiplyService" target="MultiplyServiceComponent" />
- <reference name="divideService" target="DivideServiceComponent" />
- </component>
-
- <component name="AddServiceComponent">
- <implementation.java class="calculator.AddServiceImpl"/>
- <service name="AddService">
- <tuscany:binding.jsonrpc />
- </service>
- </component>
-
- <component name="SubtractServiceComponent">
- <implementation.java class="calculator.SubtractServiceImpl"/>
- </component>
-
- <component name="MultiplyServiceComponent">
- <implementation.java class="calculator.MultiplyServiceImpl"/>
- </component>
-
- <component name="DivideServiceComponent">
- <implementation.java class="calculator.DivideServiceImpl"/>
- </component>
-
-</composite>
diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/calculator-webapp/src/main/webapp/WEB-INF/web.xml b/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/calculator-webapp/src/main/webapp/WEB-INF/web.xml deleted file mode 100644 index b7e216baf7..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/calculator-webapp/src/main/webapp/WEB-INF/web.xml +++ /dev/null @@ -1,41 +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.
--->
-<web-app version="2.4"
- xmlns="http://java.sun.com/xml/ns/j2ee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd" >
-
- <display-name>Apache Tuscany Contribution binding-jsonrpc Calculator WebApp Sample</display-name>
-
- <filter>
- <filter-name>tuscany</filter-name>
- <filter-class>org.apache.tuscany.sca.host.webapp.TuscanyServletFilter</filter-class>
- </filter>
-
- <filter-mapping>
- <filter-name>tuscany</filter-name>
- <url-pattern>/*</url-pattern>
- </filter-mapping>
-
- <welcome-file-list id="WelcomeFileList">
- <welcome-file>calculate.html</welcome-file>
- </welcome-file-list>
-
-</web-app>
diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/calculator-webapp/src/main/webapp/calculate.html b/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/calculator-webapp/src/main/webapp/calculate.html deleted file mode 100644 index 6d22806e8f..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/calculator-webapp/src/main/webapp/calculate.html +++ /dev/null @@ -1,62 +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.
--->
-<html>
-
-<head>
- <title>Apache Tuscany binding-jsonrpc Calculator WebApp with DOJO Sample</title>
-
- <script type="text/javascript" src="dojo/dojo/dojo.js"></script>
-
- <script language="JavaScript">
- dojo.require("dojo.rpc.JsonService");
-
- var addService = new dojo.rpc.JsonService("AddServiceComponent/AddService?smd");
-
- function calculate() {
- var addRequest = new Object();
- addRequest.n1 = 1;
- addRequest.n2 = 1;
- addRequest.n3 = 0;
- addRequest.b = true;
- addRequest.s = "fred";
- addRequest.x = 2;
- addRequest.y = 3;
-
- addService.addComplexParam(addRequest).addCallback(calculateResponse);
- }
-
- function calculateResponse(reply) {
- document.getElementById('result').innerHTML=reply.n3;
- }
-
- </script>
-
-</head>
-
-<body>
-
-<h2>Apache Tuscany binding-jsonrpc Calculator WebApp with DOJO Sample</h2>
-
- 1 + 1 =
- <button name="submit" onclick="calculate()">Calculate</button>
-
- <div id='result'/>
-
-</body>
-</html>
diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/calculator-webapp/src/test/java/calculator/CalculatorTestCase.java b/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/calculator-webapp/src/test/java/calculator/CalculatorTestCase.java deleted file mode 100644 index 1952eb4a6e..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/calculator-webapp/src/test/java/calculator/CalculatorTestCase.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 calculator;
-
-import static org.junit.Assert.assertEquals;
-
-import org.junit.Test;
-
-/**
- * A unit test of the basic Java implementation classes in this contribution
- * without using SCA
- */
-public class CalculatorTestCase {
-
- @Test
- public void testCalculator() throws Exception {
- AddService add = new AddServiceImpl();
- SubtractService subtract = new SubtractServiceImpl();
- MultiplyService multiply = new MultiplyServiceImpl();
- DivideService divide = new DivideServiceImpl();
-
- CalculatorServiceImpl calculator = new CalculatorServiceImpl();
-
- calculator.setAddService(add);
- calculator.setSubtractService(subtract);
- calculator.setMultiplyService(multiply);
- calculator.setDivideService(divide);
-
- assertEquals(calculator.add(3, 2), 5.0, 0);
- assertEquals(calculator.subtract(3, 2), 1.0, 0);
- assertEquals(calculator.multiply(3, 2), 6.0, 0);
- assertEquals(calculator.divide(3, 2), 1.5, 0);
- }
-}
diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/pom.xml b/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/pom.xml deleted file mode 100644 index 7426d1ee31..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/binding-jsonrpc/pom.xml +++ /dev/null @@ -1,44 +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-samples-learning-more</artifactId>
- <version>2.0-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
- </parent>
- <artifactId>tuscany-samples-binding-jsonrpc</artifactId>
- <packaging>pom</packaging>
- <name>Apache Tuscany SCA Sample binding.jsonrpc</name>
-
- <profiles>
- <profile>
- <id>default</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
- <modules>
- <module>calculator-contribution</module> - <module>calculator-webapp</module>
- </modules>
- </profile>
- </profiles>
-</project>
diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-rmi/README b/sca-java-2.x/trunk/samples/learning-more/binding-rmi/README deleted file mode 100644 index 18ba62d494..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/binding-rmi/README +++ /dev/null @@ -1 +0,0 @@ -Please look at the README files in the subdirectories of this directory for descriptions of the sample contributions.
diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-rmi/calculator-reference-contribution/README b/sca-java-2.x/trunk/samples/learning-more/binding-rmi/calculator-reference-contribution/README deleted file mode 100644 index f647ef1c50..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/binding-rmi/calculator-reference-contribution/README +++ /dev/null @@ -1,11 +0,0 @@ -Calculator RMI Reference Sample Contribution -============================================ - -This sample illustrates the use of Tuscany RMI Binding to call reference -services that are hosted as Java RMI services. - -See http://tuscany.apache.org/documentation-2x/20-beta-samples-documentation.html -for more information - - - diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-rmi/calculator-reference-contribution/build.xml b/sca-java-2.x/trunk/samples/learning-more/binding-rmi/calculator-reference-contribution/build.xml deleted file mode 100644 index 06f6ba8730..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/binding-rmi/calculator-reference-contribution/build.xml +++ /dev/null @@ -1,59 +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="sample-binding-rmi-calculator-reference-contribution" default="compile"> - - <property name="tuscany.home" value="../../../.."/> - <property name="jar.name" value="sample-binding-rmi-calculator-reference-contribution.jar" /> - - <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-sca-api-*.jar" /> - </fileset> - </classpath> - </javac> - <copy todir="target/classes"> - <fileset dir="src/main/resources"/> - </copy> - <jar destfile="target/${jar.name}" basedir="target/classes"> - <manifest> - <attribute name="Main-Class" value="${main.class}" /> - </manifest> - </jar> - </target> - -</project> - - diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-rmi/calculator-reference-contribution/pom.xml b/sca-java-2.x/trunk/samples/learning-more/binding-rmi/calculator-reference-contribution/pom.xml deleted file mode 100644 index 87ac79b0d0..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/binding-rmi/calculator-reference-contribution/pom.xml +++ /dev/null @@ -1,74 +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-samples</artifactId> - <version>2.0-SNAPSHOT</version> - <relativePath>../../../pom.xml</relativePath> - </parent> - <artifactId>sample-binding-rmi-calculator-reference-contribution</artifactId> - <name>Apache Tuscany SCA Sample binding.rmi Calculator Reference Contribution</name> - - <dependencies> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-node-api</artifactId> - <version>2.0-SNAPSHOT</version> - </dependency> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-node-impl</artifactId> - <version>2.0-SNAPSHOT</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-implementation-java-runtime</artifactId> - <version>2.0-SNAPSHOT</version> - <scope>runtime</scope> - </dependency> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-binding-rmi-runtime</artifactId> - <version>2.0-SNAPSHOT</version> - <scope>runtime</scope> - </dependency> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>4.8.1</version> - <scope>test</scope> - </dependency> - </dependencies> - - <build> - <finalName>${project.artifactId}</finalName> - <plugins> - <plugin> - <groupId>org.apache.tuscany.maven.plugins</groupId> - <artifactId>maven-tuscany-plugin</artifactId> - <version>2.0-SNAPSHOT</version> - </plugin> - </plugins> - </build> - -</project> diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-rmi/calculator-reference-contribution/src/main/java/calculator/AddService.java b/sca-java-2.x/trunk/samples/learning-more/binding-rmi/calculator-reference-contribution/src/main/java/calculator/AddService.java deleted file mode 100644 index a235e648c7..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/binding-rmi/calculator-reference-contribution/src/main/java/calculator/AddService.java +++ /dev/null @@ -1,28 +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; - -/** - * The interface for the add service - */ -public interface AddService { - - double add(double n1, double n2); - -} diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-rmi/calculator-reference-contribution/src/main/java/calculator/CalculatorService.java b/sca-java-2.x/trunk/samples/learning-more/binding-rmi/calculator-reference-contribution/src/main/java/calculator/CalculatorService.java deleted file mode 100644 index 0f7dec116f..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/binding-rmi/calculator-reference-contribution/src/main/java/calculator/CalculatorService.java +++ /dev/null @@ -1,39 +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 java.rmi.Remote; -import java.rmi.RemoteException; - -import org.oasisopen.sca.annotation.Remotable; - -/** - * The Calculator service interface. - */ -@Remotable -public interface CalculatorService extends Remote { - - double add(double n1, double n2) throws RemoteException; - - double subtract(double n1, double n2) throws RemoteException; - - double multiply(double n1, double n2) throws RemoteException; - - double divide(double n1, double n2) throws RemoteException; -} diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-rmi/calculator-reference-contribution/src/main/java/calculator/CalculatorServiceImpl.java b/sca-java-2.x/trunk/samples/learning-more/binding-rmi/calculator-reference-contribution/src/main/java/calculator/CalculatorServiceImpl.java deleted file mode 100644 index bcfd8871b6..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/binding-rmi/calculator-reference-contribution/src/main/java/calculator/CalculatorServiceImpl.java +++ /dev/null @@ -1,68 +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.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); - } -} diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-rmi/calculator-reference-contribution/src/main/java/calculator/DivideService.java b/sca-java-2.x/trunk/samples/learning-more/binding-rmi/calculator-reference-contribution/src/main/java/calculator/DivideService.java deleted file mode 100644 index 497dafd4fd..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/binding-rmi/calculator-reference-contribution/src/main/java/calculator/DivideService.java +++ /dev/null @@ -1,28 +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; - -/** - * The interface for the divide service - */ -public interface DivideService { - - double divide(double n1, double n2); - -} diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-rmi/calculator-reference-contribution/src/main/java/calculator/MultiplyService.java b/sca-java-2.x/trunk/samples/learning-more/binding-rmi/calculator-reference-contribution/src/main/java/calculator/MultiplyService.java deleted file mode 100644 index 5290605938..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/binding-rmi/calculator-reference-contribution/src/main/java/calculator/MultiplyService.java +++ /dev/null @@ -1,28 +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; - -/** - * The interface for the multiply service - */ -public interface MultiplyService { - - double multiply(double n1, double n2); - -} diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-rmi/calculator-reference-contribution/src/main/java/calculator/SubtractService.java b/sca-java-2.x/trunk/samples/learning-more/binding-rmi/calculator-reference-contribution/src/main/java/calculator/SubtractService.java deleted file mode 100644 index 376b3e5bb9..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/binding-rmi/calculator-reference-contribution/src/main/java/calculator/SubtractService.java +++ /dev/null @@ -1,28 +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; - -/** - * The interface for the subtract service - */ -public interface SubtractService { - - double subtract(double n1, double n2); - -} diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-rmi/calculator-reference-contribution/src/main/resources/CalculatorRMIReference.composite b/sca-java-2.x/trunk/samples/learning-more/binding-rmi/calculator-reference-contribution/src/main/resources/CalculatorRMIReference.composite deleted file mode 100644 index 7455dc7d38..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/binding-rmi/calculator-reference-contribution/src/main/resources/CalculatorRMIReference.composite +++ /dev/null @@ -1,42 +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://docs.oasis-open.org/ns/opencsa/sca/200912"
- xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.1"
- targetNamespace="http://sample"
- xmlns:sample="http://sample"
- name="Calculator">
-
- <component name="CalculatorServiceComponent">
- <implementation.java class="calculator.CalculatorServiceImpl"/>
- <reference name="addService"> - <tuscany:binding.rmi uri="rmi://localhost:8099/CalculatorRMIService"/> - </reference>
- <reference name="subtractService"> - <tuscany:binding.rmi uri="rmi://localhost:8099/CalculatorRMIService"/> - </reference>
- <reference name="multiplyService"> - <tuscany:binding.rmi uri="rmi://localhost:8099/CalculatorRMIService"/> - </reference>
- <reference name="divideService"> - <tuscany:binding.rmi uri="rmi://localhost:8099/CalculatorRMIService"/> - </reference>
- </component>
-
-</composite>
diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-rmi/calculator-reference-contribution/src/test/java/calculator/CalculatorRMIReferenceTestCase.java b/sca-java-2.x/trunk/samples/learning-more/binding-rmi/calculator-reference-contribution/src/test/java/calculator/CalculatorRMIReferenceTestCase.java deleted file mode 100644 index 39d4b2fd28..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/binding-rmi/calculator-reference-contribution/src/test/java/calculator/CalculatorRMIReferenceTestCase.java +++ /dev/null @@ -1,70 +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 static org.junit.Assert.assertEquals; - -import java.rmi.registry.LocateRegistry; -import java.rmi.registry.Registry; - -import org.apache.tuscany.sca.node.Contribution; -import org.apache.tuscany.sca.node.ContributionLocationHelper; -import org.apache.tuscany.sca.node.Node; -import org.apache.tuscany.sca.node.NodeFactory; -import org.junit.AfterClass; -import org.junit.BeforeClass; -import org.junit.Test; - - -/** - * This shows how to test the Calculator service component. - */ -public class CalculatorRMIReferenceTestCase { - - private static Node node; - private static CalculatorService calculatorService; - - @BeforeClass - public static void setUp() throws Exception { - CalculatorRMIServiceImpl rmiCalculatorImpl = new CalculatorRMIServiceImpl(); - Registry rmiRegistry = LocateRegistry.createRegistry(8099); - rmiRegistry.bind("CalculatorRMIService", rmiCalculatorImpl); - - String uri = ContributionLocationHelper.getContributionLocation(CalculatorService.class); - Contribution contribution = new Contribution("c1", uri); - node = NodeFactory.newInstance().createNode("CalculatorRMIReference.composite", contribution); - node.start(); - calculatorService = node.getService(CalculatorService.class, "CalculatorServiceComponent"); - } - - @AfterClass - public static void tearDown() throws Exception { - node.stop(); - LocateRegistry.getRegistry(8099).unbind("CalculatorRMIService"); - } - - @Test - public void testCalculator() throws Exception { - // Calculate - assertEquals(calculatorService.add(3, 2), 5.0, 0.0); - assertEquals(calculatorService.subtract(3, 2), 1.0, 0.0); - assertEquals(calculatorService.multiply(3, 2), 6.0, 0.0); - assertEquals(calculatorService.divide(3, 2), 1.5, 0.0); - } -} diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-rmi/calculator-reference-contribution/src/test/java/calculator/CalculatorRMIServiceImpl.java b/sca-java-2.x/trunk/samples/learning-more/binding-rmi/calculator-reference-contribution/src/test/java/calculator/CalculatorRMIServiceImpl.java deleted file mode 100644 index d8ded42cb2..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/binding-rmi/calculator-reference-contribution/src/test/java/calculator/CalculatorRMIServiceImpl.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 java.rmi.RemoteException; -import java.rmi.server.UnicastRemoteObject; - - - -/** - * An implementation of the Calculator service. - */ -public class CalculatorRMIServiceImpl extends UnicastRemoteObject implements CalculatorService { - - private static final long serialVersionUID = -1543948944662001428L; - - public CalculatorRMIServiceImpl() throws RemoteException { - super(); - } - - public double add(double n1, double n2) throws RemoteException { - return n1 + n2; - } - - public double subtract(double n1, double n2) { - return n1 - n2; - } - - public double multiply(double n1, double n2) { - return n1 * n2; - } - - public double divide(double n1, double n2) { - return n1 / n2; - } -} diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-rmi/calculator-service-contribution/README b/sca-java-2.x/trunk/samples/learning-more/binding-rmi/calculator-service-contribution/README deleted file mode 100644 index cb25027f14..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/binding-rmi/calculator-service-contribution/README +++ /dev/null @@ -1,28 +0,0 @@ -Calculator RMI Service Sample Contribution -========================================== - -This sample illustrates the use of Tuscany RMI Binding to expose component -services as Java RMI Services. It also demonstrates how a simple Java RMI -Client application invokes the SCA Application's services exposed as RMI -Services. - -The README in the <distribution-unpack-dir>/samples directory provides -general instructions about building and running samples. ( where -distribution-unpack-dir is the directory in which you unpacked the tuscany -binary distribution archive) Take a look there for instructions on how to launch -this sample contribution. - - -Sample Overview ---------------- -This sample extends the calculator sample by replacing the local service -binding with an RMI binding. SO a java client can call the service exposed -by the SCA application using an RMI client. - -Amongst the other output created by the launcher/contribution combination, you should see the following output ... - - - [java] 3 + 2=5.0 - [java] 3 - 2=1.0 - [java] 3 * 2=6.0 - [java] 3 / 2=1.5 diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-rmi/calculator-service-contribution/build.xml b/sca-java-2.x/trunk/samples/learning-more/binding-rmi/calculator-service-contribution/build.xml deleted file mode 100644 index 79ec168c8a..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/binding-rmi/calculator-service-contribution/build.xml +++ /dev/null @@ -1,59 +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="sample-binding-rmi-calculator-service-contribution" default="compile"> - - <property name="tuscany.home" value="../../../.."/> - <property name="jar.name" value="sample-binding-rmi-calculator-service-contribution.jar" /> - - <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-sca-api-*.jar" /> - </fileset> - </classpath> - </javac> - <copy todir="target/classes"> - <fileset dir="src/main/resources"/> - </copy> - <jar destfile="target/${jar.name}" basedir="target/classes"> - <manifest> - <attribute name="Main-Class" value="${main.class}" /> - </manifest> - </jar> - </target> - -</project> - - diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-rmi/calculator-service-contribution/pom.xml b/sca-java-2.x/trunk/samples/learning-more/binding-rmi/calculator-service-contribution/pom.xml deleted file mode 100644 index cb92cfe8a1..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/binding-rmi/calculator-service-contribution/pom.xml +++ /dev/null @@ -1,74 +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-samples</artifactId> - <version>2.0-SNAPSHOT</version> - <relativePath>../../../pom.xml</relativePath> - </parent> - <artifactId>sample-binding-rmi-calculator-service-contribution</artifactId> - <name>Apache Tuscany SCA Sample binding.rmi Calculator Service Contribution</name> - - <dependencies> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-node-api</artifactId> - <version>2.0-SNAPSHOT</version> - </dependency> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-node-impl</artifactId> - <version>2.0-SNAPSHOT</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-implementation-java-runtime</artifactId> - <version>2.0-SNAPSHOT</version> - <scope>runtime</scope> - </dependency> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-binding-rmi-runtime</artifactId> - <version>2.0-SNAPSHOT</version> - <scope>runtime</scope> - </dependency> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>4.8.1</version> - <scope>test</scope> - </dependency> - </dependencies> - - <build> - <finalName>${project.artifactId}</finalName> - <plugins> - <plugin> - <groupId>org.apache.tuscany.maven.plugins</groupId> - <artifactId>maven-tuscany-plugin</artifactId> - <version>2.0-SNAPSHOT</version> - </plugin> - </plugins> - </build> - -</project> diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-rmi/calculator-service-contribution/src/main/java/calculator/AddService.java b/sca-java-2.x/trunk/samples/learning-more/binding-rmi/calculator-service-contribution/src/main/java/calculator/AddService.java deleted file mode 100644 index a235e648c7..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/binding-rmi/calculator-service-contribution/src/main/java/calculator/AddService.java +++ /dev/null @@ -1,28 +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; - -/** - * The interface for the add service - */ -public interface AddService { - - double add(double n1, double n2); - -} diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-rmi/calculator-service-contribution/src/main/java/calculator/AddServiceImpl.java b/sca-java-2.x/trunk/samples/learning-more/binding-rmi/calculator-service-contribution/src/main/java/calculator/AddServiceImpl.java deleted file mode 100644 index 8b6fe066a6..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/binding-rmi/calculator-service-contribution/src/main/java/calculator/AddServiceImpl.java +++ /dev/null @@ -1,30 +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; - -/** - * An implementation of the Add service - */ -public class AddServiceImpl implements AddService { - - public double add(double n1, double n2) { - return n1 + n2; - } - -} diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-rmi/calculator-service-contribution/src/main/java/calculator/CalculatorClient.java b/sca-java-2.x/trunk/samples/learning-more/binding-rmi/calculator-service-contribution/src/main/java/calculator/CalculatorClient.java deleted file mode 100644 index 2b99485b68..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/binding-rmi/calculator-service-contribution/src/main/java/calculator/CalculatorClient.java +++ /dev/null @@ -1,40 +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 java.rmi.Naming; - -/** - * This client program shows how to create an SCA runtime, start it, - * and locate and invoke a SCA component - */ -public class CalculatorClient { - public static void main(String[] args) throws Exception { - CalculatorService calculatorService = (CalculatorService)Naming.lookup("//localhost:8099/CalculatorRMIService"); - - // 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)); - - } - -} diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-rmi/calculator-service-contribution/src/main/java/calculator/CalculatorService.java b/sca-java-2.x/trunk/samples/learning-more/binding-rmi/calculator-service-contribution/src/main/java/calculator/CalculatorService.java deleted file mode 100644 index 3c0375924f..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/binding-rmi/calculator-service-contribution/src/main/java/calculator/CalculatorService.java +++ /dev/null @@ -1,36 +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/trunk/samples/learning-more/binding-rmi/calculator-service-contribution/src/main/java/calculator/CalculatorServiceImpl.java b/sca-java-2.x/trunk/samples/learning-more/binding-rmi/calculator-service-contribution/src/main/java/calculator/CalculatorServiceImpl.java deleted file mode 100644 index bcfd8871b6..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/binding-rmi/calculator-service-contribution/src/main/java/calculator/CalculatorServiceImpl.java +++ /dev/null @@ -1,68 +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.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); - } -} diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-rmi/calculator-service-contribution/src/main/java/calculator/DivideService.java b/sca-java-2.x/trunk/samples/learning-more/binding-rmi/calculator-service-contribution/src/main/java/calculator/DivideService.java deleted file mode 100644 index 497dafd4fd..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/binding-rmi/calculator-service-contribution/src/main/java/calculator/DivideService.java +++ /dev/null @@ -1,28 +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; - -/** - * The interface for the divide service - */ -public interface DivideService { - - double divide(double n1, double n2); - -} diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-rmi/calculator-service-contribution/src/main/java/calculator/DivideServiceImpl.java b/sca-java-2.x/trunk/samples/learning-more/binding-rmi/calculator-service-contribution/src/main/java/calculator/DivideServiceImpl.java deleted file mode 100644 index f7ac0b7287..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/binding-rmi/calculator-service-contribution/src/main/java/calculator/DivideServiceImpl.java +++ /dev/null @@ -1,30 +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; - -/** - * An implementation of the Divide service. - */ -public class DivideServiceImpl implements DivideService { - - public double divide(double n1, double n2) { - return n1 / n2; - } - -} diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-rmi/calculator-service-contribution/src/main/java/calculator/MultiplyService.java b/sca-java-2.x/trunk/samples/learning-more/binding-rmi/calculator-service-contribution/src/main/java/calculator/MultiplyService.java deleted file mode 100644 index 5290605938..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/binding-rmi/calculator-service-contribution/src/main/java/calculator/MultiplyService.java +++ /dev/null @@ -1,28 +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; - -/** - * The interface for the multiply service - */ -public interface MultiplyService { - - double multiply(double n1, double n2); - -} diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-rmi/calculator-service-contribution/src/main/java/calculator/MultiplyServiceImpl.java b/sca-java-2.x/trunk/samples/learning-more/binding-rmi/calculator-service-contribution/src/main/java/calculator/MultiplyServiceImpl.java deleted file mode 100644 index b7dca792b2..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/binding-rmi/calculator-service-contribution/src/main/java/calculator/MultiplyServiceImpl.java +++ /dev/null @@ -1,30 +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; - -/** - * An implementation of the Multiply service. - */ -public class MultiplyServiceImpl implements MultiplyService { - - public double multiply(double n1, double n2) { - return n1 * n2; - } - -} diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-rmi/calculator-service-contribution/src/main/java/calculator/SubtractService.java b/sca-java-2.x/trunk/samples/learning-more/binding-rmi/calculator-service-contribution/src/main/java/calculator/SubtractService.java deleted file mode 100644 index 376b3e5bb9..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/binding-rmi/calculator-service-contribution/src/main/java/calculator/SubtractService.java +++ /dev/null @@ -1,28 +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; - -/** - * The interface for the subtract service - */ -public interface SubtractService { - - double subtract(double n1, double n2); - -} diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-rmi/calculator-service-contribution/src/main/java/calculator/SubtractServiceImpl.java b/sca-java-2.x/trunk/samples/learning-more/binding-rmi/calculator-service-contribution/src/main/java/calculator/SubtractServiceImpl.java deleted file mode 100644 index 77b128ab8d..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/binding-rmi/calculator-service-contribution/src/main/java/calculator/SubtractServiceImpl.java +++ /dev/null @@ -1,30 +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; - -/** - * An implementation of the subtract service. - */ -public class SubtractServiceImpl implements SubtractService { - - public double subtract(double n1, double n2) { - return n1 - n2; - } - -} diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-rmi/calculator-service-contribution/src/main/resources/CalculatorRMIServer.composite b/sca-java-2.x/trunk/samples/learning-more/binding-rmi/calculator-service-contribution/src/main/resources/CalculatorRMIServer.composite deleted file mode 100644 index 8b37d407f0..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/binding-rmi/calculator-service-contribution/src/main/resources/CalculatorRMIServer.composite +++ /dev/null @@ -1,53 +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://docs.oasis-open.org/ns/opencsa/sca/200912"
- xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.1"
- targetNamespace="http://sample"
- xmlns:sample="http://sample"
- name="Calculator">
-
- <component name="CalculatorServiceComponent">
- <implementation.java class="calculator.CalculatorServiceImpl"/> - <service name="CalculatorService"> - <interface.java interface="calculator.CalculatorService"/> - <tuscany:binding.rmi uri="rmi://localhost:8099/CalculatorRMIService"/> - </service> - <reference name="addService" target="AddServiceComponent"></reference>
- <reference name="subtractService" target="SubtractServiceComponent"></reference>
- <reference name="multiplyService" target="MultiplyServiceComponent"></reference>
- <reference name="divideService" target="DivideServiceComponent"></reference>
- </component>
-
- <component name="AddServiceComponent">
- <implementation.java class="calculator.AddServiceImpl"/>
- </component>
-
- <component name="SubtractServiceComponent">
- <implementation.java class="calculator.SubtractServiceImpl"/>
- </component>
-
- <component name="MultiplyServiceComponent">
- <implementation.java class="calculator.MultiplyServiceImpl"/>
- </component>
-
- <component name="DivideServiceComponent">
- <implementation.java class="calculator.DivideServiceImpl"/>
- </component>
-</composite>
diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-rmi/calculator-service-contribution/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/samples/learning-more/binding-rmi/calculator-service-contribution/src/main/resources/META-INF/sca-contribution.xml deleted file mode 100644 index 8d6012e5c4..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/binding-rmi/calculator-service-contribution/src/main/resources/META-INF/sca-contribution.xml +++ /dev/null @@ -1,23 +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. ---> -<contribution xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" - xmlns:sample="http://sample"> - <deployable composite="sample:Calculator"/> -</contribution>
\ No newline at end of file diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-rmi/calculator-service-contribution/src/test/java/calculator/CalculatorRMIServerTestCase.java b/sca-java-2.x/trunk/samples/learning-more/binding-rmi/calculator-service-contribution/src/test/java/calculator/CalculatorRMIServerTestCase.java deleted file mode 100644 index 0e352db9bb..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/binding-rmi/calculator-service-contribution/src/test/java/calculator/CalculatorRMIServerTestCase.java +++ /dev/null @@ -1,63 +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 static org.junit.Assert.assertEquals; - -import java.rmi.Naming; - -import org.apache.tuscany.sca.node.Contribution; -import org.apache.tuscany.sca.node.ContributionLocationHelper; -import org.apache.tuscany.sca.node.Node; -import org.apache.tuscany.sca.node.NodeFactory; -import org.junit.AfterClass; -import org.junit.BeforeClass; -import org.junit.Test; - -/** - * This shows how to test the Calculator service component. - */ -public class CalculatorRMIServerTestCase { - - private static Node node; - private static CalculatorService calculatorService; - - @BeforeClass - public static void setUp() throws Exception { - String uri = ContributionLocationHelper.getContributionLocation(CalculatorService.class); - Contribution contribution = new Contribution("c1", uri); - node = NodeFactory.newInstance().createNode("CalculatorRMIServer.composite", contribution); - node.start(); - } - - @AfterClass - public static void tearDown() throws Exception { - node.stop(); - } - - @Test - public void testCalculator() throws Exception { - // Calculate - calculatorService = (CalculatorService)Naming.lookup("//localhost:8099/CalculatorRMIService"); - assertEquals(calculatorService.add(3, 2), 5.0, 0.0); - assertEquals(calculatorService.subtract(3, 2), 1.0, 0.0); - assertEquals(calculatorService.multiply(3, 2), 6.0, 0.0); - assertEquals(calculatorService.divide(3, 2), 1.5, 0.0); - } -} diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-rmi/pom.xml b/sca-java-2.x/trunk/samples/learning-more/binding-rmi/pom.xml deleted file mode 100644 index 81a309ed9f..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/binding-rmi/pom.xml +++ /dev/null @@ -1,44 +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-samples-learning-more</artifactId>
- <version>2.0-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
- </parent>
- <artifactId>tuscany-sample-binding-rmi</artifactId>
- <packaging>pom</packaging>
- <name>Apache Tuscany SCA Sample binding.rmi</name>
-
- <profiles>
- <profile>
- <id>default</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
- <modules>
- <module>calculator-reference-contribution</module>
- <module>calculator-service-contribution</module>
- </modules>
- </profile>
- </profiles>
-</project>
diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-sca/README b/sca-java-2.x/trunk/samples/learning-more/binding-sca/README deleted file mode 100644 index 18ba62d494..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/binding-sca/README +++ /dev/null @@ -1 +0,0 @@ -Please look at the README files in the subdirectories of this directory for descriptions of the sample contributions.
diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-sca/calculator-contribution/README b/sca-java-2.x/trunk/samples/learning-more/binding-sca/calculator-contribution/README deleted file mode 100644 index 4102b81e28..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/binding-sca/calculator-contribution/README +++ /dev/null @@ -1,8 +0,0 @@ -Calculator Sample Contribution -============================== - -This sample contribution implements a simple calculator using SCA components. - -See http://tuscany.apache.org/documentation-2x/20-beta-samples-documentation.html -for more information - diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-sca/calculator-contribution/build.xml b/sca-java-2.x/trunk/samples/learning-more/binding-sca/calculator-contribution/build.xml deleted file mode 100644 index 8fef755c8b..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/binding-sca/calculator-contribution/build.xml +++ /dev/null @@ -1,57 +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="sample-binding-sca-calculator-contribution" default="compile"> - <property name="tuscany.home" value="../../../.."/> - <property name="jar.name" value="sample-binding-sca-calculator-contribution.jar" /> - - <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-sca-api-*.jar" /> - </fileset> - </classpath> - </javac> - <copy todir="target/classes"> - <fileset dir="src/main/resources"/> - </copy> - <jar destfile="target/${jar.name}" basedir="target/classes"> - <manifest> - <attribute name="Main-Class" value="${main.class}" /> - </manifest> - </jar> - </target> -</project> - - diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-sca/calculator-contribution/pom.xml b/sca-java-2.x/trunk/samples/learning-more/binding-sca/calculator-contribution/pom.xml deleted file mode 100644 index 134a9be456..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/binding-sca/calculator-contribution/pom.xml +++ /dev/null @@ -1,57 +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-samples</artifactId> - <version>2.0-SNAPSHOT</version> - <relativePath>../../../pom.xml</relativePath> - </parent> - <artifactId>sample-binding-sca-calculator-contribution</artifactId> - <name>Apache Tuscany SCA Sample binding.sca Calculator Contribution</name> - - <dependencies> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-sca-api</artifactId> - <version>2.0-SNAPSHOT</version> - </dependency> - - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>4.8.1</version> - <scope>test</scope> - </dependency> - - </dependencies> - - <build> - <finalName>${project.artifactId}</finalName> - <plugins> - <plugin> - <groupId>org.apache.tuscany.maven.plugins</groupId> - <artifactId>maven-tuscany-plugin</artifactId> - <version>2.0-SNAPSHOT</version> - </plugin> - </plugins> - </build> -</project> diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-sca/calculator-contribution/src/main/java/calculator/AddService.java b/sca-java-2.x/trunk/samples/learning-more/binding-sca/calculator-contribution/src/main/java/calculator/AddService.java deleted file mode 100644 index 188451ebac..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/binding-sca/calculator-contribution/src/main/java/calculator/AddService.java +++ /dev/null @@ -1,28 +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; - -/** - * The Add service interface - */ -public interface AddService { - - double add(double n1, double n2); - -} diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-sca/calculator-contribution/src/main/java/calculator/AddServiceImpl.java b/sca-java-2.x/trunk/samples/learning-more/binding-sca/calculator-contribution/src/main/java/calculator/AddServiceImpl.java deleted file mode 100644 index bb75bb2337..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/binding-sca/calculator-contribution/src/main/java/calculator/AddServiceImpl.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 java.util.logging.Level; -import java.util.logging.Logger; - -import org.oasisopen.sca.annotation.Service; - -/** - * An implementation of the Add service - */ -@Service(AddService.class) -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; - } - -} diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-sca/calculator-contribution/src/main/java/calculator/CalculatorClient.java b/sca-java-2.x/trunk/samples/learning-more/binding-sca/calculator-contribution/src/main/java/calculator/CalculatorClient.java deleted file mode 100644 index afd5ea48fc..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/binding-sca/calculator-contribution/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)); - } - -} diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-sca/calculator-contribution/src/main/java/calculator/CalculatorService.java b/sca-java-2.x/trunk/samples/learning-more/binding-sca/calculator-contribution/src/main/java/calculator/CalculatorService.java deleted file mode 100644 index ce1cdaae5a..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/binding-sca/calculator-contribution/src/main/java/calculator/CalculatorService.java +++ /dev/null @@ -1,37 +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/trunk/samples/learning-more/binding-sca/calculator-contribution/src/main/java/calculator/CalculatorServiceImpl.java b/sca-java-2.x/trunk/samples/learning-more/binding-sca/calculator-contribution/src/main/java/calculator/CalculatorServiceImpl.java deleted file mode 100644 index fc53393d23..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/binding-sca/calculator-contribution/src/main/java/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 calculator; - -import org.oasisopen.sca.annotation.Reference; -import org.oasisopen.sca.annotation.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) { - return multiplyService.multiply(n1, n2); - } - - public double divide(double n1, double n2) { - return divideService.divide(n1, n2); - } - -} diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-sca/calculator-contribution/src/main/java/calculator/DivideService.java b/sca-java-2.x/trunk/samples/learning-more/binding-sca/calculator-contribution/src/main/java/calculator/DivideService.java deleted file mode 100644 index 30d248208b..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/binding-sca/calculator-contribution/src/main/java/calculator/DivideService.java +++ /dev/null @@ -1,28 +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; - -/** - * The divide service interface - */ -public interface DivideService { - - double divide(double n1, double n2); - -} diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-sca/calculator-contribution/src/main/java/calculator/DivideServiceImpl.java b/sca-java-2.x/trunk/samples/learning-more/binding-sca/calculator-contribution/src/main/java/calculator/DivideServiceImpl.java deleted file mode 100644 index b1250ed9f2..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/binding-sca/calculator-contribution/src/main/java/calculator/DivideServiceImpl.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 java.util.logging.Level; -import java.util.logging.Logger; - -import org.oasisopen.sca.annotation.Service; - -/** - * An implementation of the Divide service. - */ -@Service(DivideService.class) -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; - } - -} diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-sca/calculator-contribution/src/main/java/calculator/MultiplyService.java b/sca-java-2.x/trunk/samples/learning-more/binding-sca/calculator-contribution/src/main/java/calculator/MultiplyService.java deleted file mode 100644 index 5290605938..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/binding-sca/calculator-contribution/src/main/java/calculator/MultiplyService.java +++ /dev/null @@ -1,28 +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; - -/** - * The interface for the multiply service - */ -public interface MultiplyService { - - double multiply(double n1, double n2); - -} diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-sca/calculator-contribution/src/main/java/calculator/MultiplyServiceImpl.java b/sca-java-2.x/trunk/samples/learning-more/binding-sca/calculator-contribution/src/main/java/calculator/MultiplyServiceImpl.java deleted file mode 100644 index 11f68c66e3..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/binding-sca/calculator-contribution/src/main/java/calculator/MultiplyServiceImpl.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 java.util.logging.Level; -import java.util.logging.Logger; - -import org.oasisopen.sca.annotation.Service; - -/** - * An implementation of the Multiply service. - */ -@Service(MultiplyService.class) -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; - } - -} diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-sca/calculator-contribution/src/main/java/calculator/SubtractService.java b/sca-java-2.x/trunk/samples/learning-more/binding-sca/calculator-contribution/src/main/java/calculator/SubtractService.java deleted file mode 100644 index bf0d1882b6..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/binding-sca/calculator-contribution/src/main/java/calculator/SubtractService.java +++ /dev/null @@ -1,28 +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; - -/** - * The interface for the multiply service - */ -public interface SubtractService { - - double subtract(double n1, double n2); - -} diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-sca/calculator-contribution/src/main/java/calculator/SubtractServiceImpl.java b/sca-java-2.x/trunk/samples/learning-more/binding-sca/calculator-contribution/src/main/java/calculator/SubtractServiceImpl.java deleted file mode 100644 index 30e59bf668..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/binding-sca/calculator-contribution/src/main/java/calculator/SubtractServiceImpl.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 java.util.logging.Level; -import java.util.logging.Logger; - -import org.oasisopen.sca.annotation.Service; - -/** - * An implementation of the subtract service. - */ -@Service(SubtractService.class) -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; - } - -} diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-sca/calculator-contribution/src/main/resources/Calculator.composite b/sca-java-2.x/trunk/samples/learning-more/binding-sca/calculator-contribution/src/main/resources/Calculator.composite deleted file mode 100644 index 05bea57944..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/binding-sca/calculator-contribution/src/main/resources/Calculator.composite +++ /dev/null @@ -1,49 +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://docs.oasis-open.org/ns/opencsa/sca/200912" - targetNamespace="http://sample" - xmlns:sample="http://sample" - name="Calculator"> - - <component name="CalculatorServiceComponent"> - <implementation.java class="calculator.CalculatorServiceImpl"/> - <reference name="addService" target="AddServiceComponent" /> - <reference name="subtractService" target="SubtractServiceComponent" /> - <reference name="multiplyService" target="MultiplyServiceComponent" /> - <reference name="divideService" target="DivideServiceComponent" /> - </component> - - <component name="AddServiceComponent"> - <implementation.java class="calculator.AddServiceImpl"/> - </component> - - <component name="SubtractServiceComponent"> - <implementation.java class="calculator.SubtractServiceImpl"/> - </component> - - <component name="MultiplyServiceComponent"> - <implementation.java class="calculator.MultiplyServiceImpl"/> - </component> - - <component name="DivideServiceComponent"> - <implementation.java class="calculator.DivideServiceImpl"/> - </component> - -</composite> diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-sca/calculator-contribution/src/main/resources/CalculatorClient.composite b/sca-java-2.x/trunk/samples/learning-more/binding-sca/calculator-contribution/src/main/resources/CalculatorClient.composite deleted file mode 100644 index dfd32761be..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/binding-sca/calculator-contribution/src/main/resources/CalculatorClient.composite +++ /dev/null @@ -1,30 +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://docs.oasis-open.org/ns/opencsa/sca/200912"
- targetNamespace="http://sample"
- xmlns:sample="http://sample"
- name="CalculatorClient">
-
- <component name="CalculatorClient">
- <implementation.java class="calculator.CalculatorClient"/>
- <reference name="calculatorService" target="CalculatorServiceComponent" />
- </component>
-
-</composite>
diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-sca/calculator-contribution/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/samples/learning-more/binding-sca/calculator-contribution/src/main/resources/META-INF/sca-contribution.xml deleted file mode 100644 index 3e64787ce4..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/binding-sca/calculator-contribution/src/main/resources/META-INF/sca-contribution.xml +++ /dev/null @@ -1,24 +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. ---> -<contribution xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" - xmlns:sample="http://sample"> - <deployable composite="sample:Calculator"/> - <deployable composite="sample:CalculatorClient"/> -</contribution>
\ No newline at end of file diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-sca/calculator-contribution/src/test/java/calculator/CalculatorTestCase.java b/sca-java-2.x/trunk/samples/learning-more/binding-sca/calculator-contribution/src/test/java/calculator/CalculatorTestCase.java deleted file mode 100644 index 9d3024f451..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/binding-sca/calculator-contribution/src/test/java/calculator/CalculatorTestCase.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 calculator; - -import static org.junit.Assert.assertEquals; - -import org.junit.Test; - -/** - * A unit test of the basic Java implementation classes in this contribution - * without using SCA - */ -public class CalculatorTestCase { - - @Test - public void testCalculator() throws Exception { - AddService add = new AddServiceImpl(); - SubtractService subtract = new SubtractServiceImpl(); - MultiplyService multiply = new MultiplyServiceImpl(); - DivideService divide = new DivideServiceImpl(); - - CalculatorServiceImpl calculator = new CalculatorServiceImpl(); - - calculator.setAddService(add); - calculator.setSubtractService(subtract); - calculator.setMultiplyService(multiply); - calculator.setDivideService(divide); - - assertEquals(calculator.add(3, 2), 5.0, 0); - assertEquals(calculator.subtract(3, 2), 1.0, 0); - assertEquals(calculator.multiply(3, 2), 6.0, 0); - assertEquals(calculator.divide(3, 2), 1.5, 0); - } -} diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-sca/pom.xml b/sca-java-2.x/trunk/samples/learning-more/binding-sca/pom.xml deleted file mode 100644 index 6b90dd713f..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/binding-sca/pom.xml +++ /dev/null @@ -1,43 +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-samples-learning-more</artifactId>
- <version>2.0-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
- </parent>
- <artifactId>tuscany-sample-binding-sca</artifactId>
- <packaging>pom</packaging>
- <name>Apache Tuscany SCA Sample binding.sca</name>
-
- <profiles>
- <profile>
- <id>default</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
- <modules>
- <module>calculator-contribution</module>
- </modules>
- </profile>
- </profiles>
-</project>
diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-ws/README b/sca-java-2.x/trunk/samples/learning-more/binding-ws/README deleted file mode 100644 index 18ba62d494..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/binding-ws/README +++ /dev/null @@ -1 +0,0 @@ -Please look at the README files in the subdirectories of this directory for descriptions of the sample contributions.
diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-ws/calculator-contribution/README b/sca-java-2.x/trunk/samples/learning-more/binding-ws/calculator-contribution/README deleted file mode 100644 index 73246be305..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/binding-ws/calculator-contribution/README +++ /dev/null @@ -1,9 +0,0 @@ -Calculator Contribution Sample
-==============================
-
-This directory contains code which implements a simple calculator SCA contribution.
-
-See http://tuscany.apache.org/documentation-2x/20-beta-samples-documentation.html
-for more information
-
-
diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-ws/calculator-contribution/build.xml b/sca-java-2.x/trunk/samples/learning-more/binding-ws/calculator-contribution/build.xml deleted file mode 100644 index ab27460ea9..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/binding-ws/calculator-contribution/build.xml +++ /dev/null @@ -1,55 +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="sample-binding-ws-calculator-contribution" default="compile">
- <property name="tuscany.home" value="../../../.."/>
- <property name="jar.name" value="sample-binding-ws-calculator-contribution.jar" />
-
- <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-sca-api-*.jar" />
- </fileset>
- </classpath>
- </javac>
- <copy todir="target/classes">
- <fileset dir="src/main/resources"/>
- </copy>
- <jar destfile="target/${jar.name}" basedir="target/classes">
- <manifest>
- <attribute name="Main-Class" value="${main.class}" />
- </manifest>
- </jar>
- </target>
-
-</project>
diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-ws/calculator-contribution/calculator.odg b/sca-java-2.x/trunk/samples/learning-more/binding-ws/calculator-contribution/calculator.odg Binary files differdeleted file mode 100644 index c2646f7d5e..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/binding-ws/calculator-contribution/calculator.odg +++ /dev/null diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-ws/calculator-contribution/calculator.png b/sca-java-2.x/trunk/samples/learning-more/binding-ws/calculator-contribution/calculator.png Binary files differdeleted file mode 100644 index 476306e5f0..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/binding-ws/calculator-contribution/calculator.png +++ /dev/null diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-ws/calculator-contribution/pom.xml b/sca-java-2.x/trunk/samples/learning-more/binding-ws/calculator-contribution/pom.xml deleted file mode 100644 index 4153f5f523..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/binding-ws/calculator-contribution/pom.xml +++ /dev/null @@ -1,53 +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-samples</artifactId>
- <version>2.0-SNAPSHOT</version>
- <relativePath>../../../pom.xml</relativePath>
- </parent>
- <artifactId>sample-binding-ws-calculator-contribution</artifactId>
- <name>Apache Tuscany SCA Sample binding.ws Calculator Contribution</name>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-sca-api</artifactId>
- <version>2.0-SNAPSHOT</version>
- </dependency>
-
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.8.1</version>
- <scope>test</scope>
- </dependency>
-
- </dependencies>
-
- <build>
- <finalName>${project.artifactId}</finalName>
-
- <plugins>
- </plugins>
- </build>
-</project>
diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-ws/calculator-contribution/src/main/java/calculator/AddService.java b/sca-java-2.x/trunk/samples/learning-more/binding-ws/calculator-contribution/src/main/java/calculator/AddService.java deleted file mode 100644 index 138213b5fc..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/binding-ws/calculator-contribution/src/main/java/calculator/AddService.java +++ /dev/null @@ -1,31 +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 Add service interface
- */
-@Remotable
-public interface AddService {
-
- double add(double n1, double n2);
-
-}
diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-ws/calculator-contribution/src/main/java/calculator/AddServiceImpl.java b/sca-java-2.x/trunk/samples/learning-more/binding-ws/calculator-contribution/src/main/java/calculator/AddServiceImpl.java deleted file mode 100644 index caf4d358df..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/binding-ws/calculator-contribution/src/main/java/calculator/AddServiceImpl.java +++ /dev/null @@ -1,35 +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 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;
- }
-
-}
diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-ws/calculator-contribution/src/main/java/calculator/CalculatorService.java b/sca-java-2.x/trunk/samples/learning-more/binding-ws/calculator-contribution/src/main/java/calculator/CalculatorService.java deleted file mode 100644 index ad87375529..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/binding-ws/calculator-contribution/src/main/java/calculator/CalculatorService.java +++ /dev/null @@ -1,35 +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;
-
-
-/**
- * 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/sca-java-2.x/trunk/samples/learning-more/binding-ws/calculator-contribution/src/main/java/calculator/CalculatorServiceImpl.java b/sca-java-2.x/trunk/samples/learning-more/binding-ws/calculator-contribution/src/main/java/calculator/CalculatorServiceImpl.java deleted file mode 100644 index d3fa7a8f41..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/binding-ws/calculator-contribution/src/main/java/calculator/CalculatorServiceImpl.java +++ /dev/null @@ -1,70 +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.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);
- }
-
-}
diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-ws/calculator-contribution/src/main/java/calculator/DivideService.java b/sca-java-2.x/trunk/samples/learning-more/binding-ws/calculator-contribution/src/main/java/calculator/DivideService.java deleted file mode 100644 index ef6a8b375b..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/binding-ws/calculator-contribution/src/main/java/calculator/DivideService.java +++ /dev/null @@ -1,28 +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;
-
-/**
- * The divide service interface
- */
-public interface DivideService {
-
- double divide(double n1, double n2);
-
-}
diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-ws/calculator-contribution/src/main/java/calculator/DivideServiceImpl.java b/sca-java-2.x/trunk/samples/learning-more/binding-ws/calculator-contribution/src/main/java/calculator/DivideServiceImpl.java deleted file mode 100644 index cd91935f08..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/binding-ws/calculator-contribution/src/main/java/calculator/DivideServiceImpl.java +++ /dev/null @@ -1,35 +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 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;
- }
-
-}
diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-ws/calculator-contribution/src/main/java/calculator/MultiplyService.java b/sca-java-2.x/trunk/samples/learning-more/binding-ws/calculator-contribution/src/main/java/calculator/MultiplyService.java deleted file mode 100644 index db568cc762..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/binding-ws/calculator-contribution/src/main/java/calculator/MultiplyService.java +++ /dev/null @@ -1,28 +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;
-
-/**
- * The interface for the multiply service
- */
-public interface MultiplyService {
-
- double multiply(double n1, double n2);
-
-}
diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-ws/calculator-contribution/src/main/java/calculator/MultiplyServiceImpl.java b/sca-java-2.x/trunk/samples/learning-more/binding-ws/calculator-contribution/src/main/java/calculator/MultiplyServiceImpl.java deleted file mode 100644 index c85357fcd8..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/binding-ws/calculator-contribution/src/main/java/calculator/MultiplyServiceImpl.java +++ /dev/null @@ -1,35 +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 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;
- }
-
-}
diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-ws/calculator-contribution/src/main/java/calculator/SubtractService.java b/sca-java-2.x/trunk/samples/learning-more/binding-ws/calculator-contribution/src/main/java/calculator/SubtractService.java deleted file mode 100644 index 56ee372fc4..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/binding-ws/calculator-contribution/src/main/java/calculator/SubtractService.java +++ /dev/null @@ -1,28 +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;
-
-/**
- * The interface for the multiply service
- */
-public interface SubtractService {
-
- double subtract(double n1, double n2);
-
-}
diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-ws/calculator-contribution/src/main/java/calculator/SubtractServiceImpl.java b/sca-java-2.x/trunk/samples/learning-more/binding-ws/calculator-contribution/src/main/java/calculator/SubtractServiceImpl.java deleted file mode 100644 index 1b669084d9..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/binding-ws/calculator-contribution/src/main/java/calculator/SubtractServiceImpl.java +++ /dev/null @@ -1,35 +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 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;
- }
-
-}
diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-ws/calculator-contribution/src/main/resources/Calculator.composite b/sca-java-2.x/trunk/samples/learning-more/binding-ws/calculator-contribution/src/main/resources/Calculator.composite deleted file mode 100644 index 3688ebcb85..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/binding-ws/calculator-contribution/src/main/resources/Calculator.composite +++ /dev/null @@ -1,54 +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://docs.oasis-open.org/ns/opencsa/sca/200912"
- targetNamespace="http://sample"
- xmlns:sample="http://sample"
- name="Calculator">
-
- <component name="CalculatorServiceComponent">
- <implementation.java class="calculator.CalculatorServiceImpl"/>
- <reference name="addService" >
- <binding.ws uri="http://localhost:8085/AddServiceComponent"/>
- </reference>
- <reference name="subtractService" target="SubtractServiceComponent" />
- <reference name="multiplyService" target="MultiplyServiceComponent" />
- <reference name="divideService" target="DivideServiceComponent" />
- </component>
-
- <component name="AddServiceComponent">
- <implementation.java class="calculator.AddServiceImpl"/>
- <service name="AddService">
- <binding.ws uri="http://localhost:8085/AddServiceComponent"/>
- </service>
- </component>
-
- <component name="SubtractServiceComponent">
- <implementation.java class="calculator.SubtractServiceImpl"/>
- </component>
-
- <component name="MultiplyServiceComponent">
- <implementation.java class="calculator.MultiplyServiceImpl"/>
- </component>
-
- <component name="DivideServiceComponent">
- <implementation.java class="calculator.DivideServiceImpl"/>
- </component>
-
-</composite>
diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-ws/calculator-contribution/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/samples/learning-more/binding-ws/calculator-contribution/src/main/resources/META-INF/sca-contribution.xml deleted file mode 100644 index 3a7548cd47..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/binding-ws/calculator-contribution/src/main/resources/META-INF/sca-contribution.xml +++ /dev/null @@ -1,23 +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.
--->
-<contribution xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
- xmlns:sample="http://sample">
- <deployable composite="sample:Calculator"/>
-</contribution>
\ No newline at end of file diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-ws/calculator-contribution/src/test/java/calculator/CalculatorTestCase.java b/sca-java-2.x/trunk/samples/learning-more/binding-ws/calculator-contribution/src/test/java/calculator/CalculatorTestCase.java deleted file mode 100644 index 1952eb4a6e..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/binding-ws/calculator-contribution/src/test/java/calculator/CalculatorTestCase.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 calculator;
-
-import static org.junit.Assert.assertEquals;
-
-import org.junit.Test;
-
-/**
- * A unit test of the basic Java implementation classes in this contribution
- * without using SCA
- */
-public class CalculatorTestCase {
-
- @Test
- public void testCalculator() throws Exception {
- AddService add = new AddServiceImpl();
- SubtractService subtract = new SubtractServiceImpl();
- MultiplyService multiply = new MultiplyServiceImpl();
- DivideService divide = new DivideServiceImpl();
-
- CalculatorServiceImpl calculator = new CalculatorServiceImpl();
-
- calculator.setAddService(add);
- calculator.setSubtractService(subtract);
- calculator.setMultiplyService(multiply);
- calculator.setDivideService(divide);
-
- assertEquals(calculator.add(3, 2), 5.0, 0);
- assertEquals(calculator.subtract(3, 2), 1.0, 0);
- assertEquals(calculator.multiply(3, 2), 6.0, 0);
- assertEquals(calculator.divide(3, 2), 1.5, 0);
- }
-}
diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-ws/helloworld-ws-sdo-contribution/README b/sca-java-2.x/trunk/samples/learning-more/binding-ws/helloworld-ws-sdo-contribution/README deleted file mode 100644 index be947b1923..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/binding-ws/helloworld-ws-sdo-contribution/README +++ /dev/null @@ -1,214 +0,0 @@ -Hello World Web Service References using SDO Sample
-===================================================
-This sample demonstrates an SCA reference that uses a web service binding which works with SDO.
-
-The README in the samples directory (the directory above this) provides
-general instructions about building and running samples. Take a look there
-first.
-
-To run this sample
-------------------
-This sample is dependent on helloworld-ws-service. Open a command prompt to start
-the service. If you are running ant do the following:
-
-cd helloworld-ws-service
-ant run
-
-if you don't have ant, issue one of the following commands for windows or *nix:
-
-java -cp ..\..\lib\tuscany-sca-manifest.jar;target\sample-helloworld-ws-service.jar helloworld.HelloWorldServer
-
-and on *nix do
-
-java -cp ../../lib/tuscany-sca-manifest.jar:target/sample-helloworld-ws-service.jar helloworld.HelloWorldServer
-
-You should see the following output:
-
-Buildfile: build.xml
-
-run-server:
- [java] log4j:WARN No appenders could be found for logger (org.apache.axiom.
-om.util.StAXUtils).
- [java] log4j:WARN Please initialize the log4j system properly.
- [java] Aug 24, 2007 11:17:33 AM org.apache.catalina.core.StandardEngine sta
-rt
- [java] INFO: Starting Servlet Engine: Apache Tomcat/6.0.10
- [java] Aug 24, 2007 11:17:34 AM org.apache.catalina.startup.ContextConfig d
-efaultWebConfig
- [java] INFO: No default web.xml
- [java] Aug 24, 2007 11:17:34 AM org.apache.catalina.startup.DigesterFactory
- register
- [java] WARNING: Could not get url for /javax/servlet/jsp/resources/jsp_2_0.
-xsd
- [java] Aug 24, 2007 11:17:34 AM org.apache.catalina.startup.DigesterFactory
- register
- [java] WARNING: Could not get url for /javax/servlet/jsp/resources/web-jspt
-aglibrary_1_1.dtd
- [java] Aug 24, 2007 11:17:34 AM org.apache.catalina.startup.DigesterFactory
- register
- [java] WARNING: Could not get url for /javax/servlet/jsp/resources/web-jspt
-aglibrary_1_2.dtd
- [java] Aug 24, 2007 11:17:34 AM org.apache.catalina.startup.DigesterFactory
- register
- [java] WARNING: Could not get url for /javax/servlet/jsp/resources/web-jspt
-aglibrary_2_0.xsd
- [java] Aug 24, 2007 11:17:34 AM org.apache.catalina.startup.DigesterFactory
- register
- [java] WARNING: Could not get url for /javax/servlet/resources/j2ee_web_ser
-vices_1_1.xsd
- [java] Aug 24, 2007 11:17:34 AM org.apache.coyote.http11.Http11Protocol ini
-t
- [java] INFO: Initializing Coyote HTTP/1.1 on http-8085
- [java] Aug 24, 2007 11:17:34 AM org.apache.coyote.http11.Http11Protocol sta
-rt
- [java] INFO: Starting Coyote HTTP/1.1 on http-8085
- [java] Aug 24, 2007 11:17:34 AM org.apache.tuscany.sca.http.tomcat.TomcatSe
-rver addServletMapping
- [java] INFO: Added Servlet mapping: http://localhost:8085/HelloWorldService
-
- [java] HelloWorld server started (press enter to shutdown)
-
-The server is now ready.
-
-
-Now, open another command window to run the client.
-
-cd helloworld-ws-sdo
-ant run
-
-OR if you don't have ant, on Windows do
-
-java -cp ..\..\lib\tuscany-sca-manifest.jar;target\sample-helloworld-ws-sdo.jar helloworld.HelloWorldClient
-
-and on *nix do
-
-java -cp ../../lib/tuscany-sca-manifest.jar:target/sample-helloworld-ws-sdo.jar helloworl.HelloWorldClient
-
-You should be able to see the following result:
-
-Buildfile: build.xml
-
-run:
- [java] log4j:WARN No appenders could be found for logger (org.apache.axiom.
-om.util.StAXUtils).
- [java] log4j:WARN Please initialize the log4j system properly.
- [java] Injected helloWorldService
- [java] Called getGreetings
- [java] Hello David Haney
-
-BUILD SUCCESSFUL
-Total time: 9 seconds
-
-
-Sample Overview
----------------
-The sample provides a single component that is wired to a reference with a
-web service binding. The binding refers to WSDL that identifies the service
-exposed by the helloworld-ws-service sample.
-
-helloworld-ws-sdo/
- src/
- main/
- java/
- helloworld/
- HelloWorldService.java - interface description for
- HelloWorldServiceComponent
- HelloWorldServiceComponent.java - component implementation
- HelloWorldClient.java - starts the SCA Runtime and
- deploys the helloworldwsclient
- .composite. It then calls the
- HelloWorldServiceComponent
- resources/
- wsdl
- helloworld.wsdl - the service description that the
- SCA reference uses to bind to service.
-
- test/
- java/
- helloworld/
- HelloWorldClientTestCase.java - JUnit test case
- helloworld-ws-sdo.png - a pictorial representation of the
- sample .composite file
- build.xml - the Ant build file
- pom.xml - the Maven build file
-
-Building And Running The Sample Using Ant
------------------------------------------
-You can build and run the sample with the binary distribution using Ant.
-Make sure that you have started helloworld-ws-service which this sample is dependent on
-in a separate command window. You can either follow the instruction at the begining of this
-sample file or if you want to build and run the service, follow the README under helloworld-ws-service.
-
-Now, let's build and run helloworld-ws-sdo sample:
-
-cd helloworld-ws-sdo
-ant
-ant run
-
-You should see the following output from the run target.
-
-run:
- [java] log4j:WARN No appenders could be found for logger (org.apache.axiom.
-om.util.StAXUtils).
- [java] log4j:WARN Please initialize the log4j system properly.
- [java] Injected helloWorldService
- [java] Called getGreetings
- [java] Hello World
-
-Building And Running The Sample Using Maven
--------------------------------------------
-You can build and run the sample with either the binary or source distributions using Maven. Please note that you do not need to start helloworld-ws-service in this case since Maven does this for you.
-
-cd helloworld-ws-sdo
-mvn
-
-You should see the following output from the test phase.
-
--------------------------------------------------------
- T E S T S
--------------------------------------------------------
-Running helloworld.HelloWorldClientTestCase
-log4j:WARN No appenders could be found for logger (org.apache.axiom.om.util.StAX
-Utils).
-log4j:WARN Please initialize the log4j system properly.
-log4j:WARN No appenders could be found for logger (org.apache.axiom.om.util.StAX
-Utils).
-log4j:WARN Please initialize the log4j system properly.
-Aug 23, 2007 2:27:32 PM org.apache.catalina.core.StandardEngine start
-INFO: Starting Servlet Engine: Apache Tomcat/6.0.10
-Aug 23, 2007 2:27:32 PM org.apache.catalina.startup.ContextConfig defaultWebConf
-ig
-INFO: No default web.xml
-Aug 23, 2007 2:27:32 PM org.apache.catalina.startup.DigesterFactory register
-WARNING: Could not get url for /javax/servlet/jsp/resources/jsp_2_0.xsd
-Aug 23, 2007 2:27:32 PM org.apache.catalina.startup.DigesterFactory register
-WARNING: Could not get url for /javax/servlet/jsp/resources/web-jsptaglibrary_1_
-1.dtd
-Aug 23, 2007 2:27:32 PM org.apache.catalina.startup.DigesterFactory register
-WARNING: Could not get url for /javax/servlet/jsp/resources/web-jsptaglibrary_1_
-2.dtd
-Aug 23, 2007 2:27:32 PM org.apache.catalina.startup.DigesterFactory register
-WARNING: Could not get url for /javax/servlet/jsp/resources/web-jsptaglibrary_2_
-0.xsd
-Aug 23, 2007 2:27:32 PM org.apache.catalina.startup.DigesterFactory register
-WARNING: Could not get url for /javax/servlet/resources/j2ee_web_services_1_1.xs
-d
-Aug 23, 2007 2:27:32 PM org.apache.coyote.http11.Http11Protocol init
-INFO: Initializing Coyote HTTP/1.1 on http-8085
-Aug 23, 2007 2:27:32 PM org.apache.coyote.http11.Http11Protocol start
-INFO: Starting Coyote HTTP/1.1 on http-8085
-Aug 23, 2007 2:27:32 PM org.apache.tuscany.sca.http.tomcat.TomcatServer addServl
-etMapping
-INFO: Added Servlet mapping: http://localhost:8085/HelloWorldService
-Injected helloWorldService
-Called getGreetings
-Aug 23, 2007 2:27:34 PM org.apache.coyote.http11.Http11Protocol destroy
-INFO: Stopping Coyote HTTP/1.1 on http-8085
-Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 8.502 sec
-
-Results :
-
-Tests run: 1, Failures: 0, Errors: 0, Skipped: 0
-
-
-This shows that the Junit test cases have run successfully.
diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-ws/helloworld-ws-sdo-contribution/build.xml b/sca-java-2.x/trunk/samples/learning-more/binding-ws/helloworld-ws-sdo-contribution/build.xml deleted file mode 100644 index 401315d424..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/binding-ws/helloworld-ws-sdo-contribution/build.xml +++ /dev/null @@ -1,101 +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="helloworld-ws-sdo" default="compile" basedir="."> - <property file="${user.home}/tuscany/build.properties" /> - <property file="${user.home}/build.properties" /> - - <property name="server.class" value="helloworld.HelloWorldServer" /> - <property name="client.class" value="helloworld.HelloWorldClient" /> - <property name="test.jar" value="sample-helloworld-ws-sdo.jar" /> - - <property name="tuscany.sca.manifest.location" value="../../lib/tuscany-sca-manifest.jar"/> - - <target name="init"> - <mkdir dir="target/classes"/> - <mkdir dir="target/sdo-source"/> - </target> - - <path id="project.classpath"> - <pathelement path="target/classes"/> - <pathelement path="target/sdo-source"/> - <pathelement location="${tuscany.sca.manifest.location}"/> - </path> - - <target name="generate-sdo" depends="init"> - <java classname="org.apache.tuscany.sdo.generate.XSD2JavaGenerator" fork="true"> - <arg value="-targetDirectory"/> - <arg value="target/sdo-source"/> - <arg value="-javaPackage"/> - <arg value="helloworld"/> - <arg value="-prefix"/> - <arg value="Helloworld"/> - <arg value="-noNotification"/> - <arg value="-noContainment"/> - <arg value="-noUnsettable"/> - <arg value="src/main/resources/wsdl/helloworld.wsdl"/> - - <classpath refid="project.classpath"/> - </java> - </target> - - <target name="compile" depends="init, generate-sdo"> - <javac destdir="target/classes" - debug="on" - source="1.5" - target="1.5"> - <src location="src/main/java"/> - <src location="target/sdo-source"/> - <classpath refid="project.classpath"/> - </javac> - <copy todir="target/classes"> - <fileset dir="src/main/resources"/> - <fileset dir="target/sdo-source"/> - </copy> - <jar destfile="target/${test.jar}" basedir="target/classes"> - <manifest> - <attribute name="Main-Class" value="${test.class}" /> - </manifest> - </jar> - </target> - - <target name="run-classes"> - <java classname="${client.class}" fork="true"> - <classpath refid="project.classpath"/> </java> - </target> - - <target name="run-server"> - <java classname="${server.class}" fork="true"> - <classpath path="target/${test.jar}"/> - <classpath refid="project.classpath"/> - </java> - </target> - - <target name="run"> - <java classname="${client.class}" fork="true"> - <classpath path="target/${test.jar}"/> - <classpath refid="project.classpath"/> - </java> - </target> - - <target name="clean"> - <delete quiet="true" includeemptydirs="true"> - <fileset dir="target"/> - </delete> - </target> -</project> diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-ws/helloworld-ws-sdo-contribution/helloworld-ws-sdo.png b/sca-java-2.x/trunk/samples/learning-more/binding-ws/helloworld-ws-sdo-contribution/helloworld-ws-sdo.png Binary files differdeleted file mode 100644 index bd2bba41db..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/binding-ws/helloworld-ws-sdo-contribution/helloworld-ws-sdo.png +++ /dev/null diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-ws/helloworld-ws-sdo-contribution/maven-eclipse.xml b/sca-java-2.x/trunk/samples/learning-more/binding-ws/helloworld-ws-sdo-contribution/maven-eclipse.xml deleted file mode 100644 index 3adfca89f4..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/binding-ws/helloworld-ws-sdo-contribution/maven-eclipse.xml +++ /dev/null @@ -1,8 +0,0 @@ -<project default="copy-resources"> - <target name="init"/> - <target name="copy-resources" depends="init"> - <copy todir="target/classes/META-INF" filtering="true"> - <fileset dir="." includes="LICENSE|NOTICE" excludes="**/*.java"/> - </copy> - </target> -</project>
\ No newline at end of file diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-ws/helloworld-ws-sdo-contribution/pom.xml b/sca-java-2.x/trunk/samples/learning-more/binding-ws/helloworld-ws-sdo-contribution/pom.xml deleted file mode 100644 index f5c2839067..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/binding-ws/helloworld-ws-sdo-contribution/pom.xml +++ /dev/null @@ -1,180 +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-samples</artifactId> - <version>2.0-SNAPSHOT</version> - <relativePath>../../../pom.xml</relativePath> - </parent> - <artifactId>sample-binding-ws-helloworld-ws-sdo-contribution</artifactId> - <name>Apache Tuscany SCA Sample binding.ws HelloWorld Web Service SDO Contribution</name> - - <dependencies> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-node-api</artifactId> - <version>2.0-SNAPSHOT</version> - </dependency> - - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-node-impl</artifactId> - <version>2.0-SNAPSHOT</version> - <scope>runtime</scope> - </dependency> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-implementation-java-runtime</artifactId> - <version>2.0-SNAPSHOT</version> - <scope>runtime</scope> - </dependency> - - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-binding-ws-runtime-axis2</artifactId> - <version>2.0-SNAPSHOT</version> - <scope>runtime</scope> - </dependency> - - <dependency> - <groupId>org.apache.tuscany.sdo</groupId> - <artifactId>tuscany-sdo-lib</artifactId> - <version>1.1.1</version> - </dependency> - <dependency> - <groupId>org.apache.tuscany.sdo</groupId> - <artifactId>tuscany-sdo-impl</artifactId> - <version>1.1.1</version> - <exclusions> - <exclusion> - <groupId>backport-util-concurrent</groupId> - <artifactId>backport-util-concurrent</artifactId> - </exclusion> - </exclusions> - </dependency> - <dependency> - <groupId>backport-util-concurrent</groupId> - <artifactId>backport-util-concurrent</artifactId> - <version>3.1</version> - </dependency> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-databinding-sdo</artifactId> - <version>2.0-SNAPSHOT</version> - <scope>compile</scope> - </dependency> - - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-host-jetty</artifactId> - <version>2.0-SNAPSHOT</version> - <scope>runtime</scope> - </dependency> - - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>4.5</version> - <scope>test</scope> - </dependency> - - </dependencies> - - <build> - <finalName>${project.artifactId}</finalName> - - - <plugins> - - <plugin> - <groupId>org.apache.tuscany.maven.plugins</groupId> - <artifactId>maven-tuscany-plugin</artifactId> - <version>2.0-SNAPSHOT</version> - <dependencies> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-databinding-sdo</artifactId> - <version>2.0-SNAPSHOT</version> - </dependency> - </dependencies> - </plugin> - - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>build-helper-maven-plugin</artifactId> - <version>1.0</version> - <executions> - <execution> - <id>add-source</id> - <phase>generate-sources</phase> - <goals> - <goal>add-test-source</goal> - </goals> - <configuration> - <sources> - <source>target/sdo-source</source> - </sources> - </configuration> - </execution> - </executions> - </plugin> - <plugin> - <groupId>org.apache.tuscany.sdo</groupId> - <artifactId>tuscany-sdo-plugin</artifactId> - <version>1.1.1</version> - <executions> - <execution> - <id>generate-helloworld-sdo</id> - <phase>generate-sources</phase> - <configuration> - <schemaFile>${basedir}/src/main/resources/wsdl/helloworld.wsdl</schemaFile> - <javaPackage>helloworld</javaPackage> - <prefix>Helloworld</prefix> - <noNotification>true</noNotification> - <noContainer>true</noContainer> - <noUnsettable>true</noUnsettable> - </configuration> - <goals> - <goal>generate</goal> - </goals> - </execution> - <execution> - <id>generate-helloworld-sdo1</id> - <phase>generate-sources</phase> - <configuration> - <schemaFile>${basedir}/src/main/resources/test.xsd</schemaFile> - <javaPackage>model.sdo</javaPackage> - <prefix>Entity</prefix> - <noNotification>true</noNotification> - <noContainer>true</noContainer> - <noUnsettable>true</noUnsettable> - </configuration> - <goals> - <goal>generate</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> - </build> - -</project> diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-ws/helloworld-ws-sdo-contribution/src/main/java/helloworld/HelloWorldClient.java b/sca-java-2.x/trunk/samples/learning-more/binding-ws/helloworld-ws-sdo-contribution/src/main/java/helloworld/HelloWorldClient.java deleted file mode 100644 index ebc270811f..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/binding-ws/helloworld-ws-sdo-contribution/src/main/java/helloworld/HelloWorldClient.java +++ /dev/null @@ -1,51 +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 helloworld; - -import org.apache.tuscany.sca.node.Contribution; -import org.apache.tuscany.sca.node.ContributionLocationHelper; -import org.apache.tuscany.sca.node.Node; -import org.apache.tuscany.sca.node.NodeFactory; - -/** - * This client program shows how to create an SCA runtime, start it, locate the - * HelloWorld service and invoke it. - */ -public class HelloWorldClient { - - public final static void main(String[] args) throws Exception { - - NodeFactory factory = NodeFactory.newInstance(); - String contribution = ContributionLocationHelper.getContributionLocation(HelloWorldClient.class); - Node node = - factory.createNode("helloworldwsclient.composite", new Contribution("helloworld", contribution)).start(); - - HelloWorldService helloWorldService = node.getService(HelloWorldService.class, "HelloWorldServiceComponent"); - - Name name = HelloworldFactory.INSTANCE.createName(); - - name.setFirst("David"); - name.setLast("Haney"); - - String value = helloWorldService.getGreetings(name); - System.out.println(value); - - node.stop(); - } -} diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-ws/helloworld-ws-sdo-contribution/src/main/java/helloworld/HelloWorldImpl.java b/sca-java-2.x/trunk/samples/learning-more/binding-ws/helloworld-ws-sdo-contribution/src/main/java/helloworld/HelloWorldImpl.java deleted file mode 100644 index c42a4d59c3..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/binding-ws/helloworld-ws-sdo-contribution/src/main/java/helloworld/HelloWorldImpl.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 helloworld; - -import org.oasisopen.sca.annotation.Service; - -/** - * This class implements the HelloWorld service. - */ -@Service(HelloWorldService.class) -public class HelloWorldImpl implements HelloWorldService { - - public String getGreetings(Name name) { - return "Hello " + name.getFirst() + " " + name.getLast(); - } - -} diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-ws/helloworld-ws-sdo-contribution/src/main/java/helloworld/HelloWorldServer.java b/sca-java-2.x/trunk/samples/learning-more/binding-ws/helloworld-ws-sdo-contribution/src/main/java/helloworld/HelloWorldServer.java deleted file mode 100644 index ff5cb4ceda..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/binding-ws/helloworld-ws-sdo-contribution/src/main/java/helloworld/HelloWorldServer.java +++ /dev/null @@ -1,51 +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 helloworld; - -import java.io.IOException; - -import org.apache.tuscany.sca.node.Contribution; -import org.apache.tuscany.sca.node.ContributionLocationHelper; -import org.apache.tuscany.sca.node.Node; -import org.apache.tuscany.sca.node.NodeFactory; - -/** - * This server program shows how to create an SCA runtime, and start it which - * activates the helloworld Web service endpoint. - */ -public class HelloWorldServer { - - public static void main(String[] args) { - - NodeFactory factory = NodeFactory.newInstance(); - String contribution = ContributionLocationHelper.getContributionLocation(HelloWorldServer.class); - Node node = factory.createNode("helloworldws.composite", new Contribution("helloworld", contribution)).start(); - - try { - System.out.println("HelloWorld server started (press enter to shutdown)"); - System.in.read(); - } catch (IOException e) { - e.printStackTrace(); - } - - node.stop(); - System.out.println("HelloWorld server stopped"); - } - -} diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-ws/helloworld-ws-sdo-contribution/src/main/java/helloworld/HelloWorldService.java b/sca-java-2.x/trunk/samples/learning-more/binding-ws/helloworld-ws-sdo-contribution/src/main/java/helloworld/HelloWorldService.java deleted file mode 100644 index fa257a0605..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/binding-ws/helloworld-ws-sdo-contribution/src/main/java/helloworld/HelloWorldService.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 helloworld; - -import javax.xml.ws.RequestWrapper; -import javax.xml.ws.ResponseWrapper; - -import org.oasisopen.sca.annotation.Remotable; - -/** - * The interface for the helloworld service - */ -@Remotable -public interface HelloWorldService { - @RequestWrapper(className="helloworld.getGreetings") - @ResponseWrapper(className="helloworld.getGreetingsResponse") - public String getGreetings(Name name); -} diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-ws/helloworld-ws-sdo-contribution/src/main/java/helloworld/HelloWorldServiceComponent.java b/sca-java-2.x/trunk/samples/learning-more/binding-ws/helloworld-ws-sdo-contribution/src/main/java/helloworld/HelloWorldServiceComponent.java deleted file mode 100644 index 711eef63b5..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/binding-ws/helloworld-ws-sdo-contribution/src/main/java/helloworld/HelloWorldServiceComponent.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 helloworld; - -/** - * The HelloWorld service implementation - */ -public class HelloWorldServiceComponent implements HelloWorldService { - - HelloWorldService helloWorldService; - - public String getGreetings(Name name) { - System.out.println("Called getGreetings"); - return helloWorldService.getGreetings(name); - } - - public HelloWorldService getHelloWorldService() { - System.out.println("Got Injected helloWorldService"); - return helloWorldService; - } - - public void setHelloWorldService(HelloWorldService helloWorldService) { - System.out.println("Injected helloWorldService"); - this.helloWorldService = helloWorldService; - } -} diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-ws/helloworld-ws-sdo-contribution/src/main/java/services/bcircle/BioTestCase.java b/sca-java-2.x/trunk/samples/learning-more/binding-ws/helloworld-ws-sdo-contribution/src/main/java/services/bcircle/BioTestCase.java deleted file mode 100644 index d222d77b3b..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/binding-ws/helloworld-ws-sdo-contribution/src/main/java/services/bcircle/BioTestCase.java +++ /dev/null @@ -1,59 +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 services.bcircle; - -import model.sdo.EntityFactory; -import model.sdo.Laboratory; - -import org.apache.tuscany.sca.node.Contribution; -import org.apache.tuscany.sca.node.ContributionLocationHelper; -import org.apache.tuscany.sca.node.Node; -import org.apache.tuscany.sca.node.NodeFactory; - -public class BioTestCase { - - /** - * @param args - */ - public static void main(String[] args) { - BiochemicalCircle biochemicalCircl = new BiochemicalCircleImpl(); - Laboratory lab2 = biochemicalCircl.getLaboratory("Lab2"); //This invocation without use SCA works ok. - - NodeFactory factory = NodeFactory.newInstance(); - String contribution = ContributionLocationHelper.getContributionLocation(BioTestCase.class); - Node node = - factory.createNode("resources/clinicalLaboratory.composite", new Contribution("clinical", contribution)) - .start(); - - BiochemicalCircle biochemicalCircle = node.getService(BiochemicalCircle.class, "BiochemicalCircleComponent"); - - Laboratory lab = EntityFactory.INSTANCE.createLaboratory(); - lab.setName("lab2"); - biochemicalCircle.setLaboratory(lab); // this invocation works ok too - - lab = biochemicalCircle.getLaboratory("Lab2"); // here I have an exception posted below. - - //here I wait a moment before close scaDomain - System.out.println(lab.getName()); - - node.stop(); - - } -} diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-ws/helloworld-ws-sdo-contribution/src/main/java/services/bcircle/BiochemicalCircle.java b/sca-java-2.x/trunk/samples/learning-more/binding-ws/helloworld-ws-sdo-contribution/src/main/java/services/bcircle/BiochemicalCircle.java deleted file mode 100644 index a988a4156c..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/binding-ws/helloworld-ws-sdo-contribution/src/main/java/services/bcircle/BiochemicalCircle.java +++ /dev/null @@ -1,29 +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 services.bcircle; - -import org.oasisopen.sca.annotation.Remotable; - -@Remotable -public interface BiochemicalCircle { - void setLaboratory(model.sdo.Laboratory lab); - - model.sdo.Laboratory getLaboratory(String name); -} diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-ws/helloworld-ws-sdo-contribution/src/main/java/services/bcircle/BiochemicalCircleImpl.java b/sca-java-2.x/trunk/samples/learning-more/binding-ws/helloworld-ws-sdo-contribution/src/main/java/services/bcircle/BiochemicalCircleImpl.java deleted file mode 100644 index b609f58373..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/binding-ws/helloworld-ws-sdo-contribution/src/main/java/services/bcircle/BiochemicalCircleImpl.java +++ /dev/null @@ -1,40 +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 services.bcircle; -import model.sdo.EntityFactory; -import model.sdo.Laboratory; - -import org.oasisopen.sca.annotation.Service; - - -@Service(BiochemicalCircle.class) -public class BiochemicalCircleImpl implements BiochemicalCircle{ - public Laboratory getLaboratory(String name) { - - Laboratory lab = EntityFactory.INSTANCE.createLaboratory(); - lab.setName("Main Laboratory"); - return lab; - } - - public void setLaboratory(Laboratory lab) { - //sad method - System.out.println(lab.getName()); - } -} diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-ws/helloworld-ws-sdo-contribution/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/samples/learning-more/binding-ws/helloworld-ws-sdo-contribution/src/main/resources/META-INF/sca-contribution.xml deleted file mode 100644 index f8b2a60f6a..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/binding-ws/helloworld-ws-sdo-contribution/src/main/resources/META-INF/sca-contribution.xml +++ /dev/null @@ -1,28 +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. ---> -<contribution xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" - xmlns:hw="http://helloworld" - xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.1"> - - <deployable composite="hw:helloworldws"/> - - <tuscany:sdo.types namespace="http://helloworld" location="wsdl/helloworld.wsdl"/> - -</contribution> diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-ws/helloworld-ws-sdo-contribution/src/main/resources/helloworldws.composite b/sca-java-2.x/trunk/samples/learning-more/binding-ws/helloworld-ws-sdo-contribution/src/main/resources/helloworldws.composite deleted file mode 100644 index 46c819d08c..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/binding-ws/helloworld-ws-sdo-contribution/src/main/resources/helloworldws.composite +++ /dev/null @@ -1,31 +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://docs.oasis-open.org/ns/opencsa/sca/200912" targetNamespace="http://helloworld" - xmlns:dbsdo="http://tuscany.apache.org/xmlns/sca/1.1" xmlns:hw="http://helloworld" - name="helloworldws"> - - <component name="HelloWorldServiceComponent"> - <implementation.java class="helloworld.HelloWorldImpl" /> - <service name="HelloWorldService"> - <interface.wsdl interface="http://helloworld#wsdl.interface(HelloWorld)" /> - <binding.ws uri="http://localhost:8085/HelloWorldService" /> - </service> - </component> -</composite> diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-ws/helloworld-ws-sdo-contribution/src/main/resources/helloworldwsclient.composite b/sca-java-2.x/trunk/samples/learning-more/binding-ws/helloworld-ws-sdo-contribution/src/main/resources/helloworldwsclient.composite deleted file mode 100644 index 65b0e294a8..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/binding-ws/helloworld-ws-sdo-contribution/src/main/resources/helloworldwsclient.composite +++ /dev/null @@ -1,34 +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://docs.oasis-open.org/ns/opencsa/sca/200912" targetNamespace="http://helloworld" - xmlns:dbsdo="http://tuscany.apache.org/xmlns/sca/1.1" xmlns:hw="http://helloworld" - name="helloworldwsclient"> - - <component name="HelloWorldServiceComponent"> - <implementation.java class="helloworld.HelloWorldServiceComponent" /> - <reference name="helloWorldService"> - <interface.java interface="helloworld.HelloWorldService" /> - <binding.ws wsdlElement="http://helloworld#wsdl.port(HelloWorldService/HelloWorldSoapPort)" /> - </reference> - </component> - - - -</composite> diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-ws/helloworld-ws-sdo-contribution/src/main/resources/logging.properties b/sca-java-2.x/trunk/samples/learning-more/binding-ws/helloworld-ws-sdo-contribution/src/main/resources/logging.properties deleted file mode 100644 index 3dca310cdb..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/binding-ws/helloworld-ws-sdo-contribution/src/main/resources/logging.properties +++ /dev/null @@ -1,30 +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. -# -# $Rev$ $Date$ -# - -# Custom logging configuration for Tuscany samples -# By default, only INFO level logging is enabled and ALL messages get sent to the console -# For more messages from the runtime, uncomment specific settings at the end of this file -handlers = java.util.logging.ConsoleHandler -java.util.logging.ConsoleHandler.level = ALL -java.util.logging.ConsoleHandler.formatter = java.util.logging.SimpleFormatter -.level=INFO - -# Uncomment the next setting to get all Tuscany messages (this will be a lot) -#org.apache.tuscany.level=FINEST diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-ws/helloworld-ws-sdo-contribution/src/main/resources/resources/clinicalLaboratory.composite b/sca-java-2.x/trunk/samples/learning-more/binding-ws/helloworld-ws-sdo-contribution/src/main/resources/resources/clinicalLaboratory.composite deleted file mode 100644 index 0451cee24c..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/binding-ws/helloworld-ws-sdo-contribution/src/main/resources/resources/clinicalLaboratory.composite +++ /dev/null @@ -1,34 +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. ---> -<sca:composite xmlns:federation="http://eclipse.org/SCAExample1/src/resources/federation" - xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200912" name="clinicalLaboratory" - targetNamespace="http://eclipse.org/SCAExample1/src/resources/clinicalLaboratory"> - - <sca:component name="BiochemicalCircleComponent"> - <sca:implementation.java class="services.bcircle.BiochemicalCircleImpl" /> - <sca:service name="BiochemicalCircle"> - <sca:interface.java interface="services.bcircle.BiochemicalCircle" /> - <sca:binding.ws uri="http://localhost:8080/SCA1/MyServiceComponent" /> - </sca:service> - </sca:component> - <!-- - <sca:service name="BiochemicalCircle" promote="BiochemicalCircleComponent/BiochemicalCircle" /> - --> -</sca:composite> diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-ws/helloworld-ws-sdo-contribution/src/main/resources/test.xsd b/sca-java-2.x/trunk/samples/learning-more/binding-ws/helloworld-ws-sdo-contribution/src/main/resources/test.xsd deleted file mode 100644 index 7fd9aa0013..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/binding-ws/helloworld-ws-sdo-contribution/src/main/resources/test.xsd +++ /dev/null @@ -1,35 +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. ---> -<schema xmlns="http://www.w3.org/2001/XMLSchema" - targetNamespace="http://eclipse.org/SCAExample1/src/resources/clinicalLaboratory" - xmlns:tns="http://eclipse.org/SCAExample1/src/resources/clinicalLaboratory" - elementFormDefault="qualified"> - <complexType name="Practice"> - <sequence> - <element name="name" type="string" /> - </sequence> - </complexType> - <complexType name="Laboratory"> - <sequence> - <element name="name" type="string" /> - <element name="practices" type="tns:Practice" maxOccurs="unbounded" /> - </sequence> - </complexType> -</schema> diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-ws/helloworld-ws-sdo-contribution/src/main/resources/wsdl/helloworld.wsdl b/sca-java-2.x/trunk/samples/learning-more/binding-ws/helloworld-ws-sdo-contribution/src/main/resources/wsdl/helloworld.wsdl deleted file mode 100644 index 882819110f..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/binding-ws/helloworld-ws-sdo-contribution/src/main/resources/wsdl/helloworld.wsdl +++ /dev/null @@ -1,88 +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. ---> -<wsdl:definitions targetNamespace="http://helloworld" xmlns:tns="http://helloworld" - xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:wsdlsoap="http://schemas.xmlsoap.org/wsdl/soap/" - xmlns:xsd="http://www.w3.org/2001/XMLSchema" name="helloworld"> - - <wsdl:types> - <schema elementFormDefault="qualified" targetNamespace="http://helloworld" - xmlns="http://www.w3.org/2001/XMLSchema"> - - <element name="getGreetings"> - <complexType> - <sequence> - <element name="name" type="tns:Name" /> - </sequence> - </complexType> - </element> - - <element name="getGreetingsResponse"> - <complexType> - <sequence> - <element name="getGreetingsReturn" type="xsd:string" /> - </sequence> - </complexType> - </element> - - <complexType name="Name"> - <sequence> - <element name="first" type="xsd:string" /> - <element name="last" type="xsd:string" /> - </sequence> - </complexType> - - </schema> - </wsdl:types> - - <wsdl:message name="getGreetingsRequest"> - <wsdl:part element="tns:getGreetings" name="parameters" /> - </wsdl:message> - - <wsdl:message name="getGreetingsResponse"> - <wsdl:part element="tns:getGreetingsResponse" name="parameters" /> - </wsdl:message> - - <wsdl:portType name="HelloWorld"> - <wsdl:operation name="getGreetings"> - <wsdl:input message="tns:getGreetingsRequest" name="getGreetingsRequest" /> - <wsdl:output message="tns:getGreetingsResponse" name="getGreetingsResponse" /> - </wsdl:operation> - </wsdl:portType> - - <wsdl:binding name="HelloWorldSoapBinding" type="tns:HelloWorld"> - <wsdlsoap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http" /> - <wsdl:operation name="getGreetings"> - <wsdlsoap:operation soapAction="" /> - <wsdl:input name="getGreetingsRequest"> - <wsdlsoap:body use="literal" /> - </wsdl:input> - <wsdl:output name="getGreetingsResponse"> - <wsdlsoap:body use="literal" /> - </wsdl:output> - </wsdl:operation> - </wsdl:binding> - - <wsdl:service name="HelloWorldService"> - <wsdl:port binding="tns:HelloWorldSoapBinding" name="HelloWorldSoapPort"> - <wsdlsoap:address location="http://localhost:8085/HelloWorldService" /> - </wsdl:port> - </wsdl:service> - -</wsdl:definitions> diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-ws/helloworld-ws-sdo-contribution/src/test/java/helloworld/HelloWorldClientTestCase.java b/sca-java-2.x/trunk/samples/learning-more/binding-ws/helloworld-ws-sdo-contribution/src/test/java/helloworld/HelloWorldClientTestCase.java deleted file mode 100644 index 3918f9a4a5..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/binding-ws/helloworld-ws-sdo-contribution/src/test/java/helloworld/HelloWorldClientTestCase.java +++ /dev/null @@ -1,85 +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 helloworld; - -import junit.framework.Assert; - -import org.apache.tuscany.sca.node.Contribution; -import org.apache.tuscany.sca.node.ContributionLocationHelper; -import org.apache.tuscany.sca.node.Node; -import org.apache.tuscany.sca.node.NodeFactory; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; - -/** - * Test case for helloworld web service client - */ -public class HelloWorldClientTestCase { - - private HelloWorldService helloWorldService; - private static Node node; - - private TestCaseRunner server; - - @Before - public void startClient() throws Exception { - try { - - NodeFactory factory = NodeFactory.newInstance(); - String contribution = ContributionLocationHelper.getContributionLocation(HelloWorldClient.class); - node = - factory.createNode("helloworldwsclient.composite", new Contribution("helloworld", contribution)) - .start(); - - helloWorldService = node.getService(HelloWorldService.class, "HelloWorldServiceComponent"); - - server = new TestCaseRunner(HelloWorldTestServer.class); - server.before(); - - } catch (Throwable e) { - e.printStackTrace(); - } - } - - @Test - public void testWSClient() throws Exception { - Name name = HelloworldFactory.INSTANCE.createName(); - name.setFirst("John"); - name.setLast("Smith"); - String msg = helloWorldService.getGreetings(name); - Assert.assertEquals("Hello John Smith", msg); - } - - @After - public void stopClient() throws Exception { - server.after(); - node.stop(); - } - - public static void main(String[] args) throws Exception { - HelloWorldClientTestCase test = new HelloWorldClientTestCase(); - test.startClient(); - test.testWSClient(); - - System.in.read(); - } - -} diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-ws/helloworld-ws-sdo-contribution/src/test/java/helloworld/HelloWorldTestServer.java b/sca-java-2.x/trunk/samples/learning-more/binding-ws/helloworld-ws-sdo-contribution/src/test/java/helloworld/HelloWorldTestServer.java deleted file mode 100644 index 98487ad88b..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/binding-ws/helloworld-ws-sdo-contribution/src/test/java/helloworld/HelloWorldTestServer.java +++ /dev/null @@ -1,67 +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 helloworld; - -import java.io.IOException; -import java.net.Socket; - -import org.apache.tuscany.sca.node.Contribution; -import org.apache.tuscany.sca.node.ContributionLocationHelper; -import org.apache.tuscany.sca.node.Node; -import org.apache.tuscany.sca.node.NodeFactory; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; - -/** - * Starts up the SCA runtime which starts listening for service requests - */ -public class HelloWorldTestServer { - - private Node node; - - @Before - public void startServer() throws Exception { - try { - - NodeFactory factory = NodeFactory.newInstance(); - String contribution = ContributionLocationHelper.getContributionLocation(HelloWorldService.class); - node = factory.createNode("helloworldws.composite", new Contribution("helloworld", contribution)).start(); - } catch (Exception e) { - e.printStackTrace(); - } - } - - @Test - public void testPing() throws IOException { - new Socket("127.0.0.1", 8085); - } - - @After - public void stopServer() throws Exception { - node.stop(); - } - - public static void main(String[] args) throws Exception { - - HelloWorldTestServer test = new HelloWorldTestServer(); - test.startServer(); - } - -} diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-ws/helloworld-ws-sdo-contribution/src/test/java/helloworld/TestCaseRunner.java b/sca-java-2.x/trunk/samples/learning-more/binding-ws/helloworld-ws-sdo-contribution/src/test/java/helloworld/TestCaseRunner.java deleted file mode 100644 index b6b4ed2254..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/binding-ws/helloworld-ws-sdo-contribution/src/test/java/helloworld/TestCaseRunner.java +++ /dev/null @@ -1,329 +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 helloworld; - -import java.lang.annotation.Annotation; -import java.lang.reflect.Constructor; -import java.lang.reflect.Method; -import java.net.URL; -import java.net.URLClassLoader; -import java.security.AccessController; -import java.security.PrivilegedAction; -import java.util.Arrays; -import java.util.HashSet; -import java.util.Set; - -/** - * A helper class that can be used to run an SCA JUnit test case. The test case will run in an isolated class loader. - * - * @version $Rev$ $Date$ - */ -public class TestCaseRunner { - - private ClassLoader classLoader; - private Class<?> testSuiteClass; - private Object testSuite; - private Class<?> testResultClass; - private Class<?> testCaseClass; - private Object testCase; - - private Class<?> beforeAnnotation; - private Class<?> beforeClassAnnotation; - private Class<?> afterAnnotation; - private Class<?> afterClassAnnotation; - private Class<?> junit4AdapterClass; - private Class<?> junit3TestCaseClass; - - /** - * Constructs a new TestCase runner. - * - * @param testClass - */ - public TestCaseRunner(Class<?> testClass, String... isolatedClasses) { - try { - ClassLoader tccl = setupClassLoader(testClass, isolatedClasses); - - try { - // Thread.currentThread().setContextClassLoader(classLoader); - // Allow privileged access to set class loader. Requires RuntimePermission - // setContextClassLoader in security policy. - final ClassLoader finalClassLoader = classLoader; - AccessController.doPrivileged(new PrivilegedAction<Object>() { - public Object run() { - Thread.currentThread().setContextClassLoader(finalClassLoader); - return null; - } - }); - - testCaseClass = Class.forName(testClass.getName(), true, classLoader); - testCase = testCaseClass.newInstance(); - ClassLoader testClassLoader = testCaseClass.getClassLoader(); - - junit3TestCaseClass = Class.forName("junit.framework.TestCase", true, testClassLoader); - - testSuiteClass = Class.forName("junit.framework.TestSuite", true, testClassLoader); - Constructor<?> testSuiteConstructor = testSuiteClass.getConstructor(Class.class); - testSuite = testSuiteConstructor.newInstance(testCaseClass); - - testResultClass = Class.forName("junit.framework.TestResult", true, testClassLoader); - - try { - beforeAnnotation = Class.forName("org.junit.Before", true, testClassLoader); - afterAnnotation = Class.forName("org.junit.After", true, testClassLoader); - beforeClassAnnotation = Class.forName("org.junit.BeforeClass", true, testClassLoader); - afterClassAnnotation = Class.forName("org.junit.AfterClass", true, testClassLoader); - junit4AdapterClass = Class.forName("junit.framework.JUnit4TestAdapter", true, testClassLoader); - } catch (Exception e) { - // Unexpected - throw new AssertionError(e); - } - } catch (Throwable e) { - e.printStackTrace(); - } finally { - // Thread.currentThread().setContextClassLoader(tccl); - // Allow privileged access to set class loader. Requires RuntimePermission - // setContextClassLoader in security policy. - final ClassLoader finaltccl = tccl; - AccessController.doPrivileged(new PrivilegedAction<Object>() { - public Object run() { - Thread.currentThread().setContextClassLoader(finaltccl); - return null; - } - }); - } - } catch (Exception e) { - throw new RuntimeException(e); - } - } - - private ClassLoader setupClassLoader(Class<?> testClass, String... isolatedClasses) { - ClassLoader tccl = Thread.currentThread().getContextClassLoader(); - classLoader = testClass.getClassLoader(); - if (classLoader instanceof URLClassLoader) { - URL[] urls = ((URLClassLoader)classLoader).getURLs(); - classLoader = new ClassLoaderImpl(urls, classLoader, isolatedClasses); - } else if (classLoader == tccl || classLoader.getParent() == tccl) { - classLoader = new URLClassLoader(new URL[0], classLoader); - } else { - classLoader = tccl; - } - return tccl; - } - - /** - * Run the test case - */ - public void run() { - ClassLoader tccl = Thread.currentThread().getContextClassLoader(); - try { - // Thread.currentThread().setContextClassLoader(classLoader); - // Allow privileged access to set class loader. Requires RuntimePermission - // setContextClassLoader in security policy. - final ClassLoader finalClassLoader = classLoader; - AccessController.doPrivileged(new PrivilegedAction<Object>() { - public Object run() { - Thread.currentThread().setContextClassLoader(finalClassLoader); - return null; - } - }); - - if (junit3TestCaseClass.isAssignableFrom(testCaseClass)) { - Object testResult = testResultClass.newInstance(); - Method runMethod = testSuiteClass.getMethod("run", testResultClass); - runMethod.invoke(testSuite, testResult); - } else { - Object junit4Adapter = junit4AdapterClass.getConstructor(Class.class).newInstance(testCaseClass); - Object testResult = testResultClass.newInstance(); - Method runMethod = junit4AdapterClass.getMethod("run", testResultClass); - runMethod.invoke(junit4Adapter, testResult); - } - } catch (Exception e) { - throw new RuntimeException(e); - } finally { - // Thread.currentThread().setContextClassLoader(tccl); - // Allow privileged access to set class loader. Requires RuntimePermission - // setContextClassLoader in security policy. - final ClassLoader finaltccl = tccl; - AccessController.doPrivileged(new PrivilegedAction<Object>() { - public Object run() { - Thread.currentThread().setContextClassLoader(finaltccl); - return null; - } - }); - } - } - - /** - * Invoke the setUp method - */ - public void setUp() { - execute("setUp"); - } - - /** - * Invoke the before methods - */ - public void before() { - execute(beforeAnnotation); - } - - /** - * Invoke the beforeClass methods - */ - public void beforeClass() { - execute(beforeClassAnnotation); - } - - /** - * Invoke the tearDown method - */ - public void tearDown() { - execute("tearDown"); - } - - /** - * Invoke the after methods - */ - public void after() { - execute(afterAnnotation); - } - - /** - * Invoke the afterClass methods - */ - public void afterClass() { - execute(afterClassAnnotation); - } - - /** - * Invoke the specified test method. - */ - public void run(String methodName) { - execute(methodName); - } - - /** - * Invoke the methods annotated with the specified annotation. - */ - private void execute(Class<?> annotationClass) { - if (annotationClass == null) { - throw new RuntimeException(new NoSuchMethodException()); - } - ClassLoader tccl = Thread.currentThread().getContextClassLoader(); - try { - // Thread.currentThread().setContextClassLoader(classLoader); - // Allow privileged access to set class loader. Requires RuntimePermission - // setContextClassLoader in security policy. - final ClassLoader finalClassLoader = classLoader; - AccessController.doPrivileged(new PrivilegedAction<Object>() { - public Object run() { - Thread.currentThread().setContextClassLoader(finalClassLoader); - return null; - } - }); - - for (Method method : testCaseClass.getDeclaredMethods()) { - for (Annotation annotation : method.getAnnotations()) { - if (annotation.annotationType() == annotationClass) { - method.invoke(testCase); - } - } - } - } catch (Exception e) { - throw new RuntimeException(e); - } finally { - // Thread.currentThread().setContextClassLoader(tccl); - // Allow privileged access to set class loader. Requires RuntimePermission - // setContextClassLoader in security policy. - final ClassLoader finaltccl = tccl; - AccessController.doPrivileged(new PrivilegedAction<Object>() { - public Object run() { - Thread.currentThread().setContextClassLoader(finaltccl); - return null; - } - }); - } - } - - /** - * Invoke the specified method - */ - private void execute(String methodName) { - ClassLoader tccl = Thread.currentThread().getContextClassLoader(); - try { - // Thread.currentThread().setContextClassLoader(classLoader); - // Allow privileged access to set class loader. Requires RuntimePermission - // setContextClassLoader in security policy. - final ClassLoader finalClassLoader = classLoader; - AccessController.doPrivileged(new PrivilegedAction<Object>() { - public Object run() { - Thread.currentThread().setContextClassLoader(finalClassLoader); - return null; - } - }); - Method setUpMethod = testCaseClass.getDeclaredMethod(methodName); - setUpMethod.setAccessible(true); - setUpMethod.invoke(testCase); - } catch (Exception e) { - throw new RuntimeException(e); - } finally { - // Thread.currentThread().setContextClassLoader(tccl); - // Allow privileged access to set class loader. Requires RuntimePermission - // setContextClassLoader in security policy. - final ClassLoader finaltccl = tccl; - AccessController.doPrivileged(new PrivilegedAction<Object>() { - public Object run() { - Thread.currentThread().setContextClassLoader(finaltccl); - return null; - } - }); - } - } - - public static class ClassLoaderImpl extends URLClassLoader { - private Set<String> isolatedClasses = new HashSet<String>(); - - /** - * @param urls - * @param parent - */ - public ClassLoaderImpl(URL[] urls, ClassLoader parent, String... sharedClasses) { - super(urls, parent); - this.isolatedClasses.addAll(Arrays.asList(sharedClasses)); - } - - @Override - protected synchronized Class<?> loadClass(String name, boolean resolve) throws ClassNotFoundException { - if (!isolatedClasses.contains(name)) { - return super.loadClass(name, resolve); - } else { - Class<?> cls = findLoadedClass(name); - if (cls == null) { - cls = findClass(name); - } - if (resolve) { - resolveClass(cls); - } - return cls; - } - } - - } - -} diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-ws/holder-ws-service/pom.xml b/sca-java-2.x/trunk/samples/learning-more/binding-ws/holder-ws-service/pom.xml deleted file mode 100644 index e910931a27..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/binding-ws/holder-ws-service/pom.xml +++ /dev/null @@ -1,124 +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-samples</artifactId>
- <version>2.0-SNAPSHOT</version>
- <relativePath>../../../pom.xml</relativePath>
- </parent>
-
- <packaging>jar</packaging>
- <artifactId>sample-holder-ws-service</artifactId>
- <name>Apache Tuscany SCA Holder Input/Output Web Service Sample</name>
-
- <dependencies>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-assembly</artifactId>
- <version>2.0-SNAPSHOT</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-sca-api</artifactId>
- <version>2.0-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-node-api</artifactId>
- <version>2.0-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-node-impl</artifactId>
- <version>2.0-SNAPSHOT</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-implementation-java-runtime</artifactId>
- <version>2.0-SNAPSHOT</version>
- <scope>runtime</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-binding-ws</artifactId>
- <version>2.0-SNAPSHOT</version>
- <scope>runtime</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-binding-ws-wsdlgen</artifactId>
- <version>2.0-SNAPSHOT</version>
- <scope>runtime</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-host-http</artifactId>
- <version>2.0-SNAPSHOT</version>
- <scope>runtime</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-host-jetty</artifactId>
- <version>2.0-SNAPSHOT</version>
- <scope>runtime</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-policy-security</artifactId>
- <version>2.0-SNAPSHOT</version>
- <scope>runtime</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-binding-ws-runtime-axis2</artifactId>
- <version>2.0-SNAPSHOT</version>
- <scope>runtime</scope>
- </dependency>
-
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.8.1</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
- <build>
- <finalName>${project.artifactId}</finalName>
- <plugins>
- <plugin>
- <groupId>org.apache.tuscany.maven.plugins</groupId>
- <artifactId>maven-tuscany-plugin</artifactId>
- <version>2.0-SNAPSHOT</version>
- </plugin>
- </plugins>
- </build>
-</project>
diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-ws/holder-ws-service/src/main/java/org/example/orderservice/ObjectFactory.java b/sca-java-2.x/trunk/samples/learning-more/binding-ws/holder-ws-service/src/main/java/org/example/orderservice/ObjectFactory.java deleted file mode 100644 index c812c53eeb..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/binding-ws/holder-ws-service/src/main/java/org/example/orderservice/ObjectFactory.java +++ /dev/null @@ -1,74 +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 org.example.orderservice;
-
-import javax.xml.bind.annotation.XmlRegistry;
-
-
-/**
- * This object contains factory methods for each
- * Java content interface and Java element interface
- * generated in the org.example.orderservice package.
- * <p>An ObjectFactory allows you to programatically
- * construct new instances of the Java representation
- * for XML content. The Java representation of XML
- * content can consist of schema derived interfaces
- * and classes representing the binding of schema
- * type definitions, element declarations and model
- * groups. Factory methods for each of these are
- * provided in this class.
- *
- */
-@XmlRegistry
-public class ObjectFactory {
-
-
- /**
- * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: org.example.orderservice
- *
- */
- public ObjectFactory() {
- }
-
- /**
- * Create an instance of {@link ReviewOrderResponse }
- *
- */
- public ReviewOrderResponse createReviewOrderResponse() {
- return new ReviewOrderResponse();
- }
-
- /**
- * Create an instance of {@link Order }
- *
- */
- public Order createOrder() {
- return new Order();
- }
-
- /**
- * Create an instance of {@link ReviewOrder }
- *
- */
- public ReviewOrder createReviewOrder() {
- return new ReviewOrder();
- }
-
-}
diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-ws/holder-ws-service/src/main/java/org/example/orderservice/Order.java b/sca-java-2.x/trunk/samples/learning-more/binding-ws/holder-ws-service/src/main/java/org/example/orderservice/Order.java deleted file mode 100644 index 2a4bb26858..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/binding-ws/holder-ws-service/src/main/java/org/example/orderservice/Order.java +++ /dev/null @@ -1,147 +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 org.example.orderservice;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>Java class for order complex type.
- *
- * <p>The following schema fragment specifies the expected content contained within this class.
- *
- * <pre>
- * <complexType name="order">
- * <complexContent>
- * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- * <sequence>
- * <element name="customerId" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/>
- * <element name="status" type="{http://www.example.org/OrderService/}status" minOccurs="0"/>
- * <element name="total" type="{http://www.w3.org/2001/XMLSchema}double"/>
- * <element name="orderId" type="{http://www.w3.org/2001/XMLSchema}int"/>
- * </sequence>
- * </restriction>
- * </complexContent>
- * </complexType>
- * </pre>
- *
- *
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "order", propOrder = {
- "customerId",
- "status",
- "total",
- "orderId"
-})
-public class Order {
-
- protected String customerId;
- protected Status status;
- protected double total;
- protected int orderId;
-
- /**
- * Gets the value of the customerId property.
- *
- * @return
- * possible object is
- * {@link String }
- *
- */
- public String getCustomerId() {
- return customerId;
- }
-
- /**
- * Sets the value of the customerId property.
- *
- * @param value
- * allowed object is
- * {@link String }
- *
- */
- public void setCustomerId(String value) {
- this.customerId = value;
- }
-
- /**
- * Gets the value of the status property.
- *
- * @return
- * possible object is
- * {@link Status }
- *
- */
- public Status getStatus() {
- return status;
- }
-
- /**
- * Sets the value of the status property.
- *
- * @param value
- * allowed object is
- * {@link Status }
- *
- */
- public void setStatus(Status value) {
- this.status = value;
- }
-
- /**
- * Gets the value of the total property.
- *
- */
- public double getTotal() {
- return total;
- }
-
- /**
- * Sets the value of the total property.
- *
- */
- public void setTotal(double value) {
- this.total = value;
- }
-
- /**
- * Gets the value of the orderId property.
- *
- */
- public int getOrderId() {
- return orderId;
- }
-
- /**
- * Sets the value of the orderId property.
- *
- */
- public void setOrderId(int value) {
- this.orderId = value;
- }
-
- // Added manually from wsimport generated class to improve debugging.
- public String toString() {
- return "Order[customerId=" + customerId + ",orderId=" + orderId + ",total=" + total + ",status=" + status.value() + "]";
- }
-}
diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-ws/holder-ws-service/src/main/java/org/example/orderservice/OrderService.java b/sca-java-2.x/trunk/samples/learning-more/binding-ws/holder-ws-service/src/main/java/org/example/orderservice/OrderService.java deleted file mode 100644 index b0990423b8..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/binding-ws/holder-ws-service/src/main/java/org/example/orderservice/OrderService.java +++ /dev/null @@ -1,55 +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 org.example.orderservice;
-
-import javax.jws.WebMethod;
-import javax.jws.WebParam;
-import javax.jws.WebService;
-import javax.xml.bind.annotation.XmlSeeAlso;
-import javax.xml.ws.Holder;
-import javax.xml.ws.RequestWrapper;
-import javax.xml.ws.ResponseWrapper;
-
-
-/**
- * This class was generated by the JAX-WS RI.
- * JAX-WS RI 2.1.1 in JDK 6
- * Generated source version: 2.1
- *
- */
-@WebService(name = "OrderService", targetNamespace = "http://www.example.org/OrderService/")
-@XmlSeeAlso({
- ObjectFactory.class
-})
-public interface OrderService {
-
-
- /**
- *
- * @param myData
- */
- @WebMethod(action = "http://www.example.org/OrderService/reviewOrder")
- @RequestWrapper(localName = "reviewOrder", targetNamespace = "http://www.example.org/OrderService/", className = "org.example.orderservice.ReviewOrder")
- @ResponseWrapper(localName = "reviewOrderResponse", targetNamespace = "http://www.example.org/OrderService/", className = "org.example.orderservice.ReviewOrderResponse")
- public void reviewOrder(
- @WebParam(name = "myData", targetNamespace = "", mode = WebParam.Mode.INOUT)
- Holder<Order> myData);
-
-}
diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-ws/holder-ws-service/src/main/java/org/example/orderservice/OrderServiceImpl.java b/sca-java-2.x/trunk/samples/learning-more/binding-ws/holder-ws-service/src/main/java/org/example/orderservice/OrderServiceImpl.java deleted file mode 100644 index 7cb75ae843..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/binding-ws/holder-ws-service/src/main/java/org/example/orderservice/OrderServiceImpl.java +++ /dev/null @@ -1,65 +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 org.example.orderservice;
-
-// import org.osoa.sca.annotations.Service;
-import java.util.Random;
-
-import javax.jws.WebMethod;
-import javax.jws.WebParam;
-import javax.xml.ws.Holder;
-import javax.xml.ws.RequestWrapper;
-import javax.xml.ws.ResponseWrapper;
-
-/**
- * This class implements the OrderService service.
- */
-// @Service(OrderService.class)
-public class OrderServiceImpl implements OrderService {
-
- /** This dummy implementation approves or rejects orders:
- * < 100 - always approved.
- * 100-1100 - randomly approved. Probability = (1100 - amount)/10
- * >1100 - always rejected.
- */
- // public Order reviewOrder(Order order) {
- @WebMethod(action = "http://www.example.org/OrderService/reviewOrder")
- @RequestWrapper(localName = "reviewOrder", targetNamespace = "http://www.example.org/OrderService/", className = "org.example.orderservice.ReviewOrder")
- @ResponseWrapper(localName = "reviewOrderResponse", targetNamespace = "http://www.example.org/OrderService/", className = "org.example.orderservice.ReviewOrderResponse")
- public void reviewOrder(
- @WebParam(name = "myData", targetNamespace = "", mode = WebParam.Mode.INOUT)
- Holder<Order> myData) {
- Order order = myData.value;
- double total = order.getTotal();
- if ( total < 100.0 ) {
- order.setStatus( Status.APPROVED );
- } else if ( total > 1100.0 ) {
- order.setStatus( Status.REJECTED );
- } else {
- int probability = (int) ((-100.0 + total) / 10.0);
- Random approver = new Random();
- if ( approver.nextInt( 100 ) < probability )
- order.setStatus( Status.APPROVED );
- else
- order.setStatus( Status.REJECTED );
- }
- System.out.println( ">>> OrderService.reviewOrder return=" + order );
- // return order;
- }
-}
diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-ws/holder-ws-service/src/main/java/org/example/orderservice/OrderServiceServer.java b/sca-java-2.x/trunk/samples/learning-more/binding-ws/holder-ws-service/src/main/java/org/example/orderservice/OrderServiceServer.java deleted file mode 100644 index bbcfb3b961..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/binding-ws/holder-ws-service/src/main/java/org/example/orderservice/OrderServiceServer.java +++ /dev/null @@ -1,112 +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 org.example.orderservice;
-
-import java.io.IOException;
-
-import javax.xml.ws.Holder;
-
-import org.apache.tuscany.sca.node.Contribution;
-import org.apache.tuscany.sca.node.ContributionLocationHelper;
-import org.apache.tuscany.sca.node.Node;
-import org.apache.tuscany.sca.node.NodeFactory;
-
-/**
- * Tests that the order server responds.
- */
-public class OrderServiceServer {
-
- private Node node;
-
- public static void main(String[] args) throws Exception {
- OrderServiceServer oss = new OrderServiceServer();
-
- oss.startServer();
- oss.testOrderReviewApproved();
- oss.testOrderReviewRejected();
- oss.testOrderReviewRandom();
- oss.stopServer();
- }
-
-
- public void startServer() throws Exception {
- try {
-
- NodeFactory factory = NodeFactory.newInstance();
- String contribution = ContributionLocationHelper.getContributionLocation(OrderService_Service.class);
- node = factory.createNode("orderws.composite", new Contribution("order", contribution)).start();
- } catch (Exception e) {
- e.printStackTrace();
- }
-
- }
-
- public void testOrderReviewApproved() throws IOException {
- OrderService orderService =
- node.getService(OrderService.class, "OrderServiceComponent/OrderService");
-
- Order order = new Order();
- order.setStatus( Status.CREATED );
- order.setCustomerId("cust1234");
- order.setTotal( 50.0 );
-
- System.out.println( ">>> Order submitted=" + order );
- Holder<Order> holder = new Holder<Order>( order );
- orderService.reviewOrder( holder );
- System.out.println( ">>> Order returned=" + holder.value );
- }
-
-
- public void testOrderReviewRejected() throws IOException {
- OrderService orderService =
- node.getService(OrderService.class, "OrderServiceComponent/OrderService");
-
- Order order = new Order();
- order.setStatus( Status.CREATED );
- order.setCustomerId("cust2345");
- order.setTotal( 50000.0 );
-
- System.out.println( ">>> Order submitted=" + order );
- Holder<Order> holder = new Holder<Order>( order );
- orderService.reviewOrder( holder );
- System.out.println( ">>> Order returned=" + holder.value );
- }
-
- public void testOrderReviewRandom() throws IOException {
- OrderService orderService =
- node.getService(OrderService.class, "OrderServiceComponent/OrderService");
-
- Order order = new Order();
- order.setStatus( Status.CREATED );
- order.setCustomerId("cust3456");
- order.setTotal( 600.0 );
-
- System.out.println( ">>> Order submitted=" + order );
- Holder<Order> holder = new Holder<Order>( order );
- orderService.reviewOrder( holder );
- System.out.println( ">>> Order returned=" + holder.value );
- }
-
-
- public void stopServer() throws Exception {
- if (node != null)
- node.stop();
- }
-
-}
diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-ws/holder-ws-service/src/main/java/org/example/orderservice/OrderService_Service.java b/sca-java-2.x/trunk/samples/learning-more/binding-ws/holder-ws-service/src/main/java/org/example/orderservice/OrderService_Service.java deleted file mode 100644 index fbcdff735d..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/binding-ws/holder-ws-service/src/main/java/org/example/orderservice/OrderService_Service.java +++ /dev/null @@ -1,84 +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 org.example.orderservice;
-
-import java.net.MalformedURLException;
-import java.net.URL;
-import javax.xml.namespace.QName;
-import javax.xml.ws.Service;
-import javax.xml.ws.WebEndpoint;
-import javax.xml.ws.WebServiceClient;
-import javax.xml.ws.WebServiceFeature;
-
-
-/**
- * This class was generated by the JAX-WS RI.
- * JAX-WS RI 2.1.1 in JDK 6
- * Generated source version: 2.1
- *
- */
-@WebServiceClient(name = "OrderService", targetNamespace = "http://www.example.org/OrderService/", wsdlLocation = "META-INF/sca-deployables/orderservice.wsdl")
-public class OrderService_Service
- extends Service
-{
-
- private final static URL ORDERSERVICE_WSDL_LOCATION;
-
- static {
- URL url = null;
- try {
- url = new URL("META-INF/sca-deployables/orderservice.wsdl");
- } catch (MalformedURLException e) {
- e.printStackTrace();
- }
- ORDERSERVICE_WSDL_LOCATION = url;
- }
-
- public OrderService_Service(URL wsdlLocation, QName serviceName) {
- super(wsdlLocation, serviceName);
- }
-
- public OrderService_Service() {
- super(ORDERSERVICE_WSDL_LOCATION, new QName("http://www.example.org/OrderService/", "OrderService"));
- }
-
- /**
- *
- * @return
- * returns OrderService
- */
- @WebEndpoint(name = "OrderServiceSOAP")
- public OrderService getOrderServiceSOAP() {
- return (OrderService)super.getPort(new QName("http://www.example.org/OrderService/", "OrderServiceSOAP"), OrderService.class);
- }
-
- /**
- *
- * @param features
- * A list of {@link javax.xml.ws.WebServiceFeature} to configure on the proxy. Supported features not in the <code>features</code> parameter will have their default values.
- * @return
- * returns OrderService
- */
- @WebEndpoint(name = "OrderServiceSOAP")
- public OrderService getOrderServiceSOAP(WebServiceFeature... features) {
- return (OrderService)super.getPort(new QName("http://www.example.org/OrderService/", "OrderServiceSOAP"), OrderService.class, features);
- }
-
-}
diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-ws/holder-ws-service/src/main/java/org/example/orderservice/ReviewOrder.java b/sca-java-2.x/trunk/samples/learning-more/binding-ws/holder-ws-service/src/main/java/org/example/orderservice/ReviewOrder.java deleted file mode 100644 index ea00efb42e..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/binding-ws/holder-ws-service/src/main/java/org/example/orderservice/ReviewOrder.java +++ /dev/null @@ -1,82 +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 org.example.orderservice;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>Java class for anonymous complex type.
- *
- * <p>The following schema fragment specifies the expected content contained within this class.
- *
- * <pre>
- * <complexType>
- * <complexContent>
- * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- * <sequence>
- * <element name="myData" type="{http://www.example.org/OrderService/}order"/>
- * </sequence>
- * </restriction>
- * </complexContent>
- * </complexType>
- * </pre>
- *
- *
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "", propOrder = {
- "myData"
-})
-@XmlRootElement(name = "reviewOrder")
-public class ReviewOrder {
-
- @XmlElement(required = true)
- protected Order myData;
-
- /**
- * Gets the value of the myData property.
- *
- * @return
- * possible object is
- * {@link Order }
- *
- */
- public Order getMyData() {
- return myData;
- }
-
- /**
- * Sets the value of the myData property.
- *
- * @param value
- * allowed object is
- * {@link Order }
- *
- */
- public void setMyData(Order value) {
- this.myData = value;
- }
-
-}
diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-ws/holder-ws-service/src/main/java/org/example/orderservice/ReviewOrderResponse.java b/sca-java-2.x/trunk/samples/learning-more/binding-ws/holder-ws-service/src/main/java/org/example/orderservice/ReviewOrderResponse.java deleted file mode 100644 index 7b27c7d4b5..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/binding-ws/holder-ws-service/src/main/java/org/example/orderservice/ReviewOrderResponse.java +++ /dev/null @@ -1,82 +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 org.example.orderservice;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>Java class for anonymous complex type.
- *
- * <p>The following schema fragment specifies the expected content contained within this class.
- *
- * <pre>
- * <complexType>
- * <complexContent>
- * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- * <sequence>
- * <element name="myData" type="{http://www.example.org/OrderService/}order"/>
- * </sequence>
- * </restriction>
- * </complexContent>
- * </complexType>
- * </pre>
- *
- *
- */
-@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "", propOrder = {
- "myData"
-})
-@XmlRootElement(name = "reviewOrderResponse")
-public class ReviewOrderResponse {
-
- @XmlElement(required = true)
- protected Order myData;
-
- /**
- * Gets the value of the myData property.
- *
- * @return
- * possible object is
- * {@link Order }
- *
- */
- public Order getMyData() {
- return myData;
- }
-
- /**
- * Sets the value of the myData property.
- *
- * @param value
- * allowed object is
- * {@link Order }
- *
- */
- public void setMyData(Order value) {
- this.myData = value;
- }
-
-}
diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-ws/holder-ws-service/src/main/java/org/example/orderservice/Status.java b/sca-java-2.x/trunk/samples/learning-more/binding-ws/holder-ws-service/src/main/java/org/example/orderservice/Status.java deleted file mode 100644 index 83b198ab35..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/binding-ws/holder-ws-service/src/main/java/org/example/orderservice/Status.java +++ /dev/null @@ -1,75 +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 org.example.orderservice;
-
-import javax.xml.bind.annotation.XmlEnum;
-import javax.xml.bind.annotation.XmlEnumValue;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>Java class for status.
- *
- * <p>The following schema fragment specifies the expected content contained within this class.
- * <p>
- * <pre>
- * <simpleType name="status">
- * <restriction base="{http://www.w3.org/2001/XMLSchema}string">
- * <enumeration value="Created"/>
- * <enumeration value="Submitted"/>
- * <enumeration value="Approved"/>
- * <enumeration value="Rejected"/>
- * </restriction>
- * </simpleType>
- * </pre>
- *
- */
-@XmlType(name = "status")
-@XmlEnum
-public enum Status {
-
- @XmlEnumValue("Created")
- CREATED("Created"),
- @XmlEnumValue("Submitted")
- SUBMITTED("Submitted"),
- @XmlEnumValue("Approved")
- APPROVED("Approved"),
- @XmlEnumValue("Rejected")
- REJECTED("Rejected");
- private final String value;
-
- Status(String v) {
- value = v;
- }
-
- public String value() {
- return value;
- }
-
- public static Status fromValue(String v) {
- for (Status c: Status.values()) {
- if (c.value.equals(v)) {
- return c;
- }
- }
- throw new IllegalArgumentException(v);
- }
-
-}
diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-ws/holder-ws-service/src/main/java/org/example/orderservice/package-info.java b/sca-java-2.x/trunk/samples/learning-more/binding-ws/holder-ws-service/src/main/java/org/example/orderservice/package-info.java deleted file mode 100644 index 4acc5af9b0..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/binding-ws/holder-ws-service/src/main/java/org/example/orderservice/package-info.java +++ /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.
- */
-
-@javax.xml.bind.annotation.XmlSchema(namespace = "http://www.example.org/OrderService/")
-package org.example.orderservice;
diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-ws/holder-ws-service/src/main/resources/orderws.composite b/sca-java-2.x/trunk/samples/learning-more/binding-ws/holder-ws-service/src/main/resources/orderws.composite deleted file mode 100644 index eeba5ac050..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/binding-ws/holder-ws-service/src/main/resources/orderws.composite +++ /dev/null @@ -1,33 +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://docs.oasis-open.org/ns/opencsa/sca/200912"
- targetNamespace="http://orderservice"
- xmlns:hw="http://orderservice"
- name="orderws">
-
- <component name="OrderServiceComponent">
- <implementation.java class="org.example.orderservice.OrderServiceImpl" />
- <service name="OrderService">
- <interface.wsdl interface="http://www.example.org/OrderService/#wsdl.interface(OrderService)" />
- <binding.ws uri="http://localhost:8085/OrderService"/>
- </service>
- </component>
-
-</composite>
diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-ws/holder-ws-service/src/main/resources/wsdl/orderservice.wsdl b/sca-java-2.x/trunk/samples/learning-more/binding-ws/holder-ws-service/src/main/resources/wsdl/orderservice.wsdl deleted file mode 100644 index d016994679..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/binding-ws/holder-ws-service/src/main/resources/wsdl/orderservice.wsdl +++ /dev/null @@ -1,89 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!--
- * 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.
--->
-<wsdl:definitions xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" xmlns:tns="http://www.example.org/OrderService/" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" name="OrderService" targetNamespace="http://www.example.org/OrderService/">
- <wsdl:types>
- <xsd:schema targetNamespace="http://www.example.org/OrderService/">
- <xsd:complexType name="order">
- <xsd:sequence>
- <xsd:element name="customerId" type="xsd:string" minOccurs="0" />
- <xsd:element name="status" type="tns:status" minOccurs="0" />
- <xsd:element name="total" type="xsd:double" />
- <xsd:element name="orderId" type="xsd:int" />
- </xsd:sequence>
- </xsd:complexType>
-
- <xsd:simpleType name="status">
- <xsd:restriction base="xsd:string">
- <xsd:enumeration value="Created" />
- <xsd:enumeration value="Submitted" />
- <xsd:enumeration value="Approved" />
- <xsd:enumeration value="Rejected" />
- </xsd:restriction>
- </xsd:simpleType>
-
- <xsd:element name="reviewOrder">
- <xsd:complexType>
- <xsd:sequence>
- <xsd:element name="myData" type="tns:order"
- minOccurs="1" maxOccurs="1" />
- </xsd:sequence>
- </xsd:complexType>
- </xsd:element>
- <xsd:element name="reviewOrderResponse">
- <xsd:complexType>
- <xsd:sequence>
- <xsd:element name="myData" type="tns:order"
- minOccurs="1" maxOccurs="1" />
- </xsd:sequence>
- </xsd:complexType>
- </xsd:element>
-
- </xsd:schema>
- </wsdl:types>
- <wsdl:message name="reviewOrderRequest">
- <wsdl:part element="tns:reviewOrder" name="myParameters"/>
- </wsdl:message>
- <wsdl:message name="reviewOrderResponse">
- <wsdl:part element="tns:reviewOrderResponse" name="myResult"/>
- </wsdl:message>
- <wsdl:portType name="OrderService">
- <wsdl:operation name="reviewOrder">
- <wsdl:input message="tns:reviewOrderRequest"/>
- <wsdl:output message="tns:reviewOrderResponse"/>
- </wsdl:operation>
- </wsdl:portType>
- <wsdl:binding name="OrderServiceSOAP" type="tns:OrderService">
- <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
- <wsdl:operation name="reviewOrder">
- <soap:operation soapAction="http://www.example.org/OrderService/reviewOrder"/>
- <wsdl:input>
- <soap:body use="literal"/>
- </wsdl:input>
- <wsdl:output>
- <soap:body use="literal"/>
- </wsdl:output>
- </wsdl:operation>
- </wsdl:binding>
- <wsdl:service name="OrderService">
- <wsdl:port binding="tns:OrderServiceSOAP" name="OrderServiceSOAP">
- <soap:address location="http://www.example.org/"/>
- </wsdl:port>
- </wsdl:service>
-</wsdl:definitions>
diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-ws/holder-ws-service/src/test/java/org/example/orderservice/OrderServiceTestCase.java b/sca-java-2.x/trunk/samples/learning-more/binding-ws/holder-ws-service/src/test/java/org/example/orderservice/OrderServiceTestCase.java deleted file mode 100644 index bb135adb26..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/binding-ws/holder-ws-service/src/test/java/org/example/orderservice/OrderServiceTestCase.java +++ /dev/null @@ -1,116 +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 org.example.orderservice;
-
-import static junit.framework.Assert.assertNotNull;
-import static junit.framework.Assert.assertTrue;
-
-import java.io.IOException;
-
-import javax.xml.ws.Holder;
-
-import org.apache.tuscany.sca.node.Contribution;
-import org.apache.tuscany.sca.node.ContributionLocationHelper;
-import org.apache.tuscany.sca.node.Node;
-import org.apache.tuscany.sca.node.NodeFactory;
-import org.junit.After;
-import org.junit.Before;
-import org.junit.Test;
-
-/**
- * Tests that the order server responds.
- */
-public class OrderServiceTestCase {
-
- private Node node;
-
- @Before
- public void startServer() throws Exception {
- try {
-
- NodeFactory factory = NodeFactory.newInstance();
- String contribution = ContributionLocationHelper.getContributionLocation(OrderService_Service.class);
- node = factory.createNode("orderws.composite", new Contribution("order", contribution)).start();
- } catch (Exception e) {
- e.printStackTrace();
- }
-
- }
-
- @Test
- public void testOrderReviewApproved() throws IOException {
- OrderService orderService =
- node.getService(OrderService.class, "OrderServiceComponent/OrderService");
- assertNotNull(orderService);
-
- Order order = new Order();
- order.setStatus( Status.CREATED );
- order.setCustomerId("cust1234");
- order.setTotal( 50.0 );
-
- System.out.println( ">>> Order submitted=" + order );
- Holder<Order> holder = new Holder<Order>( order );
- orderService.reviewOrder( holder );
- System.out.println( ">>> Order returned=" + holder.value );
- assertTrue( holder.value.getStatus() == Status.APPROVED );
- }
-
- @Test
- public void testOrderReviewRejected() throws IOException {
- OrderService orderService =
- node.getService(OrderService.class, "OrderServiceComponent/OrderService");
- assertNotNull(orderService);
-
- Order order = new Order();
- order.setStatus( Status.CREATED );
- order.setCustomerId("cust2345");
- order.setTotal( 50000.0 );
-
- System.out.println( ">>> Order submitted=" + order );
- Holder<Order> holder = new Holder<Order>( order );
- orderService.reviewOrder( holder );
- System.out.println( ">>> Order returned=" + holder.value );
- assertTrue( holder.value.getStatus() == Status.REJECTED );
- }
-
- @Test
- public void testOrderReviewRandom() throws IOException {
- OrderService orderService =
- node.getService(OrderService.class, "OrderServiceComponent/OrderService");
- assertNotNull(orderService);
-
- Order order = new Order();
- order.setStatus( Status.CREATED );
- order.setCustomerId("cust3456");
- order.setTotal( 600.0 );
-
- System.out.println( ">>> Order submitted=" + order );
- Holder<Order> holder = new Holder<Order>( order );
- orderService.reviewOrder( holder );
- System.out.println( ">>> Order returned=" + holder.value );
- assertTrue( holder.value.getStatus() != Status.CREATED );
- }
-
- @After
- public void stopServer() throws Exception {
- if (node != null)
- node.stop();
- }
-
-}
diff --git a/sca-java-2.x/trunk/samples/learning-more/binding-ws/pom.xml b/sca-java-2.x/trunk/samples/learning-more/binding-ws/pom.xml deleted file mode 100644 index 5cf72633fe..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/binding-ws/pom.xml +++ /dev/null @@ -1,44 +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-samples-learning-more</artifactId>
- <version>2.0-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
- </parent>
- <artifactId>tuscany-sample-binding-ws</artifactId>
- <packaging>pom</packaging>
- <name>Apache Tuscany SCA Sample binding.ws</name>
-
- <profiles>
- <profile>
- <id>default</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
- <modules>
- <module>calculator-contribution</module> - <!--module>helloworld-ws-sdo-contribution</module-->
- </modules>
- </profile>
- </profiles>
-</project>
diff --git a/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/dosgi-dynamic-calculator-operations/LICENSE b/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/dosgi-dynamic-calculator-operations/LICENSE deleted file mode 100644 index 6e529a25c4..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/dosgi-dynamic-calculator-operations/LICENSE +++ /dev/null @@ -1,205 +0,0 @@ -
- Apache License
- Version 2.0, January 2004
- http://www.apache.org/licenses/
-
- TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
- 1. Definitions.
-
- "License" shall mean the terms and conditions for use, reproduction,
- and distribution as defined by Sections 1 through 9 of this document.
-
- "Licensor" shall mean the copyright owner or entity authorized by
- the copyright owner that is granting the License.
-
- "Legal Entity" shall mean the union of the acting entity and all
- other entities that control, are controlled by, or are under common
- control with that entity. For the purposes of this definition,
- "control" means (i) the power, direct or indirect, to cause the
- direction or management of such entity, whether by contract or
- otherwise, or (ii) ownership of fifty percent (50%) or more of the
- outstanding shares, or (iii) beneficial ownership of such entity.
-
- "You" (or "Your") shall mean an individual or Legal Entity
- exercising permissions granted by this License.
-
- "Source" form shall mean the preferred form for making modifications,
- including but not limited to software source code, documentation
- source, and configuration files.
-
- "Object" form shall mean any form resulting from mechanical
- transformation or translation of a Source form, including but
- not limited to compiled object code, generated documentation,
- and conversions to other media types.
-
- "Work" shall mean the work of authorship, whether in Source or
- Object form, made available under the License, as indicated by a
- copyright notice that is included in or attached to the work
- (an example is provided in the Appendix below).
-
- "Derivative Works" shall mean any work, whether in Source or Object
- form, that is based on (or derived from) the Work and for which the
- editorial revisions, annotations, elaborations, or other modifications
- represent, as a whole, an original work of authorship. For the purposes
- of this License, Derivative Works shall not include works that remain
- separable from, or merely link (or bind by name) to the interfaces of,
- the Work and Derivative Works thereof.
-
- "Contribution" shall mean any work of authorship, including
- the original version of the Work and any modifications or additions
- to that Work or Derivative Works thereof, that is intentionally
- submitted to Licensor for inclusion in the Work by the copyright owner
- or by an individual or Legal Entity authorized to submit on behalf of
- the copyright owner. For the purposes of this definition, "submitted"
- means any form of electronic, verbal, or written communication sent
- to the Licensor or its representatives, including but not limited to
- communication on electronic mailing lists, source code control systems,
- and issue tracking systems that are managed by, or on behalf of, the
- Licensor for the purpose of discussing and improving the Work, but
- excluding communication that is conspicuously marked or otherwise
- designated in writing by the copyright owner as "Not a Contribution."
-
- "Contributor" shall mean Licensor and any individual or Legal Entity
- on behalf of whom a Contribution has been received by Licensor and
- subsequently incorporated within the Work.
-
- 2. Grant of Copyright License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- copyright license to reproduce, prepare Derivative Works of,
- publicly display, publicly perform, sublicense, and distribute the
- Work and such Derivative Works in Source or Object form.
-
- 3. Grant of Patent License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- (except as stated in this section) patent license to make, have made,
- use, offer to sell, sell, import, and otherwise transfer the Work,
- where such license applies only to those patent claims licensable
- by such Contributor that are necessarily infringed by their
- Contribution(s) alone or by combination of their Contribution(s)
- with the Work to which such Contribution(s) was submitted. If You
- institute patent litigation against any entity (including a
- cross-claim or counterclaim in a lawsuit) alleging that the Work
- or a Contribution incorporated within the Work constitutes direct
- or contributory patent infringement, then any patent licenses
- granted to You under this License for that Work shall terminate
- as of the date such litigation is filed.
-
- 4. Redistribution. You may reproduce and distribute copies of the
- Work or Derivative Works thereof in any medium, with or without
- modifications, and in Source or Object form, provided that You
- meet the following conditions:
-
- (a) You must give any other recipients of the Work or
- Derivative Works a copy of this License; and
-
- (b) You must cause any modified files to carry prominent notices
- stating that You changed the files; and
-
- (c) You must retain, in the Source form of any Derivative Works
- that You distribute, all copyright, patent, trademark, and
- attribution notices from the Source form of the Work,
- excluding those notices that do not pertain to any part of
- the Derivative Works; and
-
- (d) If the Work includes a "NOTICE" text file as part of its
- distribution, then any Derivative Works that You distribute must
- include a readable copy of the attribution notices contained
- within such NOTICE file, excluding those notices that do not
- pertain to any part of the Derivative Works, in at least one
- of the following places: within a NOTICE text file distributed
- as part of the Derivative Works; within the Source form or
- documentation, if provided along with the Derivative Works; or,
- within a display generated by the Derivative Works, if and
- wherever such third-party notices normally appear. The contents
- of the NOTICE file are for informational purposes only and
- do not modify the License. You may add Your own attribution
- notices within Derivative Works that You distribute, alongside
- or as an addendum to the NOTICE text from the Work, provided
- that such additional attribution notices cannot be construed
- as modifying the License.
-
- You may add Your own copyright statement to Your modifications and
- may provide additional or different license terms and conditions
- for use, reproduction, or distribution of Your modifications, or
- for any such Derivative Works as a whole, provided Your use,
- reproduction, and distribution of the Work otherwise complies with
- the conditions stated in this License.
-
- 5. Submission of Contributions. Unless You explicitly state otherwise,
- any Contribution intentionally submitted for inclusion in the Work
- by You to the Licensor shall be under the terms and conditions of
- this License, without any additional terms or conditions.
- Notwithstanding the above, nothing herein shall supersede or modify
- the terms of any separate license agreement you may have executed
- with Licensor regarding such Contributions.
-
- 6. Trademarks. This License does not grant permission to use the trade
- names, trademarks, service marks, or product names of the Licensor,
- except as required for reasonable and customary use in describing the
- origin of the Work and reproducing the content of the NOTICE file.
-
- 7. Disclaimer of Warranty. Unless required by applicable law or
- agreed to in writing, Licensor provides the Work (and each
- Contributor provides its Contributions) on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- implied, including, without limitation, any warranties or conditions
- of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
- PARTICULAR PURPOSE. You are solely responsible for determining the
- appropriateness of using or redistributing the Work and assume any
- risks associated with Your exercise of permissions under this License.
-
- 8. Limitation of Liability. In no event and under no legal theory,
- whether in tort (including negligence), contract, or otherwise,
- unless required by applicable law (such as deliberate and grossly
- negligent acts) or agreed to in writing, shall any Contributor be
- liable to You for damages, including any direct, indirect, special,
- incidental, or consequential damages of any character arising as a
- result of this License or out of the use or inability to use the
- Work (including but not limited to damages for loss of goodwill,
- work stoppage, computer failure or malfunction, or any and all
- other commercial damages or losses), even if such Contributor
- has been advised of the possibility of such damages.
-
- 9. Accepting Warranty or Additional Liability. While redistributing
- the Work or Derivative Works thereof, You may choose to offer,
- and charge a fee for, acceptance of support, warranty, indemnity,
- or other liability obligations and/or rights consistent with this
- License. However, in accepting such obligations, You may act only
- on Your own behalf and on Your sole responsibility, not on behalf
- of any other Contributor, and only if You agree to indemnify,
- defend, and hold each Contributor harmless for any liability
- incurred by, or claims asserted against, such Contributor by reason
- of your accepting any such warranty or additional liability.
-
- END OF TERMS AND CONDITIONS
-
- APPENDIX: How to apply the Apache License to your work.
-
- To apply the Apache License to your work, attach the following
- boilerplate notice, with the fields enclosed by brackets "[]"
- replaced with your own identifying information. (Don't include
- the brackets!) The text should be enclosed in the appropriate
- comment syntax for the file format. We also recommend that a
- file or class name and description of purpose be included on the
- same "printed page" as the copyright notice for easier
- identification within third-party archives.
-
- Copyright [yyyy] [name of copyright owner]
-
- Licensed 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.
-
-
-
diff --git a/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/dosgi-dynamic-calculator-operations/META-INF/MANIFEST.MF b/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/dosgi-dynamic-calculator-operations/META-INF/MANIFEST.MF deleted file mode 100644 index cea4e2ff79..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/dosgi-dynamic-calculator-operations/META-INF/MANIFEST.MF +++ /dev/null @@ -1,23 +0,0 @@ -Manifest-Version: 1.0
-Export-Package: calculator.dosgi.operations;version="1.0.1"
-Bundle-Version: 1.0.0
-Bundle-Name: calculator.dosgi.dynamic.operations
-Bundle-Activator: calculator.dosgi.operations.impl.OperationsActivator
-Bundle-ManifestVersion: 2
-Import-Package: calculator.dosgi.operations;version="[1.0.1,1.0.1]",
- org.oasisopen.sca.annotation;version="2.0.0",
- org.osgi.framework,
- org.osgi.service.component;resolution:=optional,
- org.osgi.service.packageadmin
-Bundle-SymbolicName: calculator.dosgi.dynamic.operations
-Bundle-Vendor: The Apache Software Foundation
-Bundle-ActivationPolicy: lazy
-Eclipse-LazyStart: true
-Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt
-Bundle-DocURL: http://www.apache.org/
-Service-Component-Disabled: OSGI-INF/add-component.xml,
- OSGI-INF/subtract-component.xml,
- OSGI-INF/multiply-component.xml,
- OSGI-INF/divide-component.xml
-Bundle-RequiredExecutionEnvironment: J2SE-1.5,JavaSE-1.6 -SCA-Configuration: OSGI-INF/sca-config/*.xml
diff --git a/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/dosgi-dynamic-calculator-operations/NOTICE b/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/dosgi-dynamic-calculator-operations/NOTICE deleted file mode 100644 index f6ce2542c3..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/dosgi-dynamic-calculator-operations/NOTICE +++ /dev/null @@ -1,6 +0,0 @@ -${pom.name}
-Copyright (c) 2005 - 2011 The Apache Software Foundation
-
-This product includes software developed by
-The Apache Software Foundation (http://www.apache.org/).
-
diff --git a/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/dosgi-dynamic-calculator-operations/OSGI-INF/add-component.xml b/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/dosgi-dynamic-calculator-operations/OSGI-INF/add-component.xml deleted file mode 100644 index 99845257ff..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/dosgi-dynamic-calculator-operations/OSGI-INF/add-component.xml +++ /dev/null @@ -1,25 +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. ---> -<scr:component name="AddComponent" xmlns:scr="http://www.osgi.org/xmlns/scr/v1.0.0"> - <implementation class="calculator.dosgi.operations.impl.AddServiceImpl" /> - <service> - <provide interface="calculator.dosgi.operations.AddService" /> - </service> -</scr:component> diff --git a/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/dosgi-dynamic-calculator-operations/OSGI-INF/blueprint/operations-module.xml b/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/dosgi-dynamic-calculator-operations/OSGI-INF/blueprint/operations-module.xml deleted file mode 100644 index f6b5f4690e..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/dosgi-dynamic-calculator-operations/OSGI-INF/blueprint/operations-module.xml +++ /dev/null @@ -1,40 +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. ---> -<!-- A sample module-context.xml for OSGI RFC 124 (BluePrint Service) --> -<components xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0"> - <component id="AddComponent" class="calculator.dosgi.operations.impl.AddServiceImpl"> - </component> - <component id="SubtractComponent" class="calculator.dosgi.operations.impl.SubtractServiceImpl"> - </component> - <component id="MultiplyComponent" class="calculator.dosgi.operations.impl.MultiplyServiceImpl"> - </component> - <component id="DivideComponent" class="calculator.dosgi.operations.impl.DivideServiceImpl"> - </component> - - <!-- We can derive the SCA services for the implementation.osgi --> - <service id="AddService" ref="AddComponent" interface="calculator.dosgi.operations.AddService"> - </service> - <service id="SubtractService" ref="SubtractComponent" interface="calculator.dosgi.operations.SubtractService"> - </service> - <service id="MultiplyService" ref="MultiplyComponent" interface="calculator.dosgi.operations.MultiplyService"> - </service> - <service id="DivideService" ref="DivideComponent" interface="calculator.dosgi.operations.DivideService"> - </service> -</components>
\ No newline at end of file diff --git a/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/dosgi-dynamic-calculator-operations/OSGI-INF/divide-component.xml b/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/dosgi-dynamic-calculator-operations/OSGI-INF/divide-component.xml deleted file mode 100644 index 322d4daf2f..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/dosgi-dynamic-calculator-operations/OSGI-INF/divide-component.xml +++ /dev/null @@ -1,25 +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. ---> -<scr:component name="DivideComponent" xmlns:scr="http://www.osgi.org/xmlns/scr/v1.0.0"> - <implementation class="calculator.dosgi.operations.impl.DivideServiceImpl" /> - <service> - <provide interface="calculator.dosgi.operations.DivideService" /> - </service> -</scr:component> diff --git a/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/dosgi-dynamic-calculator-operations/OSGI-INF/multiply-component.xml b/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/dosgi-dynamic-calculator-operations/OSGI-INF/multiply-component.xml deleted file mode 100644 index b9ca777bd8..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/dosgi-dynamic-calculator-operations/OSGI-INF/multiply-component.xml +++ /dev/null @@ -1,25 +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. ---> -<scr:component name="MultiplyComponent" xmlns:scr="http://www.osgi.org/xmlns/scr/v1.0.0"> - <implementation class="calculator.dosgi.operations.impl.MultiplyServiceImpl" /> - <service> - <provide interface="calculator.dosgi.operations.MultiplyService" /> - </service> -</scr:component> diff --git a/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/dosgi-dynamic-calculator-operations/OSGI-INF/sca-config/operations-config.xml b/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/dosgi-dynamic-calculator-operations/OSGI-INF/sca-config/operations-config.xml deleted file mode 100644 index 1965b571a9..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/dosgi-dynamic-calculator-operations/OSGI-INF/sca-config/operations-config.xml +++ /dev/null @@ -1,29 +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. ---> -<scact:sca-config targetNamespace="http://sample" - xmlns:scact="http://www.osgi.org/xmlns/scact/v1.0.0" - xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200912" - xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.1"> - <tuscany:binding.rmi name="Add" uri="rmi://localhost:8085/AddService"/> - <tuscany:binding.rmi name="Divide" uri="rmi://localhost:8085/DivideService"/> - <tuscany:binding.rmi name="Subtract" uri="rmi://localhost:8085/SubtractService"/> - <tuscany:binding.rmi name="Multiply" uri="rmi://localhost:8085/MultiplyService"/> -</scact:sca-config> -
\ No newline at end of file diff --git a/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/dosgi-dynamic-calculator-operations/OSGI-INF/subtract-component.xml b/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/dosgi-dynamic-calculator-operations/OSGI-INF/subtract-component.xml deleted file mode 100644 index 1472f5a976..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/dosgi-dynamic-calculator-operations/OSGI-INF/subtract-component.xml +++ /dev/null @@ -1,25 +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. ---> -<scr:component name="SubtractComponent" xmlns:scr="http://www.osgi.org/xmlns/scr/v1.0.0"> - <implementation class="calculator.dosgi.operations.impl.SubtractServiceImpl" /> - <service> - <provide interface="calculator.dosgi.operations.SubtractService" /> - </service> -</scr:component> diff --git a/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/dosgi-dynamic-calculator-operations/README b/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/dosgi-dynamic-calculator-operations/README deleted file mode 100644 index 52afa44559..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/dosgi-dynamic-calculator-operations/README +++ /dev/null @@ -1,6 +0,0 @@ -Distributed OSGi Calculator Sample
-==================================
-This sample implements a distributed calculator using Distributed OSGi (RFC 119) over SCA.
-
-See http://tuscany.apache.org/documentation-2x/20-beta-samples-documentation.html
-for more information
diff --git a/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/dosgi-dynamic-calculator-operations/pom.xml b/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/dosgi-dynamic-calculator-operations/pom.xml deleted file mode 100644 index 6f5918b8d1..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/dosgi-dynamic-calculator-operations/pom.xml +++ /dev/null @@ -1,159 +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-samples</artifactId> - <version>2.0-SNAPSHOT</version> - <relativePath>../../../pom.xml</relativePath> - </parent> - - <artifactId>sample-dosgi-dynamic-calculator-operations</artifactId> - <name>Apache Tuscany SCA Sample OSGi Remote Services Dynamic Calculator Operations</name> - - <dependencies> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-base-runtime-pom</artifactId> - <version>2.0-SNAPSHOT</version> - <type>pom</type> - </dependency> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-osgi-runtime-pom</artifactId> - <version>2.0-SNAPSHOT</version> - <type>pom</type> - </dependency> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-binding-rmi-runtime</artifactId> - <version>2.0-SNAPSHOT</version> - </dependency> - - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-node-launcher-equinox</artifactId> - <version>2.0-SNAPSHOT</version> - <scope>test</scope> - </dependency> - - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-node-impl-osgi</artifactId> - <version>2.0-SNAPSHOT</version> - <scope>runtime</scope> - </dependency> - - <dependency> - <groupId>org.eclipse.osgi</groupId> - <artifactId>services</artifactId> - <version>3.2.0-v20090520-1800</version> - <scope>test</scope> - </dependency> - - <!-- Equinox Declarative Services --> - <dependency> - <groupId>org.eclipse.equinox</groupId> - <artifactId>ds</artifactId> - <version>1.1.0-v20090601</version> - <scope>test</scope> - </dependency> - - <dependency> - <groupId>org.eclipse.equinox</groupId> - <artifactId>util</artifactId> - <version>1.0.100-v20090520-1800</version> - <scope>test</scope> - </dependency> - - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>4.8.1</version> - <scope>test</scope> - </dependency> - - </dependencies> - - <build> - <finalName>${project.artifactId}</finalName> - <plugins> - <plugin> - <artifactId>maven-eclipse-plugin</artifactId> - <version>2.5.1</version> - <configuration> - <buildcommands> - <buildcommand>org.eclipse.pde.ManifestBuilder</buildcommand> - <buildcommand>org.eclipse.jdt.core.javabuilder</buildcommand> - </buildcommands> - <projectnatures> - <projectnature>org.eclipse.jdt.core.javanature</projectnature> - <projectnature>org.eclipse.pde.PluginNature</projectnature> - </projectnatures> - <classpathContainers> - <classpathContainer>org.eclipse.jdt.launching.JRE_CONTAINER - </classpathContainer> - </classpathContainers> - </configuration> - </plugin> - - <plugin> - <artifactId>maven-jar-plugin</artifactId> - <configuration> - <archive> - <manifestFile>${basedir}/META-INF/MANIFEST.MF</manifestFile> - </archive> - </configuration> - </plugin> - - <plugin> - <groupId>org.apache.tuscany.maven.plugins</groupId> - <artifactId>maven-osgi-junit-plugin</artifactId> - <version>1.0</version> - <dependencies> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-node-launcher-equinox</artifactId> - <version>${project.version}</version> - </dependency> - </dependencies> - <executions> - <execution> - <id>osgi-test</id> - <phase>test</phase> - <goals> - <goal>test</goal> - </goals> - <configuration> - <systemProperties> - <property> - <name>osgi.configuration.area</name> - <value>${project.build.directory}/equinox</value> - </property> - </systemProperties> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> - -</project> diff --git a/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/dosgi-dynamic-calculator-operations/src/main/java/calculator/dosgi/operations/AddService.java b/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/dosgi-dynamic-calculator-operations/src/main/java/calculator/dosgi/operations/AddService.java deleted file mode 100644 index 971500782f..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/dosgi-dynamic-calculator-operations/src/main/java/calculator/dosgi/operations/AddService.java +++ /dev/null @@ -1,31 +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.dosgi.operations; - -import org.oasisopen.sca.annotation.Remotable; - -/** - * The interface for the add service - */ -@Remotable -public interface AddService { - - double add(double n1, double n2); - -} diff --git a/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/dosgi-dynamic-calculator-operations/src/main/java/calculator/dosgi/operations/DivideService.java b/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/dosgi-dynamic-calculator-operations/src/main/java/calculator/dosgi/operations/DivideService.java deleted file mode 100644 index 49b8a1c0bf..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/dosgi-dynamic-calculator-operations/src/main/java/calculator/dosgi/operations/DivideService.java +++ /dev/null @@ -1,31 +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.dosgi.operations; - -import org.oasisopen.sca.annotation.Remotable; - -/** - * The interface for the divide service - */ -@Remotable -public interface DivideService { - - double divide(double n1, double n2); - -} diff --git a/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/dosgi-dynamic-calculator-operations/src/main/java/calculator/dosgi/operations/MultiplyService.java b/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/dosgi-dynamic-calculator-operations/src/main/java/calculator/dosgi/operations/MultiplyService.java deleted file mode 100644 index f4e59d12ea..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/dosgi-dynamic-calculator-operations/src/main/java/calculator/dosgi/operations/MultiplyService.java +++ /dev/null @@ -1,31 +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.dosgi.operations; - -import org.oasisopen.sca.annotation.Remotable; - -/** - * The interface for the multiply service - */ -@Remotable -public interface MultiplyService { - - double multiply(double n1, double n2); - -} diff --git a/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/dosgi-dynamic-calculator-operations/src/main/java/calculator/dosgi/operations/SubtractService.java b/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/dosgi-dynamic-calculator-operations/src/main/java/calculator/dosgi/operations/SubtractService.java deleted file mode 100644 index bfb9b820f7..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/dosgi-dynamic-calculator-operations/src/main/java/calculator/dosgi/operations/SubtractService.java +++ /dev/null @@ -1,31 +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.dosgi.operations; - -import org.oasisopen.sca.annotation.Remotable; - -/** - * The interface for the subtract service - */ -@Remotable -public interface SubtractService { - - double subtract(double n1, double n2); - -} diff --git a/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/dosgi-dynamic-calculator-operations/src/main/java/calculator/dosgi/operations/impl/AddServiceImpl.java b/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/dosgi-dynamic-calculator-operations/src/main/java/calculator/dosgi/operations/impl/AddServiceImpl.java deleted file mode 100644 index 66b2977241..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/dosgi-dynamic-calculator-operations/src/main/java/calculator/dosgi/operations/impl/AddServiceImpl.java +++ /dev/null @@ -1,37 +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.dosgi.operations.impl; - -import java.util.logging.Level; -import java.util.logging.Logger; - -import calculator.dosgi.operations.AddService; - -/** - * 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.INFO, "Adding " + n1 + " and " + n2); - return n1 + n2; - } - -} diff --git a/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/dosgi-dynamic-calculator-operations/src/main/java/calculator/dosgi/operations/impl/DivideServiceImpl.java b/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/dosgi-dynamic-calculator-operations/src/main/java/calculator/dosgi/operations/impl/DivideServiceImpl.java deleted file mode 100644 index a3c21b2b96..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/dosgi-dynamic-calculator-operations/src/main/java/calculator/dosgi/operations/impl/DivideServiceImpl.java +++ /dev/null @@ -1,37 +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.dosgi.operations.impl; - -import java.util.logging.Level; -import java.util.logging.Logger; - -import calculator.dosgi.operations.DivideService; - -/** - * 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.INFO, "Dividing " + n1 + " with " + n2); - return n1 / n2; - } - -} diff --git a/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/dosgi-dynamic-calculator-operations/src/main/java/calculator/dosgi/operations/impl/MultiplyServiceImpl.java b/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/dosgi-dynamic-calculator-operations/src/main/java/calculator/dosgi/operations/impl/MultiplyServiceImpl.java deleted file mode 100644 index 7922d2d392..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/dosgi-dynamic-calculator-operations/src/main/java/calculator/dosgi/operations/impl/MultiplyServiceImpl.java +++ /dev/null @@ -1,37 +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.dosgi.operations.impl; - -import java.util.logging.Level; -import java.util.logging.Logger; - -import calculator.dosgi.operations.MultiplyService; - -/** - * 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.INFO, "Multiplying " + n1 + " with " + n2); - return n1 * n2; - } - -} diff --git a/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/dosgi-dynamic-calculator-operations/src/main/java/calculator/dosgi/operations/impl/OperationsActivator.java b/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/dosgi-dynamic-calculator-operations/src/main/java/calculator/dosgi/operations/impl/OperationsActivator.java deleted file mode 100644 index f75cc6444e..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/dosgi-dynamic-calculator-operations/src/main/java/calculator/dosgi/operations/impl/OperationsActivator.java +++ /dev/null @@ -1,94 +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.dosgi.operations.impl; - -import java.util.Dictionary; -import java.util.Hashtable; -import java.util.logging.Logger; - -import org.osgi.framework.Bundle; -import org.osgi.framework.BundleActivator; -import org.osgi.framework.BundleContext; -import org.osgi.framework.ServiceReference; -import org.osgi.service.packageadmin.PackageAdmin; - -import calculator.dosgi.operations.AddService; -import calculator.dosgi.operations.DivideService; -import calculator.dosgi.operations.MultiplyService; -import calculator.dosgi.operations.SubtractService; - -/** - * - */ -public class OperationsActivator implements BundleActivator { - private Logger logger = Logger.getLogger(OperationsActivator.class.getName()); - - public void start(BundleContext context) throws Exception { - logger.info("Starting " + context.getBundle()); - - Dictionary<String, Object> props = new Hashtable<String, Object>(); - props.put("service.exported.configs", new String[] {"org.osgi.sca"}); - props.put("service.exported.interfaces", new String[] {"*"}); - - logger.info("Registering " + AddService.class.getName()); - props.put("sca.service", "AddComponent#service-name(Add)"); - props.put("org.osgi.sca.bindings", new String[] {"{http://sample}Add"}); - context.registerService(AddService.class.getName(), new AddServiceImpl(), props); - - logger.info("Registering " + SubtractService.class.getName()); - props.put("sca.service", "SubtractComponent#service-name(Subtract)"); - props.put("org.osgi.sca.bindings", new String[] {"{http://sample}Subtract"}); - context.registerService(SubtractService.class.getName(), new SubtractServiceImpl(), props); - - logger.info("Registering " + MultiplyService.class.getName()); - props.put("sca.service", "MultiplyComponent#service-name(Multiply)"); - props.put("org.osgi.sca.bindings", new String[] {"{http://sample}Multiply"}); - context.registerService(MultiplyService.class.getName(), new MultiplyServiceImpl(), props); - - logger.info("Registering " + DivideService.class.getName()); - props.put("sca.service", "DivideComponent#service-name(Divide)"); - props.put("org.osgi.sca.bindings", new String[] {"{http://sample}Divide"}); - context.registerService(DivideService.class.getName(), new DivideServiceImpl(), props); - - getBundle(context, AddService.class); - } - - public void stop(BundleContext context) throws Exception { - logger.info("Stopping " + context.getBundle()); - // Registered services will be automatically unregistered - } - - private Bundle getBundle(BundleContext bundleContext, Class<?> cls) { - PackageAdmin packageAdmin = null; - // PackageAdmin is used to resolve bundles - ServiceReference ref = bundleContext.getServiceReference("org.osgi.service.packageadmin.PackageAdmin"); - if (ref != null) { - packageAdmin = (PackageAdmin)bundleContext.getService(ref); - Bundle bundle = packageAdmin.getBundle(cls); - if (bundle != null) { - logger.info(cls.getName() + " is loaded by bundle: " + bundle.getSymbolicName()); - } - bundleContext.ungetService(ref); - return bundle; - } - return null; - } - -} diff --git a/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/dosgi-dynamic-calculator-operations/src/main/java/calculator/dosgi/operations/impl/SubtractServiceImpl.java b/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/dosgi-dynamic-calculator-operations/src/main/java/calculator/dosgi/operations/impl/SubtractServiceImpl.java deleted file mode 100644 index 4bbe83b14f..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/dosgi-dynamic-calculator-operations/src/main/java/calculator/dosgi/operations/impl/SubtractServiceImpl.java +++ /dev/null @@ -1,37 +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.dosgi.operations.impl; - -import java.util.logging.Level; -import java.util.logging.Logger; - -import calculator.dosgi.operations.SubtractService; - -/** - * 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.INFO, "Subtracting " + n1 + " from " + n2); - return n1 - n2; - } - -} diff --git a/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/dosgi-dynamic-calculator-operations/src/test/java/calculator/dosgi/operations/test/OSGiTestUtils.java b/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/dosgi-dynamic-calculator-operations/src/test/java/calculator/dosgi/operations/test/OSGiTestUtils.java deleted file mode 100644 index cd92989da1..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/dosgi-dynamic-calculator-operations/src/test/java/calculator/dosgi/operations/test/OSGiTestUtils.java +++ /dev/null @@ -1,105 +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.dosgi.operations.test; - -import java.lang.reflect.InvocationHandler; -import java.lang.reflect.Method; -import java.lang.reflect.Proxy; - -import org.osgi.framework.Bundle; - -/** - * - * Utility class to create OSGi bundles - * - * @version $Rev$ $Date$ - */ -public class OSGiTestUtils { - private static class InvocationHandlerImpl implements InvocationHandler { - private Object instance; - - public InvocationHandlerImpl(Object instance) { - super(); - this.instance = instance; - } - - public Object invoke(Object proxy, Method method, Object[] args) throws Throwable { - Method m = instance.getClass().getMethod(method.getName(), method.getParameterTypes()); - return m.invoke(instance, args); - } - - } - - /** - * Returns a string representation of the given bundle. - * - * @param b - * @param verbose - * @return - */ - public static String bundleStatus(Bundle bundle, boolean verbose) { - StringBuffer sb = new StringBuffer(); - sb.append(bundle.getBundleId()).append(" ").append(bundle.getSymbolicName()); - int s = bundle.getState(); - if ((s & Bundle.UNINSTALLED) != 0) { - sb.append(" UNINSTALLED"); - } - if ((s & Bundle.INSTALLED) != 0) { - sb.append(" INSTALLED"); - } - if ((s & Bundle.RESOLVED) != 0) { - sb.append(" RESOLVED"); - } - if ((s & Bundle.STARTING) != 0) { - sb.append(" STARTING"); - } - if ((s & Bundle.STOPPING) != 0) { - sb.append(" STOPPING"); - } - if ((s & Bundle.ACTIVE) != 0) { - sb.append(" ACTIVE"); - } - - if (verbose) { - sb.append(" ").append(bundle.getLocation()); - sb.append(" ").append(bundle.getHeaders()); - } - return sb.toString(); - } - - /** - * A utility to cast the object to the given interface. If the class for the object - * is loaded by a different classloader, a proxy will be created. - * - * @param <T> - * @param obj - * @param cls - * @return - */ - public static <T> T cast(Object obj, Class<T> cls) { - if (cls.isInstance(obj)) { - return cls.cast(obj); - } else { - return cls.cast(Proxy.newProxyInstance(cls.getClassLoader(), - new Class<?>[] {cls}, - new InvocationHandlerImpl(obj))); - } - } -} diff --git a/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/dosgi-dynamic-calculator-operations/src/test/java/calculator/dosgi/operations/test/OperationsNode.java b/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/dosgi-dynamic-calculator-operations/src/test/java/calculator/dosgi/operations/test/OperationsNode.java deleted file mode 100644 index 02007c385c..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/dosgi-dynamic-calculator-operations/src/test/java/calculator/dosgi/operations/test/OperationsNode.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 calculator.dosgi.operations.test; - -import org.apache.tuscany.sca.node.equinox.launcher.NodeLauncher; - -/** - * - */ -public class OperationsNode { - - /** - * @param args - */ - public static void main(String[] args) { - if (args.length == 0) { - args = new String[] {"-bundles"}; - } - try { - NodeLauncher.main(args); - } catch (Exception e) { - e.printStackTrace(); - } - } - -} diff --git a/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/dosgi-dynamic-calculator-operations/src/test/java/calculator/dosgi/operations/test/OperationsOSGiNodeTestCase.java b/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/dosgi-dynamic-calculator-operations/src/test/java/calculator/dosgi/operations/test/OperationsOSGiNodeTestCase.java deleted file mode 100644 index eee64bf86f..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/dosgi-dynamic-calculator-operations/src/test/java/calculator/dosgi/operations/test/OperationsOSGiNodeTestCase.java +++ /dev/null @@ -1,104 +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.dosgi.operations.test; - -import static calculator.dosgi.operations.test.OSGiTestUtils.bundleStatus; - -import java.rmi.registry.LocateRegistry; -import java.rmi.registry.Registry; - -import org.apache.tuscany.sca.node.equinox.launcher.EquinoxHost; -import org.junit.AfterClass; -import org.junit.Assert; -import org.junit.BeforeClass; -import org.junit.Test; -import org.osgi.framework.Bundle; -import org.osgi.framework.BundleContext; -import org.osgi.framework.Constants; - -import calculator.dosgi.operations.AddService; - -/** - * - */ -public class OperationsOSGiNodeTestCase { - private static EquinoxHost host; - private static BundleContext context; - private static Bundle operationsBundle; - - /** - * @throws java.lang.Exception - */ - @BeforeClass - public static void setUpBeforeClass() throws Exception { - try { - host = new EquinoxHost(); - context = host.start(); - - for (Bundle b : context.getBundles()) { - if (b.getSymbolicName().equals("org.eclipse.equinox.ds") || b.getSymbolicName() - .startsWith("org.apache.tuscany.sca.")) { - try { - if (b.getHeaders().get(Constants.FRAGMENT_HOST) == null) { - // Start the non-fragment bundle - b.start(); - } - } catch (Exception e) { - e.printStackTrace(); - } - System.out.println(bundleStatus(b, false)); - } - if ("calculator.dosgi.dynamic.operations".equals(b.getSymbolicName())) { - operationsBundle = b; - } - } - - if (operationsBundle != null) { - operationsBundle.start(); - System.out.println(bundleStatus(operationsBundle, false)); - } - - } catch (Exception e) { - e.printStackTrace(); - throw e; - } - } - - @Test - public void testOSGi() throws Exception { - Registry registry = LocateRegistry.getRegistry(8085); - Object add = registry.lookup("AddService"); - AddService addService = OSGiTestUtils.cast(add, AddService.class); - double sum = addService.add(1.0, 2.0); - Assert.assertEquals(3.0, sum, 0.0); - } - - /** - * @throws java.lang.Exception - */ - @AfterClass - public static void tearDownAfterClass() throws Exception { - if (host != null) { - host.stop(); - context = null; - } - } - -} diff --git a/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/dosgi-dynamic-calculator/LICENSE b/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/dosgi-dynamic-calculator/LICENSE deleted file mode 100644 index 6e529a25c4..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/dosgi-dynamic-calculator/LICENSE +++ /dev/null @@ -1,205 +0,0 @@ -
- Apache License
- Version 2.0, January 2004
- http://www.apache.org/licenses/
-
- TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
- 1. Definitions.
-
- "License" shall mean the terms and conditions for use, reproduction,
- and distribution as defined by Sections 1 through 9 of this document.
-
- "Licensor" shall mean the copyright owner or entity authorized by
- the copyright owner that is granting the License.
-
- "Legal Entity" shall mean the union of the acting entity and all
- other entities that control, are controlled by, or are under common
- control with that entity. For the purposes of this definition,
- "control" means (i) the power, direct or indirect, to cause the
- direction or management of such entity, whether by contract or
- otherwise, or (ii) ownership of fifty percent (50%) or more of the
- outstanding shares, or (iii) beneficial ownership of such entity.
-
- "You" (or "Your") shall mean an individual or Legal Entity
- exercising permissions granted by this License.
-
- "Source" form shall mean the preferred form for making modifications,
- including but not limited to software source code, documentation
- source, and configuration files.
-
- "Object" form shall mean any form resulting from mechanical
- transformation or translation of a Source form, including but
- not limited to compiled object code, generated documentation,
- and conversions to other media types.
-
- "Work" shall mean the work of authorship, whether in Source or
- Object form, made available under the License, as indicated by a
- copyright notice that is included in or attached to the work
- (an example is provided in the Appendix below).
-
- "Derivative Works" shall mean any work, whether in Source or Object
- form, that is based on (or derived from) the Work and for which the
- editorial revisions, annotations, elaborations, or other modifications
- represent, as a whole, an original work of authorship. For the purposes
- of this License, Derivative Works shall not include works that remain
- separable from, or merely link (or bind by name) to the interfaces of,
- the Work and Derivative Works thereof.
-
- "Contribution" shall mean any work of authorship, including
- the original version of the Work and any modifications or additions
- to that Work or Derivative Works thereof, that is intentionally
- submitted to Licensor for inclusion in the Work by the copyright owner
- or by an individual or Legal Entity authorized to submit on behalf of
- the copyright owner. For the purposes of this definition, "submitted"
- means any form of electronic, verbal, or written communication sent
- to the Licensor or its representatives, including but not limited to
- communication on electronic mailing lists, source code control systems,
- and issue tracking systems that are managed by, or on behalf of, the
- Licensor for the purpose of discussing and improving the Work, but
- excluding communication that is conspicuously marked or otherwise
- designated in writing by the copyright owner as "Not a Contribution."
-
- "Contributor" shall mean Licensor and any individual or Legal Entity
- on behalf of whom a Contribution has been received by Licensor and
- subsequently incorporated within the Work.
-
- 2. Grant of Copyright License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- copyright license to reproduce, prepare Derivative Works of,
- publicly display, publicly perform, sublicense, and distribute the
- Work and such Derivative Works in Source or Object form.
-
- 3. Grant of Patent License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- (except as stated in this section) patent license to make, have made,
- use, offer to sell, sell, import, and otherwise transfer the Work,
- where such license applies only to those patent claims licensable
- by such Contributor that are necessarily infringed by their
- Contribution(s) alone or by combination of their Contribution(s)
- with the Work to which such Contribution(s) was submitted. If You
- institute patent litigation against any entity (including a
- cross-claim or counterclaim in a lawsuit) alleging that the Work
- or a Contribution incorporated within the Work constitutes direct
- or contributory patent infringement, then any patent licenses
- granted to You under this License for that Work shall terminate
- as of the date such litigation is filed.
-
- 4. Redistribution. You may reproduce and distribute copies of the
- Work or Derivative Works thereof in any medium, with or without
- modifications, and in Source or Object form, provided that You
- meet the following conditions:
-
- (a) You must give any other recipients of the Work or
- Derivative Works a copy of this License; and
-
- (b) You must cause any modified files to carry prominent notices
- stating that You changed the files; and
-
- (c) You must retain, in the Source form of any Derivative Works
- that You distribute, all copyright, patent, trademark, and
- attribution notices from the Source form of the Work,
- excluding those notices that do not pertain to any part of
- the Derivative Works; and
-
- (d) If the Work includes a "NOTICE" text file as part of its
- distribution, then any Derivative Works that You distribute must
- include a readable copy of the attribution notices contained
- within such NOTICE file, excluding those notices that do not
- pertain to any part of the Derivative Works, in at least one
- of the following places: within a NOTICE text file distributed
- as part of the Derivative Works; within the Source form or
- documentation, if provided along with the Derivative Works; or,
- within a display generated by the Derivative Works, if and
- wherever such third-party notices normally appear. The contents
- of the NOTICE file are for informational purposes only and
- do not modify the License. You may add Your own attribution
- notices within Derivative Works that You distribute, alongside
- or as an addendum to the NOTICE text from the Work, provided
- that such additional attribution notices cannot be construed
- as modifying the License.
-
- You may add Your own copyright statement to Your modifications and
- may provide additional or different license terms and conditions
- for use, reproduction, or distribution of Your modifications, or
- for any such Derivative Works as a whole, provided Your use,
- reproduction, and distribution of the Work otherwise complies with
- the conditions stated in this License.
-
- 5. Submission of Contributions. Unless You explicitly state otherwise,
- any Contribution intentionally submitted for inclusion in the Work
- by You to the Licensor shall be under the terms and conditions of
- this License, without any additional terms or conditions.
- Notwithstanding the above, nothing herein shall supersede or modify
- the terms of any separate license agreement you may have executed
- with Licensor regarding such Contributions.
-
- 6. Trademarks. This License does not grant permission to use the trade
- names, trademarks, service marks, or product names of the Licensor,
- except as required for reasonable and customary use in describing the
- origin of the Work and reproducing the content of the NOTICE file.
-
- 7. Disclaimer of Warranty. Unless required by applicable law or
- agreed to in writing, Licensor provides the Work (and each
- Contributor provides its Contributions) on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- implied, including, without limitation, any warranties or conditions
- of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
- PARTICULAR PURPOSE. You are solely responsible for determining the
- appropriateness of using or redistributing the Work and assume any
- risks associated with Your exercise of permissions under this License.
-
- 8. Limitation of Liability. In no event and under no legal theory,
- whether in tort (including negligence), contract, or otherwise,
- unless required by applicable law (such as deliberate and grossly
- negligent acts) or agreed to in writing, shall any Contributor be
- liable to You for damages, including any direct, indirect, special,
- incidental, or consequential damages of any character arising as a
- result of this License or out of the use or inability to use the
- Work (including but not limited to damages for loss of goodwill,
- work stoppage, computer failure or malfunction, or any and all
- other commercial damages or losses), even if such Contributor
- has been advised of the possibility of such damages.
-
- 9. Accepting Warranty or Additional Liability. While redistributing
- the Work or Derivative Works thereof, You may choose to offer,
- and charge a fee for, acceptance of support, warranty, indemnity,
- or other liability obligations and/or rights consistent with this
- License. However, in accepting such obligations, You may act only
- on Your own behalf and on Your sole responsibility, not on behalf
- of any other Contributor, and only if You agree to indemnify,
- defend, and hold each Contributor harmless for any liability
- incurred by, or claims asserted against, such Contributor by reason
- of your accepting any such warranty or additional liability.
-
- END OF TERMS AND CONDITIONS
-
- APPENDIX: How to apply the Apache License to your work.
-
- To apply the Apache License to your work, attach the following
- boilerplate notice, with the fields enclosed by brackets "[]"
- replaced with your own identifying information. (Don't include
- the brackets!) The text should be enclosed in the appropriate
- comment syntax for the file format. We also recommend that a
- file or class name and description of purpose be included on the
- same "printed page" as the copyright notice for easier
- identification within third-party archives.
-
- Copyright [yyyy] [name of copyright owner]
-
- Licensed 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.
-
-
-
diff --git a/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/dosgi-dynamic-calculator/META-INF/MANIFEST.MF b/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/dosgi-dynamic-calculator/META-INF/MANIFEST.MF deleted file mode 100644 index 6ce24a4a32..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/dosgi-dynamic-calculator/META-INF/MANIFEST.MF +++ /dev/null @@ -1,23 +0,0 @@ -Manifest-Version: 1.0
-Export-Package: calculator.dosgi;version="1.0.1",
- calculator.dosgi.operations;version="1.0.1"
-Bundle-Version: 1.0.0
-Bundle-Name: calculator.dosgi.dynamic
-Bundle-Activator: calculator.dosgi.impl.CalculatorActivator
-Bundle-ManifestVersion: 2
-Import-Package: org.oasisopen.sca.annotation;version="2.0.0",
- org.osgi.framework,
- org.osgi.service.component;resolution:=optional,
- org.osgi.service.packageadmin,
- org.osgi.util.tracker
-Bundle-SymbolicName: calculator.dosgi.dynamic
-Bundle-Vendor: The Apache Software Foundation
-Bundle-ActivationPolicy: lazy
-Eclipse-LazyStart: true
-Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt
-Bundle-DocURL: http://www.apache.org/
-Service-Component-Disabled: OSGI-INF/calculator-component.xml
-Bundle-RequiredExecutionEnvironment: J2SE-1.5,JavaSE-1.6
-SCA-Configuration: OSGI-INF/sca-config/calculator-config.xml
-Remote-Service: OSGI-INF/remote-service/*.xml
- diff --git a/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/dosgi-dynamic-calculator/NOTICE b/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/dosgi-dynamic-calculator/NOTICE deleted file mode 100644 index f6ce2542c3..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/dosgi-dynamic-calculator/NOTICE +++ /dev/null @@ -1,6 +0,0 @@ -${pom.name}
-Copyright (c) 2005 - 2011 The Apache Software Foundation
-
-This product includes software developed by
-The Apache Software Foundation (http://www.apache.org/).
-
diff --git a/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/dosgi-dynamic-calculator/OSGI-INF/blueprint/calculator-module.xml b/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/dosgi-dynamic-calculator/OSGI-INF/blueprint/calculator-module.xml deleted file mode 100644 index fd834e12ef..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/dosgi-dynamic-calculator/OSGI-INF/blueprint/calculator-module.xml +++ /dev/null @@ -1,43 +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. ---> -<!-- A sample module-context.xml for OSGI RFC 124 (BluePrint Service) --> -<components xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0"> - <component id="CalculatorComponent" class="calculator.dosgi.impl.CalculatorServiceImpl"> - <property name="addService" ref="AddService" /> - <property name="subtractService" ref="SubtractService" /> - <property name="multiplyService" ref="MultiplyService" /> - <property name="divideService" ref="DivideService" /> - </component> - - <!-- We can derive the SCA services for the implementation.osgi --> - <service id="CalculatorService" ref="CalculatorComponent" interface="calculator.dosgi.CalculatorService"> - </service> - - <!-- We can derive the SCA references for the implementation.osgi --> - <reference id="AddService" interface="calculator.dosgi.operations.AddService"> - </reference> - <reference id="SubtractService" interface="calculator.dosgi.operations.SubtractService"> - </reference> - <reference id="MultiplyService" interface="calculator.dosgi.operations.MultiplyService"> - </reference> - <reference id="DivideService" interface="calculator.dosgi.operations.DivideService"> - </reference> - -</components>
\ No newline at end of file diff --git a/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/dosgi-dynamic-calculator/OSGI-INF/calculator-component.xml b/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/dosgi-dynamic-calculator/OSGI-INF/calculator-component.xml deleted file mode 100644 index 5daaa59aae..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/dosgi-dynamic-calculator/OSGI-INF/calculator-component.xml +++ /dev/null @@ -1,36 +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. ---> -<scr:component name="CalculatorComponent" - xmlns:scr="http://www.osgi.org/xmlns/scr/v1.0.0"> - <implementation class="calculator.dosgi.impl.CalculatorServiceDSImpl" /> - <service> - <provide interface="calculator.dosgi.CalculatorService" /> - </service> - - <reference name="addService" interface="calculator.dosgi.operations.AddService" bind="setAddService" unbind="unsetAddService" - policy="dynamic" /> - <reference name="subtractService" interface="calculator.dosgi.operations.SubtractService" bind="setSubtractService" - unbind="unsetSubtractService" policy="dynamic" /> - <reference name="multiplyService" interface="calculator.dosgi.operations.MultiplyService" bind="setMultiplyService" - unbind="unsetMultiplyService" policy="dynamic" /> - <reference name="divideService" interface="calculator.dosgi.operations.DivideService" bind="setDivideService" - unbind="unsetDivideService" policy="dynamic" /> - -</scr:component> diff --git a/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/dosgi-dynamic-calculator/OSGI-INF/remote-service/calculator-service-descriptions.xml b/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/dosgi-dynamic-calculator/OSGI-INF/remote-service/calculator-service-descriptions.xml deleted file mode 100644 index 195fa9e4e9..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/dosgi-dynamic-calculator/OSGI-INF/remote-service/calculator-service-descriptions.xml +++ /dev/null @@ -1,73 +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. ---> -<!-- A consumer-side service description file for RFC 119 --> -<endpoint-descriptions xmlns="http://www.osgi.org/xmlns/rsa/v1.0.0" - xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200912" - xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.1"> - <!-- Describe a remote OSGi service --> - <endpoint-description> - <property name="objectClass" value="calculator.dosgi.operations.AddService" /> - <property name="remote.configs.supported" value="org.osgi.sca"/> - <property name="service.imported.configs" value="org.osgi.sca"/> - <property name="sca.reference" value="addService"/> -<!-- ##############################################################################################################--> -<!-- Property org.osgi.sca.bindings can be removed when running with -Dorg.osgi.sca.domain.registry=tribes:default --> - <property name="org.osgi.sca.bindings"> - <list> - <value>{http://sample}Add</value> - </list> - </property> -<!-- ##############################################################################################################--> - </endpoint-description> - <endpoint-description> - <property name="objectClass" value="calculator.dosgi.operations.SubtractService" /> - <property name="service.imported.configs" value="org.osgi.sca"/> - <property name="remote.configs.supported" value="org.osgi.sca"/> - <property name="sca.reference" value="subtractService"/> -<!-- ##############################################################################################################--> -<!-- Property org.osgi.sca.bindings can be removed when running with -Dorg.osgi.sca.domain.registry=tribes:default --> - <property name="org.osgi.sca.bindings"> - <list> - <value>{http://sample}Subtract</value> - </list> - </property> -<!-- ##############################################################################################################--> - </endpoint-description> - <endpoint-description> - <property name="objectClass" value="calculator.dosgi.operations.MultiplyService" /> - <property name="service.imported.configs" value="org.osgi.sca"/> - <property name="remote.configs.supported" value="org.osgi.sca"/> - <property name="sca.reference" value="multiplyService"/> -<!-- ##############################################################################################################--> -<!-- Property org.osgi.sca.bindings can be removed when running with -Dorg.osgi.sca.domain.registry=tribes:default --> - <property name="org.osgi.sca.bindings" value="{http://sample}Multiply"/> -<!-- ##############################################################################################################--> - </endpoint-description> - <endpoint-description> - <property name="objectClass" value="calculator.dosgi.operations.DivideService" /> - <property name="service.imported.configs" value="org.osgi.sca"/> - <property name="remote.configs.supported" value="org.osgi.sca"/> - <property name="sca.reference" value="divideService"/> -<!-- ##############################################################################################################--> -<!-- Property org.osgi.sca.bindings can be removed when running with -Dorg.osgi.sca.domain.registry=tribes:default --> - <property name="org.osgi.sca.bindings" value="{http://sample}Divide"/> -<!-- ##############################################################################################################--> - </endpoint-description> -</endpoint-descriptions>
\ No newline at end of file diff --git a/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/dosgi-dynamic-calculator/OSGI-INF/sca-config/calculator-config.xml b/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/dosgi-dynamic-calculator/OSGI-INF/sca-config/calculator-config.xml deleted file mode 100644 index f10b577e87..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/dosgi-dynamic-calculator/OSGI-INF/sca-config/calculator-config.xml +++ /dev/null @@ -1,32 +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. ---> -<scact:sca-config targetNamespace="http://sample" - xmlns:scact="http://www.osgi.org/xmlns/scact/v1.0.0" - xmlns:sca="http://docs.oasis-open.org/ns/opencsa/sca/200912" - xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.1"> - <sca:binding.ws name="Calculator" uri="http://localhost:8086/CalculatorService"/> - - <!-- bindings for the remote services --> - <tuscany:binding.rmi name="Add" uri="rmi://localhost:8085/AddService"/> - <tuscany:binding.rmi name="Divide" uri="rmi://localhost:8085/DivideService"/> - <tuscany:binding.rmi name="Subtract" uri="rmi://localhost:8085/SubtractService"/> - <tuscany:binding.rmi name="Multiply" uri="rmi://localhost:8085/MultiplyService"/> -</scact:sca-config> -
\ No newline at end of file diff --git a/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/dosgi-dynamic-calculator/README b/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/dosgi-dynamic-calculator/README deleted file mode 100644 index 52afa44559..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/dosgi-dynamic-calculator/README +++ /dev/null @@ -1,6 +0,0 @@ -Distributed OSGi Calculator Sample
-==================================
-This sample implements a distributed calculator using Distributed OSGi (RFC 119) over SCA.
-
-See http://tuscany.apache.org/documentation-2x/20-beta-samples-documentation.html
-for more information
diff --git a/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/dosgi-dynamic-calculator/dosgi-calculator.png b/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/dosgi-dynamic-calculator/dosgi-calculator.png Binary files differdeleted file mode 100644 index 805baa54d2..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/dosgi-dynamic-calculator/dosgi-calculator.png +++ /dev/null diff --git a/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/dosgi-dynamic-calculator/pom.xml b/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/dosgi-dynamic-calculator/pom.xml deleted file mode 100644 index 9b79a97b07..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/dosgi-dynamic-calculator/pom.xml +++ /dev/null @@ -1,153 +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-samples</artifactId> - <version>2.0-SNAPSHOT</version> - <relativePath>../../../pom.xml</relativePath> - </parent> - - <artifactId>sample-dosgi-dynamic-calculator</artifactId> - <name>Apache Tuscany SCA Sample OSGi Remote Services Dynamic Calculator</name> - - <dependencies> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-feature-ejava</artifactId> - <version>2.0-SNAPSHOT</version> - <type>pom</type> - </dependency> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-feature-webservice</artifactId> - <version>2.0-SNAPSHOT</version> - <type>pom</type> - <scope>runtime</scope> - </dependency> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-node-launcher-equinox</artifactId> - <version>2.0-SNAPSHOT</version> - <scope>test</scope> - </dependency> - - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-node-impl-osgi</artifactId> - <version>2.0-SNAPSHOT</version> - <scope>runtime</scope> - </dependency> - - <dependency> - <groupId>org.eclipse.osgi</groupId> - <artifactId>services</artifactId> - <version>3.2.0-v20090520-1800</version> - </dependency> - - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>4.8.1</version> - <scope>test</scope> - </dependency> - - <!-- Equinox Declarative Services --> - <dependency> - <groupId>org.eclipse.equinox</groupId> - <artifactId>ds</artifactId> - <version>1.1.0-v20090601</version> - <scope>test</scope> - </dependency> - - <dependency> - <groupId>org.eclipse.equinox</groupId> - <artifactId>util</artifactId> - <version>1.0.100-v20090520-1800</version> - <scope>test</scope> - </dependency> - - </dependencies> - - <build> - <finalName>${project.artifactId}</finalName> - <plugins> - <plugin> - <artifactId>maven-eclipse-plugin</artifactId> - <version>2.5.1</version> - <configuration> - <buildcommands> - <buildcommand>org.eclipse.pde.ManifestBuilder</buildcommand> - <buildcommand>org.eclipse.jdt.core.javabuilder</buildcommand> - </buildcommands> - <projectnatures> - <projectnature>org.eclipse.jdt.core.javanature</projectnature> - <projectnature>org.eclipse.pde.PluginNature</projectnature> - </projectnatures> - <classpathContainers> - <classpathContainer>org.eclipse.jdt.launching.JRE_CONTAINER - </classpathContainer> - </classpathContainers> - </configuration> - </plugin> - - <plugin> - <artifactId>maven-jar-plugin</artifactId> - <configuration> - <archive> - <manifestFile>${basedir}/META-INF/MANIFEST.MF</manifestFile> - </archive> - </configuration> - </plugin> - - <plugin> - <groupId>org.apache.tuscany.maven.plugins</groupId> - <artifactId>maven-osgi-junit-plugin</artifactId> - <version>1.0</version> - <dependencies> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-node-launcher-equinox</artifactId> - <version>${project.version}</version> - </dependency> - </dependencies> - <executions> - <execution> - <id>osgi-test</id> - <phase>test</phase> - <goals> - <goal>test</goal> - </goals> - <configuration> - <systemProperties> - <property> - <name>osgi.configuration.area</name> - <value>${project.build.directory}/equinox</value> - </property> - </systemProperties> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> - -</project> diff --git a/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/dosgi-dynamic-calculator/src/main/java/calculator/dosgi/CalculatorService.java b/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/dosgi-dynamic-calculator/src/main/java/calculator/dosgi/CalculatorService.java deleted file mode 100644 index cc562b7c2f..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/dosgi-dynamic-calculator/src/main/java/calculator/dosgi/CalculatorService.java +++ /dev/null @@ -1,36 +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.dosgi; - -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/trunk/samples/learning-more/distributed-osgi/dosgi-dynamic-calculator/src/main/java/calculator/dosgi/impl/CalculatorActivator.java b/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/dosgi-dynamic-calculator/src/main/java/calculator/dosgi/impl/CalculatorActivator.java deleted file mode 100644 index 6228afcd53..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/dosgi-dynamic-calculator/src/main/java/calculator/dosgi/impl/CalculatorActivator.java +++ /dev/null @@ -1,78 +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.dosgi.impl; - -import java.util.Dictionary; -import java.util.Hashtable; -import java.util.logging.Logger; - -import org.osgi.framework.Bundle; -import org.osgi.framework.BundleActivator; -import org.osgi.framework.BundleContext; -import org.osgi.framework.ServiceReference; -import org.osgi.service.packageadmin.PackageAdmin; - -import calculator.dosgi.CalculatorService; -import calculator.dosgi.operations.AddService; - -/** - * - */ -public class CalculatorActivator implements BundleActivator { - private Logger logger = Logger.getLogger(CalculatorActivator.class.getName()); - - private Bundle getBundle(BundleContext bundleContext, Class<?> cls) { - PackageAdmin packageAdmin = null; - // PackageAdmin is used to resolve bundles - ServiceReference ref = bundleContext.getServiceReference("org.osgi.service.packageadmin.PackageAdmin"); - if (ref != null) { - packageAdmin = (PackageAdmin)bundleContext.getService(ref); - Bundle bundle = packageAdmin.getBundle(cls); - if (bundle != null) { - logger.info(cls.getName() + " is loaded by bundle: " + bundle.getSymbolicName()); - } - bundleContext.ungetService(ref); - return bundle; - } - return null; - } - - public void start(BundleContext context) throws Exception { - logger.info("Starting " + context.getBundle()); - Dictionary<String, Object> props = new Hashtable<String, Object>(); - props.put("sca.service", "CalculatorComponent#service-name(Calculator)"); - props.put("calculator", "Calculator"); - props.put("service.exported.configs", new String[] {"org.osgi.sca"}); - props.put("org.osgi.sca.bindings", new String[] {"{http://sample}Calculator"}); - props.put("service.exported.interfaces", new String[] {"*"}); - logger.info("Registering " + CalculatorService.class.getName()); - CalculatorService calculator = new CalculatorServiceImpl(context); - context.registerService(CalculatorService.class.getName(), calculator, props); - - getBundle(context, AddService.class); - - } - - public void stop(BundleContext context) throws Exception { - logger.info("Stopping " + context.getBundle()); - // Registered services will be automatically unregistered - } - -} diff --git a/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/dosgi-dynamic-calculator/src/main/java/calculator/dosgi/impl/CalculatorServiceDSImpl.java b/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/dosgi-dynamic-calculator/src/main/java/calculator/dosgi/impl/CalculatorServiceDSImpl.java deleted file mode 100644 index 5f9db16ca9..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/dosgi-dynamic-calculator/src/main/java/calculator/dosgi/impl/CalculatorServiceDSImpl.java +++ /dev/null @@ -1,114 +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.dosgi.impl; - -import org.osgi.service.component.ComponentContext; - -import calculator.dosgi.CalculatorService; -import calculator.dosgi.operations.AddService; -import calculator.dosgi.operations.DivideService; -import calculator.dosgi.operations.MultiplyService; -import calculator.dosgi.operations.SubtractService; - -/** - * An implementation of the Calculator service. - */ -public class CalculatorServiceDSImpl implements CalculatorService { - private AddService addService; - private SubtractService subtractService; - private MultiplyService multiplyService; - private DivideService divideService; - - public CalculatorServiceDSImpl() { - super(); - System.out.println("CalculatorServiceDSImpl()"); - } - - protected void activate(ComponentContext context) { - System.out.println("Activating " + context); - } - - protected void deactivate(ComponentContext context) { - System.out.println("Deactivating " + context); - } - - /* - * The following setters can be used for DS injection - */ - public void setAddService(AddService addService) { - System.out.println("setAddService()"); - this.addService = addService; - } - - public void setSubtractService(SubtractService subtractService) { - this.subtractService = subtractService; - } - - public void setDivideService(DivideService divideService) { - this.divideService = divideService; - } - - public void setMultiplyService(MultiplyService multiplyService) { - this.multiplyService = multiplyService; - } - - /* - * The following setters can be used for DS injection - */ - public void unsetAddService(AddService addService) { - System.out.println("unsetAddService()"); - this.addService = null; - } - - public void unsetSubtractService(SubtractService subtractService) { - this.subtractService = null; - } - - public void unsetDivideService(DivideService divideService) { - this.divideService = null; - } - - public void unsetMultiplyService(MultiplyService multiplyService) { - this.multiplyService = null; - } - private <T> T getService(Class<T> cls) { - for (Object s : new Object[] {addService, subtractService, multiplyService, divideService}) { - if (cls.isInstance(s)) { - return cls.cast(s); - } - } - throw new IllegalStateException(cls.getSimpleName() + " is not available"); - } - - public double add(double n1, double n2) { - return getService(AddService.class).add(n1, n2); - } - - public double subtract(double n1, double n2) { - return getService(SubtractService.class).subtract(n1, n2); - } - - public double multiply(double n1, double n2) { - return getService(MultiplyService.class).multiply(n1, n2); - } - - public double divide(double n1, double n2) { - return getService(DivideService.class).divide(n1, n2); - } -} diff --git a/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/dosgi-dynamic-calculator/src/main/java/calculator/dosgi/impl/CalculatorServiceImpl.java b/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/dosgi-dynamic-calculator/src/main/java/calculator/dosgi/impl/CalculatorServiceImpl.java deleted file mode 100644 index aa09b27139..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/dosgi-dynamic-calculator/src/main/java/calculator/dosgi/impl/CalculatorServiceImpl.java +++ /dev/null @@ -1,99 +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.dosgi.impl; - -import static org.osgi.framework.Constants.OBJECTCLASS; - -import java.util.HashMap; -import java.util.Map; - -import org.osgi.framework.BundleContext; -import org.osgi.framework.Filter; -import org.osgi.framework.InvalidSyntaxException; -import org.osgi.util.tracker.ServiceTracker; - -import calculator.dosgi.CalculatorService; -import calculator.dosgi.operations.AddService; -import calculator.dosgi.operations.DivideService; -import calculator.dosgi.operations.MultiplyService; -import calculator.dosgi.operations.SubtractService; - -/** - * An implementation of the Calculator service. - */ -public class CalculatorServiceImpl implements CalculatorService { - private Map<Class<?>, ServiceTracker> remoteServices = new HashMap<Class<?>, ServiceTracker>(); - - public CalculatorServiceImpl() { - super(); - } - - public CalculatorServiceImpl(BundleContext context) { - super(); - for (Class<?> cls : new Class<?>[] {AddService.class, SubtractService.class, MultiplyService.class, - DivideService.class}) { - Filter remoteFilter = null; - try { - remoteFilter = - context.createFilter("(&(" + OBJECTCLASS + "=" + cls.getName() + ") (service.imported=*))"); - } catch (InvalidSyntaxException e) { - e.printStackTrace(); - } - ServiceTracker tracker = new ServiceTracker(context, remoteFilter, null); - this.remoteServices.put(cls, tracker); - tracker.open(); - } - } - - private <T> T getService(Class<T> cls) { - ServiceTracker tracker = remoteServices.get(cls); - try { - // Wait for 10 seconds until the remote services are imported - tracker.waitForService(10000); - } catch (InterruptedException e) { - throw new IllegalStateException(cls.getSimpleName() + " is not available"); - } - Object[] remoteObjects = tracker.getServices(); - if (remoteObjects != null) { - for (Object s : remoteObjects) { - if (cls.isInstance(s)) { - System.out.println("Remote service: " + s); - return cls.cast(s); - } - } - } - throw new IllegalStateException(cls.getSimpleName() + " is not available"); - } - - public double add(double n1, double n2) { - return getService(AddService.class).add(n1, n2); - } - - public double subtract(double n1, double n2) { - return getService(SubtractService.class).subtract(n1, n2); - } - - public double multiply(double n1, double n2) { - return getService(MultiplyService.class).multiply(n1, n2); - } - - public double divide(double n1, double n2) { - return getService(DivideService.class).divide(n1, n2); - } -} diff --git a/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/dosgi-dynamic-calculator/src/main/java/calculator/dosgi/operations/AddService.java b/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/dosgi-dynamic-calculator/src/main/java/calculator/dosgi/operations/AddService.java deleted file mode 100644 index 971500782f..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/dosgi-dynamic-calculator/src/main/java/calculator/dosgi/operations/AddService.java +++ /dev/null @@ -1,31 +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.dosgi.operations; - -import org.oasisopen.sca.annotation.Remotable; - -/** - * The interface for the add service - */ -@Remotable -public interface AddService { - - double add(double n1, double n2); - -} diff --git a/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/dosgi-dynamic-calculator/src/main/java/calculator/dosgi/operations/DivideService.java b/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/dosgi-dynamic-calculator/src/main/java/calculator/dosgi/operations/DivideService.java deleted file mode 100644 index 49b8a1c0bf..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/dosgi-dynamic-calculator/src/main/java/calculator/dosgi/operations/DivideService.java +++ /dev/null @@ -1,31 +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.dosgi.operations; - -import org.oasisopen.sca.annotation.Remotable; - -/** - * The interface for the divide service - */ -@Remotable -public interface DivideService { - - double divide(double n1, double n2); - -} diff --git a/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/dosgi-dynamic-calculator/src/main/java/calculator/dosgi/operations/MultiplyService.java b/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/dosgi-dynamic-calculator/src/main/java/calculator/dosgi/operations/MultiplyService.java deleted file mode 100644 index f4e59d12ea..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/dosgi-dynamic-calculator/src/main/java/calculator/dosgi/operations/MultiplyService.java +++ /dev/null @@ -1,31 +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.dosgi.operations; - -import org.oasisopen.sca.annotation.Remotable; - -/** - * The interface for the multiply service - */ -@Remotable -public interface MultiplyService { - - double multiply(double n1, double n2); - -} diff --git a/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/dosgi-dynamic-calculator/src/main/java/calculator/dosgi/operations/SubtractService.java b/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/dosgi-dynamic-calculator/src/main/java/calculator/dosgi/operations/SubtractService.java deleted file mode 100644 index bfb9b820f7..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/dosgi-dynamic-calculator/src/main/java/calculator/dosgi/operations/SubtractService.java +++ /dev/null @@ -1,31 +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.dosgi.operations; - -import org.oasisopen.sca.annotation.Remotable; - -/** - * The interface for the subtract service - */ -@Remotable -public interface SubtractService { - - double subtract(double n1, double n2); - -} diff --git a/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/dosgi-dynamic-calculator/src/main/java/calculator/rmi/OperationsRMIServer.java b/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/dosgi-dynamic-calculator/src/main/java/calculator/rmi/OperationsRMIServer.java deleted file mode 100644 index a4fc52694e..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/dosgi-dynamic-calculator/src/main/java/calculator/rmi/OperationsRMIServer.java +++ /dev/null @@ -1,93 +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.rmi; - -import java.io.Serializable; -import java.rmi.Remote; -import java.rmi.RemoteException; -import java.rmi.registry.LocateRegistry; -import java.rmi.registry.Registry; -import java.rmi.server.UnicastRemoteObject; - -/** - * - */ -public class OperationsRMIServer implements OperationsRemote, Serializable { - - private static final long serialVersionUID = 6081008315263103012L; - private transient Registry registry; - - public OperationsRMIServer() throws RemoteException { - super(); - } - - public double add(double n1, double n2) { - return n1 + n2; - } - - public double subtract(double n1, double n2) { - return n1 - n2; - } - - public double divide(double n1, double n2) { - return n1 / n2; - } - - public double multiply(double n1, double n2) { - return n1 * n2; - } - - public void start() throws RemoteException { - Thread thread = new Thread() { - public void run() { - try { - System.out.println("Starting the RMI server for calculator operations..."); - Remote stub = UnicastRemoteObject.exportObject(OperationsRMIServer.this); - registry = LocateRegistry.createRegistry(8085); - registry.bind("AddService", stub); - registry.bind("SubtractService", stub); - registry.bind("MultiplyService", stub); - registry.bind("DivideService", stub); - System.out.println("RMI server for calculator operations is now started."); - } catch (Exception e) { - e.printStackTrace(); - } - } - }; - thread.start(); - } - - public void stop() { - if (registry != null) { - try { - registry.unbind("AddService"); - registry.unbind("SubtractService"); - registry.unbind("MultiplyService"); - registry.unbind("DivideService"); - UnicastRemoteObject.unexportObject(this, false); - UnicastRemoteObject.unexportObject(registry, false); - registry = null; - } catch (Exception e) { - e.printStackTrace(); - } - } - } - -} diff --git a/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/dosgi-dynamic-calculator/src/main/java/calculator/rmi/OperationsRMIServer_Stub.java b/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/dosgi-dynamic-calculator/src/main/java/calculator/rmi/OperationsRMIServer_Stub.java deleted file mode 100644 index a813dfb6f3..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/dosgi-dynamic-calculator/src/main/java/calculator/rmi/OperationsRMIServer_Stub.java +++ /dev/null @@ -1,132 +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. - */ - -// Stub class generated by rmic, do not edit. -// Contents subject to change without notice. -package calculator.rmi; - -public final class OperationsRMIServer_Stub extends java.rmi.server.RemoteStub implements calculator.rmi.OperationsRemote { - private static final long serialVersionUID = 2; - - private static java.lang.reflect.Method $method_add_0; - private static java.lang.reflect.Method $method_divide_1; - private static java.lang.reflect.Method $method_multiply_2; - private static java.lang.reflect.Method $method_subtract_3; - - static { - try { - $method_add_0 = - calculator.rmi.OperationsRemote.class.getMethod("add", new java.lang.Class[] {double.class, double.class}); - $method_divide_1 = - calculator.rmi.OperationsRemote.class.getMethod("divide", - new java.lang.Class[] {double.class, double.class}); - $method_multiply_2 = - calculator.rmi.OperationsRemote.class.getMethod("multiply", new java.lang.Class[] {double.class, - double.class}); - $method_subtract_3 = - calculator.rmi.OperationsRemote.class.getMethod("subtract", new java.lang.Class[] {double.class, - double.class}); - } catch (java.lang.NoSuchMethodException e) { - throw new java.lang.NoSuchMethodError("stub class initialization failed"); - } - } - - // constructors - public OperationsRMIServer_Stub(java.rmi.server.RemoteRef ref) { - super(ref); - } - - // methods from remote interfaces - - // implementation of add(double, double) - public double add(double $param_double_1, double $param_double_2) throws java.rmi.RemoteException { - try { - Object $result = - ref.invoke(this, - $method_add_0, - new java.lang.Object[] {new java.lang.Double($param_double_1), - new java.lang.Double($param_double_2)}, - 864055858262779977L); - return ((java.lang.Double)$result).doubleValue(); - } catch (java.lang.RuntimeException e) { - throw e; - } catch (java.rmi.RemoteException e) { - throw e; - } catch (java.lang.Exception e) { - throw new java.rmi.UnexpectedException("undeclared checked exception", e); - } - } - - // implementation of divide(double, double) - public double divide(double $param_double_1, double $param_double_2) throws java.rmi.RemoteException { - try { - Object $result = - ref.invoke(this, - $method_divide_1, - new java.lang.Object[] {new java.lang.Double($param_double_1), - new java.lang.Double($param_double_2)}, - 8097593626497421928L); - return ((java.lang.Double)$result).doubleValue(); - } catch (java.lang.RuntimeException e) { - throw e; - } catch (java.rmi.RemoteException e) { - throw e; - } catch (java.lang.Exception e) { - throw new java.rmi.UnexpectedException("undeclared checked exception", e); - } - } - - // implementation of multiply(double, double) - public double multiply(double $param_double_1, double $param_double_2) throws java.rmi.RemoteException { - try { - Object $result = - ref.invoke(this, - $method_multiply_2, - new java.lang.Object[] {new java.lang.Double($param_double_1), - new java.lang.Double($param_double_2)}, - -346155016949350695L); - return ((java.lang.Double)$result).doubleValue(); - } catch (java.lang.RuntimeException e) { - throw e; - } catch (java.rmi.RemoteException e) { - throw e; - } catch (java.lang.Exception e) { - throw new java.rmi.UnexpectedException("undeclared checked exception", e); - } - } - - // implementation of subtract(double, double) - public double subtract(double $param_double_1, double $param_double_2) throws java.rmi.RemoteException { - try { - Object $result = - ref.invoke(this, - $method_subtract_3, - new java.lang.Object[] {new java.lang.Double($param_double_1), - new java.lang.Double($param_double_2)}, - -610707357620578750L); - return ((java.lang.Double)$result).doubleValue(); - } catch (java.lang.RuntimeException e) { - throw e; - } catch (java.rmi.RemoteException e) { - throw e; - } catch (java.lang.Exception e) { - throw new java.rmi.UnexpectedException("undeclared checked exception", e); - } - } -} diff --git a/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/dosgi-dynamic-calculator/src/main/java/calculator/rmi/OperationsRemote.java b/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/dosgi-dynamic-calculator/src/main/java/calculator/rmi/OperationsRemote.java deleted file mode 100644 index 955e386ad8..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/dosgi-dynamic-calculator/src/main/java/calculator/rmi/OperationsRemote.java +++ /dev/null @@ -1,37 +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.rmi; - -import java.rmi.Remote; -import java.rmi.RemoteException; - -/** - * RMI Remote interface - */ -public interface OperationsRemote extends Remote { - double add(double n1, double n2) throws RemoteException; - - double subtract(double n1, double n2) throws RemoteException; - - double multiply(double n1, double n2) throws RemoteException; - - double divide(double n1, double n2) throws RemoteException; - -} diff --git a/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/dosgi-dynamic-calculator/src/test/java/calculator/dosgi/test/CalculatorNode.java b/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/dosgi-dynamic-calculator/src/test/java/calculator/dosgi/test/CalculatorNode.java deleted file mode 100644 index 565a314d85..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/dosgi-dynamic-calculator/src/test/java/calculator/dosgi/test/CalculatorNode.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 calculator.dosgi.test; - -import org.apache.tuscany.sca.node.equinox.launcher.NodeLauncher; - -/** - * - */ -public class CalculatorNode { - - /** - * @param args - */ - public static void main(String[] args) { - if (args.length == 0) { - args = new String[] {"-bundles"}; - } - try { - NodeLauncher.main(args); - } catch (Exception e) { - e.printStackTrace(); - } - } - -} diff --git a/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/dosgi-dynamic-calculator/src/test/java/calculator/dosgi/test/CalculatorOSGiNodeTestCase.java b/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/dosgi-dynamic-calculator/src/test/java/calculator/dosgi/test/CalculatorOSGiNodeTestCase.java deleted file mode 100644 index 4015c7bbc2..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/dosgi-dynamic-calculator/src/test/java/calculator/dosgi/test/CalculatorOSGiNodeTestCase.java +++ /dev/null @@ -1,144 +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.dosgi.test; - -import static calculator.dosgi.test.OSGiTestUtils.bundleStatus; - -import java.io.InputStream; -import java.io.InputStreamReader; -import java.io.Reader; -import java.net.URL; - -import org.apache.tuscany.sca.node.equinox.launcher.EquinoxHost; -import org.junit.AfterClass; -import org.junit.Assert; -import org.junit.BeforeClass; -import org.junit.Test; -import org.osgi.framework.Bundle; -import org.osgi.framework.BundleContext; -import org.osgi.framework.Constants; -import org.osgi.framework.ServiceReference; - -import calculator.dosgi.CalculatorService; -import calculator.rmi.OperationsRMIServer; - -/** - * - */ -public class CalculatorOSGiNodeTestCase { - private static EquinoxHost host; - private static BundleContext context; - private static Bundle calculatorBundle; - private static OperationsRMIServer rmiServer; - - /** - * @throws java.lang.Exception - */ - @BeforeClass - public static void setUpBeforeClass() throws Exception { - try { - rmiServer = new OperationsRMIServer(); - rmiServer.start(); - - host = new EquinoxHost(); - context = host.start(); - - for (Bundle b : context.getBundles()) { - System.out.println(b); - if (b.getSymbolicName().equals("org.eclipse.equinox.ds") || b.getSymbolicName() - .startsWith("org.apache.tuscany.sca.")) { - try { - if (b.getHeaders().get(Constants.FRAGMENT_HOST) == null) { - // Start the non-fragment bundle - b.start(); - } - } catch (Exception e) { - e.printStackTrace(); - } - System.out.println(bundleStatus(b, false)); - } - if ("calculator.dosgi.dynamic".equals(b.getSymbolicName())) { - calculatorBundle = b; - } - } - - if (calculatorBundle != null) { - calculatorBundle.start(); - System.out.println(bundleStatus(calculatorBundle, false)); - } - - } catch (Exception e) { - e.printStackTrace(); - throw e; - } - } - - @Test - public void testOSGi() { - ServiceReference ref = - calculatorBundle.getBundleContext().getServiceReference(CalculatorService.class.getName()); - Assert.assertNotNull(ref); - Object service = context.getService(ref); - Assert.assertNotNull(service); - CalculatorService calculator = OSGiTestUtils.cast(service, CalculatorService.class); - System.out.println("2.0 + 1.0 = " + calculator.add(2.0, 1.0)); - System.out.println("2.0 - 1.0 = " + calculator.subtract(2.0, 1.0)); - System.out.println("2.0 * 1.0 = " + calculator.multiply(2.0, 1.0)); - System.out.println("2.0 / 1.0 = " + calculator.divide(2.0, 1.0)); - } - - @Test - /** - * Test the Web service exposed by the Calculator - */ - public void testWS() throws Exception { - URL url = new URL("http://localhost:8086/CalculatorService?wsdl"); - InputStream is = url.openStream(); - Reader reader = new InputStreamReader(is); - char[] content = new char[10240]; // 10k - int len = 0; - while (true) { - int size = reader.read(content, len, content.length - len); - if (size < 0) { - break; - } - len += size; - } - Assert.assertTrue(len > 0); - String str = new String(content, 0, len); - System.out.println(str); - Assert.assertTrue(str.indexOf("<wsdl:definitions") != -1); - } - - /** - * @throws java.lang.Exception - */ - @AfterClass - public static void tearDownAfterClass() throws Exception { - if (host != null) { - host.stop(); - rmiServer.stop(); - host = null; - rmiServer = null; - context = null; - } - } - -} diff --git a/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/dosgi-dynamic-calculator/src/test/java/calculator/dosgi/test/OSGiTestUtils.java b/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/dosgi-dynamic-calculator/src/test/java/calculator/dosgi/test/OSGiTestUtils.java deleted file mode 100644 index 99e0da9f97..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/dosgi-dynamic-calculator/src/test/java/calculator/dosgi/test/OSGiTestUtils.java +++ /dev/null @@ -1,105 +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.dosgi.test; - -import java.lang.reflect.InvocationHandler; -import java.lang.reflect.Method; -import java.lang.reflect.Proxy; - -import org.osgi.framework.Bundle; - -/** - * - * Utility class to create OSGi bundles - * - * @version $Rev$ $Date$ - */ -public class OSGiTestUtils { - private static class InvocationHandlerImpl implements InvocationHandler { - private Object instance; - - public InvocationHandlerImpl(Object instance) { - super(); - this.instance = instance; - } - - public Object invoke(Object proxy, Method method, Object[] args) throws Throwable { - Method m = instance.getClass().getMethod(method.getName(), method.getParameterTypes()); - return m.invoke(instance, args); - } - - } - - /** - * Returns a string representation of the given bundle. - * - * @param b - * @param verbose - * @return - */ - public static String bundleStatus(Bundle bundle, boolean verbose) { - StringBuffer sb = new StringBuffer(); - sb.append(bundle.getBundleId()).append(" ").append(bundle.getSymbolicName()); - int s = bundle.getState(); - if ((s & Bundle.UNINSTALLED) != 0) { - sb.append(" UNINSTALLED"); - } - if ((s & Bundle.INSTALLED) != 0) { - sb.append(" INSTALLED"); - } - if ((s & Bundle.RESOLVED) != 0) { - sb.append(" RESOLVED"); - } - if ((s & Bundle.STARTING) != 0) { - sb.append(" STARTING"); - } - if ((s & Bundle.STOPPING) != 0) { - sb.append(" STOPPING"); - } - if ((s & Bundle.ACTIVE) != 0) { - sb.append(" ACTIVE"); - } - - if (verbose) { - sb.append(" ").append(bundle.getLocation()); - sb.append(" ").append(bundle.getHeaders()); - } - return sb.toString(); - } - - /** - * A utility to cast the object to the given interface. If the class for the object - * is loaded by a different classloader, a proxy will be created. - * - * @param <T> - * @param obj - * @param cls - * @return - */ - public static <T> T cast(Object obj, Class<T> cls) { - if (cls.isInstance(obj)) { - return cls.cast(obj); - } else { - return cls.cast(Proxy.newProxyInstance(cls.getClassLoader(), - new Class<?>[] {cls}, - new InvocationHandlerImpl(obj))); - } - } -} diff --git a/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/pom.xml b/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/pom.xml deleted file mode 100644 index a68ee3fbed..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/distributed-osgi/pom.xml +++ /dev/null @@ -1,44 +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-samples-learning-more</artifactId> - <version>2.0-SNAPSHOT</version> - <relativePath>../pom.xml</relativePath> - </parent> - <artifactId>tuscany-samples-distributed-osgi</artifactId> - <packaging>pom</packaging> - <name>Apache Tuscany SCA Distributed OSGI Samples</name> - - <profiles> - <profile> - <id>default</id> - <activation> - <activeByDefault>true</activeByDefault> - </activation> - <modules> - <module>dosgi-dynamic-calculator</module> - <module>dosgi-dynamic-calculator-operations</module> - </modules> - </profile> - </profiles> -</project> diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-bpel/helloworld-bpel-contribution/README b/sca-java-2.x/trunk/samples/learning-more/implementation-bpel/helloworld-bpel-contribution/README deleted file mode 100644 index c84dba22f4..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/implementation-bpel/helloworld-bpel-contribution/README +++ /dev/null @@ -1,31 +0,0 @@ -Hello World BPEL Sample -====================================== -This sample demonstrates an SCA service implemented by a BPEL process. - -See http://tuscany.apache.org/documentation-2x/20-beta-samples-documentation.html -for more information - -=============== OLD INFO ====================== - -mkdir target\classes -mkdir target\wsdl2java-source -java -cp ..\..\lib\tuscany-sca-manifest.jar org.apache.tuscany.sdo.generate.XSD2JavaGenerator -targetDirectory target/wsdl2java-source -prefix HelloWorld -noContainment -noUnsettable src/main/resources/helloworld.wsdl -java -cp ..\..\lib\tuscany-sca-manifest.jar org.apache.tuscany.tools.wsdl2java.generate.WSDL2JavaGenerator -targetDirectory target/wsdl2java-source src/main/resources/helloworld.wsdl -unzip ..\..\lib\ode-dao-jpa-ojpa-derby-1.1.zip -d target\database -javac -d target\classes -cp target\classes;..\..\lib\tuscany-sca-manifest.jar -sourcepath src\main\java;target\wsdl2java-source -target 1.5 -g -source 1.5 src\main\java\helloworld\BPELClient.java -copy src\main\resources\* target\classes -java -cp ..\..\lib\tuscany-sca-manifest.jar;target\classes;target\database helloworld.BPELClient - -and on *nix do - -mkdir target/classes -mkdir target/wsdl2java-source -java -cp ../../lib/tuscany-sca-manifest.jar org.apache.tuscany.sdo.generate.XSD2JavaGenerator -targetDirectory target/wsdl2java-source -prefix HelloWorld -noContainment -noUnsettable src/main/resources/helloworld.wsdl -java -cp ../../lib/tuscany-sca-manifest.jar org.apache.tuscany.tools.wsdl2java.generate.WSDL2JavaGenerator -targetDirectory target/wsdl2java-source src/main/resources/helloworld.wsdl -unzip ../../lib/ode-dao-jpa-ojpa-derby-1.1.zip -d target/database -javac -d target/classes -cp target/classes;../../lib/tuscany-sca-manifest.jar -sourcepath src/main/java;target/wsdl2java-source -target 1.5 -g -source 1.5 src/main/java/helloworld/BPELClient.java -cp src/main/resources/* target/classes -java -cp ../../lib/tuscany-sca-manifest.jar:target/classes:target/database helloworld.BPELClient - -The sample will start an embedded BPEL engine, deploy a process and invoke it. - diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-bpel/helloworld-bpel-contribution/build.xml b/sca-java-2.x/trunk/samples/learning-more/implementation-bpel/helloworld-bpel-contribution/build.xml deleted file mode 100644 index d94388f466..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/implementation-bpel/helloworld-bpel-contribution/build.xml +++ /dev/null @@ -1,95 +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="sample-implementation-bpel-helloworld-contribution" default="compile"> - <property name="test.class" value="helloworld.BPELClient" /> - <property name="test.jar" value="sample-implementation-bpel-helloworld-contribution.jar" /> - <property name="manifest.jar" value="../../lib/tuscany-sca-manifest.jar" /> - - <target name="init"> - <mkdir dir="target/classes"/> - <mkdir dir="target/wsdl2java-source"/> - </target> - - <target name="generate-wsdl" depends="init"> - <java classname="org.apache.tuscany.sdo.generate.XSD2JavaGenerator" fork="true"> - <arg value="-targetDirectory"/> - <arg value="target/wsdl2java-source"/> - <arg value="-prefix"/> - <arg value="HelloWorld"/> - <arg value="-noContainment"/> - <arg value="-noUnsettable"/> - <arg value="src/main/resources/helloworld.wsdl"/> - - <classpath> - <pathelement location="${manifest.jar}"/> - </classpath> - </java> - - <java classname="org.apache.tuscany.tools.wsdl2java.generate.WSDL2JavaGenerator" fork="true"> - <arg value="-targetDirectory"/> - <arg value="target/wsdl2java-source"/> - <arg value="src/main/resources/helloworld.wsdl"/> - - <classpath> - <pathelement location="${manifest.jar}"/> - </classpath> - </java> - </target> - - <target name="unzip-ode-db" depends="init"> - <unzip src="../../lib/ode-dao-jpa-ojpa-derby-1.3.2.zip" dest="target/database"/> - </target> - - <target name="compile" depends="init,generate-wsdl,unzip-ode-db"> - <javac destdir="target/classes" debug="on" source="1.5" target="1.5"> - <src path="src/main/java"/> - <src path="target/wsdl2java-source"/> - <classpath> - <pathelement location="${manifest.jar}"/> - </classpath> - </javac> - <copy todir="target/classes"> - <fileset dir="src/main/resources"/> - </copy> - <jar destfile="target/${test.jar}" basedir="target/classes"> - <manifest> - <attribute name="Main-Class" value="${test.class}" /> - </manifest> - </jar> - </target> - - <target name="run"> - <java classname="${test.class}" fork="true"> - <!-- jvmarg value="-Xdebug"/ --> - <!-- jvmarg value="-Xrunjdwp:transport=dt_socket,address=8000,server=y,suspend=y"/ --> - <classpath> - <pathelement location="target/classes"/> - <pathelement location="target/database"/> - <pathelement location="${manifest.jar}"/> - </classpath> - </java> - </target> - - <target name="clean"> - <delete includeemptydirs="true"> - <fileset dir="target"/> - </delete> - </target> - -</project> diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-bpel/helloworld-bpel-contribution/helloworld-bpel.png b/sca-java-2.x/trunk/samples/learning-more/implementation-bpel/helloworld-bpel-contribution/helloworld-bpel.png Binary files differdeleted file mode 100644 index 5f53a3c5d1..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/implementation-bpel/helloworld-bpel-contribution/helloworld-bpel.png +++ /dev/null diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-bpel/helloworld-bpel-contribution/helloworld-bpel.svg b/sca-java-2.x/trunk/samples/learning-more/implementation-bpel/helloworld-bpel-contribution/helloworld-bpel.svg deleted file mode 100644 index 5a98f1a07c..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/implementation-bpel/helloworld-bpel-contribution/helloworld-bpel.svg +++ /dev/null @@ -1,179 +0,0 @@ -<?xml version="1.0" encoding="UTF-8" standalone="no"?> -<!-- - * 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. ---> -<!-- Created with Inkscape (http://www.inkscape.org/) --> -<svg - xmlns:dc="http://purl.org/dc/elements/1.1/" - xmlns:cc="http://web.resource.org/cc/" - xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" - xmlns:svg="http://www.w3.org/2000/svg" - xmlns="http://www.w3.org/2000/svg" - xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" - xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - width="1052.3622" - height="744.09448" - id="svg2" - sodipodi:version="0.32" - inkscape:version="0.45.1" - sodipodi:docbase="C:\simon\tuscany\java-panic\sca\samples\helloworld-bpel" - sodipodi:docname="helloworld-bpel.svg" - version="1.0" - inkscape:export-filename="C:\simon\tuscany\java-panic\sca\samples\helloworld-bpel\helloworld-bpel.png" - inkscape:export-xdpi="52.84" - inkscape:export-ydpi="52.84" - inkscape:output_extension="org.inkscape.output.svg.inkscape"> - <defs - id="defs4" /> - <sodipodi:namedview - id="base" - pagecolor="#ffffff" - bordercolor="#666666" - borderopacity="1.0" - gridtolerance="10000" - guidetolerance="10" - objecttolerance="10" - inkscape:pageopacity="0.0" - inkscape:pageshadow="2" - inkscape:zoom="1.4" - inkscape:cx="519.38407" - inkscape:cy="414.63224" - inkscape:document-units="px" - inkscape:current-layer="layer1" - inkscape:window-width="1141" - inkscape:window-height="676" - inkscape:window-x="360" - inkscape:window-y="147" /> - <metadata - id="metadata7"> - <rdf:RDF> - <cc:Work - rdf:about=""> - <dc:format>image/svg+xml</dc:format> - <dc:type - rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> - </cc:Work> - </rdf:RDF> - </metadata> - <g - inkscape:label="Layer 1" - inkscape:groupmode="layer" - id="layer1"> - <g - id="g2997" - transform="matrix(0.991389,0,0,1,2.215655,0)"> - <rect - rx="13.79423" - ry="12.692303" - y="192.00233" - x="258.3114" - height="299.99988" - width="446.72086" - id="rect2067" - style="opacity:1;fill:#90baf4;fill-opacity:1;stroke:#060000;stroke-width:2.00866628;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" /> - <flowRoot - id="flowRoot2954" - xml:space="preserve"><flowRegion - id="flowRegion2956"><rect - y="212.66591" - x="281.42856" - height="61.42857" - width="170" - id="rect2958" /></flowRegion><flowPara - id="flowPara2960">helloworldws</flowPara></flowRoot> </g> - <rect - style="fill:#317fed;fill-opacity:1;stroke:#060000;stroke-width:2.77353811;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" - id="rect2988" - width="137.03178" - height="139.37514" - x="433.16025" - y="308.26868" - rx="8.2887468" - ry="11.562291" /> - <flowRoot - xml:space="preserve" - id="flowRoot2966" - transform="translate(183.89697,109.51481)"><flowRegion - id="flowRegion2968"><rect - id="rect2970" - width="170" - height="61.42857" - x="281.42856" - y="212.66591" /></flowRegion><flowPara - id="flowPara2972">HelloWorld</flowPara><flowPara - id="flowPara1883">Service</flowPara><flowPara - id="flowPara1885">Component</flowPara></flowRoot> <path - style="fill:#5b9d05;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" - d="M 414.90867,339.0146 L 448.24371,339.0146 L 454.30462,352.14658 L 447.23356,364.26842 L 414.90867,364.26842 L 422.48482,352.14658 L 414.90867,339.0146 z " - id="path3017" /> - <path - style="fill:#5b9d05;fill-opacity:1;fill-rule:evenodd;stroke:black;stroke-width:0.99999994px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" - d="M 226.73064,320.75315 L 293.91185,320.75315 L 306.1266,352.82797 L 291.87606,382.43553 L 226.73064,382.43553 L 241.99911,352.82797 L 226.73064,320.75315 z " - id="path1892" /> - <flowRoot - xml:space="preserve" - id="flowRoot1894" - transform="translate(-37.47944,122.8324)" - style="font-size:10px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans"><flowRegion - id="flowRegion1896"><rect - id="rect1898" - width="170" - height="61.42857" - x="281.42856" - y="212.66591" - style="font-size:10px;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-align:start;line-height:125%;writing-mode:lr-tb;text-anchor:start;font-family:Bitstream Vera Sans" /></flowRegion><flowPara - id="flowPara1900">HelloWorld</flowPara><flowPara - id="flowPara1906">Web</flowPara><flowPara - id="flowPara1904">Service</flowPara></flowRoot> <path - style="fill:none;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" - d="M 305.71429,353.3802 L 422.85714,351.95163" - id="path1910" - inkscape:export-filename="C:\simon\Projects\Tuscany\java\java-head\sca\samples\helloworld-ws-service\helloworld-ws-service.png" - inkscape:export-xdpi="52.84" - inkscape:export-ydpi="52.84" /> - <rect - style="opacity:1;fill:#e4a637;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:1.03563392;stroke-miterlimit:4;stroke-dasharray:6.21380369, 1.03563395;stroke-dashoffset:0;stroke-opacity:1" - id="rect2179" - width="107.35972" - height="30.216856" - x="454.17728" - y="404.70035" - rx="1.1482089" - ry="1.0659764" /> - <flowRoot - xml:space="preserve" - id="flowRoot3152" - transform="matrix(0.8110318,0,0,0.9349147,74.607827,34.581873)"><flowRegion - id="flowRegion3154"><rect - id="rect3156" - width="114.28571" - height="12.857142" - x="450.71429" - y="376.23734" /></flowRegion><flowPara - id="flowPara3158">implementation.bpel</flowPara></flowRoot> <text - xml:space="preserve" - style="font-size:12px;font-style:normal;font-weight:normal;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;font-family:Bitstream Vera Sans" - x="466.42856" - y="423.38019" - id="text3160"><tspan - sodipodi:role="line" - id="tspan3162" - x="466.42856" - y="423.38019">helloworld.bpel</tspan></text> - </g> -</svg> diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-bpel/helloworld-bpel-contribution/pom.xml b/sca-java-2.x/trunk/samples/learning-more/implementation-bpel/helloworld-bpel-contribution/pom.xml deleted file mode 100644 index 59d74cb5ae..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/implementation-bpel/helloworld-bpel-contribution/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-samples</artifactId> - <version>2.0-SNAPSHOT</version> - <relativePath>../../../pom.xml</relativePath> - </parent> - - <packaging>zip</packaging> - <artifactId>sample-implementation-bpel-helloworld-contribution</artifactId> - <name>Apache Tuscany SCA Sample implementation.bpel HelloWorld Contribution</name> - - <dependencies> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-sca-api</artifactId> - <version>2.0-SNAPSHOT</version> - <scope>provided</scope> - </dependency> - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>4.8.1</version> - <scope>test</scope> - </dependency> - </dependencies> - - <build> - <finalName>${project.artifactId}</finalName> - <plugins> - - <plugin> - <!-- plugin to support zip packaging for SCA contributions --> - <groupId>org.apache.tuscany.maven.plugins</groupId> - <artifactId>maven-zip-plugin</artifactId> - <version>alpha2</version> - <extensions>true</extensions> - </plugin> - - <!-- plugin to support using mvn tuscany:run to run this contribution --> - <plugin> - <groupId>org.apache.tuscany.maven.plugins</groupId> - <artifactId>maven-tuscany-plugin</artifactId> - <version>2.0-SNAPSHOT</version> - <dependencies> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-implementation-bpel-runtime</artifactId> - <version>2.0-SNAPSHOT</version> - </dependency> - </dependencies> - </plugin> - - </plugins> - </build> -</project> diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-bpel/helloworld-bpel-contribution/src/main/java/helloworld/Hello.java b/sca-java-2.x/trunk/samples/learning-more/implementation-bpel/helloworld-bpel-contribution/src/main/java/helloworld/Hello.java deleted file mode 100644 index dbd3854d7c..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/implementation-bpel/helloworld-bpel-contribution/src/main/java/helloworld/Hello.java +++ /dev/null @@ -1,29 +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 helloworld; - -import org.oasisopen.sca.annotation.Remotable; - -@Remotable -public interface Hello { - - String hello(String name); - -} diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-bpel/helloworld-bpel-contribution/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/samples/learning-more/implementation-bpel/helloworld-bpel-contribution/src/main/resources/META-INF/sca-contribution.xml deleted file mode 100644 index 4a56523adb..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/implementation-bpel/helloworld-bpel-contribution/src/main/resources/META-INF/sca-contribution.xml +++ /dev/null @@ -1,23 +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. ---> -<contribution xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" - xmlns:sample="http://bpel"> - <deployable composite="sample:bpel"/> -</contribution>
\ No newline at end of file diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-bpel/helloworld-bpel-contribution/src/main/resources/helloworld.bpel b/sca-java-2.x/trunk/samples/learning-more/implementation-bpel/helloworld-bpel-contribution/src/main/resources/helloworld.bpel deleted file mode 100644 index d58768adfa..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/implementation-bpel/helloworld-bpel-contribution/src/main/resources/helloworld.bpel +++ /dev/null @@ -1,80 +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.
- -->
-<process name="HelloWorld"
- targetNamespace="http://tuscany.apache.org/implementation/bpel/example/helloworld"
- xmlns="http://schemas.xmlsoap.org/ws/2004/03/business-process/"
- xmlns:bpws="http://schemas.xmlsoap.org/ws/2004/03/business-process/"
- xmlns:tns="http://tuscany.apache.org/implementation/bpel/example/helloworld"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- xmlns:test="http://testing/"
- queryLanguage="urn:oasis:names:tc:wsbpel:2.0:sublang:xpath2.0"
- expressionLanguage="urn:oasis:names:tc:wsbpel:2.0:sublang:xpath2.0" xmlns:bpel="http://docs.oasis-open.org/wsbpel/2.0/process/executable">
-
- <import location="helloworld.wsdl" importType="http://schemas.xmlsoap.org/wsdl/"
- namespace="http://testing/"/>
-
- <partnerLinks>
- <partnerLink name="helloPartnerLink" partnerLinkType="test:HelloPartnerLinkType" myRole="me" />
- </partnerLinks>
-
- <variables>
- <variable name="helloMessage" messageType="test:HelloMessage"/>
- <variable name="helloMessageResponse" messageType="test:HelloMessageResponse"/>
- <variable name="tmpVar" type="xsd:string"/>
- </variables>
-
- <sequence>
- <receive
- name="start"
- partnerLink="helloPartnerLink"
- portType="test:HelloPortType"
- operation="hello"
- variable="helloMessage"
- createInstance="yes"/>
-
- <assign name="assign1">
- <copy>
- <!-- from>concat($helloMessage.TestPart/test:message/text(), ' World')</from -->
- <from>concat($helloMessage.TestPart/test:arg0/text(), ' World')</from>
- <!-- from>concat('Hello ', 'world')</from -->
- <to variable="tmpVar"/>
- </copy>
- <!-- Initialize the response -->
- <copy>
- <from>
- <literal>
- <test:helloResponse>
- <test:messageResponse>Dummy</test:messageResponse>
- </test:helloResponse>
- </literal>
- </from>
- <to variable="helloMessageResponse" part="TestResponse"/>
- </copy>
- <copy>
- <from variable="tmpVar"/>
- <to>$helloMessageResponse.TestResponse/test:messageResponse</to>
- </copy>
- </assign>
- <reply name="end"
- partnerLink="helloPartnerLink"
- portType="test:HelloPortType"
- operation="hello"
- variable="helloMessageResponse"/>
- </sequence>
-</process>
diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-bpel/helloworld-bpel-contribution/src/main/resources/helloworld.composite b/sca-java-2.x/trunk/samples/learning-more/implementation-bpel/helloworld-bpel-contribution/src/main/resources/helloworld.composite deleted file mode 100644 index 08350e8417..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/implementation-bpel/helloworld-bpel-contribution/src/main/resources/helloworld.composite +++ /dev/null @@ -1,29 +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://docs.oasis-open.org/ns/opencsa/sca/200912" - targetNamespace="http://bpel" - xmlns:hns="http://tuscany.apache.org/implementation/bpel/example/helloworld" - name="bpel"> - - <component name="HelloworldComponent"> - <implementation.bpel process="hns:HelloWorld"/> - </component> - -</composite> diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-bpel/helloworld-bpel-contribution/src/main/resources/helloworld.wsdl b/sca-java-2.x/trunk/samples/learning-more/implementation-bpel/helloworld-bpel-contribution/src/main/resources/helloworld.wsdl deleted file mode 100644 index cf966264ef..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/implementation-bpel/helloworld-bpel-contribution/src/main/resources/helloworld.wsdl +++ /dev/null @@ -1,94 +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. - --> - -<wsdl:definitions name="helloworld" - targetNamespace="http://testing/" - xmlns="http://schemas.xmlsoap.org/wsdl/" - xmlns:tns="http://testing/" - xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" - xmlns:wsdlsoap="http://schemas.xmlsoap.org/wsdl/soap/" - xmlns:xsd="http://www.w3.org/2001/XMLSchema" - xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" - xmlns:bpws="http://schemas.xmlsoap.org/ws/2004/03/business-process/" - xmlns:plnk="http://schemas.xmlsoap.org/ws/2004/03/partner-link/"> - - <wsdl:types> - <schema elementFormDefault="qualified" - targetNamespace="http://testing/" - xmlns="http://www.w3.org/2001/XMLSchema"> - - <element name="hello"> - <complexType> - <sequence> - <element name="message" type="xsd:string"/> - </sequence> - </complexType> - </element> - - <element name="helloResponse"> - <complexType> - <sequence> - <element name="messageResponse" type="xsd:string"/> - </sequence> - </complexType> - </element> - </schema> - </wsdl:types> - - <wsdl:message name="HelloMessage"> - <wsdl:part element="tns:hello" name="TestPart"/> - </wsdl:message> - - <wsdl:message name="HelloMessageResponse"> - <wsdl:part element="tns:helloResponse" name="TestResponse"/> - </wsdl:message> - - <wsdl:portType name="HelloPortType"> - <wsdl:operation name="hello"> - <wsdl:input message="tns:HelloMessage" name="TestIn"/> - <wsdl:output message="tns:HelloMessageResponse" name="TestOut"/> - </wsdl:operation> - </wsdl:portType> - - - <wsdl:binding name="HelloSoapBinding" type="tns:HelloPortType"> - <wsdlsoap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/> - <wsdl:operation name="hello"> - <wsdlsoap:operation soapAction=""/> - <wsdl:input name="TestIn"> - <wsdlsoap:body use="literal"/> - </wsdl:input> - <wsdl:output name="TestOut"> - <wsdlsoap:body use="literal"/> - </wsdl:output> - </wsdl:operation> - </wsdl:binding> - - <wsdl:service name="HelloService"> - <wsdl:port name="HelloPort" binding="tns:HelloSoapBinding"> - <soap:address location="http://localhost:8085/ode/processes/helloWorld"/> - </wsdl:port> - </wsdl:service> - - <plnk:partnerLinkType name="HelloPartnerLinkType"> - <plnk:role name="me" portType="tns:HelloPortType"/> - <plnk:role name="you" portType="tns:HelloPortType"/> - </plnk:partnerLinkType> -</wsdl:definitions>
\ No newline at end of file diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-bpel/helloworld-bpel-contribution/src/main/resources/log4j.properties b/sca-java-2.x/trunk/samples/learning-more/implementation-bpel/helloworld-bpel-contribution/src/main/resources/log4j.properties deleted file mode 100644 index 8649a71550..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/implementation-bpel/helloworld-bpel-contribution/src/main/resources/log4j.properties +++ /dev/null @@ -1,35 +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. -# - -# Set root logger level to WARN and its only appender to CONSOLE -log4j.rootLogger=OFF, CONSOLE - -# log4j properties to work with commandline tools. -log4j.category.org.mortbay=OFF -log4j.category.org.hibernate.type=OFF -log4j.category.org.objectweb=OFF -log4j.category.org.apache.ode.sql=OFF -log4j.category.org.apache.ode.axis2=OFF -log4j.category.org.apache.ode.bpel.engine=OFF -log4j.category.org.apache.ode.daohib.bpel.CorrelatorDaoImpl=OFF -log4j.category.org.apache.ode.bpel.epr=OFF -log4j.category.org.apache.openjpa.kernel=OFF - -# Console appender -log4j.appender.CONSOLE=org.apache.log4j.ConsoleAppender -log4j.appender.CONSOLE.layout=org.apache.log4j.PatternLayout -log4j.appender.CONSOLE.layout.ConversionPattern=%p - %C{1}.%M(%L) | %m%n
\ No newline at end of file diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-bpel/helloworld-bpel-webapp/README b/sca-java-2.x/trunk/samples/learning-more/implementation-bpel/helloworld-bpel-webapp/README deleted file mode 100644 index 2576b0ff13..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/implementation-bpel/helloworld-bpel-webapp/README +++ /dev/null @@ -1,6 +0,0 @@ -Hello World BPEL WebApp Sample
-======================================
-This sample demonstrates an SCA service implemented by a BPEL process.
-
-See http://tuscany.apache.org/documentation-2x/20-beta-samples-documentation.html
-for more information
\ No newline at end of file diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-bpel/helloworld-bpel-webapp/pom.xml b/sca-java-2.x/trunk/samples/learning-more/implementation-bpel/helloworld-bpel-webapp/pom.xml deleted file mode 100644 index 8417ee478f..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/implementation-bpel/helloworld-bpel-webapp/pom.xml +++ /dev/null @@ -1,153 +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 xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-samples</artifactId>
- <version>2.0-SNAPSHOT</version>
- <relativePath>../../../pom.xml</relativePath>
- </parent>
-
- <artifactId>sample-implementation-bpel-helloworld-webapp</artifactId>
- <packaging>war</packaging>
- <name>Apache Tuscany SCA Sample implementation.bpel Helloworld WebApp</name>
-
- <properties>
- <tuscany.version>2.0-SNAPSHOT</tuscany.version>
- <jetty.version>6.1.18</jetty.version>
- </properties>
-
- <dependencies>
- <!-- TUSCANY DEPENDENCIES -->
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-base-runtime</artifactId>
- <version>${tuscany.version}</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-implementation-bpel-runtime</artifactId>
- <version>${tuscany.version}</version>
- <scope>runtime</scope>
- </dependency>
-
- <!-- JUNIT DEPENDENCY FOR TESTING -->
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.8.1</version>
- <scope>test</scope>
- </dependency>
-
- <!-- JETTY DEPENDENCIES FOR TESTING -->
- <dependency>
- <groupId>org.mortbay.jetty</groupId>
- <artifactId>jetty</artifactId>
- <version>${jetty.version}</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.mortbay.jetty</groupId>
- <artifactId>jetty-util</artifactId>
- <version>${jetty.version}</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.mortbay.jetty</groupId>
- <artifactId>jetty-management</artifactId>
- <version>${jetty.version}</version>
- <scope>provided</scope>
- </dependency>
- </dependencies>
-
- <build>
- <finalName>helloworld-bpel</finalName>
-
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-dependency-plugin</artifactId>
- <executions>
- <execution>
- <id>unpack</id>
- <phase>compile</phase>
- <goals>
- <goal>unpack</goal>
- </goals>
- <configuration>
- <artifactItems>
- <artifactItem>
- <groupId>org.apache.ode</groupId>
- <artifactId>ode-dao-jpa-ojpa-derby</artifactId>
- <version>1.1.1</version>
- <type>zip</type>
- <overWrite>false</overWrite>
- <outputDirectory>${project.build.directory}/classes</outputDirectory>
- <includes>**/*</includes>
- </artifactItem>
- </artifactItems>
- </configuration>
- </execution>
- </executions>
- </plugin>
-
- <plugin>
- <groupId>org.mortbay.jetty</groupId>
- <artifactId>maven-jetty-plugin</artifactId>
- <version>6.1.18</version>
- <configuration>
- <contextPath>helloworld-bpel</contextPath>
- <stopKey>foo</stopKey>
- <stopPort>9999</stopPort>
- </configuration>
- <executions>
- <execution>
- <id>start-jetty</id>
- <phase>process-test-classes</phase>
- <goals>
- <goal>run</goal>
- </goals>
- <configuration>
- <scanIntervalSeconds>0</scanIntervalSeconds>
- <daemon>true</daemon>
- <connectors>
- <connector implementation="org.mortbay.jetty.nio.SelectChannelConnector">
- <port>8085</port>
- </connector>
- </connectors>
- </configuration>
- </execution>
- <execution>
- <id>stop-jetty</id>
- <phase>prepare-package</phase>
- <goals>
- <goal>stop</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
-
- </plugins>
- </build>
-</project>
diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-bpel/helloworld-bpel-webapp/src/main/java/sample/HelloworldService.java b/sca-java-2.x/trunk/samples/learning-more/implementation-bpel/helloworld-bpel-webapp/src/main/java/sample/HelloworldService.java deleted file mode 100644 index c1a50d9be5..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/implementation-bpel/helloworld-bpel-webapp/src/main/java/sample/HelloworldService.java +++ /dev/null @@ -1,28 +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 sample; - -import org.oasisopen.sca.annotation.Remotable; - -@Remotable -public interface HelloworldService { - - String hello(String name); - -} diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-bpel/helloworld-bpel-webapp/src/main/resources/helloworld.bpel b/sca-java-2.x/trunk/samples/learning-more/implementation-bpel/helloworld-bpel-webapp/src/main/resources/helloworld.bpel deleted file mode 100644 index f1e8895f76..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/implementation-bpel/helloworld-bpel-webapp/src/main/resources/helloworld.bpel +++ /dev/null @@ -1,66 +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.
- -->
-<process name="HelloWorld"
- targetNamespace="http://tuscany.apache.org/implementation/bpel/example/helloworld"
- xmlns:bpws="http://schemas.xmlsoap.org/ws/2004/03/business-process/"
- xmlns="http://schemas.xmlsoap.org/ws/2004/03/business-process/"
- xmlns:tns="http://tuscany.apache.org/implementation/bpel/example/helloworld"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- xmlns:test="http://tuscany.apache.org/implementation/bpel/example/helloworld.wsdl"
- queryLanguage="urn:oasis:names:tc:wsbpel:2.0:sublang:xpath2.0"
- expressionLanguage="urn:oasis:names:tc:wsbpel:2.0:sublang:xpath2.0">
-
- <import location="helloworld.wsdl" importType="http://schemas.xmlsoap.org/wsdl/"
- namespace="http://tuscany.apache.org/implementation/bpel/example/helloworld.wsdl"/>
-
- <partnerLinks>
- <partnerLink name="helloPartnerLink" partnerLinkType="test:HelloPartnerLinkType" myRole="me" />
- </partnerLinks>
-
- <variables>
- <variable name="myVar" messageType="test:HelloMessage"/>
- <variable name="tmpVar" type="xsd:string"/>
- </variables>
-
- <sequence>
- <receive
- name="start"
- partnerLink="helloPartnerLink"
- portType="test:HelloPortType"
- operation="hello"
- variable="myVar"
- createInstance="yes"/>
-
- <assign name="assign1">
- <copy>
- <from>concat('Hello ', $myVar.TestPart/test:message/text())</from>
- <to variable="tmpVar"/>
- </copy>
- <copy>
- <from>$tmpVar</from>
- <to>$myVar.TestPart/test:message</to>
- </copy>
- </assign>
- <reply name="end"
- partnerLink="helloPartnerLink"
- portType="test:HelloPortType"
- operation="hello"
- variable="myVar"/>
- </sequence>
-</process>
diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-bpel/helloworld-bpel-webapp/src/main/resources/helloworld.wsdl b/sca-java-2.x/trunk/samples/learning-more/implementation-bpel/helloworld-bpel-webapp/src/main/resources/helloworld.wsdl deleted file mode 100644 index 46cf381577..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/implementation-bpel/helloworld-bpel-webapp/src/main/resources/helloworld.wsdl +++ /dev/null @@ -1,82 +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. - --> - -<wsdl:definitions - targetNamespace="http://tuscany.apache.org/implementation/bpel/example/helloworld.wsdl" - xmlns="http://schemas.xmlsoap.org/wsdl/" - xmlns:tns="http://tuscany.apache.org/implementation/bpel/example/helloworld.wsdl" - xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" - xmlns:wsdlsoap="http://schemas.xmlsoap.org/wsdl/soap/" - xmlns:xsd="http://www.w3.org/2001/XMLSchema" - xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" - xmlns:bpws="http://schemas.xmlsoap.org/ws/2004/03/business-process/" - xmlns:plnk="http://schemas.xmlsoap.org/ws/2004/03/partner-link/"> - - <wsdl:types> - <schema elementFormDefault="qualified" - targetNamespace="http://tuscany.apache.org/implementation/bpel/example/helloworld.wsdl" - xmlns="http://www.w3.org/2001/XMLSchema"> - - <element name="hello"> - <complexType> - <sequence> - <element name="message" type="xsd:string"/> - </sequence> - </complexType> - </element> - </schema> - </wsdl:types> - - <wsdl:message name="HelloMessage"> - <wsdl:part element="tns:hello" name="TestPart"/> - </wsdl:message> - - <wsdl:portType name="HelloPortType"> - <wsdl:operation name="hello"> - <wsdl:input message="tns:HelloMessage" name="TestIn"/> - <wsdl:output message="tns:HelloMessage" name="TestOut"/> - </wsdl:operation> - </wsdl:portType> - - - <wsdl:binding name="HelloSoapBinding" type="tns:HelloPortType"> - <wsdlsoap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/> - <wsdl:operation name="hello"> - <wsdlsoap:operation soapAction=""/> - <wsdl:input name="TestIn"> - <wsdlsoap:body use="literal"/> - </wsdl:input> - <wsdl:output name="TestOut"> - <wsdlsoap:body use="literal"/> - </wsdl:output> - </wsdl:operation> - </wsdl:binding> - - <wsdl:service name="HelloService"> - <wsdl:port name="HelloPort" binding="tns:HelloSoapBinding"> - <soap:address location="http://localhost:8085/ode/processes/helloWorld"/> - </wsdl:port> - </wsdl:service> - - <plnk:partnerLinkType name="HelloPartnerLinkType"> - <plnk:role name="me" portType="tns:HelloPortType"/> - <plnk:role name="you" portType="tns:HelloPortType"/> - </plnk:partnerLinkType> -</wsdl:definitions>
\ No newline at end of file diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-bpel/helloworld-bpel-webapp/src/main/webapp/WEB-INF/web.composite b/sca-java-2.x/trunk/samples/learning-more/implementation-bpel/helloworld-bpel-webapp/src/main/webapp/WEB-INF/web.composite deleted file mode 100644 index 3d36adadeb..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/implementation-bpel/helloworld-bpel-webapp/src/main/webapp/WEB-INF/web.composite +++ /dev/null @@ -1,37 +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://docs.oasis-open.org/ns/opencsa/sca/200912" - xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.1" - xmlns:hns="http://tuscany.apache.org/implementation/bpel/example/helloworld" - targetNamespace="http://sample" - name="helloworld-bpel"> - - <component name="WebComponent"> - <implementation.web web-uri=""/> - <reference name="service" target="HelloworldComponent"> - <interface.java interface="sample.HelloworldService"/> - </reference> - </component> - - <component name="HelloworldComponent"> - <implementation.bpel process="hns:HelloWorld"/> - </component> - -</composite> diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-bpel/helloworld-bpel-webapp/src/main/webapp/WEB-INF/web.xml b/sca-java-2.x/trunk/samples/learning-more/implementation-bpel/helloworld-bpel-webapp/src/main/webapp/WEB-INF/web.xml deleted file mode 100644 index bf01a7b759..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/implementation-bpel/helloworld-bpel-webapp/src/main/webapp/WEB-INF/web.xml +++ /dev/null @@ -1,41 +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. ---> -<web-app version="2.4" - xmlns="http://java.sun.com/xml/ns/j2ee" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd" > - - <display-name>helloworld-bpel</display-name> - - <filter> - <filter-name>tuscany.helloworld-bpel</filter-name> - <filter-class>org.apache.tuscany.sca.host.webapp.TuscanyServletFilter</filter-class> - </filter> - - <filter-mapping> - <filter-name>tuscany.helloworld-bpel</filter-name> - <url-pattern>/*</url-pattern> - </filter-mapping> - - <welcome-file-list id="WelcomeFileList"> - <welcome-file>hello.jsp</welcome-file> - </welcome-file-list> - -</web-app> diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-bpel/helloworld-bpel-webapp/src/main/webapp/hello.jsp b/sca-java-2.x/trunk/samples/learning-more/implementation-bpel/helloworld-bpel-webapp/src/main/webapp/hello.jsp deleted file mode 100644 index c52d7b1cb2..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/implementation-bpel/helloworld-bpel-webapp/src/main/webapp/hello.jsp +++ /dev/null @@ -1,36 +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.
---%>
-<%@ page contentType="text/html;charset=UTF-8" language="java" %>
-<%@ taglib uri="http://www.osoa.org/sca/sca_jsp.tld" prefix="sca" %>
-
-<sca:reference name="service" type="sample.HelloworldService" />
-
-<html>
- <body >
-
- <h2>helloworld-bpel</h2>
-
- Calling HelloworldService sayHello("world") returns:
-
- <p>
-
- <%= service.hello("world") %>
-
- </body>
-</html>
diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-bpel/pom.xml b/sca-java-2.x/trunk/samples/learning-more/implementation-bpel/pom.xml deleted file mode 100644 index e5945d2f52..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/implementation-bpel/pom.xml +++ /dev/null @@ -1,44 +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-samples-learning-more</artifactId> - <version>2.0-SNAPSHOT</version> - <relativePath>../pom.xml</relativePath> - </parent> - <artifactId>tuscany-sample-implementation-bpel</artifactId> - <packaging>pom</packaging> - <name>Apache Tuscany SCA Implementation BPEL Samples</name> - - <profiles> - <profile> - <id>default</id> - <activation> - <activeByDefault>true</activeByDefault> - </activation> - <modules> - <module>helloworld-bpel-contribution</module> - <module>helloworld-bpel-webapp</module> - </modules> - </profile> - </profiles> -</project> diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-composite/helloworld-recursive-ws/README b/sca-java-2.x/trunk/samples/learning-more/implementation-composite/helloworld-recursive-ws/README deleted file mode 100644 index 58422d84cf..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/implementation-composite/helloworld-recursive-ws/README +++ /dev/null @@ -1,7 +0,0 @@ -Hello implementation.composite helloworld-ws-contribution Sample
-=============================================================
-This sample demonstrates nested composition using implementation.composite and
-binding.ws
-
-See http://tuscany.apache.org/documentation-2x/20-beta-samples-documentation.html
-for more information
diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-composite/helloworld-recursive-ws/pom.xml b/sca-java-2.x/trunk/samples/learning-more/implementation-composite/helloworld-recursive-ws/pom.xml deleted file mode 100644 index 5b59323ee9..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/implementation-composite/helloworld-recursive-ws/pom.xml +++ /dev/null @@ -1,82 +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-samples</artifactId>
- <version>2.0-SNAPSHOT</version>
- <relativePath>../../../pom.xml</relativePath>
- </parent>
-
- <packaging>zip</packaging>
- <artifactId>sample-implementation-composite-helloworld-ws-contribution</artifactId>
- <name>Apache Tuscany SCA Sample implemenation.composite Helloworld WS Contribution</name>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-sca-api</artifactId>
- <version>2.0-SNAPSHOT</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>sample-helloworld-contribution</artifactId>
- <version>2.0-SNAPSHOT</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.8.1</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
- <build>
- <finalName>${project.artifactId}</finalName>
- <plugins>
-
- <!-- plugin to support zip packaging for SCA contributions -->
- <plugin>
- <groupId>org.apache.tuscany.maven.plugins</groupId>
- <artifactId>maven-zip-plugin</artifactId>
- <version>alpha2</version>
- <extensions>true</extensions>
- </plugin>
-
- <!-- plugin to support using mvn tuscany:run to run this contribution -->
- <plugin>
- <groupId>org.apache.tuscany.maven.plugins</groupId>
- <artifactId>maven-tuscany-plugin</artifactId>
- <version>2.0-SNAPSHOT</version>
- <configuration>
- <contributions>
- <!-- add the dependee contribution that this contribution uses -->
- <param>../helloworld-recursive/target/sample-implementation-composite-helloworld-contribution.zip</param>
- <param>../../../getting-started/helloworld-contribution/target/helloworld-contribution.jar</param>
- </contributions>
- </configuration>
- </plugin>
-
- </plugins>
- </build>
-</project>
diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-composite/helloworld-recursive-ws/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/samples/learning-more/implementation-composite/helloworld-recursive-ws/src/main/resources/META-INF/sca-contribution.xml deleted file mode 100644 index ffc35bb553..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/implementation-composite/helloworld-recursive-ws/src/main/resources/META-INF/sca-contribution.xml +++ /dev/null @@ -1,28 +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.
--->
-<contribution xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
- xmlns:sample="http://sample">
-
- <deployable composite="sample:helloworld-ws"/>
-
- <import namespace="http://sample"/>
- <import.java package="sample"/>
-
-</contribution>
diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-composite/helloworld-recursive-ws/src/main/resources/helloworld-ws.composite b/sca-java-2.x/trunk/samples/learning-more/implementation-composite/helloworld-recursive-ws/src/main/resources/helloworld-ws.composite deleted file mode 100644 index 719754224d..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/implementation-composite/helloworld-recursive-ws/src/main/resources/helloworld-ws.composite +++ /dev/null @@ -1,33 +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://docs.oasis-open.org/ns/opencsa/sca/200912"
- xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.1"
- targetNamespace="http://sample"
- xmlns:hns="http://sample"
- name="helloworld-ws">
-
- <component name="HelloworldWSComponent">
- <implementation.composite name="hns:helloworld-recursive"/>
- <service name="MyHelloworld">
- <binding.ws />
- </service>
- </component>
-
-</composite>
diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-composite/helloworld-recursive/README b/sca-java-2.x/trunk/samples/learning-more/implementation-composite/helloworld-recursive/README deleted file mode 100644 index 1ad09620f3..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/implementation-composite/helloworld-recursive/README +++ /dev/null @@ -1,6 +0,0 @@ -Hello implementation.composite helloworld-contribution Sample
-=============================================================
-This sample demonstrates nested composition using implementation.composite
-
-See http://tuscany.apache.org/documentation-2x/20-beta-samples-documentation.html
-for more information
\ No newline at end of file diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-composite/helloworld-recursive/pom.xml b/sca-java-2.x/trunk/samples/learning-more/implementation-composite/helloworld-recursive/pom.xml deleted file mode 100644 index 164d31f300..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/implementation-composite/helloworld-recursive/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-samples</artifactId>
- <version>2.0-SNAPSHOT</version>
- <relativePath>../../../pom.xml</relativePath>
- </parent>
-
- <packaging>zip</packaging>
- <artifactId>sample-implementation-composite-helloworld-contribution</artifactId>
- <name>Apache Tuscany SCA Sample implementation.composite Helloworld Contribution</name>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-sca-api</artifactId>
- <version>2.0-SNAPSHOT</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.8.1</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
- <build>
- <finalName>${project.artifactId}</finalName>
-
- <plugins>
-
- <!-- plugin to support zip packaging for SCA contributions -->
- <plugin>
- <groupId>org.apache.tuscany.maven.plugins</groupId>
- <artifactId>maven-zip-plugin</artifactId>
- <version>alpha2</version>
- <extensions>true</extensions>
- </plugin>
-
- <!-- plugin to support using mvn tuscany:run to run this contribution -->
- <plugin>
- <groupId>org.apache.tuscany.maven.plugins</groupId>
- <artifactId>maven-tuscany-plugin</artifactId>
- <version>2.0-SNAPSHOT</version>
- <configuration>
- <contributions>
- <!-- add the dependee contribution that this contribution uses -->
- <param>../../../getting-started/helloworld-contribution/target/helloworld-contribution.jar</param>
- </contributions>
- </configuration>
- </plugin>
-
- </plugins>
- </build>
-</project>
diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-composite/helloworld-recursive/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/samples/learning-more/implementation-composite/helloworld-recursive/src/main/resources/META-INF/sca-contribution.xml deleted file mode 100644 index 15d9304d05..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/implementation-composite/helloworld-recursive/src/main/resources/META-INF/sca-contribution.xml +++ /dev/null @@ -1,26 +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.
--->
-<contribution xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
- xmlns:sample="http://sample">
- <deployable composite="sample:helloworld-recursive"/>
- <import namespace="http://sample"/>
- <export namespace="http://sample"/>
-</contribution>
-
diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-composite/helloworld-recursive/src/main/resources/helloworld-recursive.composite b/sca-java-2.x/trunk/samples/learning-more/implementation-composite/helloworld-recursive/src/main/resources/helloworld-recursive.composite deleted file mode 100644 index 1094fea85e..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/implementation-composite/helloworld-recursive/src/main/resources/helloworld-recursive.composite +++ /dev/null @@ -1,30 +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://docs.oasis-open.org/ns/opencsa/sca/200912"
- xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.1"
- xmlns:inc="http://sample"
- targetNamespace="http://sample"
- name="helloworld-recursive">
-
- <include name="inc:helloworld" />
-
- <service name="MyHelloworld" promote="HelloworldComponent/Helloworld" />
-
-</composite>
diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-composite/pom.xml b/sca-java-2.x/trunk/samples/learning-more/implementation-composite/pom.xml deleted file mode 100644 index baad81945e..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/implementation-composite/pom.xml +++ /dev/null @@ -1,44 +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-samples-learning-more</artifactId> - <version>2.0-SNAPSHOT</version> - <relativePath>../pom.xml</relativePath> - </parent> - <artifactId>tuscany-samples-implementation-composite</artifactId> - <packaging>pom</packaging> - <name>Apache Tuscany SCA Implementation Composite Samples</name> - - <profiles> - <profile> - <id>default</id> - <activation> - <activeByDefault>true</activeByDefault> - </activation> - <modules> - <module>helloworld-recursive</module> - <module>helloworld-recursive-ws</module> - </modules> - </profile> - </profiles> -</project> diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-java/README b/sca-java-2.x/trunk/samples/learning-more/implementation-java/README deleted file mode 100644 index 18ba62d494..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/implementation-java/README +++ /dev/null @@ -1 +0,0 @@ -Please look at the README files in the subdirectories of this directory for descriptions of the sample contributions.
diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-java/calculator-contribution/README b/sca-java-2.x/trunk/samples/learning-more/implementation-java/calculator-contribution/README deleted file mode 100644 index 45c339d370..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/implementation-java/calculator-contribution/README +++ /dev/null @@ -1,8 +0,0 @@ -Calculator Sample Contribution
-==============================
-
-This sample implements a simple calculator using SCA components.
-
-See http://tuscany.apache.org/documentation-2x/20-beta-samples-documentation.html
-for more information
-
diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-java/calculator-contribution/build.xml b/sca-java-2.x/trunk/samples/learning-more/implementation-java/calculator-contribution/build.xml deleted file mode 100644 index 21dd4db482..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/implementation-java/calculator-contribution/build.xml +++ /dev/null @@ -1,56 +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="sample-implementation-java-calculator-contribution" default="compile">
-
- <property name="tuscany.home" value="../../../.."/>
- <property name="jar.name" value="sample-implementation-java-calculator-contribution.jar" />
-
- <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-sca-api-*.jar" />
- </fileset>
- </classpath>
- </javac>
- <copy todir="target/classes">
- <fileset dir="src/main/resources"/>
- </copy>
- <jar destfile="target/${jar.name}" basedir="target/classes">
- <manifest>
- <attribute name="Main-Class" value="${main.class}" />
- </manifest>
- </jar>
- </target>
-</project>
diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-java/calculator-contribution/pom.xml b/sca-java-2.x/trunk/samples/learning-more/implementation-java/calculator-contribution/pom.xml deleted file mode 100644 index f10a4b486e..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/implementation-java/calculator-contribution/pom.xml +++ /dev/null @@ -1,57 +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-samples</artifactId>
- <version>2.0-SNAPSHOT</version>
- <relativePath>../../../pom.xml</relativePath>
- </parent>
- <artifactId>sample-implementation-java-calculator-contribution</artifactId>
- <name>Apache Tuscany SCA Sample implementation.java Calculator Contribution</name>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-sca-api</artifactId>
- <version>2.0-SNAPSHOT</version>
- </dependency>
-
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.8.1</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
- <build>
- <finalName>${project.artifactId}</finalName>
- <plugins>
- <plugin>
- <groupId>org.apache.tuscany.maven.plugins</groupId>
- <artifactId>maven-tuscany-plugin</artifactId>
- <version>2.0-SNAPSHOT</version>
- </plugin>
- </plugins>
- </build>
-
-</project>
diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-java/calculator-contribution/src/main/java/calculator/AddService.java b/sca-java-2.x/trunk/samples/learning-more/implementation-java/calculator-contribution/src/main/java/calculator/AddService.java deleted file mode 100644 index 5a1e7a638a..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/implementation-java/calculator-contribution/src/main/java/calculator/AddService.java +++ /dev/null @@ -1,28 +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;
-
-/**
- * The Add service interface
- */
-public interface AddService {
-
- double add(double n1, double n2);
-
-}
diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-java/calculator-contribution/src/main/java/calculator/AddServiceImpl.java b/sca-java-2.x/trunk/samples/learning-more/implementation-java/calculator-contribution/src/main/java/calculator/AddServiceImpl.java deleted file mode 100644 index caf4d358df..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/implementation-java/calculator-contribution/src/main/java/calculator/AddServiceImpl.java +++ /dev/null @@ -1,35 +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 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;
- }
-
-}
diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-java/calculator-contribution/src/main/java/calculator/CalculatorClient.java b/sca-java-2.x/trunk/samples/learning-more/implementation-java/calculator-contribution/src/main/java/calculator/CalculatorClient.java deleted file mode 100644 index 2b791a8e1f..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/implementation-java/calculator-contribution/src/main/java/calculator/CalculatorClient.java +++ /dev/null @@ -1,62 +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: " + print(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));
- }
-
- private static String print(ClassLoader cl) {
- StringBuffer buf = new StringBuffer();
- for (; cl != null;) {
- buf.append(cl.toString());
- buf.append(' ');
- cl = cl.getParent();
- }
- return buf.toString();
- }
-
-}
diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-java/calculator-contribution/src/main/java/calculator/CalculatorService.java b/sca-java-2.x/trunk/samples/learning-more/implementation-java/calculator-contribution/src/main/java/calculator/CalculatorService.java deleted file mode 100644 index 78eea39c71..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/implementation-java/calculator-contribution/src/main/java/calculator/CalculatorService.java +++ /dev/null @@ -1,37 +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/trunk/samples/learning-more/implementation-java/calculator-contribution/src/main/java/calculator/CalculatorServiceImpl.java b/sca-java-2.x/trunk/samples/learning-more/implementation-java/calculator-contribution/src/main/java/calculator/CalculatorServiceImpl.java deleted file mode 100644 index d3fa7a8f41..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/implementation-java/calculator-contribution/src/main/java/calculator/CalculatorServiceImpl.java +++ /dev/null @@ -1,70 +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.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);
- }
-
-}
diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-java/calculator-contribution/src/main/java/calculator/DivideService.java b/sca-java-2.x/trunk/samples/learning-more/implementation-java/calculator-contribution/src/main/java/calculator/DivideService.java deleted file mode 100644 index ef6a8b375b..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/implementation-java/calculator-contribution/src/main/java/calculator/DivideService.java +++ /dev/null @@ -1,28 +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;
-
-/**
- * The divide service interface
- */
-public interface DivideService {
-
- double divide(double n1, double n2);
-
-}
diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-java/calculator-contribution/src/main/java/calculator/DivideServiceImpl.java b/sca-java-2.x/trunk/samples/learning-more/implementation-java/calculator-contribution/src/main/java/calculator/DivideServiceImpl.java deleted file mode 100644 index cd91935f08..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/implementation-java/calculator-contribution/src/main/java/calculator/DivideServiceImpl.java +++ /dev/null @@ -1,35 +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 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;
- }
-
-}
diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-java/calculator-contribution/src/main/java/calculator/MultiplyService.java b/sca-java-2.x/trunk/samples/learning-more/implementation-java/calculator-contribution/src/main/java/calculator/MultiplyService.java deleted file mode 100644 index db568cc762..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/implementation-java/calculator-contribution/src/main/java/calculator/MultiplyService.java +++ /dev/null @@ -1,28 +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;
-
-/**
- * The interface for the multiply service
- */
-public interface MultiplyService {
-
- double multiply(double n1, double n2);
-
-}
diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-java/calculator-contribution/src/main/java/calculator/MultiplyServiceImpl.java b/sca-java-2.x/trunk/samples/learning-more/implementation-java/calculator-contribution/src/main/java/calculator/MultiplyServiceImpl.java deleted file mode 100644 index c85357fcd8..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/implementation-java/calculator-contribution/src/main/java/calculator/MultiplyServiceImpl.java +++ /dev/null @@ -1,35 +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 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;
- }
-
-}
diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-java/calculator-contribution/src/main/java/calculator/SubtractService.java b/sca-java-2.x/trunk/samples/learning-more/implementation-java/calculator-contribution/src/main/java/calculator/SubtractService.java deleted file mode 100644 index 56ee372fc4..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/implementation-java/calculator-contribution/src/main/java/calculator/SubtractService.java +++ /dev/null @@ -1,28 +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;
-
-/**
- * The interface for the multiply service
- */
-public interface SubtractService {
-
- double subtract(double n1, double n2);
-
-}
diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-java/calculator-contribution/src/main/java/calculator/SubtractServiceImpl.java b/sca-java-2.x/trunk/samples/learning-more/implementation-java/calculator-contribution/src/main/java/calculator/SubtractServiceImpl.java deleted file mode 100644 index 1b669084d9..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/implementation-java/calculator-contribution/src/main/java/calculator/SubtractServiceImpl.java +++ /dev/null @@ -1,35 +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 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;
- }
-
-}
diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-java/calculator-contribution/src/main/resources/Calculator.composite b/sca-java-2.x/trunk/samples/learning-more/implementation-java/calculator-contribution/src/main/resources/Calculator.composite deleted file mode 100644 index 370e1cf315..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/implementation-java/calculator-contribution/src/main/resources/Calculator.composite +++ /dev/null @@ -1,49 +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://docs.oasis-open.org/ns/opencsa/sca/200912"
- targetNamespace="http://sample"
- xmlns:sample="http://sample"
- name="Calculator">
-
- <component name="CalculatorServiceComponent">
- <implementation.java class="calculator.CalculatorServiceImpl"/>
- <reference name="addService" target="AddServiceComponent" />
- <reference name="subtractService" target="SubtractServiceComponent" />
- <reference name="multiplyService" target="MultiplyServiceComponent" />
- <reference name="divideService" target="DivideServiceComponent" />
- </component>
-
- <component name="AddServiceComponent">
- <implementation.java class="calculator.AddServiceImpl"/>
- </component>
-
- <component name="SubtractServiceComponent">
- <implementation.java class="calculator.SubtractServiceImpl"/>
- </component>
-
- <component name="MultiplyServiceComponent">
- <implementation.java class="calculator.MultiplyServiceImpl"/>
- </component>
-
- <component name="DivideServiceComponent">
- <implementation.java class="calculator.DivideServiceImpl"/>
- </component>
-
-</composite>
diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-java/calculator-contribution/src/main/resources/CalculatorClient.composite b/sca-java-2.x/trunk/samples/learning-more/implementation-java/calculator-contribution/src/main/resources/CalculatorClient.composite deleted file mode 100644 index dfd32761be..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/implementation-java/calculator-contribution/src/main/resources/CalculatorClient.composite +++ /dev/null @@ -1,30 +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://docs.oasis-open.org/ns/opencsa/sca/200912"
- targetNamespace="http://sample"
- xmlns:sample="http://sample"
- name="CalculatorClient">
-
- <component name="CalculatorClient">
- <implementation.java class="calculator.CalculatorClient"/>
- <reference name="calculatorService" target="CalculatorServiceComponent" />
- </component>
-
-</composite>
diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-java/calculator-contribution/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/samples/learning-more/implementation-java/calculator-contribution/src/main/resources/META-INF/sca-contribution.xml deleted file mode 100644 index 70aab0e051..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/implementation-java/calculator-contribution/src/main/resources/META-INF/sca-contribution.xml +++ /dev/null @@ -1,24 +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.
--->
-<contribution xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
- xmlns:sample="http://sample">
- <deployable composite="sample:Calculator"/>
- <deployable composite="sample:CalculatorClient"/>
-</contribution>
\ No newline at end of file diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-java/calculator-contribution/src/test/java/calculator/CalculatorTestCase.java b/sca-java-2.x/trunk/samples/learning-more/implementation-java/calculator-contribution/src/test/java/calculator/CalculatorTestCase.java deleted file mode 100644 index c1cd131f40..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/implementation-java/calculator-contribution/src/test/java/calculator/CalculatorTestCase.java +++ /dev/null @@ -1,49 +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 static org.junit.Assert.assertEquals;
-
-import org.junit.Test;
-
-/**
- * This shows how to test the Calculator composition.
- */
-public class CalculatorTestCase {
-
- @Test
- public void testCalculator() throws Exception {
- AddService add = new AddServiceImpl();
- SubtractService subtract = new SubtractServiceImpl();
- MultiplyService multiply = new MultiplyServiceImpl();
- DivideService divide = new DivideServiceImpl();
-
- CalculatorServiceImpl calculator = new CalculatorServiceImpl();
-
- calculator.setAddService(add);
- calculator.setSubtractService(subtract);
- calculator.setMultiplyService(multiply);
- calculator.setDivideService(divide);
-
- assertEquals(calculator.add(3, 2), 5.0, 0);
- assertEquals(calculator.subtract(3, 2), 1.0, 0);
- assertEquals(calculator.multiply(3, 2), 6.0, 0);
- assertEquals(calculator.divide(3, 2), 1.5, 0);
- }
-}
diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-java/pom.xml b/sca-java-2.x/trunk/samples/learning-more/implementation-java/pom.xml deleted file mode 100644 index 65fe334e33..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/implementation-java/pom.xml +++ /dev/null @@ -1,43 +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-samples-learning-more</artifactId>
- <version>2.0-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
- </parent>
- <artifactId>tuscany-sample-implementation-java</artifactId>
- <packaging>pom</packaging>
- <name>Apache Tuscany SCA Sample implementation.java</name>
-
- <profiles>
- <profile>
- <id>default</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
- <modules>
- <module>calculator-contribution</module>
- </modules>
- </profile>
- </profiles>
-</project>
diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-osgi/dosgi-calculator-operations/LICENSE b/sca-java-2.x/trunk/samples/learning-more/implementation-osgi/dosgi-calculator-operations/LICENSE deleted file mode 100644 index 6e529a25c4..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/implementation-osgi/dosgi-calculator-operations/LICENSE +++ /dev/null @@ -1,205 +0,0 @@ -
- Apache License
- Version 2.0, January 2004
- http://www.apache.org/licenses/
-
- TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
- 1. Definitions.
-
- "License" shall mean the terms and conditions for use, reproduction,
- and distribution as defined by Sections 1 through 9 of this document.
-
- "Licensor" shall mean the copyright owner or entity authorized by
- the copyright owner that is granting the License.
-
- "Legal Entity" shall mean the union of the acting entity and all
- other entities that control, are controlled by, or are under common
- control with that entity. For the purposes of this definition,
- "control" means (i) the power, direct or indirect, to cause the
- direction or management of such entity, whether by contract or
- otherwise, or (ii) ownership of fifty percent (50%) or more of the
- outstanding shares, or (iii) beneficial ownership of such entity.
-
- "You" (or "Your") shall mean an individual or Legal Entity
- exercising permissions granted by this License.
-
- "Source" form shall mean the preferred form for making modifications,
- including but not limited to software source code, documentation
- source, and configuration files.
-
- "Object" form shall mean any form resulting from mechanical
- transformation or translation of a Source form, including but
- not limited to compiled object code, generated documentation,
- and conversions to other media types.
-
- "Work" shall mean the work of authorship, whether in Source or
- Object form, made available under the License, as indicated by a
- copyright notice that is included in or attached to the work
- (an example is provided in the Appendix below).
-
- "Derivative Works" shall mean any work, whether in Source or Object
- form, that is based on (or derived from) the Work and for which the
- editorial revisions, annotations, elaborations, or other modifications
- represent, as a whole, an original work of authorship. For the purposes
- of this License, Derivative Works shall not include works that remain
- separable from, or merely link (or bind by name) to the interfaces of,
- the Work and Derivative Works thereof.
-
- "Contribution" shall mean any work of authorship, including
- the original version of the Work and any modifications or additions
- to that Work or Derivative Works thereof, that is intentionally
- submitted to Licensor for inclusion in the Work by the copyright owner
- or by an individual or Legal Entity authorized to submit on behalf of
- the copyright owner. For the purposes of this definition, "submitted"
- means any form of electronic, verbal, or written communication sent
- to the Licensor or its representatives, including but not limited to
- communication on electronic mailing lists, source code control systems,
- and issue tracking systems that are managed by, or on behalf of, the
- Licensor for the purpose of discussing and improving the Work, but
- excluding communication that is conspicuously marked or otherwise
- designated in writing by the copyright owner as "Not a Contribution."
-
- "Contributor" shall mean Licensor and any individual or Legal Entity
- on behalf of whom a Contribution has been received by Licensor and
- subsequently incorporated within the Work.
-
- 2. Grant of Copyright License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- copyright license to reproduce, prepare Derivative Works of,
- publicly display, publicly perform, sublicense, and distribute the
- Work and such Derivative Works in Source or Object form.
-
- 3. Grant of Patent License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- (except as stated in this section) patent license to make, have made,
- use, offer to sell, sell, import, and otherwise transfer the Work,
- where such license applies only to those patent claims licensable
- by such Contributor that are necessarily infringed by their
- Contribution(s) alone or by combination of their Contribution(s)
- with the Work to which such Contribution(s) was submitted. If You
- institute patent litigation against any entity (including a
- cross-claim or counterclaim in a lawsuit) alleging that the Work
- or a Contribution incorporated within the Work constitutes direct
- or contributory patent infringement, then any patent licenses
- granted to You under this License for that Work shall terminate
- as of the date such litigation is filed.
-
- 4. Redistribution. You may reproduce and distribute copies of the
- Work or Derivative Works thereof in any medium, with or without
- modifications, and in Source or Object form, provided that You
- meet the following conditions:
-
- (a) You must give any other recipients of the Work or
- Derivative Works a copy of this License; and
-
- (b) You must cause any modified files to carry prominent notices
- stating that You changed the files; and
-
- (c) You must retain, in the Source form of any Derivative Works
- that You distribute, all copyright, patent, trademark, and
- attribution notices from the Source form of the Work,
- excluding those notices that do not pertain to any part of
- the Derivative Works; and
-
- (d) If the Work includes a "NOTICE" text file as part of its
- distribution, then any Derivative Works that You distribute must
- include a readable copy of the attribution notices contained
- within such NOTICE file, excluding those notices that do not
- pertain to any part of the Derivative Works, in at least one
- of the following places: within a NOTICE text file distributed
- as part of the Derivative Works; within the Source form or
- documentation, if provided along with the Derivative Works; or,
- within a display generated by the Derivative Works, if and
- wherever such third-party notices normally appear. The contents
- of the NOTICE file are for informational purposes only and
- do not modify the License. You may add Your own attribution
- notices within Derivative Works that You distribute, alongside
- or as an addendum to the NOTICE text from the Work, provided
- that such additional attribution notices cannot be construed
- as modifying the License.
-
- You may add Your own copyright statement to Your modifications and
- may provide additional or different license terms and conditions
- for use, reproduction, or distribution of Your modifications, or
- for any such Derivative Works as a whole, provided Your use,
- reproduction, and distribution of the Work otherwise complies with
- the conditions stated in this License.
-
- 5. Submission of Contributions. Unless You explicitly state otherwise,
- any Contribution intentionally submitted for inclusion in the Work
- by You to the Licensor shall be under the terms and conditions of
- this License, without any additional terms or conditions.
- Notwithstanding the above, nothing herein shall supersede or modify
- the terms of any separate license agreement you may have executed
- with Licensor regarding such Contributions.
-
- 6. Trademarks. This License does not grant permission to use the trade
- names, trademarks, service marks, or product names of the Licensor,
- except as required for reasonable and customary use in describing the
- origin of the Work and reproducing the content of the NOTICE file.
-
- 7. Disclaimer of Warranty. Unless required by applicable law or
- agreed to in writing, Licensor provides the Work (and each
- Contributor provides its Contributions) on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- implied, including, without limitation, any warranties or conditions
- of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
- PARTICULAR PURPOSE. You are solely responsible for determining the
- appropriateness of using or redistributing the Work and assume any
- risks associated with Your exercise of permissions under this License.
-
- 8. Limitation of Liability. In no event and under no legal theory,
- whether in tort (including negligence), contract, or otherwise,
- unless required by applicable law (such as deliberate and grossly
- negligent acts) or agreed to in writing, shall any Contributor be
- liable to You for damages, including any direct, indirect, special,
- incidental, or consequential damages of any character arising as a
- result of this License or out of the use or inability to use the
- Work (including but not limited to damages for loss of goodwill,
- work stoppage, computer failure or malfunction, or any and all
- other commercial damages or losses), even if such Contributor
- has been advised of the possibility of such damages.
-
- 9. Accepting Warranty or Additional Liability. While redistributing
- the Work or Derivative Works thereof, You may choose to offer,
- and charge a fee for, acceptance of support, warranty, indemnity,
- or other liability obligations and/or rights consistent with this
- License. However, in accepting such obligations, You may act only
- on Your own behalf and on Your sole responsibility, not on behalf
- of any other Contributor, and only if You agree to indemnify,
- defend, and hold each Contributor harmless for any liability
- incurred by, or claims asserted against, such Contributor by reason
- of your accepting any such warranty or additional liability.
-
- END OF TERMS AND CONDITIONS
-
- APPENDIX: How to apply the Apache License to your work.
-
- To apply the Apache License to your work, attach the following
- boilerplate notice, with the fields enclosed by brackets "[]"
- replaced with your own identifying information. (Don't include
- the brackets!) The text should be enclosed in the appropriate
- comment syntax for the file format. We also recommend that a
- file or class name and description of purpose be included on the
- same "printed page" as the copyright notice for easier
- identification within third-party archives.
-
- Copyright [yyyy] [name of copyright owner]
-
- Licensed 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.
-
-
-
diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-osgi/dosgi-calculator-operations/META-INF/MANIFEST.MF b/sca-java-2.x/trunk/samples/learning-more/implementation-osgi/dosgi-calculator-operations/META-INF/MANIFEST.MF deleted file mode 100644 index 82a803e3a6..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/implementation-osgi/dosgi-calculator-operations/META-INF/MANIFEST.MF +++ /dev/null @@ -1,22 +0,0 @@ -Manifest-Version: 1.0
-Export-Package: calculator.dosgi.operations;version="1.0.0"
-Bundle-Version: 1.0.0
-Bundle-Name: calculator.dosgi.operations
-Bundle-Activator: calculator.dosgi.operations.impl.OperationsActivator
-Bundle-ManifestVersion: 2
-Import-Package: calculator.dosgi.operations;version="[1.0.0,1.0.0]",
- org.oasisopen.sca.annotation;version="2.0.0",
- org.osgi.framework,
- org.osgi.service.component;resolution:=optional,
- org.osgi.service.packageadmin
-Bundle-SymbolicName: calculator.dosgi.operations
-Bundle-Vendor: The Apache Software Foundation
-Bundle-ActivationPolicy: lazy
-Eclipse-LazyStart: true
-Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt
-Bundle-DocURL: http://www.apache.org/
-Service-Component-Disabled: OSGI-INF/add-component.xml,
- OSGI-INF/subtract-component.xml,
- OSGI-INF/multiply-component.xml,
- OSGI-INF/divide-component.xml
-Bundle-RequiredExecutionEnvironment: J2SE-1.5,JavaSE-1.6 diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-osgi/dosgi-calculator-operations/NOTICE b/sca-java-2.x/trunk/samples/learning-more/implementation-osgi/dosgi-calculator-operations/NOTICE deleted file mode 100644 index f6ce2542c3..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/implementation-osgi/dosgi-calculator-operations/NOTICE +++ /dev/null @@ -1,6 +0,0 @@ -${pom.name}
-Copyright (c) 2005 - 2011 The Apache Software Foundation
-
-This product includes software developed by
-The Apache Software Foundation (http://www.apache.org/).
-
diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-osgi/dosgi-calculator-operations/OSGI-INF/add-component.xml b/sca-java-2.x/trunk/samples/learning-more/implementation-osgi/dosgi-calculator-operations/OSGI-INF/add-component.xml deleted file mode 100644 index 99845257ff..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/implementation-osgi/dosgi-calculator-operations/OSGI-INF/add-component.xml +++ /dev/null @@ -1,25 +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. ---> -<scr:component name="AddComponent" xmlns:scr="http://www.osgi.org/xmlns/scr/v1.0.0"> - <implementation class="calculator.dosgi.operations.impl.AddServiceImpl" /> - <service> - <provide interface="calculator.dosgi.operations.AddService" /> - </service> -</scr:component> diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-osgi/dosgi-calculator-operations/OSGI-INF/blueprint/operations-module.xml b/sca-java-2.x/trunk/samples/learning-more/implementation-osgi/dosgi-calculator-operations/OSGI-INF/blueprint/operations-module.xml deleted file mode 100644 index f6b5f4690e..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/implementation-osgi/dosgi-calculator-operations/OSGI-INF/blueprint/operations-module.xml +++ /dev/null @@ -1,40 +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. ---> -<!-- A sample module-context.xml for OSGI RFC 124 (BluePrint Service) --> -<components xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0"> - <component id="AddComponent" class="calculator.dosgi.operations.impl.AddServiceImpl"> - </component> - <component id="SubtractComponent" class="calculator.dosgi.operations.impl.SubtractServiceImpl"> - </component> - <component id="MultiplyComponent" class="calculator.dosgi.operations.impl.MultiplyServiceImpl"> - </component> - <component id="DivideComponent" class="calculator.dosgi.operations.impl.DivideServiceImpl"> - </component> - - <!-- We can derive the SCA services for the implementation.osgi --> - <service id="AddService" ref="AddComponent" interface="calculator.dosgi.operations.AddService"> - </service> - <service id="SubtractService" ref="SubtractComponent" interface="calculator.dosgi.operations.SubtractService"> - </service> - <service id="MultiplyService" ref="MultiplyComponent" interface="calculator.dosgi.operations.MultiplyService"> - </service> - <service id="DivideService" ref="DivideComponent" interface="calculator.dosgi.operations.DivideService"> - </service> -</components>
\ No newline at end of file diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-osgi/dosgi-calculator-operations/OSGI-INF/divide-component.xml b/sca-java-2.x/trunk/samples/learning-more/implementation-osgi/dosgi-calculator-operations/OSGI-INF/divide-component.xml deleted file mode 100644 index 322d4daf2f..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/implementation-osgi/dosgi-calculator-operations/OSGI-INF/divide-component.xml +++ /dev/null @@ -1,25 +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. ---> -<scr:component name="DivideComponent" xmlns:scr="http://www.osgi.org/xmlns/scr/v1.0.0"> - <implementation class="calculator.dosgi.operations.impl.DivideServiceImpl" /> - <service> - <provide interface="calculator.dosgi.operations.DivideService" /> - </service> -</scr:component> diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-osgi/dosgi-calculator-operations/OSGI-INF/multiply-component.xml b/sca-java-2.x/trunk/samples/learning-more/implementation-osgi/dosgi-calculator-operations/OSGI-INF/multiply-component.xml deleted file mode 100644 index b9ca777bd8..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/implementation-osgi/dosgi-calculator-operations/OSGI-INF/multiply-component.xml +++ /dev/null @@ -1,25 +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. ---> -<scr:component name="MultiplyComponent" xmlns:scr="http://www.osgi.org/xmlns/scr/v1.0.0"> - <implementation class="calculator.dosgi.operations.impl.MultiplyServiceImpl" /> - <service> - <provide interface="calculator.dosgi.operations.MultiplyService" /> - </service> -</scr:component> diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-osgi/dosgi-calculator-operations/OSGI-INF/sca/bundle.componentType b/sca-java-2.x/trunk/samples/learning-more/implementation-osgi/dosgi-calculator-operations/OSGI-INF/sca/bundle.componentType deleted file mode 100644 index fced5b7840..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/implementation-osgi/dosgi-calculator-operations/OSGI-INF/sca/bundle.componentType +++ /dev/null @@ -1,54 +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. ---> -<componentType xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" - xmlns:xsd="http://www.w3.org/2001/XMLSchema" - xmlns:t="http://tuscany.apache.org/xmlns/sca/1.1"> - - - <!-- The service elment defines an SCA proxy to a remote OSGi service --> - <service name="AddService"> - <interface.java interface="calculator.dosgi.operations.AddService"/> - <extensions> - <t:osgi.property name="prop1">1</t:osgi.property> - <t:osgi.property name="prop2">ABC</t:osgi.property> - </extensions> - </service> - <service name="SubtractService"> - <interface.java interface="calculator.dosgi.operations.SubtractService"/> - <extensions> - <t:osgi.property name="prop1">1</t:osgi.property> - <t:osgi.property name="prop2">ABC</t:osgi.property> - </extensions> - </service> - <service name="MultiplyService"> - <interface.java interface="calculator.dosgi.operations.MultiplyService"/> - <extensions> - <t:osgi.property name="prop1">1</t:osgi.property> - <t:osgi.property name="prop2">ABC</t:osgi.property> - </extensions> - </service> - <service name="DivideService"> - <interface.java interface="calculator.dosgi.operations.DivideService"/> - <extensions> - <t:osgi.property name="prop1">1</t:osgi.property> - <t:osgi.property name="prop2">ABC</t:osgi.property> - </extensions> - </service> -</componentType> diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-osgi/dosgi-calculator-operations/OSGI-INF/sca/bundle.composite b/sca-java-2.x/trunk/samples/learning-more/implementation-osgi/dosgi-calculator-operations/OSGI-INF/sca/bundle.composite deleted file mode 100644 index c7250912b0..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/implementation-osgi/dosgi-calculator-operations/OSGI-INF/sca/bundle.composite +++ /dev/null @@ -1,43 +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://docs.oasis-open.org/ns/opencsa/sca/200912" - xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.1" - xmlns:xsd="http://www.w3.org/2001/XMLSchema" - targetNamespace="http://calculator.dosgi" - name="OperationsComposite"> - - <component name="OperationsComponent"> - <tuscany:implementation.osgi bundleSymbolicName="calculator.dosgi.operations" bundleVersion="1.0.0" /> - <service name="AddService"> - <tuscany:binding.rmi uri="rmi://localhost:8085/AddService"/> - </service> - <service name="SubtractService"> - <tuscany:binding.rmi uri="rmi://localhost:8085/SubtractService"/> - </service> - <service name="MultiplyService"> - <tuscany:binding.rmi uri="rmi://localhost:8085/MultiplyService"/> - </service> - <service name="DivideService"> - <tuscany:binding.rmi uri="rmi://localhost:8085/DivideService"/> - </service> - - </component> - -</composite> diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-osgi/dosgi-calculator-operations/OSGI-INF/subtract-component.xml b/sca-java-2.x/trunk/samples/learning-more/implementation-osgi/dosgi-calculator-operations/OSGI-INF/subtract-component.xml deleted file mode 100644 index 1472f5a976..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/implementation-osgi/dosgi-calculator-operations/OSGI-INF/subtract-component.xml +++ /dev/null @@ -1,25 +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. ---> -<scr:component name="SubtractComponent" xmlns:scr="http://www.osgi.org/xmlns/scr/v1.0.0"> - <implementation class="calculator.dosgi.operations.impl.SubtractServiceImpl" /> - <service> - <provide interface="calculator.dosgi.operations.SubtractService" /> - </service> -</scr:component> diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-osgi/dosgi-calculator-operations/README b/sca-java-2.x/trunk/samples/learning-more/implementation-osgi/dosgi-calculator-operations/README deleted file mode 100644 index 52afa44559..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/implementation-osgi/dosgi-calculator-operations/README +++ /dev/null @@ -1,6 +0,0 @@ -Distributed OSGi Calculator Sample
-==================================
-This sample implements a distributed calculator using Distributed OSGi (RFC 119) over SCA.
-
-See http://tuscany.apache.org/documentation-2x/20-beta-samples-documentation.html
-for more information
diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-osgi/dosgi-calculator-operations/pom.xml b/sca-java-2.x/trunk/samples/learning-more/implementation-osgi/dosgi-calculator-operations/pom.xml deleted file mode 100644 index 612bf0b634..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/implementation-osgi/dosgi-calculator-operations/pom.xml +++ /dev/null @@ -1,161 +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-samples</artifactId> - <version>2.0-SNAPSHOT</version> - <relativePath>../../../pom.xml</relativePath> - </parent> - - <artifactId>sample-dosgi-calculator-operations</artifactId> - <name>Apache Tuscany SCA Sample OSGi Remote Services Calculator Operations</name> - - <dependencies> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-base-runtime-pom</artifactId> - <version>2.0-SNAPSHOT</version> - <type>pom</type> - </dependency> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-osgi-runtime-pom</artifactId> - <version>2.0-SNAPSHOT</version> - <type>pom</type> - </dependency> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-binding-rmi-runtime</artifactId> - <version>2.0-SNAPSHOT</version> - </dependency> - - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-node-launcher-equinox</artifactId> - <version>2.0-SNAPSHOT</version> - <scope>test</scope> - </dependency> - - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-node-impl-osgi</artifactId> - <version>2.0-SNAPSHOT</version> - <scope>runtime</scope> - </dependency> - - <dependency> - <groupId>org.eclipse.osgi</groupId> - <artifactId>services</artifactId> - <version>3.2.0-v20090520-1800</version> - <scope>test</scope> - </dependency> - - <!-- Equinox Declarative Services --> - <dependency> - <groupId>org.eclipse.equinox</groupId> - <artifactId>ds</artifactId> - <version>1.1.0-v20090601</version> - <scope>test</scope> - </dependency> - - <dependency> - <groupId>org.eclipse.equinox</groupId> - <artifactId>util</artifactId> - <version>1.0.100-v20090520-1800</version> - <scope>test</scope> - </dependency> - - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>4.8.1</version> - <scope>test</scope> - </dependency> - - </dependencies> - - <build> - <finalName>${project.artifactId}</finalName> - <plugins> - <plugin> - <artifactId>maven-eclipse-plugin</artifactId> - <version>2.5.1</version> - <configuration> - <buildcommands> - <buildcommand>org.eclipse.pde.ManifestBuilder</buildcommand> - <buildcommand>org.eclipse.jdt.core.javabuilder</buildcommand> - </buildcommands> - <projectnatures> - <projectnature>org.eclipse.jdt.core.javanature</projectnature> - <projectnature>org.eclipse.pde.PluginNature</projectnature> - </projectnatures> - <classpathContainers> - <classpathContainer>org.eclipse.jdt.launching.JRE_CONTAINER - </classpathContainer> - </classpathContainers> - </configuration> - </plugin> - - <plugin> - <artifactId>maven-jar-plugin</artifactId> - <configuration> - <archive> - <manifestFile>${basedir}/META-INF/MANIFEST.MF</manifestFile> - </archive> - </configuration> - </plugin> - -<!-- Don't think we need this as the JUnit test starts equinox - <plugin> - <groupId>org.apache.tuscany.maven.plugins</groupId> - <artifactId>maven-osgi-junit-plugin</artifactId> - <version>1.0</version> - <dependencies> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-node-launcher-equinox</artifactId> - <version>${project.version}</version> - </dependency> - </dependencies> - <executions> - <execution> - <id>osgi-test</id> - <phase>test</phase> - <goals> - <goal>test</goal> - </goals> - <configuration> - <systemProperties> - <property> - <name>osgi.configuration.area</name> - <value>${project.build.directory}/equinox</value> - </property> - </systemProperties> - </configuration> - </execution> - </executions> - </plugin> ---> - </plugins> - </build> - -</project> diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-osgi/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/AddService.java b/sca-java-2.x/trunk/samples/learning-more/implementation-osgi/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/AddService.java deleted file mode 100644 index 971500782f..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/implementation-osgi/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/AddService.java +++ /dev/null @@ -1,31 +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.dosgi.operations; - -import org.oasisopen.sca.annotation.Remotable; - -/** - * The interface for the add service - */ -@Remotable -public interface AddService { - - double add(double n1, double n2); - -} diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-osgi/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/DivideService.java b/sca-java-2.x/trunk/samples/learning-more/implementation-osgi/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/DivideService.java deleted file mode 100644 index 49b8a1c0bf..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/implementation-osgi/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/DivideService.java +++ /dev/null @@ -1,31 +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.dosgi.operations; - -import org.oasisopen.sca.annotation.Remotable; - -/** - * The interface for the divide service - */ -@Remotable -public interface DivideService { - - double divide(double n1, double n2); - -} diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-osgi/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/MultiplyService.java b/sca-java-2.x/trunk/samples/learning-more/implementation-osgi/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/MultiplyService.java deleted file mode 100644 index f4e59d12ea..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/implementation-osgi/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/MultiplyService.java +++ /dev/null @@ -1,31 +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.dosgi.operations; - -import org.oasisopen.sca.annotation.Remotable; - -/** - * The interface for the multiply service - */ -@Remotable -public interface MultiplyService { - - double multiply(double n1, double n2); - -} diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-osgi/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/SubtractService.java b/sca-java-2.x/trunk/samples/learning-more/implementation-osgi/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/SubtractService.java deleted file mode 100644 index bfb9b820f7..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/implementation-osgi/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/SubtractService.java +++ /dev/null @@ -1,31 +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.dosgi.operations; - -import org.oasisopen.sca.annotation.Remotable; - -/** - * The interface for the subtract service - */ -@Remotable -public interface SubtractService { - - double subtract(double n1, double n2); - -} diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-osgi/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/impl/AddServiceImpl.java b/sca-java-2.x/trunk/samples/learning-more/implementation-osgi/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/impl/AddServiceImpl.java deleted file mode 100644 index 66b2977241..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/implementation-osgi/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/impl/AddServiceImpl.java +++ /dev/null @@ -1,37 +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.dosgi.operations.impl; - -import java.util.logging.Level; -import java.util.logging.Logger; - -import calculator.dosgi.operations.AddService; - -/** - * 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.INFO, "Adding " + n1 + " and " + n2); - return n1 + n2; - } - -} diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-osgi/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/impl/DivideServiceImpl.java b/sca-java-2.x/trunk/samples/learning-more/implementation-osgi/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/impl/DivideServiceImpl.java deleted file mode 100644 index a3c21b2b96..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/implementation-osgi/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/impl/DivideServiceImpl.java +++ /dev/null @@ -1,37 +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.dosgi.operations.impl; - -import java.util.logging.Level; -import java.util.logging.Logger; - -import calculator.dosgi.operations.DivideService; - -/** - * 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.INFO, "Dividing " + n1 + " with " + n2); - return n1 / n2; - } - -} diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-osgi/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/impl/MultiplyServiceImpl.java b/sca-java-2.x/trunk/samples/learning-more/implementation-osgi/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/impl/MultiplyServiceImpl.java deleted file mode 100644 index 7922d2d392..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/implementation-osgi/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/impl/MultiplyServiceImpl.java +++ /dev/null @@ -1,37 +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.dosgi.operations.impl; - -import java.util.logging.Level; -import java.util.logging.Logger; - -import calculator.dosgi.operations.MultiplyService; - -/** - * 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.INFO, "Multiplying " + n1 + " with " + n2); - return n1 * n2; - } - -} diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-osgi/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/impl/OperationsActivator.java b/sca-java-2.x/trunk/samples/learning-more/implementation-osgi/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/impl/OperationsActivator.java deleted file mode 100644 index da2ce9063a..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/implementation-osgi/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/impl/OperationsActivator.java +++ /dev/null @@ -1,88 +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.dosgi.operations.impl; - -import java.util.Dictionary; -import java.util.Hashtable; -import java.util.logging.Logger; - -import org.osgi.framework.Bundle; -import org.osgi.framework.BundleActivator; -import org.osgi.framework.BundleContext; -import org.osgi.framework.ServiceReference; -import org.osgi.service.packageadmin.PackageAdmin; - -import calculator.dosgi.operations.AddService; -import calculator.dosgi.operations.DivideService; -import calculator.dosgi.operations.MultiplyService; -import calculator.dosgi.operations.SubtractService; - -/** - * - */ -public class OperationsActivator implements BundleActivator { - private Logger logger = Logger.getLogger(OperationsActivator.class.getName()); - - public void start(BundleContext context) throws Exception { - logger.info("Starting " + context.getBundle()); - - Dictionary<String, Object> props = new Hashtable<String, Object>(); - - logger.info("Registering " + AddService.class.getName()); - props.put("sca.service", "AddComponent#service-name(Add)"); - context.registerService(AddService.class.getName(), new AddServiceImpl(), props); - - logger.info("Registering " + SubtractService.class.getName()); - props.put("sca.service", "SubtractComponent#service-name(Subtract)"); - context.registerService(SubtractService.class.getName(), new SubtractServiceImpl(), props); - - logger.info("Registering " + MultiplyService.class.getName()); - props.put("sca.service", "MultiplyComponent#service-name(Multiply)"); - context.registerService(MultiplyService.class.getName(), new MultiplyServiceImpl(), props); - - logger.info("Registering " + DivideService.class.getName()); - props.put("sca.service", "DivideComponent#service-name(Divide)"); - context.registerService(DivideService.class.getName(), new DivideServiceImpl(), props); - - getBundle(context, AddService.class); - } - - public void stop(BundleContext context) throws Exception { - logger.info("Stopping " + context.getBundle()); - // Registered services will be automatically unregistered - } - - private Bundle getBundle(BundleContext bundleContext, Class<?> cls) { - PackageAdmin packageAdmin = null; - // PackageAdmin is used to resolve bundles - ServiceReference ref = bundleContext.getServiceReference("org.osgi.service.packageadmin.PackageAdmin"); - if (ref != null) { - packageAdmin = (PackageAdmin)bundleContext.getService(ref); - Bundle bundle = packageAdmin.getBundle(cls); - if (bundle != null) { - logger.info(cls.getName() + " is loaded by bundle: " + bundle.getSymbolicName()); - } - bundleContext.ungetService(ref); - return bundle; - } - return null; - } - -} diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-osgi/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/impl/SubtractServiceImpl.java b/sca-java-2.x/trunk/samples/learning-more/implementation-osgi/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/impl/SubtractServiceImpl.java deleted file mode 100644 index 4bbe83b14f..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/implementation-osgi/dosgi-calculator-operations/src/main/java/calculator/dosgi/operations/impl/SubtractServiceImpl.java +++ /dev/null @@ -1,37 +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.dosgi.operations.impl; - -import java.util.logging.Level; -import java.util.logging.Logger; - -import calculator.dosgi.operations.SubtractService; - -/** - * 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.INFO, "Subtracting " + n1 + " from " + n2); - return n1 - n2; - } - -} diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-osgi/dosgi-calculator-operations/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/samples/learning-more/implementation-osgi/dosgi-calculator-operations/src/main/resources/META-INF/sca-contribution.xml deleted file mode 100644 index d24999ab3e..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/implementation-osgi/dosgi-calculator-operations/src/main/resources/META-INF/sca-contribution.xml +++ /dev/null @@ -1,23 +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. ---> -<contribution xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" - xmlns:c="http://calculator.dosgi"> - <deployable composite="c:OperationsComposite" /> -</contribution> diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-osgi/dosgi-calculator-operations/src/test/java/calculator/dosgi/operations/test/OSGiTestUtils.java b/sca-java-2.x/trunk/samples/learning-more/implementation-osgi/dosgi-calculator-operations/src/test/java/calculator/dosgi/operations/test/OSGiTestUtils.java deleted file mode 100644 index cd92989da1..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/implementation-osgi/dosgi-calculator-operations/src/test/java/calculator/dosgi/operations/test/OSGiTestUtils.java +++ /dev/null @@ -1,105 +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.dosgi.operations.test; - -import java.lang.reflect.InvocationHandler; -import java.lang.reflect.Method; -import java.lang.reflect.Proxy; - -import org.osgi.framework.Bundle; - -/** - * - * Utility class to create OSGi bundles - * - * @version $Rev$ $Date$ - */ -public class OSGiTestUtils { - private static class InvocationHandlerImpl implements InvocationHandler { - private Object instance; - - public InvocationHandlerImpl(Object instance) { - super(); - this.instance = instance; - } - - public Object invoke(Object proxy, Method method, Object[] args) throws Throwable { - Method m = instance.getClass().getMethod(method.getName(), method.getParameterTypes()); - return m.invoke(instance, args); - } - - } - - /** - * Returns a string representation of the given bundle. - * - * @param b - * @param verbose - * @return - */ - public static String bundleStatus(Bundle bundle, boolean verbose) { - StringBuffer sb = new StringBuffer(); - sb.append(bundle.getBundleId()).append(" ").append(bundle.getSymbolicName()); - int s = bundle.getState(); - if ((s & Bundle.UNINSTALLED) != 0) { - sb.append(" UNINSTALLED"); - } - if ((s & Bundle.INSTALLED) != 0) { - sb.append(" INSTALLED"); - } - if ((s & Bundle.RESOLVED) != 0) { - sb.append(" RESOLVED"); - } - if ((s & Bundle.STARTING) != 0) { - sb.append(" STARTING"); - } - if ((s & Bundle.STOPPING) != 0) { - sb.append(" STOPPING"); - } - if ((s & Bundle.ACTIVE) != 0) { - sb.append(" ACTIVE"); - } - - if (verbose) { - sb.append(" ").append(bundle.getLocation()); - sb.append(" ").append(bundle.getHeaders()); - } - return sb.toString(); - } - - /** - * A utility to cast the object to the given interface. If the class for the object - * is loaded by a different classloader, a proxy will be created. - * - * @param <T> - * @param obj - * @param cls - * @return - */ - public static <T> T cast(Object obj, Class<T> cls) { - if (cls.isInstance(obj)) { - return cls.cast(obj); - } else { - return cls.cast(Proxy.newProxyInstance(cls.getClassLoader(), - new Class<?>[] {cls}, - new InvocationHandlerImpl(obj))); - } - } -} diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-osgi/dosgi-calculator-operations/src/test/java/calculator/dosgi/operations/test/OperationsNode.java b/sca-java-2.x/trunk/samples/learning-more/implementation-osgi/dosgi-calculator-operations/src/test/java/calculator/dosgi/operations/test/OperationsNode.java deleted file mode 100644 index 02007c385c..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/implementation-osgi/dosgi-calculator-operations/src/test/java/calculator/dosgi/operations/test/OperationsNode.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 calculator.dosgi.operations.test; - -import org.apache.tuscany.sca.node.equinox.launcher.NodeLauncher; - -/** - * - */ -public class OperationsNode { - - /** - * @param args - */ - public static void main(String[] args) { - if (args.length == 0) { - args = new String[] {"-bundles"}; - } - try { - NodeLauncher.main(args); - } catch (Exception e) { - e.printStackTrace(); - } - } - -} diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-osgi/dosgi-calculator-operations/src/test/java/calculator/dosgi/operations/test/OperationsOSGiNodeTestCase.java b/sca-java-2.x/trunk/samples/learning-more/implementation-osgi/dosgi-calculator-operations/src/test/java/calculator/dosgi/operations/test/OperationsOSGiNodeTestCase.java deleted file mode 100644 index 07f6aad01a..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/implementation-osgi/dosgi-calculator-operations/src/test/java/calculator/dosgi/operations/test/OperationsOSGiNodeTestCase.java +++ /dev/null @@ -1,105 +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.dosgi.operations.test; - -import static calculator.dosgi.operations.test.OSGiTestUtils.bundleStatus; - -import java.rmi.registry.LocateRegistry; -import java.rmi.registry.Registry; - -import org.apache.tuscany.sca.node.equinox.launcher.EquinoxHost; -import org.junit.AfterClass; -import org.junit.Assert; -import org.junit.BeforeClass; -import org.junit.Test; -import org.osgi.framework.Bundle; -import org.osgi.framework.BundleContext; -import org.osgi.framework.Constants; - -import calculator.dosgi.operations.AddService; - -/** - * - */ -public class OperationsOSGiNodeTestCase { - private static EquinoxHost host; - private static BundleContext context; - private static Bundle operationsBundle; - - /** - * @throws java.lang.Exception - */ - @BeforeClass - public static void setUpBeforeClass() throws Exception { - try { - host = new EquinoxHost(); - context = host.start(); - - for (Bundle b : context.getBundles()) { - if (b.getSymbolicName().equals("org.eclipse.equinox.ds") || b.getSymbolicName() - .startsWith("org.apache.tuscany.sca.")) { - try { - if (b.getHeaders().get(Constants.FRAGMENT_HOST) == null) { - // Start the non-fragment bundle - b.start(); - } - } catch (Exception e) { - System.out.println("Error for bundle: " + b.getSymbolicName()); - e.printStackTrace(); - } - System.out.println(bundleStatus(b, false)); - } - if ("calculator.dosgi.operations".equals(b.getSymbolicName())) { - operationsBundle = b; - } - } - - if (operationsBundle != null) { - operationsBundle.start(); - System.out.println(bundleStatus(operationsBundle, false)); - } - - } catch (Exception e) { - e.printStackTrace(); - throw e; - } - } - - @Test - public void testOSGi() throws Exception { - Registry registry = LocateRegistry.getRegistry(8085); - Object add = registry.lookup("AddService"); - AddService addService = OSGiTestUtils.cast(add, AddService.class); - double sum = addService.add(1.0, 2.0); - Assert.assertEquals(3.0, sum, 0.0); - } - - /** - * @throws java.lang.Exception - */ - @AfterClass - public static void tearDownAfterClass() throws Exception { - if (host != null) { - host.stop(); - context = null; - } - } - -} diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-osgi/dosgi-calculator/LICENSE b/sca-java-2.x/trunk/samples/learning-more/implementation-osgi/dosgi-calculator/LICENSE deleted file mode 100644 index 6e529a25c4..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/implementation-osgi/dosgi-calculator/LICENSE +++ /dev/null @@ -1,205 +0,0 @@ -
- Apache License
- Version 2.0, January 2004
- http://www.apache.org/licenses/
-
- TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
- 1. Definitions.
-
- "License" shall mean the terms and conditions for use, reproduction,
- and distribution as defined by Sections 1 through 9 of this document.
-
- "Licensor" shall mean the copyright owner or entity authorized by
- the copyright owner that is granting the License.
-
- "Legal Entity" shall mean the union of the acting entity and all
- other entities that control, are controlled by, or are under common
- control with that entity. For the purposes of this definition,
- "control" means (i) the power, direct or indirect, to cause the
- direction or management of such entity, whether by contract or
- otherwise, or (ii) ownership of fifty percent (50%) or more of the
- outstanding shares, or (iii) beneficial ownership of such entity.
-
- "You" (or "Your") shall mean an individual or Legal Entity
- exercising permissions granted by this License.
-
- "Source" form shall mean the preferred form for making modifications,
- including but not limited to software source code, documentation
- source, and configuration files.
-
- "Object" form shall mean any form resulting from mechanical
- transformation or translation of a Source form, including but
- not limited to compiled object code, generated documentation,
- and conversions to other media types.
-
- "Work" shall mean the work of authorship, whether in Source or
- Object form, made available under the License, as indicated by a
- copyright notice that is included in or attached to the work
- (an example is provided in the Appendix below).
-
- "Derivative Works" shall mean any work, whether in Source or Object
- form, that is based on (or derived from) the Work and for which the
- editorial revisions, annotations, elaborations, or other modifications
- represent, as a whole, an original work of authorship. For the purposes
- of this License, Derivative Works shall not include works that remain
- separable from, or merely link (or bind by name) to the interfaces of,
- the Work and Derivative Works thereof.
-
- "Contribution" shall mean any work of authorship, including
- the original version of the Work and any modifications or additions
- to that Work or Derivative Works thereof, that is intentionally
- submitted to Licensor for inclusion in the Work by the copyright owner
- or by an individual or Legal Entity authorized to submit on behalf of
- the copyright owner. For the purposes of this definition, "submitted"
- means any form of electronic, verbal, or written communication sent
- to the Licensor or its representatives, including but not limited to
- communication on electronic mailing lists, source code control systems,
- and issue tracking systems that are managed by, or on behalf of, the
- Licensor for the purpose of discussing and improving the Work, but
- excluding communication that is conspicuously marked or otherwise
- designated in writing by the copyright owner as "Not a Contribution."
-
- "Contributor" shall mean Licensor and any individual or Legal Entity
- on behalf of whom a Contribution has been received by Licensor and
- subsequently incorporated within the Work.
-
- 2. Grant of Copyright License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- copyright license to reproduce, prepare Derivative Works of,
- publicly display, publicly perform, sublicense, and distribute the
- Work and such Derivative Works in Source or Object form.
-
- 3. Grant of Patent License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- (except as stated in this section) patent license to make, have made,
- use, offer to sell, sell, import, and otherwise transfer the Work,
- where such license applies only to those patent claims licensable
- by such Contributor that are necessarily infringed by their
- Contribution(s) alone or by combination of their Contribution(s)
- with the Work to which such Contribution(s) was submitted. If You
- institute patent litigation against any entity (including a
- cross-claim or counterclaim in a lawsuit) alleging that the Work
- or a Contribution incorporated within the Work constitutes direct
- or contributory patent infringement, then any patent licenses
- granted to You under this License for that Work shall terminate
- as of the date such litigation is filed.
-
- 4. Redistribution. You may reproduce and distribute copies of the
- Work or Derivative Works thereof in any medium, with or without
- modifications, and in Source or Object form, provided that You
- meet the following conditions:
-
- (a) You must give any other recipients of the Work or
- Derivative Works a copy of this License; and
-
- (b) You must cause any modified files to carry prominent notices
- stating that You changed the files; and
-
- (c) You must retain, in the Source form of any Derivative Works
- that You distribute, all copyright, patent, trademark, and
- attribution notices from the Source form of the Work,
- excluding those notices that do not pertain to any part of
- the Derivative Works; and
-
- (d) If the Work includes a "NOTICE" text file as part of its
- distribution, then any Derivative Works that You distribute must
- include a readable copy of the attribution notices contained
- within such NOTICE file, excluding those notices that do not
- pertain to any part of the Derivative Works, in at least one
- of the following places: within a NOTICE text file distributed
- as part of the Derivative Works; within the Source form or
- documentation, if provided along with the Derivative Works; or,
- within a display generated by the Derivative Works, if and
- wherever such third-party notices normally appear. The contents
- of the NOTICE file are for informational purposes only and
- do not modify the License. You may add Your own attribution
- notices within Derivative Works that You distribute, alongside
- or as an addendum to the NOTICE text from the Work, provided
- that such additional attribution notices cannot be construed
- as modifying the License.
-
- You may add Your own copyright statement to Your modifications and
- may provide additional or different license terms and conditions
- for use, reproduction, or distribution of Your modifications, or
- for any such Derivative Works as a whole, provided Your use,
- reproduction, and distribution of the Work otherwise complies with
- the conditions stated in this License.
-
- 5. Submission of Contributions. Unless You explicitly state otherwise,
- any Contribution intentionally submitted for inclusion in the Work
- by You to the Licensor shall be under the terms and conditions of
- this License, without any additional terms or conditions.
- Notwithstanding the above, nothing herein shall supersede or modify
- the terms of any separate license agreement you may have executed
- with Licensor regarding such Contributions.
-
- 6. Trademarks. This License does not grant permission to use the trade
- names, trademarks, service marks, or product names of the Licensor,
- except as required for reasonable and customary use in describing the
- origin of the Work and reproducing the content of the NOTICE file.
-
- 7. Disclaimer of Warranty. Unless required by applicable law or
- agreed to in writing, Licensor provides the Work (and each
- Contributor provides its Contributions) on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- implied, including, without limitation, any warranties or conditions
- of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
- PARTICULAR PURPOSE. You are solely responsible for determining the
- appropriateness of using or redistributing the Work and assume any
- risks associated with Your exercise of permissions under this License.
-
- 8. Limitation of Liability. In no event and under no legal theory,
- whether in tort (including negligence), contract, or otherwise,
- unless required by applicable law (such as deliberate and grossly
- negligent acts) or agreed to in writing, shall any Contributor be
- liable to You for damages, including any direct, indirect, special,
- incidental, or consequential damages of any character arising as a
- result of this License or out of the use or inability to use the
- Work (including but not limited to damages for loss of goodwill,
- work stoppage, computer failure or malfunction, or any and all
- other commercial damages or losses), even if such Contributor
- has been advised of the possibility of such damages.
-
- 9. Accepting Warranty or Additional Liability. While redistributing
- the Work or Derivative Works thereof, You may choose to offer,
- and charge a fee for, acceptance of support, warranty, indemnity,
- or other liability obligations and/or rights consistent with this
- License. However, in accepting such obligations, You may act only
- on Your own behalf and on Your sole responsibility, not on behalf
- of any other Contributor, and only if You agree to indemnify,
- defend, and hold each Contributor harmless for any liability
- incurred by, or claims asserted against, such Contributor by reason
- of your accepting any such warranty or additional liability.
-
- END OF TERMS AND CONDITIONS
-
- APPENDIX: How to apply the Apache License to your work.
-
- To apply the Apache License to your work, attach the following
- boilerplate notice, with the fields enclosed by brackets "[]"
- replaced with your own identifying information. (Don't include
- the brackets!) The text should be enclosed in the appropriate
- comment syntax for the file format. We also recommend that a
- file or class name and description of purpose be included on the
- same "printed page" as the copyright notice for easier
- identification within third-party archives.
-
- Copyright [yyyy] [name of copyright owner]
-
- Licensed 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.
-
-
-
diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-osgi/dosgi-calculator/META-INF/MANIFEST.MF b/sca-java-2.x/trunk/samples/learning-more/implementation-osgi/dosgi-calculator/META-INF/MANIFEST.MF deleted file mode 100644 index 542b53b085..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/implementation-osgi/dosgi-calculator/META-INF/MANIFEST.MF +++ /dev/null @@ -1,20 +0,0 @@ -Manifest-Version: 1.0
-Export-Package: calculator.dosgi;version="1.0.0",
- calculator.dosgi.operations;version="1.0.0"
-Bundle-Version: 1.0.0
-Bundle-Name: calculator.dosgi
-Bundle-Activator: calculator.dosgi.impl.CalculatorActivator
-Bundle-ManifestVersion: 2
-Import-Package: org.oasisopen.sca.annotation;version="2.0.0",
- org.osgi.framework,
- org.osgi.service.component;resolution:=optional,
- org.osgi.service.packageadmin,
- org.osgi.util.tracker
-Bundle-SymbolicName: calculator.dosgi
-Bundle-Vendor: The Apache Software Foundation
-Bundle-ActivationPolicy: lazy
-Eclipse-LazyStart: true
-Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt
-Bundle-DocURL: http://www.apache.org/
-Service-Component-Disabled: OSGI-INF/calculator-component.xml
-Bundle-RequiredExecutionEnvironment: J2SE-1.5,JavaSE-1.6 diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-osgi/dosgi-calculator/NOTICE b/sca-java-2.x/trunk/samples/learning-more/implementation-osgi/dosgi-calculator/NOTICE deleted file mode 100644 index f6ce2542c3..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/implementation-osgi/dosgi-calculator/NOTICE +++ /dev/null @@ -1,6 +0,0 @@ -${pom.name}
-Copyright (c) 2005 - 2011 The Apache Software Foundation
-
-This product includes software developed by
-The Apache Software Foundation (http://www.apache.org/).
-
diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-osgi/dosgi-calculator/OSGI-INF/blueprint/calculator-module.xml b/sca-java-2.x/trunk/samples/learning-more/implementation-osgi/dosgi-calculator/OSGI-INF/blueprint/calculator-module.xml deleted file mode 100644 index fd834e12ef..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/implementation-osgi/dosgi-calculator/OSGI-INF/blueprint/calculator-module.xml +++ /dev/null @@ -1,43 +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. ---> -<!-- A sample module-context.xml for OSGI RFC 124 (BluePrint Service) --> -<components xmlns="http://www.osgi.org/xmlns/blueprint/v1.0.0"> - <component id="CalculatorComponent" class="calculator.dosgi.impl.CalculatorServiceImpl"> - <property name="addService" ref="AddService" /> - <property name="subtractService" ref="SubtractService" /> - <property name="multiplyService" ref="MultiplyService" /> - <property name="divideService" ref="DivideService" /> - </component> - - <!-- We can derive the SCA services for the implementation.osgi --> - <service id="CalculatorService" ref="CalculatorComponent" interface="calculator.dosgi.CalculatorService"> - </service> - - <!-- We can derive the SCA references for the implementation.osgi --> - <reference id="AddService" interface="calculator.dosgi.operations.AddService"> - </reference> - <reference id="SubtractService" interface="calculator.dosgi.operations.SubtractService"> - </reference> - <reference id="MultiplyService" interface="calculator.dosgi.operations.MultiplyService"> - </reference> - <reference id="DivideService" interface="calculator.dosgi.operations.DivideService"> - </reference> - -</components>
\ No newline at end of file diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-osgi/dosgi-calculator/OSGI-INF/calculator-component.xml b/sca-java-2.x/trunk/samples/learning-more/implementation-osgi/dosgi-calculator/OSGI-INF/calculator-component.xml deleted file mode 100644 index 5daaa59aae..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/implementation-osgi/dosgi-calculator/OSGI-INF/calculator-component.xml +++ /dev/null @@ -1,36 +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. ---> -<scr:component name="CalculatorComponent" - xmlns:scr="http://www.osgi.org/xmlns/scr/v1.0.0"> - <implementation class="calculator.dosgi.impl.CalculatorServiceDSImpl" /> - <service> - <provide interface="calculator.dosgi.CalculatorService" /> - </service> - - <reference name="addService" interface="calculator.dosgi.operations.AddService" bind="setAddService" unbind="unsetAddService" - policy="dynamic" /> - <reference name="subtractService" interface="calculator.dosgi.operations.SubtractService" bind="setSubtractService" - unbind="unsetSubtractService" policy="dynamic" /> - <reference name="multiplyService" interface="calculator.dosgi.operations.MultiplyService" bind="setMultiplyService" - unbind="unsetMultiplyService" policy="dynamic" /> - <reference name="divideService" interface="calculator.dosgi.operations.DivideService" bind="setDivideService" - unbind="unsetDivideService" policy="dynamic" /> - -</scr:component> diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-osgi/dosgi-calculator/OSGI-INF/sca/bundle.componentType b/sca-java-2.x/trunk/samples/learning-more/implementation-osgi/dosgi-calculator/OSGI-INF/sca/bundle.componentType deleted file mode 100644 index 1dff21ab6b..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/implementation-osgi/dosgi-calculator/OSGI-INF/sca/bundle.componentType +++ /dev/null @@ -1,64 +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. ---> -<componentType xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" - xmlns:xsd="http://www.w3.org/2001/XMLSchema" - xmlns:t="http://tuscany.apache.org/xmlns/sca/1.1"> - <!-- The service elment defines an SCA view of the OSGi service --> - <service name="CalculatorService"> - <!-- The interface will be mapped into the OSGi service class --> - <interface.java interface="calculator.dosgi.CalculatorService"/> - <!-- The list of OSGi properties --> - <extensions> - <t:osgi.property name="prop1">1</t:osgi.property> - <t:osgi.property name="prop2">ABC</t:osgi.property> - </extensions> - </service> - - <!-- The reference elment defines an SCA proxy to a remote OSGi service --> - <reference name="addService"> - <interface.java interface="calculator.dosgi.operations.AddService"/> - <extensions> - <t:osgi.property name="prop1">1</t:osgi.property> - <t:osgi.property name="prop2">ABC</t:osgi.property> - </extensions> - </reference> - <reference name="subtractService"> - <interface.java interface="calculator.dosgi.operations.SubtractService"/> - <extensions> - <t:osgi.property name="prop1">1</t:osgi.property> - <t:osgi.property name="prop2">ABC</t:osgi.property> - </extensions> - </reference> - <reference name="multiplyService"> - <interface.java interface="calculator.dosgi.operations.MultiplyService"/> - <extensions> - <t:osgi.property name="prop1">1</t:osgi.property> - <t:osgi.property name="prop2">ABC</t:osgi.property> - </extensions> - </reference> - <reference name="divideService"> - <interface.java interface="calculator.dosgi.operations.DivideService"/> - <extensions> - <t:osgi.property name="prop1">1</t:osgi.property> - <t:osgi.property name="prop2">ABC</t:osgi.property> - </extensions> - </reference> - -</componentType> diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-osgi/dosgi-calculator/OSGI-INF/sca/bundle.composite b/sca-java-2.x/trunk/samples/learning-more/implementation-osgi/dosgi-calculator/OSGI-INF/sca/bundle.composite deleted file mode 100644 index c64e999fc6..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/implementation-osgi/dosgi-calculator/OSGI-INF/sca/bundle.composite +++ /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. ---> -<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" - xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.1" - xmlns:xsd="http://www.w3.org/2001/XMLSchema" - targetNamespace="http://calculator.dosgi" - name="CalculatorComposite"> - - <component name="CalculatorComponent"> - <tuscany:implementation.osgi bundleSymbolicName="calculator.dosgi" bundleVersion="1.0.0" /> - <service name="CalculatorService"> - <binding.ws uri="http://localhost:8086/CalculatorService"/> - </service> - <reference name="addService"> - <tuscany:binding.rmi uri="rmi://localhost:8085/AddService"/> - </reference> - <reference name="subtractService"> - <tuscany:binding.rmi uri="rmi://localhost:8085/SubtractService"/> - </reference> - <reference name="multiplyService"> - <tuscany:binding.rmi uri="rmi://localhost:8085/MultiplyService"/> - </reference> - <reference name="divideService"> - <tuscany:binding.rmi uri="rmi://localhost:8085/DivideService"/> - </reference> - </component> - -</composite> diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-osgi/dosgi-calculator/README b/sca-java-2.x/trunk/samples/learning-more/implementation-osgi/dosgi-calculator/README deleted file mode 100644 index 52afa44559..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/implementation-osgi/dosgi-calculator/README +++ /dev/null @@ -1,6 +0,0 @@ -Distributed OSGi Calculator Sample
-==================================
-This sample implements a distributed calculator using Distributed OSGi (RFC 119) over SCA.
-
-See http://tuscany.apache.org/documentation-2x/20-beta-samples-documentation.html
-for more information
diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-osgi/dosgi-calculator/dosgi-calculator.png b/sca-java-2.x/trunk/samples/learning-more/implementation-osgi/dosgi-calculator/dosgi-calculator.png Binary files differdeleted file mode 100644 index 805baa54d2..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/implementation-osgi/dosgi-calculator/dosgi-calculator.png +++ /dev/null diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-osgi/dosgi-calculator/pom.xml b/sca-java-2.x/trunk/samples/learning-more/implementation-osgi/dosgi-calculator/pom.xml deleted file mode 100644 index 94a9d46db2..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/implementation-osgi/dosgi-calculator/pom.xml +++ /dev/null @@ -1,153 +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-samples</artifactId> - <version>2.0-SNAPSHOT</version> - <relativePath>../../../pom.xml</relativePath> - </parent> - - <artifactId>sample-dosgi-calculator</artifactId> - <name>Apache Tuscany SCA Sample OSGi Remote Services Calculator</name> - - <dependencies> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-feature-ejava</artifactId> - <version>2.0-SNAPSHOT</version> - <type>pom</type> - </dependency> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-feature-webservice</artifactId> - <version>2.0-SNAPSHOT</version> - <type>pom</type> - <scope>runtime</scope> - </dependency> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-node-launcher-equinox</artifactId> - <version>2.0-SNAPSHOT</version> - <scope>test</scope> - </dependency> - - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-node-impl-osgi</artifactId> - <version>2.0-SNAPSHOT</version> - <scope>runtime</scope> - </dependency> - - <dependency> - <groupId>org.eclipse.osgi</groupId> - <artifactId>services</artifactId> - <version>3.2.0-v20090520-1800</version> - </dependency> - - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>4.8.1</version> - <scope>test</scope> - </dependency> - - <!-- Equinox Declarative Services --> - <dependency> - <groupId>org.eclipse.equinox</groupId> - <artifactId>ds</artifactId> - <version>1.1.0-v20090601</version> - <scope>test</scope> - </dependency> - - <dependency> - <groupId>org.eclipse.equinox</groupId> - <artifactId>util</artifactId> - <version>1.0.100-v20090520-1800</version> - <scope>test</scope> - </dependency> - - </dependencies> - - <build> - <finalName>${project.artifactId}</finalName> - <plugins> - <plugin> - <artifactId>maven-eclipse-plugin</artifactId> - <version>2.5.1</version> - <configuration> - <buildcommands> - <buildcommand>org.eclipse.pde.ManifestBuilder</buildcommand> - <buildcommand>org.eclipse.jdt.core.javabuilder</buildcommand> - </buildcommands> - <projectnatures> - <projectnature>org.eclipse.jdt.core.javanature</projectnature> - <projectnature>org.eclipse.pde.PluginNature</projectnature> - </projectnatures> - <classpathContainers> - <classpathContainer>org.eclipse.jdt.launching.JRE_CONTAINER - </classpathContainer> - </classpathContainers> - </configuration> - </plugin> - - <plugin> - <artifactId>maven-jar-plugin</artifactId> - <configuration> - <archive> - <manifestFile>${basedir}/META-INF/MANIFEST.MF</manifestFile> - </archive> - </configuration> - </plugin> - - <plugin> - <groupId>org.apache.tuscany.maven.plugins</groupId> - <artifactId>maven-osgi-junit-plugin</artifactId> - <version>1.0</version> - <dependencies> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-node-launcher-equinox</artifactId> - <version>${project.version}</version> - </dependency> - </dependencies> - <executions> - <execution> - <id>osgi-test</id> - <phase>test</phase> - <goals> - <goal>test</goal> - </goals> - <configuration> - <systemProperties> - <property> - <name>osgi.configuration.area</name> - <value>${project.build.directory}/equinox</value> - </property> - </systemProperties> - </configuration> - </execution> - </executions> - </plugin> - </plugins> - </build> - -</project> diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-osgi/dosgi-calculator/src/main/java/calculator/dosgi/CalculatorService.java b/sca-java-2.x/trunk/samples/learning-more/implementation-osgi/dosgi-calculator/src/main/java/calculator/dosgi/CalculatorService.java deleted file mode 100644 index cc562b7c2f..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/implementation-osgi/dosgi-calculator/src/main/java/calculator/dosgi/CalculatorService.java +++ /dev/null @@ -1,36 +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.dosgi; - -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/trunk/samples/learning-more/implementation-osgi/dosgi-calculator/src/main/java/calculator/dosgi/impl/CalculatorActivator.java b/sca-java-2.x/trunk/samples/learning-more/implementation-osgi/dosgi-calculator/src/main/java/calculator/dosgi/impl/CalculatorActivator.java deleted file mode 100644 index 6b42645f69..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/implementation-osgi/dosgi-calculator/src/main/java/calculator/dosgi/impl/CalculatorActivator.java +++ /dev/null @@ -1,76 +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.dosgi.impl; - -import java.util.Dictionary; -import java.util.Hashtable; -import java.util.logging.Logger; - -import org.osgi.framework.Bundle; -import org.osgi.framework.BundleActivator; -import org.osgi.framework.BundleContext; -import org.osgi.framework.ServiceReference; -import org.osgi.service.packageadmin.PackageAdmin; - -import calculator.dosgi.CalculatorService; -import calculator.dosgi.operations.AddService; - -/** - * - */ -public class CalculatorActivator implements BundleActivator { - private Logger logger = Logger.getLogger(CalculatorActivator.class.getName()); - - private Bundle getBundle(BundleContext bundleContext, Class<?> cls) { - PackageAdmin packageAdmin = null; - // PackageAdmin is used to resolve bundles - ServiceReference ref = bundleContext.getServiceReference("org.osgi.service.packageadmin.PackageAdmin"); - if (ref != null) { - packageAdmin = (PackageAdmin)bundleContext.getService(ref); - Bundle bundle = packageAdmin.getBundle(cls); - if (bundle != null) { - logger.info(cls.getName() + " is loaded by bundle: " + bundle.getSymbolicName()); - } - bundleContext.ungetService(ref); - return bundle; - } - return null; - } - - public void start(BundleContext context) throws Exception { - logger.info("Starting " + context.getBundle()); - Dictionary<String, Object> props = new Hashtable<String, Object>(); - props.put("sca.service", "CalculatorComponent#service-name(Calculator)"); - props.put("calculator", "Calculator"); - - logger.info("Registering " + CalculatorService.class.getName()); - CalculatorService calculator = new CalculatorServiceImpl(context); - context.registerService(CalculatorService.class.getName(), calculator, props); - - getBundle(context, AddService.class); - - } - - public void stop(BundleContext context) throws Exception { - logger.info("Stopping " + context.getBundle()); - // Registered services will be automatically unregistered - } - -} diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-osgi/dosgi-calculator/src/main/java/calculator/dosgi/impl/CalculatorServiceDSImpl.java b/sca-java-2.x/trunk/samples/learning-more/implementation-osgi/dosgi-calculator/src/main/java/calculator/dosgi/impl/CalculatorServiceDSImpl.java deleted file mode 100644 index 5f9db16ca9..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/implementation-osgi/dosgi-calculator/src/main/java/calculator/dosgi/impl/CalculatorServiceDSImpl.java +++ /dev/null @@ -1,114 +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.dosgi.impl; - -import org.osgi.service.component.ComponentContext; - -import calculator.dosgi.CalculatorService; -import calculator.dosgi.operations.AddService; -import calculator.dosgi.operations.DivideService; -import calculator.dosgi.operations.MultiplyService; -import calculator.dosgi.operations.SubtractService; - -/** - * An implementation of the Calculator service. - */ -public class CalculatorServiceDSImpl implements CalculatorService { - private AddService addService; - private SubtractService subtractService; - private MultiplyService multiplyService; - private DivideService divideService; - - public CalculatorServiceDSImpl() { - super(); - System.out.println("CalculatorServiceDSImpl()"); - } - - protected void activate(ComponentContext context) { - System.out.println("Activating " + context); - } - - protected void deactivate(ComponentContext context) { - System.out.println("Deactivating " + context); - } - - /* - * The following setters can be used for DS injection - */ - public void setAddService(AddService addService) { - System.out.println("setAddService()"); - this.addService = addService; - } - - public void setSubtractService(SubtractService subtractService) { - this.subtractService = subtractService; - } - - public void setDivideService(DivideService divideService) { - this.divideService = divideService; - } - - public void setMultiplyService(MultiplyService multiplyService) { - this.multiplyService = multiplyService; - } - - /* - * The following setters can be used for DS injection - */ - public void unsetAddService(AddService addService) { - System.out.println("unsetAddService()"); - this.addService = null; - } - - public void unsetSubtractService(SubtractService subtractService) { - this.subtractService = null; - } - - public void unsetDivideService(DivideService divideService) { - this.divideService = null; - } - - public void unsetMultiplyService(MultiplyService multiplyService) { - this.multiplyService = null; - } - private <T> T getService(Class<T> cls) { - for (Object s : new Object[] {addService, subtractService, multiplyService, divideService}) { - if (cls.isInstance(s)) { - return cls.cast(s); - } - } - throw new IllegalStateException(cls.getSimpleName() + " is not available"); - } - - public double add(double n1, double n2) { - return getService(AddService.class).add(n1, n2); - } - - public double subtract(double n1, double n2) { - return getService(SubtractService.class).subtract(n1, n2); - } - - public double multiply(double n1, double n2) { - return getService(MultiplyService.class).multiply(n1, n2); - } - - public double divide(double n1, double n2) { - return getService(DivideService.class).divide(n1, n2); - } -} diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-osgi/dosgi-calculator/src/main/java/calculator/dosgi/impl/CalculatorServiceImpl.java b/sca-java-2.x/trunk/samples/learning-more/implementation-osgi/dosgi-calculator/src/main/java/calculator/dosgi/impl/CalculatorServiceImpl.java deleted file mode 100644 index a9ea37585a..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/implementation-osgi/dosgi-calculator/src/main/java/calculator/dosgi/impl/CalculatorServiceImpl.java +++ /dev/null @@ -1,105 +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.dosgi.impl; - -import static org.osgi.framework.Constants.OBJECTCLASS; - -import org.osgi.framework.BundleContext; -import org.osgi.framework.Filter; -import org.osgi.framework.InvalidSyntaxException; -import org.osgi.util.tracker.ServiceTracker; - -import calculator.dosgi.CalculatorService; -import calculator.dosgi.operations.AddService; -import calculator.dosgi.operations.DivideService; -import calculator.dosgi.operations.MultiplyService; -import calculator.dosgi.operations.SubtractService; - -/** - * An implementation of the Calculator service. - */ -public class CalculatorServiceImpl implements CalculatorService { - private ServiceTracker remoteServices; - private ServiceTracker localServices; - - public CalculatorServiceImpl() { - super(); - } - - public CalculatorServiceImpl(BundleContext context) { - super(); - Filter remoteFilter = null, localFilter = null; - try { - remoteFilter = - context.createFilter("(&(" + OBJECTCLASS + "=calculator.dosgi.operations.*) (service.imported=*))"); - localFilter = - context.createFilter("(&(" + OBJECTCLASS + "=calculator.dosgi.operations.*) (!(service.imported=*)))"); - } catch (InvalidSyntaxException e) { - e.printStackTrace(); - } - this.remoteServices = new ServiceTracker(context, remoteFilter, null); - remoteServices.open(); - this.localServices = new ServiceTracker(context, localFilter, null); - localServices.open(); - } - - private <T> T getService(Class<T> cls) { - try { - // Wait for 10 seconds until the remote services are imported - remoteServices.waitForService(10000); - } catch (InterruptedException e) { - throw new IllegalStateException(cls.getSimpleName() + " is not available"); - } - Object[] remoteObjects = remoteServices.getServices(); - if (remoteObjects != null) { - for (Object s : remoteObjects) { - if (cls.isInstance(s)) { - System.out.println("Remote service: " + s); - return cls.cast(s); - } - } - } - Object[] localObjects = localServices.getServices(); - if (localObjects != null) { - for (Object s : localObjects) { - if (cls.isInstance(s)) { - System.out.println("Local service: " + s); - return cls.cast(s); - } - } - } - throw new IllegalStateException(cls.getSimpleName() + " is not available"); - } - - public double add(double n1, double n2) { - return getService(AddService.class).add(n1, n2); - } - - public double subtract(double n1, double n2) { - return getService(SubtractService.class).subtract(n1, n2); - } - - public double multiply(double n1, double n2) { - return getService(MultiplyService.class).multiply(n1, n2); - } - - public double divide(double n1, double n2) { - return getService(DivideService.class).divide(n1, n2); - } -} diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-osgi/dosgi-calculator/src/main/java/calculator/dosgi/operations/AddService.java b/sca-java-2.x/trunk/samples/learning-more/implementation-osgi/dosgi-calculator/src/main/java/calculator/dosgi/operations/AddService.java deleted file mode 100644 index 971500782f..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/implementation-osgi/dosgi-calculator/src/main/java/calculator/dosgi/operations/AddService.java +++ /dev/null @@ -1,31 +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.dosgi.operations; - -import org.oasisopen.sca.annotation.Remotable; - -/** - * The interface for the add service - */ -@Remotable -public interface AddService { - - double add(double n1, double n2); - -} diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-osgi/dosgi-calculator/src/main/java/calculator/dosgi/operations/DivideService.java b/sca-java-2.x/trunk/samples/learning-more/implementation-osgi/dosgi-calculator/src/main/java/calculator/dosgi/operations/DivideService.java deleted file mode 100644 index 49b8a1c0bf..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/implementation-osgi/dosgi-calculator/src/main/java/calculator/dosgi/operations/DivideService.java +++ /dev/null @@ -1,31 +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.dosgi.operations; - -import org.oasisopen.sca.annotation.Remotable; - -/** - * The interface for the divide service - */ -@Remotable -public interface DivideService { - - double divide(double n1, double n2); - -} diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-osgi/dosgi-calculator/src/main/java/calculator/dosgi/operations/MultiplyService.java b/sca-java-2.x/trunk/samples/learning-more/implementation-osgi/dosgi-calculator/src/main/java/calculator/dosgi/operations/MultiplyService.java deleted file mode 100644 index f4e59d12ea..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/implementation-osgi/dosgi-calculator/src/main/java/calculator/dosgi/operations/MultiplyService.java +++ /dev/null @@ -1,31 +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.dosgi.operations; - -import org.oasisopen.sca.annotation.Remotable; - -/** - * The interface for the multiply service - */ -@Remotable -public interface MultiplyService { - - double multiply(double n1, double n2); - -} diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-osgi/dosgi-calculator/src/main/java/calculator/dosgi/operations/SubtractService.java b/sca-java-2.x/trunk/samples/learning-more/implementation-osgi/dosgi-calculator/src/main/java/calculator/dosgi/operations/SubtractService.java deleted file mode 100644 index bfb9b820f7..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/implementation-osgi/dosgi-calculator/src/main/java/calculator/dosgi/operations/SubtractService.java +++ /dev/null @@ -1,31 +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.dosgi.operations; - -import org.oasisopen.sca.annotation.Remotable; - -/** - * The interface for the subtract service - */ -@Remotable -public interface SubtractService { - - double subtract(double n1, double n2); - -} diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-osgi/dosgi-calculator/src/main/java/calculator/rmi/OperationsRMIServer.java b/sca-java-2.x/trunk/samples/learning-more/implementation-osgi/dosgi-calculator/src/main/java/calculator/rmi/OperationsRMIServer.java deleted file mode 100644 index a4fc52694e..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/implementation-osgi/dosgi-calculator/src/main/java/calculator/rmi/OperationsRMIServer.java +++ /dev/null @@ -1,93 +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.rmi; - -import java.io.Serializable; -import java.rmi.Remote; -import java.rmi.RemoteException; -import java.rmi.registry.LocateRegistry; -import java.rmi.registry.Registry; -import java.rmi.server.UnicastRemoteObject; - -/** - * - */ -public class OperationsRMIServer implements OperationsRemote, Serializable { - - private static final long serialVersionUID = 6081008315263103012L; - private transient Registry registry; - - public OperationsRMIServer() throws RemoteException { - super(); - } - - public double add(double n1, double n2) { - return n1 + n2; - } - - public double subtract(double n1, double n2) { - return n1 - n2; - } - - public double divide(double n1, double n2) { - return n1 / n2; - } - - public double multiply(double n1, double n2) { - return n1 * n2; - } - - public void start() throws RemoteException { - Thread thread = new Thread() { - public void run() { - try { - System.out.println("Starting the RMI server for calculator operations..."); - Remote stub = UnicastRemoteObject.exportObject(OperationsRMIServer.this); - registry = LocateRegistry.createRegistry(8085); - registry.bind("AddService", stub); - registry.bind("SubtractService", stub); - registry.bind("MultiplyService", stub); - registry.bind("DivideService", stub); - System.out.println("RMI server for calculator operations is now started."); - } catch (Exception e) { - e.printStackTrace(); - } - } - }; - thread.start(); - } - - public void stop() { - if (registry != null) { - try { - registry.unbind("AddService"); - registry.unbind("SubtractService"); - registry.unbind("MultiplyService"); - registry.unbind("DivideService"); - UnicastRemoteObject.unexportObject(this, false); - UnicastRemoteObject.unexportObject(registry, false); - registry = null; - } catch (Exception e) { - e.printStackTrace(); - } - } - } - -} diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-osgi/dosgi-calculator/src/main/java/calculator/rmi/OperationsRMIServer_Stub.java b/sca-java-2.x/trunk/samples/learning-more/implementation-osgi/dosgi-calculator/src/main/java/calculator/rmi/OperationsRMIServer_Stub.java deleted file mode 100644 index a813dfb6f3..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/implementation-osgi/dosgi-calculator/src/main/java/calculator/rmi/OperationsRMIServer_Stub.java +++ /dev/null @@ -1,132 +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. - */ - -// Stub class generated by rmic, do not edit. -// Contents subject to change without notice. -package calculator.rmi; - -public final class OperationsRMIServer_Stub extends java.rmi.server.RemoteStub implements calculator.rmi.OperationsRemote { - private static final long serialVersionUID = 2; - - private static java.lang.reflect.Method $method_add_0; - private static java.lang.reflect.Method $method_divide_1; - private static java.lang.reflect.Method $method_multiply_2; - private static java.lang.reflect.Method $method_subtract_3; - - static { - try { - $method_add_0 = - calculator.rmi.OperationsRemote.class.getMethod("add", new java.lang.Class[] {double.class, double.class}); - $method_divide_1 = - calculator.rmi.OperationsRemote.class.getMethod("divide", - new java.lang.Class[] {double.class, double.class}); - $method_multiply_2 = - calculator.rmi.OperationsRemote.class.getMethod("multiply", new java.lang.Class[] {double.class, - double.class}); - $method_subtract_3 = - calculator.rmi.OperationsRemote.class.getMethod("subtract", new java.lang.Class[] {double.class, - double.class}); - } catch (java.lang.NoSuchMethodException e) { - throw new java.lang.NoSuchMethodError("stub class initialization failed"); - } - } - - // constructors - public OperationsRMIServer_Stub(java.rmi.server.RemoteRef ref) { - super(ref); - } - - // methods from remote interfaces - - // implementation of add(double, double) - public double add(double $param_double_1, double $param_double_2) throws java.rmi.RemoteException { - try { - Object $result = - ref.invoke(this, - $method_add_0, - new java.lang.Object[] {new java.lang.Double($param_double_1), - new java.lang.Double($param_double_2)}, - 864055858262779977L); - return ((java.lang.Double)$result).doubleValue(); - } catch (java.lang.RuntimeException e) { - throw e; - } catch (java.rmi.RemoteException e) { - throw e; - } catch (java.lang.Exception e) { - throw new java.rmi.UnexpectedException("undeclared checked exception", e); - } - } - - // implementation of divide(double, double) - public double divide(double $param_double_1, double $param_double_2) throws java.rmi.RemoteException { - try { - Object $result = - ref.invoke(this, - $method_divide_1, - new java.lang.Object[] {new java.lang.Double($param_double_1), - new java.lang.Double($param_double_2)}, - 8097593626497421928L); - return ((java.lang.Double)$result).doubleValue(); - } catch (java.lang.RuntimeException e) { - throw e; - } catch (java.rmi.RemoteException e) { - throw e; - } catch (java.lang.Exception e) { - throw new java.rmi.UnexpectedException("undeclared checked exception", e); - } - } - - // implementation of multiply(double, double) - public double multiply(double $param_double_1, double $param_double_2) throws java.rmi.RemoteException { - try { - Object $result = - ref.invoke(this, - $method_multiply_2, - new java.lang.Object[] {new java.lang.Double($param_double_1), - new java.lang.Double($param_double_2)}, - -346155016949350695L); - return ((java.lang.Double)$result).doubleValue(); - } catch (java.lang.RuntimeException e) { - throw e; - } catch (java.rmi.RemoteException e) { - throw e; - } catch (java.lang.Exception e) { - throw new java.rmi.UnexpectedException("undeclared checked exception", e); - } - } - - // implementation of subtract(double, double) - public double subtract(double $param_double_1, double $param_double_2) throws java.rmi.RemoteException { - try { - Object $result = - ref.invoke(this, - $method_subtract_3, - new java.lang.Object[] {new java.lang.Double($param_double_1), - new java.lang.Double($param_double_2)}, - -610707357620578750L); - return ((java.lang.Double)$result).doubleValue(); - } catch (java.lang.RuntimeException e) { - throw e; - } catch (java.rmi.RemoteException e) { - throw e; - } catch (java.lang.Exception e) { - throw new java.rmi.UnexpectedException("undeclared checked exception", e); - } - } -} diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-osgi/dosgi-calculator/src/main/java/calculator/rmi/OperationsRemote.java b/sca-java-2.x/trunk/samples/learning-more/implementation-osgi/dosgi-calculator/src/main/java/calculator/rmi/OperationsRemote.java deleted file mode 100644 index 955e386ad8..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/implementation-osgi/dosgi-calculator/src/main/java/calculator/rmi/OperationsRemote.java +++ /dev/null @@ -1,37 +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.rmi; - -import java.rmi.Remote; -import java.rmi.RemoteException; - -/** - * RMI Remote interface - */ -public interface OperationsRemote extends Remote { - double add(double n1, double n2) throws RemoteException; - - double subtract(double n1, double n2) throws RemoteException; - - double multiply(double n1, double n2) throws RemoteException; - - double divide(double n1, double n2) throws RemoteException; - -} diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-osgi/dosgi-calculator/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/samples/learning-more/implementation-osgi/dosgi-calculator/src/main/resources/META-INF/sca-contribution.xml deleted file mode 100644 index b48c048000..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/implementation-osgi/dosgi-calculator/src/main/resources/META-INF/sca-contribution.xml +++ /dev/null @@ -1,24 +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. ---> - -<contribution xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" - xmlns:c="http://calculator.dosgi"> - <deployable composite="c:CalculatorComposite" /> -</contribution> diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-osgi/dosgi-calculator/src/test/java/calculator/dosgi/test/CalculatorNode.java b/sca-java-2.x/trunk/samples/learning-more/implementation-osgi/dosgi-calculator/src/test/java/calculator/dosgi/test/CalculatorNode.java deleted file mode 100644 index 565a314d85..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/implementation-osgi/dosgi-calculator/src/test/java/calculator/dosgi/test/CalculatorNode.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 calculator.dosgi.test; - -import org.apache.tuscany.sca.node.equinox.launcher.NodeLauncher; - -/** - * - */ -public class CalculatorNode { - - /** - * @param args - */ - public static void main(String[] args) { - if (args.length == 0) { - args = new String[] {"-bundles"}; - } - try { - NodeLauncher.main(args); - } catch (Exception e) { - e.printStackTrace(); - } - } - -} diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-osgi/dosgi-calculator/src/test/java/calculator/dosgi/test/CalculatorOSGiNodeTestCase.java b/sca-java-2.x/trunk/samples/learning-more/implementation-osgi/dosgi-calculator/src/test/java/calculator/dosgi/test/CalculatorOSGiNodeTestCase.java deleted file mode 100644 index 2f37da0707..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/implementation-osgi/dosgi-calculator/src/test/java/calculator/dosgi/test/CalculatorOSGiNodeTestCase.java +++ /dev/null @@ -1,152 +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.dosgi.test; - -import static calculator.dosgi.test.OSGiTestUtils.bundleStatus; - -import java.io.InputStream; -import java.io.InputStreamReader; -import java.io.Reader; -import java.net.URL; - -import org.apache.tuscany.sca.node.equinox.launcher.EquinoxHost; -import org.junit.AfterClass; -import org.junit.Assert; -import org.junit.BeforeClass; -import org.junit.Test; -import org.osgi.framework.Bundle; -import org.osgi.framework.BundleContext; -import org.osgi.framework.Constants; -import org.osgi.framework.ServiceReference; - -import calculator.dosgi.CalculatorService; -import calculator.rmi.OperationsRMIServer; - -/** - * - */ -public class CalculatorOSGiNodeTestCase { - private static EquinoxHost host; - private static BundleContext context; - private static Bundle calculatorBundle; - private static OperationsRMIServer rmiServer; - - /** - * @throws java.lang.Exception - */ - @BeforeClass - public static void setUpBeforeClass() throws Exception { - try { - rmiServer = new OperationsRMIServer(); - rmiServer.start(); - - host = new EquinoxHost(); - context = host.start(); - - for (Bundle b : context.getBundles()) { - System.out.println(b); - // debug to print out exported packages - // handy if you want to find aplit packages - //Object exports = b.getHeaders().get(Constants.EXPORT_PACKAGE); - //if (exports != null){ - // System.out.println(exports.toString()); - //} - if (b.getSymbolicName().equals("org.eclipse.equinox.ds") || b.getSymbolicName() - .startsWith("org.apache.tuscany.sca.")) { - try { - if (b.getHeaders().get(Constants.FRAGMENT_HOST) == null) { - // Start the non-fragment bundle - b.start(); - } - } catch (Exception e) { - e.printStackTrace(); - } - System.out.println(bundleStatus(b, false)); - } else { - System.out.println(bundleStatus(b, false)); - } - if ("calculator.dosgi".equals(b.getSymbolicName())) { - calculatorBundle = b; - } - } - - if (calculatorBundle != null) { - calculatorBundle.start(); - System.out.println(bundleStatus(calculatorBundle, false)); - } - - } catch (Exception e) { - e.printStackTrace(); - throw e; - } - } - - @Test - public void testOSGi() { - ServiceReference ref = - calculatorBundle.getBundleContext().getServiceReference(CalculatorService.class.getName()); - Assert.assertNotNull(ref); - Object service = context.getService(ref); - Assert.assertNotNull(service); - CalculatorService calculator = OSGiTestUtils.cast(service, CalculatorService.class); - System.out.println("2.0 + 1.0 = " + calculator.add(2.0, 1.0)); - System.out.println("2.0 - 1.0 = " + calculator.subtract(2.0, 1.0)); - System.out.println("2.0 * 1.0 = " + calculator.multiply(2.0, 1.0)); - System.out.println("2.0 / 1.0 = " + calculator.divide(2.0, 1.0)); - } - - @Test - /** - * Test the Web service exposed by the Calculator - */ - public void testWS() throws Exception { - URL url = new URL("http://localhost:8086/CalculatorService?wsdl"); - InputStream is = url.openStream(); - Reader reader = new InputStreamReader(is); - char[] content = new char[10240]; // 10k - int len = 0; - while (true) { - int size = reader.read(content, len, content.length - len); - if (size < 0) { - break; - } - len += size; - } - Assert.assertTrue(len > 0); - String str = new String(content, 0, len); - System.out.println(str); - Assert.assertTrue(str.indexOf("<wsdl:definitions") != -1); - } - - /** - * @throws java.lang.Exception - */ - @AfterClass - public static void tearDownAfterClass() throws Exception { - if (host != null) { - host.stop(); - rmiServer.stop(); - host = null; - rmiServer = null; - context = null; - } - } - -} diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-osgi/dosgi-calculator/src/test/java/calculator/dosgi/test/OSGiTestUtils.java b/sca-java-2.x/trunk/samples/learning-more/implementation-osgi/dosgi-calculator/src/test/java/calculator/dosgi/test/OSGiTestUtils.java deleted file mode 100644 index 99e0da9f97..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/implementation-osgi/dosgi-calculator/src/test/java/calculator/dosgi/test/OSGiTestUtils.java +++ /dev/null @@ -1,105 +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.dosgi.test; - -import java.lang.reflect.InvocationHandler; -import java.lang.reflect.Method; -import java.lang.reflect.Proxy; - -import org.osgi.framework.Bundle; - -/** - * - * Utility class to create OSGi bundles - * - * @version $Rev$ $Date$ - */ -public class OSGiTestUtils { - private static class InvocationHandlerImpl implements InvocationHandler { - private Object instance; - - public InvocationHandlerImpl(Object instance) { - super(); - this.instance = instance; - } - - public Object invoke(Object proxy, Method method, Object[] args) throws Throwable { - Method m = instance.getClass().getMethod(method.getName(), method.getParameterTypes()); - return m.invoke(instance, args); - } - - } - - /** - * Returns a string representation of the given bundle. - * - * @param b - * @param verbose - * @return - */ - public static String bundleStatus(Bundle bundle, boolean verbose) { - StringBuffer sb = new StringBuffer(); - sb.append(bundle.getBundleId()).append(" ").append(bundle.getSymbolicName()); - int s = bundle.getState(); - if ((s & Bundle.UNINSTALLED) != 0) { - sb.append(" UNINSTALLED"); - } - if ((s & Bundle.INSTALLED) != 0) { - sb.append(" INSTALLED"); - } - if ((s & Bundle.RESOLVED) != 0) { - sb.append(" RESOLVED"); - } - if ((s & Bundle.STARTING) != 0) { - sb.append(" STARTING"); - } - if ((s & Bundle.STOPPING) != 0) { - sb.append(" STOPPING"); - } - if ((s & Bundle.ACTIVE) != 0) { - sb.append(" ACTIVE"); - } - - if (verbose) { - sb.append(" ").append(bundle.getLocation()); - sb.append(" ").append(bundle.getHeaders()); - } - return sb.toString(); - } - - /** - * A utility to cast the object to the given interface. If the class for the object - * is loaded by a different classloader, a proxy will be created. - * - * @param <T> - * @param obj - * @param cls - * @return - */ - public static <T> T cast(Object obj, Class<T> cls) { - if (cls.isInstance(obj)) { - return cls.cast(obj); - } else { - return cls.cast(Proxy.newProxyInstance(cls.getClassLoader(), - new Class<?>[] {cls}, - new InvocationHandlerImpl(obj))); - } - } -} diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-osgi/pom.xml b/sca-java-2.x/trunk/samples/learning-more/implementation-osgi/pom.xml deleted file mode 100644 index ad5421c32a..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/implementation-osgi/pom.xml +++ /dev/null @@ -1,44 +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-samples-learning-more</artifactId> - <version>2.0-SNAPSHOT</version> - <relativePath>../pom.xml</relativePath> - </parent> - <artifactId>tuscany-samples-distributed-osgi-static</artifactId> - <packaging>pom</packaging> - <name>Apache Tuscany SCA Distributed OSGI Statically Configured Samples</name> - - <profiles> - <profile> - <id>default</id> - <activation> - <activeByDefault>true</activeByDefault> - </activation> - <modules> - <module>dosgi-calculator</module> - <module>dosgi-calculator-operations</module> - </modules> - </profile> - </profiles> -</project> diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-script/README b/sca-java-2.x/trunk/samples/learning-more/implementation-script/README deleted file mode 100644 index 18ba62d494..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/implementation-script/README +++ /dev/null @@ -1 +0,0 @@ -Please look at the README files in the subdirectories of this directory for descriptions of the sample contributions.
diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-script/calculator-contribution/README b/sca-java-2.x/trunk/samples/learning-more/implementation-script/calculator-contribution/README deleted file mode 100644 index fe9aac7f3c..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/implementation-script/calculator-contribution/README +++ /dev/null @@ -1,8 +0,0 @@ -Calculator Sample Contribution
-==============================
-
-This sample contribution implements a simple calculator using SCA components.
-
-See http://tuscany.apache.org/documentation-2x/20-beta-samples-documentation.html
-for more information
-
diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-script/calculator-contribution/build.xml b/sca-java-2.x/trunk/samples/learning-more/implementation-script/calculator-contribution/build.xml deleted file mode 100644 index cfb163955e..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/implementation-script/calculator-contribution/build.xml +++ /dev/null @@ -1,57 +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="sample-implementation-script-calculator-contribution" default="compile">
- <property name="tuscany.home" value="../../../.."/>
- <property name="jar.name" value="sample-implementation-script-calculator-contribution.jar" />
-
- <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-sca-api-*.jar" />
- </fileset>
- </classpath>
- </javac>
- <copy todir="target/classes">
- <fileset dir="src/main/resources"/>
- </copy>
- <jar destfile="target/${jar.name}" basedir="target/classes">
- <manifest>
- <attribute name="Main-Class" value="${main.class}" />
- </manifest>
- </jar>
- </target>
-</project>
-
-
diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-script/calculator-contribution/pom.xml b/sca-java-2.x/trunk/samples/learning-more/implementation-script/calculator-contribution/pom.xml deleted file mode 100644 index 2444855b17..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/implementation-script/calculator-contribution/pom.xml +++ /dev/null @@ -1,57 +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-samples</artifactId>
- <version>2.0-SNAPSHOT</version>
- <relativePath>../../../pom.xml</relativePath>
- </parent>
- <artifactId>sample-implementation-script-calculator-contribution</artifactId>
- <name>Apache Tuscany SCA Sample implementation.script Calculator Contribution</name>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-sca-api</artifactId>
- <version>2.0-SNAPSHOT</version>
- </dependency>
-
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.8.1</version>
- <scope>test</scope>
- </dependency>
-
- </dependencies>
-
- <build>
- <finalName>${project.artifactId}</finalName>
- <plugins>
- <plugin>
- <groupId>org.apache.tuscany.maven.plugins</groupId>
- <artifactId>maven-tuscany-plugin</artifactId>
- <version>2.0-SNAPSHOT</version>
- </plugin>
- </plugins>
- </build>
-</project>
diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-script/calculator-contribution/src/main/java/calculator/AddService.java b/sca-java-2.x/trunk/samples/learning-more/implementation-script/calculator-contribution/src/main/java/calculator/AddService.java deleted file mode 100644 index 5a1e7a638a..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/implementation-script/calculator-contribution/src/main/java/calculator/AddService.java +++ /dev/null @@ -1,28 +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;
-
-/**
- * The Add service interface
- */
-public interface AddService {
-
- double add(double n1, double n2);
-
-}
diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-script/calculator-contribution/src/main/java/calculator/CalculatorClient.java b/sca-java-2.x/trunk/samples/learning-more/implementation-script/calculator-contribution/src/main/java/calculator/CalculatorClient.java deleted file mode 100644 index 1df1f31c48..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/implementation-script/calculator-contribution/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));
- }
-
-}
diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-script/calculator-contribution/src/main/java/calculator/CalculatorService.java b/sca-java-2.x/trunk/samples/learning-more/implementation-script/calculator-contribution/src/main/java/calculator/CalculatorService.java deleted file mode 100644 index 78eea39c71..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/implementation-script/calculator-contribution/src/main/java/calculator/CalculatorService.java +++ /dev/null @@ -1,37 +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/trunk/samples/learning-more/implementation-script/calculator-contribution/src/main/java/calculator/CalculatorServiceImpl.java b/sca-java-2.x/trunk/samples/learning-more/implementation-script/calculator-contribution/src/main/java/calculator/CalculatorServiceImpl.java deleted file mode 100644 index 8e4b082d14..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/implementation-script/calculator-contribution/src/main/java/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 calculator;
-
-import org.oasisopen.sca.annotation.Reference;
-import org.oasisopen.sca.annotation.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) {
- return multiplyService.multiply(n1, n2);
- }
-
- public double divide(double n1, double n2) {
- return divideService.divide(n1, n2);
- }
-
-}
diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-script/calculator-contribution/src/main/java/calculator/DivideService.java b/sca-java-2.x/trunk/samples/learning-more/implementation-script/calculator-contribution/src/main/java/calculator/DivideService.java deleted file mode 100644 index ef6a8b375b..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/implementation-script/calculator-contribution/src/main/java/calculator/DivideService.java +++ /dev/null @@ -1,28 +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;
-
-/**
- * The divide service interface
- */
-public interface DivideService {
-
- double divide(double n1, double n2);
-
-}
diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-script/calculator-contribution/src/main/java/calculator/MultiplyService.java b/sca-java-2.x/trunk/samples/learning-more/implementation-script/calculator-contribution/src/main/java/calculator/MultiplyService.java deleted file mode 100644 index db568cc762..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/implementation-script/calculator-contribution/src/main/java/calculator/MultiplyService.java +++ /dev/null @@ -1,28 +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;
-
-/**
- * The interface for the multiply service
- */
-public interface MultiplyService {
-
- double multiply(double n1, double n2);
-
-}
diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-script/calculator-contribution/src/main/java/calculator/SubtractService.java b/sca-java-2.x/trunk/samples/learning-more/implementation-script/calculator-contribution/src/main/java/calculator/SubtractService.java deleted file mode 100644 index 56ee372fc4..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/implementation-script/calculator-contribution/src/main/java/calculator/SubtractService.java +++ /dev/null @@ -1,28 +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;
-
-/**
- * The interface for the multiply service
- */
-public interface SubtractService {
-
- double subtract(double n1, double n2);
-
-}
diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-script/calculator-contribution/src/main/resources/Calculator.composite b/sca-java-2.x/trunk/samples/learning-more/implementation-script/calculator-contribution/src/main/resources/Calculator.composite deleted file mode 100644 index d441aa0aea..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/implementation-script/calculator-contribution/src/main/resources/Calculator.composite +++ /dev/null @@ -1,50 +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://docs.oasis-open.org/ns/opencsa/sca/200912"
- xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.1"
- targetNamespace="http://sample"
- xmlns:sample="http://sample"
- name="Calculator">
-
- <component name="CalculatorServiceComponent">
- <implementation.java class="calculator.CalculatorServiceImpl"/>
- <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/sca-java-2.x/trunk/samples/learning-more/implementation-script/calculator-contribution/src/main/resources/CalculatorClient.composite b/sca-java-2.x/trunk/samples/learning-more/implementation-script/calculator-contribution/src/main/resources/CalculatorClient.composite deleted file mode 100644 index dfd32761be..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/implementation-script/calculator-contribution/src/main/resources/CalculatorClient.composite +++ /dev/null @@ -1,30 +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://docs.oasis-open.org/ns/opencsa/sca/200912"
- targetNamespace="http://sample"
- xmlns:sample="http://sample"
- name="CalculatorClient">
-
- <component name="CalculatorClient">
- <implementation.java class="calculator.CalculatorClient"/>
- <reference name="calculatorService" target="CalculatorServiceComponent" />
- </component>
-
-</composite>
diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-script/calculator-contribution/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/samples/learning-more/implementation-script/calculator-contribution/src/main/resources/META-INF/sca-contribution.xml deleted file mode 100644 index 70aab0e051..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/implementation-script/calculator-contribution/src/main/resources/META-INF/sca-contribution.xml +++ /dev/null @@ -1,24 +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.
--->
-<contribution xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
- xmlns:sample="http://sample">
- <deployable composite="sample:Calculator"/>
- <deployable composite="sample:CalculatorClient"/>
-</contribution>
\ No newline at end of file diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-script/calculator-contribution/src/main/resources/calculator/AddServiceImpl.componentType b/sca-java-2.x/trunk/samples/learning-more/implementation-script/calculator-contribution/src/main/resources/calculator/AddServiceImpl.componentType deleted file mode 100644 index 5f6d88454c..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/implementation-script/calculator-contribution/src/main/resources/calculator/AddServiceImpl.componentType +++ /dev/null @@ -1,30 +0,0 @@ -<?xml version="1.0" encoding="ASCII"?> -<!-- - * 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. ---> -<componentType xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" - xmlns:wsdli="http://www.w3.org/2006/01/wsdl-instance" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xmlns:xsd="http://www.w3.org/2001/XMLSchema"> - - <service name="AddService"> - <interface.java interface="calculator.AddService" /> - </service> - -</componentType> -
\ No newline at end of file diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-script/calculator-contribution/src/main/resources/calculator/AddServiceImpl.js b/sca-java-2.x/trunk/samples/learning-more/implementation-script/calculator-contribution/src/main/resources/calculator/AddServiceImpl.js deleted file mode 100644 index 6f11106ddd..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/implementation-script/calculator-contribution/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/sca-java-2.x/trunk/samples/learning-more/implementation-script/calculator-contribution/src/main/resources/calculator/DivideServiceImpl.componentType b/sca-java-2.x/trunk/samples/learning-more/implementation-script/calculator-contribution/src/main/resources/calculator/DivideServiceImpl.componentType deleted file mode 100644 index f4bb4e3471..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/implementation-script/calculator-contribution/src/main/resources/calculator/DivideServiceImpl.componentType +++ /dev/null @@ -1,30 +0,0 @@ -<?xml version="1.0" encoding="ASCII"?> -<!-- - * 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. ---> -<componentType xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" - xmlns:wsdli="http://www.w3.org/2006/01/wsdl-instance" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xmlns:xsd="http://www.w3.org/2001/XMLSchema"> - - <service name="DivideService"> - <interface.java interface="calculator.DivideService" /> - </service> - -</componentType> -
\ No newline at end of file diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-script/calculator-contribution/src/main/resources/calculator/DivideServiceImpl.groovy b/sca-java-2.x/trunk/samples/learning-more/implementation-script/calculator-contribution/src/main/resources/calculator/DivideServiceImpl.groovy deleted file mode 100644 index c31c1e8fd6..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/implementation-script/calculator-contribution/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/sca-java-2.x/trunk/samples/learning-more/implementation-script/calculator-contribution/src/main/resources/calculator/MultiplyServiceImpl.componentType b/sca-java-2.x/trunk/samples/learning-more/implementation-script/calculator-contribution/src/main/resources/calculator/MultiplyServiceImpl.componentType deleted file mode 100644 index 35dc5721b2..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/implementation-script/calculator-contribution/src/main/resources/calculator/MultiplyServiceImpl.componentType +++ /dev/null @@ -1,30 +0,0 @@ -<?xml version="1.0" encoding="ASCII"?> -<!-- - * 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. ---> -<componentType xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" - xmlns:wsdli="http://www.w3.org/2006/01/wsdl-instance" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xmlns:xsd="http://www.w3.org/2001/XMLSchema"> - - <service name="MultiplyService"> - <interface.java interface="calculator.MultiplyService" /> - </service> - -</componentType> -
\ No newline at end of file diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-script/calculator-contribution/src/main/resources/calculator/MultiplyServiceImpl.py b/sca-java-2.x/trunk/samples/learning-more/implementation-script/calculator-contribution/src/main/resources/calculator/MultiplyServiceImpl.py deleted file mode 100644 index cce0b5b3ec..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/implementation-script/calculator-contribution/src/main/resources/calculator/MultiplyServiceImpl.py +++ /dev/null @@ -1,20 +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):
- return n1 * n2
\ No newline at end of file diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-script/calculator-contribution/src/main/resources/calculator/SubtractServiceImpl.componentType b/sca-java-2.x/trunk/samples/learning-more/implementation-script/calculator-contribution/src/main/resources/calculator/SubtractServiceImpl.componentType deleted file mode 100644 index ee768f73f2..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/implementation-script/calculator-contribution/src/main/resources/calculator/SubtractServiceImpl.componentType +++ /dev/null @@ -1,30 +0,0 @@ -<?xml version="1.0" encoding="ASCII"?> -<!-- - * 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. ---> -<componentType xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912" - xmlns:wsdli="http://www.w3.org/2006/01/wsdl-instance" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xmlns:xsd="http://www.w3.org/2001/XMLSchema"> - - <service name="SubtractService"> - <interface.java interface="calculator.SubtractService" /> - </service> - -</componentType> -
\ No newline at end of file diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-script/calculator-contribution/src/main/resources/calculator/SubtractServiceImpl.rb b/sca-java-2.x/trunk/samples/learning-more/implementation-script/calculator-contribution/src/main/resources/calculator/SubtractServiceImpl.rb deleted file mode 100644 index 132a1d13b0..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/implementation-script/calculator-contribution/src/main/resources/calculator/SubtractServiceImpl.rb +++ /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 subtract(n1, n2)
- return n1 - n2
-end
\ No newline at end of file diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-script/pom.xml b/sca-java-2.x/trunk/samples/learning-more/implementation-script/pom.xml deleted file mode 100644 index 6dcf2bb71f..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/implementation-script/pom.xml +++ /dev/null @@ -1,43 +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-samples-learning-more</artifactId>
- <version>2.0-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
- </parent>
- <artifactId>tuscany-sample-implementation-script</artifactId>
- <packaging>pom</packaging>
- <name>Apache Tuscany SCA Sample implementation.script</name>
-
- <profiles>
- <profile>
- <id>default</id>
- <activation>
- <activeByDefault>true</activeByDefault>
- </activation>
- <modules>
- <module>calculator-contribution</module>
- </modules>
- </profile>
- </profiles>
-</project>
diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-spring/helloworld-spring-contribution/README b/sca-java-2.x/trunk/samples/learning-more/implementation-spring/helloworld-spring-contribution/README deleted file mode 100644 index 50e3b874ba..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/implementation-spring/helloworld-spring-contribution/README +++ /dev/null @@ -1,8 +0,0 @@ -Sample implementation.spring Contribution
-==========================================
-
-This sample contribution shows SCA components implemented using Spring.
-
-See http://tuscany.apache.org/documentation-2x/20-beta-samples-documentation.html
-for more information
-
diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-spring/helloworld-spring-contribution/pom.xml b/sca-java-2.x/trunk/samples/learning-more/implementation-spring/helloworld-spring-contribution/pom.xml deleted file mode 100644 index 5b7b366056..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/implementation-spring/helloworld-spring-contribution/pom.xml +++ /dev/null @@ -1,67 +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-samples</artifactId>
- <version>2.0-SNAPSHOT</version>
- <relativePath>../../../pom.xml</relativePath>
- </parent>
-
- <artifactId>sample-implementation-spring-helloworld-contribution</artifactId>
- <name>Apache Tuscany SCA Sample implemenation.spring HelloWorld Contribution</name>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-sca-api</artifactId>
- <version>2.0-SNAPSHOT</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.8.1</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
- <build>
- <finalName>${project.artifactId}</finalName>
- <plugins>
-
- <!-- plugin to support using mvn tuscany:run to run this contribution -->
- <plugin>
- <groupId>org.apache.tuscany.maven.plugins</groupId>
- <artifactId>maven-tuscany-plugin</artifactId>
- <version>2.0-SNAPSHOT</version>
- <dependencies>
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-implementation-spring-runtime</artifactId>
- <version>2.0-SNAPSHOT</version>
- </dependency>
- </dependencies>
- </plugin>
-
- </plugins>
- </build>
-</project>
diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-spring/helloworld-spring-contribution/src/main/java/sample/DateService.java b/sca-java-2.x/trunk/samples/learning-more/implementation-spring/helloworld-spring-contribution/src/main/java/sample/DateService.java deleted file mode 100644 index 7c50d66a9c..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/implementation-spring/helloworld-spring-contribution/src/main/java/sample/DateService.java +++ /dev/null @@ -1,29 +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 sample; - -import java.util.Date; - -/** - * - */ -public interface DateService { - Date getDate(); -} diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-spring/helloworld-spring-contribution/src/main/java/sample/DateServiceImpl.java b/sca-java-2.x/trunk/samples/learning-more/implementation-spring/helloworld-spring-contribution/src/main/java/sample/DateServiceImpl.java deleted file mode 100644 index 64bdd86f7c..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/implementation-spring/helloworld-spring-contribution/src/main/java/sample/DateServiceImpl.java +++ /dev/null @@ -1,37 +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 sample; - -import java.util.Date; - -import org.oasisopen.sca.annotation.Service; - -/** - * - */ -@Service(DateService.class) -public class DateServiceImpl implements DateService { - - public Date getDate() { - System.out.println("DateServiceImpl.getDate()"); - return new Date(); - } - -} diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-spring/helloworld-spring-contribution/src/main/java/sample/Helloworld.java b/sca-java-2.x/trunk/samples/learning-more/implementation-spring/helloworld-spring-contribution/src/main/java/sample/Helloworld.java deleted file mode 100644 index f4e8c50448..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/implementation-spring/helloworld-spring-contribution/src/main/java/sample/Helloworld.java +++ /dev/null @@ -1,28 +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 sample;
-
-import org.oasisopen.sca.annotation.Remotable;
-
-@Remotable
-public interface Helloworld {
-
- String sayHello(String name);
-
-}
diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-spring/helloworld-spring-contribution/src/main/java/sample/HelloworldClientImpl.java b/sca-java-2.x/trunk/samples/learning-more/implementation-spring/helloworld-spring-contribution/src/main/java/sample/HelloworldClientImpl.java deleted file mode 100644 index ddcb1d9bc3..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/implementation-spring/helloworld-spring-contribution/src/main/java/sample/HelloworldClientImpl.java +++ /dev/null @@ -1,48 +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 sample; - -import org.oasisopen.sca.annotation.Reference; - -public class HelloworldClientImpl implements Helloworld { - private Helloworld helloworld; - - // SCA reference - @Reference(required = false) - private DateService dateService; - - public HelloworldClientImpl() { - System.out.println("HelloworldClientImpl()"); - } - - public String sayHello(String name) { - System.out.println("HelloworldClientImpl.sayHello(" + name + ")"); - if (dateService == null) { - return "Hello " + name; - } - return "[" + dateService.getDate() + "] " + helloworld.sayHello(name); - } - - // Setter for spring injection - public void setHelloworld(Helloworld helloworld) { - System.out.println("Injected with " + helloworld); - this.helloworld = helloworld; - } - -} diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-spring/helloworld-spring-contribution/src/main/java/sample/HelloworldImpl.java b/sca-java-2.x/trunk/samples/learning-more/implementation-spring/helloworld-spring-contribution/src/main/java/sample/HelloworldImpl.java deleted file mode 100644 index 125c333ddc..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/implementation-spring/helloworld-spring-contribution/src/main/java/sample/HelloworldImpl.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 sample;
-
-
-public class HelloworldImpl implements Helloworld {
-
- public HelloworldImpl() {
- super();
- System.out.println("HelloworldImpl()");
- }
-
- public String sayHello(String name) {
- System.out.println("HelloworldImpl.sayHello(" + name + ")");
- return "Hello " + name;
- }
-
-}
diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-spring/helloworld-spring-contribution/src/main/resources/META-INF/sca-contribution.xml b/sca-java-2.x/trunk/samples/learning-more/implementation-spring/helloworld-spring-contribution/src/main/resources/META-INF/sca-contribution.xml deleted file mode 100644 index 552d100638..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/implementation-spring/helloworld-spring-contribution/src/main/resources/META-INF/sca-contribution.xml +++ /dev/null @@ -1,23 +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.
--->
-<contribution xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
- xmlns:sample="http://sample">
- <deployable composite="sample:helloworld"/>
-</contribution>
\ No newline at end of file diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-spring/helloworld-spring-contribution/src/main/resources/helloworld-client-context.xml b/sca-java-2.x/trunk/samples/learning-more/implementation-spring/helloworld-spring-contribution/src/main/resources/helloworld-client-context.xml deleted file mode 100644 index 15e9647bb0..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/implementation-spring/helloworld-spring-contribution/src/main/resources/helloworld-client-context.xml +++ /dev/null @@ -1,37 +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"> - - <bean id="HelloworldClientBean" class="sample.HelloworldClientImpl"> - <property name="helloworld"> - <ref bean="HelloworldBean"/> - </property> - </bean> - - <!-- - <sca:reference name="dateService" type="sample.DateService"/> - --> - -</beans>
\ No newline at end of file diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-spring/helloworld-spring-contribution/src/main/resources/helloworld-context.xml b/sca-java-2.x/trunk/samples/learning-more/implementation-spring/helloworld-spring-contribution/src/main/resources/helloworld-context.xml deleted file mode 100644 index 9ecd09974e..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/implementation-spring/helloworld-spring-contribution/src/main/resources/helloworld-context.xml +++ /dev/null @@ -1,30 +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">
-
- <bean id="HelloworldBean" class="sample.HelloworldImpl">
- </bean>
-
-</beans>
\ No newline at end of file diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-spring/helloworld-spring-contribution/src/main/resources/helloworld.composite b/sca-java-2.x/trunk/samples/learning-more/implementation-spring/helloworld-spring-contribution/src/main/resources/helloworld.composite deleted file mode 100644 index 6d356758ae..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/implementation-spring/helloworld-spring-contribution/src/main/resources/helloworld.composite +++ /dev/null @@ -1,36 +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://docs.oasis-open.org/ns/opencsa/sca/200912"
- targetNamespace="http://sample"
- xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.1"
- name="helloworld">
-
- <component name="HelloworldClientComponent">
- <implementation.spring location="helloworld-client-context.xml"/>
- <service name="HelloworldClientBean">
- <tuscany:binding.jsonrpc/>
- </service>
- <reference name="dateService" target="DateServiceComponent"/>
- </component>
-
- <component name="DateServiceComponent">
- <implementation.java class="sample.DateServiceImpl"/>
- </component>
-</composite>
diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-spring/helloworld-spring-contribution/src/test/java/sample/HelloworldTestCase.java b/sca-java-2.x/trunk/samples/learning-more/implementation-spring/helloworld-spring-contribution/src/test/java/sample/HelloworldTestCase.java deleted file mode 100644 index 7e679ec0e9..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/implementation-spring/helloworld-spring-contribution/src/test/java/sample/HelloworldTestCase.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 sample;
-
-import static org.junit.Assert.assertEquals;
-
-import org.junit.Test;
-
-public class HelloworldTestCase {
-
- @Test
- public void testSayHello() {
- HelloworldImpl helloworld = new HelloworldImpl();
- assertEquals("Hello Petra", helloworld.sayHello("Petra"));
- }
-
-}
diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-spring/helloworld-spring-webapp/README b/sca-java-2.x/trunk/samples/learning-more/implementation-spring/helloworld-spring-webapp/README deleted file mode 100644 index c3e2ceed03..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/implementation-spring/helloworld-spring-webapp/README +++ /dev/null @@ -1,9 +0,0 @@ -Sample implementation.spring WebApp
-==========================================
-
-This sample contribution shows SCA components implemented using Spring and
-wrapped in a webapp
-
-See http://tuscany.apache.org/documentation-2x/20-beta-samples-documentation.html
-for more information
-
diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-spring/helloworld-spring-webapp/pom.xml b/sca-java-2.x/trunk/samples/learning-more/implementation-spring/helloworld-spring-webapp/pom.xml deleted file mode 100644 index 25a78c2a54..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/implementation-spring/helloworld-spring-webapp/pom.xml +++ /dev/null @@ -1,185 +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-samples</artifactId> - <version>2.0-SNAPSHOT</version> - <relativePath>../../../pom.xml</relativePath> - </parent> - - <artifactId>sample-implementation-spring-helloworld-webapp</artifactId> - <name>Apache Tuscany SCA Sample implementation.spring Helloworld WebApp</name> - <packaging>war</packaging> - - <dependencies> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-base-runtime</artifactId> - <version>2.0-SNAPSHOT</version> - </dependency> - - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-implementation-spring-webapp</artifactId> - <version>2.0-SNAPSHOT</version> - </dependency> - - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-implementation-spring-runtime</artifactId> - <version>2.0-SNAPSHOT</version> - </dependency> - - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-binding-jsonrpc-runtime</artifactId> - <version>2.0-SNAPSHOT</version> - </dependency> - - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>sample-implementation-spring-helloworld-contribution</artifactId> - <version>2.0-SNAPSHOT</version> - <scope>provided</scope> - </dependency> - - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>4.8.1</version> - <scope>test</scope> - </dependency> - <dependency> - <groupId>httpunit</groupId> - <artifactId>httpunit</artifactId> - <version>1.6.1</version> - <scope>test</scope> - </dependency> - </dependencies> - - <build> - <finalName>helloworld-spring</finalName> - <plugins> - - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-surefire-plugin</artifactId> - <configuration> - <!-- Skip the normal tests, we'll run them in the integration-test phase --> - <skip>true</skip> - </configuration> - - <executions> - <execution> - <phase>integration-test</phase> - <goals> - <goal>test</goal> - </goals> - <configuration> - <!-- Ingore the test failures so that the build will proceed to stop the tomcat server --> - <testFailureIgnore>true</testFailureIgnore> - <skip>false</skip> - </configuration> - </execution> - </executions> - </plugin> - - <plugin> - <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-war-plugin</artifactId> - <configuration> - <overlays> - <overlay> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>sample-implementation-spring-helloworld-contribution</artifactId> - <type>jar</type> - <targetPath>WEB-INF/classes</targetPath> - <excludes> - <exclude>META-INF/**/*</exclude> - </excludes> - </overlay> - - <overlay> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>sample-implementation-spring-helloworld-contribution</artifactId> - <type>jar</type> - <includes> - <include>META-INF/**/*</include> - </includes> - </overlay> - - <overlay> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-implementation-spring-webapp</artifactId> - <type>jar</type> - <targetPath>WEB-INF/classes</targetPath> - <includes> - <include>org/apache/tuscany/sca/implementation/spring/webapp/spring-webapp-context.xml</include> - </includes> - </overlay> - </overlays> - </configuration> - </plugin> - - <plugin> - <groupId>org.mortbay.jetty</groupId> - <artifactId>maven-jetty-plugin</artifactId> - <version>6.1.18</version> - <configuration> - <contextPath>helloworld</contextPath> - <stopKey>foo</stopKey> - <stopPort>9999</stopPort> - </configuration> - <executions> - <execution> - <id>start-jetty</id> - <phase>pre-integration-test</phase> - <goals> - <goal>run</goal> - </goals> - <configuration> - <overrideWebXml>src/test/resources/test-web.xml</overrideWebXml> - <webAppSourceDirectory>${project.build.directory}/${project.build.finalName}</webAppSourceDirectory> - <webXml>${project.build.directory}/${project.build.finalName}/WEB-INF/web.xml</webXml> - <classesDirectory>${project.build.directory}/${project.build.finalName}/WEB-INF/classes</classesDirectory> - <scanIntervalSeconds>0</scanIntervalSeconds> - <daemon>true</daemon> - <connectors> - <connector implementation="org.mortbay.jetty.nio.SelectChannelConnector"> - <port>8085</port> - </connector> - </connectors> - </configuration> - </execution> - <execution> - <id>stop-jetty</id> - <phase>post-integration-test</phase> - <goals> - <goal>stop</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> - </build> - -</project> diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-spring/helloworld-spring-webapp/src/main/webapp/WEB-INF/web.xml b/sca-java-2.x/trunk/samples/learning-more/implementation-spring/helloworld-spring-webapp/src/main/webapp/WEB-INF/web.xml deleted file mode 100644 index 49590e00a2..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/implementation-spring/helloworld-spring-webapp/src/main/webapp/WEB-INF/web.xml +++ /dev/null @@ -1,51 +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. ---> -<web-app version="2.4" xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"> - - <display-name>Apache Tuscany Helloworld Spring Sample</display-name> - - <context-param> - <param-name>contextConfigLocation</param-name> - <param-value> - /WEB-INF/classes/helloworld-context.xml - /WEB-INF/classes/org/apache/tuscany/sca/implementation/spring/webapp/spring-webapp-context.xml - </param-value> - </context-param> - - <listener> - <listener-class>org.springframework.web.context.ContextLoaderListener</listener-class> - </listener> - - <listener> - <listener-class>org.apache.tuscany.sca.host.webapp.TuscanyContextListener</listener-class> - </listener> - - <filter> - <filter-name>tuscany</filter-name> - <filter-class>org.apache.tuscany.sca.host.webapp.TuscanyServletFilter</filter-class> - </filter> - - <filter-mapping> - <filter-name>tuscany</filter-name> - <url-pattern>/*</url-pattern> - </filter-mapping> - -</web-app> diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-spring/helloworld-spring-webapp/src/test/java/sample/HelloworldClientTestCase.java b/sca-java-2.x/trunk/samples/learning-more/implementation-spring/helloworld-spring-webapp/src/test/java/sample/HelloworldClientTestCase.java deleted file mode 100644 index fa77f08ee2..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/implementation-spring/helloworld-spring-webapp/src/test/java/sample/HelloworldClientTestCase.java +++ /dev/null @@ -1,58 +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 sample; - -import java.io.ByteArrayInputStream; - -import junit.framework.Assert; - -import org.json.JSONObject; -import org.junit.Test; - -import com.meterware.httpunit.PostMethodWebRequest; -import com.meterware.httpunit.WebConversation; -import com.meterware.httpunit.WebRequest; -import com.meterware.httpunit.WebResponse; - - -/** - * - */ -public class HelloworldClientTestCase { - private static final String SERVICE_URL = - "http://localhost:8085/helloworld/HelloworldClientComponent/HelloworldClientBean"; - - @Test - public void testJSONRPCBinding() throws Exception { - JSONObject jsonRequest = new JSONObject("{ \"method\": \"sayHello\", \"params\": [\"Ray\"], \"id\": 1}"); - - WebConversation wc = new WebConversation(); - WebRequest request = - new PostMethodWebRequest(SERVICE_URL, new ByteArrayInputStream(jsonRequest.toString().getBytes("UTF-8")), - "application/json"); - WebResponse response = wc.getResource(request); - - Assert.assertEquals(200, response.getResponseCode()); - - JSONObject jsonResp = new JSONObject(response.getText()); - String text = jsonResp.getString("result"); - Assert.assertTrue(text.endsWith("Hello Ray")); - } -} diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-spring/helloworld-spring-webapp/src/test/resources/test-web.xml b/sca-java-2.x/trunk/samples/learning-more/implementation-spring/helloworld-spring-webapp/src/test/resources/test-web.xml deleted file mode 100644 index 0ad2ed49c1..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/implementation-spring/helloworld-spring-webapp/src/test/resources/test-web.xml +++ /dev/null @@ -1,25 +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.
--->
-<web-app version="2.4"
- xmlns="http://java.sun.com/xml/ns/j2ee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd" >
-
-</web-app>
diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-spring/pom.xml b/sca-java-2.x/trunk/samples/learning-more/implementation-spring/pom.xml deleted file mode 100644 index 89acc85399..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/implementation-spring/pom.xml +++ /dev/null @@ -1,44 +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-samples-learning-more</artifactId> - <version>2.0-SNAPSHOT</version> - <relativePath>../pom.xml</relativePath> - </parent> - <artifactId>tuscany-samples-implementation-spring</artifactId> - <packaging>pom</packaging> - <name>Apache Tuscany SCA Implementation Spring Samples</name> - - <profiles> - <profile> - <id>default</id> - <activation> - <activeByDefault>true</activeByDefault> - </activation> - <modules> - <module>helloworld-spring-contribution</module> - <module>helloworld-spring-webapp</module> - </modules> - </profile> - </profiles> -</project> diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-jaxrs/README b/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-jaxrs/README deleted file mode 100644 index 82c3349c85..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-jaxrs/README +++ /dev/null @@ -1,8 +0,0 @@ -Sample implementation.web JAXRS WebApp
-==========================================
-
-This sample contribution shows SCA components implemented in a webapp and
-accessed using JAXRS.
-
-See http://tuscany.apache.org/documentation-2x/20-beta-samples-documentation.html
-for more information
\ No newline at end of file diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-jaxrs/pom.xml b/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-jaxrs/pom.xml deleted file mode 100644 index 9b874a5215..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-jaxrs/pom.xml +++ /dev/null @@ -1,131 +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-samples</artifactId>
- <version>2.0-SNAPSHOT</version>
- <relativePath>../../../pom.xml</relativePath>
- </parent>
-
- <artifactId>sample-implementation-web-helloworld-jaxrs-webapp</artifactId>
- <packaging>war</packaging>
- <name>Apache Tuscany SCA Sample implemenation.web Helloworld JAX-RS WebApp</name>
-
- <dependencies>
-
- <!-- Tuscany dependency -->
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-base-runtime</artifactId>
- <version>2.0-SNAPSHOT</version>
- </dependency>
-
- <!-- Wink dependency for JAX-RS support -->
- <dependency>
- <groupId>org.apache.wink</groupId>
- <artifactId>wink-common</artifactId>
- <version>1.1.2-incubating</version>
- </dependency>
- <dependency>
- <groupId>org.apache.wink</groupId>
- <artifactId>wink-server</artifactId>
- <version>1.1.2-incubating</version>
- <exclusions>
- <exclusion>
- <groupId>javax.xml.bind</groupId>
- <artifactId>jaxb-api</artifactId>
- </exclusion>
- <exclusion>
- <groupId>com.sun.xml.bind</groupId>
- <artifactId>jaxb-impl</artifactId>
- </exclusion>
- <exclusion>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
-
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- <version>1.6.0</version>
- </dependency>
-
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.8.1</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>net.sourceforge.htmlunit</groupId>
- <artifactId>htmlunit</artifactId>
- <version>2.6</version>
- <scope>test</scope>
- </dependency>
-
- </dependencies>
-
- <build>
- <finalName>helloworld-jaxrs</finalName>
- <plugins>
- <plugin>
- <groupId>org.mortbay.jetty</groupId>
- <artifactId>maven-jetty-plugin</artifactId>
- <version>6.1.18</version>
- <configuration>
- <contextPath>helloworld-jaxrs</contextPath>
- <stopKey>foo</stopKey>
- <stopPort>9999</stopPort>
- </configuration>
- <executions>
- <execution>
- <id>start-jetty</id>
- <phase>process-test-classes</phase>
- <goals>
- <goal>run</goal>
- </goals>
- <configuration>
- <scanIntervalSeconds>0</scanIntervalSeconds>
- <daemon>true</daemon>
- <connectors>
- <connector implementation="org.mortbay.jetty.nio.SelectChannelConnector">
- <port>8085</port>
- </connector>
- </connectors>
- </configuration>
- </execution>
- <execution>
- <id>stop-jetty</id>
- <phase>prepare-package</phase>
- <goals>
- <goal>stop</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-
-</project>
diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-jaxrs/src/main/java/sample/HelloWorldResource.java b/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-jaxrs/src/main/java/sample/HelloWorldResource.java deleted file mode 100644 index 42625b8a78..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-jaxrs/src/main/java/sample/HelloWorldResource.java +++ /dev/null @@ -1,68 +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 sample;
-
-import java.util.Date;
-
-import javax.ws.rs.GET;
-import javax.ws.rs.Path;
-import javax.ws.rs.Produces;
-
-import org.oasisopen.sca.annotation.Reference;
-
-/**
- * Simple example - Hello World!
- * <p/>
- * The SDK dispatches HTTP requests for URI
- * <code>http://[host]:[port]/helloworld-jaxrs/rest/world</code>, where
- * <code>helloworld-jaxrs</code> is the context root, to this class. A simple
- * plain text entry is returned in HTTP response.
- * <p/>
- * The service document is available at URI
- * <code>http://[host]:[port]/helloworld-jaxrs/rest</code> but it is empty because
- * this simple demo doesn't contain any collection of resources.
- * <p/>
- * This resource must be registered within a JAX-RS application, this example
- * uses the default usage of application /WEB-INF/application
- */
-@Path("/world")
-public class HelloWorldResource {
-
- @Reference
- protected HelloworldService service;
-
-
- /**
- * This method is called by the SDK for HTTP GET method requests where the
- * Accept header allows the Atom media type application/atom+xml. A
- * SyndEntry is created with basic information. Serialization of the
- * SyndEntry to Atom entry is performed by the SDK automatically. The
- * default status code of 200 (OK) is returned in the response.
- *
- * @return SyndEntry of the requested resource
- */
- @GET
- @Produces("text/plain")
- public String getClichedMessage() {
- return service == null ? "SCA reference not injected" : service.sayHello("World");
- }
-
-}
diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-jaxrs/src/main/java/sample/HelloworldService.java b/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-jaxrs/src/main/java/sample/HelloworldService.java deleted file mode 100644 index 123774b936..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-jaxrs/src/main/java/sample/HelloworldService.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 sample;
-
-public interface HelloworldService {
-
- String sayHello(String name);
-
-}
diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-jaxrs/src/main/java/sample/HelloworldServiceImpl.java b/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-jaxrs/src/main/java/sample/HelloworldServiceImpl.java deleted file mode 100644 index 66cef71a25..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-jaxrs/src/main/java/sample/HelloworldServiceImpl.java +++ /dev/null @@ -1,28 +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 sample;
-
-
-public class HelloworldServiceImpl implements HelloworldService {
-
- public String sayHello(String name) {
- return "Hello " + name;
- }
-
-}
diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-jaxrs/src/main/webapp/WEB-INF/application b/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-jaxrs/src/main/webapp/WEB-INF/application deleted file mode 100644 index 8ce781d6c8..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-jaxrs/src/main/webapp/WEB-INF/application +++ /dev/null @@ -1,14 +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.
-sample.HelloWorldResource
\ No newline at end of file diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-jaxrs/src/main/webapp/WEB-INF/web.composite b/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-jaxrs/src/main/webapp/WEB-INF/web.composite deleted file mode 100644 index 7ff71519e9..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-jaxrs/src/main/webapp/WEB-INF/web.composite +++ /dev/null @@ -1,34 +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://docs.oasis-open.org/ns/opencsa/sca/200912"
- xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.1"
- targetNamespace="http://samples"
- name="Helloworld">
-
- <component name="HelloworldJAXRSComponent">
- <implementation.web web-uri=""/>
- <reference name="service" target="HelloworldComponent"/>
- </component>
-
- <component name="HelloworldComponent">
- <implementation.java class="sample.HelloworldServiceImpl"/>
- </component>
-
-</composite>
diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-jaxrs/src/main/webapp/WEB-INF/web.xml b/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-jaxrs/src/main/webapp/WEB-INF/web.xml deleted file mode 100644 index 3c5726a818..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-jaxrs/src/main/webapp/WEB-INF/web.xml +++ /dev/null @@ -1,49 +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.
--->
-<web-app version="2.4"
- xmlns="http://java.sun.com/xml/ns/j2ee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd" >
-
- <display-name>Apache Tuscany Helloworld JAX-RS Sample</display-name>
-
- <!-- Listener to start the Tuscany webapp embedded runtime -->
- <listener><listener-class>org.apache.tuscany.sca.host.webapp.TuscanyContextListener</listener-class></listener>
-
- <!-- Apache Wink JAX-RS Servlet -->
- <servlet>
- <servlet-name>restSdkService</servlet-name>
- <servlet-class>org.apache.wink.server.internal.servlet.RestServlet</servlet-class>
- <init-param>
- <param-name>applicationConfigLocation</param-name>
- <param-value>/WEB-INF/application</param-value>
- </init-param>
- <init-param>
- <!-- Custom init param to tell Wink to use Tuscany -->
- <param-name>deploymentConfiguration</param-name>
- <param-value>org.apache.tuscany.sca.wink.TuscanyDeploymentConfiguration</param-value>
- </init-param>
- </servlet>
- <servlet-mapping>
- <servlet-name>restSdkService</servlet-name>
- <url-pattern>/rest/*</url-pattern>
- </servlet-mapping>
-
-</web-app>
diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-jaxrs/src/test/java/itest/HelloworldTestCase.java b/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-jaxrs/src/test/java/itest/HelloworldTestCase.java deleted file mode 100644 index 50197cdfcb..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-jaxrs/src/test/java/itest/HelloworldTestCase.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 itest;
-
-import static org.junit.Assert.assertEquals;
-
-import java.io.IOException;
-import java.net.MalformedURLException;
-
-import org.junit.Test;
-
-import com.gargoylesoftware.htmlunit.FailingHttpStatusCodeException;
-import com.gargoylesoftware.htmlunit.TextPage;
-import com.gargoylesoftware.htmlunit.WebClient;
-
-/**
- */
-public class HelloworldTestCase {
-
- @Test
- public void testA() throws FailingHttpStatusCodeException, MalformedURLException, IOException {
- TextPage page = (TextPage)new WebClient().getPage("http://localhost:8085/helloworld-jaxrs/rest/world");
- assertEquals("Hello World", page.getContent());
- }
-
-}
diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-js-client/README b/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-js-client/README deleted file mode 100644 index 455a56b815..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-js-client/README +++ /dev/null @@ -1,8 +0,0 @@ -Sample implementation.web JS WebApp
-==========================================
-
-This sample contribution shows SCA components implemented in a webapp and
-accessed using Javascript.
-
-See http://tuscany.apache.org/documentation-2x/20-beta-samples-documentation.html
-for more information
\ No newline at end of file diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-js-client/pom.xml b/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-js-client/pom.xml deleted file mode 100644 index bdd9c5085b..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-js-client/pom.xml +++ /dev/null @@ -1,104 +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-samples</artifactId>
- <version>2.0-SNAPSHOT</version>
- <relativePath>../../../pom.xml</relativePath>
- </parent>
-
- <artifactId>sample-implementation-web-helloworld-js-client-webapp</artifactId>
- <packaging>war</packaging>
- <name>Apache Tuscany SCA Sample implemenation.web Helloworld Javascript Client WebApp</name>
-
- <dependencies>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-base-runtime</artifactId>
- <version>2.0-SNAPSHOT</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-databinding-json</artifactId>
- <version>2.0-SNAPSHOT</version>
- </dependency>
-
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.8.1</version>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>net.sourceforge.htmlunit</groupId>
- <artifactId>htmlunit</artifactId>
- <version>2.6</version>
- <scope>test</scope>
- </dependency>
-
- </dependencies>
-
- <build>
- <finalName>helloworld-js-client</finalName>
- <plugins>
- <plugin>
- <groupId>org.mortbay.jetty</groupId>
- <artifactId>maven-jetty-plugin</artifactId>
- <version>6.1.18</version>
- <configuration>
- <contextPath>helloworld-js-client</contextPath>
- <stopKey>foo</stopKey>
- <stopPort>9999</stopPort>
- </configuration>
- <executions>
- <execution>
- <id>start-jetty</id>
- <phase>process-test-classes</phase>
- <goals>
- <goal>run</goal>
- </goals>
- <configuration>
- <scanIntervalSeconds>0</scanIntervalSeconds>
- <daemon>true</daemon>
- <connectors>
- <connector implementation="org.mortbay.jetty.nio.SelectChannelConnector">
- <port>8085</port>
- </connector>
- </connectors>
- </configuration>
- </execution>
- <execution>
- <id>stop-jetty</id>
- <phase>prepare-package</phase>
- <goals>
- <goal>stop</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-
-</project>
diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-js-client/src/main/java/sample/HelloworldService.java b/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-js-client/src/main/java/sample/HelloworldService.java deleted file mode 100644 index 123774b936..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-js-client/src/main/java/sample/HelloworldService.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 sample;
-
-public interface HelloworldService {
-
- String sayHello(String name);
-
-}
diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-js-client/src/main/java/sample/HelloworldServiceImpl.java b/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-js-client/src/main/java/sample/HelloworldServiceImpl.java deleted file mode 100644 index 66cef71a25..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-js-client/src/main/java/sample/HelloworldServiceImpl.java +++ /dev/null @@ -1,28 +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 sample;
-
-
-public class HelloworldServiceImpl implements HelloworldService {
-
- public String sayHello(String name) {
- return "Hello " + name;
- }
-
-}
diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-js-client/src/main/webapp/WEB-INF/web.composite b/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-js-client/src/main/webapp/WEB-INF/web.composite deleted file mode 100644 index d41a8535e2..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-js-client/src/main/webapp/WEB-INF/web.composite +++ /dev/null @@ -1,36 +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://docs.oasis-open.org/ns/opencsa/sca/200912"
- xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.1"
- targetNamespace="http://samples"
- name="Helloworld">
-
- <component name="foo">
- <implementation.web web-uri=""/>
- <reference name="service" target="HelloworldComponent">
- <interface.java interface="sample.HelloworldService" />
- </reference>
- </component>
-
- <component name="HelloworldComponent">
- <implementation.java class="sample.HelloworldServiceImpl"/>
- </component>
-
-</composite>
diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-js-client/src/main/webapp/WEB-INF/web.xml b/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-js-client/src/main/webapp/WEB-INF/web.xml deleted file mode 100644 index babeb7b203..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-js-client/src/main/webapp/WEB-INF/web.xml +++ /dev/null @@ -1,41 +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.
--->
-<web-app version="2.4"
- xmlns="http://java.sun.com/xml/ns/j2ee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd" >
-
- <display-name>Apache Tuscany Helloworld JSP Sample</display-name>
-
- <filter>
- <filter-name>tuscany</filter-name>
- <filter-class>org.apache.tuscany.sca.host.webapp.TuscanyServletFilter</filter-class>
- </filter>
-
- <filter-mapping>
- <filter-name>tuscany</filter-name>
- <url-pattern>/*</url-pattern>
- </filter-mapping>
-
- <welcome-file-list id="WelcomeFileList">
- <welcome-file>hello.html</welcome-file>
- </welcome-file-list>
-
-</web-app>
diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-js-client/src/main/webapp/hello.html b/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-js-client/src/main/webapp/hello.html deleted file mode 100644 index 12024cc4d3..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-js-client/src/main/webapp/hello.html +++ /dev/null @@ -1,51 +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.
--->
-<html>
-
-<head>
- <title>Apache Tuscany Helloworld Javascript Client Sample</title>
-
- <script type="text/javascript" src="org.oasisopen.sca.componentContext.js"></script>
-
- <script language="JavaScript">
-
- function callSayHello() {
- componentContext.getService("service").sayHello(document.getElementById('name').value, sayHelloResponse);
- }
-
- function sayHelloResponse(reply) {
- document.getElementById('result').innerHTML=reply;
- }
-
- </script>
-
-</head>
-
-<body>
-
-<h2>Apache Tuscany Helloworld Javascript Client Sample</h2>
-
- <input type="text" id="name" width="10">
-
- <button name="submit" onclick="callSayHello()">Say hello</button>
-
- <div id='result'></div>
-
-</body>
-</html>
\ No newline at end of file diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-js-client/src/test/java/itest/HelloworldTestCase.java b/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-js-client/src/test/java/itest/HelloworldTestCase.java deleted file mode 100644 index de41997a59..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-js-client/src/test/java/itest/HelloworldTestCase.java +++ /dev/null @@ -1,77 +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 itest;
-
-import static org.junit.Assert.assertTrue;
-
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.io.OutputStreamWriter;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.net.URLConnection;
-import java.net.URLEncoder;
-
-import org.junit.Ignore;
-import org.junit.Test;
-
-/**
- * Verfiy the serverside code is working, not sure how to easily itest the browser javascript code
- */
-@Ignore("TUSCANY-3688")
-public class HelloworldTestCase {
-
- @Test
- public void testA() throws MalformedURLException, IOException {
-
- URL url = new URL("http://localhost:8085/helloworld-js-client/org.oasisopen.sca.componentContext.js/foo/call/plaincall/service.sayHello.dwr");
- URLConnection conn = url.openConnection();
- conn.setDoOutput(true);
- OutputStreamWriter wr = new OutputStreamWriter(conn.getOutputStream());
-
- // to find this run the sample through TCPMON to capture the messages
-
- String data = URLEncoder.encode("callCount", "UTF-8") + "=" + URLEncoder.encode("1", "UTF-8");
- data += "&" + URLEncoder.encode("page", "UTF-8") + "=" + URLEncoder.encode("/helloworld-js-client/", "UTF-8");
- data += "&" + URLEncoder.encode("httpSessionId", "UTF-8") + "=" + URLEncoder.encode("", "UTF-8");
- data += "&" + URLEncoder.encode("scriptSessionId", "UTF-8") + "=" + URLEncoder.encode("A023DA664E56F075491BE1B87B37B02671", "UTF-8");
- data += "&" + URLEncoder.encode("c0-scriptName", "UTF-8") + "=" + URLEncoder.encode("service", "UTF-8");
- data += "&" + URLEncoder.encode("c0-methodName", "UTF-8") + "=" + URLEncoder.encode("sayHello", "UTF-8");
- data += "&" + URLEncoder.encode("c0-id", "UTF-8") + "=" + URLEncoder.encode("0", "UTF-8");
- data += "&" + URLEncoder.encode("c0-param0", "UTF-8") + "=" + URLEncoder.encode("string:petra", "UTF-8");
- data += "&" + URLEncoder.encode("batchId", "UTF-8") + "=" + URLEncoder.encode("0", "UTF-8");
-
- wr.write(data);
- wr.flush();
-
- BufferedReader rd = new BufferedReader(new InputStreamReader(conn.getInputStream()));
- rd.readLine(); // throw 'allowScriptTagRemoting is false.';
- rd.readLine(); //#DWR-INSERT
- rd.readLine(); //#DWR-REPLY
- String line = rd.readLine(); // dwr.engine._remoteHandleCallback('0','0',"Hello petra");
- wr.close();
- rd.close();
-
- assertTrue(line.endsWith("\"Hello petra\");"));
-
- }
-
-}
diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-jsf/README b/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-jsf/README deleted file mode 100644 index c845341743..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-jsf/README +++ /dev/null @@ -1,8 +0,0 @@ -Sample implementation.web JSF WebApp
-==========================================
-
-This sample contribution shows SCA components implemented in a webapp and
-accessed using Java Server Faces.
-
-See http://tuscany.apache.org/documentation-2x/20-beta-samples-documentation.html
-for more information
\ No newline at end of file diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-jsf/pom.xml b/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-jsf/pom.xml deleted file mode 100644 index 36fe0c93c8..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-jsf/pom.xml +++ /dev/null @@ -1,99 +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-samples</artifactId> - <version>2.0-SNAPSHOT</version> - <relativePath>../../../pom.xml</relativePath> - </parent> - - <artifactId>sample-implementation-web-helloworld-jsf-webapp</artifactId> - <name>Apache Tuscany SCA Sample implemenation.web Helloworld JSF WebApp</name> - <packaging>war</packaging> - - <dependencies> - - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-sca-api</artifactId> - <version>2.0-SNAPSHOT</version> - <scope>compile</scope> - </dependency> - - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-base-runtime</artifactId> - <version>2.0-SNAPSHOT</version> - <scope>runtime</scope> - </dependency> - - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-myfaces</artifactId> - <version>2.0-SNAPSHOT</version> - <scope>runtime</scope> - </dependency> - - </dependencies> - - <build> - <finalName>helloworld-jsf</finalName> - <plugins> - <plugin> - <groupId>org.mortbay.jetty</groupId> - <artifactId>maven-jetty-plugin</artifactId> - <version>6.1.18</version> - <configuration> - <contextPath>helloworld-jsf</contextPath> - <stopKey>foo</stopKey> - <stopPort>9999</stopPort> - </configuration> - <executions> - <execution> - <id>start-jetty</id> - <phase>process-test-classes</phase> - <goals> - <goal>run</goal> - </goals> - <configuration> - <scanIntervalSeconds>0</scanIntervalSeconds> - <daemon>true</daemon> - <connectors> - <connector implementation="org.mortbay.jetty.nio.SelectChannelConnector"> - <port>8085</port> - </connector> - </connectors> - </configuration> - </execution> - <execution> - <id>stop-jetty</id> - <phase>prepare-package</phase> - <goals> - <goal>stop</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> - </build> - -</project> diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-jsf/src/main/java/sample/HelloWorldController.java b/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-jsf/src/main/java/sample/HelloWorldController.java deleted file mode 100644 index 9c9f541997..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-jsf/src/main/java/sample/HelloWorldController.java +++ /dev/null @@ -1,56 +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 sample; - -import org.oasisopen.sca.annotation.Reference; - -/** - * - */ -public class HelloWorldController { - - @Reference - protected HelloworldService service; - - private String name; - - public HelloWorldController() { - } - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - /** - * Method that is backed to a submit button of a form. - */ - public String send() { - if (service == null) { - name = "reference not injected!"; - } else { - name = service.sayHello(name); - } - return "success"; - } - -} diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-jsf/src/main/java/sample/HelloworldService.java b/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-jsf/src/main/java/sample/HelloworldService.java deleted file mode 100644 index 53ff7a5ca1..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-jsf/src/main/java/sample/HelloworldService.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 sample; - -public interface HelloworldService { - - String sayHello(String name); - -} diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-jsf/src/main/java/sample/HelloworldServiceImpl.java b/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-jsf/src/main/java/sample/HelloworldServiceImpl.java deleted file mode 100644 index 23925d6c69..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-jsf/src/main/java/sample/HelloworldServiceImpl.java +++ /dev/null @@ -1,27 +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 sample; - -public class HelloworldServiceImpl implements HelloworldService { - - public String sayHello(String name) { - return "Hello " + name; - } - -} diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-jsf/src/main/webapp/WEB-INF/faces-config.xml b/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-jsf/src/main/webapp/WEB-INF/faces-config.xml deleted file mode 100644 index 99cee9faeb..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-jsf/src/main/webapp/WEB-INF/faces-config.xml +++ /dev/null @@ -1,51 +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. ---> -<faces-config version="1.2" - xmlns="http://java.sun.com/xml/ns/javaee" - xmlns:xi="http://www.w3.org/2001/XInclude" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-facesconfig_1_2.xsd"> - - <!-- managed beans of the simple hello world app --> - <managed-bean> - <managed-bean-name>helloWorld</managed-bean-name> - <managed-bean-class>sample.HelloWorldController</managed-bean-class> - <managed-bean-scope>request</managed-bean-scope> - </managed-bean> - - <!-- navigation rules for helloWorld.jsp --> - <navigation-rule> - <from-view-id>/helloWorld.jsp</from-view-id> - <navigation-case> - <from-outcome>success</from-outcome> - <to-view-id>/page2.jsp</to-view-id> - </navigation-case> - </navigation-rule> - - <!-- navigation rules for page2.jsp --> - <navigation-rule> - <from-view-id>/page2.jsp</from-view-id> - <navigation-case> - <from-outcome>back</from-outcome> - <to-view-id>/helloWorld.jsp</to-view-id> - </navigation-case> - </navigation-rule> - -</faces-config> diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-jsf/src/main/webapp/WEB-INF/web.composite b/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-jsf/src/main/webapp/WEB-INF/web.composite deleted file mode 100644 index 8976adde3c..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-jsf/src/main/webapp/WEB-INF/web.composite +++ /dev/null @@ -1,34 +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://docs.oasis-open.org/ns/opencsa/sca/200912" - xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.1" - targetNamespace="http://samples" - name="Helloworld"> - - <component name="foo"> - <implementation.web web-uri=""/> - <reference name="service" target="HelloworldComponent"/> - </component> - - <component name="HelloworldComponent"> - <implementation.java class="sample.HelloworldServiceImpl"/> - </component> - -</composite> diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-jsf/src/main/webapp/WEB-INF/web.xml b/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-jsf/src/main/webapp/WEB-INF/web.xml deleted file mode 100644 index fecbd7c79b..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-jsf/src/main/webapp/WEB-INF/web.xml +++ /dev/null @@ -1,191 +0,0 @@ -<?xml version="1.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. ---> -<web-app xmlns="http://java.sun.com/xml/ns/j2ee" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd" - version="2.4"> - - <description>MyProject web.xml</description> - - <!-- The only web.xml change to the MyFaces Helloworld sample is to add - the Tuscany listener and annotation processor context parameter --> - <listener> - <listener-class>org.apache.tuscany.sca.host.webapp.TuscanyContextListener</listener-class> - </listener> - <context-param> - <param-name>org.apache.myfaces.config.annotation.LifecycleProvider</param-name> - <param-value>org.apache.tuscany.sca.myfaces.TuscanyAnnotationLifecycleProvider</param-value> - </context-param> - - <!--optional: context-param> - <description>Comma separated list of URIs of (additional) faces config files. - (e.g. /WEB-INF/my-config.xml) - See JSF 1.0 PRD2, 10.3.2 - Attention: You do not need to put /WEB-INF/faces-config.xml in here. - </description> - <param-name>javax.faces.CONFIG_FILES</param-name> - <param-value>/WEB-INF/examples-config.xml</param-value> - </context-param--> - <context-param> - <description>State saving method: "client" or "server" (= default) - See JSF Specification 2.5.3</description> - <param-name>javax.faces.STATE_SAVING_METHOD</param-name> - <param-value>client</param-value> - </context-param> - <context-param> - <description>Only applicable if state saving method is "server" (= default). - Defines the amount (default = 20) of the latest views are stored in session.</description> - <param-name>org.apache.myfaces.NUMBER_OF_VIEWS_IN_SESSION</param-name> - <param-value>20</param-value> - </context-param> - <context-param> - <description>Only applicable if state saving method is "server" (= default). - If true (default) the state will be serialized to a byte stream before it - is written to the session. - If false the state will not be serialized to a byte stream.</description> - <param-name>org.apache.myfaces.SERIALIZE_STATE_IN_SESSION</param-name> - <param-value>true</param-value> - </context-param> - <context-param> - <description>Only applicable if state saving method is "server" (= default) and if - org.apache.myfaces.SERIALIZE_STATE_IN_SESSION is true (= default) - If true (default) the serialized state will be compressed before it - is written to the session. If false the state will not be compressed.</description> - <param-name>org.apache.myfaces.COMPRESS_STATE_IN_SESSION</param-name> - <param-value>true</param-value> - </context-param> - <context-param> - <description>This parameter tells MyFaces if javascript code should be allowed in the - rendered HTML output. - If javascript is allowed, command_link anchors will have javascript code - that submits the corresponding form. - If javascript is not allowed, the state saving info and nested parameters - will be added as url parameters. - Default: "true"</description> - <param-name>org.apache.myfaces.ALLOW_JAVASCRIPT</param-name> - <param-value>true</param-value> - </context-param> - <context-param> - <param-name>org.apache.myfaces.DETECT_JAVASCRIPT</param-name> - <param-value>false</param-value> - </context-param> - <context-param> - <description>If true, rendered HTML code will be formatted, so that it is "human readable". - i.e. additional line separators and whitespace will be written, that do not - influence the HTML code. - Default: "true"</description> - <param-name>org.apache.myfaces.PRETTY_HTML</param-name> - <param-value>true</param-value> - </context-param> - <context-param> - <description>If true, a javascript function will be rendered that is able to restore the - former vertical scroll on every request. Convenient feature if you have pages - with long lists and you do not want the browser page to always jump to the top - if you trigger a link or button action that stays on the same page. - Default: "false"</description> - <param-name>org.apache.myfaces.AUTO_SCROLL</param-name> - <param-value>true</param-value> - </context-param> - - <context-param> - <description>Used for encrypting view state. Only relevant for client side - state saving. See MyFaces wiki/web site documentation for instructions - on how to configure an application for diffenent encryption strengths. - </description> - <param-name>org.apache.myfaces.SECRET</param-name> - <param-value>NzY1NDMyMTA=</param-value> - </context-param> - - <context-param> - <description> - Validate managed beans, navigation rules and ensure that forms are not nested. - </description> - <param-name>org.apache.myfaces.VALIDATE</param-name> - <param-value>true</param-value> - </context-param> - - <context-param> - <description> - Treat readonly same as if disabled attribute was set for select elements. - </description> - <param-name>org.apache.myfaces.READONLY_AS_DISABLED_FOR_SELECTS</param-name> - <param-value>true</param-value> - </context-param> - - <context-param> - <description> - Use the defined class as the class which will be called when a resource is added to the - ExtensionFilter handling. Using StreamingAddResource here helps with performance. If you want to add - custom components and want to use the ExtensionFilter, you need to provide your custom implementation here. - </description> - <param-name>org.apache.myfaces.ADD_RESOURCE_CLASS</param-name> - <param-value>org.apache.myfaces.renderkit.html.util.DefaultAddResource</param-value> - </context-param> - - <context-param> - <description> - Virtual path in the URL which triggers loading of resources for the MyFaces extended components - in the ExtensionFilter. - </description> - <param-name>org.apache.myfaces.RESOURCE_VIRTUAL_PATH</param-name> - <param-value>/faces/myFacesExtensionResource</param-value> - </context-param> - - <context-param> - <description> - Check if the extensions-filter has been properly configured. - </description> - <param-name>org.apache.myfaces.CHECK_EXTENSIONS_FILTER</param-name> - <param-value>true</param-value> - </context-param> - - <context-param> - <description> - Define partial state saving as true/false. - </description> - <param-name>javax.faces.PARTIAL_STATE_SAVING_METHOD</param-name> - <param-value>false</param-value> - </context-param> - - <!-- Listener, to allow Jetty serving MyFaces apps --> - <listener> - <listener-class>org.apache.myfaces.webapp.StartupServletContextListener</listener-class> - </listener> - - <!-- Faces Servlet --> - <servlet> - <servlet-name>Faces Servlet</servlet-name> - <servlet-class>javax.faces.webapp.FacesServlet</servlet-class> - <load-on-startup>1</load-on-startup> - </servlet> - - <!-- Faces Servlet Mapping --> - <servlet-mapping> - <servlet-name>Faces Servlet</servlet-name> - <url-pattern>*.jsf</url-pattern> - </servlet-mapping> - - <!-- Welcome files --> - <welcome-file-list> - <welcome-file>index.jsp</welcome-file> - <welcome-file>index.html</welcome-file> - </welcome-file-list> - -</web-app> diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-jsf/src/main/webapp/helloWorld.jsp b/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-jsf/src/main/webapp/helloWorld.jsp deleted file mode 100644 index 189c142c99..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-jsf/src/main/webapp/helloWorld.jsp +++ /dev/null @@ -1,40 +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.
--->
-
-<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
-<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%>
-
-<html>
- <head>
- <title>Apache Tuscany Helloworld JSF sample</title>
- </head>
- <body>
- <h2>Apache Tuscany Helloworld JSF sample</h2>
- <f:view>
- <h:form id="mainForm">
- <h:panelGrid columns="2">
- <h:outputLabel for="name" value="Please enter your name" />
- <h:inputText id="name" value="#{helloWorld.name}" required="true"/>
- <h:commandButton value="Press me" action="#{helloWorld.send}"/>
- <h:messages showDetail="true" showSummary="false"/>
- </h:panelGrid>
- </h:form>
- </f:view>
- </body>
-</html>
diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-jsf/src/main/webapp/index.jsp b/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-jsf/src/main/webapp/index.jsp deleted file mode 100644 index 5ca296e115..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-jsf/src/main/webapp/index.jsp +++ /dev/null @@ -1,23 +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.
--->
-
-<%@ page session="false"%>
-<%
-response.sendRedirect("helloWorld.jsf");
-%>
diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-jsf/src/main/webapp/page2.jsp b/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-jsf/src/main/webapp/page2.jsp deleted file mode 100644 index 89259021c7..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-jsf/src/main/webapp/page2.jsp +++ /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.
--->
-
-<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h" %>
-<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%>
-<html>
- <head>
- <title>Apache Tuscany Helloworld JSF sample</title>
- </head>
- <body>
- <h2>Apache Tuscany Helloworld JSF sample</h2>
- <f:view>
- <h:form id="mainForm">
- <h:inputTextarea readonly="true" rows="20" cols="80" value="#{helloWorld.name}"/>
- <br>
- <h:commandLink action="back">
- <h:outputText value="Home"/>
- </h:commandLink>
- </h:form>
- </f:view>
- </body>
-</html>
diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-jsp/README b/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-jsp/README deleted file mode 100644 index 828aadb0f1..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-jsp/README +++ /dev/null @@ -1,7 +0,0 @@ -The README in the <distribution-unpack-dir>/samples directory provides
-general instructions about building and running samples. (where
-distribution-unpack-dir is the directory in which you unpacked the tuscany
-binary distribution archive). Take a look there first (noting at you read it that this sample
-is not a new style sample).
-
-TODO - finish
\ No newline at end of file diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-jsp/pom.xml b/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-jsp/pom.xml deleted file mode 100644 index fb1f93bcc1..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-jsp/pom.xml +++ /dev/null @@ -1,98 +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-samples</artifactId> - <version>2.0-SNAPSHOT</version> - <relativePath>../../../pom.xml</relativePath> - </parent> - - <artifactId>sample-implementation-web-helloworld-jsp-webapp</artifactId> - <packaging>war</packaging> - <name>Apache Tuscany SCA Sample implemenation-web Helloworld JSP WebApp</name> - - <dependencies> - - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-base-runtime</artifactId> - <version>2.0-SNAPSHOT</version> - </dependency> - - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>4.8.1</version> - <scope>test</scope> - </dependency> - - <dependency> - <groupId>net.sourceforge.htmlunit</groupId> - <artifactId>htmlunit</artifactId> - <version>2.6</version> - <scope>test</scope> - </dependency> - - </dependencies> - - <build> - <finalName>helloworld-jsp</finalName> - <plugins> - <plugin> - <groupId>org.mortbay.jetty</groupId> - <artifactId>maven-jetty-plugin</artifactId> - <version>6.1.18</version> - <configuration> - <contextPath>helloworld-jsp</contextPath> - <stopKey>foo</stopKey> - <stopPort>9999</stopPort> - </configuration> - <executions> - <execution> - <id>start-jetty</id> - <phase>process-test-classes</phase> - <goals> - <goal>run</goal> - </goals> - <configuration> - <scanIntervalSeconds>0</scanIntervalSeconds> - <daemon>true</daemon> - <connectors> - <connector implementation="org.mortbay.jetty.nio.SelectChannelConnector"> - <port>8085</port> - </connector> - </connectors> - </configuration> - </execution> - <execution> - <id>stop-jetty</id> - <phase>prepare-package</phase> - <goals> - <goal>stop</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> - </build> - -</project> diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-jsp/src/main/java/sample/HelloworldService.java b/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-jsp/src/main/java/sample/HelloworldService.java deleted file mode 100644 index 53ff7a5ca1..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-jsp/src/main/java/sample/HelloworldService.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 sample; - -public interface HelloworldService { - - String sayHello(String name); - -} diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-jsp/src/main/java/sample/HelloworldServiceImpl.java b/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-jsp/src/main/java/sample/HelloworldServiceImpl.java deleted file mode 100644 index a22c095f29..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-jsp/src/main/java/sample/HelloworldServiceImpl.java +++ /dev/null @@ -1,28 +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 sample; - - -public class HelloworldServiceImpl implements HelloworldService { - - public String sayHello(String name) { - return "Hello " + name; - } - -} diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-jsp/src/main/webapp/WEB-INF/web.composite b/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-jsp/src/main/webapp/WEB-INF/web.composite deleted file mode 100644 index 8976adde3c..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-jsp/src/main/webapp/WEB-INF/web.composite +++ /dev/null @@ -1,34 +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://docs.oasis-open.org/ns/opencsa/sca/200912" - xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.1" - targetNamespace="http://samples" - name="Helloworld"> - - <component name="foo"> - <implementation.web web-uri=""/> - <reference name="service" target="HelloworldComponent"/> - </component> - - <component name="HelloworldComponent"> - <implementation.java class="sample.HelloworldServiceImpl"/> - </component> - -</composite> diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-jsp/src/main/webapp/WEB-INF/web.xml b/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-jsp/src/main/webapp/WEB-INF/web.xml deleted file mode 100644 index fa1f7ad7b9..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-jsp/src/main/webapp/WEB-INF/web.xml +++ /dev/null @@ -1,41 +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. ---> -<web-app version="2.4" - xmlns="http://java.sun.com/xml/ns/j2ee" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd" > - - <display-name>Apache Tuscany Helloworld JSP Sample</display-name> - - <filter> - <filter-name>tuscany</filter-name> - <filter-class>org.apache.tuscany.sca.host.webapp.TuscanyServletFilter</filter-class> - </filter> - - <filter-mapping> - <filter-name>tuscany</filter-name> - <url-pattern>/*</url-pattern> - </filter-mapping> - - <welcome-file-list id="WelcomeFileList"> - <welcome-file>hello.jsp</welcome-file> - </welcome-file-list> - -</web-app> diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-jsp/src/main/webapp/hello.jsp b/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-jsp/src/main/webapp/hello.jsp deleted file mode 100644 index ffd01cca73..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-jsp/src/main/webapp/hello.jsp +++ /dev/null @@ -1,37 +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.
--->
-
-<%@ page contentType="text/html;charset=UTF-8" language="java" %>
-<%@ taglib uri="http://www.osoa.org/sca/sca_jsp.tld" prefix="sca" %>
-
-<sca:reference name="service" type="sample.HelloworldService" />
-
-<html>
- <body >
-
- <h2>Apache Tuscany Helloworld JSP Sample</h2>
-
- Calling HelloworldService sayHello("world") returns:
-
- <p>
-
- <%= service.sayHello("world") %>
-
- </body>
-</html>
diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-jsp/src/test/java/itest/HelloworldTestCase.java b/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-jsp/src/test/java/itest/HelloworldTestCase.java deleted file mode 100644 index 665957b0eb..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-jsp/src/test/java/itest/HelloworldTestCase.java +++ /dev/null @@ -1,53 +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 itest;
-
-import static org.junit.Assert.assertEquals;
-
-import java.io.IOException;
-import java.net.MalformedURLException;
-import java.util.Iterator;
-
-import org.junit.Test;
-
-import com.gargoylesoftware.htmlunit.FailingHttpStatusCodeException;
-import com.gargoylesoftware.htmlunit.WebClient;
-import com.gargoylesoftware.htmlunit.html.HtmlElement;
-import com.gargoylesoftware.htmlunit.html.HtmlPage;
-import com.gargoylesoftware.htmlunit.html.HtmlParagraph;
-
-/**
- */
-public class HelloworldTestCase {
-
- @Test
- public void testA() throws FailingHttpStatusCodeException, MalformedURLException, IOException {
- HtmlPage page = (HtmlPage)new WebClient().getPage("http://localhost:8085/helloworld-jsp");
- Iterator<?> ss = page.getAllHtmlChildElements().iterator();
- while(ss.hasNext()) {
- HtmlElement htmlElement = (HtmlElement) ss.next();
- if( htmlElement instanceof HtmlParagraph) {
- assertEquals("Hello world", htmlElement.asText());
- break;
- }
- }
- }
-
-}
diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-servlet/README b/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-servlet/README deleted file mode 100644 index 6874bcaddc..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-servlet/README +++ /dev/null @@ -1,8 +0,0 @@ -Sample implementation.web Servlet WebApp
-==========================================
-
-This sample contribution shows SCA components implemented in a webapp and
-accessed using a Servlet.
-
-See http://tuscany.apache.org/documentation-2x/20-beta-samples-documentation.html
-for more information
\ No newline at end of file diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-servlet/pom.xml b/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-servlet/pom.xml deleted file mode 100644 index 5a07843e58..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-servlet/pom.xml +++ /dev/null @@ -1,105 +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-samples</artifactId> - <version>2.0-SNAPSHOT</version> - <relativePath>../../../pom.xml</relativePath> - </parent> - - <artifactId>sample-implementation-web-helloworld-servlet-webapp</artifactId> - <packaging>war</packaging> - <name>Apache Tuscany SCA Sample implementation.web Helloworld Servlet WebApp</name> - - <dependencies> - - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-base-runtime</artifactId> - <version>2.0-SNAPSHOT</version> - </dependency> - - <dependency> - <groupId>javax.servlet</groupId> - <artifactId>servlet-api</artifactId> - <version>2.5</version> - <scope>provided</scope> - </dependency> - - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>4.8.1</version> - <scope>test</scope> - </dependency> - - <dependency> - <groupId>net.sourceforge.htmlunit</groupId> - <artifactId>htmlunit</artifactId> - <version>2.6</version> - <scope>test</scope> - </dependency> - - </dependencies> - - <build> - <finalName>helloworld-servlet</finalName> - <plugins> - <plugin> - <groupId>org.mortbay.jetty</groupId> - <artifactId>maven-jetty-plugin</artifactId> - <version>6.1.18</version> - <configuration> - <contextPath>helloworld-servlet</contextPath> - <stopKey>foo</stopKey> - <stopPort>9999</stopPort> - </configuration> - <executions> - <execution> - <id>start-jetty</id> - <phase>process-test-classes</phase> - <goals> - <goal>run</goal> - </goals> - <configuration> - <scanIntervalSeconds>0</scanIntervalSeconds> - <daemon>true</daemon> - <connectors> - <connector implementation="org.mortbay.jetty.nio.SelectChannelConnector"> - <port>8085</port> - </connector> - </connectors> - </configuration> - </execution> - <execution> - <id>stop-jetty</id> - <phase>prepare-package</phase> - <goals> - <goal>stop</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> - </build> -</project> - diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-servlet/src/main/java/sample/HelloworldService.java b/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-servlet/src/main/java/sample/HelloworldService.java deleted file mode 100644 index 2e43e09897..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-servlet/src/main/java/sample/HelloworldService.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 sample; - -public interface HelloworldService { - - String sayHello(String name); - -} diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-servlet/src/main/java/sample/HelloworldServiceImpl.java b/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-servlet/src/main/java/sample/HelloworldServiceImpl.java deleted file mode 100644 index 9e79276704..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-servlet/src/main/java/sample/HelloworldServiceImpl.java +++ /dev/null @@ -1,27 +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 sample; - -public class HelloworldServiceImpl implements HelloworldService { - - public String sayHello(String name) { - return "Hello " + name; - } - -} diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-servlet/src/main/java/sample/HelloworldServlet.java b/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-servlet/src/main/java/sample/HelloworldServlet.java deleted file mode 100644 index bb72c50f6a..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-servlet/src/main/java/sample/HelloworldServlet.java +++ /dev/null @@ -1,64 +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 sample; - -import java.io.IOException; -import java.io.Writer; - -import javax.servlet.ServletConfig; -import javax.servlet.ServletException; -import javax.servlet.http.HttpServlet; -import javax.servlet.http.HttpServletRequest; -import javax.servlet.http.HttpServletResponse; - -import org.oasisopen.sca.ComponentContext; -import org.oasisopen.sca.annotation.Reference; - -/** - */ -public class HelloworldServlet extends HttpServlet { - private static final long serialVersionUID = 1L; - - @Reference - protected HelloworldService service; - - @Override - public void init(ServletConfig servletConfig) throws ServletException { - if (service == null) { - System.out.println("HelloworldServlet reference injection failed, using ComponentContext"); - ComponentContext cc = (ComponentContext)servletConfig.getServletContext().getAttribute("org.oasisopen.sca.ComponentContext"); - service = cc.getService(HelloworldService.class, "service"); - } - } - - @Override - protected void service(HttpServletRequest request, HttpServletResponse response) throws IOException { - - String name = request.getParameter("name"); - String greeting = service.sayHello(name); - - Writer out = response.getWriter(); - out.write("<html><head><title>Apache Tuscany Helloworld Servlet Sample</title></head><body>"); - out.write("<h2>Apache Tuscany Helloworld Servlet Sample</h2>"); - out.write("<br><strong>Result: </strong>" + greeting); - out.write("</body></html>"); - out.flush(); - out.close(); - } -} diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-servlet/src/main/webapp/WEB-INF/web.composite b/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-servlet/src/main/webapp/WEB-INF/web.composite deleted file mode 100644 index 8976adde3c..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-servlet/src/main/webapp/WEB-INF/web.composite +++ /dev/null @@ -1,34 +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://docs.oasis-open.org/ns/opencsa/sca/200912" - xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.1" - targetNamespace="http://samples" - name="Helloworld"> - - <component name="foo"> - <implementation.web web-uri=""/> - <reference name="service" target="HelloworldComponent"/> - </component> - - <component name="HelloworldComponent"> - <implementation.java class="sample.HelloworldServiceImpl"/> - </component> - -</composite> diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-servlet/src/main/webapp/WEB-INF/web.xml b/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-servlet/src/main/webapp/WEB-INF/web.xml deleted file mode 100644 index a91b3fc96b..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-servlet/src/main/webapp/WEB-INF/web.xml +++ /dev/null @@ -1,44 +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. ---> -<web-app version="2.4" - xmlns="http://java.sun.com/xml/ns/j2ee" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd" > - - <display-name>Apache Tuscany Helloworld Servlet Sample</display-name> - - <listener><listener-class>org.apache.tuscany.sca.host.webapp.TuscanyContextListener</listener-class></listener> - - <servlet> - <servlet-name>HelloworldServlet</servlet-name> - <servlet-class>sample.HelloworldServlet</servlet-class> - </servlet> - - <servlet-mapping> - <servlet-name>HelloworldServlet</servlet-name> - <url-pattern>/HelloworldServlet</url-pattern> - </servlet-mapping> - - <welcome-file-list id="WelcomeFileList"> - <welcome-file>hello.html</welcome-file> - </welcome-file-list> - -</web-app> - diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-servlet/src/main/webapp/hello.html b/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-servlet/src/main/webapp/hello.html deleted file mode 100644 index c4484916aa..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-servlet/src/main/webapp/hello.html +++ /dev/null @@ -1,46 +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. ---> -<html> - -<head> -<title>Apache Tuscany Helloworld Servlet Sample</title> -</head> - -<body> - -<h2>Apache Tuscany Helloworld Servlet Sample</h2> - -<form action="HelloworldServlet" method="post"> - <table> - <tr> - <td>Enter your name:</td> - <td> - <input type="text" name="name" width="10"> - </td> - </tr> - <tr> - <td align="left" colspan="2"> - <button name="submit" type="submit">Say hello</button> - </td> - </tr> - </table> -</form> - -</body> -</html>
\ No newline at end of file diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-servlet/src/test/java/itest/HelloworldTestCase.java b/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-servlet/src/test/java/itest/HelloworldTestCase.java deleted file mode 100644 index 61d722da1f..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-servlet/src/test/java/itest/HelloworldTestCase.java +++ /dev/null @@ -1,55 +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 itest;
-import static org.junit.Assert.assertTrue;
-
-import java.io.IOException;
-import java.net.MalformedURLException;
-
-import org.junit.Test;
-
-import com.gargoylesoftware.htmlunit.FailingHttpStatusCodeException;
-import com.gargoylesoftware.htmlunit.WebClient;
-import com.gargoylesoftware.htmlunit.html.HtmlButton;
-import com.gargoylesoftware.htmlunit.html.HtmlForm;
-import com.gargoylesoftware.htmlunit.html.HtmlInput;
-import com.gargoylesoftware.htmlunit.html.HtmlPage;
-
-/**
- */
-public class HelloworldTestCase {
-
- @Test
- public void testA() throws FailingHttpStatusCodeException, MalformedURLException, IOException {
- HtmlPage page = (HtmlPage)new WebClient().getPage("http://localhost:8085/helloworld-servlet");
-
- HtmlForm form = (HtmlForm) page.getForms().get(0);
-
- HtmlInput textField = form.getInputByName("name");
- textField.setValueAttribute("petra");
-
- HtmlButton button = (HtmlButton) form.getButtonsByName("submit").get(0);
-
- HtmlPage pageResponse = (HtmlPage) button.click();
-
- assertTrue(pageResponse.getWebResponse().getContentAsString().endsWith("</strong>Hello petra</body></html>"));
- }
-
-}
diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-stripes/README b/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-stripes/README deleted file mode 100644 index f331fb036c..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-stripes/README +++ /dev/null @@ -1,8 +0,0 @@ -Sample implementation.web Stripes WebApp
-==========================================
-
-This sample contribution shows SCA components implemented in a webapp and
-accessed using a Stripes.
-
-See http://tuscany.apache.org/documentation-2x/20-beta-samples-documentation.html
-for more information
\ No newline at end of file diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-stripes/pom.xml b/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-stripes/pom.xml deleted file mode 100644 index 7e092f548b..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-stripes/pom.xml +++ /dev/null @@ -1,118 +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-samples</artifactId> - <version>2.0-SNAPSHOT</version> - <relativePath>../../../pom.xml</relativePath> - </parent> - - <artifactId>sample-implementation-web-helloworld-stripes-webapp</artifactId> - <packaging>war</packaging> - <name>Apache Tuscany SCA Sample implementation.web Helloworld Stripes WebApp</name> - - <dependencies> - - <!-- Tuscany dependencies --> - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-base-runtime</artifactId> - <version>2.0-SNAPSHOT</version> - </dependency> - - <dependency> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-stripes</artifactId> - <version>2.0-SNAPSHOT</version> - </dependency> - - <!-- Stripes Framework dependencies --> - <dependency> - <groupId>net.sourceforge.stripes</groupId> - <artifactId>stripes</artifactId> - <version>1.5.2</version> - </dependency> - - <dependency> - <groupId>taglibs</groupId> - <artifactId>standard</artifactId> - <version>1.1.2</version> - </dependency> - - <dependency> - <groupId>junit</groupId> - <artifactId>junit</artifactId> - <version>4.8.1</version> - <scope>test</scope> - </dependency> - - <dependency> - <groupId>net.sourceforge.htmlunit</groupId> - <artifactId>htmlunit</artifactId> - <version>2.6</version> - <scope>test</scope> - </dependency> - - </dependencies> - - <build> - <finalName>helloworld-stripes</finalName> - <plugins> - <plugin> - <groupId>org.mortbay.jetty</groupId> - <artifactId>maven-jetty-plugin</artifactId> - <version>6.1.18</version> - <configuration> - <contextPath>helloworld-stripes</contextPath> - <stopKey>foo</stopKey> - <stopPort>9999</stopPort> - </configuration> - <executions> - <execution> - <id>start-jetty</id> - <phase>process-test-classes</phase> - <goals> - <goal>run</goal> - </goals> - <configuration> - <scanIntervalSeconds>0</scanIntervalSeconds> - <daemon>true</daemon> - <connectors> - <connector implementation="org.mortbay.jetty.nio.SelectChannelConnector"> - <port>8085</port> - </connector> - </connectors> - </configuration> - </execution> - <execution> - <id>stop-jetty</id> - <phase>prepare-package</phase> - <goals> - <goal>stop</goal> - </goals> - </execution> - </executions> - </plugin> - </plugins> - </build> - -</project> diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-stripes/src/main/java/mystripes/action/BaseActionBean.java b/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-stripes/src/main/java/mystripes/action/BaseActionBean.java deleted file mode 100644 index 0ab02682ac..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-stripes/src/main/java/mystripes/action/BaseActionBean.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 mystripes.action; - -import net.sourceforge.stripes.action.ActionBean; -import net.sourceforge.stripes.action.ActionBeanContext; - -public class BaseActionBean implements ActionBean { - private ActionBeanContext context; - - public ActionBeanContext getContext() { - return context; - } - public void setContext(ActionBeanContext context) { - this.context = context; - } -} diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-stripes/src/main/java/mystripes/action/HomeActionBean.java b/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-stripes/src/main/java/mystripes/action/HomeActionBean.java deleted file mode 100644 index 0385c92369..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-stripes/src/main/java/mystripes/action/HomeActionBean.java +++ /dev/null @@ -1,45 +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 mystripes.action; - -import net.sourceforge.stripes.action.DefaultHandler; -import net.sourceforge.stripes.action.ForwardResolution; -import net.sourceforge.stripes.action.Resolution; -import net.sourceforge.stripes.action.UrlBinding; - -import org.oasisopen.sca.annotation.Reference; - -import sample.HelloworldService; - -@UrlBinding("/Home.htm") -public class HomeActionBean extends BaseActionBean { - - @Reference - HelloworldService service; - - @DefaultHandler - public Resolution view() { - return new ForwardResolution("/WEB-INF/jsp/home.jsp"); - } - - public String getHello() { - return service.sayHello("world"); - } - -} diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-stripes/src/main/java/sample/HelloworldService.java b/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-stripes/src/main/java/sample/HelloworldService.java deleted file mode 100644 index 53ff7a5ca1..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-stripes/src/main/java/sample/HelloworldService.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 sample; - -public interface HelloworldService { - - String sayHello(String name); - -} diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-stripes/src/main/java/sample/HelloworldServiceImpl.java b/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-stripes/src/main/java/sample/HelloworldServiceImpl.java deleted file mode 100644 index a22c095f29..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-stripes/src/main/java/sample/HelloworldServiceImpl.java +++ /dev/null @@ -1,28 +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 sample; - - -public class HelloworldServiceImpl implements HelloworldService { - - public String sayHello(String name) { - return "Hello " + name; - } - -} diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-stripes/src/main/resources/StripesResources.properties b/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-stripes/src/main/resources/StripesResources.properties deleted file mode 100644 index 902842a19e..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-stripes/src/main/resources/StripesResources.properties +++ /dev/null @@ -1,73 +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. -# - -# Resource strings used by the <stripes:errors> tag when there are no nested tags -stripes.errors.header=<div style="color:#b72222; font-weight: bold">Please fix the following errors:</div><ol> -stripes.errors.beforeError=<li style="color: #b72222;"> -stripes.errors.afterError=</li> -stripes.errors.footer=</ol> - -# Resource strings used by the <stripes:errors> tag when displaying errors for a -# specific field (e.g. <stripes:errors field="password"/>). If not supplied the -# values above will be used instead. -stripes.fieldErrors.header= -stripes.fieldErrors.beforeError=<span style="color: #b72222;"> -stripes.fieldErrors.afterError=</span><br /> -stripes.fieldErrors.footer= - -# Resource strings used by the stripes:messages tag -stripes.messages.header=<ul class="messages"> -stripes.messages.beforeMessage=<li> -stripes.messages.afterMessage=</li> -stripes.messages.footer=</ul> - -# Validation error messages produced by Stripes' built-in converter classes. These -# are default error messages and can be overridden on per-field and per-form levels. -# Using the 'invalidNumber' error for a field 'age' of a form posting to -# '/user/Profile.action', the keys looked for (in order) would be: -# 1: /user/Profile.action.age.invalidNumber -# 2: /user/Profile.action.age.errorMessage -# 3: age.errorMessage -# 4: /user/Profile.action.invalidNumber -# 5: converter.number.invalidNumber -converter.number.invalidNumber=The value ({1}) entered in field {0} must be a valid number -converter.byte.outOfRange=The value ({1}) entered in field {0} was out of the range {2} to {3} -converter.short.outOfRange=The value ({1}) entered in field {0} was out of the range {2} to {3} -converter.integer.outOfRange=The value ({1}) entered in field {0} was out of the range {2} to {3} -converter.float.outOfRange=The value ({1}) entered in field {0} was out of the range {2} to {3} -converter.enum.notAnEnumeratedValue=The value "{1}" is not a valid value for field {0} -converter.date.invalidDate=The value ({1}) entered in field {0} must be a valid date -converter.email.invalidEmail=The value ({1}) entered is not a valid email address -converter.creditCard.invalidCreditCard=The value ({1}) entered is not a valid credit card number - -# Validation error messages produced by Stripes' annotation based validations. These -# are default error messages and can be overridden on per-field and per-form levels. -# Using the 'valueNotPresent' required field error for a field 'username' of a form -# posting to '/user/Register.action', the keys looked for (in order) would be: -# 1: /user/Register.action.username.valueNotPresent -# 2: /user/Register.action.username.errorMessage -# 3: username.errorMessage -# 4: /user/Register.action.valueNotPresent -# 5: validation.required.valueNotPresent -validation.required.valueNotPresent={0} is a required field -validation.minlength.valueTooShort={0} must be at least {2} characters long -validation.maxlength.valueTooLong={0} must be no more than {2} characters long -validation.minvalue.valueBelowMinimum=The minimum allowed value for {0} is {2} -validation.maxvalue.valueAboveMaximum=The maximum allowed value for {0} is {2} -validation.mask.valueDoesNotMatch=<em>{1}</em> is not a valid {0} -validation.expression.valueFailedExpression=The value supplied ({1}) for field {0} is invalid -validation.file.postBodyTooBig=Total upload size of {3} KB exceeds the maximum size of {2} KB diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-stripes/src/main/resources/log4j.properties b/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-stripes/src/main/resources/log4j.properties deleted file mode 100644 index 2741999098..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-stripes/src/main/resources/log4j.properties +++ /dev/null @@ -1,48 +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. -# - -# log4j.properties - -# Set up a logger to the console -log4j.appender.stdout=org.apache.log4j.ConsoleAppender -log4j.appender.stdout.layout=org.apache.log4j.PatternLayout -log4j.appender.stdout.layout.ConversionPattern=[%d{HH:mm:ss}] %-5p %c %x - %m%n - -# Use this to only see log messages beyond a certain threshold in the console -#log4j.appender.stdout.Threshold=WARN - -# Set up a logger to a log file -log4j.appender.logfile=org.apache.log4j.DailyRollingFileAppender -log4j.appender.logfile.layout=org.apache.log4j.PatternLayout -log4j.appender.logfile.layout.ConversionPattern=[%d{HH:mm:ss}] %-5p %c %x - %m%n -log4j.appender.logfile.File=${user.home}/stripesquick.log -log4j.appender.logfile.DatePattern='.'yyyy-MM-dd - -# Use this to only see log messages beyond a certain threshold in the log file -#log4j.appender.logfile.Threshold=WARN - -# Logger settings -log4j.rootLogger=INFO, stdout, logfile - -# Valid levels are TRACE, DEBUG, INFO, WARN, ERROR, FATAL -# Change to TRACE or DEBUG to see more log messages -log4j.logger.net.sourceforge.stripes=WARN -log4j.logger.org.stripesbook.quickstart=INFO -log4j.logger.org.mortbay.log=INFO -log4j.logger.org=WARN -log4j.logger.com=WARN -log4j.logger.net=WARN diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-stripes/src/main/webapp/WEB-INF/jsp/home.jsp b/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-stripes/src/main/webapp/WEB-INF/jsp/home.jsp deleted file mode 100644 index 0681c1f2bf..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-stripes/src/main/webapp/WEB-INF/jsp/home.jsp +++ /dev/null @@ -1,26 +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.
--->
-<%@ include file="/WEB-INF/jsp/taglibs.jsp" %>
-
-<s:layout-render name="/WEB-INF/jsp/layout.jsp" title="Welcome">
- <s:layout-component name="body">
- <p>sayHello returns: ${actionBean.hello}</p>
- <p>Congratulations, you've set up a Stripes SCA project!</p>
- </s:layout-component>
-</s:layout-render>
diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-stripes/src/main/webapp/WEB-INF/jsp/layout.jsp b/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-stripes/src/main/webapp/WEB-INF/jsp/layout.jsp deleted file mode 100644 index d0fb716b80..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-stripes/src/main/webapp/WEB-INF/jsp/layout.jsp +++ /dev/null @@ -1,39 +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.
--->
-<%@ include file="/WEB-INF/jsp/taglibs.jsp" %>
-
-<s:layout-definition>
-
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
-<html>
- <head>
- <title>${title}</title>
- <link rel="stylesheet" type="text/css" href="${contextPath}/css/style.css">
- <s:layout-component name="head">
- </s:layout-component>
- </head>
- <body>
- <div id="main">
- <s:layout-component name="body">
- </s:layout-component>
- </div>
- </body>
-</html>
-
-</s:layout-definition>
\ No newline at end of file diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-stripes/src/main/webapp/WEB-INF/jsp/taglibs.jsp b/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-stripes/src/main/webapp/WEB-INF/jsp/taglibs.jsp deleted file mode 100644 index f85602fcfa..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-stripes/src/main/webapp/WEB-INF/jsp/taglibs.jsp +++ /dev/null @@ -1,29 +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.
--->
-<%-- Stripes TLD --%>
-<%@ taglib prefix="s" uri="http://stripes.sourceforge.net/stripes.tld" %>
-<%@ taglib prefix="sdyn" uri="http://stripes.sourceforge.net/stripes-dynattr.tld" %>
-
-<%-- JSTL TLDs --%>
-<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
-<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt" %>
-<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %>
-
-<%-- This is so that you can conveniently refer to the context path with ${contextPath} --%>
-<c:set var="contextPath" value="${pageContext.request.contextPath}"/>
diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-stripes/src/main/webapp/WEB-INF/web.composite b/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-stripes/src/main/webapp/WEB-INF/web.composite deleted file mode 100644 index 8976adde3c..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-stripes/src/main/webapp/WEB-INF/web.composite +++ /dev/null @@ -1,34 +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://docs.oasis-open.org/ns/opencsa/sca/200912" - xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.1" - targetNamespace="http://samples" - name="Helloworld"> - - <component name="foo"> - <implementation.web web-uri=""/> - <reference name="service" target="HelloworldComponent"/> - </component> - - <component name="HelloworldComponent"> - <implementation.java class="sample.HelloworldServiceImpl"/> - </component> - -</composite> diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-stripes/src/main/webapp/WEB-INF/web.xml b/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-stripes/src/main/webapp/WEB-INF/web.xml deleted file mode 100644 index f01584cc2f..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-stripes/src/main/webapp/WEB-INF/web.xml +++ /dev/null @@ -1,61 +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. - --> -<web-app version="2.4" xmlns="http://java.sun.com/xml/ns/j2ee" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"> - - <display-name>Apache Tuscany Helloworld Stripes Sample</display-name> - - <listener> - <listener-class>org.apache.tuscany.sca.host.webapp.TuscanyContextListener</listener-class> - </listener> - - <filter> - <filter-name>StripesFilter</filter-name> - <filter-class>net.sourceforge.stripes.controller.StripesFilter</filter-class> - <init-param> - <param-name>ActionResolver.Packages</param-name> - <param-value>mystripes.action</param-value> - </init-param> - <init-param> - <param-name>Extension.Packages</param-name> - <param-value>org.apache.tuscany.sca.stripes</param-value> - </init-param> - </filter> - - <servlet> - <servlet-name>DispatcherServlet</servlet-name> - <servlet-class>net.sourceforge.stripes.controller.DispatcherServlet</servlet-class> - <load-on-startup>1</load-on-startup> - </servlet> - - <filter-mapping> - <filter-name>StripesFilter</filter-name> - <servlet-name>DispatcherServlet</servlet-name> - <dispatcher>REQUEST</dispatcher> - <dispatcher>FORWARD</dispatcher> - </filter-mapping> - - <servlet-mapping> - <servlet-name>DispatcherServlet</servlet-name> - <url-pattern>*.htm</url-pattern> - </servlet-mapping> - - <welcome-file-list> - <welcome-file>index.html</welcome-file> - </welcome-file-list> - -</web-app> diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-stripes/src/main/webapp/index.html b/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-stripes/src/main/webapp/index.html deleted file mode 100644 index c79d29e6a5..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-stripes/src/main/webapp/index.html +++ /dev/null @@ -1,24 +0,0 @@ -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN" "http://www.w3.org/TR/html4/strict.dtd">
-<!--
- * 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.
--->
-<html>
- <head>
- <meta http-equiv="refresh" content="0;url=Home.htm">
- </head>
-</html>
diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-stripes/src/test/java/README b/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-stripes/src/test/java/README deleted file mode 100644 index 828aadb0f1..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-stripes/src/test/java/README +++ /dev/null @@ -1,7 +0,0 @@ -The README in the <distribution-unpack-dir>/samples directory provides
-general instructions about building and running samples. (where
-distribution-unpack-dir is the directory in which you unpacked the tuscany
-binary distribution archive). Take a look there first (noting at you read it that this sample
-is not a new style sample).
-
-TODO - finish
\ No newline at end of file diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-stripes/src/test/java/itest/HelloworldTestCase.java b/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-stripes/src/test/java/itest/HelloworldTestCase.java deleted file mode 100644 index 7f4359fa43..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/implementation-web/helloworld-stripes/src/test/java/itest/HelloworldTestCase.java +++ /dev/null @@ -1,53 +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 itest;
-
-import static org.junit.Assert.assertEquals;
-
-import java.io.IOException;
-import java.net.MalformedURLException;
-import java.util.Iterator;
-
-import org.junit.Test;
-
-import com.gargoylesoftware.htmlunit.FailingHttpStatusCodeException;
-import com.gargoylesoftware.htmlunit.WebClient;
-import com.gargoylesoftware.htmlunit.html.HtmlElement;
-import com.gargoylesoftware.htmlunit.html.HtmlPage;
-import com.gargoylesoftware.htmlunit.html.HtmlParagraph;
-
-/**
- */
-public class HelloworldTestCase {
-
- @Test
- public void testA() throws FailingHttpStatusCodeException, MalformedURLException, IOException {
- HtmlPage page = (HtmlPage)new WebClient().getPage("http://localhost:8085/helloworld-stripes");
- Iterator<?> ss = page.getAllHtmlChildElements().iterator();
- while(ss.hasNext()) {
- HtmlElement htmlElement = (HtmlElement) ss.next();
- if( htmlElement instanceof HtmlParagraph) {
- assertEquals("sayHello returns: Hello world", htmlElement.asText());
- break;
- }
- }
- }
-
-}
diff --git a/sca-java-2.x/trunk/samples/learning-more/implementation-web/pom.xml b/sca-java-2.x/trunk/samples/learning-more/implementation-web/pom.xml deleted file mode 100644 index 94b39e5561..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/implementation-web/pom.xml +++ /dev/null @@ -1,50 +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-samples-learning-more</artifactId> - <version>2.0-SNAPSHOT</version> - <relativePath>../pom.xml</relativePath> - </parent> - <artifactId>tuscany-samples-implementation-webapp</artifactId> - <packaging>pom</packaging> - <name>Apache Tuscany SCA Sample Web Applications</name> - - <profiles> - <profile> - <id>default</id> - <activation> - <activeByDefault>true</activeByDefault> - </activation> - <modules> - <module>helloworld-jaxrs</module> - <module>helloworld-js-client</module> - <module>helloworld-jsf</module> -<!-- failure due to lack of tag support? - <module>helloworld-jsp</module> ---> - <module>helloworld-servlet</module> - <module>helloworld-stripes</module> - </modules> - </profile> - </profiles> -</project> diff --git a/sca-java-2.x/trunk/samples/learning-more/pom.xml b/sca-java-2.x/trunk/samples/learning-more/pom.xml deleted file mode 100644 index 1b11cf0e30..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/pom.xml +++ /dev/null @@ -1,60 +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-samples</artifactId> - <version>2.0-SNAPSHOT</version> - <relativePath>../pom.xml</relativePath> - </parent> - <groupId>org.apache.tuscany.sca</groupId> - <artifactId>tuscany-samples-learning-more</artifactId> - <version>2.0-SNAPSHOT</version> - <packaging>pom</packaging> - <name>Apache Tuscany SCA Learning More Sample Contributions</name> - - <profiles> - <profile> - <id>default</id> - <activation> - <activeByDefault>true</activeByDefault> - </activation> - <modules> - <module>binding-jms</module> - <module>binding-rmi</module> - <module>binding-sca</module> - <module>binding-ws</module> - <!-- module>binding-comet</module --> - <module>binding-jsonrpc</module> - <module>implementation-bpel</module> - <module>implementation-composite</module> - <module>implementation-java</module> - <module>implementation-script</module> - <module>implementation-spring</module> - <module>implementation-osgi</module> - <module>implementation-web</module> - <module>distributed-osgi</module> - <module>sca-client</module> - <module>async</module> - </modules> - </profile> - </profiles> -</project> diff --git a/sca-java-2.x/trunk/samples/learning-more/sca-client/calculator-scaclient/README b/sca-java-2.x/trunk/samples/learning-more/sca-client/calculator-scaclient/README deleted file mode 100644 index 59dd5f1759..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/sca-client/calculator-scaclient/README +++ /dev/null @@ -1,19 +0,0 @@ -Calculator SCA Client
-=====================
-
-To run an application that uses the SCA client API to send messages to the
-Calculator service running in the domain do the following
-
-First start one of the Calculator based contributions. For example,
-
-cd samples/learning-more/binding-sca/contribution-calculator
-follow the instructions in the README there
-
-Then run the the SCA client by doing the following:
-
-cd samples/learning-more/scaclient-calculator
-mvn exec:java
-
-See http://tuscany.apache.org/documentation-2x/20-beta-samples-documentation.html
-for more information
-
diff --git a/sca-java-2.x/trunk/samples/learning-more/sca-client/calculator-scaclient/pom.xml b/sca-java-2.x/trunk/samples/learning-more/sca-client/calculator-scaclient/pom.xml deleted file mode 100644 index d63a90c359..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/sca-client/calculator-scaclient/pom.xml +++ /dev/null @@ -1,69 +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-samples</artifactId>
- <version>2.0-SNAPSHOT</version>
- <relativePath>../../../pom.xml</relativePath>
- </parent>
-
- <artifactId>sample-sca-client-calculator</artifactId>
- <name>Apache Tuscany SCA Sample SCA Client Calculator</name>
-
- <dependencies>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-base-runtime</artifactId>
- <version>2.0-SNAPSHOT</version>
- </dependency>
-
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.8.1</version>
- <scope>test</scope>
- </dependency>
-
- </dependencies>
-
- <build>
- <finalName>${project.artifactId}</finalName>
- <plugins>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>exec-maven-plugin</artifactId>
- <version>1.1.1</version>
- <executions>
- <execution>
- <goals>
- <goal>java</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <mainClass>sample.CalculatorSCAClient</mainClass>
- </configuration>
- </plugin>
- </plugins>
- </build>
-</project>
diff --git a/sca-java-2.x/trunk/samples/learning-more/sca-client/calculator-scaclient/src/main/java/calculator/CalculatorService.java b/sca-java-2.x/trunk/samples/learning-more/sca-client/calculator-scaclient/src/main/java/calculator/CalculatorService.java deleted file mode 100644 index 12d80ffd1c..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/sca-client/calculator-scaclient/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/trunk/samples/learning-more/sca-client/calculator-scaclient/src/main/java/sample/CalculatorSCAClient.java b/sca-java-2.x/trunk/samples/learning-more/sca-client/calculator-scaclient/src/main/java/sample/CalculatorSCAClient.java deleted file mode 100644 index edbf528517..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/sca-client/calculator-scaclient/src/main/java/sample/CalculatorSCAClient.java +++ /dev/null @@ -1,53 +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 sample;
-
-import java.net.URI;
-
-import org.oasisopen.sca.NoSuchDomainException;
-import org.oasisopen.sca.NoSuchServiceException;
-import org.oasisopen.sca.client.SCAClientFactory;
-
-import calculator.CalculatorService;
-
-public class CalculatorSCAClient {
-
- public static void main(String[] args) throws NoSuchDomainException, NoSuchServiceException {
-
- String domainURI = "default";
- String name = "world";
-
- if (args.length == 2) {
- domainURI= args[0];
- name = args[1];
- } else if (args.length == 1) {
- domainURI= args[0];
- }
-
- System.out.println("using domain uri: " + domainURI);
- System.out.println("using name: " + name);
-
- SCAClientFactory factory = SCAClientFactory.newInstance(URI.create(domainURI));
- CalculatorService calculator = factory.getService(CalculatorService.class, "CalculatorServiceComponent");
-
- System.out.println("Calling CalculatorService.add(2, 3)");
- System.out.println(calculator.add(3, 2));
- }
-
-}
diff --git a/sca-java-2.x/trunk/samples/learning-more/sca-client/helloworld-scaclient/README b/sca-java-2.x/trunk/samples/learning-more/sca-client/helloworld-scaclient/README deleted file mode 100644 index 895716cd98..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/sca-client/helloworld-scaclient/README +++ /dev/null @@ -1,19 +0,0 @@ -Helloworld SCA Client
-=====================
-
-To run an application that uses the SCA client API to send messages to the
-Helloworld service running in the domain do the following
-
-First start one of the Helloworld based contributions. For example,
-
-cd samples/getting-started/helloworld-contribution
-follow the instructions in the README there
-
-Then run the the SCA client by doing the following:
-
-cd samples/learning-more/scaclient-helloworld
-mvn exec:java
-
-See http://tuscany.apache.org/documentation-2x/20-beta-samples-documentation.html
-for more information
-
diff --git a/sca-java-2.x/trunk/samples/learning-more/sca-client/helloworld-scaclient/pom.xml b/sca-java-2.x/trunk/samples/learning-more/sca-client/helloworld-scaclient/pom.xml deleted file mode 100644 index f891ee3e45..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/sca-client/helloworld-scaclient/pom.xml +++ /dev/null @@ -1,69 +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-samples</artifactId>
- <version>2.0-SNAPSHOT</version>
- <relativePath>../../../pom.xml</relativePath>
- </parent>
-
- <artifactId>sample-sca-client-helloworld</artifactId>
- <name>Apache Tuscany SCA Sample SCA Client Helloworld </name>
-
- <dependencies>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-base-runtime</artifactId>
- <version>2.0-SNAPSHOT</version>
- </dependency>
-
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.8.1</version>
- <scope>test</scope>
- </dependency>
-
- </dependencies>
-
- <build>
- <finalName>${project.artifactId}</finalName>
- <plugins>
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>exec-maven-plugin</artifactId>
- <version>1.1.1</version>
- <executions>
- <execution>
- <goals>
- <goal>java</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <mainClass>sample.HelloworldSCAClient</mainClass>
- </configuration>
- </plugin>
- </plugins>
- </build>
-</project>
diff --git a/sca-java-2.x/trunk/samples/learning-more/sca-client/helloworld-scaclient/src/main/java/sample/Helloworld.java b/sca-java-2.x/trunk/samples/learning-more/sca-client/helloworld-scaclient/src/main/java/sample/Helloworld.java deleted file mode 100644 index f4e8c50448..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/sca-client/helloworld-scaclient/src/main/java/sample/Helloworld.java +++ /dev/null @@ -1,28 +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 sample;
-
-import org.oasisopen.sca.annotation.Remotable;
-
-@Remotable
-public interface Helloworld {
-
- String sayHello(String name);
-
-}
diff --git a/sca-java-2.x/trunk/samples/learning-more/sca-client/helloworld-scaclient/src/main/java/sample/HelloworldSCAClient.java b/sca-java-2.x/trunk/samples/learning-more/sca-client/helloworld-scaclient/src/main/java/sample/HelloworldSCAClient.java deleted file mode 100644 index c2c9c4e44e..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/sca-client/helloworld-scaclient/src/main/java/sample/HelloworldSCAClient.java +++ /dev/null @@ -1,51 +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 sample;
-
-import java.net.URI;
-
-import org.oasisopen.sca.NoSuchDomainException;
-import org.oasisopen.sca.NoSuchServiceException;
-import org.oasisopen.sca.client.SCAClientFactory;
-
-public class HelloworldSCAClient {
-
- public static void main(String[] args) throws NoSuchDomainException, NoSuchServiceException {
-
- String domainURI = "default";
- String name = "world";
-
- if (args.length == 2) {
- domainURI= args[0];
- name = args[1];
- } else if (args.length == 1) {
- domainURI= args[0];
- }
-
- System.out.println("using domain uri: " + domainURI);
- System.out.println("using name: " + name);
-
- SCAClientFactory factory = SCAClientFactory.newInstance(URI.create(domainURI));
- Helloworld service = factory.getService(Helloworld.class, "HelloworldComponent");
-
- System.out.println("Calling HelloworldComponent.sayHello(\"" + name + "\")");
- System.out.println(service.sayHello(name));
- }
-
-}
diff --git a/sca-java-2.x/trunk/samples/learning-more/sca-client/helloworld-scaclient/src/test/java/sample/HelloworldTestCase.java b/sca-java-2.x/trunk/samples/learning-more/sca-client/helloworld-scaclient/src/test/java/sample/HelloworldTestCase.java deleted file mode 100644 index 13e08de692..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/sca-client/helloworld-scaclient/src/test/java/sample/HelloworldTestCase.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 sample;
-
-import static org.junit.Assert.assertEquals;
-
-import org.junit.Test;
-
-public class HelloworldTestCase {
-
- @Test
- public void testSayHello() {
- HelloworldSCAClient helloworld = new HelloworldSCAClient();
-// assertEquals("Hello Petra", helloworld.sayHello("Petra"));
- }
-
-}
diff --git a/sca-java-2.x/trunk/samples/learning-more/sca-client/pom.xml b/sca-java-2.x/trunk/samples/learning-more/sca-client/pom.xml deleted file mode 100644 index 5c125bead3..0000000000 --- a/sca-java-2.x/trunk/samples/learning-more/sca-client/pom.xml +++ /dev/null @@ -1,46 +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-samples-learning-more</artifactId> - <version>2.0-SNAPSHOT</version> - <relativePath>../pom.xml</relativePath> - </parent> - <groupId>org.apache.tuscany.sca</groupId> - <version>2.0-SNAPSHOT</version> - <artifactId>tuscany-samples-sca-client</artifactId> - <packaging>pom</packaging> - <name>Apache Tuscany SCA SCAClient Samples</name> - - <profiles> - <profile> - <id>default</id> - <activation> - <activeByDefault>true</activeByDefault> - </activation> - <modules> - <module>helloworld-scaclient</module> - <module>calculator-scaclient</module> - </modules> - </profile> - </profiles> -</project> |
