diff options
| -rw-r--r-- | WebContent/WEB-INF/web.xml | 12 | ||||
| -rw-r--r-- | build/package/WebContent/WEB-INF/web.xml | 20 | ||||
| -rwxr-xr-x | src/com/vaadin/terminal/gwt/client/ApplicationConnection.java | 4 |
3 files changed, 2 insertions, 34 deletions
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 @@ -20,26 +20,6 @@ </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 class can be run in /run/foo.App/. Do not deploy this servlet in 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; |