summaryrefslogtreecommitdiffstats
path: root/branches/sca-android/samples
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--branches/sca-android/samples/binding-notification-broker/README110
-rw-r--r--branches/sca-android/samples/binding-notification-broker/binding-notification-broker.pngbin36945 -> 0 bytes
-rw-r--r--branches/sca-android/samples/binding-notification-broker/build.xml75
-rw-r--r--branches/sca-android/samples/binding-notification-broker/pom.xml97
-rw-r--r--branches/sca-android/samples/binding-notification-broker/src/main/java/notification/broker/TestCaseProducer.java24
-rw-r--r--branches/sca-android/samples/binding-notification-broker/src/main/java/notification/broker/TrafficAdvisory.java30
-rw-r--r--branches/sca-android/samples/binding-notification-broker/src/main/java/notification/broker/TrafficAdvisoryConsumer.java41
-rw-r--r--branches/sca-android/samples/binding-notification-broker/src/main/java/notification/broker/TrafficAdvisoryProducer.java36
-rw-r--r--branches/sca-android/samples/binding-notification-broker/src/main/java/notification/broker/TrafficAdvisoryServer.java72
-rw-r--r--branches/sca-android/samples/binding-notification-broker/src/main/resources/TrafficAdvisoryNotification.componentType34
-rw-r--r--branches/sca-android/samples/binding-notification-broker/src/main/resources/TrafficAdvisoryNotification.composite61
-rw-r--r--branches/sca-android/samples/binding-notification-broker/src/main/resources/wsdl/TrafficAdvisory.wsdl50
-rw-r--r--branches/sca-android/samples/binding-notification-consumer/README102
-rw-r--r--branches/sca-android/samples/binding-notification-consumer/binding-notification-consumer.pngbin27279 -> 0 bytes
-rw-r--r--branches/sca-android/samples/binding-notification-consumer/build.xml75
-rw-r--r--branches/sca-android/samples/binding-notification-consumer/pom.xml115
-rw-r--r--branches/sca-android/samples/binding-notification-consumer/src/main/java/notification/consumer/TrafficAdvisory.java30
-rw-r--r--branches/sca-android/samples/binding-notification-consumer/src/main/java/notification/consumer/TrafficAdvisoryConsumer.java41
-rw-r--r--branches/sca-android/samples/binding-notification-consumer/src/main/java/notification/consumer/TrafficAdvisoryServer.java48
-rw-r--r--branches/sca-android/samples/binding-notification-consumer/src/main/resources/TrafficAdvisoryNotification.componentType34
-rw-r--r--branches/sca-android/samples/binding-notification-consumer/src/main/resources/TrafficAdvisoryNotification.composite53
-rw-r--r--branches/sca-android/samples/binding-notification-consumer/src/main/resources/wsdl/TrafficAdvisory.wsdl50
-rw-r--r--branches/sca-android/samples/binding-notification-consumer/src/test/java/notification/consumer/TrafficAdvisoryTestCase.java61
-rw-r--r--branches/sca-android/samples/binding-notification-producer/README131
-rw-r--r--branches/sca-android/samples/binding-notification-producer/binding-notification-producer.pngbin21631 -> 0 bytes
-rw-r--r--branches/sca-android/samples/binding-notification-producer/build.xml75
-rw-r--r--branches/sca-android/samples/binding-notification-producer/pom.xml126
-rw-r--r--branches/sca-android/samples/binding-notification-producer/src/main/java/notification/producer/TestCaseProducer.java24
-rw-r--r--branches/sca-android/samples/binding-notification-producer/src/main/java/notification/producer/TrafficAdvisory.java30
-rw-r--r--branches/sca-android/samples/binding-notification-producer/src/main/java/notification/producer/TrafficAdvisoryProducer.java36
-rw-r--r--branches/sca-android/samples/binding-notification-producer/src/main/java/notification/producer/TrafficAdvisoryServer.java57
-rw-r--r--branches/sca-android/samples/binding-notification-producer/src/main/resources/TrafficAdvisoryNotification.componentType34
-rw-r--r--branches/sca-android/samples/binding-notification-producer/src/main/resources/TrafficAdvisoryNotification.composite44
-rw-r--r--branches/sca-android/samples/binding-notification-producer/src/main/resources/wsdl/TrafficAdvisory.wsdl50
-rw-r--r--branches/sca-android/samples/binding-notification-producer/src/test/java/notification/producer/TrafficAdvisoryTestCase.java78
-rw-r--r--branches/sca-android/samples/chat-webapp/README61
-rw-r--r--branches/sca-android/samples/chat-webapp/chat-webapp.pngbin6552 -> 0 bytes
-rw-r--r--branches/sca-android/samples/chat-webapp/chat-webapp.svg187
-rw-r--r--branches/sca-android/samples/chat-webapp/pom.xml97
-rw-r--r--branches/sca-android/samples/chat-webapp/src/main/java/sample/ChatService.java26
-rw-r--r--branches/sca-android/samples/chat-webapp/src/main/java/sample/ChatServiceImpl.java36
-rw-r--r--branches/sca-android/samples/chat-webapp/src/main/resources/chat.composite40
-rw-r--r--branches/sca-android/samples/chat-webapp/src/main/webapp/META-INF/sca-contribution.xml24
-rw-r--r--branches/sca-android/samples/chat-webapp/src/main/webapp/WEB-INF/web.xml37
-rw-r--r--branches/sca-android/samples/chat-webapp/src/main/webapp/chat.html70
-rw-r--r--branches/sca-android/samples/chat2-webapp/README61
-rw-r--r--branches/sca-android/samples/chat2-webapp/build.xml117
-rw-r--r--branches/sca-android/samples/chat2-webapp/pom.xml104
-rw-r--r--branches/sca-android/samples/chat2-webapp/src/main/java/sample/ChatCallback.java27
-rw-r--r--branches/sca-android/samples/chat2-webapp/src/main/java/sample/ChatService.java32
-rw-r--r--branches/sca-android/samples/chat2-webapp/src/main/java/sample/ChatServiceImpl.java36
-rw-r--r--branches/sca-android/samples/chat2-webapp/src/main/resources/chat.composite40
-rw-r--r--branches/sca-android/samples/chat2-webapp/src/main/webapp/META-INF/sca-contribution.xml24
-rw-r--r--branches/sca-android/samples/chat2-webapp/src/main/webapp/WEB-INF/web.xml37
-rw-r--r--branches/sca-android/samples/chat2-webapp/src/main/webapp/chat.html73
-rw-r--r--branches/sca-android/samples/domain-webapp/README310
-rw-r--r--branches/sca-android/samples/domain-webapp/build.xml296
-rw-r--r--branches/sca-android/samples/domain-webapp/pom.xml101
-rw-r--r--branches/sca-android/samples/domain-webapp/src/main/java/node/DomainServer.java54
-rwxr-xr-xbranches/sca-android/samples/domain-webapp/src/main/resources/META-INF/sca-contribution.xml24
-rw-r--r--branches/sca-android/samples/domain-webapp/src/main/resources/domain.composite54
-rw-r--r--branches/sca-android/samples/domain-webapp/src/main/resources/webroot/index.html354
-rw-r--r--branches/sca-android/samples/domain-webapp/src/main/resources/webroot/node.pngbin689 -> 0 bytes
-rw-r--r--branches/sca-android/samples/domain-webapp/src/main/resources/webroot/style.css176
-rw-r--r--branches/sca-android/samples/helloworld-distributed/README28
-rw-r--r--branches/sca-android/samples/helloworld-distributed/helloworld-node/README28
-rw-r--r--branches/sca-android/samples/helloworld-distributed/helloworld-node/pom.xml71
-rw-r--r--branches/sca-android/samples/helloworld-distributed/helloworld-node/src/main/java/sample/Helloworld.java29
-rw-r--r--branches/sca-android/samples/helloworld-distributed/helloworld-node/src/main/java/sample/HelloworldImpl.java29
-rw-r--r--branches/sca-android/samples/helloworld-distributed/helloworld-node/src/main/java/sample/HelloworldNode.java40
-rw-r--r--branches/sca-android/samples/helloworld-distributed/helloworld-node/src/main/resources/Helloworld.composite28
-rw-r--r--branches/sca-android/samples/helloworld-distributed/helloworld-webapp/README28
-rw-r--r--branches/sca-android/samples/helloworld-distributed/helloworld-webapp/build.xml128
-rw-r--r--branches/sca-android/samples/helloworld-distributed/helloworld-webapp/pom.xml78
-rw-r--r--branches/sca-android/samples/helloworld-distributed/helloworld-webapp/src/main/java/sample/Helloworld.java27
-rw-r--r--branches/sca-android/samples/helloworld-distributed/helloworld-webapp/src/main/webapp/WEB-INF/web.composite29
-rw-r--r--branches/sca-android/samples/helloworld-distributed/helloworld-webapp/src/main/webapp/WEB-INF/web.xml41
-rw-r--r--branches/sca-android/samples/helloworld-distributed/helloworld-webapp/src/main/webapp/hello.jsp36
-rw-r--r--branches/sca-android/samples/helloworld-jsp/pom.xml54
-rw-r--r--branches/sca-android/samples/helloworld-jsp/src/main/java/sample/HelloworldService.java7
-rw-r--r--branches/sca-android/samples/helloworld-jsp/src/main/java/sample/HelloworldServiceImpl.java12
-rw-r--r--branches/sca-android/samples/helloworld-jsp/src/main/webapp/META-INF/sca-deployables/web.composite34
-rw-r--r--branches/sca-android/samples/helloworld-jsp/src/main/webapp/WEB-INF/web.xml42
-rw-r--r--branches/sca-android/samples/helloworld-jsp/src/main/webapp/hello.jsp36
-rw-r--r--branches/sca-android/samples/helloworld-servlet/pom.xml61
-rw-r--r--branches/sca-android/samples/helloworld-servlet/src/main/java/sample/HelloworldService.java7
-rw-r--r--branches/sca-android/samples/helloworld-servlet/src/main/java/sample/HelloworldServiceImpl.java12
-rw-r--r--branches/sca-android/samples/helloworld-servlet/src/main/java/sample/HelloworldServlet.java65
-rw-r--r--branches/sca-android/samples/helloworld-servlet/src/main/webapp/META-INF/sca-deployables/web.composite33
-rw-r--r--branches/sca-android/samples/helloworld-servlet/src/main/webapp/WEB-INF/web.xml52
-rw-r--r--branches/sca-android/samples/helloworld-servlet/src/main/webapp/hello.html46
-rw-r--r--branches/sca-android/samples/helloworld-web-callback/pom.xml68
-rw-r--r--branches/sca-android/samples/helloworld-web-callback/src/main/java/sample/HelloworldCallback.java30
-rw-r--r--branches/sca-android/samples/helloworld-web-callback/src/main/java/sample/HelloworldService.java14
-rw-r--r--branches/sca-android/samples/helloworld-web-callback/src/main/java/sample/HelloworldServiceImpl.java27
-rw-r--r--branches/sca-android/samples/helloworld-web-callback/src/main/webapp/META-INF/sca-deployables/web.composite45
-rw-r--r--branches/sca-android/samples/helloworld-web-callback/src/main/webapp/WEB-INF/web.xml42
-rw-r--r--branches/sca-android/samples/helloworld-web-callback/src/main/webapp/hello.html63
-rw-r--r--branches/sca-android/samples/helloworld-web/pom.xml68
-rw-r--r--branches/sca-android/samples/helloworld-web/src/main/java/sample/HelloworldService.java7
-rw-r--r--branches/sca-android/samples/helloworld-web/src/main/java/sample/HelloworldServiceImpl.java12
-rw-r--r--branches/sca-android/samples/helloworld-web/src/main/webapp/META-INF/sca-deployables/web.composite39
-rw-r--r--branches/sca-android/samples/helloworld-web/src/main/webapp/WEB-INF/web.xml42
-rw-r--r--branches/sca-android/samples/helloworld-web/src/main/webapp/hello.html62
-rw-r--r--branches/sca-android/samples/helloworld-ws-deep-webapp/README1
-rw-r--r--branches/sca-android/samples/helloworld-ws-deep-webapp/build.xml158
-rw-r--r--branches/sca-android/samples/helloworld-ws-deep-webapp/pom.xml45
-rw-r--r--branches/sca-android/samples/helloworld-ws-deep-webapp/src/main/java/helloworld/HelloWorldImpl.java33
-rw-r--r--branches/sca-android/samples/helloworld-ws-deep-webapp/src/main/java/helloworld/HelloWorldService.java30
-rw-r--r--branches/sca-android/samples/helloworld-ws-deep-webapp/src/main/resources/META-INF/sca-deployables/helloworldws.composite32
-rw-r--r--branches/sca-android/samples/helloworld-ws-deep-webapp/src/main/resources/wsdl/helloworld.wsdl79
-rw-r--r--branches/sca-android/samples/helloworld-ws-deep-webapp/src/main/webapp/WEB-INF/web.xml27
-rw-r--r--branches/sca-android/samples/implementation-notification/README93
-rw-r--r--branches/sca-android/samples/implementation-notification/build.xml72
-rw-r--r--branches/sca-android/samples/implementation-notification/implementation-notification.pngbin21543 -> 0 bytes
-rw-r--r--branches/sca-android/samples/implementation-notification/pom.xml75
-rw-r--r--branches/sca-android/samples/implementation-notification/src/main/java/notification/TestCaseProducer.java24
-rw-r--r--branches/sca-android/samples/implementation-notification/src/main/java/notification/TrafficAdvisory.java24
-rw-r--r--branches/sca-android/samples/implementation-notification/src/main/java/notification/TrafficAdvisoryClient.java45
-rw-r--r--branches/sca-android/samples/implementation-notification/src/main/java/notification/TrafficAdvisoryConsumer.java39
-rw-r--r--branches/sca-android/samples/implementation-notification/src/main/java/notification/TrafficAdvisoryProducer.java36
-rw-r--r--branches/sca-android/samples/implementation-notification/src/main/resources/TrafficAdvisoryNotification.componentType30
-rw-r--r--branches/sca-android/samples/implementation-notification/src/main/resources/TrafficAdvisoryNotification.composite50
-rw-r--r--branches/sca-android/samples/implementation-notification/src/test/java/notification/TrafficAdvisoryTestCase.java60
-rw-r--r--branches/sca-android/samples/implementation-notification/src/test/resources/TrafficAdvisoryNotification.componentType30
-rw-r--r--branches/sca-android/samples/implementation-notification/src/test/resources/TrafficAdvisoryNotification.composite50
-rw-r--r--branches/sca-android/samples/pom.xml30
-rw-r--r--branches/sca-android/samples/spi-implementation-pojo/pom.xml59
-rw-r--r--branches/sca-android/samples/spi-implementation-pojo/src/main/java/sample/JavaImplementation.java35
-rw-r--r--branches/sca-android/samples/spi-implementation-pojo/src/main/java/sample/JavaImplementationActivator.java37
-rw-r--r--branches/sca-android/samples/spi-implementation-pojo/src/main/java/sample/JavaInvoker.java59
-rw-r--r--branches/sca-android/samples/spi-implementation-pojo/src/main/java/sample/JavaInvokerFactory.java47
-rw-r--r--branches/sca-android/samples/spi-implementation-pojo/src/main/resources/META-INF/services/org.apache.tuscany.sca.spi.ImplementationActivator18
-rw-r--r--branches/sca-android/samples/spi-implementation-pojo/src/test/java/helloworld/HelloWorld.java26
-rw-r--r--branches/sca-android/samples/spi-implementation-pojo/src/test/java/helloworld/HelloWorldImpl.java28
-rw-r--r--branches/sca-android/samples/spi-implementation-pojo/src/test/java/helloworld/HelloWorldTestCase.java35
-rw-r--r--branches/sca-android/samples/spi-implementation-pojo/src/test/resources/helloworld/helloworld.composite28
137 files changed, 16 insertions, 7441 deletions
diff --git a/branches/sca-android/samples/binding-notification-broker/README b/branches/sca-android/samples/binding-notification-broker/README
deleted file mode 100644
index e47f12cb20..0000000000
--- a/branches/sca-android/samples/binding-notification-broker/README
+++ /dev/null
@@ -1,110 +0,0 @@
-Notification Broker Binding Sample
-==================================
-
-This sample illustrates the use of <binding.notification/> with a
-broker.
-
-The README in the samples directory (the directory above this) provides
-general instructions about building and running samples. Take a look there
-first.
-
-Sample Overview
----------------
-
-This sample illustrates the use of a notification broker that is located in a
-separate (and remote) composite with respect to any producers or consumers. As
-such, this sample is run in conjunction with the binding-notification-producer
-sample, the binding-notification-consumer sample, or both. Take a look at the
-composite file or the .svg file which shows the composite file in pictorial form.
-The composite service and composite reference each have a <binding.notification/>
-that handles the remote communication. This binding includes an 'ntm' attribute
-that refers to the notification type manager, which manages the connectivity of
-producers, consumers and brokers, and which (for this sample) is assumed to be
-running on http://localhost:8083. The ntm is a system component that is included in
-and runs as part of the binding-notification module.
-This sample also illustrates the use of a wsdl interface in the notification
-component's <implementation.notification/>. This allows messages sent and received
-via <binding.notification/> to be transported as literal xml over http.
-
-Building And Running The Sample Using Ant
------------------------------------------
-With the binary distribution the sample can be built and run using Ant as
-follows
-
-cd binding-notification-broker
-ant compile
-ant run
-
-You should see the following output from the run target.
-
-run:
- [java] Sep 14, 2007 11:14:24 AM org.apache.tuscany.sca.http.jetty.JettyServer addServletMapping
- [java] INFO: Added Servlet mapping: http://localhost:8083/ntm/trafficAdvisory
- [java] Sep 14, 2007 11:14:24 AM org.apache.tuscany.sca.http.jetty.JettyServer addServletMapping
- [java] INFO: Added Servlet mapping: http://localhost:8083/consumer/trafficAdvisory
- [java] Sep 14, 2007 11:14:24 AM org.apache.tuscany.sca.http.jetty.JettyServer addServletMapping
- [java] INFO: Added Servlet mapping: http://localhost:8083/producer/trafficAdvisory
-
-Building And Running The Sample Using Maven
--------------------------------------------
-
-With either the binary or source distributions the sample can be built and run
-using Maven as follows.
-
-cd binding-notification-broker
-mvn
-
-Sample Usage
-------------
-
-This sample is run using the tuscany binary distribution. To run it, first set the
-following environment variables:
-
-set TUSCANY_BIN_DISTRO=<Directory where the distro was extracted, e.g. \Devt\tuscany-sca-distr\tuscany-sca>
-set TUSCANY_SCA_MANIFEST_JAR=%TUSCANY_BIN_DISTRO%\lib\tuscany-sca-manifest.jar
-
-Then navigate to this sample directory and do:
-
-java -Dnotification.httpPort=8080 -cp "target\sample-binding-notification-broker.jar;%TUSCANY_SCA_MANIFEST_JAR%" notification.broker.TrafficAdvisoryServer
-
-this should bring up the following prompt:
-
-Send a report value, ^C or <end> to end
-
-at this point you should be able to type a message to send, for instance:
-
-Traffic congestion
-
-Notice that before you try to receive any message, you should bring up the
-consumer sample or another broker sample. When you have finished using this
-sample, type 'end' or ^C to end.
-
-Also notice that '-Dnotification.httpPort=8080' is used in the java command.
-This indicates the port the sample should use. This also says that this server
-is not going to play the role of ntm, given our previous assumption. It is important
-that the first one of the producer, consumer or broker sample that is run be the
-one that uses '-Dnotification.httpPort=8083', otherwise there is no ntm to talk
-to and an exception will be thrown.
-
-Sample directory structure:
----------------------------
-
-binding-notification-broker/
- src/
- main/
- java/
- notification.broker/
- TestCaseProducer.java - interface for the producer component
- TrafficAdvisory.java - remote interface referred to by the producer component
- and for the consumer component
- TrafficAdvisoryConsumer.java - implementation for the consumer components
- TrafficAdvisoryProducer.java - implementation for the producer component
- TrafficAdvisoryServer.java - server class including main entry point
- resources/
- wsdl/
- TrafficAdvisory.wsdl - remote interface for the notification component
- TrafficAdvisoryNotification.componentType - the component type referred to by
- <implementation.notification/>
- TrafficAdvisoryNotification.composite - the main composite including producer, consumer and
- notification components, and composite service and reference
- pom.xml - the Maven build file
diff --git a/branches/sca-android/samples/binding-notification-broker/binding-notification-broker.png b/branches/sca-android/samples/binding-notification-broker/binding-notification-broker.png
deleted file mode 100644
index 49030650f2..0000000000
--- a/branches/sca-android/samples/binding-notification-broker/binding-notification-broker.png
+++ /dev/null
Binary files differ
diff --git a/branches/sca-android/samples/binding-notification-broker/build.xml b/branches/sca-android/samples/binding-notification-broker/build.xml
deleted file mode 100644
index a042b9036a..0000000000
--- a/branches/sca-android/samples/binding-notification-broker/build.xml
+++ /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.
--->
-<project name="binding-notification-broker" default="compile">
- <property name="test.class" value="notification.broker.TrafficAdvisoryServer" />
- <property name="test.jar" value="sample-binding-notification-broker.jar" />
-
- <target name="init">
- <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">
- <classpath>
- <pathelement location="../../lib/tuscany-sca-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-classes">
- <java classname="${test.class}"
- fork="true">
- <classpath>
- <pathelement path="target/classes"/>
- <pathelement location="../../lib/tuscany-sca-manifest.jar"/>
- </classpath>
- <sysproperty key="notification.httpPort" value="8083"/>
- <arg value="end"/>
- </java>
- </target>
-
- <target name="run">
- <java classname="${test.class}"
- fork="true">
- <classpath>
- <pathelement path="target/${test.jar}"/>
- <pathelement location="../../lib/tuscany-sca-manifest.jar"/>
- </classpath>
- <sysproperty key="notification.httpPort" value="8083"/>
- </java>
- </target>
-
- <target name="clean">
- <delete quiet="true" includeemptydirs="true">
- <fileset dir="target"/>
- </delete>
- </target>
-</project>
diff --git a/branches/sca-android/samples/binding-notification-broker/pom.xml b/branches/sca-android/samples/binding-notification-broker/pom.xml
deleted file mode 100644
index 8043379003..0000000000
--- a/branches/sca-android/samples/binding-notification-broker/pom.xml
+++ /dev/null
@@ -1,97 +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-sca</artifactId>
- <version>1.4-SNAPSHOT</version>
- <relativePath>../../pom.xml</relativePath>
- </parent>
- <artifactId>sample-binding-notification-broker</artifactId>
- <name>Apache Tuscany SCA Notification Binding Broker Sample</name>
- <version>1.4-SNAPSHOT</version>
- <description>A sample illustrating use of binding.notification</description>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-implementation-notification</artifactId>
- <version>1.4-SNAPSHOT</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-binding-notification</artifactId>
- <version>1.4-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-databinding</artifactId>
- <version>1.4-SNAPSHOT</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-host-embedded</artifactId>
- <version>1.4-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-implementation-java-runtime</artifactId>
- <version>1.4-SNAPSHOT</version>
- <scope>runtime</scope>
- </dependency>
- <!-- test dependencies -->
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-interface-wsdl</artifactId>
- <version>1.4-SNAPSHOT</version>
- <scope>runtime</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-interface-wsdl-xml</artifactId>
- <version>1.4-SNAPSHOT</version>
- <scope>runtime</scope>
- </dependency>
- <!-- test dependencies -->
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.2</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- </plugin>
- </plugins>
- <defaultGoal>install</defaultGoal>
- </build>
-</project>
diff --git a/branches/sca-android/samples/binding-notification-broker/src/main/java/notification/broker/TestCaseProducer.java b/branches/sca-android/samples/binding-notification-broker/src/main/java/notification/broker/TestCaseProducer.java
deleted file mode 100644
index 35fa1a9ee9..0000000000
--- a/branches/sca-android/samples/binding-notification-broker/src/main/java/notification/broker/TestCaseProducer.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT 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 notification.broker;
-
-public interface TestCaseProducer {
-
- public void produceTrafficNotification(String report);
-}
diff --git a/branches/sca-android/samples/binding-notification-broker/src/main/java/notification/broker/TrafficAdvisory.java b/branches/sca-android/samples/binding-notification-broker/src/main/java/notification/broker/TrafficAdvisory.java
deleted file mode 100644
index d5bc8fbb50..0000000000
--- a/branches/sca-android/samples/binding-notification-broker/src/main/java/notification/broker/TrafficAdvisory.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 notification.broker;
-
-import org.osoa.sca.annotations.Remotable;
-
-/**
- * @version $Rev$ $Date$
- */
-@Remotable
-public interface TrafficAdvisory {
-
- void trafficNotification(String report);
-}
diff --git a/branches/sca-android/samples/binding-notification-broker/src/main/java/notification/broker/TrafficAdvisoryConsumer.java b/branches/sca-android/samples/binding-notification-broker/src/main/java/notification/broker/TrafficAdvisoryConsumer.java
deleted file mode 100644
index cd3befe076..0000000000
--- a/branches/sca-android/samples/binding-notification-broker/src/main/java/notification/broker/TrafficAdvisoryConsumer.java
+++ /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.
- */
-package notification.broker;
-
-import org.osoa.sca.annotations.AllowsPassByReference;
-import org.osoa.sca.annotations.Property;
-import org.osoa.sca.annotations.Scope;
-import org.osoa.sca.annotations.Service;
-
-/**
- * @version $Rev$ $Date$
- */
-@Service(TrafficAdvisory.class)
-@Scope("COMPOSITE")
-@AllowsPassByReference
-public class TrafficAdvisoryConsumer implements TrafficAdvisory {
-
- @Property
- protected String name;
-
- public void trafficNotification(String report) {
-
- System.out.println("Consumer [" + name + "] received report: " + report);
- }
-}
diff --git a/branches/sca-android/samples/binding-notification-broker/src/main/java/notification/broker/TrafficAdvisoryProducer.java b/branches/sca-android/samples/binding-notification-broker/src/main/java/notification/broker/TrafficAdvisoryProducer.java
deleted file mode 100644
index 8caefaf1d2..0000000000
--- a/branches/sca-android/samples/binding-notification-broker/src/main/java/notification/broker/TrafficAdvisoryProducer.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 notification.broker;
-
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Scope;
-import org.osoa.sca.annotations.Service;
-
-@Service(TestCaseProducer.class)
-@Scope("COMPOSITE")
-public class TrafficAdvisoryProducer implements TestCaseProducer {
-
- @Reference
- protected TrafficAdvisory destination;
-
- public void produceTrafficNotification(String report) {
-
- destination.trafficNotification(report);
- }
-}
diff --git a/branches/sca-android/samples/binding-notification-broker/src/main/java/notification/broker/TrafficAdvisoryServer.java b/branches/sca-android/samples/binding-notification-broker/src/main/java/notification/broker/TrafficAdvisoryServer.java
deleted file mode 100644
index b0f0d2a800..0000000000
--- a/branches/sca-android/samples/binding-notification-broker/src/main/java/notification/broker/TrafficAdvisoryServer.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 notification.broker;
-
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.net.URI;
-
-import org.apache.tuscany.sca.binding.notification.NotificationBindingProviderFactory;
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-
-/**
- * @version $Rev$ $Date$
- */
-public class TrafficAdvisoryServer {
-
- private static URI notificationType;
-
- public static void main(String[] args) {
- try {
- notificationType = new URI("trafficAdvisory");
- String compositeName = "TrafficAdvisoryNotification.composite";
- SCADomain domain = SCADomain.newInstance(compositeName);
- TestCaseProducer testCaseProducer = domain.getService(TestCaseProducer.class, "TrafficAdvisoryProducer");
-
- BufferedReader reader = new BufferedReader(new InputStreamReader(System.in));
- String value = "";
- if (args.length == 1) {
- value = args[0];
- }
- do {
- if(value == null || value.equals("end")) {
- break;
- }
- try {
- System.out.println("Send a report value, ^C or <end> to end");
- value = reader.readLine();
- } catch (IOException e) {
- e.printStackTrace();
- }
- if (value.equals("rb")) {
- NotificationBindingProviderFactory.removeBroker(notificationType);
- }
- else {
- testCaseProducer.produceTrafficNotification("Report value [" + value + "]");
- }
- }
- while(true);
-
- domain.close();
- } catch(Throwable e) {
- e.printStackTrace();
- }
- }
-}
diff --git a/branches/sca-android/samples/binding-notification-broker/src/main/resources/TrafficAdvisoryNotification.componentType b/branches/sca-android/samples/binding-notification-broker/src/main/resources/TrafficAdvisoryNotification.componentType
deleted file mode 100644
index 2dc70f8ed1..0000000000
--- a/branches/sca-android/samples/binding-notification-broker/src/main/resources/TrafficAdvisoryNotification.componentType
+++ /dev/null
@@ -1,34 +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://www.osoa.org/xmlns/sca/1.0" xmlns:wsdli="http://www.w3.org/2006/01/wsdl-instance">
- <service name="TrafficAdvisoryNotificationService">
- <interface.wsdl interface="http://example.com/TrafficAdvisory.wsdl#wsdl.interface(TrafficAdvisoryPortType)"
- wsdli:wsdlLocation="http://example.com/TrafficAdvisory.wsdl wsdl/TrafficAdvisory.wsdl">
- </interface.wsdl>
- </service>
-
- <reference name="TrafficAdvisoryNotificationReference"
- multiplicity="0..n">
- <interface.wsdl interface="http://example.com/TrafficAdvisory.wsdl#wsdl.interface(TrafficAdvisoryPortType)"
- wsdli:wsdlLocation="http://example.com/TrafficAdvisory.wsdl wsdl/TrafficAdvisory.wsdl">
- </interface.wsdl>
- </reference>
-</componentType>
diff --git a/branches/sca-android/samples/binding-notification-broker/src/main/resources/TrafficAdvisoryNotification.composite b/branches/sca-android/samples/binding-notification-broker/src/main/resources/TrafficAdvisoryNotification.composite
deleted file mode 100644
index f490c34ea6..0000000000
--- a/branches/sca-android/samples/binding-notification-broker/src/main/resources/TrafficAdvisoryNotification.composite
+++ /dev/null
@@ -1,61 +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.
--->
-
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
- xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"
- targetNamespace="http://tuscany.apache.org/xmlns/notification/1.0/samples"
- xmlns:wsdli="http://www.w3.org/2006/01/wsdl-instance"
- name="TrafficAdvisoryNotificationBrokerComposite">
-
- <service name="TrafficAdvisoryNotificationCompositeService"
- promote="TrafficAdvisoryNotificationComponent/TrafficAdvisoryNotificationService">
- <interface.wsdl interface="http://example.com/TrafficAdvisory.wsdl#wsdl.interface(TrafficAdvisoryPortType)"
- wsdli:wsdlLocation="http://example.com/TrafficAdvisory.wsdl wsdl/TrafficAdvisory.wsdl">
- </interface.wsdl>
- <tuscany:binding.notification ntm="http://localhost:8083/ntm" notificationType="trafficAdvisory"/>
- </service>
-
- <component name="TrafficAdvisoryProducer">
- <implementation.java class="notification.broker.TrafficAdvisoryProducer"/>
- <reference name="destination" target="TrafficAdvisoryNotificationComponent"/>
- </component>
-
- <component name="TrafficAdvisoryNotificationComponent">
- <tuscany:implementation.notification name="TrafficAdvisoryNotification"/>
- <!-- Never use > 1 reference elements here !! -->
- <reference name="TrafficAdvisoryNotificationReference"
- multiplicity="0..n"
- target="TrafficAdvisoryConsumer1"/>
- </component>
-
- <component name="TrafficAdvisoryConsumer1">
- <implementation.java class="notification.broker.TrafficAdvisoryConsumer"/>
- <property name="name">Consumer1</property>
- </component>
-
- <reference name="TrafficAdvisoryNotificationCompositeReference"
- promote="TrafficAdvisoryNotificationComponent/TrafficAdvisoryNotificationReference">
- <interface.wsdl interface="http://example.com/TrafficAdvisory.wsdl#wsdl.interface(TrafficAdvisoryPortType)"
- wsdli:wsdlLocation="http://example.com/TrafficAdvisory.wsdl wsdl/TrafficAdvisory.wsdl">
- </interface.wsdl>
- <tuscany:binding.notification ntm="http://localhost:8083/ntm" notificationType="trafficAdvisory"/>
- </reference>
-
-</composite>
diff --git a/branches/sca-android/samples/binding-notification-broker/src/main/resources/wsdl/TrafficAdvisory.wsdl b/branches/sca-android/samples/binding-notification-broker/src/main/resources/wsdl/TrafficAdvisory.wsdl
deleted file mode 100644
index b823bbebcc..0000000000
--- a/branches/sca-android/samples/binding-notification-broker/src/main/resources/wsdl/TrafficAdvisory.wsdl
+++ /dev/null
@@ -1,50 +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.
--->
-<definitions name="TrafficAdvisory"
- targetNamespace="http://example.com/TrafficAdvisory.wsdl"
- xmlns:tns="http://example.com/TrafficAdvisory.wsdl"
- xmlns:xsd1="http://example.com/TrafficAdvisory.xsd"
- xmlns="http://schemas.xmlsoap.org/wsdl/">
-
- <types>
- <schema targetNamespace="http://example.com/TrafficAdvisory.xsd"
- xmlns:tns="http://example.com/TrafficAdvisory.xsd"
- xmlns="http://www.w3.org/2001/XMLSchema">
- <element name="trafficNotification">
- <complexType>
- <sequence>
- <element name="report" type="string" />
- </sequence>
- </complexType>
- </element>
- </schema>
- </types>
-
- <message name="TrafficNotificationInput">
- <part name="body" element="xsd1:trafficNotification" />
- </message>
-
- <portType name="TrafficAdvisoryPortType">
- <operation name="trafficNotification">
- <input message="tns:TrafficNotificationInput" />
- </operation>
- </portType>
-
-</definitions>
diff --git a/branches/sca-android/samples/binding-notification-consumer/README b/branches/sca-android/samples/binding-notification-consumer/README
deleted file mode 100644
index 0fdfa8461a..0000000000
--- a/branches/sca-android/samples/binding-notification-consumer/README
+++ /dev/null
@@ -1,102 +0,0 @@
-Notification Consumer Binding Sample
-===============================
-
-This sample illustrates the use of <binding.notification/> with a
-remote consumer.
-
-The README in the samples directory (the directory above this) provides
-general instructions about building and running samples. Take a look there
-first.
-
-Sample Overview
----------------
-
-This sample illustrates the use of a notification consumer that is located in a
-separate (and remote) composite with respect to any producers. As such, this sample
-is run in conjunction with the binding-notification-producer sample, the
-binding-notification-broker sample, or both. Take a look at the composite file
-or the .svg file which shows the composite file in pictorial form. The composite
-service, wired to the notification component, has a <binding.notification/>
-that handles the remote communication. This binding includes an 'ntm' attribute
-that refers to the notification type manager, which manages the connectivity of
-producers, consumers and brokers, and which (for this sample) is assumed to be
-running on http://localhost:8083. The ntm is a system component that is included in
-and runs as part of the binding-notification module.
-This sample also illustrates the use of a wsdl interface in the notification
-component's <implementation.notification/>. This allows messages sent and received
-via <binding.notification/> to be transported as literal xml over http.
-
-Building And Running The Sample Using Ant
------------------------------------------
-With the binary distribution the sample can be built and run using Ant as
-follows
-
-cd binding-notification-consumer
-ant compile
-ant run
-
-You should see the following output from the run target.
-
-run:
- [java] Sep 14, 2007 10:56:29 AM org.apache.tuscany.sca.http.jetty.JettyServer addServletMapping
- [java] INFO: Added Servlet mapping: http://localhost:8083/ntm/trafficAdvisory
- [java] Sep 14, 2007 10:56:29 AM org.apache.tuscany.sca.http.jetty.JettyServer addServletMapping
- [java] INFO: Added Servlet mapping: http://localhost:8083/consumer/trafficAdvisory
-
-Building And Running The Sample Using Maven
--------------------------------------------
-With either the binary or source distributions the sample can be built and run
-using Maven as follows.
-
-cd binding-notification-consumer
-mvn
-
-Sample Usage
-------------
-
-This sample is run using the tuscany binary distribution. To run it, first set the
-following environment variables:
-
-set TUSCANY_BIN_DISTRO=<Directory where the distro was extracted, e.g. \Devt\tuscany-sca-distr\tuscany-sca>
-set TUSCANY_SCA_MANIFEST_JAR=%TUSCANY_BIN_DISTRO%\lib\tuscany-sca-manifest.jar
-
-Then navigate to this sample directory and do:
-
-java -Dnotification.httpPort=8082 -cp "target\sample-binding-notification-consumer.jar;%TUSCANY_SCA_MANIFEST_JAR%" notification.consumer.TrafficAdvisoryServer
-
-this should bring up the following prompt:
-
-TrafficAdvisoryServer, hit return to end
-
-at this point you should be able to receive messages.
-
-Notice that before you try to receive any message, you should bring up the
-producer sample or the broker sample. When you have finished using this
-sample, hit return to end.
-
-Also notice that '-Dnotification.httpPort=8082' is used in the java command.
-This indicates the port the sample should use. This also says that this server
-is not going to play the role of ntm, given our previous assumption. It is important
-that the first one of the producer, consumer or broker sample that is run be the
-one that uses '-Dnotification.httpPort=8083', otherwise there is no ntm to talk
-to and an exception will be thrown.
-
-Sample directory structure:
----------------------------
-
-binding-notification-consumer/
- src/
- main/
- java/
- notification.consumer/
- TrafficAdvisory.java - remote interface referred to by the producer component
- TrafficAdvisoryConsumer.java - implementation for the consumer components
- TrafficAdvisoryServer.java - server class including main entry point
- resources/
- wsdl/
- TrafficAdvisory.wsdl - remote interface for the notification component
- TrafficAdvisoryNotification.componentType - the component type referred to by
- <implementation.notification/>
- TrafficAdvisoryNotification.composite - the main composite including producer and
- notification components, and composite reference
- pom.xml - the Maven build file
diff --git a/branches/sca-android/samples/binding-notification-consumer/binding-notification-consumer.png b/branches/sca-android/samples/binding-notification-consumer/binding-notification-consumer.png
deleted file mode 100644
index 33e1966c3e..0000000000
--- a/branches/sca-android/samples/binding-notification-consumer/binding-notification-consumer.png
+++ /dev/null
Binary files differ
diff --git a/branches/sca-android/samples/binding-notification-consumer/build.xml b/branches/sca-android/samples/binding-notification-consumer/build.xml
deleted file mode 100644
index f57fe1bb26..0000000000
--- a/branches/sca-android/samples/binding-notification-consumer/build.xml
+++ /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.
--->
-<project name="binding-notification-consumer" default="compile">
- <property name="test.class" value="notification.consumer.TrafficAdvisoryServer" />
- <property name="test.jar" value="sample-binding-notification-consumer.jar" />
-
- <target name="init">
- <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">
- <classpath>
- <pathelement location="../../lib/tuscany-sca-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-classes">
- <java classname="${test.class}"
- fork="true">
- <classpath>
- <pathelement path="target/classes"/>
- <pathelement location="../../lib/tuscany-sca-manifest.jar"/>
- </classpath>
- <sysproperty key="notification.httpPort" value="8083"/>
- <arg value="end"/>
- </java>
- </target>
-
- <target name="run">
- <java classname="${test.class}"
- fork="true">
- <classpath>
- <pathelement path="target/${test.jar}"/>
- <pathelement location="../../lib/tuscany-sca-manifest.jar"/>
- </classpath>
- <sysproperty key="notification.httpPort" value="8081"/>
- </java>
- </target>
-
- <target name="clean">
- <delete quiet="true" includeemptydirs="true">
- <fileset dir="target"/>
- </delete>
- </target>
-</project>
diff --git a/branches/sca-android/samples/binding-notification-consumer/pom.xml b/branches/sca-android/samples/binding-notification-consumer/pom.xml
deleted file mode 100644
index 5b1fc256f6..0000000000
--- a/branches/sca-android/samples/binding-notification-consumer/pom.xml
+++ /dev/null
@@ -1,115 +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-sca</artifactId>
- <version>1.4-SNAPSHOT</version>
- <relativePath>../../pom.xml</relativePath>
- </parent>
- <artifactId>sample-binding-notification-consumer</artifactId>
- <name>Apache Tuscany SCA Notification Binding Consumer Sample</name>
- <version>1.4-SNAPSHOT</version>
- <description>A sample illustrating use of binding.notification</description>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-implementation-notification</artifactId>
- <version>1.4-SNAPSHOT</version>
- <scope>runtime</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-binding-notification</artifactId>
- <version>1.4-SNAPSHOT</version>
- <scope>runtime</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-host-embedded</artifactId>
- <version>1.4-SNAPSHOT</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-implementation-java-runtime</artifactId>
- <version>1.4-SNAPSHOT</version>
- <scope>runtime</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-interface-java-xml</artifactId>
- <version>1.4-SNAPSHOT</version>
- <scope>runtime</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-interface-wsdl-xml</artifactId>
- <version>1.4-SNAPSHOT</version>
- <scope>runtime</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-host-jetty</artifactId>
- <version>1.4-SNAPSHOT</version>
- <scope>runtime</scope>
- </dependency>
-
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.2</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <systemProperties>
- <property>
- <name>notification.httpPort</name>
- <value>8083</value>
- </property>
- </systemProperties>
- </configuration>
- </plugin>
- </plugins>
- <defaultGoal>install</defaultGoal>
- </build>
-</project>
diff --git a/branches/sca-android/samples/binding-notification-consumer/src/main/java/notification/consumer/TrafficAdvisory.java b/branches/sca-android/samples/binding-notification-consumer/src/main/java/notification/consumer/TrafficAdvisory.java
deleted file mode 100644
index 0efd1195bc..0000000000
--- a/branches/sca-android/samples/binding-notification-consumer/src/main/java/notification/consumer/TrafficAdvisory.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 notification.consumer;
-
-import org.osoa.sca.annotations.Remotable;
-
-/**
- * @version $Rev$ $Date$
- */
-@Remotable
-public interface TrafficAdvisory {
-
- void trafficNotification(String report);
-}
diff --git a/branches/sca-android/samples/binding-notification-consumer/src/main/java/notification/consumer/TrafficAdvisoryConsumer.java b/branches/sca-android/samples/binding-notification-consumer/src/main/java/notification/consumer/TrafficAdvisoryConsumer.java
deleted file mode 100644
index f6c27a2f55..0000000000
--- a/branches/sca-android/samples/binding-notification-consumer/src/main/java/notification/consumer/TrafficAdvisoryConsumer.java
+++ /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.
- */
-package notification.consumer;
-
-import org.osoa.sca.annotations.AllowsPassByReference;
-import org.osoa.sca.annotations.Property;
-import org.osoa.sca.annotations.Scope;
-import org.osoa.sca.annotations.Service;
-
-/**
- * @version $Rev$ $Date$
- */
-@Service(TrafficAdvisory.class)
-@Scope("COMPOSITE")
-@AllowsPassByReference
-public class TrafficAdvisoryConsumer implements TrafficAdvisory {
-
- @Property
- protected String name;
-
- public void trafficNotification(String report) {
-
- System.out.println("Consumer [" + name + "] received report: " + report);
- }
-}
diff --git a/branches/sca-android/samples/binding-notification-consumer/src/main/java/notification/consumer/TrafficAdvisoryServer.java b/branches/sca-android/samples/binding-notification-consumer/src/main/java/notification/consumer/TrafficAdvisoryServer.java
deleted file mode 100644
index c53adb1944..0000000000
--- a/branches/sca-android/samples/binding-notification-consumer/src/main/java/notification/consumer/TrafficAdvisoryServer.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 notification.consumer;
-
-import java.io.IOException;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-
-/**
- * @version $Rev$ $Date$
- */
-public class TrafficAdvisoryServer {
-
- public static void main(String[] args) {
- try {
- SCADomain domain = SCADomain.newInstance("TrafficAdvisoryNotification.composite");
-
- try {
- if (args.length != 1 || !args[0].equals("end")) {
- System.out.println("TrafficAdvisoryServer, hit return to end");
- System.in.read();
- }
- } catch (IOException e) {
- e.printStackTrace();
- }
-
- domain.close();
- } catch(Throwable e) {
- e.printStackTrace();
- }
- }
-}
diff --git a/branches/sca-android/samples/binding-notification-consumer/src/main/resources/TrafficAdvisoryNotification.componentType b/branches/sca-android/samples/binding-notification-consumer/src/main/resources/TrafficAdvisoryNotification.componentType
deleted file mode 100644
index 2dc70f8ed1..0000000000
--- a/branches/sca-android/samples/binding-notification-consumer/src/main/resources/TrafficAdvisoryNotification.componentType
+++ /dev/null
@@ -1,34 +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://www.osoa.org/xmlns/sca/1.0" xmlns:wsdli="http://www.w3.org/2006/01/wsdl-instance">
- <service name="TrafficAdvisoryNotificationService">
- <interface.wsdl interface="http://example.com/TrafficAdvisory.wsdl#wsdl.interface(TrafficAdvisoryPortType)"
- wsdli:wsdlLocation="http://example.com/TrafficAdvisory.wsdl wsdl/TrafficAdvisory.wsdl">
- </interface.wsdl>
- </service>
-
- <reference name="TrafficAdvisoryNotificationReference"
- multiplicity="0..n">
- <interface.wsdl interface="http://example.com/TrafficAdvisory.wsdl#wsdl.interface(TrafficAdvisoryPortType)"
- wsdli:wsdlLocation="http://example.com/TrafficAdvisory.wsdl wsdl/TrafficAdvisory.wsdl">
- </interface.wsdl>
- </reference>
-</componentType>
diff --git a/branches/sca-android/samples/binding-notification-consumer/src/main/resources/TrafficAdvisoryNotification.composite b/branches/sca-android/samples/binding-notification-consumer/src/main/resources/TrafficAdvisoryNotification.composite
deleted file mode 100644
index 8f9bcc4438..0000000000
--- a/branches/sca-android/samples/binding-notification-consumer/src/main/resources/TrafficAdvisoryNotification.composite
+++ /dev/null
@@ -1,53 +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.
--->
-
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
- xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"
- targetNamespace="http://tuscany.apache.org/xmlns/notification/1.0/samples"
- xmlns:wsdli="http://www.w3.org/2006/01/wsdl-instance"
- name="TrafficAdvisoryNotificationRemoteConsumerComposite">
-
- <service name="TrafficAdvisoryNotificationCompositeService"
- promote="TrafficAdvisoryNotificationComponent/TrafficAdvisoryNotificationService">
- <interface.wsdl interface="http://example.com/TrafficAdvisory.wsdl#wsdl.interface(TrafficAdvisoryPortType)"
- wsdli:wsdlLocation="http://example.com/TrafficAdvisory.wsdl wsdl/TrafficAdvisory.wsdl">
- </interface.wsdl>
- <tuscany:binding.notification ntm="http://localhost:8083/ntm" notificationType="http://example.com/trafficAdvisory"/>
- </service>
-
- <component name="TrafficAdvisoryNotificationComponent">
- <tuscany:implementation.notification name="TrafficAdvisoryNotification"/>
- <!-- Never use > 1 reference elements here !! -->
- <reference name="TrafficAdvisoryNotificationReference"
- multiplicity="0..n"
- target="TrafficAdvisoryConsumer1 TrafficAdvisoryConsumer2"/>
- </component>
-
- <component name="TrafficAdvisoryConsumer1">
- <implementation.java class="notification.consumer.TrafficAdvisoryConsumer"/>
- <property name="name">Consumer1</property>
- </component>
-
- <component name="TrafficAdvisoryConsumer2">
- <implementation.java class="notification.consumer.TrafficAdvisoryConsumer"/>
- <property name="name">Consumer2</property>
- </component>
-
-</composite>
diff --git a/branches/sca-android/samples/binding-notification-consumer/src/main/resources/wsdl/TrafficAdvisory.wsdl b/branches/sca-android/samples/binding-notification-consumer/src/main/resources/wsdl/TrafficAdvisory.wsdl
deleted file mode 100644
index b823bbebcc..0000000000
--- a/branches/sca-android/samples/binding-notification-consumer/src/main/resources/wsdl/TrafficAdvisory.wsdl
+++ /dev/null
@@ -1,50 +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.
--->
-<definitions name="TrafficAdvisory"
- targetNamespace="http://example.com/TrafficAdvisory.wsdl"
- xmlns:tns="http://example.com/TrafficAdvisory.wsdl"
- xmlns:xsd1="http://example.com/TrafficAdvisory.xsd"
- xmlns="http://schemas.xmlsoap.org/wsdl/">
-
- <types>
- <schema targetNamespace="http://example.com/TrafficAdvisory.xsd"
- xmlns:tns="http://example.com/TrafficAdvisory.xsd"
- xmlns="http://www.w3.org/2001/XMLSchema">
- <element name="trafficNotification">
- <complexType>
- <sequence>
- <element name="report" type="string" />
- </sequence>
- </complexType>
- </element>
- </schema>
- </types>
-
- <message name="TrafficNotificationInput">
- <part name="body" element="xsd1:trafficNotification" />
- </message>
-
- <portType name="TrafficAdvisoryPortType">
- <operation name="trafficNotification">
- <input message="tns:TrafficNotificationInput" />
- </operation>
- </portType>
-
-</definitions>
diff --git a/branches/sca-android/samples/binding-notification-consumer/src/test/java/notification/consumer/TrafficAdvisoryTestCase.java b/branches/sca-android/samples/binding-notification-consumer/src/test/java/notification/consumer/TrafficAdvisoryTestCase.java
deleted file mode 100644
index c5318f405c..0000000000
--- a/branches/sca-android/samples/binding-notification-consumer/src/test/java/notification/consumer/TrafficAdvisoryTestCase.java
+++ /dev/null
@@ -1,61 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT 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 notification.consumer;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-
-import junit.framework.TestCase;
-
-public class TrafficAdvisoryTestCase extends TestCase {
-
- private SCADomain domain;
-
- public void testTrafficAdvisoryNotification() throws Exception {
- System.out.println("Only instantiating and closing domain ...");
-
- /* Uncomment to test with producer
- try {
- System.out.println("TrafficAdvisoryServer, hit return to end");
- System.in.read();
- } catch (Exception e) {
- e.printStackTrace();
- }
- */
- }
-
- @Override
- protected void setUp() throws Exception {
- try {
- domain = SCADomain.newInstance("TrafficAdvisoryNotification.composite");
- } catch(Throwable e) {
- e.printStackTrace();
- if (e instanceof Exception) {
- throw (Exception)e;
- }
- else {
- throw new Exception(e);
- }
- }
- }
-
- @Override
- protected void tearDown() throws Exception {
- domain.close();
- }
-}
diff --git a/branches/sca-android/samples/binding-notification-producer/README b/branches/sca-android/samples/binding-notification-producer/README
deleted file mode 100644
index 58611f64bd..0000000000
--- a/branches/sca-android/samples/binding-notification-producer/README
+++ /dev/null
@@ -1,131 +0,0 @@
-Notification Producer Binding Sample
-===============================
-
-This sample illustrates the use of <binding.notification/> with a
-remote producer.
-
-The README in the samples directory (the directory above this) provides
-general instructions about building and running samples. Take a look there
-first.
-
-Sample Overview
----------------
-
-This sample illustrates the use of a notification producer that is located in a
-separate (and remote) composite with respect to any consumers. As such, this sample
-is run in conjunction with the binding-notification-consumer sample, the
-binding-notification-broker sample, or both. Take a look at the composite file
-or the .svg file which shows the composite file in pictorial form. The composite
-reference, referred to by the notification component, has a <binding.notification/>
-that handles the remote communication. This binding includes an 'ntm' attribute
-that refers to the notification type manager, which manages the connectivity of
-producers, consumers and brokers, and which (for this sample) is assumed to be
-running on http://localhost:8083. The ntm is a system component that is included in
-and runs as part of the binding-notification module.
-This sample also illustrates the use of a wsdl interface in the notification
-component's <implementation.notification/>. This allows messages sent and received
-via <binding.notification/> to be transported as literal xml over http.
-
-Building And Running The Sample Using Ant
------------------------------------------
-With the binary distribution the sample can be built and run using Ant as
-follows
-
-cd binding-notification-producer
-ant compile
-ant run
-
-You should see the following output from the run target.
-
-run:
- [java] Sep 14, 2007 10:31:45 AM org.apache.tuscany.sca.http.jetty.JettyServer addServletMapping
- [java] INFO: Added Servlet mapping: http://localhost:8083/ntm/trafficAdvisory
- [java] Sep 14, 2007 10:31:45 AM org.apache.tuscany.sca.http.jetty.JettyServer addServletMapping
- [java] INFO: Added Servlet mapping: http://localhost:8083/producer/trafficAdvisory
-
-Building And Running The Sample Using Maven
--------------------------------------------
-With either the binary or source distributions the sample can be built and run
-using Maven as follows.
-
-cd binding-notification-producer
-mvn
-
-You should see the following output from the test phase.
-
--------------------------------------------------------
- T E S T S
--------------------------------------------------------
-Running notification.producer.TrafficAdvisoryTestCase
-Only instantiating and closing domain ...
-Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 1.252 sec
-
-Results :
-
-Tests run: 1, Failures: 0, Errors: 0, Skipped: 0
-
-This shows that the Junit test cases have run successfully.
-
-Sample Usage
-------------
-
-This sample is run using the tuscany binary distribution. To run it, first set the
-following environment variables:
-
-set TUSCANY_BIN_DISTRO=<Directory where the distro was extracted, e.g. \Devt\tuscany-sca-distr\tuscany-sca>
-set TUSCANY_SCA_MANIFEST_JAR=%TUSCANY_BIN_DISTRO%\lib\tuscany-sca-manifest.jar
-
-Then navigate to this sample directory and do:
-
-java -Dnotification.httpPort=8083 -cp "target\sample-binding-notification-producer.jar;%TUSCANY_SCA_MANIFEST_JAR%" notification.producer.TrafficAdvisoryServer
-
-this should bring up the following prompt:
-
-Send a report value, ^C or <end> to end
-
-at this point you should be able to type a message to send, for instance:
-
-Traffic congestion
-
-Notice that before you try to send any message, you should bring up the
-consumer sample or the broker sample. When you have finished using this
-sample, type 'end' or ^C to end.
-
-Also notice that '-Dnotification.httpPort=8083' is used in the java command.
-This indicates the port the sample should use. This also says that this server
-is going to play the role of ntm, given our previous assumption. It is important
-that the first one of the producer, consumer or broker sample that is run be the
-one that uses '-Dnotification.httpPort=8083', otherwise there is no ntm to talk
-to and an exception will be thrown.
-
-Sample directory structure:
----------------------------
-
-binding-notification-producer/
- src/
- main/
- java/
- notification.producer/
- TestCaseProducer.java - interface for the producer component
- TrafficAdvisory.java - remote interface referred to by the producer component
- TrafficAdvisoryProducer.java - implementation for the producer component
- TrafficAdvisoryServer.java - server class including main entry point
- resources/
- wsdl/
- TrafficAdvisory.wsdl - remote interface for the notification component
- TrafficAdvisoryNotification.componentType - the component type referred to by
- <implementation.notification/>
- TrafficAdvisoryNotification.composite - the main composite including producer and
- notification components, and composite reference
- test/
- java/
- notification.producer/
- TrafficAdvisoryTestCase.java - JUnit test case
- resources/
- wsdl/
- TrafficAdvisory.wsdl - remote interface for the notification component
- TrafficAdvisoryNotification.componentType - the component type referred to by
- <implementation.notification/>
- TrafficAdvisoryNotification.composite - the main composite including producer and
- notification components, and composite reference
- pom.xml - the Maven build file
diff --git a/branches/sca-android/samples/binding-notification-producer/binding-notification-producer.png b/branches/sca-android/samples/binding-notification-producer/binding-notification-producer.png
deleted file mode 100644
index 34c347c893..0000000000
--- a/branches/sca-android/samples/binding-notification-producer/binding-notification-producer.png
+++ /dev/null
Binary files differ
diff --git a/branches/sca-android/samples/binding-notification-producer/build.xml b/branches/sca-android/samples/binding-notification-producer/build.xml
deleted file mode 100644
index d13e4c8a6c..0000000000
--- a/branches/sca-android/samples/binding-notification-producer/build.xml
+++ /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.
--->
-<project name="binding-notification-producer" default="compile">
- <property name="test.class" value="notification.producer.TrafficAdvisoryServer" />
- <property name="test.jar" value="sample-binding-notification-producer.jar" />
-
- <target name="init">
- <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">
- <classpath>
- <pathelement location="../../lib/tuscany-sca-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-classes">
- <java classname="${test.class}"
- fork="true">
- <classpath>
- <pathelement path="target/classes"/>
- <pathelement location="../../lib/tuscany-sca-manifest.jar"/>
- </classpath>
- <sysproperty key="notification.httpPort" value="8083"/>
- <arg value="end"/>
- </java>
- </target>
-
- <target name="run">
- <java classname="${test.class}"
- fork="true">
- <classpath>
- <pathelement path="target/${test.jar}"/>
- <pathelement location="../../lib/tuscany-sca-manifest.jar"/>
- </classpath>
- <sysproperty key="notification.httpPort" value="8082"/>
- </java>
- </target>
-
- <target name="clean">
- <delete quiet="true" includeemptydirs="true">
- <fileset dir="target"/>
- </delete>
- </target>
-</project>
diff --git a/branches/sca-android/samples/binding-notification-producer/pom.xml b/branches/sca-android/samples/binding-notification-producer/pom.xml
deleted file mode 100644
index a35fbb0339..0000000000
--- a/branches/sca-android/samples/binding-notification-producer/pom.xml
+++ /dev/null
@@ -1,126 +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-sca</artifactId>
- <version>1.4-SNAPSHOT</version>
- <relativePath>../../pom.xml</relativePath>
- </parent>
- <artifactId>sample-binding-notification-producer</artifactId>
- <name>Apache Tuscany SCA Notification Binding Producer Sample</name>
- <version>1.4-SNAPSHOT</version>
- <description>A sample illustrating use of binding.notification</description>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-implementation-notification</artifactId>
- <version>1.4-SNAPSHOT</version>
- <scope>runtime</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-binding-notification</artifactId>
- <version>1.4-SNAPSHOT</version>
- <scope>runtime</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-host-embedded</artifactId>
- <version>1.4-SNAPSHOT</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-implementation-java-runtime</artifactId>
- <version>1.4-SNAPSHOT</version>
- <scope>runtime</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-interface-wsdl-xml</artifactId>
- <version>1.4-SNAPSHOT</version>
- <scope>runtime</scope>
- </dependency>
-
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <version>2.5</version>
- <scope>provided</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-host-jetty</artifactId>
- <version>1.4-SNAPSHOT</version>
- <scope>runtime</scope>
- </dependency>
-
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.2</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <configuration>
- <archive>
- <manifest>
- <mainClass>org.apache.tuscany.notification.remoteProducer.TrafficAdvisoryServer</mainClass>
- </manifest>
- </archive>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <configuration>
- <systemProperties>
- <property>
- <name>notification.httpPort</name>
- <value>8083</value>
- </property>
- </systemProperties>
- </configuration>
- </plugin>
- </plugins>
- <defaultGoal>install</defaultGoal>
- </build>
-</project>
diff --git a/branches/sca-android/samples/binding-notification-producer/src/main/java/notification/producer/TestCaseProducer.java b/branches/sca-android/samples/binding-notification-producer/src/main/java/notification/producer/TestCaseProducer.java
deleted file mode 100644
index be80e71249..0000000000
--- a/branches/sca-android/samples/binding-notification-producer/src/main/java/notification/producer/TestCaseProducer.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT 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 notification.producer;
-
-public interface TestCaseProducer {
-
- public void produceTrafficNotification(String report);
-}
diff --git a/branches/sca-android/samples/binding-notification-producer/src/main/java/notification/producer/TrafficAdvisory.java b/branches/sca-android/samples/binding-notification-producer/src/main/java/notification/producer/TrafficAdvisory.java
deleted file mode 100644
index 39f06d5dde..0000000000
--- a/branches/sca-android/samples/binding-notification-producer/src/main/java/notification/producer/TrafficAdvisory.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 notification.producer;
-
-import org.osoa.sca.annotations.Remotable;
-
-/**
- * @version $Rev$ $Date$
- */
-@Remotable
-public interface TrafficAdvisory {
-
- void trafficNotification(String report);
-}
diff --git a/branches/sca-android/samples/binding-notification-producer/src/main/java/notification/producer/TrafficAdvisoryProducer.java b/branches/sca-android/samples/binding-notification-producer/src/main/java/notification/producer/TrafficAdvisoryProducer.java
deleted file mode 100644
index 7d49b00607..0000000000
--- a/branches/sca-android/samples/binding-notification-producer/src/main/java/notification/producer/TrafficAdvisoryProducer.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 notification.producer;
-
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Scope;
-import org.osoa.sca.annotations.Service;
-
-@Service(TestCaseProducer.class)
-@Scope("COMPOSITE")
-public class TrafficAdvisoryProducer implements TestCaseProducer {
-
- @Reference
- protected TrafficAdvisory destination;
-
- public void produceTrafficNotification(String report) {
-
- destination.trafficNotification(report);
- }
-}
diff --git a/branches/sca-android/samples/binding-notification-producer/src/main/java/notification/producer/TrafficAdvisoryServer.java b/branches/sca-android/samples/binding-notification-producer/src/main/java/notification/producer/TrafficAdvisoryServer.java
deleted file mode 100644
index efd3657dc3..0000000000
--- a/branches/sca-android/samples/binding-notification-producer/src/main/java/notification/producer/TrafficAdvisoryServer.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 notification.producer;
-
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStreamReader;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-
-public class TrafficAdvisoryServer {
-
- public static void main(String[] args) {
- try {
- SCADomain domain = SCADomain.newInstance("TrafficAdvisoryNotification.composite");
- TestCaseProducer testCaseProducer = domain.getService(TestCaseProducer.class, "TrafficAdvisoryProducer");
- BufferedReader reader = new BufferedReader(new InputStreamReader(System.in));
- String value = "";
- if (args.length == 1) {
- value = args[0];
- }
- do {
- if(value == null || value.equals("end")) {
- break;
- }
- try {
- System.out.println("Send a report value, ^C or <end> to end");
- value = reader.readLine();
- } catch (IOException e) {
- e.printStackTrace();
- }
- testCaseProducer.produceTrafficNotification("Report value [" + value + "]");
- }
- while(true);
-
- domain.close();
- } catch(Throwable e) {
- e.printStackTrace();
- }
- }
-}
diff --git a/branches/sca-android/samples/binding-notification-producer/src/main/resources/TrafficAdvisoryNotification.componentType b/branches/sca-android/samples/binding-notification-producer/src/main/resources/TrafficAdvisoryNotification.componentType
deleted file mode 100644
index 2dc70f8ed1..0000000000
--- a/branches/sca-android/samples/binding-notification-producer/src/main/resources/TrafficAdvisoryNotification.componentType
+++ /dev/null
@@ -1,34 +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://www.osoa.org/xmlns/sca/1.0" xmlns:wsdli="http://www.w3.org/2006/01/wsdl-instance">
- <service name="TrafficAdvisoryNotificationService">
- <interface.wsdl interface="http://example.com/TrafficAdvisory.wsdl#wsdl.interface(TrafficAdvisoryPortType)"
- wsdli:wsdlLocation="http://example.com/TrafficAdvisory.wsdl wsdl/TrafficAdvisory.wsdl">
- </interface.wsdl>
- </service>
-
- <reference name="TrafficAdvisoryNotificationReference"
- multiplicity="0..n">
- <interface.wsdl interface="http://example.com/TrafficAdvisory.wsdl#wsdl.interface(TrafficAdvisoryPortType)"
- wsdli:wsdlLocation="http://example.com/TrafficAdvisory.wsdl wsdl/TrafficAdvisory.wsdl">
- </interface.wsdl>
- </reference>
-</componentType>
diff --git a/branches/sca-android/samples/binding-notification-producer/src/main/resources/TrafficAdvisoryNotification.composite b/branches/sca-android/samples/binding-notification-producer/src/main/resources/TrafficAdvisoryNotification.composite
deleted file mode 100644
index 2db6ea655b..0000000000
--- a/branches/sca-android/samples/binding-notification-producer/src/main/resources/TrafficAdvisoryNotification.composite
+++ /dev/null
@@ -1,44 +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.
--->
-
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
- xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"
- targetNamespace="http://tuscany.apache.org/xmlns/notification/1.0/samples"
- xmlns:wsdli="http://www.w3.org/2006/01/wsdl-instance"
- name="TrafficAdvisoryNotificationRemoteProducerComposite">
-
- <component name="TrafficAdvisoryProducer">
- <implementation.java class="notification.producer.TrafficAdvisoryProducer"/>
- <reference name="destination" target="TrafficAdvisoryNotificationComponent"/>
- </component>
-
- <component name="TrafficAdvisoryNotificationComponent">
- <tuscany:implementation.notification name="TrafficAdvisoryNotification"/>
- </component>
-
- <reference name="TrafficAdvisoryNotificationCompositeReference"
- promote="TrafficAdvisoryNotificationComponent/TrafficAdvisoryNotificationReference">
- <interface.wsdl interface="http://example.com/TrafficAdvisory.wsdl#wsdl.interface(TrafficAdvisoryPortType)"
- wsdli:wsdlLocation="http://example.com/TrafficAdvisory.wsdl wsdl/TrafficAdvisory.wsdl">
- </interface.wsdl>
- <tuscany:binding.notification ntm="http://localhost:8083/ntm" notificationType="trafficAdvisory"/>
- </reference>
-
-</composite>
diff --git a/branches/sca-android/samples/binding-notification-producer/src/main/resources/wsdl/TrafficAdvisory.wsdl b/branches/sca-android/samples/binding-notification-producer/src/main/resources/wsdl/TrafficAdvisory.wsdl
deleted file mode 100644
index b823bbebcc..0000000000
--- a/branches/sca-android/samples/binding-notification-producer/src/main/resources/wsdl/TrafficAdvisory.wsdl
+++ /dev/null
@@ -1,50 +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.
--->
-<definitions name="TrafficAdvisory"
- targetNamespace="http://example.com/TrafficAdvisory.wsdl"
- xmlns:tns="http://example.com/TrafficAdvisory.wsdl"
- xmlns:xsd1="http://example.com/TrafficAdvisory.xsd"
- xmlns="http://schemas.xmlsoap.org/wsdl/">
-
- <types>
- <schema targetNamespace="http://example.com/TrafficAdvisory.xsd"
- xmlns:tns="http://example.com/TrafficAdvisory.xsd"
- xmlns="http://www.w3.org/2001/XMLSchema">
- <element name="trafficNotification">
- <complexType>
- <sequence>
- <element name="report" type="string" />
- </sequence>
- </complexType>
- </element>
- </schema>
- </types>
-
- <message name="TrafficNotificationInput">
- <part name="body" element="xsd1:trafficNotification" />
- </message>
-
- <portType name="TrafficAdvisoryPortType">
- <operation name="trafficNotification">
- <input message="tns:TrafficNotificationInput" />
- </operation>
- </portType>
-
-</definitions>
diff --git a/branches/sca-android/samples/binding-notification-producer/src/test/java/notification/producer/TrafficAdvisoryTestCase.java b/branches/sca-android/samples/binding-notification-producer/src/test/java/notification/producer/TrafficAdvisoryTestCase.java
deleted file mode 100644
index d3901ee407..0000000000
--- a/branches/sca-android/samples/binding-notification-producer/src/test/java/notification/producer/TrafficAdvisoryTestCase.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 notification.producer;
-
-import java.io.BufferedReader;
-import java.io.InputStreamReader;
-
-import notification.producer.TestCaseProducer;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-//import org.apache.tuscany.sca.notification.remoteProducer.TestCaseProducer;
-
-import junit.framework.TestCase;
-
-public class TrafficAdvisoryTestCase extends TestCase {
-
- private SCADomain domain;
-
- public void testTrafficAdvisoryNotification() throws Exception {
- System.out.println("Only instantiating and closing domain ...");
- TestCaseProducer testCaseProducer = domain.getService(TestCaseProducer.class, "TrafficAdvisoryProducer");
-
- /* Uncomment to test with consumer
- BufferedReader reader = new BufferedReader(new InputStreamReader(System.in));
- String value = "foo";
- do {
- try {
- System.out.println("Send a report value, ^C or <end> to end");
- value = reader.readLine();
- } catch (Exception e) {
- e.printStackTrace();
- }
- if(value == null || value.equals("end")) {
- break;
- }
- testCaseProducer.produceTrafficNotification("Report value [" + value + "]");
- value = "end";
- }
- while(true);
- */
- }
-
- @Override
- protected void setUp() throws Exception {
- try {
- domain = SCADomain.newInstance("TrafficAdvisoryNotification.composite");
- } catch(Throwable e) {
- e.printStackTrace();
- if (e instanceof Exception) {
- throw (Exception)e;
- }
- else {
- throw new Exception(e);
- }
- }
- }
-
- @Override
- protected void tearDown() throws Exception {
- domain.close();
- }
-}
diff --git a/branches/sca-android/samples/chat-webapp/README b/branches/sca-android/samples/chat-webapp/README
deleted file mode 100644
index dddd7e3f94..0000000000
--- a/branches/sca-android/samples/chat-webapp/README
+++ /dev/null
@@ -1,61 +0,0 @@
-Chat WebApp Sample
-==================
-This sample demonstrates the SCA DWR binding to implement the classic Ajax sample
-of a chat application which allows multiple users to chat from their browsers.
-
-The README in the samples directory (the directory 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/sample-chat-webapp.war)
-to your web application server.
-
-Once the web app is deployed use your browser to visit the following URL;
-
-http://localhost:8080/sample-chat-webapp
-
-The port and hostname will of course vary depending on your local installation.
-
-Sample Overview
----------------
-The sample provides an SCA component which has an SCA service using the SCA DWR
-binding and an SCA reference also using the DWR binding. The component implementation
-simply forwards every invocation of the service as an invocation on the reference. The
-component reference is scoped by the composite so every active client of the composite
-will receive every message sent to the component service, thus implementing the chat
-application with very little code.
-
-chat-webapp/
- src/
- main/
- java/
- sample/
- ChatService.java - service interface
- ChatServiceImpl.java - service implementation
- resources/
- chat.composite - the SCA assembly for this sample
- webapp
- chat.html - the html UserInterface for this application
- META-INF/
- sca-contribution.xml - specifies the composite to be deployed
- WEB-INF/
- web.xml - defines the listener that starts up the
- Tuscany SCA runtime
-
- pom.xml - the Maven build file
-
-Building And Running The Sample Using Maven
--------------------------------------------
-With either the binary or source distributions the sample can be built and run
-using Maven as follows.
-
-cd chat-webapp
-mvn
-
-Again this should result in a war file (sample-chat-webapp.war) in the target
-directory. Follow the steps described in the previous section for running the web
-app and for the expected results.
-
-
diff --git a/branches/sca-android/samples/chat-webapp/chat-webapp.png b/branches/sca-android/samples/chat-webapp/chat-webapp.png
deleted file mode 100644
index fdf540d243..0000000000
--- a/branches/sca-android/samples/chat-webapp/chat-webapp.png
+++ /dev/null
Binary files differ
diff --git a/branches/sca-android/samples/chat-webapp/chat-webapp.svg b/branches/sca-android/samples/chat-webapp/chat-webapp.svg
deleted file mode 100644
index b37c1dc590..0000000000
--- a/branches/sca-android/samples/chat-webapp/chat-webapp.svg
+++ /dev/null
@@ -1,187 +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:xlink="http://www.w3.org/1999/xlink"
- 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-head\sca\samples\chat-webapp"
- sodipodi:docname="chat-webapp.svg"
- version="1.0"
- inkscape:output_extension="org.inkscape.output.svg.inkscape"
- inkscape:export-filename="C:\simon\tuscany\java-head\sca\samples\chat-webapp\chat-webapp.png"
- inkscape:export-xdpi="52.84"
- inkscape:export-ydpi="52.84">
- <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="538.06165"
- inkscape:cy="485.93773"
- inkscape:document-units="px"
- inkscape:current-layer="g2997"
- inkscape:window-width="1467"
- inkscape:window-height="831"
- inkscape:window-x="116"
- inkscape:window-y="80" />
- <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">
- <rect
- rx="10.364296"
- ry="11.940332"
- y="196.8512"
- x="447.00812"
- height="282.22604"
- width="335.64374"
- id="rect2067"
- style="opacity:1;fill:#90baf4;fill-opacity:1;stroke:#060000;stroke-width:1.59621525;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" />
- <flowRoot
- id="flowRoot2954"
- xml:space="preserve"
- transform="translate(189.90868,1.0101522)"><flowRegion
- id="flowRegion2956"><rect
- y="212.66591"
- x="281.42856"
- height="61.42857"
- width="170"
- id="rect2958" /></flowRegion><flowPara
- id="flowPara2171">store</flowPara></flowRoot> <rect
- style="opacity:1;fill:#0064ff;fill-opacity:1;stroke:#000000;stroke-width:0.9612025;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
- id="rect2223"
- width="104.08451"
- height="113.17588"
- x="256.22867"
- y="297.25845"
- rx="0"
- ry="0.048917599" />
- <path
- style="fill:#1a73fe;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
- d="M 256.07143,409.80877 L 233.21428,426.95163 L 385.71428,426.95163 L 359.64285,410.16591 L 256.07143,409.80877 z "
- id="path3197" />
- <rect
- style="opacity:1;fill:#f1f4f8;fill-opacity:1;stroke:#000000;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
- id="rect3199"
- width="92.5"
- height="97.14286"
- x="261.42859"
- y="305.52304"
- ry="3.6203461"
- rx="3.9285715" />
- <flowRoot
- xml:space="preserve"
- id="flowRoot3364"
- transform="translate(-173.62276,-49.782291)"><flowRegion
- id="flowRegion3366"><rect
- id="rect3368"
- width="142.14285"
- height="21.428572"
- x="655"
- y="349.80878" /></flowRegion><flowPara
- id="flowPara3370">DWR</flowPara></flowRoot> <image
- y="306.6889"
- x="268.77594"
- id="image2297"
- height="89.285721"
- width="70"
- sodipodi:absref="C:\simon\tuscany\evangelism\whitepapers\chat.png"
- xlink:href="C:\simon\tuscany\evangelism\whitepapers\chat.png" />
- <path
- style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
- d="M 675,309.80877 L 696.42857,309.80877 L 696.42857,389.09448 L 335.71429,389.80877"
- id="path2302"
- sodipodi:nodetypes="cccc" />
- <path
- style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
- d="M 340,313.95163 C 530,313.95163 530,313.95163 530,313.95163"
- id="path2306" />
- <flowRoot
- xml:space="preserve"
- id="flowRoot2316"
- transform="translate(25.998466,-54.30712)"><flowRegion
- id="flowRegion2318"><rect
- id="rect2320"
- width="142.14285"
- height="21.428572"
- x="655"
- y="349.80878" /></flowRegion><flowPara
- id="flowPara2322">DWR</flowPara></flowRoot> </g>
- <rect
- style="fill:#317fed;fill-opacity:1;stroke:#060000;stroke-width:2;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1"
- id="rect2988"
- width="115.66247"
- height="85.862968"
- x="540.14038"
- y="268.41565"
- rx="6.9961648"
- ry="7.1230249" />
- <flowRoot
- xml:space="preserve"
- id="flowRoot2966"
- transform="translate(272.54962,62.477116)"><flowRegion
- id="flowRegion2968"><rect
- id="rect2970"
- width="170"
- height="61.42857"
- x="281.42856"
- y="212.66591" /></flowRegion><flowPara
- id="flowPara2972">Catalog</flowPara></flowRoot> <path
- style="fill:#5b9d05;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
- d="M 522.98989,300.26265 L 556.32493,300.26265 L 562.38584,313.39463 L 555.31478,325.51647 L 522.98989,325.51647 L 530.56604,313.39463 L 522.98989,300.26265 z "
- id="path3017" />
- <path
- style="fill:#ae62bf;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
- d="M 636.24233,298.42437 L 669.57737,298.42437 L 675.63828,311.55635 L 668.56722,323.67819 L 636.24233,323.67819 L 643.81848,311.55635 L 636.24233,298.42437 z "
- id="path3019" />
- </g>
-</svg>
diff --git a/branches/sca-android/samples/chat-webapp/pom.xml b/branches/sca-android/samples/chat-webapp/pom.xml
deleted file mode 100644
index 50be91f202..0000000000
--- a/branches/sca-android/samples/chat-webapp/pom.xml
+++ /dev/null
@@ -1,97 +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-sca</artifactId>
- <version>1.4-SNAPSHOT</version>
- <relativePath>../../pom.xml</relativePath>
- </parent>
- <artifactId>sample-chat-webapp</artifactId>
- <packaging>war</packaging>
- <name>Apache Tuscany SCA Chat Sample WebApp</name>
-
- <repositories>
- <repository>
- <id>apache.incubator</id>
- <url>http://people.apache.org/repo/m2-incubating-repository</url>
- </repository>
- </repositories>
-
- <dependencies>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-host-webapp</artifactId>
- <version>1.4-SNAPSHOT</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-binding-dwr</artifactId>
- <version>1.4-SNAPSHOT</version>
- <scope>runtime</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-implementation-java-runtime</artifactId>
- <version>1.4-SNAPSHOT</version>
- <scope>runtime</scope>
- </dependency>
-
- <!-- exclude stax 1.0.1 as we're also pulling in javax\xml\stream\stax-api\1.0-2 -->
- <dependency>
- <groupId>stax</groupId>
- <artifactId>stax-api</artifactId>
- <version>1.0.1</version>
- <scope>provided</scope>
- </dependency>
-
- <!-- marking dependency as provided to exclude from war file -->
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <version>2.3</version>
- <scope>provided</scope>
- </dependency>
-
- </dependencies>
-
- <build>
- <finalName>${artifactId}</finalName>
- <plugins>
- <plugin>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-maven-ant-generator</artifactId>
- <version>1.4-SNAPSHOT</version>
- <executions>
- <execution>
- <goals>
- <goal>generate</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-
-</project>
diff --git a/branches/sca-android/samples/chat-webapp/src/main/java/sample/ChatService.java b/branches/sca-android/samples/chat-webapp/src/main/java/sample/ChatService.java
deleted file mode 100644
index ca90b8f579..0000000000
--- a/branches/sca-android/samples/chat-webapp/src/main/java/sample/ChatService.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/**
- *
- * Copyright 2005 The Apache Software Foundation or its licensors, as applicable.
- *
- * 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.
- */
-package sample;
-
-import org.osoa.sca.annotations.Remotable;
-
-@Remotable
-public interface ChatService {
-
- public void chat(String msg);
-
-}
diff --git a/branches/sca-android/samples/chat-webapp/src/main/java/sample/ChatServiceImpl.java b/branches/sca-android/samples/chat-webapp/src/main/java/sample/ChatServiceImpl.java
deleted file mode 100644
index 7d0bfb3307..0000000000
--- a/branches/sca-android/samples/chat-webapp/src/main/java/sample/ChatServiceImpl.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 sample;
-
-import org.osoa.sca.annotations.Scope;
-
-@Scope("COMPOSITE")
-public class ChatServiceImpl implements ChatService {
-
- ChatService chatters;
-
- public void chat(String msg) {
- chatters.chat(msg);
- }
-
- public void setChatters(ChatService chatters) {
- this.chatters = chatters;
- }
-}
diff --git a/branches/sca-android/samples/chat-webapp/src/main/resources/chat.composite b/branches/sca-android/samples/chat-webapp/src/main/resources/chat.composite
deleted file mode 100644
index c9ce95e2dc..0000000000
--- a/branches/sca-android/samples/chat-webapp/src/main/resources/chat.composite
+++ /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.
--->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
- xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"
- targetNamespace="http://sample"
- xmlns:sample="http://sample"
- name="Chat">
-
- <service name="ChatService" promote="ChatComponent">
- <interface.java interface="sample.ChatService"/>
- <tuscany:binding.dwr/>
- </service>
-
- <component name="ChatComponent">
- <implementation.java class="sample.ChatServiceImpl"/>
- </component>
-
- <reference name="ChatReference" promote="ChatComponent/chatters">
- <interface.java interface="sample.ChatService" />
- <tuscany:binding.dwr/>
- </reference>
-
-</composite>
diff --git a/branches/sca-android/samples/chat-webapp/src/main/webapp/META-INF/sca-contribution.xml b/branches/sca-android/samples/chat-webapp/src/main/webapp/META-INF/sca-contribution.xml
deleted file mode 100644
index 897849ff8d..0000000000
--- a/branches/sca-android/samples/chat-webapp/src/main/webapp/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://www.osoa.org/xmlns/sca/1.0"
- targetNamespace="http://sample"
- xmlns:sample="http://sample">
- <deployable composite="sample:Chat"/>
-</contribution> \ No newline at end of file
diff --git a/branches/sca-android/samples/chat-webapp/src/main/webapp/WEB-INF/web.xml b/branches/sca-android/samples/chat-webapp/src/main/webapp/WEB-INF/web.xml
deleted file mode 100644
index 97d91fec56..0000000000
--- a/branches/sca-android/samples/chat-webapp/src/main/webapp/WEB-INF/web.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!--
- Copyright (c) 2005 The Apache Software Foundation or its licensors, as applicable.
-
- 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.
- -->
-
-<!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 AJAX/DWR Chat 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>
- <welcome-file>chat.html</welcome-file>
- </welcome-file-list>
-
-</web-app>
diff --git a/branches/sca-android/samples/chat-webapp/src/main/webapp/chat.html b/branches/sca-android/samples/chat-webapp/src/main/webapp/chat.html
deleted file mode 100644
index 7a449a906a..0000000000
--- a/branches/sca-android/samples/chat-webapp/src/main/webapp/chat.html
+++ /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.
--->
-<html>
- <head>
- <title>Apache Tuscany Ajax/DWR Chat Sample</TITLE>
-
- <script type="text/javascript" src="SCADomain/scaDomain.js"></script>
-
- <script language="JavaScript">
-
- function clickButton(e, buttonid){
- var evt = e ? e : window.event;
- var bt = document.getElementById(buttonid);
- if (bt){
- if (evt.keyCode == 13){
- bt.click();
- return false;
- }
- }
- }
-
- ChatReference.chat = function(msg) {
- var chatLog = document.getElementById('chatLog');
- chatLog.innerHTML = msg + '<br>' + chatLog.innerHTML;
- }
-
- function sendChat() {
- var chatText = document.getElementById("chatText");
- var nickName = document.getElementById("nickName").value;
- var msg = nickName + ": " + chatText.value
- chatText.value = "";
- chatText.focus();
- ChatService.chat(msg);
- }
- </script>
-
- </head>
- <body onLoad="scaDomain.open()">
-
- <h2>Apache Tuscany Ajax/DWR Chat Sample</h2>
-
- A simple client to chat between multiple web browsers:<br><br>
-
- Nickname: <input type="text" id="nickName" size="10"/>
- <br><br>
-
- Enter text: <input type="text" id="chatText" size="80" onkeypress="return clickButton(event,'Send')"/>
- <input type="button" name="Send" value="Send" id="Send" onclick="sendChat()" />
-
- <br><br>
- <div id="chatLog" style="overflow:auto; height:400px; border:1px solid"></div>
-
- </body>
-</html>
diff --git a/branches/sca-android/samples/chat2-webapp/README b/branches/sca-android/samples/chat2-webapp/README
deleted file mode 100644
index 0186006211..0000000000
--- a/branches/sca-android/samples/chat2-webapp/README
+++ /dev/null
@@ -1,61 +0,0 @@
-Chat WebApp Sample
-==================
-This sample demonstrates the SCA DWR binding to implement the classic Ajax sample
-of a chat application which allows multiple users to chat from their browsers.
-
-The README in the samples directory (the directory 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/sample-chat-webapp.war)
-to your web application server.
-
-Once the web app is deployed use your browser to visit the following URL;
-
-http://localhost:8080/sample-chat-webapp
-
-The port and hostname will of course vary depending on your local installation.
-
-Sample Overview
----------------
-The sample provides an SCA component which has an SCA service using the SCA DWR
-binding and an SCA reference also using the DWR binding. The component implementation
-simply forwards every invocation of the service as an invocation on the reference. The
-component reference is scoped by the composite so every active client of the composite
-will receive every message sent to the component service, thus implementing the chat
-application with very little code.
-
-chat-webapp/
- src/
- main/
- java/
- sample/
- ChatService.java - service interface
- ChatServiceImpl.java - service implementation
- resources/
- chat.composite - the SCA assembly for this sample
- webapp
- chat.html - the html UserInterface for this application
- META-INF/
- sca-contribution.xml - specifies the composite to be deployed
- WEB-INF/
- web.xml - defines the listener that starts up the
- Tuscany SCA runtime
-
- pom.xml - the Maven build file
-
-Building And Running The Sample Using Maven
--------------------------------------------
-With either the binary or source distributions the sample can be built and run
-using Maven as follows.
-
-cd chat-webapp
-mvn
-
-Again this should result in a war file (sample-chat-webapp.war) in the target
-directory. Follow the steps described in the previous section for running the web
-app and for the expected results.
-
-
diff --git a/branches/sca-android/samples/chat2-webapp/build.xml b/branches/sca-android/samples/chat2-webapp/build.xml
deleted file mode 100644
index 2d3fc0c5f3..0000000000
--- a/branches/sca-android/samples/chat2-webapp/build.xml
+++ /dev/null
@@ -1,117 +0,0 @@
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT 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-chat2-webapp" default="compile">
-
- <target name="compile">
- <mkdir dir="target/classes"/>
- <javac destdir="target/classes" debug="on" source="1.5" target="1.5">
- <src path="src\main\java"/>
- <classpath>
- <fileset refid="tuscany.jars"/>
- <fileset refid="3rdparty.jars"/>
- </classpath>
- </javac>
- <copy todir="target/classes">
- <fileset dir="src\main\resources"/>
- <fileset dir="." includes="*" excludes="src, target, pom.xml, build.xml"/>
- </copy>
- <war destfile="target/sample-chat2-webapp.war" webxml="src/main/webapp/WEB-INF/web.xml">
- <fileset dir="src/main/webapp"/>
- <lib refid="tuscany.jars"/>
- <lib refid="3rdparty.jars"/>
- <classes dir="target/classes"/>
- </war>
- </target>
-
- <target name="package" depends="compile"/>
-
- <target name="clean">
- <delete includeemptydirs="true">
- <fileset dir="target"/>
- </delete>
- </target>
-
- <fileset id="tuscany.jars" dir="../../modules">
- <include name="tuscany-assembly-1.4-SNAPSHOT.jar"/>
- <include name="tuscany-assembly-xml-1.4-SNAPSHOT.jar"/>
- <include name="tuscany-assembly-xsd-1.4-SNAPSHOT.jar"/>
- <include name="tuscany-binding-dwr-1.4-SNAPSHOT.jar"/>
- <include name="tuscany-binding-sca-1.4-SNAPSHOT.jar"/>
- <include name="tuscany-binding-sca-xml-1.4-SNAPSHOT.jar"/>
- <include name="tuscany-contribution-1.4-SNAPSHOT.jar"/>
- <include name="tuscany-contribution-impl-1.4-SNAPSHOT.jar"/>
- <include name="tuscany-contribution-java-1.4-SNAPSHOT.jar"/>
- <include name="tuscany-contribution-namespace-1.4-SNAPSHOT.jar"/>
- <include name="tuscany-contribution-resource-1.4-SNAPSHOT.jar"/>
- <include name="tuscany-contribution-xml-1.4-SNAPSHOT.jar"/>
- <include name="tuscany-core-1.4-SNAPSHOT.jar"/>
- <include name="tuscany-core-databinding-1.4-SNAPSHOT.jar"/>
- <include name="tuscany-core-spi-1.4-SNAPSHOT.jar"/>
- <include name="tuscany-databinding-1.4-SNAPSHOT.jar"/>
- <include name="tuscany-databinding-jaxb-1.4-SNAPSHOT.jar"/>
- <include name="tuscany-definitions-1.4-SNAPSHOT.jar"/>
- <include name="tuscany-definitions-xml-1.4-SNAPSHOT.jar"/>
- <include name="tuscany-domain-1.4-SNAPSHOT.jar"/>
- <include name="tuscany-domain-api-1.4-SNAPSHOT.jar"/>
- <include name="tuscany-extensibility-1.4-SNAPSHOT.jar"/>
- <include name="tuscany-extension-helper-1.4-SNAPSHOT.jar"/>
- <include name="tuscany-host-embedded-1.4-SNAPSHOT.jar"/>
- <include name="tuscany-host-http-1.4-SNAPSHOT.jar"/>
- <include name="tuscany-host-webapp-1.4-SNAPSHOT.jar"/>
- <include name="tuscany-implementation-java-1.4-SNAPSHOT.jar"/>
- <include name="tuscany-implementation-java-runtime-1.4-SNAPSHOT.jar"/>
- <include name="tuscany-implementation-java-xml-1.4-SNAPSHOT.jar"/>
- <include name="tuscany-implementation-web-1.4-SNAPSHOT.jar"/>
- <include name="tuscany-interface-1.4-SNAPSHOT.jar"/>
- <include name="tuscany-interface-java-1.4-SNAPSHOT.jar"/>
- <include name="tuscany-interface-java-jaxws-1.4-SNAPSHOT.jar"/>
- <include name="tuscany-interface-java-xml-1.4-SNAPSHOT.jar"/>
- <include name="tuscany-node-1.4-SNAPSHOT.jar"/>
- <include name="tuscany-node-api-1.4-SNAPSHOT.jar"/>
- <include name="tuscany-policy-1.4-SNAPSHOT.jar"/>
- <include name="tuscany-policy-xml-1.4-SNAPSHOT.jar"/>
- <include name="tuscany-sca-api-1.4-SNAPSHOT.jar"/>
- </fileset>
- <fileset id="3rdparty.jars" dir="../../lib">
- <include name="activation-1.1.jar"/>
- <include name="axiom-api-1.2.5.jar"/>
- <include name="axiom-impl-1.2.5.jar"/>
- <include name="cglib-nodep-2.1_3.jar"/>
- <include name="commons-logging-1.1.jar"/>
- <include name="dwr-2.0.1.jar"/>
- <include name="geronimo-commonj_1.1_spec-1.0.jar"/>
- <include name="jaxb-api-2.1.jar"/>
- <include name="jaxb-impl-2.1.6.jar"/>
- <include name="jaxb2-reflection-2.1.4.jar"/>
- <include name="jaxen-1.1-beta-9.jar"/>
- <include name="jaxws-api-2.1.jar"/>
- <include name="jsr181-api-1.0-MR1.jar"/>
- <include name="jsr250-api-1.0.jar"/>
- <include name="mail-1.4.jar"/>
- <include name="neethi-2.0.2.jar"/>
- <include name="saaj-api-1.3.jar"/>
- <include name="stax-api-1.0-2.jar"/>
- <include name="wstx-asl-3.2.1.jar"/>
- <include name="xalan-2.7.0.jar"/>
- <include name="xercesImpl-2.8.1.jar"/>
- <include name="xml-apis-1.3.03.jar"/>
- </fileset>
-
-</project>
diff --git a/branches/sca-android/samples/chat2-webapp/pom.xml b/branches/sca-android/samples/chat2-webapp/pom.xml
deleted file mode 100644
index c9def0ae48..0000000000
--- a/branches/sca-android/samples/chat2-webapp/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-sca</artifactId>
- <version>1.4-SNAPSHOT</version>
- <relativePath>../../pom.xml</relativePath>
- </parent>
- <artifactId>sample-chat2-webapp</artifactId>
- <packaging>war</packaging>
- <name>Apache Tuscany SCA Chat Sample WebApp using callbacks</name>
-
- <repositories>
- <repository>
- <id>apache.incubator</id>
- <url>http://people.apache.org/repo/m2-incubating-repository</url>
- </repository>
- </repositories>
-
- <dependencies>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-host-webapp</artifactId>
- <version>1.4-SNAPSHOT</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-binding-dwr</artifactId>
- <version>1.4-SNAPSHOT</version>
- <scope>runtime</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-implementation-web</artifactId>
- <version>1.4-SNAPSHOT</version>
- <scope>runtime</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-implementation-java-runtime</artifactId>
- <version>1.4-SNAPSHOT</version>
- <scope>runtime</scope>
- </dependency>
-
- <!-- exclude stax 1.0.1 as we're also pulling in javax\xml\stream\stax-api\1.0-2 -->
- <dependency>
- <groupId>stax</groupId>
- <artifactId>stax-api</artifactId>
- <version>1.0.1</version>
- <scope>provided</scope>
- </dependency>
-
- <!-- marking dependency as provided to exclude from war file -->
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <version>2.3</version>
- <scope>provided</scope>
- </dependency>
-
- </dependencies>
-
- <build>
- <finalName>${artifactId}</finalName>
- <plugins>
- <plugin>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-maven-ant-generator</artifactId>
- <version>1.4-SNAPSHOT</version>
- <executions>
- <execution>
- <goals>
- <goal>generate</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-
-</project>
diff --git a/branches/sca-android/samples/chat2-webapp/src/main/java/sample/ChatCallback.java b/branches/sca-android/samples/chat2-webapp/src/main/java/sample/ChatCallback.java
deleted file mode 100644
index 7d668052b2..0000000000
--- a/branches/sca-android/samples/chat2-webapp/src/main/java/sample/ChatCallback.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;
-
-import org.osoa.sca.annotations.Remotable;
-
-@Remotable
-public interface ChatCallback {
- void newMsg(String msg);
-}
diff --git a/branches/sca-android/samples/chat2-webapp/src/main/java/sample/ChatService.java b/branches/sca-android/samples/chat2-webapp/src/main/java/sample/ChatService.java
deleted file mode 100644
index cc9d00ca4a..0000000000
--- a/branches/sca-android/samples/chat2-webapp/src/main/java/sample/ChatService.java
+++ /dev/null
@@ -1,32 +0,0 @@
-/**
- *
- * Copyright 2005 The Apache Software Foundation or its licensors, as applicable.
- *
- * 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.
- */
-package sample;
-
-import javax.jws.Oneway;
-
-import org.osoa.sca.annotations.Callback;
-import org.osoa.sca.annotations.Remotable;
-import org.osoa.sca.annotations.Scope;
-
-@Remotable
-@Scope("COMPOSITE")
-@Callback(ChatCallback.class)
-public interface ChatService {
-
- @Oneway
- public void addMsg(String msg);
-}
diff --git a/branches/sca-android/samples/chat2-webapp/src/main/java/sample/ChatServiceImpl.java b/branches/sca-android/samples/chat2-webapp/src/main/java/sample/ChatServiceImpl.java
deleted file mode 100644
index d714ff82ed..0000000000
--- a/branches/sca-android/samples/chat2-webapp/src/main/java/sample/ChatServiceImpl.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 sample;
-
-import org.osoa.sca.annotations.Callback;
-
-public class ChatServiceImpl implements ChatService {
-
- ChatCallback chatCallback;
-
- @Callback
- public void setCallback(ChatCallback chatCallback) {
- this.chatCallback = chatCallback;
- }
-
- public void addMsg(String msg) {
- chatCallback.newMsg(msg);
- }
-}
diff --git a/branches/sca-android/samples/chat2-webapp/src/main/resources/chat.composite b/branches/sca-android/samples/chat2-webapp/src/main/resources/chat.composite
deleted file mode 100644
index 93a10d0fdf..0000000000
--- a/branches/sca-android/samples/chat2-webapp/src/main/resources/chat.composite
+++ /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.
--->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
- xmlns:t="http://tuscany.apache.org/xmlns/sca/1.0"
- targetNamespace="http://sample"
- xmlns:sample="http://sample"
- name="Chat">
-
- <component name="webapp">
- <t:implementation.web war="." />
- <reference name="ChatService" target="ChatService">
- <t:binding.dwr/>
- </reference>
- </component>
-
- <component name="ChatService">
- <implementation.java class="sample.ChatServiceImpl"/>
- <service name="ChatService">
- <t:binding.dwr/>
- </service>
- </component>
-
-</composite>
diff --git a/branches/sca-android/samples/chat2-webapp/src/main/webapp/META-INF/sca-contribution.xml b/branches/sca-android/samples/chat2-webapp/src/main/webapp/META-INF/sca-contribution.xml
deleted file mode 100644
index 897849ff8d..0000000000
--- a/branches/sca-android/samples/chat2-webapp/src/main/webapp/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://www.osoa.org/xmlns/sca/1.0"
- targetNamespace="http://sample"
- xmlns:sample="http://sample">
- <deployable composite="sample:Chat"/>
-</contribution> \ No newline at end of file
diff --git a/branches/sca-android/samples/chat2-webapp/src/main/webapp/WEB-INF/web.xml b/branches/sca-android/samples/chat2-webapp/src/main/webapp/WEB-INF/web.xml
deleted file mode 100644
index 6919372e87..0000000000
--- a/branches/sca-android/samples/chat2-webapp/src/main/webapp/WEB-INF/web.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!--
- Copyright (c) 2005 The Apache Software Foundation or its licensors, as applicable.
-
- 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.
- -->
-
-<!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 AJAX/DWR Chat 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>
- <welcome-file>chat.jsp</welcome-file>
- </welcome-file-list>
-
-</web-app>
diff --git a/branches/sca-android/samples/chat2-webapp/src/main/webapp/chat.html b/branches/sca-android/samples/chat2-webapp/src/main/webapp/chat.html
deleted file mode 100644
index a063e27f8e..0000000000
--- a/branches/sca-android/samples/chat2-webapp/src/main/webapp/chat.html
+++ /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.
--->
-<html>
- <head>
- <title>Apache Tuscany Ajax/DWR Chat Sample</TITLE>
-
- <script type="text/javascript" src="org.apache.tuscany.sca.componentContext.js" />
-
- <script language="JavaScript">
-
- var chatService = componentContext.getService("ChatService");
-
- chatService.callbacks.chatResponse = function(msg) {
- var chatLog = document.getElementById('chatLog');
- chatLog.innerHTML = msg + '<br>' + chatLog.innerHTML;
- }
-
- function sendChat() {
- var chatText = document.getElementById("chatText");
- var nickName = document.getElementById("nickName").value;
- var msg = nickName + ": " + chatText.value
- chatText.value = "";
- chatText.focus();
- ChatService.addMsg(msg);
- }
-
- function clickButton(e, buttonid){
- var evt = e ? e : window.event;
- var bt = document.getElementById(buttonid);
- if (bt){
- if (evt.keyCode == 13){
- bt.click();
- return false;
- }
- }
- }
-
- </script>
-
- </head>
- <body >
-
- <h2>Apache Tuscany Ajax/DWR Chat Sample</h2>
-
- A simple client to chat between multiple web browsers:<br><br>
-
- Nickname: <input type="text" id="nickName" size="10"/>
- <br><br>
-
- Enter text: <input type="text" id="chatText" size="80" onkeypress="return clickButton(event,'Send')"/>
- <input type="button" name="Send" value="Send" id="Send" onclick="sendChat()" />
-
- <br><br>
- <div id="chatLog" style="overflow:auto; height:400px; border:1px solid"></div>
-
- </body>
-</html>
diff --git a/branches/sca-android/samples/domain-webapp/README b/branches/sca-android/samples/domain-webapp/README
deleted file mode 100644
index c01a0dd39a..0000000000
--- a/branches/sca-android/samples/domain-webapp/README
+++ /dev/null
@@ -1,310 +0,0 @@
-Domain Webapp Sample
-====================
-
-Not actually a webapp just yet as webapp host need to use the new domain for it to work.
-If you run the DomainServer in a debugger you will get a server that provides a registry
-for servide URLs, listens for Nodes starting and stopping and provides a web page where
-you can see what nodes are registered and pull up their web pages.
-
-Use the nodes from the calculator-distributed to register with this domain
-
-
-==========================================
-Below copied from calculator sample as a template for when this gets done
-
-
-This sample implements a simple calculator using SCA components. It uses
-exactly the same calculator application classes as the calculator sample but
-runs the application distributed across three nodes.
-
-A node in this sample means an instance of the Tuscany SCA java runtime running
-in a Java virtual machine.
-
-The README in the samples directory (the directory above this) provides
-general instructions about building and running samples. Take a look there
-first.
-
-If you just want to run it to see what happens open four command prompts and
-navigate to this sample directory in each one. There is one command to be run
-in each command prompt:
-
-ant runDomainNode
-ant runNodeB
-ant runNodeC
-ant runNodeA
-
-Please run the commands in this order.
-
-OR if you don't have ant, on Windows use
-
-java -cp src\main\resources;..\..\lib\tuscany-sca-manifest.jar;target\sample-calculator-distributed.jar node.DomainNode
-java -cp src\main\resources;..\..\lib\tuscany-sca-manifest.jar;target\sample-calculator-distributed.jar node.CalculatorNode mydomain nodeB
-java -cp src\main\resources;..\..\lib\tuscany-sca-manifest.jar;target\sample-calculator-distributed.jar node.CalculatorNode mydomain nodeC
-java -cp src\main\resources;..\..\lib\tuscany-sca-manifest.jar;target\sample-calculator-distributed.jar node.CalculatorNode mydomain nodeA
-
-and on *nix do
-
-java -cp src/main/resources:../../lib/tuscany-sca-manifest.jar:target/sample-calculator-distributed.jar node.DomainNode
-java -cp src/main/resources:../../lib/tuscany-sca-manifest.jar:target/sample-calculator-distributed.jar node.CalculatorNode mydomain nodeB
-java -cp src/main/resources:../../lib/tuscany-sca-manifest.jar:target/sample-calculator-distributed.jar node.CalculatorNode mydomain nodeC
-java -cp src/main/resources:../../lib/tuscany-sca-manifest.jar:target/sample-calculator-distributed.jar node.CalculatorNode mydomain nodeA
-
-
-The processes started on each of these command prompts can be ended by pressing
-the <Enter> key.
-
-
-Sample Overview
----------------
-The sample provides a single calculator service with a default SCA (java)
-binding. NodeA exercises this interface by calling add, subtract, multiply and
-divide operations.
-
-In the case of add and subtract the runtime recognises that
-it can't find these services locally and, using the remote (web services)
-version of the default SCA binding contacts the add service running in NodeB
-and the subtract service running in NodeC.
-
-On the command prompt where you started NodeA, you would see output of invoking the
-calculator functions distributed over NodeB and and NodeC. On the command prompts
-where you have started NodeB and NodeC, you would see log messages that indicate that
-the add and substract services where called on these nodes respectively.
-
-The sample demonstrates that the calculator application can be distributed
-across multiple nodes with no change to the application or to the SCA description
-files.
-
-
-calculator/
- src/
- main/
- java/
- calculator/
- CalculatorService.java - the first component, calls +-/* as
- appropriate
- AddService.java - adds two numbers
- AddServiceImpl.java
- SubtractService.java - subtracts one number from another
- SubtractServiceImpl.java
- MultiplyService.java - multiplies two numbers
- MultiplyServiceImpl.java
- DivideService.java - divides one number by another
- DivideServiceImpl.java
- node/
- CalculatorNode.java - runs up an sca application based on
- configuration given on the command
- line in the form
-
- CalculatorNode <domain name> <node name>
-
- it looks for a directory name the same
- as <node name> and loads the composites
- there
-
- if <node name> = nodeA it calls the
- +-/* operations otherwise it behaves
- like a server and waits for service
- requests
- DomainNode.java - the node that provides the service
- discovery mechanism to the distributed
- domain
- resources/
- domain - the SCA assembly for the service discovery
- function
- management/ - the SCA assembly for each nodes management
- function
- nodeA - the SCA assembly for nodeA's part of the
- calculator application
- nodeB - the SCA assembly for nodeB's part of the
- calculator application
- nodeC - the SCA assembly for nodeB's part of the
- calculator application
- test/
- java/
- calculator/
- DomainInMemoryTestCase.java - JUnit test case which runs all of the
- separate ndes in a single VM for test
- purposes
- calculator-distributed.png - a pictorial representation of the sample
- .composite files
- build.xml - the Ant build file
- pom.xml - the Maven build file
-
-
-Building And Running The Sample Using Ant
------------------------------------------
-With the binary distribution the sample can be built and run using Ant as
-follows
-
-cd calculator-distributed
-ant compile
-ant runDomainNode
-ant runNodeB
-ant runNodeC
-ant runNodeA
-
-You should see the following output from the four separate command prompt:
-
-runDomainNode:
- [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] 23-Aug-2007 17:40:40 org.apache.tuscany.sca.http.jetty.JettyServer a
-ddServletMapping
- [java] INFO: Added Servlet mapping: http://localhost:8080/ServiceDiscoveryC
-omponent/ServiceDiscovery
- [java] Domain node started (press enter to shutdown)
- [java] Registering service: [mydomain nodeB AddServiceComponent org.apache.
-tuscany.sca.assembly.SCABinding http://localhost:8085/AddServiceComponent]
- [java] Registering service: [mydomain nodeC SubtractServiceComponent org.ap
-ache.tuscany.sca.assembly.SCABinding http://localhost:8086/SubtractServiceCompon
-ent]
- [java] Finding service: [mydomain SubtractServiceComponent org.apache.tusca
-ny.sca.assembly.SCABinding]
- [java] Matching service url: http://localhost:8086/SubtractServiceComponent
-
- [java] Finding service: [mydomain AddServiceComponent org.apache.tuscany.sc
-a.assembly.SCABinding]
- [java] Matching service url: http://localhost:8085/AddServiceComponent
- [java] Java Result: 1
-Terminate batch job (Y/N)? y
-
-
-
-runNodeB:
- [java] file:/C:/simon/tuscany/java-head/sca/samples/calculator-distributed/
-target/classes/management/
- [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] Registering service: [mydomain nodeB AddServiceComponent/ org.apache
-.tuscany.sca.assembly.SCABinding http://localhost:8085/AddServiceComponent]
- [java] 23-Aug-2007 17:41:25 org.apache.tuscany.sca.http.jetty.JettyServer a
-ddServletMapping
- [java] INFO: Added Servlet mapping: http://localhost:8085/AddServiceCompone
-nt
- [java] Node started (press enter to shutdown)
- [java] AddService - add 3.0 and 2.0
-
-
-runNodeC:
- [java] file:/C:/simon/tuscany/java-head/sca/samples/calculator-distributed/
-target/classes/management/
- [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] Registering service: [mydomain nodeC SubtractServiceComponent org.ap
-ache.tuscany.sca.assembly.SCABinding http://localhost:8086/SubtractServiceCompon
-ent]
- [java] 23-Aug-2007 17:41:51 org.apache.tuscany.sca.http.jetty.JettyServer a
-ddServletMapping
- [java] Node started (press enter to shutdown)
- [java] INFO: Added Servlet mapping: http://localhost:8086/SubtractServiceCo
-mponent
- [java] SubtractService - subtract 3.0 and 2.0
-Terminate batch job (Y/N)? y
-
-
-runNodeA:
- [java] file:/C:/simon/tuscany/java-head/sca/samples/calculator-distributed/
-target/classes/management/
- [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] 23-Aug-2007 17:42:12 org.apache.tuscany.sca.assembly.builder.impl.Co
-mpositeBuilderImpl$1 problem
- [java] WARNING: [WARNING] Component reference target not found, it might be
- a remote service: AddServiceComponent null
- [java]
- [java] 23-Aug-2007 17:42:12 org.apache.tuscany.sca.assembly.builder.impl.Co
-mpositeBuilderImpl$1 problem
- [java] WARNING: [WARNING] Component reference target not found, it might be
- a remote service: SubtractServiceComponent null
- [java]
- [java] Finding service: [mydomain SubtractServiceComponent org.apache.tusca
-ny.sca.assembly.SCABinding]
- [java] Finding service: [mydomain AddServiceComponent org.apache.tuscany.sc
-a.assembly.SCABinding]
- [java] CalculatorService - add 3.0 and 2.0
- [java] 3 + 2=5.0
- [java] CalculatorService - subtract 3.0 and 2.0
- [java] 3 - 2=1.0
- [java] CalculatorService - multiply 3.0 and 2.0
- [java] 3 * 2=6.0
- [java] CalculatorService - divide 3.0 and 2.0
- [java] 3 / 2=1.5
-
-
-Building And Running The Sample Using Maven
--------------------------------------------
-With either the binary or source distributions the sample can be built and run
-using Maven as follows. When running from Maven the four nodes all run within
-Java virtual machine.
-
-cd calculator-distributed
-mvn
-
-You should see the following output from the test phase.
-
--------------------------------------------------------
- T E S T S
--------------------------------------------------------
-Running calculator.DomainInMemoryTestCase
-Setting up distributed nodes
-file:/C:/simon/tuscany/java-head/sca/samples/calculator-distributed/target/class
-es/management/
-log4j:WARN No appenders could be found for logger (org.apache.axiom.om.util.StAX
-Utils).
-log4j:WARN Please initialize the log4j system properly.
-23-Aug-2007 18:18:41 org.apache.tuscany.sca.assembly.builder.impl.CompositeBuild
-erImpl$1 problem
-WARNING: [WARNING] Component reference target not found, it might be a remote se
-rvice: AddServiceComponent null
-
-23-Aug-2007 18:18:41 org.apache.tuscany.sca.assembly.builder.impl.CompositeBuild
-erImpl$1 problem
-WARNING: [WARNING] Component reference target not found, it might be a remote se
-rvice: SubtractServiceComponent null
-
-file:/C:/simon/tuscany/java-head/sca/samples/calculator-distributed/target/class
-es/management/
-Registering service: [mydomain nodeB AddServiceComponent org.apache.tuscany.sca.
-assembly.SCABinding http://localhost:8085/AddServiceComponent]
-file:/C:/simon/tuscany/java-head/sca/samples/calculator-distributed/target/class
-es/management/
-Registering service: [mydomain nodeC SubtractServiceComponent org.apache.tuscany
-.sca.assembly.SCABinding http://localhost:8086/SubtractServiceComponent]
-Finding service: [mydomain SubtractServiceComponent org.apache.tuscany.sca.assem
-bly.SCABinding]
-Matching service url: http://localhost:8086/SubtractServiceComponent
-Finding service: [mydomain AddServiceComponent org.apache.tuscany.sca.assembly.S
-CABinding]
-Matching service url: http://localhost:8085/AddServiceComponent
-23-Aug-2007 18:18:45 org.apache.tuscany.sca.http.jetty.JettyServer addServletMap
-ping
-INFO: Added Servlet mapping: http://localhost:8085/AddServiceComponent
-23-Aug-2007 18:18:47 org.apache.tuscany.sca.http.jetty.JettyServer addServletMap
-ping
-INFO: Added Servlet mapping: http://localhost:8086/SubtractServiceComponent
-CalculatorService - add 3.0 and 2.0
-AddService - add 3.0 and 2.0
-CalculatorService - subtract 3.0 and 2.0
-SubtractService - subtract 3.0 and 2.0
-CalculatorService - multiply 3.0 and 2.0
-CalculatorService - divide 3.0 and 2.0
-Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 7.14 sec
-
-Results :
-
-Tests run: 1, Failures: 0, Errors: 0, Skipped: 0
-
-
-This shows that the Junit test cases have run successfully.
-
-Known Bug :
----------
-The processes that are running NodeB and NodeC do not seem to end on pressing the
-<Enter>. This will be fixed for the next release. For this release you should use
-^C (Control C) to exit these processes.
-
-
diff --git a/branches/sca-android/samples/domain-webapp/build.xml b/branches/sca-android/samples/domain-webapp/build.xml
deleted file mode 100644
index e008e3c9f0..0000000000
--- a/branches/sca-android/samples/domain-webapp/build.xml
+++ /dev/null
@@ -1,296 +0,0 @@
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT 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="calculator" default="runDomainNode">
- <property name="node.class" value="node.CalculatorNode" />
- <property name="domain.class" value="node.DomainNode" />
- <property name="test.jar" value="sample-calculator-distributed.jar"
-/>
-
- <target name="init">
- <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">
- <classpath>
- <pathelement location="../../lib/tuscany-sca-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="runDomainNode">
- <java classname="${domain.class}"
- fork="true">
- <classpath>
- <pathelement path="src/main/resources"/>
- <pathelement path="target/classes"/>
- <pathelement path="target/${test.jar}"/>
- <pathelement location="../../lib/tuscany-sca-manifest.jar"/>
- </classpath>
- </java>
- </target>
-
- <target name="runNodeA">
- <java classname="${node.class}"
- fork="true">
- <classpath>
- <pathelement path="src/main/resources"/>
- <pathelement path="target/classes"/>
- <pathelement path="target/${test.jar}"/>
- <pathelement location="../../lib/tuscany-sca-manifest.jar"/>
- </classpath>
- <arg value="mydomain"/>
- <arg value="nodeA"/>
- </java>
- </target>
-
- <target name="runNodeB">
- <java classname="${node.class}"
- fork="true">
- <classpath>
- <pathelement path="src/main/resources"/>
- <pathelement path="target/classes"/>
- <pathelement path="target/${test.jar}"/>
- <pathelement location="../../lib/tuscany-sca-manifest.jar"/>
- </classpath>
- <arg value="mydomain"/>
- <arg value="nodeB"/>
- </java>
- </target>
-
- <target name="runNodeC">
- <java classname="${node.class}"
- fork="true">
- <classpath>
- <pathelement path="src/main/resources"/>
- <pathelement path="target/classes"/>
- <pathelement path="target/${test.jar}"/>
- <pathelement location="../../lib/tuscany-sca-manifest.jar"/>
- </classpath>
- <arg value="mydomain"/>
- <arg value="nodeC"/>
- </java>
- </target>
-
- <target name="clean">
- <delete quiet="true" includeemptydirs="true">
- <fileset dir="target"/>
- </delete>
- </target>
-
- <!-- If you want to test without building the distribution jars set the -->
- <!-- localtion value of the m2.repo on your machine and use the targets below -->
- <property name="m2.repo" value="your dir here\.m2\repository" />
- <path id="repo.classpath">
- <!--pathelement location="${classpath}"/-->
- <!--pathelement location="${m2.repo}\annogen\annogen\0.1.0\annogen-0.1.0.jar"/>
- <pathelement location="${m2.repo}\avalon-framework\avalon-framework\4.1.3\avalon-framework-4.1.3.jar"/>
- <pathelement location="${m2.repo}\backport-util-concurrent\backport-util-concurrent\2.2\backport-util-concurrent-2.2.jar"/>
- <pathelement location="${m2.repo}\cglib\cglib-nodep\2.1_3\cglib-nodep-2.1_3.jar"/>
- <pathelement location="${m2.repo}\com\metaparadigm\json-rpc\1.0\json-rpc-1.0.jar"/>
- <pathelement location="${m2.repo}\commons-codec\commons-codec\1.3\commons-codec-1.3.jar"/>
- <pathelement location="${m2.repo}\commons-fileupload\commons-fileupload\1.1.1\commons-fileupload-1.1.1.jar"/>
- <pathelement location="${m2.repo}\commons-httpclient\commons-httpclient\3.0.1\commons-httpclient-3.0.1.jar"/>
- <pathelement location="${m2.repo}\commons-io\commons-io\1.1\commons-io-1.1.jar"/>
- <pathelement location="${m2.repo}\commons-logging\commons-logging\1.1\commons-logging-1.1.jar"/>
- <pathelement location="${m2.repo}\javax\activation\activation\1.1\activation-1.1.jar"/>
- <pathelement location="${m2.repo}\javax\mail\mail\1.4\mail-1.4.jar"/>
- <pathelement location="${m2.repo}\javax\servlet\servlet-api\2.5\servlet-api-2.5.jar"/>
- <pathelement location="${m2.repo}\jaxen\jaxen\1.1-beta-9\jaxen-1.1-beta-9.jar"/>
- <pathelement location="${m2.repo}\log4j\log4j\1.2.12\log4j-1.2.12.jar"/>
- <pathelement location="${m2.repo}\logkit\logkit\1.0.1\logkit-1.0.1.jar"/>
- <pathelement location="${m2.repo}\org\apache\ant\ant\1.7.0\ant-1.7.0.jar"/>
- <pathelement location="${m2.repo}\org\apache\ant\ant-launcher\1.7.0\ant-launcher-1.7.0.jar"/>
- <pathelement location="${m2.repo}\org\apache\axis2\axis2-java2wsdl\1.2\axis2-java2wsdl-1.2.jar"/>
- <pathelement location="${m2.repo}\org\apache\axis2\axis2-kernel\1.2\axis2-kernel-1.2.jar"/>
- <pathelement location="${m2.repo}\org\apache\geronimo\specs\geronimo-commonj_1.1_spec\1.0\geronimo-commonj_1.1_spec-1.0.jar"/>
- <pathelement location="${m2.repo}\org\apache\geronimo\specs\geronimo-jms_1.1_spec\1.1\geronimo-jms_1.1_spec-1.1.jar"/>
- <pathelement location="${m2.repo}\org\apache\httpcomponents\jakarta-httpcore\4.0-alpha4\jakarta-httpcore-4.0-alpha4.jar"/>
- <pathelement location="${m2.repo}\org\apache\neethi\neethi\2.0.1\neethi-2.0.1.jar"/>
- <pathelement location="${m2.repo}\org\apache\tuscany\sca\sca-api\1.4-SNAPSHOT\sca-api-1.4-SNAPSHOT.jar"/>
- <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-assembly\1.4-SNAPSHOT\tuscany-assembly-1.4-SNAPSHOT.jar"/>
- <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-assembly-xml\1.4-SNAPSHOT\tuscany-assembly-xml-1.4-SNAPSHOT.jar"/>
- <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-binding-sca\1.4-SNAPSHOT\tuscany-binding-sca-1.4-SNAPSHOT.jar"/>
- <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-binding-sca-axis2\1.4-SNAPSHOT\tuscany-binding-sca-axis2-1.4-SNAPSHOT.jar"/>
- <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-binding-sca-xml\1.4-SNAPSHOT\tuscany-binding-sca-xml-1.4-SNAPSHOT.jar"/>
- <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-binding-ws\1.4-SNAPSHOT\tuscany-binding-ws-1.4-SNAPSHOT.jar"/>
- <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-binding-ws-axis2\1.4-SNAPSHOT\tuscany-binding-ws-axis2-1.4-SNAPSHOT.jar"/>
- <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-binding-ws-xml\1.4-SNAPSHOT\tuscany-binding-ws-xml-1.4-SNAPSHOT.jar"/>
- <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-contribution\1.4-SNAPSHOT\tuscany-contribution-1.4-SNAPSHOT.jar"/>
- <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-contribution-impl\1.4-SNAPSHOT\tuscany-contribution-impl-1.4-SNAPSHOT.jar"/>
- <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-contribution-java\1.4-SNAPSHOT\tuscany-contribution-java-1.4-SNAPSHOT.jar"/>
- <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-contribution-namespace\1.4-SNAPSHOT\tuscany-contribution-namespace-1.4-SNAPSHOT.jar"/>
- <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-core\1.4-SNAPSHOT\tuscany-core-1.4-SNAPSHOT.jar"/>
- <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-core-databinding\1.4-SNAPSHOT\tuscany-core-databinding-1.4-SNAPSHOT.jar"/>
- <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-core-spi\1.4-SNAPSHOT\tuscany-core-spi-1.4-SNAPSHOT.jar"/>
- <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-databinding\1.4-SNAPSHOT\tuscany-databinding-1.4-SNAPSHOT.jar"/>
- <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-databinding-axiom\1.4-SNAPSHOT\tuscany-databinding-axiom-1.4-SNAPSHOT.jar"/>
- <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-distributed\1.4-SNAPSHOT\tuscany-distributed-1.4-SNAPSHOT.jar"/>
- <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-distributed-impl\1.4-SNAPSHOT\tuscany-distributed-impl-1.4-SNAPSHOT.jar"/>
- <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-host-embedded\1.4-SNAPSHOT\tuscany-host-embedded-1.4-SNAPSHOT.jar"/>
- <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-host-http\1.4-SNAPSHOT\tuscany-host-http-1.4-SNAPSHOT.jar"/>
- <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-host-tomcat\1.4-SNAPSHOT\tuscany-host-jetty-1.4-SNAPSHOT.jar"/>
- <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-implementation-java\1.4-SNAPSHOT\tuscany-implementation-java-1.4-SNAPSHOT.jar"/>
- <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-implementation-java-runtime\1.4-SNAPSHOT\tuscany-implementation-java-runtime-1.4-SNAPSHOT.jar"/>
- <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-implementation-java-xml\1.4-SNAPSHOT\tuscany-implementation-java-xml-1.4-SNAPSHOT.jar"/>
- <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-interface\1.4-SNAPSHOT\tuscany-interface-1.4-SNAPSHOT.jar"/>
- <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-interface-java\1.4-SNAPSHOT\tuscany-interface-java-1.4-SNAPSHOT.jar"/>
- <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-interface-java-xml\1.4-SNAPSHOT\tuscany-interface-java-xml-1.4-SNAPSHOT.jar"/>
- <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-interface-wsdl\1.4-SNAPSHOT\tuscany-interface-wsdl-1.4-SNAPSHOT.jar"/>
- <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-interface-wsdl-xml\1.4-SNAPSHOT\tuscany-interface-wsdl-xml-1.4-SNAPSHOT.jar"/>
- <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-policy\1.4-SNAPSHOT\tuscany-policy-1.4-SNAPSHOT.jar"/>
- <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-policy-xml\1.4-SNAPSHOT\tuscany-policy-xml-1.4-SNAPSHOT.jar"/>
- <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-topology\1.4-SNAPSHOT\tuscany-topology-1.4-SNAPSHOT.jar"/>
- <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-topology-xml\1.4-SNAPSHOT\tuscany-topology-xml-1.4-SNAPSHOT.jar"/>
- <pathelement location="${m2.repo}\org\apache\woden\woden\1.0-incubating-M7a\woden-1.0-incubating-M7a.jar"/>
- <pathelement location="${m2.repo}\org\apache\ws\commons\axiom\axiom-api\1.2.4\axiom-api-1.2.4.jar"/>
- <pathelement location="${m2.repo}\org\apache\ws\commons\axiom\axiom-dom\1.2.4\axiom-dom-1.2.4.jar"/>
- <pathelement location="${m2.repo}\org\apache\ws\commons\axiom\axiom-impl\1.2.4\axiom-impl-1.2.4.jar"/>
- <pathelement location="${m2.repo}\org\apache\ws\commons\schema\XmlSchema\1.3.1\XmlSchema-1.3.1.jar"/>
- <pathelement location="${m2.repo}\org\codehaus\woodstox\wstx-asl\3.2.1\wstx-asl-3.2.1.jar"/>
- <pathelement location="${m2.repo}\stax\stax-api\1.0.1\stax-api-1.0.1.jar"/>
- <pathelement location="${m2.repo}\wsdl4j\wsdl4j\1.6.2\wsdl4j-1.6.2.jar"/>
- <pathelement location="${m2.repo}\xerces\xercesImpl\2.8.1\xercesImpl-2.8.1.jar"/>
- <pathelement location="${m2.repo}\xml-apis\xml-apis\1.3.03\xml-apis-1.3.03.jar"/>
- <pathelement location="target/classes"/-->
- <pathelement location="${m2.repo}\annogen\annogen\0.1.0\annogen-0.1.0.jar"/>
- <pathelement location="${m2.repo}\avalon-framework\avalon-framework\4.1.3\avalon-framework-4.1.3.jar"/>
- <pathelement location="${m2.repo}\backport-util-concurrent\backport-util-concurrent\2.2\backport-util-concurrent-2.2.jar"/>
- <pathelement location="${m2.repo}\cglib\cglib-nodep\2.1_3\cglib-nodep-2.1_3.jar"/>
- <pathelement location="${m2.repo}\com\metaparadigm\json-rpc\1.0\json-rpc-1.0.jar"/>
- <pathelement location="${m2.repo}\commons-codec\commons-codec\1.3\commons-codec-1.3.jar"/>
- <pathelement location="${m2.repo}\commons-fileupload\commons-fileupload\1.1.1\commons-fileupload-1.1.1.jar"/>
- <pathelement location="${m2.repo}\commons-httpclient\commons-httpclient\3.0.1\commons-httpclient-3.0.1.jar"/>
- <pathelement location="${m2.repo}\commons-io\commons-io\1.1\commons-io-1.1.jar"/>
- <pathelement location="${m2.repo}\commons-logging\commons-logging\1.1\commons-logging-1.1.jar"/>
- <pathelement location="${m2.repo}\javax\activation\activation\1.1\activation-1.1.jar"/>
- <pathelement location="${m2.repo}\javax\mail\mail\1.4\mail-1.4.jar"/>
- <pathelement location="${m2.repo}\jaxen\jaxen\1.1-beta-9\jaxen-1.1-beta-9.jar"/>
- <pathelement location="${m2.repo}\log4j\log4j\1.2.12\log4j-1.2.12.jar"/>
- <pathelement location="${m2.repo}\logkit\logkit\1.0.1\logkit-1.0.1.jar"/>
- <pathelement location="${m2.repo}\org\apache\ant\ant\1.7.0\ant-1.7.0.jar"/>
- <pathelement location="${m2.repo}\org\apache\ant\ant-launcher\1.7.0\ant-launcher-1.7.0.jar"/>
- <pathelement location="${m2.repo}\org\apache\axis2\axis2-adb\1.2\axis2-adb-1.2.jar"/>
- <pathelement location="${m2.repo}\org\apache\axis2\axis2-java2wsdl\1.2\axis2-java2wsdl-1.2.jar"/>
- <pathelement location="${m2.repo}\org\apache\axis2\axis2-kernel\1.2\axis2-kernel-1.2.jar"/>
- <pathelement location="${m2.repo}\org\apache\geronimo\specs\geronimo-commonj_1.1_spec\1.0\geronimo-commonj_1.1_spec-1.0.jar"/>
- <pathelement location="${m2.repo}\org\apache\geronimo\specs\geronimo-jms_1.1_spec\1.1\geronimo-jms_1.1_spec-1.1.jar"/>
- <pathelement location="${m2.repo}\org\apache\httpcomponents\jakarta-httpcore\4.0-alpha4\jakarta-httpcore-4.0-alpha4.jar"/>
- <pathelement location="${m2.repo}\org\apache\neethi\neethi\2.0.1\neethi-2.0.1.jar"/>
- <pathelement location="${m2.repo}\org\apache\tuscany\sca\sca-api\1.4-SNAPSHOT\sca-api-1.4-SNAPSHOT.jar"/>
- <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-assembly\1.4-SNAPSHOT\tuscany-assembly-1.4-SNAPSHOT.jar"/>
- <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-assembly-xml\1.4-SNAPSHOT\tuscany-assembly-xml-1.4-SNAPSHOT.jar"/>
- <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-binding-http\1.4-SNAPSHOT\tuscany-binding-http-1.4-SNAPSHOT.jar"/>
- <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-binding-jsonrpc\1.4-SNAPSHOT\tuscany-binding-jsonrpc-1.4-SNAPSHOT.jar"/>
- <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-binding-sca\1.4-SNAPSHOT\tuscany-binding-sca-1.4-SNAPSHOT.jar"/>
- <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-binding-sca-axis2\1.4-SNAPSHOT\tuscany-binding-sca-axis2-1.4-SNAPSHOT.jar"/>
- <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-binding-sca-xml\1.4-SNAPSHOT\tuscany-binding-sca-xml-1.4-SNAPSHOT.jar"/>
- <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-binding-ws\1.4-SNAPSHOT\tuscany-binding-ws-1.4-SNAPSHOT.jar"/>
- <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-binding-ws-axis2\1.4-SNAPSHOT\tuscany-binding-ws-axis2-1.4-SNAPSHOT.jar"/>
- <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-binding-ws-xml\1.4-SNAPSHOT\tuscany-binding-ws-xml-1.4-SNAPSHOT.jar"/>
- <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-contribution\1.4-SNAPSHOT\tuscany-contribution-1.4-SNAPSHOT.jar"/>
- <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-contribution-impl\1.4-SNAPSHOT\tuscany-contribution-impl-1.4-SNAPSHOT.jar"/>
- <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-contribution-java\1.4-SNAPSHOT\tuscany-contribution-java-1.4-SNAPSHOT.jar"/>
- <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-contribution-namespace\1.4-SNAPSHOT\tuscany-contribution-namespace-1.4-SNAPSHOT.jar"/>
- <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-core\1.4-SNAPSHOT\tuscany-core-1.4-SNAPSHOT.jar"/>
- <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-core-databinding\1.4-SNAPSHOT\tuscany-core-databinding-1.4-SNAPSHOT.jar"/>
- <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-core-spi\1.4-SNAPSHOT\tuscany-core-spi-1.4-SNAPSHOT.jar"/>
- <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-databinding\1.4-SNAPSHOT\tuscany-databinding-1.4-SNAPSHOT.jar"/>
- <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-databinding-axiom\1.4-SNAPSHOT\tuscany-databinding-axiom-1.4-SNAPSHOT.jar"/>
- <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-distributed\1.4-SNAPSHOT\tuscany-distributed-1.4-SNAPSHOT.jar"/>
- <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-distributed-impl\1.4-SNAPSHOT\tuscany-distributed-impl-1.4-SNAPSHOT.jar"/>
- <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-extension-helper\1.4-SNAPSHOT\tuscany-extension-helper-1.4-SNAPSHOT.jar"/>
- <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-host-embedded\1.4-SNAPSHOT\tuscany-host-embedded-1.4-SNAPSHOT.jar"/>
- <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-host-http\1.4-SNAPSHOT\tuscany-host-http-1.4-SNAPSHOT.jar"/>
- <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-interface\1.4-SNAPSHOT\tuscany-interface-1.4-SNAPSHOT.jar"/>
- <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-interface-java\1.4-SNAPSHOT\tuscany-interface-java-1.4-SNAPSHOT.jar"/>
- <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-interface-java-xml\1.4-SNAPSHOT\tuscany-interface-java-xml-1.4-SNAPSHOT.jar"/>
- <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-interface-wsdl\1.4-SNAPSHOT\tuscany-interface-wsdl-1.4-SNAPSHOT.jar"/>
- <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-interface-wsdl-xml\1.4-SNAPSHOT\tuscany-interface-wsdl-xml-1.4-SNAPSHOT.jar"/>
- <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-policy\1.4-SNAPSHOT\tuscany-policy-1.4-SNAPSHOT.jar"/>
- <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-policy-xml\1.4-SNAPSHOT\tuscany-policy-xml-1.4-SNAPSHOT.jar"/>
- <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-topology\1.4-SNAPSHOT\tuscany-topology-1.4-SNAPSHOT.jar"/>
- <pathelement location="${m2.repo}\org\apache\tuscany\sca\tuscany-topology-xml\1.4-SNAPSHOT\tuscany-topology-xml-1.4-SNAPSHOT.jar"/>
- <pathelement location="${m2.repo}\org\apache\woden\woden\1.0-incubating-M7a\woden-1.0-incubating-M7a.jar"/>
- <pathelement location="${m2.repo}\org\apache\ws\commons\axiom\axiom-api\1.2.4\axiom-api-1.2.4.jar"/>
- <pathelement location="${m2.repo}\org\apache\ws\commons\axiom\axiom-dom\1.2.4\axiom-dom-1.2.4.jar"/>
- <pathelement location="${m2.repo}\org\apache\ws\commons\axiom\axiom-impl\1.2.4\axiom-impl-1.2.4.jar"/>
- <pathelement location="${m2.repo}\org\apache\ws\commons\schema\XmlSchema\1.3.1\XmlSchema-1.3.1.jar"/>
- <pathelement location="${m2.repo}\org\codehaus\woodstox\wstx-asl\3.2.1\wstx-asl-3.2.1.jar"/>
- <pathelement location="${m2.repo}\stax\stax-api\1.0.1\stax-api-1.0.1.jar"/>
- <pathelement location="${m2.repo}\wsdl4j\wsdl4j\1.6.2\wsdl4j-1.6.2.jar"/>
- <pathelement location="${m2.repo}\xerces\xercesImpl\2.8.1\xercesImpl-2.8.1.jar"/>
- <pathelement location="${m2.repo}\xml-apis\xml-apis\1.3.03\xml-apis-1.3.03.jar"/>
- </path>
-
- <target name="runDomainNodeRepo">
- <java classname="${domain.class}"
- fork="true">
- <classpath>
- <path refid="repo.classpath"/>
- </classpath>
- </java>
- </target>
-
- <target name="runNodeARepo">
- <java classname="${node.class}"
- fork="true">
- <classpath>
- <path refid="repo.classpath"/>
- </classpath>
- <arg value="mydomain"/>
- <arg value="nodeA"/>
- </java>
- </target>
-
- <target name="runNodeBRepo">
- <java classname="${node.class}"
- fork="true">
- <classpath>
- <path refid="repo.classpath"/>
- </classpath>
- <arg value="mydomain"/>
- <arg value="nodeB"/>
- </java>
- </target>
-
- <target name="runNodeCRepo">
- <java classname="${node.class}"
- fork="true">
- <classpath>
- <path refid="repo.classpath"/>
- </classpath>
- <arg value="mydomain"/>
- <arg value="nodeC"/>
- </java>
- </target>
-
-</project>
diff --git a/branches/sca-android/samples/domain-webapp/pom.xml b/branches/sca-android/samples/domain-webapp/pom.xml
deleted file mode 100644
index 58fa5a7458..0000000000
--- a/branches/sca-android/samples/domain-webapp/pom.xml
+++ /dev/null
@@ -1,101 +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>1.4-SNAPSHOT</version>
- <relativePath>../pom.xml</relativePath>
- </parent>
- <artifactId>sample-domain-webapp</artifactId>
- <name>Apache Tuscany SCA Domain Webapp Sample</name>
-
- <repositories>
- <repository>
- <id>apache.incubator</id>
- <url>http://people.apache.org/repo/m2-incubating-repository</url>
- </repository>
- </repositories>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-host-tomcat</artifactId>
- <version>1.4-SNAPSHOT</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-host-embedded</artifactId>
- <version>1.4-SNAPSHOT</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-node-impl</artifactId>
- <version>1.4-SNAPSHOT</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-domain-impl</artifactId>
- <version>1.4-SNAPSHOT</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-binding-jsonrpc</artifactId>
- <version>1.4-SNAPSHOT</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-binding-sca-axis2</artifactId>
- <version>1.4-SNAPSHOT</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-binding-http</artifactId>
- <version>1.4-SNAPSHOT</version>
- <scope>runtime</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-implementation-resource</artifactId>
- <version>1.4-SNAPSHOT</version>
- <scope>runtime</scope>
- </dependency>
-
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.2</version>
- <scope>test</scope>
- </dependency>
-
- </dependencies>
-
- <build>
- <finalName>${artifactId}</finalName>
- </build>
-</project>
diff --git a/branches/sca-android/samples/domain-webapp/src/main/java/node/DomainServer.java b/branches/sca-android/samples/domain-webapp/src/main/java/node/DomainServer.java
deleted file mode 100644
index ea3cddc01b..0000000000
--- a/branches/sca-android/samples/domain-webapp/src/main/java/node/DomainServer.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT 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 node;
-
-import java.io.IOException;
-
-
-/**
- * This server program that loads a composite to provide simple registry function.
- * This server can be replaced with any registry that is appropriate but the components
- * in each node that talk to the registry should be replaced also.
- */
-public class DomainServer {
-
- public static void main(String[] args) {
- try {
-/*
- NodeImpl node = new NodeImpl();
- node.start();
- node.getContributionManager().startContribution(DomainServer.class.getClassLoader().getResource("."));
-
- try {
- System.out.println("Domain server started (press enter to shutdown)");
- System.in.read();
- } catch (IOException e) {
- e.printStackTrace();
- }
-
- node.stop();
- System.out.println("Domain server stopped");
-*/
- } catch (Exception ex) {
- System.out.println("Exception in domain server " +
- ex.toString());
- }
- }
-
-}
diff --git a/branches/sca-android/samples/domain-webapp/src/main/resources/META-INF/sca-contribution.xml b/branches/sca-android/samples/domain-webapp/src/main/resources/META-INF/sca-contribution.xml
deleted file mode 100755
index fbe5880db6..0000000000
--- a/branches/sca-android/samples/domain-webapp/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://www.osoa.org/xmlns/sca/1.0"
- targetNamespace="http://sample"
- xmlns:sample="http://sample">
- <deployable composite="sample:Domain"/>
-</contribution> \ No newline at end of file
diff --git a/branches/sca-android/samples/domain-webapp/src/main/resources/domain.composite b/branches/sca-android/samples/domain-webapp/src/main/resources/domain.composite
deleted file mode 100644
index dbaaebd3c7..0000000000
--- a/branches/sca-android/samples/domain-webapp/src/main/resources/domain.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://www.osoa.org/xmlns/sca/1.0"
- targetNamespace="http://sample"
- xmlns:sample="http://sample"
- xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"
- name="Domain">
-
- <component name="domain">
- <service name="Resource">
- <tuscany:binding.http/>
- </service>
- <tuscany:implementation.resource location="webroot"/>
- </component>
-
- <component name="DomainManagerComponent">
- <implementation.java class="org.apache.tuscany.sca.domain.impl.DomainManagerServiceImpl"/>
- <service name="DomainManagerService">
- <interface.java interface="org.apache.tuscany.sca.domain.DomainManagerService"/>
- <binding.ws uri="http://localhost:8080/DomainManagerComponent/DomainManager"/>
- <tuscany:binding.jsonrpc uri="http://localhost:8080/DomainManagerComponent/DomainManagerJson"/>
- </service>
- <reference name="serviceDiscovery" target="ServiceDiscoveryComponent"/>
-
- </component>
-
- <component name="ServiceDiscoveryComponent">
- <implementation.java class="org.apache.tuscany.sca.domain.impl.ServiceDiscoveryServiceImpl" />
- <service name="ServiceDiscoveryService">
- <interface.java interface="org.apache.tuscany.sca.domain.ServiceDiscoveryService"/>
- <binding.sca uri="http://localhost:8080/ServiceDiscoveryComponent/ServiceDiscoverySCA"/>
- <binding.ws uri="http://localhost:8080/ServiceDiscoveryComponent/ServiceDiscovery"/>
- <tuscany:binding.jsonrpc uri="http://localhost:8080/ServiceDiscoveryComponent/ServiceDiscoveryJson"/>
- </service>
- </component>
-
-</composite>
diff --git a/branches/sca-android/samples/domain-webapp/src/main/resources/webroot/index.html b/branches/sca-android/samples/domain-webapp/src/main/resources/webroot/index.html
deleted file mode 100644
index 425bd73734..0000000000
--- a/branches/sca-android/samples/domain-webapp/src/main/resources/webroot/index.html
+++ /dev/null
@@ -1,354 +0,0 @@
-<html>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- -->
-<head>
-<title>Apache Tuscany Domain</TITLE>
-
- <script type="text/javascript" src="../SCADomain/scaDomain.js"></script>
-
- <script language="JavaScript">
-
- domainManager = new JSONRpcClient("../DomainManagerComponent/DomainManagerJson");
-
- function getNodeInfo() {
- domainManager.DomainManagerService.getNodeInfo(handleGetNodeInfo);
- }
-
- function handleGetNodeInfo(result) {
-
- var text = ""
-
- for (var i in result.list){
- var node = result.list[i];
-
- text = text + "<table>";
- text = text + "<TR CLASS='source_1' >";
- text = text + " <TD>";
- text = text + " <IMG SRC='node.png'/>&nbsp;&nbsp;" + node.domainUri;
- text = text + " </TD>";
-
- var noProtocol = node.nodeManagerUrl.substring(7);
- var colonPos = noProtocol.indexOf(':')
- var nodeManagerWebUrl = noProtocol.substring(0, colonPos + 6);
- nodeManagerWebUrl = "http://" + nodeManagerWebUrl + "node/index.html";
-
- text = text + " <TD CLASS='clickable link' ONCLICK=\"showNode('" + nodeManagerWebUrl + "')\">" + node.nodeUri + "</TD>";
- text = text + "</TR>";
- }
-
- document.getElementById('domainInfo').innerHTML=text;
- }
-
- function showNode(url)
- {
- document.getElementById("nodePage").innerHTML="<IFRAME CLASS='alert_data' SRC='"+url+"'/>";
- window.location="#data";
- return;
- }
-
- </script>
-
- <link rel="stylesheet" type="text/css" href="style.css" />
-</head>
-
-<body onload="getNodeInfo()">
-
-<!--script type="text/javascript">
-
- // The proxy for the alert and alertsources services running in Tuscany
- var alertsService = new dojo.rpc.JsonService("AlertsServiceJSONRPC?smd");
- var alertSourcesService = new dojo.rpc.JsonService("AlertsSourcesServiceJSONRPC?smd");
-
- // If you want to put an HTTP sniffer in the way to look at the JSONROPC packets you'll
- // need to edit the target address of the service in the smd. The only way to do this easily
- // is to read an smd from disc rather than generate one. There are two smds provided for this
- //var alertsService = new dojo.rpc.JsonService("service.smd");
- //var alertSourcesService = new dojo.rpc.JsonService("sources.smd");
-
- // The global list of alerts sources
- var alertSourceList = null;
-
- // The global list of alerts
- var alertList = null;
-
- // the constructor for entries on the alert source list
- function alertSourceType(name,id,address,feedAddress,feedType,popUsername,popPassword,popServer,lastChecked,javaClass) {
- this.name = name;
- this.id = id;
- this.address = address;
- this.feedAddress = feedAddress;
- this.feedType = feedType;
- this.lastChecked = lastChecked;
- this.javaClass = "org.apache.tuscany.sca.demos.aggregator.types.impl.SourceTypeImpl";
-
- }
-
- function errorCallback(result, error, id) {
- var resultsNode = document.getElementById("errors");
- // There seems to be a problem somewhere as I should be able to get the error
- // details but all I can actually get is the Id from the error message
- // resultsNode.innerHTML = "there was an error! message id = " + " error code = " + result.error.code + " error message = " + result.error.msg ;
- resultsNode.innerHTML = "An error was returned by the server. Message id = " + result.id;
- }
-
- // Generate the alert sources table
- function getAlertSources()
- {
- response = alertSourcesService.getAlertSources("Dojo");
- response.addCallbacks(getAlertSourcesCallback, errorCallback);
-
- getAlerts();
- }
-
- function getAlertSourcesCallback(result) {
- var resultsNode = document.getElementById("alertSourcesTable");
- if ( result.error != null ) {
- resultsNode.innerHTML = result.error;
- } else {
- // stash away the source list for when we come to edit it
- alertSourceList = result.source.list;
-
- // put out the html
- var text = ""
- var nextSourceId = 0
- for (var i in result.source.list){
- var source = result.source.list[i];
-
- text = text + "<table>";
- text = text + "<TR CLASS='source_" + source.id + "' >";
- text = text + " <TD CLASS='source_name clickable' ONCLICK=\"displayAlert('" + source.address + "')\">";
- text = text + " <IMG SRC='rss.png'/>&nbsp;&nbsp;" + source.name;
- text = text + " </TD>";
- text = text + " <TD CLASS='clickable link' ONCLICK=\"showEditSource('" + source.id + "')\">Edit</TD>";
- text = text + " <TD CLASS='clickable link' ONCLICK=\"deleteSource('" + source.id + "')\">Delete</TD>";
- text = text + "</TR>";
- text = text + "<TR ID='edit_source_" + source.id + "' CLASS='hidden source_" + source.id + "'>";
- text = text + " <TD COLSPAN='3'>";
- text = text + " <TABLE CLASS='sourceDetailsTable'>";
- text = text + " <TR>";
- text = text + " <TD>Source name:</TD>";
- text = text + " <TD>";
- text = text + " <INPUT ID='source_" + source.id + "_name' TYPE='TEXT' SIZE='50' VALUE='" + source.name + "'/>";
- text = text + " </TD>";
- text = text + " </TR>";
- text = text + " <TR>";
- text = text + " <TD>Source address:</TD>"
- text = text + " <TD>";
- text = text + " <INPUT ID='source_" + source.id + "_address' TYPE='TEXT' SIZE='50' VALUE='" + source.address + "'/>";
- text = text + " </TD>";
- text = text + " </TR>";
- text = text + " <TR>";
- text = text + " <TD>";
- text = text + " <INPUT ID='source_" + source.id + "_type' TYPE='HIDDEN' VALUE='" + source.id + "'/>";
- text = text + " <INPUT TYPE='BUTTON' VALUE='Update' ONCLICK=\"updateSource('" + source.id + "')\"/>";
- text = text + " <INPUT TYPE='BUTTON' VALUE='Cancel' ONCLICK=\"hideEditSource('" + source.id + "')\"/>";
- text = text + " </TD>";
- text = text + " </TR>";
- text = text + " </TABLE>";
- text = text + " </TD>";
- text = text + "</TR>";
-
- nextSourceId = eval(source.id);
- }
-
- nextSourceId = nextSourceId + 1;
-
- text = text + "<TR CLASS='source_" + nextSourceId + "'>";
- text = text + " <TD COLSPAN='4' CLASS='clickable link' ONCLICK=\"showAddNewSource('" + nextSourceId + "')\">Add new Alert Source</TD>";
- text = text + "</TR>";
- text = text + "<TR ID='add_source_" + nextSourceId + "' CLASS='hidden source_" + nextSourceId + "'>";
- text = text + " <TD COLSPAN='4'>";
- text = text + " <TABLE CLASS='sourceDetailsTable'>";
- text = text + " <TR>";
- text = text + " <TD>Source name:</TD>";
- text = text + " <TD>";
- text = text + " <INPUT ID='source_" + nextSourceId + "_name' TYPE='TEXT' SIZE='50'>";
- text = text + " </TD>";
- text = text + " </TR>";
- text = text + " <TR>";
- text = text + " <TD>Source address:</TD>";
- text = text + " <TD>";
- text = text + " <INPUT ID='source_" + nextSourceId + "_address' TYPE='TEXT' SIZE='50'>";
- text = text + " </TD>";
- text = text + " </TR>";
- text = text + " <TR>";
- text = text + " <TD>Source type:</TD>";
- text = text + " <TD>";
- text = text + " <SELECT ID='source_" + nextSourceId + "_type' ONCHANGE=\"showSourceType('" + nextSourceId + "')\">";
- text = text + " <OPTION value='rss' selected='selected'>RSS/Atom feed</OPTION>";
- text = text + " </SELECT>";
- text = text + " </TD>";
- text = text + " </TR>";
- text = text + " <TR ID='add_rss_source'>";
- text = text + " <TD COLSPAN='2'>";
- text = text + " <TABLE CLASS='sourceDetailsTable'>";
- text = text + " <TR>";
- text = text + " <TD>Feed address:</TD>";
- text = text + " <TD>";
- text = text + " <INPUT ID='source_" + nextSourceId + "_feedAddress' TYPE='TEXT' SIZE='50'/>";
- text = text + " </TD>";
- text = text + " </TR>";
- text = text + " </TABLE>";
- text = text + " </TD>";
- text = text + " </TR>";
- text = text + " <TR>";
- text = text + " <TD>";
- text = text + " <INPUT TYPE='BUTTON' VALUE='Add' ONCLICK=\"addSource('" + nextSourceId + "')\">";
- text = text + " <INPUT TYPE='BUTTON' VALUE='Cancel' ONCLICK=\"hideAddNewSource('" + nextSourceId + "')\">";
- text = text + " </TD>";
- text = text + " </TR>";
- text = text + " </TABLE>";
- text = text + " </TD>";
- text = text + "</TR>";
- text = text + "</table>";
-
- resultsNode.innerHTML = text;
- }
- }
-
- function showEditSource(sourceid)
- {
- document.getElementById("edit_source_"+sourceid).className = "source_"+sourceid;
- }
-
- function hideEditSource(sourceid)
- {
- document.getElementById("edit_source_"+sourceid).className = "hidden source_"+sourceid;
- }
-
- function updateSource(sourceid)
- {
- hideEditSource(sourceid);
- var source = getSource(sourceId);
- alertSourcesService.updateAlertSource(source);
- getAlertSources();
- }
-
- function deleteSource(sourceid)
- {
- alertSourcesService.removeAlertSource(sourceid);
- getAlertSources();
- }
-
- function showAddNewSource(sourceid)
- {
- document.getElementById("add_source_"+sourceid).className = "source_"+sourceid;
- }
-
- function hideAddNewSource(sourceid)
- {
- document.getElementById("add_source_"+sourceid).className = "hidden source_"+sourceid;
- }
-
- function addSource(sourceid)
- {
- hideAddNewSource(sourceid);
- var source = getSource(sourceid);
- alertSourcesService.addAlertSource(source);
-
- // wait a little before getting the list back from the server
- setTimeout("getAlertSources()",1250);
- }
-
- function getSource(sourceid)
- {
- var source = alertSourceList[sourceid];
-
- if ( source == null ){
- source = new alertSourceType("name","id","address","feedAddress","feedType","popUsername","popPassword","popServer","lastChecked","javaClass");
- alertSourceList[sourceid] = source;
- }
-
- source.name = document.getElementById("source_"+sourceid+"_name").value;
- source.id = sourceid;
- source.address = document.getElementById("source_"+sourceid+"_address").value;
- var typeElem = document.getElementById("source_"+sourceid+"_type");
- source.feedType = typeElem.options[typeElem.selectedIndex].value;
-
- if(source.feedType=="rss")
- {
- source.feedAddress = document.getElementById("source_"+sourceid+"_feedAddress").value;
-
- }
- else if(source.feedType=="pop")
- {
- source.popServer = document.getElementById("source_"+sourceid+"_popServer").value;
- source.popUsername = document.getElementById("source_"+sourceid+"_popUsername").value;
- source.popPassword = document.getElementById("source_"+sourceid+"_popPassword").value;
- }
- return source;
- }
-
- // Generate the alerts table
- function getAlerts()
- {
- response = alertsService.getAllNewAlerts("Dojo");
- response.addCallbacks(getAlertsCallback, errorCallback);
- }
-
- function getAlertsCallback(result) {
- var resultsNode = document.getElementById("alertsTable");
- if ( result.error != null ) {
- resultsNode.innerHTML = result.error;
- } else {
- alertList = result.alert.list;
- var text = ""
- for (var i in result.alert.list){
- var alert = result.alert.list[i];
-
- text = text + "<table>";
- text = text + "<TR class='source_" + alert.sourceId + " clickable' onclick=\"displayAlert('" + alert.address + "')\">";
- text = text + " <TD class='alert_text'>";
- text = text + " <SPAN id='" + alert.id + "' class='unread_title'>" + alert.title + "</SPAN>";
- text = text + " <SPAN class='summary'> - " + alert.summary.substring(0, 80) + "...</SPAN>";
- text = text + " </TD>";
- text = text + " <TD>";
- text = text + alert.date;
- text = text + " </TD>"
- text = text + "</TR>"
- text = text + "</table>";
- }
-
- resultsNode.innerHTML = text;
- }
- }
-
-
-
- function displayAlert(url)
- {
- document.getElementById("alertData").innerHTML="<IFRAME CLASS='alert_data' SRC='"+url+"'/>";
- window.location="#data";
- return;
- }
-</script-->
-
-<h1 id="top">Apache Tuscany Domain</h1>
-<div id="errors"></div>
-
-<p>Domain Name<span id="domainName"></span>:</p>
-
-<div id="domainInfo"></div>
-
-<p /><input type="button" value="Refresh" onclick="getNodeInfo()" />
-
-<div id="nodePage"></div>
-
-</body>
-</html>
diff --git a/branches/sca-android/samples/domain-webapp/src/main/resources/webroot/node.png b/branches/sca-android/samples/domain-webapp/src/main/resources/webroot/node.png
deleted file mode 100644
index b3c949d224..0000000000
--- a/branches/sca-android/samples/domain-webapp/src/main/resources/webroot/node.png
+++ /dev/null
Binary files differ
diff --git a/branches/sca-android/samples/domain-webapp/src/main/resources/webroot/style.css b/branches/sca-android/samples/domain-webapp/src/main/resources/webroot/style.css
deleted file mode 100644
index f5bbf23379..0000000000
--- a/branches/sca-android/samples/domain-webapp/src/main/resources/webroot/style.css
+++ /dev/null
@@ -1,176 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-p,table,li,h1,h2,h3
-{
-font-family: verdana, arial, 'sans serif';
-}
-
-p, h1, h2, h3, table, li, hr
-{
-margin-left: 10pt;
-}
-
-table
-{
-border-color: black;
-border-collapse: separate;
-border-spacing: 0px 1px;
-
-margin-right: 10pt;
-margin-left: 10pt;
-width: 800px;
-}
-
-.sourceDetailsTable
-{
-width: 600px;
-}
-
-tr, td
-{
-margin-left: 0pt;
-margin-right: 0pt;
-padding-left: 10pt;
-font-size: 90%;
-}
-
-p,li,th
-{
-font-size: 90%;
-margin-left: 10pt;
-}
-
-pre
-{
-margin-left: 10pt;
-}
-
-body
-{
-#ffffff;
-}
-
-h1,h2,h3,hr
-{
-color: firebrick;
-}
-
-a:link {COLOR: firebrick;}
-a:visited {COLOR: firebrick;}
-a:active {COLOR: navy;}
-
-.link
-{
-COLOR: firebrick;
-text-decoration: underline;
-}
-
-.clickable
-{
-cursor: pointer
-}
-
-.unread_title
-{
-font-weight: bold;
-}
-
-.read_title
-{
-font-weight: normal;
-}
-
-.summary
-{
-color: DimGrey;
-}
-
-.hidden
-{
-display: none;
-}
-
-.source_name
-{
-width: 600px;
-}
-
-.alert_text
-{
-width: 600px;
-}
-
-.alert_data
-{
-margin-left: 10px;
-width: 800px;
-height: 800px;
-}
-
-.source_0
-{
-background-color: LightGreen;
-}
-
-.source_1
-{
-background-color: LightSkyBlue;
-}
-
-.source_2
-{
-background-color: Khaki;
-}
-
-.source_3
-{
-background-color: LightPink;
-}
-
-.source_4
-{
-background-color: Orange;
-}
-
-.source_5
-{
-background-color: LightCoral;
-}
-
-.source_6
-{
-background-color: Orchid;
-}
-
-.source_7
-{
-background-color: Peru;
-}
-
-.source_8
-{
-background-color: SpringGreen;
-}
-
-.source_9
-{
-background-color: LightGrey;
-}
-
diff --git a/branches/sca-android/samples/helloworld-distributed/README b/branches/sca-android/samples/helloworld-distributed/README
deleted file mode 100644
index 0ea891b07f..0000000000
--- a/branches/sca-android/samples/helloworld-distributed/README
+++ /dev/null
@@ -1,28 +0,0 @@
-Distributed Helloworld Sample
-=============================
-
-This sample demonstrates a distributed SCA domain using the JMS implementation of binding.sca which
-automatically discovers available nodes and the services they contain.
-
-In this sample there are two nodes in the domain, a standalone node containing a Helloworld component,
-and a webapp using a JSP with <implementation.web> which invokes the Helloworld service in the domain.
-
-To run the sample:
-
-- Build the two sample modules with mvn or Ant.
-- Deploy the helloworld-webapp war to Tomcat.
-- Start the standalone node by:
- in the helloworld-node folder do "mvn dependency:copy-dependencies" then:
- java -Djava.ext.dirs=target\dependency -cp target\sample-helloworld-node.jar sample.HelloworldNode
-- On a web browser go to:
- http://localhost:8080/sample-helloworld-webapp
-
-You should see "Hello world" returned on the web page and the node console should show "HelloworldImpl.sayHello: world"
-
-How it works:
-
-
-
-
-
-
diff --git a/branches/sca-android/samples/helloworld-distributed/helloworld-node/README b/branches/sca-android/samples/helloworld-distributed/helloworld-node/README
deleted file mode 100644
index 0ea891b07f..0000000000
--- a/branches/sca-android/samples/helloworld-distributed/helloworld-node/README
+++ /dev/null
@@ -1,28 +0,0 @@
-Distributed Helloworld Sample
-=============================
-
-This sample demonstrates a distributed SCA domain using the JMS implementation of binding.sca which
-automatically discovers available nodes and the services they contain.
-
-In this sample there are two nodes in the domain, a standalone node containing a Helloworld component,
-and a webapp using a JSP with <implementation.web> which invokes the Helloworld service in the domain.
-
-To run the sample:
-
-- Build the two sample modules with mvn or Ant.
-- Deploy the helloworld-webapp war to Tomcat.
-- Start the standalone node by:
- in the helloworld-node folder do "mvn dependency:copy-dependencies" then:
- java -Djava.ext.dirs=target\dependency -cp target\sample-helloworld-node.jar sample.HelloworldNode
-- On a web browser go to:
- http://localhost:8080/sample-helloworld-webapp
-
-You should see "Hello world" returned on the web page and the node console should show "HelloworldImpl.sayHello: world"
-
-How it works:
-
-
-
-
-
-
diff --git a/branches/sca-android/samples/helloworld-distributed/helloworld-node/pom.xml b/branches/sca-android/samples/helloworld-distributed/helloworld-node/pom.xml
deleted file mode 100644
index 941cb2b4ed..0000000000
--- a/branches/sca-android/samples/helloworld-distributed/helloworld-node/pom.xml
+++ /dev/null
@@ -1,71 +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-sca</artifactId>
- <version>1.4-SNAPSHOT</version>
- <relativePath>../../pom.xml</relativePath>
- </parent>
- <artifactId>sample-helloworld-node</artifactId>
- <name>Apache Tuscany SCA Helloworld Node Sample</name>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-node-api</artifactId>
- <version>1.4-SNAPSHOT</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-node-impl</artifactId>
- <version>1.4-SNAPSHOT</version>
- <scope>runtime</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-implementation-java-runtime</artifactId>
- <version>1.4-SNAPSHOT</version>
- <scope>runtime</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-binding-sca-jms</artifactId>
- <version>1.4-SNAPSHOT</version>
- <scope>runtime</scope>
- </dependency>
-
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.2</version>
- <scope>test</scope>
- </dependency>
-
- </dependencies>
-
- <build>
- <finalName>${artifactId}</finalName>
- </build>
-</project>
diff --git a/branches/sca-android/samples/helloworld-distributed/helloworld-node/src/main/java/sample/Helloworld.java b/branches/sca-android/samples/helloworld-distributed/helloworld-node/src/main/java/sample/Helloworld.java
deleted file mode 100644
index 386426df73..0000000000
--- a/branches/sca-android/samples/helloworld-distributed/helloworld-node/src/main/java/sample/Helloworld.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.osoa.sca.annotations.Remotable;
-
-@Remotable
-public interface Helloworld {
-
- String sayHello(String name);
-
-}
diff --git a/branches/sca-android/samples/helloworld-distributed/helloworld-node/src/main/java/sample/HelloworldImpl.java b/branches/sca-android/samples/helloworld-distributed/helloworld-node/src/main/java/sample/HelloworldImpl.java
deleted file mode 100644
index 033b4088c8..0000000000
--- a/branches/sca-android/samples/helloworld-distributed/helloworld-node/src/main/java/sample/HelloworldImpl.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;
-
-public class HelloworldImpl implements Helloworld {
-
- public String sayHello(String name) {
- System.out.println("HelloworldImpl.sayHello: " + name);
- return "Hello " + name;
- }
-
-}
diff --git a/branches/sca-android/samples/helloworld-distributed/helloworld-node/src/main/java/sample/HelloworldNode.java b/branches/sca-android/samples/helloworld-distributed/helloworld-node/src/main/java/sample/HelloworldNode.java
deleted file mode 100644
index 3cd8fe547a..0000000000
--- a/branches/sca-android/samples/helloworld-distributed/helloworld-node/src/main/java/sample/HelloworldNode.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 sample;
-
-import org.apache.tuscany.sca.node.SCANode;
-import org.apache.tuscany.sca.node.SCANodeFactory;
-
-/**
- */
-public class HelloworldNode {
-
- public static void main(String[] args) throws Exception {
-
- SCANode node = SCANodeFactory.newInstance().createSCANodeFromClassLoader("Helloworld.composite", null);
- node.start();
-
- System.out.println("Hit enter to stop node...");
- System.in.read();
-
- node.stop();
- }
-
-}
diff --git a/branches/sca-android/samples/helloworld-distributed/helloworld-node/src/main/resources/Helloworld.composite b/branches/sca-android/samples/helloworld-distributed/helloworld-node/src/main/resources/Helloworld.composite
deleted file mode 100644
index 0f827390c8..0000000000
--- a/branches/sca-android/samples/helloworld-distributed/helloworld-node/src/main/resources/Helloworld.composite
+++ /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.
--->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
- targetNamespace="http://sample"
- name="Helloworld">
-
- <component name="HelloworldComponent">
- <implementation.java class="sample.HelloworldImpl"/>
- </component>
-
-</composite>
diff --git a/branches/sca-android/samples/helloworld-distributed/helloworld-webapp/README b/branches/sca-android/samples/helloworld-distributed/helloworld-webapp/README
deleted file mode 100644
index 0ea891b07f..0000000000
--- a/branches/sca-android/samples/helloworld-distributed/helloworld-webapp/README
+++ /dev/null
@@ -1,28 +0,0 @@
-Distributed Helloworld Sample
-=============================
-
-This sample demonstrates a distributed SCA domain using the JMS implementation of binding.sca which
-automatically discovers available nodes and the services they contain.
-
-In this sample there are two nodes in the domain, a standalone node containing a Helloworld component,
-and a webapp using a JSP with <implementation.web> which invokes the Helloworld service in the domain.
-
-To run the sample:
-
-- Build the two sample modules with mvn or Ant.
-- Deploy the helloworld-webapp war to Tomcat.
-- Start the standalone node by:
- in the helloworld-node folder do "mvn dependency:copy-dependencies" then:
- java -Djava.ext.dirs=target\dependency -cp target\sample-helloworld-node.jar sample.HelloworldNode
-- On a web browser go to:
- http://localhost:8080/sample-helloworld-webapp
-
-You should see "Hello world" returned on the web page and the node console should show "HelloworldImpl.sayHello: world"
-
-How it works:
-
-
-
-
-
-
diff --git a/branches/sca-android/samples/helloworld-distributed/helloworld-webapp/build.xml b/branches/sca-android/samples/helloworld-distributed/helloworld-webapp/build.xml
deleted file mode 100644
index e08dd3027a..0000000000
--- a/branches/sca-android/samples/helloworld-distributed/helloworld-webapp/build.xml
+++ /dev/null
@@ -1,128 +0,0 @@
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT 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-helloworld-webapp" default="compile">
-
- <target name="compile">
- <mkdir dir="target/classes"/>
- <javac destdir="target/classes" debug="on" source="1.5" target="1.5">
- <src path="src\main\java"/>
- <classpath>
- <fileset refid="tuscany.jars"/>
- <fileset refid="3rdparty.jars"/>
- </classpath>
- </javac>
- <copy todir="target/classes">
- <fileset dir="src\main\resources"/>
- <fileset dir="." includes="*" excludes="src, target, pom.xml, build.xml"/>
- </copy>
- <war destfile="target/sample-helloworld-webapp.war" webxml="src/main/webapp/WEB-INF/web.xml">
- <fileset dir="src/main/webapp"/>
- <lib refid="tuscany.jars"/>
- <lib refid="3rdparty.jars"/>
- <classes dir="target/classes"/>
- </war>
- </target>
-
- <target name="package" depends="compile"/>
-
- <target name="clean">
- <delete includeemptydirs="true">
- <fileset dir="target"/>
- </delete>
- </target>
-
- <fileset id="tuscany.jars" dir="../../modules">
- <include name="tuscany-assembly-1.4-SNAPSHOT.jar"/>
- <include name="tuscany-assembly-xml-1.4-SNAPSHOT.jar"/>
- <include name="tuscany-assembly-xsd-1.4-SNAPSHOT.jar"/>
- <include name="tuscany-binding-jms-1.4-SNAPSHOT.jar"/>
- <include name="tuscany-binding-jms-runtime-1.4-SNAPSHOT.jar"/>
- <include name="tuscany-binding-sca-1.4-SNAPSHOT.jar"/>
- <include name="tuscany-binding-sca-jms-1.4-SNAPSHOT.jar"/>
- <include name="tuscany-binding-sca-xml-1.4-SNAPSHOT.jar"/>
- <include name="tuscany-contribution-1.4-SNAPSHOT.jar"/>
- <include name="tuscany-contribution-impl-1.4-SNAPSHOT.jar"/>
- <include name="tuscany-contribution-java-1.4-SNAPSHOT.jar"/>
- <include name="tuscany-contribution-namespace-1.4-SNAPSHOT.jar"/>
- <include name="tuscany-contribution-xml-1.4-SNAPSHOT.jar"/>
- <include name="tuscany-core-1.4-SNAPSHOT.jar"/>
- <include name="tuscany-core-databinding-1.4-SNAPSHOT.jar"/>
- <include name="tuscany-core-spi-1.4-SNAPSHOT.jar"/>
- <include name="tuscany-databinding-1.4-SNAPSHOT.jar"/>
- <include name="tuscany-databinding-axiom-1.4-SNAPSHOT.jar"/>
- <include name="tuscany-databinding-jaxb-1.4-SNAPSHOT.jar"/>
- <include name="tuscany-definitions-1.4-SNAPSHOT.jar"/>
- <include name="tuscany-definitions-xml-1.4-SNAPSHOT.jar"/>
- <include name="tuscany-endpoint-1.4-SNAPSHOT.jar"/>
- <include name="tuscany-extensibility-1.4-SNAPSHOT.jar"/>
- <include name="tuscany-host-embedded-1.4-SNAPSHOT.jar"/>
- <include name="tuscany-host-http-1.4-SNAPSHOT.jar"/>
- <include name="tuscany-host-webapp-1.4-SNAPSHOT.jar"/>
- <include name="tuscany-implementation-java-1.4-SNAPSHOT.jar"/>
- <include name="tuscany-implementation-java-runtime-1.4-SNAPSHOT.jar"/>
- <include name="tuscany-implementation-java-xml-1.4-SNAPSHOT.jar"/>
- <include name="tuscany-implementation-node-1.4-SNAPSHOT.jar"/>
- <include name="tuscany-implementation-web-1.4-SNAPSHOT.jar"/>
- <include name="tuscany-implementation-web-runtime-1.4-SNAPSHOT.jar"/>
- <include name="tuscany-interface-1.4-SNAPSHOT.jar"/>
- <include name="tuscany-interface-java-1.4-SNAPSHOT.jar"/>
- <include name="tuscany-interface-java-jaxws-1.4-SNAPSHOT.jar"/>
- <include name="tuscany-interface-java-xml-1.4-SNAPSHOT.jar"/>
- <include name="tuscany-monitor-1.4-SNAPSHOT.jar"/>
- <include name="tuscany-node-api-1.4-SNAPSHOT.jar"/>
- <include name="tuscany-node-impl-1.4-SNAPSHOT.jar"/>
- <include name="tuscany-policy-1.4-SNAPSHOT.jar"/>
- <include name="tuscany-policy-xml-1.4-SNAPSHOT.jar"/>
- <include name="tuscany-sca-api-1.4-SNAPSHOT.jar"/>
- <include name="tuscany-xsd-1.4-SNAPSHOT.jar"/>
- </fileset>
- <fileset id="3rdparty.jars" dir="../../lib">
- <include name="XmlSchema-1.3.2.jar"/>
- <include name="activation-1.1.jar"/>
- <include name="activeio-core-3.1.0-tests.jar"/>
- <include name="activeio-core-3.1.0.jar"/>
- <include name="activemq-core-5.1.0.jar"/>
- <include name="asm-all-3.1.jar"/>
- <include name="avalon-framework-4.1.3.jar"/>
- <include name="axiom-api-1.2.5.jar"/>
- <include name="axiom-impl-1.2.5.jar"/>
- <include name="backport-util-concurrent-2.1.jar"/>
- <include name="camel-core-1.3.0.jar"/>
- <include name="cglib-nodep-2.1_3.jar"/>
- <include name="commons-logging-1.1.jar"/>
- <include name="commons-logging-api-1.1.jar"/>
- <include name="geronimo-commonj_1.1_spec-1.0.jar"/>
- <include name="geronimo-j2ee-management_1.0_spec-1.0.jar"/>
- <include name="geronimo-jms_1.1_spec-1.1.1.jar"/>
- <include name="jaxb-api-2.1.jar"/>
- <include name="jaxb-impl-2.1.3.jar"/>
- <include name="jaxen-1.1-beta-9.jar"/>
- <include name="jaxws-api-2.1.jar"/>
- <include name="jsr181-api-1.0-MR1.jar"/>
- <include name="jsr250-api-1.0.jar"/>
- <include name="log4j-1.2.12.jar"/>
- <include name="logkit-1.0.1.jar"/>
- <include name="mail-1.4.jar"/>
- <include name="servlet-api-2.3.jar"/>
- <include name="stax-api-1.0-2.jar"/>
- <include name="wstx-asl-3.2.1.jar"/>
- </fileset>
-
-</project>
diff --git a/branches/sca-android/samples/helloworld-distributed/helloworld-webapp/pom.xml b/branches/sca-android/samples/helloworld-distributed/helloworld-webapp/pom.xml
deleted file mode 100644
index ee51fd55db..0000000000
--- a/branches/sca-android/samples/helloworld-distributed/helloworld-webapp/pom.xml
+++ /dev/null
@@ -1,78 +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-sca</artifactId>
- <version>1.4-SNAPSHOT</version>
- <relativePath>../../pom.xml</relativePath>
- </parent>
- <artifactId>sample-helloworld-webapp</artifactId>
- <packaging>war</packaging>
- <name>Apache Tuscany SCA Distributed Helloworld WebApp Sample</name>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-host-webapp</artifactId>
- <version>1.4-SNAPSHOT</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-sca-api</artifactId>
- <version>1.4-SNAPSHOT</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-implementation-web-runtime</artifactId>
- <version>1.4-SNAPSHOT</version>
- <scope>runtime</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-binding-sca-jms</artifactId>
- <version>1.4-SNAPSHOT</version>
- <scope>runtime</scope>
- </dependency>
-
- </dependencies>
-
- <build>
- <finalName>${artifactId}</finalName>
- <plugins>
- <plugin>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-maven-ant-generator</artifactId>
- <version>1.4-SNAPSHOT</version>
- <executions>
- <execution>
- <goals>
- <goal>generate</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-</project>
diff --git a/branches/sca-android/samples/helloworld-distributed/helloworld-webapp/src/main/java/sample/Helloworld.java b/branches/sca-android/samples/helloworld-distributed/helloworld-webapp/src/main/java/sample/Helloworld.java
deleted file mode 100644
index 7dd39b82a4..0000000000
--- a/branches/sca-android/samples/helloworld-distributed/helloworld-webapp/src/main/java/sample/Helloworld.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;
-
-import org.osoa.sca.annotations.Remotable;
-
-@Remotable
-public interface Helloworld {
-
- String sayHello(String name);
-}
diff --git a/branches/sca-android/samples/helloworld-distributed/helloworld-webapp/src/main/webapp/WEB-INF/web.composite b/branches/sca-android/samples/helloworld-distributed/helloworld-webapp/src/main/webapp/WEB-INF/web.composite
deleted file mode 100644
index 0e8de1be42..0000000000
--- a/branches/sca-android/samples/helloworld-distributed/helloworld-webapp/src/main/webapp/WEB-INF/web.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://www.osoa.org/xmlns/sca/1.0"
- targetNamespace="http://sample"
- name="Helloworld">
-
- <component name="foo">
- <implementation.web web-uri=""/>
- <reference name="service" target="HelloworldComponent" />
- </component>
-
-</composite>
diff --git a/branches/sca-android/samples/helloworld-distributed/helloworld-webapp/src/main/webapp/WEB-INF/web.xml b/branches/sca-android/samples/helloworld-distributed/helloworld-webapp/src/main/webapp/WEB-INF/web.xml
deleted file mode 100644
index 1eefec1c48..0000000000
--- a/branches/sca-android/samples/helloworld-distributed/helloworld-webapp/src/main/webapp/WEB-INF/web.xml
+++ /dev/null
@@ -1,41 +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 Distributed Helloworld 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/branches/sca-android/samples/helloworld-distributed/helloworld-webapp/src/main/webapp/hello.jsp b/branches/sca-android/samples/helloworld-distributed/helloworld-webapp/src/main/webapp/hello.jsp
deleted file mode 100644
index 873329cf7c..0000000000
--- a/branches/sca-android/samples/helloworld-distributed/helloworld-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.Helloworld" />
-
-<html>
- <body >
-
- <h2>Apache Tuscany Distributed Helloworld Sample</h2>
-
- Calling service.sayHello("world") returns:
-
- <p>
-
- <%= service.sayHello("world") %>
-
- </body>
-</html>
diff --git a/branches/sca-android/samples/helloworld-jsp/pom.xml b/branches/sca-android/samples/helloworld-jsp/pom.xml
deleted file mode 100644
index 05c303a013..0000000000
--- a/branches/sca-android/samples/helloworld-jsp/pom.xml
+++ /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.
--->
-<project>
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-sca</artifactId>
- <version>1.4-SNAPSHOT</version>
- <relativePath>../../pom.xml</relativePath>
- </parent>
- <artifactId>sample-helloworld-jsp</artifactId>
- <packaging>war</packaging>
- <name>Apache Tuscany SCA Helloworld JSP Sample</name>
-
- <dependencies>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-sca-api</artifactId>
- <version>1.4-SNAPSHOT</version>
- <scope>compile</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-implementation-web-runtime</artifactId>
- <version>1.4-SNAPSHOT</version>
- <scope>runtime</scope>
- </dependency>
-
- </dependencies>
-
- <build>
- <finalName>${artifactId}</finalName>
- </build>
-
-</project>
diff --git a/branches/sca-android/samples/helloworld-jsp/src/main/java/sample/HelloworldService.java b/branches/sca-android/samples/helloworld-jsp/src/main/java/sample/HelloworldService.java
deleted file mode 100644
index 2b92fd4661..0000000000
--- a/branches/sca-android/samples/helloworld-jsp/src/main/java/sample/HelloworldService.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package sample;
-
-public interface HelloworldService {
-
- String sayHello(String name);
-
-}
diff --git a/branches/sca-android/samples/helloworld-jsp/src/main/java/sample/HelloworldServiceImpl.java b/branches/sca-android/samples/helloworld-jsp/src/main/java/sample/HelloworldServiceImpl.java
deleted file mode 100644
index be83d3b407..0000000000
--- a/branches/sca-android/samples/helloworld-jsp/src/main/java/sample/HelloworldServiceImpl.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package sample;
-
-import org.osoa.sca.annotations.Service;
-
-@Service(HelloworldService.class)
-public class HelloworldServiceImpl implements HelloworldService {
-
- public String sayHello(String name) {
- return "Hello " + name;
- }
-
-}
diff --git a/branches/sca-android/samples/helloworld-jsp/src/main/webapp/META-INF/sca-deployables/web.composite b/branches/sca-android/samples/helloworld-jsp/src/main/webapp/META-INF/sca-deployables/web.composite
deleted file mode 100644
index 16bc08fc10..0000000000
--- a/branches/sca-android/samples/helloworld-jsp/src/main/webapp/META-INF/sca-deployables/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://www.osoa.org/xmlns/sca/1.0"
- xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"
- targetNamespace="http://samples"
- name="Helloworld">
-
- <component name="WebClient">
- <implementation.web web-uri=""/>
- <reference name="service" target="HelloworldService" />
- </component>
-
- <component name="HelloworldService">
- <implementation.java class="sample.HelloworldServiceImpl"/>
- </component>
-
-</composite>
diff --git a/branches/sca-android/samples/helloworld-jsp/src/main/webapp/WEB-INF/web.xml b/branches/sca-android/samples/helloworld-jsp/src/main/webapp/WEB-INF/web.xml
deleted file mode 100644
index 46285614da..0000000000
--- a/branches/sca-android/samples/helloworld-jsp/src/main/webapp/WEB-INF/web.xml
+++ /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.
--->
-
-<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/branches/sca-android/samples/helloworld-jsp/src/main/webapp/hello.jsp b/branches/sca-android/samples/helloworld-jsp/src/main/webapp/hello.jsp
deleted file mode 100644
index beac8e457f..0000000000
--- a/branches/sca-android/samples/helloworld-jsp/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>Apache Tuscany Helloworld JSP Sample</h2>
-
- Calling HelloworldService sayHello("world") returns:
-
- <p>
-
- <%= service.sayHello("world") %>
-
- </body>
-</html>
diff --git a/branches/sca-android/samples/helloworld-servlet/pom.xml b/branches/sca-android/samples/helloworld-servlet/pom.xml
deleted file mode 100644
index 84494d1598..0000000000
--- a/branches/sca-android/samples/helloworld-servlet/pom.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.
--->
-<project>
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-sca</artifactId>
- <version>1.4-SNAPSHOT</version>
- <relativePath>../../pom.xml</relativePath>
- </parent>
- <artifactId>sample-helloworld-servlet</artifactId>
- <packaging>war</packaging>
- <name>Apache Tuscany SCA Helloworld Sample using a servlet</name>
-
- <dependencies>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-sca-api</artifactId>
- <version>1.4-SNAPSHOT</version>
- <scope>compile</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-implementation-web-runtime</artifactId>
- <version>1.4-SNAPSHOT</version>
- <scope>runtime</scope>
- </dependency>
-
- <dependency>
- <groupId>javax.servlet</groupId>
- <artifactId>servlet-api</artifactId>
- <version>2.3</version>
- <scope>provided</scope>
- </dependency>
-
- </dependencies>
-
- <build>
- <finalName>${artifactId}</finalName>
- </build>
-
-</project>
diff --git a/branches/sca-android/samples/helloworld-servlet/src/main/java/sample/HelloworldService.java b/branches/sca-android/samples/helloworld-servlet/src/main/java/sample/HelloworldService.java
deleted file mode 100644
index 2b92fd4661..0000000000
--- a/branches/sca-android/samples/helloworld-servlet/src/main/java/sample/HelloworldService.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package sample;
-
-public interface HelloworldService {
-
- String sayHello(String name);
-
-}
diff --git a/branches/sca-android/samples/helloworld-servlet/src/main/java/sample/HelloworldServiceImpl.java b/branches/sca-android/samples/helloworld-servlet/src/main/java/sample/HelloworldServiceImpl.java
deleted file mode 100644
index be83d3b407..0000000000
--- a/branches/sca-android/samples/helloworld-servlet/src/main/java/sample/HelloworldServiceImpl.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package sample;
-
-import org.osoa.sca.annotations.Service;
-
-@Service(HelloworldService.class)
-public class HelloworldServiceImpl implements HelloworldService {
-
- public String sayHello(String name) {
- return "Hello " + name;
- }
-
-}
diff --git a/branches/sca-android/samples/helloworld-servlet/src/main/java/sample/HelloworldServlet.java b/branches/sca-android/samples/helloworld-servlet/src/main/java/sample/HelloworldServlet.java
deleted file mode 100644
index 0cdcc32e70..0000000000
--- a/branches/sca-android/samples/helloworld-servlet/src/main/java/sample/HelloworldServlet.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 sample;
-
-import java.io.IOException;
-import java.io.Writer;
-
-import javax.servlet.ServletConfig;
-import javax.servlet.http.HttpServlet;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
-import org.osoa.sca.ComponentContext;
-import org.osoa.sca.annotations.Reference;
-
-/**
- */
-public class HelloworldServlet extends HttpServlet {
- private static final long serialVersionUID = 1L;
-
- @Reference
- protected HelloworldService service;
-
- @Override
- public void init(ServletConfig config) {
- if (service == null) {
- // The helloworldService reference will only be injected from the @Reference
- // annotation in containers supporting SCA "deep" integration. In other
- // environments in can be looked up from the ComponentContext.
- ComponentContext cc = (ComponentContext)config.getServletContext().getAttribute("org.osoa.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/branches/sca-android/samples/helloworld-servlet/src/main/webapp/META-INF/sca-deployables/web.composite b/branches/sca-android/samples/helloworld-servlet/src/main/webapp/META-INF/sca-deployables/web.composite
deleted file mode 100644
index 23fd33a408..0000000000
--- a/branches/sca-android/samples/helloworld-servlet/src/main/webapp/META-INF/sca-deployables/web.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://www.osoa.org/xmlns/sca/1.0"
- targetNamespace="http://samples"
- name="Helloworld">
-
- <component name="WebClient">
- <implementation.web web-uri=""/>
- <reference name="service" target="HelloworldService"/>
- </component>
-
- <component name="HelloworldService">
- <implementation.java class="sample.HelloworldServiceImpl"/>
- </component>
-
-</composite>
diff --git a/branches/sca-android/samples/helloworld-servlet/src/main/webapp/WEB-INF/web.xml b/branches/sca-android/samples/helloworld-servlet/src/main/webapp/WEB-INF/web.xml
deleted file mode 100644
index 28cfdd3f6c..0000000000
--- a/branches/sca-android/samples/helloworld-servlet/src/main/webapp/WEB-INF/web.xml
+++ /dev/null
@@ -1,52 +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>
-
- <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>
-
- <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/branches/sca-android/samples/helloworld-servlet/src/main/webapp/hello.html b/branches/sca-android/samples/helloworld-servlet/src/main/webapp/hello.html
deleted file mode 100644
index c4484916aa..0000000000
--- a/branches/sca-android/samples/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/branches/sca-android/samples/helloworld-web-callback/pom.xml b/branches/sca-android/samples/helloworld-web-callback/pom.xml
deleted file mode 100644
index 54b422d64f..0000000000
--- a/branches/sca-android/samples/helloworld-web-callback/pom.xml
+++ /dev/null
@@ -1,68 +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-sca</artifactId>
- <version>1.4-SNAPSHOT</version>
- <relativePath>../../pom.xml</relativePath>
- </parent>
- <artifactId>sample-helloworld-web-callback</artifactId>
- <packaging>war</packaging>
- <name>Apache Tuscany SCA Web 2.0 Callbacks Sample</name>
-
- <dependencies>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-sca-api</artifactId>
- <version>1.4-SNAPSHOT</version>
- <scope>compile</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-implementation-web-runtime</artifactId>
- <version>1.4-SNAPSHOT</version>
- <scope>runtime</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-host-webapp</artifactId>
- <version>1.4-SNAPSHOT</version>
- <scope>runtime</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-binding-dwr</artifactId>
- <version>1.4-SNAPSHOT</version>
- <scope>runtime</scope>
- </dependency>
-
- </dependencies>
-
- <build>
- <finalName>${artifactId}</finalName>
- </build>
-
-</project>
diff --git a/branches/sca-android/samples/helloworld-web-callback/src/main/java/sample/HelloworldCallback.java b/branches/sca-android/samples/helloworld-web-callback/src/main/java/sample/HelloworldCallback.java
deleted file mode 100644
index 661f703dc8..0000000000
--- a/branches/sca-android/samples/helloworld-web-callback/src/main/java/sample/HelloworldCallback.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 sample;
-
-import org.osoa.sca.annotations.OneWay;
-import org.osoa.sca.annotations.Remotable;
-
-@Remotable
-public interface HelloworldCallback {
-
- @OneWay
- void sayHelloCallback(String reply);
-}
diff --git a/branches/sca-android/samples/helloworld-web-callback/src/main/java/sample/HelloworldService.java b/branches/sca-android/samples/helloworld-web-callback/src/main/java/sample/HelloworldService.java
deleted file mode 100644
index d2c1fc2def..0000000000
--- a/branches/sca-android/samples/helloworld-web-callback/src/main/java/sample/HelloworldService.java
+++ /dev/null
@@ -1,14 +0,0 @@
-package sample;
-
-import org.osoa.sca.annotations.Callback;
-import org.osoa.sca.annotations.OneWay;
-import org.osoa.sca.annotations.Remotable;
-
-@Remotable
-@Callback(HelloworldCallback.class)
-public interface HelloworldService {
-
- @OneWay
- void sayHello(String name);
-
-}
diff --git a/branches/sca-android/samples/helloworld-web-callback/src/main/java/sample/HelloworldServiceImpl.java b/branches/sca-android/samples/helloworld-web-callback/src/main/java/sample/HelloworldServiceImpl.java
deleted file mode 100644
index 8b52e42754..0000000000
--- a/branches/sca-android/samples/helloworld-web-callback/src/main/java/sample/HelloworldServiceImpl.java
+++ /dev/null
@@ -1,27 +0,0 @@
-package sample;
-
-import org.osoa.sca.annotations.Callback;
-import org.osoa.sca.annotations.Service;
-
-@Service(HelloworldService.class)
-public class HelloworldServiceImpl implements HelloworldService {
-
- @Callback
- public HelloworldCallback callback;
-
- public void sayHello(final String name) {
- Thread t = new Thread(new Runnable() {
- public void run() {
- for (int i=0; i<5; i++) {
- callback.sayHelloCallback(i + "Hello " + name);
- try {
- Thread.sleep(5000);
- } catch (InterruptedException e) {
- e.printStackTrace();
- }
- }
- }});
- t.start();
- }
-
-}
diff --git a/branches/sca-android/samples/helloworld-web-callback/src/main/webapp/META-INF/sca-deployables/web.composite b/branches/sca-android/samples/helloworld-web-callback/src/main/webapp/META-INF/sca-deployables/web.composite
deleted file mode 100644
index fdd5a95f58..0000000000
--- a/branches/sca-android/samples/helloworld-web-callback/src/main/webapp/META-INF/sca-deployables/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://www.osoa.org/xmlns/sca/1.0"
- xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"
- targetNamespace="http://samples"
- name="Helloworld">
-
- <component name="WebClient">
- <implementation.web web-uri=""/>
- <reference name="service" target="HelloworldService">
- <tuscany:binding.dwr />
- <callback>
- <tuscany:binding.dwr />
- </callback>
- </reference>
- </component>
-
- <component name="HelloworldService">
- <implementation.java class="sample.HelloworldServiceImpl"/>
- <service name="HelloworldService">
- <tuscany:binding.dwr />
- <callback>
- <tuscany:binding.dwr />
- </callback>
- </service>
- </component>
-
-</composite>
diff --git a/branches/sca-android/samples/helloworld-web-callback/src/main/webapp/WEB-INF/web.xml b/branches/sca-android/samples/helloworld-web-callback/src/main/webapp/WEB-INF/web.xml
deleted file mode 100644
index f29262a147..0000000000
--- a/branches/sca-android/samples/helloworld-web-callback/src/main/webapp/WEB-INF/web.xml
+++ /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.
--->
-
-<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>
-
- <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/branches/sca-android/samples/helloworld-web-callback/src/main/webapp/hello.html b/branches/sca-android/samples/helloworld-web-callback/src/main/webapp/hello.html
deleted file mode 100644
index 6d4c17626b..0000000000
--- a/branches/sca-android/samples/helloworld-web-callback/src/main/webapp/hello.html
+++ /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.
--->
-<html>
-
- <head>
- <title>Apache Tuscany Helloworld Web2.0 Callbacks Sample</title>
- <script type="text/javascript" src="org.osoa.sca.componentContext.js"></script>
-
- <script language="JavaScript">
-
- componentContext.getService("service").sayHelloCallback =
- function(reply) {
- document.getElementById('result').innerHTML=reply;
- };
-
- function callSayHello() {
- componentContext.getService("service").sayHello(document.getElementById('name').value);
- }
-
- </script>
-
- </head>
- <body >
-
- <h2>Apache Tuscany Helloworld Web2.0 Callbacks Sample</h2>
-
- <table>
- <tr>
- <td>Enter your name:</td>
- <td>
- <input type="text" id="name" width="10">
- </td>
- </tr>
- <tr>
- <td align="left" colspan="2">
- <button name="submit" onclick="callSayHello()">Say hello</button>
- </td>
- </tr>
- <tr>
- <td>
- <div id='result'></div>
- </td>
- </tr>
- </table>
-
- </body>
-</html>
diff --git a/branches/sca-android/samples/helloworld-web/pom.xml b/branches/sca-android/samples/helloworld-web/pom.xml
deleted file mode 100644
index 06b05a7c0e..0000000000
--- a/branches/sca-android/samples/helloworld-web/pom.xml
+++ /dev/null
@@ -1,68 +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-sca</artifactId>
- <version>1.4-SNAPSHOT</version>
- <relativePath>../../pom.xml</relativePath>
- </parent>
- <artifactId>sample-helloworld-web</artifactId>
- <packaging>war</packaging>
- <name>Apache Tuscany SCA Helloworld Web Sample</name>
-
- <dependencies>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-sca-api</artifactId>
- <version>1.4-SNAPSHOT</version>
- <scope>compile</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-implementation-web-runtime</artifactId>
- <version>1.4-SNAPSHOT</version>
- <scope>runtime</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-host-webapp</artifactId>
- <version>1.4-SNAPSHOT</version>
- <scope>runtime</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-binding-jsonrpc-runtime</artifactId>
- <version>1.4-SNAPSHOT</version>
- <scope>runtime</scope>
- </dependency>
-
- </dependencies>
-
- <build>
- <finalName>${artifactId}</finalName>
- </build>
-
-</project>
diff --git a/branches/sca-android/samples/helloworld-web/src/main/java/sample/HelloworldService.java b/branches/sca-android/samples/helloworld-web/src/main/java/sample/HelloworldService.java
deleted file mode 100644
index 2b92fd4661..0000000000
--- a/branches/sca-android/samples/helloworld-web/src/main/java/sample/HelloworldService.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package sample;
-
-public interface HelloworldService {
-
- String sayHello(String name);
-
-}
diff --git a/branches/sca-android/samples/helloworld-web/src/main/java/sample/HelloworldServiceImpl.java b/branches/sca-android/samples/helloworld-web/src/main/java/sample/HelloworldServiceImpl.java
deleted file mode 100644
index be83d3b407..0000000000
--- a/branches/sca-android/samples/helloworld-web/src/main/java/sample/HelloworldServiceImpl.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package sample;
-
-import org.osoa.sca.annotations.Service;
-
-@Service(HelloworldService.class)
-public class HelloworldServiceImpl implements HelloworldService {
-
- public String sayHello(String name) {
- return "Hello " + name;
- }
-
-}
diff --git a/branches/sca-android/samples/helloworld-web/src/main/webapp/META-INF/sca-deployables/web.composite b/branches/sca-android/samples/helloworld-web/src/main/webapp/META-INF/sca-deployables/web.composite
deleted file mode 100644
index 20cebc2d53..0000000000
--- a/branches/sca-android/samples/helloworld-web/src/main/webapp/META-INF/sca-deployables/web.composite
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
--->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
- xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"
- targetNamespace="http://samples"
- name="Helloworld">
-
- <component name="WebClient">
- <implementation.web web-uri=""/>
- <reference name="service" target="HelloworldService">
- <tuscany:binding.jsonrpc />
- </reference>
- </component>
-
- <component name="HelloworldService">
- <implementation.java class="sample.HelloworldServiceImpl"/>
- <service name="HelloworldService">
- <tuscany:binding.jsonrpc />
- </service>
- </component>
-
-</composite>
diff --git a/branches/sca-android/samples/helloworld-web/src/main/webapp/WEB-INF/web.xml b/branches/sca-android/samples/helloworld-web/src/main/webapp/WEB-INF/web.xml
deleted file mode 100644
index f29262a147..0000000000
--- a/branches/sca-android/samples/helloworld-web/src/main/webapp/WEB-INF/web.xml
+++ /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.
--->
-
-<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>
-
- <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/branches/sca-android/samples/helloworld-web/src/main/webapp/hello.html b/branches/sca-android/samples/helloworld-web/src/main/webapp/hello.html
deleted file mode 100644
index 83ac0ae576..0000000000
--- a/branches/sca-android/samples/helloworld-web/src/main/webapp/hello.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 Helloworld Web Sample</title>
- <script type="text/javascript" src="org.osoa.sca.componentContext.js"></script>
-
- <script language="JavaScript">
-
- function callSayHello() {
- componentContext.getService("service").sayHello(document.getElementById('name').value,
- function(reply) {
- document.getElementById('result').innerHTML=reply;
- }
- );
- }
-
- </script>
-
- </head>
- <body >
-
- <h2>Apache Tuscany Helloworld Web Sample</h2>
-
- <table>
- <tr>
- <td>Enter your name:</td>
- <td>
- <input type="text" id="name" width="10">
- </td>
- </tr>
- <tr>
- <td align="left" colspan="2">
- <button name="submit" onclick="callSayHello()">Say hello</button>
- </td>
- </tr>
- <tr>
- <td>
- <div id='result'></div>
- </td>
- </tr>
- </table>
-
- </body>
-</html>
diff --git a/branches/sca-android/samples/helloworld-ws-deep-webapp/README b/branches/sca-android/samples/helloworld-ws-deep-webapp/README
deleted file mode 100644
index 66040004f8..0000000000
--- a/branches/sca-android/samples/helloworld-ws-deep-webapp/README
+++ /dev/null
@@ -1 +0,0 @@
-http://localhost:8080/sample-helloworld-ws-service-webapp/SCA/HelloWorldService?wsdl
diff --git a/branches/sca-android/samples/helloworld-ws-deep-webapp/build.xml b/branches/sca-android/samples/helloworld-ws-deep-webapp/build.xml
deleted file mode 100644
index bdb341d26a..0000000000
--- a/branches/sca-android/samples/helloworld-ws-deep-webapp/build.xml
+++ /dev/null
@@ -1,158 +0,0 @@
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT 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-helloworld-ws-service-webapp" default="package">
- <property file="${user.home}/tuscany/build.properties" />
- <property file="${user.home}/build.properties" />
-
- <property name="tuscany.sca.manifest.location" value="../../lib/tuscany-sca-manifest.jar"/>
- <property name="tuscany.sca.lib.location" value="../../lib"/>
- <property name="tuscany.sca.modules.location" value="../../modules"/>
-
- <path id="project.classpath">
- <pathelement path="target/classes"/>
- <pathelement path="target/sdo-source"/>
- <pathelement location="${tuscany.sca.manifest.location}"/>
- </path>
-
- <target name="init">
- <mkdir dir="target/classes"/>
- <mkdir dir="target/sdo-source"/>
- </target>
-
-
- <target name="compile" depends="init">
- <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>
- </target>
-
- <target name="package" depends="compile">
- <war destfile="target/sample-helloworld-ws-service-webapp.war"
- webxml="src/main/webapp/WEB-INF/web.xml">
- <fileset dir="src/main/webapp"/>
- <zipfileset dir="${tuscany.sca.modules.location}" prefix="WEB-INF/lib">
- <include name="sca-api-1.4-SNAPSHOT.jar"/>
- <include name="tuscany-assembly-1.4-SNAPSHOT.jar"/>
- <include name="tuscany-assembly-xml-1.4-SNAPSHOT.jar"/>
- <include name="tuscany-binding-feed-1.4-SNAPSHOT.jar"/>
- <include name="tuscany-binding-jsonrpc-1.4-SNAPSHOT.jar"/>
- <include name="tuscany-binding-sca-1.4-SNAPSHOT.jar"/>
- <include name="tuscany-binding-sca-xml-1.4-SNAPSHOT.jar"/>
- <include name="tuscany-binding-ws-1.4-SNAPSHOT.jar"/>
- <include name="tuscany-binding-ws-axis2-1.4-SNAPSHOT.jar"/>
- <include name="tuscany-binding-ws-xml-1.4-SNAPSHOT.jar"/>
- <include name="tuscany-contribution-1.4-SNAPSHOT.jar"/>
- <include name="tuscany-contribution-impl-1.4-SNAPSHOT.jar"/>
- <include name="tuscany-contribution-java-1.4-SNAPSHOT.jar"/>
- <include name="tuscany-contribution-namespace-1.4-SNAPSHOT.jar"/>
- <include name="tuscany-core-1.4-SNAPSHOT.jar"/>
- <include name="tuscany-core-databinding-1.4-SNAPSHOT.jar"/>
- <include name="tuscany-core-spi-1.4-SNAPSHOT.jar"/>
- <include name="tuscany-databinding-1.4-SNAPSHOT.jar"/>
- <include name="tuscany-databinding-axiom-1.4-SNAPSHOT.jar"/>
- <include name="tuscany-databinding-jaxb-1.4-SNAPSHOT.jar"/>
- <include name="tuscany-databinding-sdo-1.4-SNAPSHOT.jar"/>
- <include name="tuscany-distributed-1.4-SNAPSHOT.jar"/>
- <include name="tuscany-extension-helper-1.4-SNAPSHOT.jar"/>
- <include name="tuscany-host-embedded-1.4-SNAPSHOT.jar"/>
- <include name="tuscany-host-http-1.4-SNAPSHOT.jar"/>
- <include name="tuscany-host-webapp-1.4-SNAPSHOT.jar"/>
- <include name="tuscany-implementation-java-1.4-SNAPSHOT.jar"/>
- <include name="tuscany-implementation-java-runtime-1.4-SNAPSHOT.jar"/>
- <include name="tuscany-implementation-java-xml-1.4-SNAPSHOT.jar"/>
- <include name="tuscany-interface-1.4-SNAPSHOT.jar"/>
- <include name="tuscany-interface-java-1.4-SNAPSHOT.jar"/>
- <include name="tuscany-interface-java-xml-1.4-SNAPSHOT.jar"/>
- <include name="tuscany-interface-wsdl-1.4-SNAPSHOT.jar"/>
- <include name="tuscany-interface-wsdl-runtime-1.4-SNAPSHOT.jar"/>
- <include name="tuscany-interface-wsdl-xml-1.4-SNAPSHOT.jar"/>
- <include name="tuscany-policy-1.4-SNAPSHOT.jar"/>
- <include name="tuscany-policy-xml-1.4-SNAPSHOT.jar"/>
- </zipfileset>
- <lib dir="${tuscany.sca.lib.location}">
- <include name="XmlSchema-1.3.1.jar"/>
- <include name="activation-1.1.jar"/>
- <include name="annogen-0.1.0.jar"/>
- <include name="ant-1.7.0.jar"/>
- <include name="ant-launcher-1.7.0.jar"/>
- <include name="axiom-api-1.2.4.jar"/>
- <include name="axiom-dom-1.2.4.jar"/>
- <include name="axiom-impl-1.2.4.jar"/>
- <include name="axis2-java2wsdl-1.2.jar"/>
- <include name="axis2-kernel-1.2.jar"/>
- <include name="backport-util-concurrent-2.2.jar"/>
- <include name="backport-util-concurrent-3.0.jar"/>
- <include name="cglib-nodep-2.1_3.jar"/>
- <include name="common-2.2.3.jar"/>
- <include name="commons-codec-1.3.jar"/>
- <include name="commons-fileupload-1.1.1.jar"/>
- <include name="commons-httpclient-3.0.1.jar"/>
- <include name="commons-io-1.1.jar"/>
- <include name="commons-logging-1.1.jar"/>
- <include name="ecore-2.2.3.jar"/>
- <include name="ecore-change-2.2.3.jar"/>
- <include name="ecore-xmi-2.2.3.jar"/>
- <include name="geronimo-commonj_1.1_spec-1.0.jar"/>
- <include name="geronimo-jms_1.1_spec-1.1.jar"/>
- <include name="jakarta-httpcore-4.0-alpha4.jar"/>
- <include name="jaxb-api-2.1.jar"/>
- <include name="jaxb-impl-2.1.4.jar"/>
- <include name="jaxen-1.1-beta-9.jar"/>
- <include name="jaxws-api-2.1.jar"/>
- <include name="jdom-1.0.jar"/>
- <include name="json-rpc-1.0.jar"/>
- <include name="jsr181-api-1.0-MR1.jar"/>
- <include name="jsr250-api-1.0.jar"/>
- <include name="mail-1.4.jar"/>
- <include name="neethi-2.0.1.jar"/>
- <include name="rome-0.9.jar"/>
- <include name="saaj-api-1.3.jar"/>
- <include name="sca-api-1.4-SNAPSHOT.jar"/>
- <include name="stax-api-1.0-2.jar"/>
- <include name="stax-api-1.0.1.jar"/>
- <include name="woden-1.0-incubating-M7a.jar"/>
- <include name="wsdl4j-1.6.2.jar"/>
- <include name="wstx-asl-3.2.1.jar"/>
- <include name="xercesImpl-2.8.1.jar"/>
- <include name="xml-apis-1.3.03.jar"/>
- <include name="xsd-2.2.3.jar"/>
- <include name="tuscany-sdo-api-r2.1-1.4-SNAPSHOT.jar"/>
- <include name="tuscany-sdo-impl-1.4-SNAPSHOT.jar"/>
- <include name="tuscany-sdo-lib-1.4-SNAPSHOT.jar"/>
- </lib>
- <classes dir="target/classes"/>
- <classes dir="target/sdo-source"/>
- </war>
- </target>
-
- <target name="clean">
- <delete quiet="true" includeemptydirs="true">
- <fileset dir="target"/>
- </delete>
- </target>
-</project>
diff --git a/branches/sca-android/samples/helloworld-ws-deep-webapp/pom.xml b/branches/sca-android/samples/helloworld-ws-deep-webapp/pom.xml
deleted file mode 100644
index 1651656c64..0000000000
--- a/branches/sca-android/samples/helloworld-ws-deep-webapp/pom.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
--->
-<project>
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-sca</artifactId>
- <version>1.4-SNAPSHOT</version>
- </parent>
-
- <artifactId>sample-helloworld-ws-service-webapp</artifactId>
- <name>Apache Tuscany SCA HelloWorld Web Service Sample Webapp</name>
- <packaging>war</packaging>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-sca-api</artifactId>
- <version>1.4-SNAPSHOT</version>
- <scope>provided</scope>
- </dependency>
- </dependencies>
-
- <build>
- <finalName>${artifactId}</finalName>
- </build>
-
-</project>
diff --git a/branches/sca-android/samples/helloworld-ws-deep-webapp/src/main/java/helloworld/HelloWorldImpl.java b/branches/sca-android/samples/helloworld-ws-deep-webapp/src/main/java/helloworld/HelloWorldImpl.java
deleted file mode 100644
index 0de3c70303..0000000000
--- a/branches/sca-android/samples/helloworld-ws-deep-webapp/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.osoa.sca.annotations.Service;
-
-/**
- * This class implements the HelloWorld service.
- */
-@Service(HelloWorldService.class)
-public class HelloWorldImpl implements HelloWorldService {
-
- public String getGreetings(String name) {
- return "Hello " + name;
- }
-
-}
diff --git a/branches/sca-android/samples/helloworld-ws-deep-webapp/src/main/java/helloworld/HelloWorldService.java b/branches/sca-android/samples/helloworld-ws-deep-webapp/src/main/java/helloworld/HelloWorldService.java
deleted file mode 100644
index 268d90e910..0000000000
--- a/branches/sca-android/samples/helloworld-ws-deep-webapp/src/main/java/helloworld/HelloWorldService.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 helloworld;
-
-import org.osoa.sca.annotations.Remotable;
-
-/**
- * This is the business interface of the HelloWorld greetings service.
- */
-@Remotable
-public interface HelloWorldService {
-
- public String getGreetings(String name);
-}
diff --git a/branches/sca-android/samples/helloworld-ws-deep-webapp/src/main/resources/META-INF/sca-deployables/helloworldws.composite b/branches/sca-android/samples/helloworld-ws-deep-webapp/src/main/resources/META-INF/sca-deployables/helloworldws.composite
deleted file mode 100644
index 114608e4d8..0000000000
--- a/branches/sca-android/samples/helloworld-ws-deep-webapp/src/main/resources/META-INF/sca-deployables/helloworldws.composite
+++ /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.
--->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
- name="helloworldws">
-
- <service name="HelloWorldService" promote="HelloWorldComponent">
- <interface.wsdl interface="http://helloworld#wsdl.interface(HelloWorld)" />
- <binding.ws />
- </service>
-
- <component name="HelloWorldComponent">
- <implementation.java class="helloworld.HelloWorldImpl" />
- </component>
-
-</composite>
diff --git a/branches/sca-android/samples/helloworld-ws-deep-webapp/src/main/resources/wsdl/helloworld.wsdl b/branches/sca-android/samples/helloworld-ws-deep-webapp/src/main/resources/wsdl/helloworld.wsdl
deleted file mode 100644
index 0b95fbd14f..0000000000
--- a/branches/sca-android/samples/helloworld-ws-deep-webapp/src/main/resources/wsdl/helloworld.wsdl
+++ /dev/null
@@ -1,79 +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="xsd:string"/>
- </sequence>
- </complexType>
- </element>
-
- <element name="getGreetingsResponse">
- <complexType>
- <sequence>
- <element name="getGreetingsReturn" type="xsd:string"/>
- </sequence>
- </complexType>
- </element>
-
- </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:8080/services/HelloWorldWebService"/>
- </wsdl:port>
- </wsdl:service>
-
-</wsdl:definitions>
diff --git a/branches/sca-android/samples/helloworld-ws-deep-webapp/src/main/webapp/WEB-INF/web.xml b/branches/sca-android/samples/helloworld-ws-deep-webapp/src/main/webapp/WEB-INF/web.xml
deleted file mode 100644
index 182fd38fd9..0000000000
--- a/branches/sca-android/samples/helloworld-ws-deep-webapp/src/main/webapp/WEB-INF/web.xml
+++ /dev/null
@@ -1,27 +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 HelloWorld Web Service Sample</display-name>
-
-</web-app>
diff --git a/branches/sca-android/samples/implementation-notification/README b/branches/sca-android/samples/implementation-notification/README
deleted file mode 100644
index 5b59358080..0000000000
--- a/branches/sca-android/samples/implementation-notification/README
+++ /dev/null
@@ -1,93 +0,0 @@
-Notification Implementation Sample
-===============================
-
-This sample illustrates the use of <implementation.notification/>
-
-The README in the samples directory (the directory above this) provides
-general instructions about building and running samples. Take a look there
-first.
-
-If you just want to run it to see what happens open a command prompt, navigate
-to this sample directory and do:
-
-ant run
-
-OR if you don't have ant, on Windows do
-
-java -cp ..\..\lib\tuscany-sca-manifest.jar;target\sample-implementation-notification.jar notification.TrafficAdvisoryClient
-
-OR you can also use Maven to test:
-
-mvn test
-
-Sample Overview
----------------
-
-This sample consists of a single composite that contains a notification component,
-a producer component and two consumer components. Take a look at the composite file
-or the .svg file which shows the composite file in pictorial form. The notification
-component has an <implementation.notification/> that refers to the component type
-that defines the TrafficAdvisory java interface. This interface indicates the
-makeup of the messages being sent and received and is also implemented by the
-consumer components.
-
-Sample directory structure:
-
-implementation-notification/
- src/
- main/
- java/
- notification/
- TestCaseProducer.java - interface for the producer component
- TrafficAdvisory.java - interface for the notification and consumer components
- TrafficAdvisoryConsumer.java - implementation for the consumer components
- TrafficAdvisoryProducer.java - implementation for the producer component
- test/
- java/
- notification/
- TrafficAdvisoryTestCase.java - JUnit test case
- resources/
- TrafficAdvisoryNotification.componentType - the component type referred to by
- <implementation.notification/>
- TrafficAdvisoryNotification.composite - the main composite including producer,
- notification component, and consumers
- pom.xml - the Maven build file
-
-Building And Running The Sample Using Ant
------------------------------------------
-With the binary distribution the sample can be built and run using Ant as
-follows
-
-cd implementation-notification
-ant compile
-ant run
-
-You should see the following output from the run target.
-
-run:
- [java] Consumer [Consumer1] received report: Nothing to report today
- [java] Consumer [Consumer2] received report: Nothing to report today
-
-Building And Running The Sample Using Maven
--------------------------------------------
-With either the binary or source distributions the sample can be built and run
-using Maven as follows.
-
-cd implementation-notification
-mvn
-
-You should see the following output from the test phase.
-
--------------------------------------------------------
- T E S T S
--------------------------------------------------------
-Running notification.TrafficAdvisoryTestCase
-Consumer [Consumer1] received report: Nothing to report today
-Consumer [Consumer2] received report: Nothing to report today
-Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 0.742 sec
-
-Results :
-
-Tests run: 1, Failures: 0, Errors: 0, Skipped: 0
-
-This shows that the Junit test cases have run successfully.
diff --git a/branches/sca-android/samples/implementation-notification/build.xml b/branches/sca-android/samples/implementation-notification/build.xml
deleted file mode 100644
index 110c7b84c1..0000000000
--- a/branches/sca-android/samples/implementation-notification/build.xml
+++ /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.
--->
-<project name="implementation-notification" default="compile">
- <property name="test.class" value="notification.TrafficAdvisoryClient" />
- <property name="test.jar" value="sample-implementation-notification.jar" />
-
- <target name="init">
- <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">
- <classpath>
- <pathelement location="../../lib/tuscany-sca-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-classes">
- <java classname="${test.class}"
- fork="true">
- <classpath>
- <pathelement path="target/classes"/>
- <pathelement location="../../lib/tuscany-sca-manifest.jar"/>
- </classpath>
- </java>
- </target>
-
- <target name="run">
- <java classname="${test.class}"
- fork="true">
- <classpath>
- <pathelement path="target/${test.jar}"/>
- <pathelement location="../../lib/tuscany-sca-manifest.jar"/>
- </classpath>
- </java>
- </target>
-
- <target name="clean">
- <delete quiet="true" includeemptydirs="true">
- <fileset dir="target"/>
- </delete>
- </target>
-</project>
diff --git a/branches/sca-android/samples/implementation-notification/implementation-notification.png b/branches/sca-android/samples/implementation-notification/implementation-notification.png
deleted file mode 100644
index 0b7ee34bf7..0000000000
--- a/branches/sca-android/samples/implementation-notification/implementation-notification.png
+++ /dev/null
Binary files differ
diff --git a/branches/sca-android/samples/implementation-notification/pom.xml b/branches/sca-android/samples/implementation-notification/pom.xml
deleted file mode 100644
index 584e3cc4c7..0000000000
--- a/branches/sca-android/samples/implementation-notification/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-sca</artifactId>
- <version>1.4-SNAPSHOT</version>
- <relativePath>../../pom.xml</relativePath>
- </parent>
- <artifactId>sample-implementation-notification</artifactId>
- <name>Apache Tuscany SCA Notification Implementation Sample</name>
- <version>1.4-SNAPSHOT</version>
- <description>A sample illustrating use of implementation.notification</description>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-implementation-notification</artifactId>
- <version>1.4-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-host-embedded</artifactId>
- <version>1.4-SNAPSHOT</version>
- </dependency>
- <!-- if this is not in, BuilderRegistryImpl throws NPE (line 96) -->
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-implementation-java-runtime</artifactId>
- <version>1.4-SNAPSHOT</version>
- <scope>test</scope>
- </dependency>
- <!-- end -->
-
- <!-- test dependencies -->
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.2</version>
- <scope>test</scope>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.5</source>
- <target>1.5</target>
- </configuration>
- </plugin>
- </plugins>
- <defaultGoal>install</defaultGoal>
- </build>
-</project>
diff --git a/branches/sca-android/samples/implementation-notification/src/main/java/notification/TestCaseProducer.java b/branches/sca-android/samples/implementation-notification/src/main/java/notification/TestCaseProducer.java
deleted file mode 100644
index bf8c72e0ce..0000000000
--- a/branches/sca-android/samples/implementation-notification/src/main/java/notification/TestCaseProducer.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT 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 notification;
-
-public interface TestCaseProducer {
-
- public void produceTrafficNotification(String report);
-}
diff --git a/branches/sca-android/samples/implementation-notification/src/main/java/notification/TrafficAdvisory.java b/branches/sca-android/samples/implementation-notification/src/main/java/notification/TrafficAdvisory.java
deleted file mode 100644
index 7bbfda2122..0000000000
--- a/branches/sca-android/samples/implementation-notification/src/main/java/notification/TrafficAdvisory.java
+++ /dev/null
@@ -1,24 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT 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 notification;
-
-public interface TrafficAdvisory {
-
- void trafficNotification(String report);
-}
diff --git a/branches/sca-android/samples/implementation-notification/src/main/java/notification/TrafficAdvisoryClient.java b/branches/sca-android/samples/implementation-notification/src/main/java/notification/TrafficAdvisoryClient.java
deleted file mode 100644
index da32bab58d..0000000000
--- a/branches/sca-android/samples/implementation-notification/src/main/java/notification/TrafficAdvisoryClient.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 notification;
-
-import notification.TestCaseProducer;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-
-public class TrafficAdvisoryClient {
-
- public static void main(String[] args) throws Exception {
- try {
- SCADomain domain = SCADomain.newInstance("TrafficAdvisoryNotification.composite");
- TestCaseProducer testCaseProducer = domain.getService(TestCaseProducer.class, "TrafficAdvisoryProducer");
-
- testCaseProducer.produceTrafficNotification("Nothing to report today");
-
- domain.close();
- } catch(Throwable e) {
- e.printStackTrace();
- if (e instanceof Exception) {
- throw (Exception)e;
- }
- else {
- throw new Exception(e);
- }
- }
- }
-}
diff --git a/branches/sca-android/samples/implementation-notification/src/main/java/notification/TrafficAdvisoryConsumer.java b/branches/sca-android/samples/implementation-notification/src/main/java/notification/TrafficAdvisoryConsumer.java
deleted file mode 100644
index 2aaae596be..0000000000
--- a/branches/sca-android/samples/implementation-notification/src/main/java/notification/TrafficAdvisoryConsumer.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 notification;
-
-import org.osoa.sca.annotations.Property;
-import org.osoa.sca.annotations.Scope;
-import org.osoa.sca.annotations.Service;
-
-/**
- * @version $Rev$ $Date$
- */
-@Service(TrafficAdvisory.class)
-@Scope("COMPOSITE")
-public class TrafficAdvisoryConsumer implements TrafficAdvisory {
-
- @Property
- protected String name;
-
- public void trafficNotification(String report) {
-
- System.out.println("Consumer [" + name + "] received report: " + report);
- }
-}
diff --git a/branches/sca-android/samples/implementation-notification/src/main/java/notification/TrafficAdvisoryProducer.java b/branches/sca-android/samples/implementation-notification/src/main/java/notification/TrafficAdvisoryProducer.java
deleted file mode 100644
index a0bb02e846..0000000000
--- a/branches/sca-android/samples/implementation-notification/src/main/java/notification/TrafficAdvisoryProducer.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 notification;
-
-import org.osoa.sca.annotations.Reference;
-import org.osoa.sca.annotations.Scope;
-import org.osoa.sca.annotations.Service;
-
-@Service(TestCaseProducer.class)
-@Scope("COMPOSITE")
-public class TrafficAdvisoryProducer implements TestCaseProducer {
-
- @Reference
- protected TrafficAdvisory destination;
-
- public void produceTrafficNotification(String report) {
-
- destination.trafficNotification(report);
- }
-}
diff --git a/branches/sca-android/samples/implementation-notification/src/main/resources/TrafficAdvisoryNotification.componentType b/branches/sca-android/samples/implementation-notification/src/main/resources/TrafficAdvisoryNotification.componentType
deleted file mode 100644
index 873e200613..0000000000
--- a/branches/sca-android/samples/implementation-notification/src/main/resources/TrafficAdvisoryNotification.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://www.osoa.org/xmlns/sca/1.0" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
- <service name="TrafficAdvisoryNotificationService">
- <interface.java interface="notification.TrafficAdvisory"/>
- </service>
-
- <reference name="TrafficAdvisoryNotificationReference"
- multiplicity="0..n">
- <interface.java interface="notification.TrafficAdvisory"/>
- </reference>
-</componentType>
diff --git a/branches/sca-android/samples/implementation-notification/src/main/resources/TrafficAdvisoryNotification.composite b/branches/sca-android/samples/implementation-notification/src/main/resources/TrafficAdvisoryNotification.composite
deleted file mode 100644
index bbf2281352..0000000000
--- a/branches/sca-android/samples/implementation-notification/src/main/resources/TrafficAdvisoryNotification.composite
+++ /dev/null
@@ -1,50 +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.
--->
-
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
- xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"
- targetNamespace="http://sample"
- xmlns:sample="http://sample"
- name="TrafficAdvisoryNotificationLocalComposite">
-
- <component name="TrafficAdvisoryProducer">
- <implementation.java class="notification.TrafficAdvisoryProducer"/>
- <reference name="destination" target="TrafficAdvisoryNotificationComponent"/>
- </component>
-
- <component name="TrafficAdvisoryNotificationComponent">
- <tuscany:implementation.notification name="TrafficAdvisoryNotification"/>
- <!-- Never use > 1 reference elements here !! -->
- <reference name="TrafficAdvisoryNotificationReference"
- multiplicity="0..n"
- target="TrafficAdvisoryConsumer1 TrafficAdvisoryConsumer2"/>
- </component>
-
- <component name="TrafficAdvisoryConsumer1">
- <implementation.java class="notification.TrafficAdvisoryConsumer"/>
- <property name="name">Consumer1</property>
- </component>
-
- <component name="TrafficAdvisoryConsumer2">
- <implementation.java class="notification.TrafficAdvisoryConsumer"/>
- <property name="name">Consumer2</property>
- </component>
-
-</composite>
diff --git a/branches/sca-android/samples/implementation-notification/src/test/java/notification/TrafficAdvisoryTestCase.java b/branches/sca-android/samples/implementation-notification/src/test/java/notification/TrafficAdvisoryTestCase.java
deleted file mode 100644
index 719141c94b..0000000000
--- a/branches/sca-android/samples/implementation-notification/src/test/java/notification/TrafficAdvisoryTestCase.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT 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 notification;
-
-import junit.framework.TestCase;
-
-import notification.TestCaseProducer;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-
-public class TrafficAdvisoryTestCase extends TestCase {
-
- private SCADomain domain;
- private TestCaseProducer testCaseProducer;
-
- public void testTrafficAdvisoryNotification() throws Exception {
- try {
- testCaseProducer.produceTrafficNotification("Nothing to report today");
- } catch(Throwable e) {
- e.printStackTrace();
- }
- }
-
- @Override
- protected void setUp() throws Exception {
- try {
- domain = SCADomain.newInstance("TrafficAdvisoryNotification.composite");
- testCaseProducer = domain.getService(TestCaseProducer.class, "TrafficAdvisoryProducer");
- } catch(Throwable e) {
- e.printStackTrace();
- if (e instanceof Exception) {
- throw (Exception)e;
- }
- else {
- throw new Exception(e);
- }
- }
- }
-
- @Override
- protected void tearDown() throws Exception {
- domain.close();
- }
-}
diff --git a/branches/sca-android/samples/implementation-notification/src/test/resources/TrafficAdvisoryNotification.componentType b/branches/sca-android/samples/implementation-notification/src/test/resources/TrafficAdvisoryNotification.componentType
deleted file mode 100644
index 873e200613..0000000000
--- a/branches/sca-android/samples/implementation-notification/src/test/resources/TrafficAdvisoryNotification.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://www.osoa.org/xmlns/sca/1.0" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
- <service name="TrafficAdvisoryNotificationService">
- <interface.java interface="notification.TrafficAdvisory"/>
- </service>
-
- <reference name="TrafficAdvisoryNotificationReference"
- multiplicity="0..n">
- <interface.java interface="notification.TrafficAdvisory"/>
- </reference>
-</componentType>
diff --git a/branches/sca-android/samples/implementation-notification/src/test/resources/TrafficAdvisoryNotification.composite b/branches/sca-android/samples/implementation-notification/src/test/resources/TrafficAdvisoryNotification.composite
deleted file mode 100644
index bbf2281352..0000000000
--- a/branches/sca-android/samples/implementation-notification/src/test/resources/TrafficAdvisoryNotification.composite
+++ /dev/null
@@ -1,50 +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.
--->
-
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
- xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"
- targetNamespace="http://sample"
- xmlns:sample="http://sample"
- name="TrafficAdvisoryNotificationLocalComposite">
-
- <component name="TrafficAdvisoryProducer">
- <implementation.java class="notification.TrafficAdvisoryProducer"/>
- <reference name="destination" target="TrafficAdvisoryNotificationComponent"/>
- </component>
-
- <component name="TrafficAdvisoryNotificationComponent">
- <tuscany:implementation.notification name="TrafficAdvisoryNotification"/>
- <!-- Never use > 1 reference elements here !! -->
- <reference name="TrafficAdvisoryNotificationReference"
- multiplicity="0..n"
- target="TrafficAdvisoryConsumer1 TrafficAdvisoryConsumer2"/>
- </component>
-
- <component name="TrafficAdvisoryConsumer1">
- <implementation.java class="notification.TrafficAdvisoryConsumer"/>
- <property name="name">Consumer1</property>
- </component>
-
- <component name="TrafficAdvisoryConsumer2">
- <implementation.java class="notification.TrafficAdvisoryConsumer"/>
- <property name="name">Consumer2</property>
- </component>
-
-</composite>
diff --git a/branches/sca-android/samples/pom.xml b/branches/sca-android/samples/pom.xml
index 5176eab59f..28ed3c1048 100644
--- a/branches/sca-android/samples/pom.xml
+++ b/branches/sca-android/samples/pom.xml
@@ -45,13 +45,13 @@
<modules>
<module>binding-echo</module>
<module>binding-echo-extension</module>
- <module>binding-notification-broker</module>
- <module>binding-notification-consumer</module>
- <module>binding-notification-producer</module>
<module>calculator</module>
- <module>calculator-lean</module>
+ <module>calculator2</module>
<module>calculator-distributed</module>
<module>calculator-implementation-policies</module>
+ <module>calculator-lean</module>
+ <module>calculator-osgi</module>
+ <module>calculator-rcp</module>
<module>calculator-rmi-reference</module>
<module>calculator-rmi-service</module>
<module>calculator-script</module>
@@ -60,44 +60,46 @@
<module>calculator-ws-webapp</module>
<module>callback-ws-client</module>
<module>callback-ws-service</module>
- <module>chat-webapp</module>
<module>customer-dojo</module>
<module>databinding-echo</module>
- <!--module>domain-webapp</module-->
<module>domain-management</module>
<module>feed-aggregator</module>
<module>feed-aggregator-webapp</module>
<module>helloworld-bpel</module>
+ <module>helloworld-bpel-ws</module>
<module>helloworld-dojo-webapp</module>
<module>helloworld-jms-webapp</module>
<module>helloworld-jsonrpc-webapp</module>
+ <module>helloworld-jsp</module>
<module>helloworld-reference-jms</module>
<module>helloworld-service-jms</module>
- <module>helloworld-ws-service</module>
- <module>helloworld-ws-service-jms</module>
- <module>helloworld-ws-service-secure</module>
+ <module>helloworld-servlet</module>
+ <module>helloworld-web</module>
+ <module>helloworld-web-callback</module>
<module>helloworld-ws-reference</module>
<module>helloworld-ws-reference-lean</module>
<module>helloworld-ws-reference-jms</module>
<module>helloworld-ws-reference-secure</module>
<module>helloworld-ws-sdo</module>
<module>helloworld-ws-sdo-webapp</module>
+ <module>helloworld-ws-service</module>
+ <module>helloworld-ws-service-jms</module>
+ <module>helloworld-ws-service-secure</module>
+ <module>helloworld-ws-service-webapp</module>
<module>implementation-composite</module>
<module>implementation-crud</module>
<module>implementation-crud-extension</module>
- <module>implementation-notification</module>
<module>implementation-pojo-extension</module>
<module>loanapplication</module>
- <module>osgi-supplychain</module>
<module>photo-gallery</module>
<module>quote-xquery</module>
<module>simple-bigbank</module>
<module>simple-bigbank-spring</module>
- <module>spring-bigbank-checkaccount</module>
- <module>spring-bigbank-calculator</module>
- <module>spring-bigbank-stockquote</module>
<module>simple-callback</module>
<module>simple-callback-ws</module>
+ <module>spring-bigbank-calculator</module>
+ <module>spring-bigbank-checkaccount</module>
+ <module>spring-bigbank-stockquote</module>
<module>store</module>
<module>store-distributed</module>
<module>supplychain</module>
diff --git a/branches/sca-android/samples/spi-implementation-pojo/pom.xml b/branches/sca-android/samples/spi-implementation-pojo/pom.xml
deleted file mode 100644
index c78d035eba..0000000000
--- a/branches/sca-android/samples/spi-implementation-pojo/pom.xml
+++ /dev/null
@@ -1,59 +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-sca</artifactId>
- <version>1.4-SNAPSHOT</version>
- <relativePath>../../pom.xml</relativePath>
- </parent>
- <artifactId>sample-spi-implementation-java</artifactId>
- <name>Apache Tuscany Java Implementation SPI Sample</name>
-
- <repositories>
- <repository>
- <id>apache.incubator</id>
- <url>http://people.apache.org/repo/m2-incubating-repository</url>
- </repository>
- </repositories>
-
- <dependencies>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-extension-helper</artifactId>
- <version>1.4-SNAPSHOT</version>
- </dependency>
-
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.2</version>
- <scope>test</scope>
- </dependency>
-
- </dependencies>
-
- <build>
- <finalName>${artifactId}</finalName>
- </build>
-
-</project>
diff --git a/branches/sca-android/samples/spi-implementation-pojo/src/main/java/sample/JavaImplementation.java b/branches/sca-android/samples/spi-implementation-pojo/src/main/java/sample/JavaImplementation.java
deleted file mode 100644
index 73104c3166..0000000000
--- a/branches/sca-android/samples/spi-implementation-pojo/src/main/java/sample/JavaImplementation.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 sample;
-
-
-public class JavaImplementation {
-
- private String className;
-
- public String getClass_() {
- return className;
- }
-
- public void setClass_(String className) {
- this.className = className;
- }
-
-}
diff --git a/branches/sca-android/samples/spi-implementation-pojo/src/main/java/sample/JavaImplementationActivator.java b/branches/sca-android/samples/spi-implementation-pojo/src/main/java/sample/JavaImplementationActivator.java
deleted file mode 100644
index 43efae32ca..0000000000
--- a/branches/sca-android/samples/spi-implementation-pojo/src/main/java/sample/JavaImplementationActivator.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 org.apache.tuscany.sca.assembly.ComponentType;
-import org.apache.tuscany.sca.runtime.RuntimeComponent;
-import org.apache.tuscany.sca.spi.ImplementationActivator;
-import org.apache.tuscany.sca.spi.InvokerFactory;
-
-public class JavaImplementationActivator implements ImplementationActivator<JavaImplementation> {
-
- public Class<JavaImplementation> getImplementationClass() {
- return JavaImplementation.class;
- }
-
- public InvokerFactory createInvokerFactory(RuntimeComponent rc, ComponentType ct, JavaImplementation implementation) {
- return new JavaInvokerFactory(rc, ct, implementation);
- }
-
-}
diff --git a/branches/sca-android/samples/spi-implementation-pojo/src/main/java/sample/JavaInvoker.java b/branches/sca-android/samples/spi-implementation-pojo/src/main/java/sample/JavaInvoker.java
deleted file mode 100644
index d65d4c8e4a..0000000000
--- a/branches/sca-android/samples/spi-implementation-pojo/src/main/java/sample/JavaInvoker.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 sample;
-
-import java.lang.reflect.Method;
-
-import org.apache.tuscany.sca.interfacedef.Operation;
-import org.apache.tuscany.sca.invocation.Invoker;
-import org.apache.tuscany.sca.invocation.Message;
-import org.osoa.sca.ServiceRuntimeException;
-
-public class JavaInvoker implements Invoker {
-
- protected Class clazz;
- protected Object instance;
- protected Operation operation;
-
- public JavaInvoker(Class clazz, Object instance, Operation operation) {
- this.clazz = clazz;
- this.instance = instance;
- this.operation = operation;
- }
-
- public Message invoke(Message msg) {
- try {
- msg.setBody(getMethod().invoke(instance, (Object[])msg.getBody()));
- } catch (Exception e) {
- throw new ServiceRuntimeException(e);
- }
- return msg;
- }
-
- protected Method getMethod() {
- for (Method method : clazz.getMethods()) {
- if (method.getName().equals(operation.getName())) {
- return method;
- }
- }
- throw new ServiceRuntimeException("no method found for operation: " + operation.getName());
- }
-
-}
diff --git a/branches/sca-android/samples/spi-implementation-pojo/src/main/java/sample/JavaInvokerFactory.java b/branches/sca-android/samples/spi-implementation-pojo/src/main/java/sample/JavaInvokerFactory.java
deleted file mode 100644
index 198befa928..0000000000
--- a/branches/sca-android/samples/spi-implementation-pojo/src/main/java/sample/JavaInvokerFactory.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT 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.apache.tuscany.sca.assembly.ComponentType;
-import org.apache.tuscany.sca.interfacedef.Operation;
-import org.apache.tuscany.sca.invocation.Invoker;
-import org.apache.tuscany.sca.runtime.RuntimeComponent;
-import org.apache.tuscany.sca.spi.InvokerFactory;
-import org.osoa.sca.ServiceRuntimeException;
-
-public class JavaInvokerFactory implements InvokerFactory {
-
- protected Object instance;
- protected Class clazz;
-
- public JavaInvokerFactory(RuntimeComponent rc, ComponentType ct, JavaImplementation implementation) {
- try {
- this.clazz = Class.forName(implementation.getClass_());
- this.instance = clazz.newInstance();
- } catch (Exception e) {
- throw new ServiceRuntimeException(e);
- }
- }
-
- public Invoker createInvoker(Operation operation) {
- return new JavaInvoker(clazz, instance, operation);
- }
-
-}
diff --git a/branches/sca-android/samples/spi-implementation-pojo/src/main/resources/META-INF/services/org.apache.tuscany.sca.spi.ImplementationActivator b/branches/sca-android/samples/spi-implementation-pojo/src/main/resources/META-INF/services/org.apache.tuscany.sca.spi.ImplementationActivator
deleted file mode 100644
index 95ee37c1aa..0000000000
--- a/branches/sca-android/samples/spi-implementation-pojo/src/main/resources/META-INF/services/org.apache.tuscany.sca.spi.ImplementationActivator
+++ /dev/null
@@ -1,18 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-# KIND, either express or implied. See the License for the
-# specific language governing permissions and limitations
-# under the License.
-# Implementation class for the ExtensionActivator
-sample.JavaImplementationActivator
diff --git a/branches/sca-android/samples/spi-implementation-pojo/src/test/java/helloworld/HelloWorld.java b/branches/sca-android/samples/spi-implementation-pojo/src/test/java/helloworld/HelloWorld.java
deleted file mode 100644
index cc32929f09..0000000000
--- a/branches/sca-android/samples/spi-implementation-pojo/src/test/java/helloworld/HelloWorld.java
+++ /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.
- */
-
-package helloworld;
-
-public interface HelloWorld {
-
- String sayHello(String name);
-
-}
diff --git a/branches/sca-android/samples/spi-implementation-pojo/src/test/java/helloworld/HelloWorldImpl.java b/branches/sca-android/samples/spi-implementation-pojo/src/test/java/helloworld/HelloWorldImpl.java
deleted file mode 100644
index 02af1ccf22..0000000000
--- a/branches/sca-android/samples/spi-implementation-pojo/src/test/java/helloworld/HelloWorldImpl.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 helloworld;
-
-public class HelloWorldImpl implements HelloWorld {
-
- public String sayHello(String name) {
- return "Hello " + name;
- }
-
-}
diff --git a/branches/sca-android/samples/spi-implementation-pojo/src/test/java/helloworld/HelloWorldTestCase.java b/branches/sca-android/samples/spi-implementation-pojo/src/test/java/helloworld/HelloWorldTestCase.java
deleted file mode 100644
index 5813fda330..0000000000
--- a/branches/sca-android/samples/spi-implementation-pojo/src/test/java/helloworld/HelloWorldTestCase.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 helloworld;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.host.embedded.SCADomain;
-
-/**
- */
-public class HelloWorldTestCase extends TestCase {
-
- public void testHello() throws Exception {
- SCADomain scaDomain = SCADomain.newInstance("helloworld/helloworld.composite");
- HelloWorld helloworld = scaDomain.getService(HelloWorld.class, "HelloWorldComponent");
- assertEquals("Hello petra", helloworld.sayHello("petra"));
- scaDomain.close();
- }
-}
diff --git a/branches/sca-android/samples/spi-implementation-pojo/src/test/resources/helloworld/helloworld.composite b/branches/sca-android/samples/spi-implementation-pojo/src/test/resources/helloworld/helloworld.composite
deleted file mode 100644
index fa9cecc160..0000000000
--- a/branches/sca-android/samples/spi-implementation-pojo/src/test/resources/helloworld/helloworld.composite
+++ /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.
--->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
- targetNamespace="http://test/helloworld"
- name="helloworld">
-
- <component name="HelloWorldComponent">
- <implementation.java class="helloworld.HelloWorldImpl" />
- </component>
-
-</composite>