Moving 1.x trunk

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@835700 13f79535-47bb-0310-9956-ffa450edef68

6 files changed, 0 insertions, 230 deletions

diff --git a/branches/sca-java-1.x/samples/helloworld-web/pom.xml b/branches/sca-java-1.x/samples/helloworld-web/pom.xml
deleted file mode 100644
index 7a7d03edc6..0000000000
--- a/branches/sca-java-1.x/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/branches/sca-java-1.x/samples/helloworld-web/src/main/java/sample/HelloworldService.java b/branches/sca-java-1.x/samples/helloworld-web/src/main/java/sample/HelloworldService.java
deleted file mode 100644
index 2b92fd4661..0000000000
--- a/branches/sca-java-1.x/samples/helloworld-web/src/main/java/sample/HelloworldService.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package sample;

-

-public interface HelloworldService {

-	

-	String sayHello(String name);

-

-}

diff --git a/branches/sca-java-1.x/samples/helloworld-web/src/main/java/sample/HelloworldServiceImpl.java b/branches/sca-java-1.x/samples/helloworld-web/src/main/java/sample/HelloworldServiceImpl.java
deleted file mode 100644
index be83d3b407..0000000000
--- a/branches/sca-java-1.x/samples/helloworld-web/src/main/java/sample/HelloworldServiceImpl.java
+++ /dev/null
@@ -1,12 +0,0 @@
-package sample;

-

-import org.osoa.sca.annotations.Service;

-

-@Service(HelloworldService.class)

-public class HelloworldServiceImpl implements HelloworldService {

-

-	public String sayHello(String name) {

-		return "Hello " + name;

-	}

-

-}

diff --git a/branches/sca-java-1.x/samples/helloworld-web/src/main/webapp/META-INF/sca-deployables/web.composite b/branches/sca-java-1.x/samples/helloworld-web/src/main/webapp/META-INF/sca-deployables/web.composite
deleted file mode 100644
index 20cebc2d53..0000000000
--- a/branches/sca-java-1.x/samples/helloworld-web/src/main/webapp/META-INF/sca-deployables/web.composite
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<!--

- * Licensed to the Apache Software Foundation (ASF) under one

- * or more contributor license agreements.  See the NOTICE file

- * distributed with this work for additional information

- * regarding copyright ownership.  The ASF licenses this file

- * to you under the Apache License, Version 2.0 (the

- * "License"); you may not use this file except in compliance

- * with the License.  You may obtain a copy of the License at

- *

- *   http://www.apache.org/licenses/LICENSE-2.0

- *

- * Unless required by applicable law or agreed to in writing,

- * software distributed under the License is distributed on an

- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

- * KIND, either express or implied.  See the License for the

- * specific language governing permissions and limitations

- * under the License.

--->

-<composite xmlns="http://www.osoa.org/xmlns/sca/1.0"

-           xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.0"

-           targetNamespace="http://samples"

-           name="Helloworld">

-

-    <component name="WebClient">

-        <implementation.web web-uri=""/>

-        <reference name="service" target="HelloworldService">

-	        <tuscany:binding.jsonrpc />

-        </reference>

-    </component>

-

-    <component name="HelloworldService">

-        <implementation.java class="sample.HelloworldServiceImpl"/>

-	    <service name="HelloworldService">

-	        <tuscany:binding.jsonrpc />

-	    </service>

-    </component>

-

-</composite>

diff --git a/branches/sca-java-1.x/samples/helloworld-web/src/main/webapp/WEB-INF/web.xml b/branches/sca-java-1.x/samples/helloworld-web/src/main/webapp/WEB-INF/web.xml
deleted file mode 100644
index f29262a147..0000000000
--- a/branches/sca-java-1.x/samples/helloworld-web/src/main/webapp/WEB-INF/web.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>

-<!--

- * Licensed to the Apache Software Foundation (ASF) under one

- * or more contributor license agreements.  See the NOTICE file

- * distributed with this work for additional information

- * regarding copyright ownership.  The ASF licenses this file

- * to you under the Apache License, Version 2.0 (the

- * "License"); you may not use this file except in compliance

- * with the License.  You may obtain a copy of the License at

- *

- *   http://www.apache.org/licenses/LICENSE-2.0

- *

- * Unless required by applicable law or agreed to in writing,

- * software distributed under the License is distributed on an

- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY

- * KIND, either express or implied.  See the License for the

- * specific language governing permissions and limitations

- * under the License.

--->

-

-<web-app version="2.4"

-         xmlns="http://java.sun.com/xml/ns/j2ee"

-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"

-         xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd" >

-

-    <display-name>Apache Tuscany Helloworld Servlet Sample</display-name>

-

-  <filter>

-    <filter-name>tuscany</filter-name> 

-    <filter-class>org.apache.tuscany.sca.host.webapp.TuscanyServletFilter</filter-class> 

-  </filter>

-

-  <filter-mapping>

-    <filter-name>tuscany</filter-name> 

-    <url-pattern>/*</url-pattern> 

-  </filter-mapping>

-

-  <welcome-file-list id="WelcomeFileList">

-    <welcome-file>hello.html</welcome-file>

-  </welcome-file-list>

-

-</web-app>

diff --git a/branches/sca-java-1.x/samples/helloworld-web/src/main/webapp/hello.html b/branches/sca-java-1.x/samples/helloworld-web/src/main/webapp/hello.html
deleted file mode 100644
index 83ac0ae576..0000000000
--- a/branches/sca-java-1.x/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>