You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by an...@apache.org on 2010/04/23 10:02:48 UTC

svn commit: r937182 - in /tuscany/sca-java-2.x/trunk/samples/webapps: helloworld-bpel/ helloworld-jaxrs/ helloworld-jms/ helloworld-js-client/ helloworld-js-client/src/test/ helloworld-js-client/src/test/java/ helloworld-js-client/src/test/java/itest/ ...

Author: antelder
Date: Fri Apr 23 08:02:47 2010
New Revision: 937182

URL: http://svn.apache.org/viewvc?rev=937182&view=rev
Log:
Add integration tests to the webapp samples copied from itest distribution tests.

Added:
    tuscany/sca-java-2.x/trunk/samples/webapps/helloworld-js-client/src/test/
    tuscany/sca-java-2.x/trunk/samples/webapps/helloworld-js-client/src/test/java/
    tuscany/sca-java-2.x/trunk/samples/webapps/helloworld-js-client/src/test/java/itest/
    tuscany/sca-java-2.x/trunk/samples/webapps/helloworld-js-client/src/test/java/itest/HelloworldTestCase.java
    tuscany/sca-java-2.x/trunk/samples/webapps/helloworld-jsp/src/test/
    tuscany/sca-java-2.x/trunk/samples/webapps/helloworld-jsp/src/test/java/
    tuscany/sca-java-2.x/trunk/samples/webapps/helloworld-jsp/src/test/java/itest/
    tuscany/sca-java-2.x/trunk/samples/webapps/helloworld-jsp/src/test/java/itest/HelloworldTestCase.java
    tuscany/sca-java-2.x/trunk/samples/webapps/helloworld-servlet/src/test/
    tuscany/sca-java-2.x/trunk/samples/webapps/helloworld-servlet/src/test/java/
    tuscany/sca-java-2.x/trunk/samples/webapps/helloworld-servlet/src/test/java/itest/
    tuscany/sca-java-2.x/trunk/samples/webapps/helloworld-servlet/src/test/java/itest/HelloworldTestCase.java
    tuscany/sca-java-2.x/trunk/samples/webapps/helloworld-stripes/src/test/
    tuscany/sca-java-2.x/trunk/samples/webapps/helloworld-stripes/src/test/java/
    tuscany/sca-java-2.x/trunk/samples/webapps/helloworld-stripes/src/test/java/itest/
    tuscany/sca-java-2.x/trunk/samples/webapps/helloworld-stripes/src/test/java/itest/HelloworldTestCase.java
Modified:
    tuscany/sca-java-2.x/trunk/samples/webapps/helloworld-bpel/pom.xml
    tuscany/sca-java-2.x/trunk/samples/webapps/helloworld-jaxrs/pom.xml
    tuscany/sca-java-2.x/trunk/samples/webapps/helloworld-jms/pom.xml
    tuscany/sca-java-2.x/trunk/samples/webapps/helloworld-js-client/pom.xml
    tuscany/sca-java-2.x/trunk/samples/webapps/helloworld-jsf/pom.xml
    tuscany/sca-java-2.x/trunk/samples/webapps/helloworld-jsp/pom.xml
    tuscany/sca-java-2.x/trunk/samples/webapps/helloworld-servlet/pom.xml
    tuscany/sca-java-2.x/trunk/samples/webapps/helloworld-stripes/pom.xml
    tuscany/sca-java-2.x/trunk/samples/webapps/helloworld-wicket/pom.xml
    tuscany/sca-java-2.x/trunk/samples/webapps/helloworld/pom.xml

Modified: tuscany/sca-java-2.x/trunk/samples/webapps/helloworld-bpel/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/samples/webapps/helloworld-bpel/pom.xml?rev=937182&r1=937181&r2=937182&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/samples/webapps/helloworld-bpel/pom.xml (original)
+++ tuscany/sca-java-2.x/trunk/samples/webapps/helloworld-bpel/pom.xml Fri Apr 23 08:02:47 2010
@@ -119,11 +119,41 @@
               </executions>
             </plugin>
 
