From e37a2cbb2792feb70fe6d1809d899f7b55cecf31 Mon Sep 17 00:00:00 2001
From: kelvingoodson <kelvingoodson@13f79535-47bb-0310-9956-ffa450edef68>
Date: Thu, 16 Sep 2010 15:42:52 +0000
Subject: TUSCANY-3677 more samples reorg -- all in webapps were helloworld, so
 moved to getting started

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@997796 13f79535-47bb-0310-9956-ffa450edef68
---
 .../samples/webapps/helloworld-js-client/README    |   7 --
 .../samples/webapps/helloworld-js-client/pom.xml   | 104 ---------------------
 .../src/main/java/sample/HelloworldService.java    |  25 -----
 .../main/java/sample/HelloworldServiceImpl.java    |  28 ------
 .../src/main/webapp/WEB-INF/web.composite          |  36 -------
 .../src/main/webapp/WEB-INF/web.xml                |  41 --------
 .../src/main/webapp/hello.html                     |  51 ----------
 .../src/test/java/itest/HelloworldTestCase.java    |  75 ---------------
 8 files changed, 367 deletions(-)
 delete mode 100644 sca-java-2.x/trunk/samples/webapps/helloworld-js-client/README
 delete mode 100644 sca-java-2.x/trunk/samples/webapps/helloworld-js-client/pom.xml
 delete mode 100644 sca-java-2.x/trunk/samples/webapps/helloworld-js-client/src/main/java/sample/HelloworldService.java
 delete mode 100644 sca-java-2.x/trunk/samples/webapps/helloworld-js-client/src/main/java/sample/HelloworldServiceImpl.java
 delete mode 100644 sca-java-2.x/trunk/samples/webapps/helloworld-js-client/src/main/webapp/WEB-INF/web.composite
 delete mode 100644 sca-java-2.x/trunk/samples/webapps/helloworld-js-client/src/main/webapp/WEB-INF/web.xml
 delete mode 100644 sca-java-2.x/trunk/samples/webapps/helloworld-js-client/src/main/webapp/hello.html
 delete mode 100644 sca-java-2.x/trunk/samples/webapps/helloworld-js-client/src/test/java/itest/HelloworldTestCase.java

(limited to 'sca-java-2.x/trunk/samples/webapps/helloworld-js-client')

