#7433 separate servlet configuration in web.xml to enable GAE testing

svn changeset:20449/svn branch:6.7

diff --git a/WebContent/WEB-INF/web.xml b/WebContent/WEB-INF/web.xml
index 2f0a69cf5acf63ebe84b76ef8acea5ceb0e1adc7..b5cd3fa1c8489bbcccf6889f8b5b8dc2c1083a59 100644 (file)
--- a/WebContent/WEB-INF/web.xml
+++ b/WebContent/WEB-INF/web.xml
@@ -29,11 +29,26 @@
                </init-param>\r
        </servlet>\r
 \r
+       <!-- For testing GAE - the deployment script changes this to use GAEApplicationServlet -->\r
+       <servlet>\r
+               <servlet-name>IntegrationTest</servlet-name>\r
+               <servlet-class>com.vaadin.terminal.gwt.server.ApplicationServlet</servlet-class>\r
+               <init-param>\r
+                       <param-name>application</param-name>\r
+                       <param-value>com.vaadin.tests.integration.IntegrationTestApplication</param-value>\r
+               </init-param>\r
+       </servlet>\r
+\r
        <servlet-mapping>\r
                <servlet-name>VaadinApplicationRunner</servlet-name>\r
                <url-pattern>/run/*</url-pattern>\r
        </servlet-mapping>\r
 \r
+       <servlet-mapping>\r
+               <servlet-name>IntegrationTest</servlet-name>\r
+               <url-pattern>/integration/*</url-pattern>\r
+       </servlet-mapping>\r
+\r
        <welcome-file-list>\r
                <welcome-file>index.html</welcome-file>\r
        </welcome-file-list>\r

diff --git a/tests/integration-testscripts/GoogleAppEngine/integration-test-GAE.html b/tests/integration-testscripts/GoogleAppEngine/integration-test-GAE.html
index dee7b6da6901c8bf7e6b0a81cdd000c2de59b9c4..3f5ec1ce90d39edca79cb66835211530165c0f1a 100644 (file)
--- a/tests/integration-testscripts/GoogleAppEngine/integration-test-GAE.html
+++ b/tests/integration-testscripts/GoogleAppEngine/integration-test-GAE.html
@@ -13,7 +13,7 @@
 </thead><tbody>
 <tr>
        <td>openAndWait</td>
-       <td>/run/com.vaadin.tests.integration.IntegrationTestApplication?restartApplication</td>
+       <td>/integration/?restartApplication</td>
        <td></td>
 </tr>
 <tr>
@@ -23,7 +23,7 @@
 </tr>
 <tr>
        <td>mouseClick</td>
-       <td>vaadin=runcomvaadintestsintegrationIntegrationTestApplication::/VVerticalLayout[0]/ChildComponentContainer[0]/VScrollTable[0]/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild[0]/domChild[1]/domChild[0]</td>
+       <td>vaadin=integration::/VVerticalLayout[0]/ChildComponentContainer[0]/VScrollTable[0]/domChild[1]/domChild[0]/domChild[1]/domChild[0]/domChild[0]/domChild[1]/domChild[0]</td>
        <td>51,13</td>
 </tr>
 <tr>
@@ -33,7 +33,7 @@
 </tr>
 <tr>
        <td>assertText</td>
-       <td>vaadin=runcomvaadintestsintegrationIntegrationTestApplication::/VVerticalLayout[0]/ChildComponentContainer[1]/VLabel[0]</td>
+       <td>vaadin=integration::/VVerticalLayout[0]/ChildComponentContainer[1]/VLabel[0]</td>
        <td>FI</td>
 </tr>