-            <plugin>
-               <groupId>org.mortbay.jetty</groupId>
-               <artifactId>maven-jetty-plugin</artifactId>
-               <version>${jetty.version}</version>
-            </plugin>
+          <plugin>
+             <groupId>org.mortbay.jetty</groupId>
+             <artifactId>maven-jetty-plugin</artifactId>
+             <version>6.1.18</version>
+             <configuration>
+                <contextPath>helloworld-bpel</contextPath>
+                <stopKey>foo</stopKey>
+                <stopPort>9999</stopPort>
+             </configuration>
+             <executions>
+                <execution>
+                   <id>start-jetty</id>
+                   <phase>process-test-classes</phase>
+                   <goals>
+                       <goal>run</goal>
+                   </goals>
+                   <configuration>
+                       <scanIntervalSeconds>0</scanIntervalSeconds>
+                       <daemon>true</daemon>
+                       <connectors>
+                          <connector implementation="org.mortbay.jetty.nio.SelectChannelConnector">
+                             <port>8085</port>
+                          </connector>
+                       </connectors>
+                   </configuration>
+                </execution>
+                <execution>
+                   <id>stop-jetty</id>
+                   <phase>prepare-package</phase>
+                   <goals>
+                       <goal>stop</goal>
+                   </goals>
+                </execution>
+             </executions>
+          </plugin>
 
          </plugins>
 	</build>

Modified: tuscany/sca-java-2.x/trunk/samples/webapps/helloworld-jaxrs/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/samples/webapps/helloworld-jaxrs/pom.xml?rev=937182&r1=937181&r2=937182&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/samples/webapps/helloworld-jaxrs/pom.xml (original)
+++ tuscany/sca-java-2.x/trunk/samples/webapps/helloworld-jaxrs/pom.xml Fri Apr 23 08:02:47 2010
@@ -60,6 +60,36 @@
              <groupId>org.mortbay.jetty</groupId>
              <artifactId>maven-jetty-plugin</artifactId>
              <version>6.1.18</version>
+             <configuration>
+                <contextPath>helloworld-jaxrs</contextPath>
+                <stopKey>foo</stopKey>
+                <stopPort>9999</stopPort>
+             </configuration>
+             <executions>
+                <execution>
+                   <id>start-jetty</id>
+                   <phase>process-test-classes</phase>
+                   <goals>
+                       <goal>run</goal>
+                   </goals>
+                   <configuration>
+                       <scanIntervalSeconds>0</scanIntervalSeconds>
+                       <daemon>true</daemon>
+                       <connectors>
+                          <connector implementation="org.mortbay.jetty.nio.SelectChannelConnector">
+                             <port>8085</port>
+                          </connector>
+                       </connectors>
+                   </configuration>
+                </execution>
+                <execution>
+                   <id>stop-jetty</id>
+                   <phase>prepare-package</phase>
+                   <goals>
+                       <goal>stop</goal>
+                   </goals>
+                </execution>
+             </executions>
           </plugin>
        </plugins>
     </build>

Modified: tuscany/sca-java-2.x/trunk/samples/webapps/helloworld-jms/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/samples/webapps/helloworld-jms/pom.xml?rev=937182&r1=937181&r2=937182&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/samples/webapps/helloworld-jms/pom.xml (original)
+++ tuscany/sca-java-2.x/trunk/samples/webapps/helloworld-jms/pom.xml Fri Apr 23 08:02:47 2010
@@ -33,38 +33,23 @@
     <dependencies>
 
         <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-sca-api</artifactId>
+            <groupId>org.apache.tuscany.sca.shades</groupId>
+            <artifactId>tuscany-base</artifactId>
             <version>2.0-SNAPSHOT</version>
-            <scope>compile</scope>
         </dependency>
-
         <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-implementation-web-runtime</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-binding-jms-runtime</artifactId>
+            <groupId>org.apache.tuscany.sca.shades</groupId>
+            <artifactId>tuscany-jms</artifactId>
             <version>2.0-SNAPSHOT</version>
         </dependency>
 
         <dependency>
             <groupId>org.apache.activemq</groupId>
             <artifactId>activemq-core</artifactId>
-            <version>5.1.0</version>
+            <version>5.3.0</version>
             <scope>runtime</scope>
         </dependency>
         
-        <dependency>
-            <groupId>backport-util-concurrent</groupId>
-            <artifactId>backport-util-concurrent</artifactId>
-            <version>3.1</version>
-        </dependency>
-
     </dependencies>
 
     <build>
@@ -74,6 +59,36 @@
              <groupId>org.mortbay.jetty</groupId>
              <artifactId>maven-jetty-plugin</artifactId>
              <version>6.1.18</version>
