diff options
| author | John Ahlroos <john@vaadin.com> | 2012-08-31 10:10:03 +0300 |
|---|---|---|
| committer | John Ahlroos <john@vaadin.com> | 2012-08-31 10:10:03 +0300 |
| commit | 340cd7899812b444941584d383d930fe8155159b (patch) | |
| tree | 5989b22f0db52cd578aad087afc9f9fe4d63fb9d /WebContent | |
| parent | 8b546f207714a663d4e2996f514cdc077cc9dafc (diff) | |
| parent | 7b25b3886ea95bc6495506fbe9472e45fcbde684 (diff) | |
| download | vaadin-framework-340cd7899812b444941584d383d930fe8155159b.tar.gz vaadin-framework-340cd7899812b444941584d383d930fe8155159b.zip | |
Merge branch 'master' into layoutgraph
Conflicts:
client/src/com/vaadin/client/ComponentLocator.java
client/src/com/vaadin/client/ui/AbstractComponentConnector.java
Diffstat (limited to 'WebContent')
| -rw-r--r-- | WebContent/WEB-INF/portlet.xml | 4 | ||||
| -rw-r--r-- | WebContent/WEB-INF/web.xml | 2 | ||||
| -rw-r--r-- | WebContent/statictestfiles/EmbedSizeHostPage.html | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/WebContent/WEB-INF/portlet.xml b/WebContent/WEB-INF/portlet.xml index 0b059a69e9..f695551cf2 100644 --- a/WebContent/WEB-INF/portlet.xml +++ b/WebContent/WEB-INF/portlet.xml @@ -6,7 +6,7 @@ <portlet> <portlet-name>JSR286TestPortlet</portlet-name> <display-name>Vaadin Portlet 2.0 Test</display-name> - <portlet-class>com.vaadin.terminal.gwt.server.ApplicationPortlet2</portlet-class> + <portlet-class>com.vaadin.server.ApplicationPortlet2</portlet-class> <init-param> <name>application</name> <value>com.vaadin.tests.integration.JSR286PortletApplication</value> @@ -44,7 +44,7 @@ <portlet-name>Vaadin Liferay Theme Portlet</portlet-name> <display-name>Vaadin Liferay Theme</display-name> - <portlet-class>com.vaadin.terminal.gwt.server.ApplicationPortlet2</portlet-class> + <portlet-class>com.vaadin.server.ApplicationPortlet2</portlet-class> <init-param> <name>application</name> <value>com.vaadin.tests.integration.LiferayThemeDemo</value> diff --git a/WebContent/WEB-INF/web.xml b/WebContent/WEB-INF/web.xml index 5b250d86f2..58a125c10f 100644 --- a/WebContent/WEB-INF/web.xml +++ b/WebContent/WEB-INF/web.xml @@ -28,7 +28,7 @@ <!-- For testing GAE - the deployment script changes this to use GAEApplicationServlet --> <servlet> <servlet-name>IntegrationTest</servlet-name> - <servlet-class>com.vaadin.terminal.gwt.server.ApplicationServlet</servlet-class> + <servlet-class>com.vaadin.server.ApplicationServlet</servlet-class> <init-param> <param-name>application</param-name> <param-value>com.vaadin.tests.integration.IntegrationTestApplication</param-value> diff --git a/WebContent/statictestfiles/EmbedSizeHostPage.html b/WebContent/statictestfiles/EmbedSizeHostPage.html index 06dfd5dfd7..2576a200db 100644 --- a/WebContent/statictestfiles/EmbedSizeHostPage.html +++ b/WebContent/statictestfiles/EmbedSizeHostPage.html @@ -13,7 +13,7 @@ vaadin.vaadinConfigurations = {}; if (!vaadin.themesLoaded) { vaadin.themesLoaded = {}; } vaadin.debug = true; document.write('<iframe tabIndex="-1" id="__gwt_historyFrame" style="position:absolute;width:0;height:0;border:0;overflow:hidden;" src="javascript:false"></iframe>'); -document.write("<script language='javascript' src='/VAADIN/widgetsets/com.vaadin.terminal.gwt.DefaultWidgetSet/com.vaadin.terminal.gwt.DefaultWidgetSet.nocache.js?1321018813162'><\/script>"); +document.write("<script language='javascript' src='/VAADIN/widgetsets/com.vaadin.DefaultWidgetSet/com.vaadin.DefaultWidgetSet.nocache.js?1321018813162'><\/script>"); } vaadin.vaadinConfigurations["runcomvaadintestsintegrationEmbedSizeTest-225840176"] = {appUri:'/run/com.vaadin.tests.integration.EmbedSizeTest', themeUri:"/VAADIN/themes/reindeer", versionInfo : {vaadinVersion:"9.9.9.INTERNAL-DEBUG-BUILD",applicationVersion:"NONVERSIONED"},"comErrMsg": {"caption":"Communication problem","message" : "Take note of any unsaved data, and <u>click here<\/u> to continue.","url" : null},"authErrMsg": {"caption":"Authentication problem","message" : "Take note of any unsaved data, and <u>click here<\/u> to continue.","url" : null}}; //]]> @@ -32,7 +32,7 @@ vaadin.themesLoaded['reindeer'] = true; </script> <script type="text/javascript"> //<![CDATA[ -setTimeout('if (typeof com_vaadin_terminal_gwt_DefaultWidgetSet == "undefined") {alert("Failed to load the widgetset: /VAADIN/widgetsets/com.vaadin.terminal.gwt.DefaultWidgetSet/com.vaadin.terminal.gwt.DefaultWidgetSet.nocache.js?1321018813162")};',15000); +setTimeout('if (typeof com_vaadin_DefaultWidgetSet == "undefined") {alert("Failed to load the widgetset: /VAADIN/widgetsets/com.vaadin.DefaultWidgetSet/com.vaadin.DefaultWidgetSet.nocache.js?1321018813162")};',15000); //]]> </script> <div style="width: 80%; border: 1px solid black"> |