diff options
7 files changed, 15 insertions, 15 deletions
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"> diff --git a/client-compiler/src/com/vaadin/tools/WidgetsetCompiler.java b/client-compiler/src/com/vaadin/tools/WidgetsetCompiler.java index 4de6847012..51d5ec8187 100755 --- a/client-compiler/src/com/vaadin/tools/WidgetsetCompiler.java +++ b/client-compiler/src/com/vaadin/tools/WidgetsetCompiler.java @@ -33,7 +33,7 @@ import com.vaadin.server.widgetsetutils.WidgetSetBuilder; * * A typical invocation would use e.g. the following arguments * - * "-out WebContent/VAADIN/widgetsets com.vaadin.terminal.gwt.DefaultWidgetSet" + * "-out WebContent/VAADIN/widgetsets com.vaadin.DefaultWidgetSet" * * In addition, larger memory usage settings for the VM should be used, e.g. * diff --git a/client/src/com/vaadin/Vaadin.gwt.xml b/client/src/com/vaadin/Vaadin.gwt.xml index cb6581f70e..ee62e1b984 100644 --- a/client/src/com/vaadin/Vaadin.gwt.xml +++ b/client/src/com/vaadin/Vaadin.gwt.xml @@ -13,7 +13,7 @@ <inherits name="com.google.gwt.json.JSON" /> - <inherits name="com.vaadin.terminal.gwt.VaadinBrowserSpecificOverrides" /> + <inherits name="com.vaadin.VaadinBrowserSpecificOverrides" /> <source path="client" /> <source path="shared" /> diff --git a/server/src/com/vaadin/portal/gwt/PortalDefaultWidgetSet.gwt.xml b/server/src/com/vaadin/portal/gwt/PortalDefaultWidgetSet.gwt.xml index bd91d05b02..c127d3bb21 100644 --- a/server/src/com/vaadin/portal/gwt/PortalDefaultWidgetSet.gwt.xml +++ b/server/src/com/vaadin/portal/gwt/PortalDefaultWidgetSet.gwt.xml @@ -2,5 +2,5 @@ <!-- WS Compiler: manually edited --> <!-- Inherit the DefaultWidgetSet --> - <inherits name="com.vaadin.terminal.gwt.DefaultWidgetSet" /> + <inherits name="com.vaadin.DefaultWidgetSet" /> </module> diff --git a/server/src/com/vaadin/server/Constants.java b/server/src/com/vaadin/server/Constants.java index 9fe2b93224..afb2d4dae1 100644 --- a/server/src/com/vaadin/server/Constants.java +++ b/server/src/com/vaadin/server/Constants.java @@ -81,7 +81,7 @@ public interface Constants { static final String WIDGETSET_DIRECTORY_PATH = "VAADIN/widgetsets/"; // Name of the default widget set, used if not specified in web.xml - static final String DEFAULT_WIDGETSET = "com.vaadin.terminal.gwt.DefaultWidgetSet"; + static final String DEFAULT_WIDGETSET = "com.vaadin.DefaultWidgetSet"; // Widget set parameter name static final String PARAMETER_WIDGETSET = "widgetset"; diff --git a/tests/server-side/com/vaadin/tests/server/TestClassesSerializable.java b/tests/server-side/com/vaadin/tests/server/TestClassesSerializable.java index 44a6a3b66d..e98be99cbc 100644 --- a/tests/server-side/com/vaadin/tests/server/TestClassesSerializable.java +++ b/tests/server-side/com/vaadin/tests/server/TestClassesSerializable.java @@ -31,8 +31,8 @@ public class TestClassesSerializable extends TestCase { "com\\.vaadin\\.demo\\..*", // "com\\.vaadin\\.external\\.org\\.apache\\.commons\\.fileupload\\..*", // "com\\.vaadin\\.launcher\\..*", // - "com\\.vaadin\\.terminal\\.gwt\\.client\\..*", // - "com\\.vaadin\\.terminal\\.gwt\\.widgetsetutils\\..*", // + "com\\.vaadin\\.client\\..*", // + "com\\.vaadin\\.server\\.widgetsetutils\\..*", // "com\\.vaadin\\.tests\\..*", // exclude automated tests "com\\.vaadin\\.tools\\..*", // "com\\.vaadin\\.ui\\.themes\\..*", // @@ -40,15 +40,15 @@ public class TestClassesSerializable extends TestCase { "com\\.vaadin\\.event\\.FieldEvents", // "com\\.vaadin\\.event\\.LayoutEvents", // "com\\.vaadin\\.event\\.MouseEvents", // - "com\\.vaadin\\.terminal\\.gwt\\.server\\.AbstractApplicationPortlet", // - "com\\.vaadin\\.terminal\\.gwt\\.server\\.ApplicationPortlet2", // - "com\\.vaadin\\.terminal\\.gwt\\.server\\.Constants", // + "com\\.vaadin\\.server\\.AbstractApplicationPortlet", // + "com\\.vaadin\\.server\\.ApplicationPortlet2", // + "com\\.vaadin\\.server\\.Constants", // "com\\.vaadin\\.util\\.SerializerHelper", // fully static // class level filtering, also affecting nested classes and // interfaces - "com\\.vaadin\\.terminal\\.gwt\\.server\\.AbstractCommunicationManager.*", // - "com\\.vaadin\\.terminal\\.gwt\\.server\\.CommunicationManager.*", // - "com\\.vaadin\\.terminal\\.gwt\\.server\\.PortletCommunicationManager.*", // + "com\\.vaadin\\.server\\.AbstractCommunicationManager.*", // + "com\\.vaadin\\.server\\.CommunicationManager.*", // + "com\\.vaadin\\.server\\.PortletCommunicationManager.*", // }; /** diff --git a/tests/testbench/com/vaadin/tests/widgetset/TestingWidgetSet.gwt.xml b/tests/testbench/com/vaadin/tests/widgetset/TestingWidgetSet.gwt.xml index bd91d05b02..c127d3bb21 100644 --- a/tests/testbench/com/vaadin/tests/widgetset/TestingWidgetSet.gwt.xml +++ b/tests/testbench/com/vaadin/tests/widgetset/TestingWidgetSet.gwt.xml @@ -2,5 +2,5 @@ <!-- WS Compiler: manually edited --> <!-- Inherit the DefaultWidgetSet --> - <inherits name="com.vaadin.terminal.gwt.DefaultWidgetSet" /> + <inherits name="com.vaadin.DefaultWidgetSet" /> </module> |