+             <configuration>
+                <contextPath>helloworld-jms</contextPath>
+                <stopKey>foo</stopKey>
+                <stopPort>9999</stopPort>
+             </configuration>
+             <executions>
+                <execution>
+                   <id>start-jetty</id>
+                   <phase>process-test-classes</phase>
+                   <goals>
+                       <goal>run</goal>
+                   </goals>
+                   <configuration>
+                       <scanIntervalSeconds>0</scanIntervalSeconds>
+                       <daemon>true</daemon>
+                       <connectors>
+                          <connector implementation="org.mortbay.jetty.nio.SelectChannelConnector">
+                             <port>8085</port>
+                          </connector>
+                       </connectors>
+                   </configuration>
+                </execution>
+                <execution>
+                   <id>stop-jetty</id>
+                   <phase>prepare-package</phase>
+                   <goals>
+                       <goal>stop</goal>
+                   </goals>
+                </execution>
+             </executions>
           </plugin>
        </plugins>
     </build>

Modified: tuscany/sca-java-2.x/trunk/samples/webapps/helloworld-js-client/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/samples/webapps/helloworld-js-client/pom.xml?rev=937182&r1=937181&r2=937182&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/samples/webapps/helloworld-js-client/pom.xml (original)
+++ tuscany/sca-java-2.x/trunk/samples/webapps/helloworld-js-client/pom.xml Fri Apr 23 08:02:47 2010
@@ -44,17 +44,61 @@
             <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>
-             </plugin>
-          </plugins>
+       <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>

Added: tuscany/sca-java-2.x/trunk/samples/webapps/helloworld-js-client/src/test/java/itest/HelloworldTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/samples/webapps/helloworld-js-client/src/test/java/itest/HelloworldTestCase.java?rev=937182&view=auto
==============================================================================
--- tuscany/sca-java-2.x/trunk/samples/webapps/helloworld-js-client/src/test/java/itest/HelloworldTestCase.java (added)
+++ tuscany/sca-java-2.x/trunk/samples/webapps/helloworld-js-client/src/test/java/itest/HelloworldTestCase.java Fri Apr 23 08:02:47 2010
@@ -0,0 +1,75 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES 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\");"));
+
+    }
+
+}

Modified: tuscany/sca-java-2.x/trunk/samples/webapps/helloworld-jsf/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/samples/webapps/helloworld-jsf/pom.xml?rev=937182&r1=937181&r2=937182&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/samples/webapps/helloworld-jsf/pom.xml (original)
+++ tuscany/sca-java-2.x/trunk/samples/webapps/helloworld-jsf/pom.xml Fri Apr 23 08:02:47 2010
@@ -62,6 +62,36 @@
              <groupId>org.mortbay.jetty</groupId>
              <artifactId>maven-jetty-plugin</artifactId>
              <version>6.1.18</version>
+             <configuration>
+                <contextPath>helloworld-jsf</contextPath>
+                <stopKey>foo</stopKey>
+                <stopPort>9999</stopPort>
+             </configuration>
+             <executions>
+                <execution>
+                   <id>start-jetty</id>
+                   <phase>process-test-classes</phase>
+                   <goals>
+                       <goal>run</goal>
+                   </goals>
+                   <configuration>
+                       <scanIntervalSeconds>0</scanIntervalSeconds>
+                       <daemon>true</daemon>
+                       <connectors>
+                          <connector implementation="org.mortbay.jetty.nio.SelectChannelConnector">
+                             <port>8085</port>
+                          </connector>
+                       </connectors>
+                   </configuration>
+                </execution>
+                <execution>
+                   <id>stop-jetty</id>
+                   <phase>prepare-package</phase>
+                   <goals>
+                       <goal>stop</goal>
+                   </goals>
+                </execution>
+             </executions>
           </plugin>
        </plugins>
     </build>

Modified: tuscany/sca-java-2.x/trunk/samples/webapps/helloworld-jsp/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/samples/webapps/helloworld-jsp/pom.xml?rev=937182&r1=937181&r2=937182&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/samples/webapps/helloworld-jsp/pom.xml (original)
+++ tuscany/sca-java-2.x/trunk/samples/webapps/helloworld-jsp/pom.xml Fri Apr 23 08:02:47 2010
@@ -38,6 +38,20 @@
             <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>
@@ -47,6 +61,36 @@
              <groupId>org.mortbay.jetty</groupId>
              <artifactId>maven-jetty-plugin</artifactId>
              <version>6.1.18</version>