diff --git a/sca-java-2.x/trunk/samples/webapps/helloworld-js-client/README b/sca-java-2.x/trunk/samples/webapps/helloworld-js-client/README
deleted file mode 100644
index 828aadb0f1..0000000000
--- a/sca-java-2.x/trunk/samples/webapps/helloworld-js-client/README
+++ /dev/null
@@ -1,7 +0,0 @@
-The README in the <distribution-unpack-dir>/samples directory provides 
-general instructions about building and running samples. (where
-distribution-unpack-dir is the directory in which you unpacked the tuscany
-binary distribution archive). Take a look there first (noting at you read it that this sample
-is not a new style sample). 
-
-TODO - finish
\ No newline at end of file
diff --git a/sca-java-2.x/trunk/samples/webapps/helloworld-js-client/pom.xml b/sca-java-2.x/trunk/samples/webapps/helloworld-js-client/pom.xml
deleted file mode 100644
index 388df0913e..0000000000
--- a/sca-java-2.x/trunk/samples/webapps/helloworld-js-client/pom.xml
+++ /dev/null
@@ -1,104 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
--->
-<project>
-    <modelVersion>4.0.0</modelVersion>
-    <parent>
-        <groupId>org.apache.tuscany.sca</groupId>
-        <artifactId>tuscany-samples</artifactId>
-        <version>2.0-SNAPSHOT</version>
-        <relativePath>../../pom.xml</relativePath>
-    </parent>
-
-    <artifactId>sample-helloworld-js-client-webapp</artifactId>
-    <packaging>war</packaging>
-    <name>Apache Tuscany SCA Sample Helloworld Javascript Client</name>
-
-    <dependencies>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca.shades</groupId>
-            <artifactId>tuscany-base</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca.shades</groupId>
-            <artifactId>tuscany-json-nodep</artifactId>
-            <version>2.0-SNAPSHOT</version>
-        </dependency>
-
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <version>4.8.1</version>
-            <scope>test</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>net.sourceforge.htmlunit</groupId>
-            <artifactId>htmlunit</artifactId>
-            <version>2.6</version>
-            <scope>test</scope>
-        </dependency>
-
-    </dependencies>
-
-    <build>
-       <finalName>helloworld-js-client</finalName>
-       <plugins>
-          <plugin>
-             <groupId>org.mortbay.jetty</groupId>
-             <artifactId>maven-jetty-plugin</artifactId>
-             <version>6.1.18</version>
-             <configuration>
-                <contextPath>helloworld-js-client</contextPath>
-                <stopKey>foo</stopKey>
-                <stopPort>9999</stopPort>
-             </configuration>
-             <executions>
-                <execution>
-                   <id>start-jetty</id>
-                   <phase>process-test-classes</phase>
-                   <goals>
-                       <goal>run</goal>
-                   </goals>
-                   <configuration>
-                       <scanIntervalSeconds>0</scanIntervalSeconds>
-                       <daemon>true</daemon>
-                       <connectors>
-                          <connector implementation="org.mortbay.jetty.nio.SelectChannelConnector">
-                             <port>8085</port>
-                          </connector>
-                       </connectors>
-                   </configuration>
-                </execution>
-                <execution>
-                   <id>stop-jetty</id>
-                   <phase>prepare-package</phase>
-                   <goals>
-                       <goal>stop</goal>
-                   </goals>
-                </execution>
-             </executions>
-          </plugin>
-       </plugins>
-    </build>
-
-</project>
diff --git a/sca-java-2.x/trunk/samples/webapps/helloworld-js-client/src/main/java/sample/HelloworldService.java b/sca-java-2.x/trunk/samples/webapps/helloworld-js-client/src/main/java/sample/HelloworldService.java
deleted file mode 100644
index 123774b936..0000000000
--- a/sca-java-2.x/trunk/samples/webapps/helloworld-js-client/src/main/java/sample/HelloworldService.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-package sample;
-
-public interface HelloworldService {
-
-    String sayHello(String name);
-
-}
diff --git a/sca-java-2.x/trunk/samples/webapps/helloworld-js-client/src/main/java/sample/HelloworldServiceImpl.java b/sca-java-2.x/trunk/samples/webapps/helloworld-js-client/src/main/java/sample/HelloworldServiceImpl.java
deleted file mode 100644
index 66cef71a25..0000000000
--- a/sca-java-2.x/trunk/samples/webapps/helloworld-js-client/src/main/java/sample/HelloworldServiceImpl.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-package sample;
-
-
-public class HelloworldServiceImpl implements HelloworldService {
-
-    public String sayHello(String name) {
-        return "Hello " + name;
-    }
-
-}
diff --git a/sca-java-2.x/trunk/samples/webapps/helloworld-js-client/src/main/webapp/WEB-INF/web.composite b/sca-java-2.x/trunk/samples/webapps/helloworld-js-client/src/main/webapp/WEB-INF/web.composite
deleted file mode 100644
index d41a8535e2..0000000000
--- a/sca-java-2.x/trunk/samples/webapps/helloworld-js-client/src/main/webapp/WEB-INF/web.composite
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
--->
-<composite xmlns="http://docs.oasis-open.org/ns/opencsa/sca/200912"
-           xmlns:tuscany="http://tuscany.apache.org/xmlns/sca/1.1"
-           targetNamespace="http://samples"
-           name="Helloworld">
-
-    <component name="foo">
-        <implementation.web web-uri=""/>
-        <reference name="service" target="HelloworldComponent">
-             <interface.java interface="sample.HelloworldService" />
-        </reference>
-    </component>
-
-    <component name="HelloworldComponent">
-        <implementation.java class="sample.HelloworldServiceImpl"/>
-    </component>
-
-</composite>
diff --git a/sca-java-2.x/trunk/samples/webapps/helloworld-js-client/src/main/webapp/WEB-INF/web.xml b/sca-java-2.x/trunk/samples/webapps/helloworld-js-client/src/main/webapp/WEB-INF/web.xml
deleted file mode 100644
index babeb7b203..0000000000
--- a/sca-java-2.x/trunk/samples/webapps/helloworld-js-client/src/main/webapp/WEB-INF/web.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
--->
-<web-app version="2.4"
-         xmlns="http://java.sun.com/xml/ns/j2ee"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd" >
-
-  <display-name>Apache Tuscany Helloworld JSP Sample</display-name>
-
-  <filter>
-    <filter-name>tuscany</filter-name> 
-    <filter-class>org.apache.tuscany.sca.host.webapp.TuscanyServletFilter</filter-class> 
-  </filter>
-
-  <filter-mapping>
-    <filter-name>tuscany</filter-name> 
-    <url-pattern>/*</url-pattern> 
-  </filter-mapping>
-
-  <welcome-file-list id="WelcomeFileList">
-    <welcome-file>hello.html</welcome-file>
-  </welcome-file-list>
-
-</web-app>
diff --git a/sca-java-2.x/trunk/samples/webapps/helloworld-js-client/src/main/webapp/hello.html b/sca-java-2.x/trunk/samples/webapps/helloworld-js-client/src/main/webapp/hello.html
deleted file mode 100644
index 12024cc4d3..0000000000
--- a/sca-java-2.x/trunk/samples/webapps/helloworld-js-client/src/main/webapp/hello.html
+++ /dev/null
@@ -1,51 +0,0 @@
-<!--
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
--->
-<html>
-
-<head>
-   <title>Apache Tuscany Helloworld Javascript Client Sample</title>
-
-   <script type="text/javascript" src="org.oasisopen.sca.componentContext.js"></script>
-
-   <script language="JavaScript">
-   
-      function callSayHello() {
-         componentContext.getService("service").sayHello(document.getElementById('name').value, sayHelloResponse);
-      }
-
-      function sayHelloResponse(reply) {
-         document.getElementById('result').innerHTML=reply;
-      }
-
-   </script>
-
-</head>
-
-<body>
-
-<h2>Apache Tuscany Helloworld Javascript Client Sample</h2>
-
-    <input type="text" id="name" width="10">
-
-    <button name="submit" onclick="callSayHello()">Say hello</button>
-
-    <div id='result'></div>
-
-</body>
-</html>
\ No newline at end of file
diff --git a/sca-java-2.x/trunk/samples/webapps/helloworld-js-client/src/test/java/itest/HelloworldTestCase.java b/sca-java-2.x/trunk/samples/webapps/helloworld-js-client/src/test/java/itest/HelloworldTestCase.java
deleted file mode 100644
index 099b442050..0000000000
--- a/sca-java-2.x/trunk/samples/webapps/helloworld-js-client/src/test/java/itest/HelloworldTestCase.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.    
- */
-
-package itest;
-
-import static org.junit.Assert.assertTrue;
-
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.io.OutputStreamWriter;
-import java.net.MalformedURLException;
-import java.net.URL;
-import java.net.URLConnection;
-import java.net.URLEncoder;
-
-import org.junit.Test;
-
-/**
- * Verfiy the serverside code is working, not sure how to easily itest the browser javascript code 
- */
-public class HelloworldTestCase {
-
-    @Test
-    public void testA() throws MalformedURLException, IOException {
-        
-        URL url = new URL("http://localhost:8085/helloworld-js-client/org.oasisopen.sca.componentContext.js/foo/call/plaincall/service.sayHello.dwr");
-        URLConnection conn = url.openConnection();
-        conn.setDoOutput(true);
-        OutputStreamWriter wr = new OutputStreamWriter(conn.getOutputStream());
-
-        // to find this run the sample through TCPMON to capture the messages        
-        
-        String data = URLEncoder.encode("callCount", "UTF-8") + "=" + URLEncoder.encode("1", "UTF-8");
-        data += "&" + URLEncoder.encode("page", "UTF-8") + "=" + URLEncoder.encode("/helloworld-js-client/", "UTF-8");       
-        data += "&" + URLEncoder.encode("httpSessionId", "UTF-8") + "=" + URLEncoder.encode("", "UTF-8");       
-        data += "&" + URLEncoder.encode("scriptSessionId", "UTF-8") + "=" + URLEncoder.encode("A023DA664E56F075491BE1B87B37B02671", "UTF-8");       
-        data += "&" + URLEncoder.encode("c0-scriptName", "UTF-8") + "=" + URLEncoder.encode("service", "UTF-8");       
-        data += "&" + URLEncoder.encode("c0-methodName", "UTF-8") + "=" + URLEncoder.encode("sayHello", "UTF-8");       
-        data += "&" + URLEncoder.encode("c0-id", "UTF-8") + "=" + URLEncoder.encode("0", "UTF-8");       
-        data += "&" + URLEncoder.encode("c0-param0", "UTF-8") + "=" + URLEncoder.encode("string:petra", "UTF-8");       
-        data += "&" + URLEncoder.encode("batchId", "UTF-8") + "=" + URLEncoder.encode("0", "UTF-8");       
-        
-        wr.write(data);
-        wr.flush();
-        
-        BufferedReader rd = new BufferedReader(new InputStreamReader(conn.getInputStream()));
-        rd.readLine(); // throw 'allowScriptTagRemoting is false.';
-        rd.readLine(); //#DWR-INSERT
-        rd.readLine(); //#DWR-REPLY
-        String line = rd.readLine(); // dwr.engine._remoteHandleCallback('0','0',"Hello petra");
-        wr.close();
-        rd.close();
-        
-        assertTrue(line.endsWith("\"Hello petra\");"));
-
-    }
-
-}
-- 
cgit v1.2.3