Merged: Fixed #3371 - Remove obsolete testingtools references

svn changeset:8841/svn branch:6.2

diff --git a/WebContent/WEB-INF/web.xml b/WebContent/WEB-INF/web.xml
index 61ec7387241fe24c036b90f9cb1be8c2115de4f7..a2c51c3646556dc4030d3d0be4b5053c7cae185b 100644 (file)
--- a/WebContent/WEB-INF/web.xml
+++ b/WebContent/WEB-INF/web.xml
@@ -19,18 +19,6 @@
                <param-value>false</param-value>\r
                <description>Vaadin production mode</description>\r
        </context-param>\r
-       <!-- Permit use of IT Mill Testing Tools for this servlet continer -->
-       <context-param>
-               <param-name>testingToolsActive</param-name>
-               <param-value>true</param-value>
-               <description>IT Mill Testing Tools activation</description>
-       </context-param>
-
-       <context-param>
-               <param-name>testingToolsServerUri</param-name>
-               <param-value>http://192.168.1.242:8099/TestingToolsServer</param-value>
-               <description>IT Mill Testing Tools URI</description>
-       </context-param>
 
        <servlet>\r
                <servlet-name>VaadinApplicationRunner</servlet-name>\r

diff --git a/build/package/WebContent/WEB-INF/web.xml b/build/package/WebContent/WEB-INF/web.xml
index e78047ca4874bb082c051e91b20a4e0700e46a4c..f80129b810e3921f8f3f827e076e2bd2289fff9c 100644 (file)
--- a/build/package/WebContent/WEB-INF/web.xml
+++ b/build/package/WebContent/WEB-INF/web.xml
@@ -19,26 +19,6 @@
                <description>Vaadin production mode</description>
        </context-param>
 
-       <!--
-               Permit use of IT Mill Testing Tools for this servlet continer. Do not
-               use this in production environment.
-       -->
-       <context-param>
-               <param-name>testingToolsActive</param-name>
-               <param-value>true</param-value>
-               <description>IT Mill Testing Tools activation</description>
-       </context-param>
-
-       <!--
-               Specify the IT Mill Testing Tools server URI. Do not use this in
-               production environment.
-       -->
-       <context-param>
-               <param-name>testingToolsServerUri</param-name>
-               <param-value>http://192.168.1.242:8099/TestingToolsServer</param-value>
-               <description>IT Mill Testing Tools URI</description>
-       </context-param>
-
        <!--
                Enable possibility to run any Java class as application from this
                servlet. For example, if this servlet is mapped to /run, your foo.App

diff --git a/src/com/vaadin/terminal/gwt/client/ApplicationConnection.java b/src/com/vaadin/terminal/gwt/client/ApplicationConnection.java
index 115d8ef7021d33d50a028fd4a72e6e67f4ce0a27..0e1270901f637cb315a5d760cf07026466d6ebaf 100755 (executable)
--- a/src/com/vaadin/terminal/gwt/client/ApplicationConnection.java
+++ b/src/com/vaadin/terminal/gwt/client/ApplicationConnection.java
@@ -132,7 +132,7 @@ public class ApplicationConnection {
         // remove the end (window name) of autogenerated rootpanel id
         appRootPanelName = appRootPanelName.replaceFirst("-\\d+$", "");
 
-        initializeTestingToolsHooks(componentLocator, appRootPanelName);
+        initializeTestbenchHooks(componentLocator, appRootPanelName);
 
         initializeClientHooks();
 
@@ -152,7 +152,7 @@ public class ApplicationConnection {
         makeUidlRequest("", true, false, false);
     }
 
-    private native void initializeTestingToolsHooks(
+    private native void initializeTestbenchHooks(
             ComponentLocator componentLocator, String TTAppId)
     /*-{
          var ap = this;