+             <configuration>
+                <contextPath>helloworld-jsp</contextPath>
+                <stopKey>foo</stopKey>
+                <stopPort>9999</stopPort>
+             </configuration>
+             <executions>
+                <execution>
+                   <id>start-jetty</id>
+                   <phase>process-test-classes</phase>
+                   <goals>
+                       <goal>run</goal>
+                   </goals>
+                   <configuration>
+                       <scanIntervalSeconds>0</scanIntervalSeconds>
+                       <daemon>true</daemon>
+                       <connectors>
+                          <connector implementation="org.mortbay.jetty.nio.SelectChannelConnector">
+                             <port>8085</port>
+                          </connector>
+                       </connectors>
+                   </configuration>
+                </execution>
+                <execution>
+                   <id>stop-jetty</id>
+                   <phase>prepare-package</phase>
+                   <goals>
+                       <goal>stop</goal>
+                   </goals>
+                </execution>
+             </executions>
           </plugin>
        </plugins>
     </build>

Added: tuscany/sca-java-2.x/trunk/samples/webapps/helloworld-jsp/src/test/java/itest/HelloworldTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/samples/webapps/helloworld-jsp/src/test/java/itest/HelloworldTestCase.java?rev=937182&view=auto
==============================================================================
--- tuscany/sca-java-2.x/trunk/samples/webapps/helloworld-jsp/src/test/java/itest/HelloworldTestCase.java (added)
+++ tuscany/sca-java-2.x/trunk/samples/webapps/helloworld-jsp/src/test/java/itest/HelloworldTestCase.java Fri Apr 23 08:02:47 2010
@@ -0,0 +1,53 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+ */
+
+package itest;
+
+import static org.junit.Assert.assertEquals;
+
+import java.io.IOException;
+import java.net.MalformedURLException;
+import java.util.Iterator;
+
+import org.junit.Test;
+
+import com.gargoylesoftware.htmlunit.FailingHttpStatusCodeException;
+import com.gargoylesoftware.htmlunit.WebClient;
+import com.gargoylesoftware.htmlunit.html.HtmlElement;
+import com.gargoylesoftware.htmlunit.html.HtmlPage;
+import com.gargoylesoftware.htmlunit.html.HtmlParagraph;
+
+/**
+ */
+public class HelloworldTestCase {
+
+    @Test
+    public void testA() throws FailingHttpStatusCodeException, MalformedURLException, IOException {
+        HtmlPage page = (HtmlPage)new WebClient().getPage("http://localhost:8085/helloworld-jsp");
+        Iterator<?> ss = page.getAllHtmlChildElements().iterator();
+        while(ss.hasNext()) {
+            HtmlElement htmlElement = (HtmlElement) ss.next();
+            if( htmlElement instanceof HtmlParagraph) {
+                assertEquals("Hello world", htmlElement.asText());
+                break;
+            }
+        }
+    }
+
+}

Modified: tuscany/sca-java-2.x/trunk/samples/webapps/helloworld-servlet/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/samples/webapps/helloworld-servlet/pom.xml?rev=937182&r1=937181&r2=937182&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/samples/webapps/helloworld-servlet/pom.xml (original)
+++ tuscany/sca-java-2.x/trunk/samples/webapps/helloworld-servlet/pom.xml Fri Apr 23 08:02:47 2010
@@ -45,6 +45,20 @@
             <scope>provided</scope>
         </dependency>
 
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>4.8.1</version>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>net.sourceforge.htmlunit</groupId>
+            <artifactId>htmlunit</artifactId>
+            <version>2.6</version>
+            <scope>test</scope>
+        </dependency>
+
     </dependencies>
 
     <build>
@@ -54,6 +68,36 @@
              <groupId>org.mortbay.jetty</groupId>
              <artifactId>maven-jetty-plugin</artifactId>
              <version>6.1.18</version>
