From: Artur Signell <artur.signell@itmill.com>
Date: Fri, 18 Sep 2009 06:15:44 +0000 (+0000)
Subject: Merged: Fixed #3371 - Remove obsolete testingtools references
X-Git-Tag: 6.7.0.beta1~2475
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=0778b963470cd893712ba000319919bb329cfc18;p=vaadin-framework.git

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 61ec738724..a2c51c3646 100644
--- a/WebContent/WEB-INF/web.xml
+++ b/WebContent/WEB-INF/web.xml
@@ -19,18 +19,6 @@
 		<param-value>false</param-value>
 		<description>Vaadin production mode</description>
 	</context-param>
-	<!-- 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>
 		<servlet-name>VaadinApplicationRunner</servlet-name>
diff --git a/build/package/WebContent/WEB-INF/web.xml b/build/package/WebContent/WEB-INF/web.xml
index e78047ca48..f80129b810 100644
--- 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 115d8ef702..0e1270901f 100755
--- 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;