summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--sca-java-1.x/branches/sca-java-1.6/samples/helloworld-distributed/README29
-rw-r--r--sca-java-1.x/branches/sca-java-1.6/samples/helloworld-distributed/helloworld-node/README29
-rw-r--r--sca-java-1.x/branches/sca-java-1.6/samples/helloworld-distributed/helloworld-node/pom.xml57
-rw-r--r--sca-java-1.x/branches/sca-java-1.6/samples/helloworld-distributed/helloworld-node/src/main/java/sample/Helloworld.java29
-rw-r--r--sca-java-1.x/branches/sca-java-1.6/samples/helloworld-distributed/helloworld-node/src/main/java/sample/HelloworldImpl.java29
-rw-r--r--sca-java-1.x/branches/sca-java-1.6/samples/helloworld-distributed/helloworld-node/src/main/resources/META-INF/sca-deployables/Helloworld.composite28
-rw-r--r--sca-java-1.x/branches/sca-java-1.6/samples/helloworld-distributed/helloworld-webapp/README29
-rw-r--r--sca-java-1.x/branches/sca-java-1.6/samples/helloworld-distributed/helloworld-webapp/build.xml127
-rw-r--r--sca-java-1.x/branches/sca-java-1.6/samples/helloworld-distributed/helloworld-webapp/pom.xml78
-rw-r--r--sca-java-1.x/branches/sca-java-1.6/samples/helloworld-distributed/helloworld-webapp/src/main/java/sample/Helloworld.java27
-rw-r--r--sca-java-1.x/branches/sca-java-1.6/samples/helloworld-distributed/helloworld-webapp/src/main/webapp/WEB-INF/web.composite29
-rw-r--r--sca-java-1.x/branches/sca-java-1.6/samples/helloworld-distributed/helloworld-webapp/src/main/webapp/WEB-INF/web.xml41
-rw-r--r--sca-java-1.x/branches/sca-java-1.6/samples/helloworld-distributed/helloworld-webapp/src/main/webapp/hello.jsp36
-rw-r--r--sca-java-1.x/branches/sca-java-1.6/samples/helloworld-jsp/pom.xml61
-rw-r--r--sca-java-1.x/branches/sca-java-1.6/samples/helloworld-jsp/src/main/java/sample/HelloworldService.java7
-rw-r--r--sca-java-1.x/branches/sca-java-1.6/samples/helloworld-jsp/src/main/java/sample/HelloworldServiceImpl.java12
-rw-r--r--sca-java-1.x/branches/sca-java-1.6/samples/helloworld-jsp/src/main/webapp/META-INF/sca-deployables/web.composite34
-rw-r--r--sca-java-1.x/branches/sca-java-1.6/samples/helloworld-jsp/src/main/webapp/WEB-INF/web.xml42
-rw-r--r--sca-java-1.x/branches/sca-java-1.6/samples/helloworld-jsp/src/main/webapp/hello.jsp36
-rw-r--r--sca-java-1.x/branches/sca-java-1.6/samples/helloworld-script/README97
-rw-r--r--sca-java-1.x/branches/sca-java-1.6/samples/helloworld-script/pom.xml50
-rw-r--r--sca-java-1.x/branches/sca-java-1.6/samples/helloworld-script/src/main/java/sample/Helloworld.java25
-rw-r--r--sca-java-1.x/branches/sca-java-1.6/samples/helloworld-script/src/main/java/sample/HelloworldClient.java44
-rw-r--r--sca-java-1.x/branches/sca-java-1.6/samples/helloworld-script/src/main/resources/helloworld.composite30
-rw-r--r--sca-java-1.x/branches/sca-java-1.6/samples/helloworld-script/src/main/resources/helloworld.js4
-rw-r--r--sca-java-1.x/branches/sca-java-1.6/samples/helloworld-script/src/test/java/sample/HelloworldTestCase.java51
-rw-r--r--sca-java-1.x/branches/sca-java-1.6/samples/helloworld-servlet/pom.xml68
-rw-r--r--sca-java-1.x/branches/sca-java-1.6/samples/helloworld-servlet/src/main/java/sample/HelloworldService.java7
-rw-r--r--sca-java-1.x/branches/sca-java-1.6/samples/helloworld-servlet/src/main/java/sample/HelloworldServiceImpl.java12
-rw-r--r--sca-java-1.x/branches/sca-java-1.6/samples/helloworld-servlet/src/main/java/sample/HelloworldServlet.java65
-rw-r--r--sca-java-1.x/branches/sca-java-1.6/samples/helloworld-servlet/src/main/webapp/META-INF/sca-deployables/web.composite33
-rw-r--r--sca-java-1.x/branches/sca-java-1.6/samples/helloworld-servlet/src/main/webapp/WEB-INF/web.xml52
-rw-r--r--sca-java-1.x/branches/sca-java-1.6/samples/helloworld-servlet/src/main/webapp/hello.html46
-rw-r--r--sca-java-1.x/branches/sca-java-1.6/samples/helloworld-spring/README97
-rw-r--r--sca-java-1.x/branches/sca-java-1.6/samples/helloworld-spring/pom.xml56
-rw-r--r--sca-java-1.x/branches/sca-java-1.6/samples/helloworld-spring/src/main/java/sample/Helloworld.java25
-rw-r--r--sca-java-1.x/branches/sca-java-1.6/samples/helloworld-spring/src/main/java/sample/HelloworldClient.java44
-rw-r--r--sca-java-1.x/branches/sca-java-1.6/samples/helloworld-spring/src/main/java/sample/HelloworldImpl.java27
-rw-r--r--sca-java-1.x/branches/sca-java-1.6/samples/helloworld-spring/src/main/resources/helloworld-spring-context.xml29
-rw-r--r--sca-java-1.x/branches/sca-java-1.6/samples/helloworld-spring/src/main/resources/helloworld.composite29
-rw-r--r--sca-java-1.x/branches/sca-java-1.6/samples/helloworld-spring/src/test/java/sample/HelloworldTestCase.java51
-rw-r--r--sca-java-1.x/branches/sca-java-1.6/samples/helloworld-web-callback/pom.xml68
-rw-r--r--sca-java-1.x/branches/sca-java-1.6/samples/helloworld-web-callback/src/main/java/sample/HelloworldCallback.java30
-rw-r--r--sca-java-1.x/branches/sca-java-1.6/samples/helloworld-web-callback/src/main/java/sample/HelloworldService.java14
-rw-r--r--sca-java-1.x/branches/sca-java-1.6/samples/helloworld-web-callback/src/main/java/sample/HelloworldServiceImpl.java27
-rw-r--r--sca-java-1.x/branches/sca-java-1.6/samples/helloworld-web-callback/src/main/webapp/META-INF/sca-deployables/web.composite45
-rw-r--r--sca-java-1.x/branches/sca-java-1.6/samples/helloworld-web-callback/src/main/webapp/WEB-INF/web.xml42
-rw-r--r--sca-java-1.x/branches/sca-java-1.6/samples/helloworld-web-callback/src/main/webapp/hello.html63
-rw-r--r--sca-java-1.x/branches/sca-java-1.6/samples/helloworld-web/pom.xml68
-rw-r--r--sca-java-1.x/branches/sca-java-1.6/samples/helloworld-web/src/main/java/sample/HelloworldService.java7
-rw-r--r--sca-java-1.x/branches/sca-java-1.6/samples/helloworld-web/src/main/java/sample/HelloworldServiceImpl.java12
-rw-r--r--sca-java-1.x/branches/sca-java-1.6/samples/helloworld-web/src/main/webapp/META-INF/sca-deployables/web.composite39
-rw-r--r--sca-java-1.x/branches/sca-java-1.6/samples/helloworld-web/src/main/webapp/WEB-INF/web.xml42
-rw-r--r--sca-java-1.x/branches/sca-java-1.6/samples/helloworld-web/src/main/webapp/hello.html62
54 files changed, 0 insertions, 2221 deletions
diff --git a/sca-java-1.x/branches/sca-java-1.6/samples/helloworld-distributed/README b/sca-java-1.x/branches/sca-java-1.6/samples/helloworld-distributed/README
deleted file mode 100644
index 9462ae4218..0000000000
--- a/sca-java-1.x/branches/sca-java-1.6/samples/helloworld-distributed/README
+++ /dev/null
@@ -1,29 +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 -jar target\dependency\tuscany-node-dynamic-1.4-SNAPSHOT.jar target\sample-helloworld-node.jar
-
-- 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/sca-java-1.x/branches/sca-java-1.6/samples/helloworld-distributed/helloworld-node/README b/sca-java-1.x/branches/sca-java-1.6/samples/helloworld-distributed/helloworld-node/README
deleted file mode 100644
index 9462ae4218..0000000000
--- a/sca-java-1.x/branches/sca-java-1.6/samples/helloworld-distributed/helloworld-node/README
+++ /dev/null
@@ -1,29 +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 -jar target\dependency\tuscany-node-dynamic-1.4-SNAPSHOT.jar target\sample-helloworld-node.jar
-
-- 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/sca-java-1.x/branches/sca-java-1.6/samples/helloworld-distributed/helloworld-node/pom.xml b/sca-java-1.x/branches/sca-java-1.6/samples/helloworld-distributed/helloworld-node/pom.xml
deleted file mode 100644
index 8de3f5101f..0000000000
--- a/sca-java-1.x/branches/sca-java-1.6/samples/helloworld-distributed/helloworld-node/pom.xml
+++ /dev/null
@@ -1,57 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
--->
-<project>
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-sca</artifactId>
- <version>1.6-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-sca-api</artifactId>
- <version>1.6-SNAPSHOT</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-node-dynamic</artifactId>
- <version>1.6-SNAPSHOT</version>
- <scope>test</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/sca-java-1.x/branches/sca-java-1.6/samples/helloworld-distributed/helloworld-node/src/main/java/sample/Helloworld.java b/sca-java-1.x/branches/sca-java-1.6/samples/helloworld-distributed/helloworld-node/src/main/java/sample/Helloworld.java
deleted file mode 100644
index 386426df73..0000000000
--- a/sca-java-1.x/branches/sca-java-1.6/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/sca-java-1.x/branches/sca-java-1.6/samples/helloworld-distributed/helloworld-node/src/main/java/sample/HelloworldImpl.java b/sca-java-1.x/branches/sca-java-1.6/samples/helloworld-distributed/helloworld-node/src/main/java/sample/HelloworldImpl.java
deleted file mode 100644
index 033b4088c8..0000000000
--- a/sca-java-1.x/branches/sca-java-1.6/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/sca-java-1.x/branches/sca-java-1.6/samples/helloworld-distributed/helloworld-node/src/main/resources/META-INF/sca-deployables/Helloworld.composite b/sca-java-1.x/branches/sca-java-1.6/samples/helloworld-distributed/helloworld-node/src/main/resources/META-INF/sca-deployables/Helloworld.composite
deleted file mode 100644
index 0f827390c8..0000000000
--- a/sca-java-1.x/branches/sca-java-1.6/samples/helloworld-distributed/helloworld-node/src/main/resources/META-INF/sca-deployables/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/sca-java-1.x/branches/sca-java-1.6/samples/helloworld-distributed/helloworld-webapp/README b/sca-java-1.x/branches/sca-java-1.6/samples/helloworld-distributed/helloworld-webapp/README
deleted file mode 100644
index 9462ae4218..0000000000
--- a/sca-java-1.x/branches/sca-java-1.6/samples/helloworld-distributed/helloworld-webapp/README
+++ /dev/null
@@ -1,29 +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 -jar target\dependency\tuscany-node-dynamic-1.4-SNAPSHOT.jar target\sample-helloworld-node.jar
-
-- 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/sca-java-1.x/branches/sca-java-1.6/samples/helloworld-distributed/helloworld-webapp/build.xml b/sca-java-1.x/branches/sca-java-1.6/samples/helloworld-distributed/helloworld-webapp/build.xml
deleted file mode 100644
index 0a0fd5ed9e..0000000000
--- a/sca-java-1.x/branches/sca-java-1.6/samples/helloworld-distributed/helloworld-webapp/build.xml
+++ /dev/null
@@ -1,127 +0,0 @@
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT 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"/>
- </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.6-SNAPSHOT.jar"/>
- <include name="tuscany-assembly-xml-1.6-SNAPSHOT.jar"/>
- <include name="tuscany-assembly-xsd-1.6-SNAPSHOT.jar"/>
- <include name="tuscany-binding-jms-1.6-SNAPSHOT.jar"/>
- <include name="tuscany-binding-jms-runtime-1.6-SNAPSHOT.jar"/>
- <include name="tuscany-binding-sca-1.6-SNAPSHOT.jar"/>
- <include name="tuscany-binding-sca-jms-1.6-SNAPSHOT.jar"/>
- <include name="tuscany-binding-sca-xml-1.6-SNAPSHOT.jar"/>
- <include name="tuscany-contribution-1.6-SNAPSHOT.jar"/>
- <include name="tuscany-contribution-impl-1.6-SNAPSHOT.jar"/>
- <include name="tuscany-contribution-java-1.6-SNAPSHOT.jar"/>
- <include name="tuscany-contribution-namespace-1.6-SNAPSHOT.jar"/>
- <include name="tuscany-contribution-xml-1.6-SNAPSHOT.jar"/>
- <include name="tuscany-core-1.6-SNAPSHOT.jar"/>
- <include name="tuscany-core-databinding-1.6-SNAPSHOT.jar"/>
- <include name="tuscany-core-spi-1.6-SNAPSHOT.jar"/>
- <include name="tuscany-databinding-1.6-SNAPSHOT.jar"/>
- <include name="tuscany-databinding-axiom-1.6-SNAPSHOT.jar"/>
- <include name="tuscany-databinding-jaxb-1.6-SNAPSHOT.jar"/>
- <include name="tuscany-definitions-1.6-SNAPSHOT.jar"/>
- <include name="tuscany-definitions-xml-1.6-SNAPSHOT.jar"/>
- <include name="tuscany-endpoint-1.6-SNAPSHOT.jar"/>
- <include name="tuscany-extensibility-1.6-SNAPSHOT.jar"/>
- <include name="tuscany-host-embedded-1.6-SNAPSHOT.jar"/>
- <include name="tuscany-host-http-1.6-SNAPSHOT.jar"/>
- <include name="tuscany-host-webapp-1.6-SNAPSHOT.jar"/>
- <include name="tuscany-implementation-java-1.6-SNAPSHOT.jar"/>
- <include name="tuscany-implementation-java-runtime-1.6-SNAPSHOT.jar"/>
- <include name="tuscany-implementation-java-xml-1.6-SNAPSHOT.jar"/>
- <include name="tuscany-implementation-node-1.6-SNAPSHOT.jar"/>
- <include name="tuscany-implementation-web-1.6-SNAPSHOT.jar"/>
- <include name="tuscany-implementation-web-runtime-1.6-SNAPSHOT.jar"/>
- <include name="tuscany-interface-1.6-SNAPSHOT.jar"/>
- <include name="tuscany-interface-java-1.6-SNAPSHOT.jar"/>
- <include name="tuscany-interface-java-jaxws-1.6-SNAPSHOT.jar"/>
- <include name="tuscany-interface-java-xml-1.6-SNAPSHOT.jar"/>
- <include name="tuscany-monitor-1.6-SNAPSHOT.jar"/>
- <include name="tuscany-node-api-1.6-SNAPSHOT.jar"/>
- <include name="tuscany-node-impl-1.6-SNAPSHOT.jar"/>
- <include name="tuscany-policy-1.6-SNAPSHOT.jar"/>
- <include name="tuscany-policy-xml-1.6-SNAPSHOT.jar"/>
- <include name="tuscany-sca-api-1.6-SNAPSHOT.jar"/>
- <include name="tuscany-xsd-1.6-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.7.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/sca-java-1.x/branches/sca-java-1.6/samples/helloworld-distributed/helloworld-webapp/pom.xml b/sca-java-1.x/branches/sca-java-1.6/samples/helloworld-distributed/helloworld-webapp/pom.xml
deleted file mode 100644
index ad1ffeb607..0000000000
--- a/sca-java-1.x/branches/sca-java-1.6/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.6-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.6-SNAPSHOT</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-sca-api</artifactId>
- <version>1.6-SNAPSHOT</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-implementation-web-runtime</artifactId>
- <version>1.6-SNAPSHOT</version>
- <scope>runtime</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-binding-sca-jms</artifactId>
- <version>1.6-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.6-SNAPSHOT</version>
- <executions>
- <execution>
- <goals>
- <goal>generate</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
-</project>
diff --git a/sca-java-1.x/branches/sca-java-1.6/samples/helloworld-distributed/helloworld-webapp/src/main/java/sample/Helloworld.java b/sca-java-1.x/branches/sca-java-1.6/samples/helloworld-distributed/helloworld-webapp/src/main/java/sample/Helloworld.java
deleted file mode 100644
index 7dd39b82a4..0000000000
--- a/sca-java-1.x/branches/sca-java-1.6/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/sca-java-1.x/branches/sca-java-1.6/samples/helloworld-distributed/helloworld-webapp/src/main/webapp/WEB-INF/web.composite b/sca-java-1.x/branches/sca-java-1.6/samples/helloworld-distributed/helloworld-webapp/src/main/webapp/WEB-INF/web.composite
deleted file mode 100644
index 0e8de1be42..0000000000
--- a/sca-java-1.x/branches/sca-java-1.6/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/sca-java-1.x/branches/sca-java-1.6/samples/helloworld-distributed/helloworld-webapp/src/main/webapp/WEB-INF/web.xml b/sca-java-1.x/branches/sca-java-1.6/samples/helloworld-distributed/helloworld-webapp/src/main/webapp/WEB-INF/web.xml
deleted file mode 100644
index 1eefec1c48..0000000000
--- a/sca-java-1.x/branches/sca-java-1.6/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/sca-java-1.x/branches/sca-java-1.6/samples/helloworld-distributed/helloworld-webapp/src/main/webapp/hello.jsp b/sca-java-1.x/branches/sca-java-1.6/samples/helloworld-distributed/helloworld-webapp/src/main/webapp/hello.jsp
deleted file mode 100644
index 873329cf7c..0000000000
--- a/sca-java-1.x/branches/sca-java-1.6/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/sca-java-1.x/branches/sca-java-1.6/samples/helloworld-jsp/pom.xml b/sca-java-1.x/branches/sca-java-1.6/samples/helloworld-jsp/pom.xml
deleted file mode 100644
index 820d8e3732..0000000000
--- a/sca-java-1.x/branches/sca-java-1.6/samples/helloworld-jsp/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.6-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.6-SNAPSHOT</version>
- <scope>compile</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-implementation-web-runtime</artifactId>
- <version>1.6-SNAPSHOT</version>
- <scope>runtime</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-host-webapp</artifactId>
- <version>1.6-SNAPSHOT</version>
- <scope>runtime</scope>
- </dependency>
-
- </dependencies>
-
- <build>
- <finalName>${artifactId}</finalName>
- </build>
-
-</project>
diff --git a/sca-java-1.x/branches/sca-java-1.6/samples/helloworld-jsp/src/main/java/sample/HelloworldService.java b/sca-java-1.x/branches/sca-java-1.6/samples/helloworld-jsp/src/main/java/sample/HelloworldService.java
deleted file mode 100644
index 2b92fd4661..0000000000
--- a/sca-java-1.x/branches/sca-java-1.6/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/sca-java-1.x/branches/sca-java-1.6/samples/helloworld-jsp/src/main/java/sample/HelloworldServiceImpl.java b/sca-java-1.x/branches/sca-java-1.6/samples/helloworld-jsp/src/main/java/sample/HelloworldServiceImpl.java
deleted file mode 100644
index be83d3b407..0000000000
--- a/sca-java-1.x/branches/sca-java-1.6/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/sca-java-1.x/branches/sca-java-1.6/samples/helloworld-jsp/src/main/webapp/META-INF/sca-deployables/web.composite b/sca-java-1.x/branches/sca-java-1.6/samples/helloworld-jsp/src/main/webapp/META-INF/sca-deployables/web.composite
deleted file mode 100644
index 16bc08fc10..0000000000
--- a/sca-java-1.x/branches/sca-java-1.6/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/sca-java-1.x/branches/sca-java-1.6/samples/helloworld-jsp/src/main/webapp/WEB-INF/web.xml b/sca-java-1.x/branches/sca-java-1.6/samples/helloworld-jsp/src/main/webapp/WEB-INF/web.xml
deleted file mode 100644
index 46285614da..0000000000
--- a/sca-java-1.x/branches/sca-java-1.6/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/sca-java-1.x/branches/sca-java-1.6/samples/helloworld-jsp/src/main/webapp/hello.jsp b/sca-java-1.x/branches/sca-java-1.6/samples/helloworld-jsp/src/main/webapp/hello.jsp
deleted file mode 100644
index beac8e457f..0000000000
--- a/sca-java-1.x/branches/sca-java-1.6/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/sca-java-1.x/branches/sca-java-1.6/samples/helloworld-script/README b/sca-java-1.x/branches/sca-java-1.6/samples/helloworld-script/README
deleted file mode 100644
index cde5fe981f..0000000000
--- a/sca-java-1.x/branches/sca-java-1.6/samples/helloworld-script/README
+++ /dev/null
@@ -1,97 +0,0 @@
-Calculator Sample
-=================
-This sample implements a simple calculator using SCA components.
-
-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-calculator.jar calculator.CalculatorClient
-
-and on *nix do
-
-java -cp ../../lib/tuscany-sca-manifest.jar:target/sample-calculator.jar calculator.CalculatorClient
-
-Sample Overview
----------------
-The sample provides a single calculator service with a default SCA (java)
-binding. The CalculatorClient exercises this interface by calling add,
-subtract, multiply and divide operations. This results in messages passing to
-the appropriate components in the composite across the local wires.
-
-calculator/
- src/
- main/
- java/
- calculator/
- CalculatorService.java - the first component, calls +-/* as
- appropriate
- CalculatorServiceImpl.java
- 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
- CalculatorClient.java - starts the SCA Runtime and
- deploys the Calculator.composite.
- It then calls the deployed Calculator
- Components services
- resources/
- Calculator.composite - the SCA assembly for this sample
- test/
- java/
- calculator/
- CalculatorTestCase.java - JUnit test case
- calculator.png - a pictorial representation of the sample
- .composite file
- build.xml - the Ant build file
- pom.xml - the Maven build file
-
-Building And Running The Sample Using Ant
------------------------------------------
-With the binary distribution the sample can be built and run using Ant as
-follows
-
-cd calculator
-ant compile
-ant run
-
-You should see the following output from the run target.
-
-run:
- [java] 3 + 2=5.0
- [java] 3 - 2=1.0
- [java] 3 * 2=6.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.
-
-cd calculator
-mvn
-
-You should see the following output from the test phase.
-
--------------------------------------------------------
- T E S T S
--------------------------------------------------------
-Running calculator.CalculatorTestCase
-Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 1.272 sec
-
-Results :
-
-Tests run: 1, Failures: 0, Errors: 0, Skipped: 0
-
-This shows that the Junit test cases have run successfully.
diff --git a/sca-java-1.x/branches/sca-java-1.6/samples/helloworld-script/pom.xml b/sca-java-1.x/branches/sca-java-1.6/samples/helloworld-script/pom.xml
deleted file mode 100644
index 35449556c4..0000000000
--- a/sca-java-1.x/branches/sca-java-1.6/samples/helloworld-script/pom.xml
+++ /dev/null
@@ -1,50 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
--->
-<project>
- <modelVersion>4.0.0</modelVersion>
- <parent>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-sca</artifactId>
- <version>1.6-SNAPSHOT</version>
- <relativePath>../../pom.xml</relativePath>
- </parent>
- <artifactId>sample-helloworld-spring</artifactId>
- <name>Apache Tuscany SCA Sample Helloworld Spring</name>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-base</artifactId>
- <version>1.6-SNAPSHOT</version>
- </dependency>
-
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.5</version>
- <scope>test</scope>
- </dependency>
-
- </dependencies>
-
- <build>
- <finalName>${artifactId}</finalName>
- </build>
-</project>
diff --git a/sca-java-1.x/branches/sca-java-1.6/samples/helloworld-script/src/main/java/sample/Helloworld.java b/sca-java-1.x/branches/sca-java-1.6/samples/helloworld-script/src/main/java/sample/Helloworld.java
deleted file mode 100644
index cd8ceef66b..0000000000
--- a/sca-java-1.x/branches/sca-java-1.6/samples/helloworld-script/src/main/java/sample/Helloworld.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package sample;
-
-public interface Helloworld {
-
- String sayHello(String name);
-
-}
diff --git a/sca-java-1.x/branches/sca-java-1.6/samples/helloworld-script/src/main/java/sample/HelloworldClient.java b/sca-java-1.x/branches/sca-java-1.6/samples/helloworld-script/src/main/java/sample/HelloworldClient.java
deleted file mode 100644
index dec7da2bb5..0000000000
--- a/sca-java-1.x/branches/sca-java-1.6/samples/helloworld-script/src/main/java/sample/HelloworldClient.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package sample;
-
-import org.apache.tuscany.sca.node.SCAClient;
-import org.apache.tuscany.sca.node.SCANode;
-import org.apache.tuscany.sca.node.SCANodeFactory;
-
-/**
- * This client program shows how to create an SCA runtime, start it,
- * and locate and invoke a SCA component
- */
-public class HelloworldClient {
-
- public static void main(String[] args) throws Exception {
-
- SCANode node = SCANodeFactory.newInstance().createSCANodeFromClassLoader("helloworld.composite", Helloworld.class.getClassLoader());
- node.start();
-
- Helloworld service = ((SCAClient)node).getService(Helloworld.class, "HelloworldComponent");
-
- System.out.println(service.sayHello("world"));
-
- node.stop();
- }
-
-}
diff --git a/sca-java-1.x/branches/sca-java-1.6/samples/helloworld-script/src/main/resources/helloworld.composite b/sca-java-1.x/branches/sca-java-1.6/samples/helloworld-script/src/main/resources/helloworld.composite
deleted file mode 100644
index e69405ef0c..0000000000
--- a/sca-java-1.x/branches/sca-java-1.6/samples/helloworld-script/src/main/resources/helloworld.composite
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
--->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
- targetNamespace="http://sample"
- xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"
- xmlns:sample="http://sample"
- name="Helloworld">
-
- <component name="HelloworldComponent">
- <tuscany:implementation.script script="helloworld.js"/>
- </component>
-
-</composite>
diff --git a/sca-java-1.x/branches/sca-java-1.6/samples/helloworld-script/src/main/resources/helloworld.js b/sca-java-1.x/branches/sca-java-1.6/samples/helloworld-script/src/main/resources/helloworld.js
deleted file mode 100644
index 8a336ab1e7..0000000000
--- a/sca-java-1.x/branches/sca-java-1.6/samples/helloworld-script/src/main/resources/helloworld.js
+++ /dev/null
@@ -1,4 +0,0 @@
-
-function sayHello(name) {
- return "Hello " + name;
-} \ No newline at end of file
diff --git a/sca-java-1.x/branches/sca-java-1.6/samples/helloworld-script/src/test/java/sample/HelloworldTestCase.java b/sca-java-1.x/branches/sca-java-1.6/samples/helloworld-script/src/test/java/sample/HelloworldTestCase.java
deleted file mode 100644
index 0eb135bdb7..0000000000
--- a/sca-java-1.x/branches/sca-java-1.6/samples/helloworld-script/src/test/java/sample/HelloworldTestCase.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package sample;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.node.SCAClient;
-import org.apache.tuscany.sca.node.SCANode;
-import org.apache.tuscany.sca.node.SCANodeFactory;
-
-/**
- * This shows how to test the Helloworld component.
- */
-public class HelloworldTestCase extends TestCase {
-
- private Helloworld service;
- private SCANode node;
-
- @Override
- protected void setUp() throws Exception {
- node = SCANodeFactory.newInstance().createSCANodeFromClassLoader("helloworld.composite", getClass().getClassLoader());
- node.start();
-
- service = ((SCAClient)node).getService(Helloworld.class, "HelloworldComponent");
- }
-
- @Override
- protected void tearDown() throws Exception {
- node.stop();
- }
-
- public void testHelloworld() throws Exception {
- assertEquals("Hello petra", service.sayHello("petra"));
- }
-}
diff --git a/sca-java-1.x/branches/sca-java-1.6/samples/helloworld-servlet/pom.xml b/sca-java-1.x/branches/sca-java-1.6/samples/helloworld-servlet/pom.xml
deleted file mode 100644
index 8d2d6bc214..0000000000
--- a/sca-java-1.x/branches/sca-java-1.6/samples/helloworld-servlet/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.6-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.6-SNAPSHOT</version>
- <scope>compile</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-implementation-web-runtime</artifactId>
- <version>1.6-SNAPSHOT</version>
- <scope>runtime</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-host-webapp</artifactId>
- <version>1.6-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/sca-java-1.x/branches/sca-java-1.6/samples/helloworld-servlet/src/main/java/sample/HelloworldService.java b/sca-java-1.x/branches/sca-java-1.6/samples/helloworld-servlet/src/main/java/sample/HelloworldService.java
deleted file mode 100644
index 2b92fd4661..0000000000
--- a/sca-java-1.x/branches/sca-java-1.6/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/sca-java-1.x/branches/sca-java-1.6/samples/helloworld-servlet/src/main/java/sample/HelloworldServiceImpl.java b/sca-java-1.x/branches/sca-java-1.6/samples/helloworld-servlet/src/main/java/sample/HelloworldServiceImpl.java
deleted file mode 100644
index be83d3b407..0000000000
--- a/sca-java-1.x/branches/sca-java-1.6/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/sca-java-1.x/branches/sca-java-1.6/samples/helloworld-servlet/src/main/java/sample/HelloworldServlet.java b/sca-java-1.x/branches/sca-java-1.6/samples/helloworld-servlet/src/main/java/sample/HelloworldServlet.java
deleted file mode 100644
index 0cdcc32e70..0000000000
--- a/sca-java-1.x/branches/sca-java-1.6/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/sca-java-1.x/branches/sca-java-1.6/samples/helloworld-servlet/src/main/webapp/META-INF/sca-deployables/web.composite b/sca-java-1.x/branches/sca-java-1.6/samples/helloworld-servlet/src/main/webapp/META-INF/sca-deployables/web.composite
deleted file mode 100644
index 23fd33a408..0000000000
--- a/sca-java-1.x/branches/sca-java-1.6/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/sca-java-1.x/branches/sca-java-1.6/samples/helloworld-servlet/src/main/webapp/WEB-INF/web.xml b/sca-java-1.x/branches/sca-java-1.6/samples/helloworld-servlet/src/main/webapp/WEB-INF/web.xml
deleted file mode 100644
index 28cfdd3f6c..0000000000
--- a/sca-java-1.x/branches/sca-java-1.6/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/sca-java-1.x/branches/sca-java-1.6/samples/helloworld-servlet/src/main/webapp/hello.html b/sca-java-1.x/branches/sca-java-1.6/samples/helloworld-servlet/src/main/webapp/hello.html
deleted file mode 100644
index c4484916aa..0000000000
--- a/sca-java-1.x/branches/sca-java-1.6/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/sca-java-1.x/branches/sca-java-1.6/samples/helloworld-spring/README b/sca-java-1.x/branches/sca-java-1.6/samples/helloworld-spring/README
deleted file mode 100644
index cde5fe981f..0000000000
--- a/sca-java-1.x/branches/sca-java-1.6/samples/helloworld-spring/README
+++ /dev/null
@@ -1,97 +0,0 @@
-Calculator Sample
-=================
-This sample implements a simple calculator using SCA components.
-
-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-calculator.jar calculator.CalculatorClient
-
-and on *nix do
-
-java -cp ../../lib/tuscany-sca-manifest.jar:target/sample-calculator.jar calculator.CalculatorClient
-
-Sample Overview
----------------
-The sample provides a single calculator service with a default SCA (java)
-binding. The CalculatorClient exercises this interface by calling add,
-subtract, multiply and divide operations. This results in messages passing to
-the appropriate components in the composite across the local wires.
-
-calculator/
- src/
- main/
- java/
- calculator/
- CalculatorService.java - the first component, calls +-/* as
- appropriate
- CalculatorServiceImpl.java
- 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
- CalculatorClient.java - starts the SCA Runtime and
- deploys the Calculator.composite.
- It then calls the deployed Calculator
- Components services
- resources/
- Calculator.composite - the SCA assembly for this sample
- test/
- java/
- calculator/
- CalculatorTestCase.java - JUnit test case
- calculator.png - a pictorial representation of the sample
- .composite file
- build.xml - the Ant build file
- pom.xml - the Maven build file
-
-Building And Running The Sample Using Ant
------------------------------------------
-With the binary distribution the sample can be built and run using Ant as
-follows
-
-cd calculator
-ant compile
-ant run
-
-You should see the following output from the run target.
-
-run:
- [java] 3 + 2=5.0
- [java] 3 - 2=1.0
- [java] 3 * 2=6.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.
-
-cd calculator
-mvn
-
-You should see the following output from the test phase.
-
--------------------------------------------------------
- T E S T S
--------------------------------------------------------
-Running calculator.CalculatorTestCase
-Tests run: 1, Failures: 0, Errors: 0, Skipped: 0, Time elapsed: 1.272 sec
-
-Results :
-
-Tests run: 1, Failures: 0, Errors: 0, Skipped: 0
-
-This shows that the Junit test cases have run successfully.
diff --git a/sca-java-1.x/branches/sca-java-1.6/samples/helloworld-spring/pom.xml b/sca-java-1.x/branches/sca-java-1.6/samples/helloworld-spring/pom.xml
deleted file mode 100644
index f0f7c1a937..0000000000
--- a/sca-java-1.x/branches/sca-java-1.6/samples/helloworld-spring/pom.xml
+++ /dev/null
@@ -1,56 +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.6-SNAPSHOT</version>
- <relativePath>../../pom.xml</relativePath>
- </parent>
- <artifactId>sample-helloworld-spring</artifactId>
- <name>Apache Tuscany SCA Sample Helloworld Spring</name>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-base</artifactId>
- <version>1.6-SNAPSHOT</version>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-spring</artifactId>
- <version>1.6-SNAPSHOT</version>
- </dependency>
-
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.5</version>
- <scope>test</scope>
- </dependency>
-
- </dependencies>
-
- <build>
- <finalName>${artifactId}</finalName>
- </build>
-</project>
diff --git a/sca-java-1.x/branches/sca-java-1.6/samples/helloworld-spring/src/main/java/sample/Helloworld.java b/sca-java-1.x/branches/sca-java-1.6/samples/helloworld-spring/src/main/java/sample/Helloworld.java
deleted file mode 100644
index cd8ceef66b..0000000000
--- a/sca-java-1.x/branches/sca-java-1.6/samples/helloworld-spring/src/main/java/sample/Helloworld.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package sample;
-
-public interface Helloworld {
-
- String sayHello(String name);
-
-}
diff --git a/sca-java-1.x/branches/sca-java-1.6/samples/helloworld-spring/src/main/java/sample/HelloworldClient.java b/sca-java-1.x/branches/sca-java-1.6/samples/helloworld-spring/src/main/java/sample/HelloworldClient.java
deleted file mode 100644
index dec7da2bb5..0000000000
--- a/sca-java-1.x/branches/sca-java-1.6/samples/helloworld-spring/src/main/java/sample/HelloworldClient.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-
-package sample;
-
-import org.apache.tuscany.sca.node.SCAClient;
-import org.apache.tuscany.sca.node.SCANode;
-import org.apache.tuscany.sca.node.SCANodeFactory;
-
-/**
- * This client program shows how to create an SCA runtime, start it,
- * and locate and invoke a SCA component
- */
-public class HelloworldClient {
-
- public static void main(String[] args) throws Exception {
-
- SCANode node = SCANodeFactory.newInstance().createSCANodeFromClassLoader("helloworld.composite", Helloworld.class.getClassLoader());
- node.start();
-
- Helloworld service = ((SCAClient)node).getService(Helloworld.class, "HelloworldComponent");
-
- System.out.println(service.sayHello("world"));
-
- node.stop();
- }
-
-}
diff --git a/sca-java-1.x/branches/sca-java-1.6/samples/helloworld-spring/src/main/java/sample/HelloworldImpl.java b/sca-java-1.x/branches/sca-java-1.6/samples/helloworld-spring/src/main/java/sample/HelloworldImpl.java
deleted file mode 100644
index 089b1a4290..0000000000
--- a/sca-java-1.x/branches/sca-java-1.6/samples/helloworld-spring/src/main/java/sample/HelloworldImpl.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package sample;
-
-public class HelloworldImpl implements Helloworld {
-
- public String sayHello(String name) {
- return "Hello " + name;
- }
-
-}
diff --git a/sca-java-1.x/branches/sca-java-1.6/samples/helloworld-spring/src/main/resources/helloworld-spring-context.xml b/sca-java-1.x/branches/sca-java-1.6/samples/helloworld-spring/src/main/resources/helloworld-spring-context.xml
deleted file mode 100644
index 6aea68b084..0000000000
--- a/sca-java-1.x/branches/sca-java-1.6/samples/helloworld-spring/src/main/resources/helloworld-spring-context.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
--->
-<beans xmlns="http://www.springframework.org/schema/beans"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:sca="http://www.springframework.org/schema/sca"
- xsi:schemaLocation="
- http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
- http://www.springframework.org/schema/sca http://www.osoa.org/xmlns/sca/1.0/spring-sca.xsd">
-
- <bean id="HelloworldBean" class="sample.HelloworldImpl" />
-
-</beans>
diff --git a/sca-java-1.x/branches/sca-java-1.6/samples/helloworld-spring/src/main/resources/helloworld.composite b/sca-java-1.x/branches/sca-java-1.6/samples/helloworld-spring/src/main/resources/helloworld.composite
deleted file mode 100644
index 4d73f398d9..0000000000
--- a/sca-java-1.x/branches/sca-java-1.6/samples/helloworld-spring/src/main/resources/helloworld.composite
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
--->
-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"
- targetNamespace="http://sample"
- xmlns:sample="http://sample"
- name="Helloworld">
-
- <component name="HelloworldComponent">
- <implementation.spring location="helloworld-spring-context.xml"/>
- </component>
-
-</composite>
diff --git a/sca-java-1.x/branches/sca-java-1.6/samples/helloworld-spring/src/test/java/sample/HelloworldTestCase.java b/sca-java-1.x/branches/sca-java-1.6/samples/helloworld-spring/src/test/java/sample/HelloworldTestCase.java
deleted file mode 100644
index 0eb135bdb7..0000000000
--- a/sca-java-1.x/branches/sca-java-1.6/samples/helloworld-spring/src/test/java/sample/HelloworldTestCase.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package sample;
-
-import junit.framework.TestCase;
-
-import org.apache.tuscany.sca.node.SCAClient;
-import org.apache.tuscany.sca.node.SCANode;
-import org.apache.tuscany.sca.node.SCANodeFactory;
-
-/**
- * This shows how to test the Helloworld component.
- */
-public class HelloworldTestCase extends TestCase {
-
- private Helloworld service;
- private SCANode node;
-
- @Override
- protected void setUp() throws Exception {
- node = SCANodeFactory.newInstance().createSCANodeFromClassLoader("helloworld.composite", getClass().getClassLoader());
- node.start();
-
- service = ((SCAClient)node).getService(Helloworld.class, "HelloworldComponent");
- }
-
- @Override
- protected void tearDown() throws Exception {
- node.stop();
- }
-
- public void testHelloworld() throws Exception {
- assertEquals("Hello petra", service.sayHello("petra"));
- }
-}
diff --git a/sca-java-1.x/branches/sca-java-1.6/samples/helloworld-web-callback/pom.xml b/sca-java-1.x/branches/sca-java-1.6/samples/helloworld-web-callback/pom.xml
deleted file mode 100644
index 7aaa046fcb..0000000000
--- a/sca-java-1.x/branches/sca-java-1.6/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.6-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.6-SNAPSHOT</version>
- <scope>compile</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-implementation-web-runtime</artifactId>
- <version>1.6-SNAPSHOT</version>
- <scope>runtime</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-host-webapp</artifactId>
- <version>1.6-SNAPSHOT</version>
- <scope>runtime</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-binding-dwr</artifactId>
- <version>1.6-SNAPSHOT</version>
- <scope>runtime</scope>
- </dependency>
-
- </dependencies>
-
- <build>
- <finalName>${artifactId}</finalName>
- </build>
-
-</project>
diff --git a/sca-java-1.x/branches/sca-java-1.6/samples/helloworld-web-callback/src/main/java/sample/HelloworldCallback.java b/sca-java-1.x/branches/sca-java-1.6/samples/helloworld-web-callback/src/main/java/sample/HelloworldCallback.java
deleted file mode 100644
index 661f703dc8..0000000000
--- a/sca-java-1.x/branches/sca-java-1.6/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/sca-java-1.x/branches/sca-java-1.6/samples/helloworld-web-callback/src/main/java/sample/HelloworldService.java b/sca-java-1.x/branches/sca-java-1.6/samples/helloworld-web-callback/src/main/java/sample/HelloworldService.java
deleted file mode 100644
index d2c1fc2def..0000000000
--- a/sca-java-1.x/branches/sca-java-1.6/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/sca-java-1.x/branches/sca-java-1.6/samples/helloworld-web-callback/src/main/java/sample/HelloworldServiceImpl.java b/sca-java-1.x/branches/sca-java-1.6/samples/helloworld-web-callback/src/main/java/sample/HelloworldServiceImpl.java
deleted file mode 100644
index 8b52e42754..0000000000
--- a/sca-java-1.x/branches/sca-java-1.6/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/sca-java-1.x/branches/sca-java-1.6/samples/helloworld-web-callback/src/main/webapp/META-INF/sca-deployables/web.composite b/sca-java-1.x/branches/sca-java-1.6/samples/helloworld-web-callback/src/main/webapp/META-INF/sca-deployables/web.composite
deleted file mode 100644
index fdd5a95f58..0000000000
--- a/sca-java-1.x/branches/sca-java-1.6/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/sca-java-1.x/branches/sca-java-1.6/samples/helloworld-web-callback/src/main/webapp/WEB-INF/web.xml b/sca-java-1.x/branches/sca-java-1.6/samples/helloworld-web-callback/src/main/webapp/WEB-INF/web.xml
deleted file mode 100644
index f29262a147..0000000000
--- a/sca-java-1.x/branches/sca-java-1.6/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/sca-java-1.x/branches/sca-java-1.6/samples/helloworld-web-callback/src/main/webapp/hello.html b/sca-java-1.x/branches/sca-java-1.6/samples/helloworld-web-callback/src/main/webapp/hello.html
deleted file mode 100644
index 6d4c17626b..0000000000
--- a/sca-java-1.x/branches/sca-java-1.6/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/sca-java-1.x/branches/sca-java-1.6/samples/helloworld-web/pom.xml b/sca-java-1.x/branches/sca-java-1.6/samples/helloworld-web/pom.xml
deleted file mode 100644
index 7a7d03edc6..0000000000
--- a/sca-java-1.x/branches/sca-java-1.6/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.6-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.6-SNAPSHOT</version>
- <scope>compile</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-implementation-web-runtime</artifactId>
- <version>1.6-SNAPSHOT</version>
- <scope>runtime</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-host-webapp</artifactId>
- <version>1.6-SNAPSHOT</version>
- <scope>runtime</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.tuscany.sca</groupId>
- <artifactId>tuscany-binding-jsonrpc-runtime</artifactId>
- <version>1.6-SNAPSHOT</version>
- <scope>runtime</scope>
- </dependency>
-
- </dependencies>
-
- <build>
- <finalName>${artifactId}</finalName>
- </build>
-
-</project>
diff --git a/sca-java-1.x/branches/sca-java-1.6/samples/helloworld-web/src/main/java/sample/HelloworldService.java b/sca-java-1.x/branches/sca-java-1.6/samples/helloworld-web/src/main/java/sample/HelloworldService.java
deleted file mode 100644
index 2b92fd4661..0000000000
--- a/sca-java-1.x/branches/sca-java-1.6/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/sca-java-1.x/branches/sca-java-1.6/samples/helloworld-web/src/main/java/sample/HelloworldServiceImpl.java b/sca-java-1.x/branches/sca-java-1.6/samples/helloworld-web/src/main/java/sample/HelloworldServiceImpl.java
deleted file mode 100644
index be83d3b407..0000000000
--- a/sca-java-1.x/branches/sca-java-1.6/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/sca-java-1.x/branches/sca-java-1.6/samples/helloworld-web/src/main/webapp/META-INF/sca-deployables/web.composite b/sca-java-1.x/branches/sca-java-1.6/samples/helloworld-web/src/main/webapp/META-INF/sca-deployables/web.composite
deleted file mode 100644
index 20cebc2d53..0000000000
--- a/sca-java-1.x/branches/sca-java-1.6/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/sca-java-1.x/branches/sca-java-1.6/samples/helloworld-web/src/main/webapp/WEB-INF/web.xml b/sca-java-1.x/branches/sca-java-1.6/samples/helloworld-web/src/main/webapp/WEB-INF/web.xml
deleted file mode 100644
index f29262a147..0000000000
--- a/sca-java-1.x/branches/sca-java-1.6/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/sca-java-1.x/branches/sca-java-1.6/samples/helloworld-web/src/main/webapp/hello.html b/sca-java-1.x/branches/sca-java-1.6/samples/helloworld-web/src/main/webapp/hello.html
deleted file mode 100644
index 83ac0ae576..0000000000
--- a/sca-java-1.x/branches/sca-java-1.6/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>