+             <configuration>
+                <contextPath>helloworld-servlet</contextPath>
+                <stopKey>foo</stopKey>
+                <stopPort>9999</stopPort>
+             </configuration>
+             <executions>
+                <execution>
+                   <id>start-jetty</id>
+                   <phase>process-test-classes</phase>
+                   <goals>
+                       <goal>run</goal>
+                   </goals>
+                   <configuration>
+                       <scanIntervalSeconds>0</scanIntervalSeconds>
+                       <daemon>true</daemon>
+                       <connectors>
+                          <connector implementation="org.mortbay.jetty.nio.SelectChannelConnector">
+                             <port>8085</port>
+                          </connector>
+                       </connectors>
+                   </configuration>
+                </execution>
+                <execution>
+                   <id>stop-jetty</id>
+                   <phase>prepare-package</phase>
+                   <goals>
+                       <goal>stop</goal>
+                   </goals>
+                </execution>
+             </executions>
           </plugin>
        </plugins>
     </build>

Added: tuscany/sca-java-2.x/trunk/samples/webapps/helloworld-servlet/src/test/java/itest/HelloworldTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/samples/webapps/helloworld-servlet/src/test/java/itest/HelloworldTestCase.java?rev=937182&view=auto
==============================================================================
--- tuscany/sca-java-2.x/trunk/samples/webapps/helloworld-servlet/src/test/java/itest/HelloworldTestCase.java (added)
+++ tuscany/sca-java-2.x/trunk/samples/webapps/helloworld-servlet/src/test/java/itest/HelloworldTestCase.java Fri Apr 23 08:02:47 2010
@@ -0,0 +1,55 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+ */
+
+package itest;
+import static org.junit.Assert.assertTrue;
+
+import java.io.IOException;
+import java.net.MalformedURLException;
+
+import org.junit.Test;
+
+import com.gargoylesoftware.htmlunit.FailingHttpStatusCodeException;
+import com.gargoylesoftware.htmlunit.WebClient;
+import com.gargoylesoftware.htmlunit.html.HtmlButton;
+import com.gargoylesoftware.htmlunit.html.HtmlForm;
+import com.gargoylesoftware.htmlunit.html.HtmlInput;
+import com.gargoylesoftware.htmlunit.html.HtmlPage;
+
+/**
+ */
+public class HelloworldTestCase {
+
+    @Test
+    public void testA() throws FailingHttpStatusCodeException, MalformedURLException, IOException {
+        HtmlPage page = (HtmlPage)new WebClient().getPage("http://localhost:8085/helloworld-servlet");
+
+        HtmlForm form = (HtmlForm) page.getForms().get(0);
+
+        HtmlInput textField = form.getInputByName("name");
+        textField.setValueAttribute("petra");
+
+        HtmlButton button = (HtmlButton) form.getButtonsByName("submit").get(0);
+
+        HtmlPage pageResponse = (HtmlPage) button.click();
+        
+        assertTrue(pageResponse.getWebResponse().getContentAsString().endsWith("</strong>Hello petra</body></html>"));
+    }
+
+}

Modified: tuscany/sca-java-2.x/trunk/samples/webapps/helloworld-stripes/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/samples/webapps/helloworld-stripes/pom.xml?rev=937182&r1=937181&r2=937182&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/samples/webapps/helloworld-stripes/pom.xml (original)
+++ tuscany/sca-java-2.x/trunk/samples/webapps/helloworld-stripes/pom.xml Fri Apr 23 08:02:47 2010
@@ -52,6 +52,20 @@
             <version>1.1.2</version>
         </dependency>
 
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <version>4.8.1</version>
+            <scope>test</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>net.sourceforge.htmlunit</groupId>
+            <artifactId>htmlunit</artifactId>
+            <version>2.6</version>
+            <scope>test</scope>
+        </dependency>
+
     </dependencies>
 
     <build>
@@ -61,6 +75,36 @@
              <groupId>org.mortbay.jetty</groupId>
              <artifactId>maven-jetty-plugin</artifactId>
              <version>6.1.18</version>
+             <configuration>
+                <contextPath>helloworld-stripes</contextPath>
+                <stopKey>foo</stopKey>
+                <stopPort>9999</stopPort>
+             </configuration>
+             <executions>
+                <execution>
+                   <id>start-jetty</id>
+                   <phase>process-test-classes</phase>
+                   <goals>
+                       <goal>run</goal>
+                   </goals>
+                   <configuration>
+                       <scanIntervalSeconds>0</scanIntervalSeconds>
+                       <daemon>true</daemon>
+                       <connectors>
+                          <connector implementation="org.mortbay.jetty.nio.SelectChannelConnector">
+                             <port>8085</port>
+                          </connector>
+                       </connectors>
+                   </configuration>
+                </execution>
+                <execution>
+                   <id>stop-jetty</id>
+                   <phase>prepare-package</phase>
+                   <goals>
+                       <goal>stop</goal>
+                   </goals>
+                </execution>
+             </executions>
           </plugin>
        </plugins>
     </build>

Added: tuscany/sca-java-2.x/trunk/samples/webapps/helloworld-stripes/src/test/java/itest/HelloworldTestCase.java
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/samples/webapps/helloworld-stripes/src/test/java/itest/HelloworldTestCase.java?rev=937182&view=auto
==============================================================================
--- tuscany/sca-java-2.x/trunk/samples/webapps/helloworld-stripes/src/test/java/itest/HelloworldTestCase.java (added)
+++ tuscany/sca-java-2.x/trunk/samples/webapps/helloworld-stripes/src/test/java/itest/HelloworldTestCase.java Fri Apr 23 08:02:47 2010
@@ -0,0 +1,53 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ * 
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.    
+ */
+
+package itest;
+
+import static org.junit.Assert.assertEquals;
+
+import java.io.IOException;
+import java.net.MalformedURLException;
+import java.util.Iterator;
+
+import org.junit.Test;
+
+import com.gargoylesoftware.htmlunit.FailingHttpStatusCodeException;
+import com.gargoylesoftware.htmlunit.WebClient;
+import com.gargoylesoftware.htmlunit.html.HtmlElement;
+import com.gargoylesoftware.htmlunit.html.HtmlPage;
+import com.gargoylesoftware.htmlunit.html.HtmlParagraph;
+
+/**
+ */
+public class HelloworldTestCase {
+
+    @Test
+    public void testA() throws FailingHttpStatusCodeException, MalformedURLException, IOException {
+        HtmlPage page = (HtmlPage)new WebClient().getPage("http://localhost:8085/helloworld-stripes");
+        Iterator<?> ss = page.getAllHtmlChildElements().iterator();
+        while(ss.hasNext()) {
+            HtmlElement htmlElement = (HtmlElement) ss.next();
+            if( htmlElement instanceof HtmlParagraph) {
+                assertEquals("sayHello returns: Hello world", htmlElement.asText());
+                break;
+            }
+        }
+    }
+
+}

Modified: tuscany/sca-java-2.x/trunk/samples/webapps/helloworld-wicket/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/samples/webapps/helloworld-wicket/pom.xml?rev=937182&r1=937181&r2=937182&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/samples/webapps/helloworld-wicket/pom.xml (original)
+++ tuscany/sca-java-2.x/trunk/samples/webapps/helloworld-wicket/pom.xml Fri Apr 23 08:02:47 2010
@@ -76,6 +76,36 @@
              <groupId>org.mortbay.jetty</groupId>
              <artifactId>maven-jetty-plugin</artifactId>
              <version>6.1.18</version>
+             <configuration>
+                <contextPath>helloworld-wicket</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>

Modified: tuscany/sca-java-2.x/trunk/samples/webapps/helloworld/pom.xml
URL: http://svn.apache.org/viewvc/tuscany/sca-java-2.x/trunk/samples/webapps/helloworld/pom.xml?rev=937182&r1=937181&r2=937182&view=diff
==============================================================================
--- tuscany/sca-java-2.x/trunk/samples/webapps/helloworld/pom.xml (original)
+++ tuscany/sca-java-2.x/trunk/samples/webapps/helloworld/pom.xml Fri Apr 23 08:02:47 2010
@@ -33,17 +33,9 @@
     <dependencies>
 
         <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-sca-api</artifactId>
+            <groupId>org.apache.tuscany.sca.shades</groupId>
+            <artifactId>tuscany-base</artifactId>
             <version>2.0-SNAPSHOT</version>
-            <scope>compile</scope>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.tuscany.sca</groupId>
-            <artifactId>tuscany-host-webapp</artifactId>
-            <version>2.0-SNAPSHOT</version>
-            <scope>runtime</scope>
         </dependency>
 
     </dependencies>
@@ -55,6 +47,36 @@
              <groupId>org.mortbay.jetty</groupId>
              <artifactId>maven-jetty-plugin</artifactId>
              <version>6.1.18</version>
+             <configuration>
+                <contextPath>helloworld</contextPath>
+                <stopKey>foo</stopKey>
+                <stopPort>9999</stopPort>
+             </configuration>
+             <executions>
+                <execution>
+                   <id>start-jetty</id>
+                   <phase>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>