diff options
| author | Artur Signell <artur@vaadin.com> | 2012-08-29 12:22:31 +0300 |
|---|---|---|
| committer | Artur Signell <artur@vaadin.com> | 2012-08-29 12:22:31 +0300 |
| commit | 63595217a224b9fbc6de4b8bdc2e6b317e0558d5 (patch) | |
| tree | 9d7bcafc23ef5f4c6aad8bca6555fc04396aa1c6 | |
| parent | e18177bac62e8367829dfc5ec3083a09973e621e (diff) | |
| download | vaadin-framework-63595217a224b9fbc6de4b8bdc2e6b317e0558d5.tar.gz vaadin-framework-63595217a224b9fbc6de4b8bdc2e6b317e0558d5.zip | |
Merged com.vaadin.terminal.gwt.server into com.vaadin.server (#9431)
121 files changed, 191 insertions, 289 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/client-compiler/src/com/vaadin/terminal/gwt/widgetsetutils/WidgetMapGenerator.java b/client-compiler/src/com/vaadin/terminal/gwt/widgetsetutils/WidgetMapGenerator.java index 21246de464..f7fc3cf45a 100644 --- a/client-compiler/src/com/vaadin/terminal/gwt/widgetsetutils/WidgetMapGenerator.java +++ b/client-compiler/src/com/vaadin/terminal/gwt/widgetsetutils/WidgetMapGenerator.java @@ -38,10 +38,10 @@ import com.google.gwt.user.rebind.SourceWriter; import com.vaadin.client.ServerConnector; import com.vaadin.client.ui.UnknownComponentConnector; import com.vaadin.client.ui.UI.UIConnector; +import com.vaadin.server.ClientConnector; import com.vaadin.shared.Connector; import com.vaadin.shared.ui.Connect; import com.vaadin.shared.ui.Connect.LoadStyle; -import com.vaadin.terminal.gwt.server.ClientConnector; /** * WidgetMapGenerator's are GWT generator to build WidgetMapImpl dynamically diff --git a/client/src/com/vaadin/client/ApplicationConfiguration.java b/client/src/com/vaadin/client/ApplicationConfiguration.java index 4db9a5d9f9..e364facb43 100644 --- a/client/src/com/vaadin/client/ApplicationConfiguration.java +++ b/client/src/com/vaadin/client/ApplicationConfiguration.java @@ -146,7 +146,7 @@ public class ApplicationConfiguration implements EntryPoint { * * @return a string with the version * - * @see com.vaadin.terminal.gwt.server.AbstractApplicationServlet#VERSION + * @see com.vaadin.server.AbstractApplicationServlet#VERSION */ private native String getVaadinVersion() /*-{ diff --git a/client/src/com/vaadin/client/ApplicationConnection.java b/client/src/com/vaadin/client/ApplicationConnection.java index 1f12cbb3a1..88510e7bf6 100644 --- a/client/src/com/vaadin/client/ApplicationConnection.java +++ b/client/src/com/vaadin/client/ApplicationConnection.java @@ -86,7 +86,7 @@ import com.vaadin.shared.ui.ui.UIConstants; /** * This is the client side communication "engine", managing client-server * communication with its server side counterpart - * com.vaadin.terminal.gwt.server.AbstractCommunicationManager. + * com.vaadin.server.AbstractCommunicationManager. * * Client-side connectors receive updates from the corresponding server-side * connector (typically component) as state updates or RPC calls. The connector diff --git a/client/src/com/vaadin/client/communication/JSONSerializer.java b/client/src/com/vaadin/client/communication/JSONSerializer.java index a8fcfbb6af..dd3594acac 100644 --- a/client/src/com/vaadin/client/communication/JSONSerializer.java +++ b/client/src/com/vaadin/client/communication/JSONSerializer.java @@ -41,7 +41,7 @@ public interface JSONSerializer<T> { * Creates and deserializes an object received from the server. Must be * compatible with {@link #serialize(Object, ConnectorMap)} and also with * the server side JsonCodec.encode(Object, - * com.vaadin.terminal.gwt.server.PaintableIdMapper) . + * com.vaadin.server.PaintableIdMapper) . * * @param jsonValue * JSON map from property name to property value @@ -54,7 +54,7 @@ public interface JSONSerializer<T> { * Serialize the given object into JSON. Must be compatible with * {@link #deserialize(JSONObject, ConnectorMap)} and also with the server * side JsonCodec.decode(com.vaadin.external.json.JSONArray, - * com.vaadin.terminal.gwt.server.PaintableIdMapper) + * com.vaadin.server.PaintableIdMapper) * * @param value * The object to serialize diff --git a/client/src/com/vaadin/client/ui/combobox/ComboBoxConnector.java b/client/src/com/vaadin/client/ui/combobox/ComboBoxConnector.java index 6c0d8fa725..e942f803e9 100644 --- a/client/src/com/vaadin/client/ui/combobox/ComboBoxConnector.java +++ b/client/src/com/vaadin/client/ui/combobox/ComboBoxConnector.java @@ -36,8 +36,8 @@ public class ComboBoxConnector extends AbstractFieldConnector implements /* * (non-Javadoc) * - * @see com.vaadin.client.Paintable#updateFromUIDL(com.vaadin.terminal - * .gwt.client.UIDL, com.vaadin.client.ApplicationConnection) + * @see com.vaadin.client.Paintable#updateFromUIDL(com.vaadin.client.UIDL, + * com.vaadin.client.ApplicationConnection) */ @Override public void updateFromUIDL(UIDL uidl, ApplicationConnection client) { diff --git a/client/src/com/vaadin/client/ui/table/TableConnector.java b/client/src/com/vaadin/client/ui/table/TableConnector.java index e92584e211..891d4880b3 100644 --- a/client/src/com/vaadin/client/ui/table/TableConnector.java +++ b/client/src/com/vaadin/client/ui/table/TableConnector.java @@ -53,9 +53,8 @@ public class TableConnector extends AbstractComponentContainerConnector /* * (non-Javadoc) * - * @see - * com.vaadin.client.Paintable#updateFromUIDL(com.vaadin.terminal - * .gwt.client.UIDL, com.vaadin.client.ApplicationConnection) + * @see com.vaadin.client.Paintable#updateFromUIDL(com.vaadin.client.UIDL, + * com.vaadin.client.ApplicationConnection) */ @Override public void updateFromUIDL(UIDL uidl, ApplicationConnection client) { diff --git a/server/src/com/vaadin/Application.java b/server/src/com/vaadin/Application.java index a406617288..ef3c805bb1 100644 --- a/server/src/com/vaadin/Application.java +++ b/server/src/com/vaadin/Application.java @@ -51,27 +51,27 @@ import com.vaadin.data.util.converter.Converter; import com.vaadin.data.util.converter.ConverterFactory; import com.vaadin.data.util.converter.DefaultConverterFactory; import com.vaadin.event.EventRouter; +import com.vaadin.server.AbstractApplicationServlet; import com.vaadin.server.AbstractErrorMessage; import com.vaadin.server.ApplicationResource; +import com.vaadin.server.BootstrapFragmentResponse; +import com.vaadin.server.BootstrapListener; +import com.vaadin.server.BootstrapPageResponse; +import com.vaadin.server.BootstrapResponse; +import com.vaadin.server.ChangeVariablesErrorEvent; +import com.vaadin.server.ClientConnector; import com.vaadin.server.CombinedRequest; import com.vaadin.server.DeploymentConfiguration; import com.vaadin.server.RequestHandler; import com.vaadin.server.Terminal; import com.vaadin.server.UIProvider; import com.vaadin.server.VariableOwner; +import com.vaadin.server.WebApplicationContext; import com.vaadin.server.WrappedRequest; import com.vaadin.server.WrappedResponse; import com.vaadin.server.WrappedRequest.BrowserDetails; import com.vaadin.service.ApplicationContext; import com.vaadin.shared.ui.ui.UIConstants; -import com.vaadin.terminal.gwt.server.AbstractApplicationServlet; -import com.vaadin.terminal.gwt.server.BootstrapFragmentResponse; -import com.vaadin.terminal.gwt.server.BootstrapListener; -import com.vaadin.terminal.gwt.server.BootstrapPageResponse; -import com.vaadin.terminal.gwt.server.BootstrapResponse; -import com.vaadin.terminal.gwt.server.ChangeVariablesErrorEvent; -import com.vaadin.terminal.gwt.server.ClientConnector; -import com.vaadin.terminal.gwt.server.WebApplicationContext; import com.vaadin.tools.ReflectTools; import com.vaadin.ui.AbstractComponent; import com.vaadin.ui.AbstractField; diff --git a/server/src/com/vaadin/annotations/JavaScript.java b/server/src/com/vaadin/annotations/JavaScript.java index 7943fe1055..1a2fdf7583 100644 --- a/server/src/com/vaadin/annotations/JavaScript.java +++ b/server/src/com/vaadin/annotations/JavaScript.java @@ -21,7 +21,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import com.vaadin.terminal.gwt.server.ClientConnector; +import com.vaadin.server.ClientConnector; /** * If this annotation is present on a {@link ClientConnector} class, the diff --git a/server/src/com/vaadin/annotations/StyleSheet.java b/server/src/com/vaadin/annotations/StyleSheet.java index 7833544ab5..e1a9efd696 100644 --- a/server/src/com/vaadin/annotations/StyleSheet.java +++ b/server/src/com/vaadin/annotations/StyleSheet.java @@ -21,7 +21,7 @@ import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; import java.lang.annotation.Target; -import com.vaadin.terminal.gwt.server.ClientConnector; +import com.vaadin.server.ClientConnector; /** * If this annotation is present on a {@link ClientConnector} class, the diff --git a/server/src/com/vaadin/data/Validator.java b/server/src/com/vaadin/data/Validator.java index ef07d3eadc..1755a44920 100644 --- a/server/src/com/vaadin/data/Validator.java +++ b/server/src/com/vaadin/data/Validator.java @@ -18,7 +18,7 @@ package com.vaadin.data; import java.io.Serializable; -import com.vaadin.terminal.gwt.server.AbstractApplicationServlet; +import com.vaadin.server.AbstractApplicationServlet; /** * Interface that implements a method for validating if an {@link Object} is diff --git a/server/src/com/vaadin/package.html b/server/src/com/vaadin/package.html index f771019709..097fd94aca 100644 --- a/server/src/com/vaadin/package.html +++ b/server/src/com/vaadin/package.html @@ -5,22 +5,20 @@ <body bgcolor="white"> -<p>The Vaadin base package. Contains the Application class, the -starting point of any application that uses Vaadin.</p> + <p>The Vaadin base package. Contains the Application class, the + starting point of any application that uses Vaadin.</p> -<p>Contains all Vaadin core classes. A Vaadin application is based -on the {@link com.vaadin.Application} class and deployed as a servlet -using {@link com.vaadin.terminal.gwt.server.ApplicationServlet} or -{@link com.vaadin.terminal.gwt.server.GAEApplicationServlet} (for Google -App Engine).</p> + <p>Contains all Vaadin core classes. A Vaadin application is based + on the {@link com.vaadin.Application} class and deployed as a servlet + using {@link com.vaadin.server.ApplicationServlet} or {@link + com.vaadin.server.GAEApplicationServlet} (for Google App Engine).</p> -<p>Vaadin applications can also be deployed as portlets using {@link -com.vaadin.terminal.gwt.server.ApplicationPortlet} (JSR-168) or {@link -com.vaadin.terminal.gwt.server.ApplicationPortlet2} (JSR-286).</p> + <p>Vaadin applications can also be deployed as portlets using + {@link com.vaadin.server.ApplicationPortlet2} (JSR-286).</p> -<p>All classes in Vaadin are serializable unless otherwise noted. -This allows Vaadin applications to run in cluster and cloud -environments.</p> + <p>All classes in Vaadin are serializable unless otherwise noted. + This allows Vaadin applications to run in cluster and cloud + environments.</p> </body> diff --git a/server/src/com/vaadin/terminal/gwt/server/AbstractApplicationPortlet.java b/server/src/com/vaadin/server/AbstractApplicationPortlet.java index 47b9e97648..e47e00577b 100644 --- a/server/src/com/vaadin/terminal/gwt/server/AbstractApplicationPortlet.java +++ b/server/src/com/vaadin/server/AbstractApplicationPortlet.java @@ -13,7 +13,7 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.vaadin.terminal.gwt.server; +package com.vaadin.server; import java.io.BufferedWriter; import java.io.IOException; @@ -57,11 +57,7 @@ import com.vaadin.Application; import com.vaadin.Application.ApplicationStartEvent; import com.vaadin.Application.SystemMessages; import com.vaadin.UIRequiresMoreInformationException; -import com.vaadin.server.DeploymentConfiguration; -import com.vaadin.server.Terminal; -import com.vaadin.server.WrappedRequest; -import com.vaadin.server.WrappedResponse; -import com.vaadin.terminal.gwt.server.AbstractCommunicationManager.Callback; +import com.vaadin.server.AbstractCommunicationManager.Callback; import com.vaadin.ui.UI; /** diff --git a/server/src/com/vaadin/terminal/gwt/server/AbstractApplicationServlet.java b/server/src/com/vaadin/server/AbstractApplicationServlet.java index c92dfddd3b..2f0dad7079 100644 --- a/server/src/com/vaadin/terminal/gwt/server/AbstractApplicationServlet.java +++ b/server/src/com/vaadin/server/AbstractApplicationServlet.java @@ -13,7 +13,7 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.vaadin.terminal.gwt.server; +package com.vaadin.server; import java.io.BufferedWriter; import java.io.IOException; @@ -49,13 +49,8 @@ import javax.servlet.http.HttpSession; import com.vaadin.Application; import com.vaadin.Application.ApplicationStartEvent; import com.vaadin.Application.SystemMessages; -import com.vaadin.server.DeploymentConfiguration; -import com.vaadin.server.Terminal; -import com.vaadin.server.ThemeResource; -import com.vaadin.server.WrappedRequest; -import com.vaadin.server.WrappedResponse; +import com.vaadin.server.AbstractCommunicationManager.Callback; import com.vaadin.shared.ApplicationConstants; -import com.vaadin.terminal.gwt.server.AbstractCommunicationManager.Callback; import com.vaadin.ui.UI; /** diff --git a/server/src/com/vaadin/server/AbstractClientConnector.java b/server/src/com/vaadin/server/AbstractClientConnector.java index 2a0d1e4425..745ccf679c 100644 --- a/server/src/com/vaadin/server/AbstractClientConnector.java +++ b/server/src/com/vaadin/server/AbstractClientConnector.java @@ -36,12 +36,6 @@ import com.vaadin.external.json.JSONObject; import com.vaadin.shared.communication.ClientRpc; import com.vaadin.shared.communication.ServerRpc; import com.vaadin.shared.communication.SharedState; -import com.vaadin.terminal.gwt.server.AbstractCommunicationManager; -import com.vaadin.terminal.gwt.server.ClientConnector; -import com.vaadin.terminal.gwt.server.ClientMethodInvocation; -import com.vaadin.terminal.gwt.server.RpcManager; -import com.vaadin.terminal.gwt.server.RpcTarget; -import com.vaadin.terminal.gwt.server.ServerRpcManager; import com.vaadin.ui.HasComponents; import com.vaadin.ui.UI; diff --git a/server/src/com/vaadin/terminal/gwt/server/AbstractCommunicationManager.java b/server/src/com/vaadin/server/AbstractCommunicationManager.java index d4c1cfb157..acbbebea78 100644 --- a/server/src/com/vaadin/terminal/gwt/server/AbstractCommunicationManager.java +++ b/server/src/com/vaadin/server/AbstractCommunicationManager.java @@ -14,7 +14,7 @@ * the License. */ -package com.vaadin.terminal.gwt.server; +package com.vaadin.server; import java.io.BufferedWriter; import java.io.ByteArrayOutputStream; @@ -66,17 +66,9 @@ import com.vaadin.annotations.StyleSheet; import com.vaadin.external.json.JSONArray; import com.vaadin.external.json.JSONException; import com.vaadin.external.json.JSONObject; -import com.vaadin.server.AbstractClientConnector; -import com.vaadin.server.CombinedRequest; -import com.vaadin.server.LegacyPaint; -import com.vaadin.server.PaintException; -import com.vaadin.server.PaintTarget; -import com.vaadin.server.RequestHandler; -import com.vaadin.server.StreamVariable; -import com.vaadin.server.Vaadin6Component; -import com.vaadin.server.VariableOwner; -import com.vaadin.server.WrappedRequest; -import com.vaadin.server.WrappedResponse; +import com.vaadin.server.BootstrapHandler.BootstrapContext; +import com.vaadin.server.ComponentSizeValidator.InvalidLayout; +import com.vaadin.server.RpcManager.RpcInvocationException; import com.vaadin.server.StreamVariable.StreamingEndEvent; import com.vaadin.server.StreamVariable.StreamingErrorEvent; import com.vaadin.server.Terminal.ErrorEvent; @@ -90,9 +82,6 @@ import com.vaadin.shared.communication.MethodInvocation; import com.vaadin.shared.communication.SharedState; import com.vaadin.shared.communication.UidlValue; import com.vaadin.shared.ui.ui.UIConstants; -import com.vaadin.terminal.gwt.server.BootstrapHandler.BootstrapContext; -import com.vaadin.terminal.gwt.server.ComponentSizeValidator.InvalidLayout; -import com.vaadin.terminal.gwt.server.RpcManager.RpcInvocationException; import com.vaadin.ui.AbstractComponent; import com.vaadin.ui.AbstractField; import com.vaadin.ui.Component; diff --git a/server/src/com/vaadin/terminal/gwt/server/AbstractDeploymentConfiguration.java b/server/src/com/vaadin/server/AbstractDeploymentConfiguration.java index ab85214d25..22830ca82b 100644 --- a/server/src/com/vaadin/terminal/gwt/server/AbstractDeploymentConfiguration.java +++ b/server/src/com/vaadin/server/AbstractDeploymentConfiguration.java @@ -14,7 +14,7 @@ * the License. */ -package com.vaadin.terminal.gwt.server; +package com.vaadin.server; import java.lang.reflect.Constructor; import java.util.Iterator; @@ -22,7 +22,6 @@ import java.util.Properties; import java.util.ServiceLoader; import java.util.logging.Logger; -import com.vaadin.server.DeploymentConfiguration; public abstract class AbstractDeploymentConfiguration implements DeploymentConfiguration { diff --git a/server/src/com/vaadin/server/AbstractErrorMessage.java b/server/src/com/vaadin/server/AbstractErrorMessage.java index 13bddcc6ca..0928ea4bd4 100644 --- a/server/src/com/vaadin/server/AbstractErrorMessage.java +++ b/server/src/com/vaadin/server/AbstractErrorMessage.java @@ -23,7 +23,6 @@ import java.util.List; import com.vaadin.data.Buffered; import com.vaadin.data.Validator; -import com.vaadin.terminal.gwt.server.AbstractApplicationServlet; /** * Base class for component error messages. diff --git a/server/src/com/vaadin/server/AbstractExtension.java b/server/src/com/vaadin/server/AbstractExtension.java index 5693d1a29f..ccc3bbed22 100644 --- a/server/src/com/vaadin/server/AbstractExtension.java +++ b/server/src/com/vaadin/server/AbstractExtension.java @@ -16,7 +16,6 @@ package com.vaadin.server; -import com.vaadin.terminal.gwt.server.ClientConnector; /** * An extension is an entity that is attached to a Component or another diff --git a/server/src/com/vaadin/terminal/gwt/server/AbstractStreamingEvent.java b/server/src/com/vaadin/server/AbstractStreamingEvent.java index 4ee309576b..39e43c725d 100644 --- a/server/src/com/vaadin/terminal/gwt/server/AbstractStreamingEvent.java +++ b/server/src/com/vaadin/server/AbstractStreamingEvent.java @@ -13,7 +13,7 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.vaadin.terminal.gwt.server; +package com.vaadin.server; import com.vaadin.server.StreamVariable.StreamingEvent; diff --git a/server/src/com/vaadin/terminal/gwt/server/AbstractWebApplicationContext.java b/server/src/com/vaadin/server/AbstractWebApplicationContext.java index 29a2bcf72f..78cf8fdab8 100644 --- a/server/src/com/vaadin/terminal/gwt/server/AbstractWebApplicationContext.java +++ b/server/src/com/vaadin/server/AbstractWebApplicationContext.java @@ -13,7 +13,7 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.vaadin.terminal.gwt.server; +package com.vaadin.server; import java.io.PrintWriter; import java.io.Serializable; @@ -34,7 +34,6 @@ import javax.servlet.http.HttpSessionBindingEvent; import javax.servlet.http.HttpSessionBindingListener; import com.vaadin.Application; -import com.vaadin.server.ApplicationResource; import com.vaadin.service.ApplicationContext; import com.vaadin.shared.ApplicationConstants; diff --git a/server/src/com/vaadin/terminal/gwt/server/AddonContext.java b/server/src/com/vaadin/server/AddonContext.java index 03f1d95a56..b3cd5ea226 100644 --- a/server/src/com/vaadin/terminal/gwt/server/AddonContext.java +++ b/server/src/com/vaadin/server/AddonContext.java @@ -14,7 +14,7 @@ * the License. */ -package com.vaadin.terminal.gwt.server; +package com.vaadin.server; import java.lang.reflect.Method; import java.util.ArrayList; @@ -24,7 +24,6 @@ import java.util.ServiceLoader; import com.vaadin.Application; import com.vaadin.event.EventRouter; -import com.vaadin.server.DeploymentConfiguration; import com.vaadin.tools.ReflectTools; /** @@ -35,10 +34,10 @@ import com.vaadin.tools.ReflectTools; * <p> * By default, AddonContextListeners are loaded using {@link ServiceLoader}, * which means that the file - * META-INF/services/com.vaadin.terminal.gwt.server.AddonContextListener will be - * checked for lines containing fully qualified names of classes to use. This - * behavior can however be overridden for custom deployment situations (e.g. to - * use CDI or OSGi) by overriding + * META-INF/services/com.vaadin.server.AddonContextListener will be checked for + * lines containing fully qualified names of classes to use. This behavior can + * however be overridden for custom deployment situations (e.g. to use CDI or + * OSGi) by overriding * {@link DeploymentConfiguration#getAddonContextListeners()}. * * @author Vaadin Ltd diff --git a/server/src/com/vaadin/terminal/gwt/server/AddonContextEvent.java b/server/src/com/vaadin/server/AddonContextEvent.java index 0f3900fa20..d83b1b0084 100644 --- a/server/src/com/vaadin/terminal/gwt/server/AddonContextEvent.java +++ b/server/src/com/vaadin/server/AddonContextEvent.java @@ -14,7 +14,7 @@ * the License. */ -package com.vaadin.terminal.gwt.server; +package com.vaadin.server; import java.util.EventObject; diff --git a/server/src/com/vaadin/terminal/gwt/server/AddonContextListener.java b/server/src/com/vaadin/server/AddonContextListener.java index b76d233716..a5d9e8c5c9 100644 --- a/server/src/com/vaadin/terminal/gwt/server/AddonContextListener.java +++ b/server/src/com/vaadin/server/AddonContextListener.java @@ -14,7 +14,7 @@ * the License. */ -package com.vaadin.terminal.gwt.server; +package com.vaadin.server; import java.util.EventListener; @@ -22,8 +22,7 @@ import java.util.EventListener; * Listener that gets notified then the {@link AddonContext} is initialized, * allowing an add-on to add listeners to various parts of the framework. In a * default configuration, add-ons can register their listeners by including a - * file named - * META-INF/services/com.vaadin.terminal.gwt.server.AddonContextListener + * file named META-INF/services/com.vaadin.server.AddonContextListener * containing the fully qualified class names of classes implementing this * interface. * diff --git a/server/src/com/vaadin/terminal/gwt/server/ApplicationPortlet2.java b/server/src/com/vaadin/server/ApplicationPortlet2.java index 743670438e..3708d8fe0d 100644 --- a/server/src/com/vaadin/terminal/gwt/server/ApplicationPortlet2.java +++ b/server/src/com/vaadin/server/ApplicationPortlet2.java @@ -14,13 +14,13 @@ * the License. */ -package com.vaadin.terminal.gwt.server; +package com.vaadin.server; import javax.portlet.PortletConfig; import javax.portlet.PortletException; import com.vaadin.Application; -import com.vaadin.terminal.gwt.server.ServletPortletHelper.ApplicationClassException; +import com.vaadin.server.ServletPortletHelper.ApplicationClassException; /** * TODO Write documentation, fix JavaDoc tags. diff --git a/server/src/com/vaadin/terminal/gwt/server/ApplicationResourceHandler.java b/server/src/com/vaadin/server/ApplicationResourceHandler.java index 397c8e7369..1cad5efcfd 100644 --- a/server/src/com/vaadin/terminal/gwt/server/ApplicationResourceHandler.java +++ b/server/src/com/vaadin/server/ApplicationResourceHandler.java @@ -14,7 +14,7 @@ * the License. */ -package com.vaadin.terminal.gwt.server; +package com.vaadin.server; import java.io.IOException; import java.util.regex.Matcher; @@ -23,11 +23,6 @@ import java.util.regex.Pattern; import javax.servlet.http.HttpServletResponse; import com.vaadin.Application; -import com.vaadin.server.ApplicationResource; -import com.vaadin.server.DownloadStream; -import com.vaadin.server.RequestHandler; -import com.vaadin.server.WrappedRequest; -import com.vaadin.server.WrappedResponse; public class ApplicationResourceHandler implements RequestHandler { private static final Pattern APP_RESOURCE_PATTERN = Pattern diff --git a/server/src/com/vaadin/terminal/gwt/server/ApplicationServlet.java b/server/src/com/vaadin/server/ApplicationServlet.java index 6765958369..af0cebcf86 100644 --- a/server/src/com/vaadin/terminal/gwt/server/ApplicationServlet.java +++ b/server/src/com/vaadin/server/ApplicationServlet.java @@ -14,14 +14,13 @@ * the License. */ -package com.vaadin.terminal.gwt.server; +package com.vaadin.server; import javax.servlet.ServletException; import javax.servlet.http.HttpServletRequest; import com.vaadin.Application; -import com.vaadin.server.DefaultUIProvider; -import com.vaadin.terminal.gwt.server.ServletPortletHelper.ApplicationClassException; +import com.vaadin.server.ServletPortletHelper.ApplicationClassException; /** * This servlet connects a Vaadin Application to Web. diff --git a/server/src/com/vaadin/terminal/gwt/server/ApplicationStartedEvent.java b/server/src/com/vaadin/server/ApplicationStartedEvent.java index 02d73884f5..d06744ae40 100644 --- a/server/src/com/vaadin/terminal/gwt/server/ApplicationStartedEvent.java +++ b/server/src/com/vaadin/server/ApplicationStartedEvent.java @@ -14,7 +14,7 @@ * the License. */ -package com.vaadin.terminal.gwt.server; +package com.vaadin.server; import java.util.EventObject; diff --git a/server/src/com/vaadin/terminal/gwt/server/ApplicationStartedListener.java b/server/src/com/vaadin/server/ApplicationStartedListener.java index c6976aee57..c54132d875 100644 --- a/server/src/com/vaadin/terminal/gwt/server/ApplicationStartedListener.java +++ b/server/src/com/vaadin/server/ApplicationStartedListener.java @@ -14,7 +14,7 @@ * the License. */ -package com.vaadin.terminal.gwt.server; +package com.vaadin.server; import java.util.EventListener; diff --git a/server/src/com/vaadin/terminal/gwt/server/BootstrapDom.java b/server/src/com/vaadin/server/BootstrapDom.java index 15210a7de5..65ee9f2761 100644 --- a/server/src/com/vaadin/terminal/gwt/server/BootstrapDom.java +++ b/server/src/com/vaadin/server/BootstrapDom.java @@ -14,7 +14,7 @@ * the License. */ -package com.vaadin.terminal.gwt.server; +package com.vaadin.server; public class BootstrapDom { diff --git a/server/src/com/vaadin/terminal/gwt/server/BootstrapFragmentResponse.java b/server/src/com/vaadin/server/BootstrapFragmentResponse.java index ff26a1270a..16f7bc653b 100644 --- a/server/src/com/vaadin/terminal/gwt/server/BootstrapFragmentResponse.java +++ b/server/src/com/vaadin/server/BootstrapFragmentResponse.java @@ -14,14 +14,13 @@ * the License. */ -package com.vaadin.terminal.gwt.server; +package com.vaadin.server; import java.util.List; import org.jsoup.nodes.Node; import com.vaadin.Application; -import com.vaadin.server.WrappedRequest; /** * A representation of a bootstrap fragment being generated. The bootstrap diff --git a/server/src/com/vaadin/terminal/gwt/server/BootstrapHandler.java b/server/src/com/vaadin/server/BootstrapHandler.java index 94328b47bf..280372a5e5 100644 --- a/server/src/com/vaadin/terminal/gwt/server/BootstrapHandler.java +++ b/server/src/com/vaadin/server/BootstrapHandler.java @@ -14,7 +14,7 @@ * the License. */ -package com.vaadin.terminal.gwt.server; +package com.vaadin.server; import java.io.BufferedWriter; import java.io.IOException; @@ -40,11 +40,6 @@ import com.vaadin.Application; import com.vaadin.UIRequiresMoreInformationException; import com.vaadin.external.json.JSONException; import com.vaadin.external.json.JSONObject; -import com.vaadin.server.DeploymentConfiguration; -import com.vaadin.server.PaintException; -import com.vaadin.server.RequestHandler; -import com.vaadin.server.WrappedRequest; -import com.vaadin.server.WrappedResponse; import com.vaadin.shared.ApplicationConstants; import com.vaadin.shared.Version; import com.vaadin.shared.ui.ui.UIConstants; diff --git a/server/src/com/vaadin/terminal/gwt/server/BootstrapListener.java b/server/src/com/vaadin/server/BootstrapListener.java index d99d5b7b84..9b68df3d51 100644 --- a/server/src/com/vaadin/terminal/gwt/server/BootstrapListener.java +++ b/server/src/com/vaadin/server/BootstrapListener.java @@ -14,7 +14,7 @@ * the License. */ -package com.vaadin.terminal.gwt.server; +package com.vaadin.server; import java.util.EventListener; diff --git a/server/src/com/vaadin/terminal/gwt/server/BootstrapPageResponse.java b/server/src/com/vaadin/server/BootstrapPageResponse.java index 1d244a69be..e978703fa3 100644 --- a/server/src/com/vaadin/terminal/gwt/server/BootstrapPageResponse.java +++ b/server/src/com/vaadin/server/BootstrapPageResponse.java @@ -14,15 +14,13 @@ * the License. */ -package com.vaadin.terminal.gwt.server; +package com.vaadin.server; import java.util.Map; import org.jsoup.nodes.Document; import com.vaadin.Application; -import com.vaadin.server.WrappedRequest; -import com.vaadin.server.WrappedResponse; /** * A representation of a bootstrap page being generated. The bootstrap page diff --git a/server/src/com/vaadin/terminal/gwt/server/BootstrapResponse.java b/server/src/com/vaadin/server/BootstrapResponse.java index bc2fdb0dd2..962b48dc31 100644 --- a/server/src/com/vaadin/terminal/gwt/server/BootstrapResponse.java +++ b/server/src/com/vaadin/server/BootstrapResponse.java @@ -14,13 +14,12 @@ * the License. */ -package com.vaadin.terminal.gwt.server; +package com.vaadin.server; import java.util.EventObject; import com.vaadin.Application; import com.vaadin.UIRequiresMoreInformationException; -import com.vaadin.server.WrappedRequest; import com.vaadin.ui.UI; /** diff --git a/server/src/com/vaadin/terminal/gwt/server/ChangeVariablesErrorEvent.java b/server/src/com/vaadin/server/ChangeVariablesErrorEvent.java index cb0645d94f..f208fffcef 100644 --- a/server/src/com/vaadin/terminal/gwt/server/ChangeVariablesErrorEvent.java +++ b/server/src/com/vaadin/server/ChangeVariablesErrorEvent.java @@ -13,7 +13,7 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.vaadin.terminal.gwt.server; +package com.vaadin.server; import java.util.Map; diff --git a/server/src/com/vaadin/terminal/gwt/server/ClientConnector.java b/server/src/com/vaadin/server/ClientConnector.java index 152acf9d2b..ce392ce226 100644 --- a/server/src/com/vaadin/terminal/gwt/server/ClientConnector.java +++ b/server/src/com/vaadin/server/ClientConnector.java @@ -13,15 +13,13 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.vaadin.terminal.gwt.server; +package com.vaadin.server; import java.util.Collection; import java.util.List; import com.vaadin.external.json.JSONException; import com.vaadin.external.json.JSONObject; -import com.vaadin.server.AbstractClientConnector; -import com.vaadin.server.Extension; import com.vaadin.shared.Connector; import com.vaadin.shared.communication.SharedState; import com.vaadin.ui.Component; diff --git a/server/src/com/vaadin/terminal/gwt/server/ClientMethodInvocation.java b/server/src/com/vaadin/server/ClientMethodInvocation.java index 7cc5159bc0..1533222b3a 100644 --- a/server/src/com/vaadin/terminal/gwt/server/ClientMethodInvocation.java +++ b/server/src/com/vaadin/server/ClientMethodInvocation.java @@ -14,7 +14,7 @@ * the License. */ -package com.vaadin.terminal.gwt.server; +package com.vaadin.server; import java.io.Serializable; import java.lang.reflect.Method; diff --git a/server/src/com/vaadin/server/CombinedRequest.java b/server/src/com/vaadin/server/CombinedRequest.java index a7a4040c35..c186fcc87c 100644 --- a/server/src/com/vaadin/server/CombinedRequest.java +++ b/server/src/com/vaadin/server/CombinedRequest.java @@ -28,8 +28,6 @@ import com.vaadin.Application; import com.vaadin.external.json.JSONArray; import com.vaadin.external.json.JSONException; import com.vaadin.external.json.JSONObject; -import com.vaadin.terminal.gwt.server.WebApplicationContext; -import com.vaadin.terminal.gwt.server.WebBrowser; /** * A {@link WrappedRequest} with path and parameters from one request and diff --git a/server/src/com/vaadin/terminal/gwt/server/CommunicationManager.java b/server/src/com/vaadin/server/CommunicationManager.java index 93a2ede4ce..9b56e20fd4 100644 --- a/server/src/com/vaadin/terminal/gwt/server/CommunicationManager.java +++ b/server/src/com/vaadin/server/CommunicationManager.java @@ -14,7 +14,7 @@ * the License. */ -package com.vaadin.terminal.gwt.server; +package com.vaadin.server; import java.io.InputStream; import java.net.URL; @@ -23,8 +23,6 @@ import javax.servlet.ServletContext; import com.vaadin.Application; import com.vaadin.external.json.JSONException; -import com.vaadin.server.PaintException; -import com.vaadin.server.WrappedRequest; import com.vaadin.ui.UI; /** diff --git a/server/src/com/vaadin/terminal/gwt/server/ComponentSizeValidator.java b/server/src/com/vaadin/server/ComponentSizeValidator.java index b8a116b1ad..08fa150a9d 100644 --- a/server/src/com/vaadin/terminal/gwt/server/ComponentSizeValidator.java +++ b/server/src/com/vaadin/server/ComponentSizeValidator.java @@ -13,7 +13,7 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.vaadin.terminal.gwt.server; +package com.vaadin.server; import java.io.PrintStream; import java.io.PrintWriter; diff --git a/server/src/com/vaadin/terminal/gwt/server/Constants.java b/server/src/com/vaadin/server/Constants.java index 9640216488..9fe2b93224 100644 --- a/server/src/com/vaadin/terminal/gwt/server/Constants.java +++ b/server/src/com/vaadin/server/Constants.java @@ -13,7 +13,7 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.vaadin.terminal.gwt.server; +package com.vaadin.server; /** * TODO Document me! diff --git a/server/src/com/vaadin/server/DeploymentConfiguration.java b/server/src/com/vaadin/server/DeploymentConfiguration.java index d365c4ce18..d1cbdfc499 100644 --- a/server/src/com/vaadin/server/DeploymentConfiguration.java +++ b/server/src/com/vaadin/server/DeploymentConfiguration.java @@ -24,8 +24,6 @@ import javax.portlet.PortletContext; import javax.servlet.ServletContext; import com.vaadin.service.ApplicationContext; -import com.vaadin.terminal.gwt.server.AddonContext; -import com.vaadin.terminal.gwt.server.AddonContextListener; /** * Provide deployment specific settings that are required outside terminal diff --git a/server/src/com/vaadin/server/DownloadStream.java b/server/src/com/vaadin/server/DownloadStream.java index 5d3b083f1e..7bc8a17c03 100644 --- a/server/src/com/vaadin/server/DownloadStream.java +++ b/server/src/com/vaadin/server/DownloadStream.java @@ -26,7 +26,6 @@ import java.util.Map; import javax.servlet.http.HttpServletResponse; -import com.vaadin.terminal.gwt.server.Constants; /** * Downloadable stream. diff --git a/server/src/com/vaadin/terminal/gwt/server/DragAndDropService.java b/server/src/com/vaadin/server/DragAndDropService.java index ff5cedd656..29825496b5 100644 --- a/server/src/com/vaadin/terminal/gwt/server/DragAndDropService.java +++ b/server/src/com/vaadin/server/DragAndDropService.java @@ -13,7 +13,7 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.vaadin.terminal.gwt.server; +package com.vaadin.server; import java.io.PrintWriter; import java.util.Collection; @@ -33,9 +33,6 @@ import com.vaadin.event.dd.TargetDetailsImpl; import com.vaadin.event.dd.acceptcriteria.AcceptCriterion; import com.vaadin.external.json.JSONException; import com.vaadin.external.json.JSONObject; -import com.vaadin.server.Extension; -import com.vaadin.server.PaintException; -import com.vaadin.server.VariableOwner; import com.vaadin.shared.ApplicationConstants; import com.vaadin.shared.communication.SharedState; import com.vaadin.shared.ui.dd.DragEventType; diff --git a/server/src/com/vaadin/terminal/gwt/server/EncodeResult.java b/server/src/com/vaadin/server/EncodeResult.java index a62df2e632..f58c0b4810 100644 --- a/server/src/com/vaadin/terminal/gwt/server/EncodeResult.java +++ b/server/src/com/vaadin/server/EncodeResult.java @@ -14,7 +14,7 @@ * the License. */ -package com.vaadin.terminal.gwt.server; +package com.vaadin.server; public class EncodeResult { private final Object encodedValue; diff --git a/server/src/com/vaadin/server/Extension.java b/server/src/com/vaadin/server/Extension.java index cf0dad5d1a..4676768781 100644 --- a/server/src/com/vaadin/server/Extension.java +++ b/server/src/com/vaadin/server/Extension.java @@ -16,7 +16,6 @@ package com.vaadin.server; -import com.vaadin.terminal.gwt.server.ClientConnector; /** * An extension is an entity that is attached to a Component or another diff --git a/server/src/com/vaadin/terminal/gwt/server/GAEApplicationServlet.java b/server/src/com/vaadin/server/GAEApplicationServlet.java index fe3d384c5c..16345edead 100644 --- a/server/src/com/vaadin/terminal/gwt/server/GAEApplicationServlet.java +++ b/server/src/com/vaadin/server/GAEApplicationServlet.java @@ -13,7 +13,7 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.vaadin.terminal.gwt.server; +package com.vaadin.server; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; @@ -56,7 +56,7 @@ import com.vaadin.service.ApplicationContext; * <pre> * <servlet> * <servlet-name>HelloWorld</servlet-name> - * <servlet-class>com.vaadin.terminal.gwt.server.GAEApplicationServlet</servlet-class> + * <servlet-class>com.vaadin.server.GAEApplicationServlet</servlet-class> * <init-param> * <param-name>application</param-name> * <param-value>com.vaadin.demo.HelloWorld</param-value> diff --git a/server/src/com/vaadin/terminal/gwt/server/HttpServletRequestListener.java b/server/src/com/vaadin/server/HttpServletRequestListener.java index 3b5eb9b42f..1f9f633c17 100644 --- a/server/src/com/vaadin/terminal/gwt/server/HttpServletRequestListener.java +++ b/server/src/com/vaadin/server/HttpServletRequestListener.java @@ -13,7 +13,7 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.vaadin.terminal.gwt.server; +package com.vaadin.server; import java.io.Serializable; @@ -23,7 +23,6 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import com.vaadin.Application; -import com.vaadin.server.Terminal; import com.vaadin.service.ApplicationContext.TransactionListener; /** diff --git a/server/src/com/vaadin/terminal/gwt/server/JsonCodec.java b/server/src/com/vaadin/server/JsonCodec.java index 3ba52a4e91..689ffe034e 100644 --- a/server/src/com/vaadin/terminal/gwt/server/JsonCodec.java +++ b/server/src/com/vaadin/server/JsonCodec.java @@ -14,7 +14,7 @@ * the License. */ -package com.vaadin.terminal.gwt.server; +package com.vaadin.server; import java.beans.IntrospectionException; import java.beans.Introspector; diff --git a/server/src/com/vaadin/terminal/gwt/server/JsonPaintTarget.java b/server/src/com/vaadin/server/JsonPaintTarget.java index e7efd28a9c..96d7cec82e 100644 --- a/server/src/com/vaadin/terminal/gwt/server/JsonPaintTarget.java +++ b/server/src/com/vaadin/server/JsonPaintTarget.java @@ -14,7 +14,7 @@ * the License. */ -package com.vaadin.terminal.gwt.server; +package com.vaadin.server; import java.io.PrintWriter; import java.io.Serializable; @@ -27,11 +27,6 @@ import java.util.Stack; import java.util.Vector; import java.util.logging.Logger; -import com.vaadin.server.PaintException; -import com.vaadin.server.PaintTarget; -import com.vaadin.server.Resource; -import com.vaadin.server.StreamVariable; -import com.vaadin.server.VariableOwner; import com.vaadin.ui.Alignment; import com.vaadin.ui.Component; import com.vaadin.ui.CustomLayout; diff --git a/server/src/com/vaadin/terminal/gwt/server/NoInputStreamException.java b/server/src/com/vaadin/server/NoInputStreamException.java index 445d8c3cb1..acd148864a 100644 --- a/server/src/com/vaadin/terminal/gwt/server/NoInputStreamException.java +++ b/server/src/com/vaadin/server/NoInputStreamException.java @@ -13,7 +13,7 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.vaadin.terminal.gwt.server; +package com.vaadin.server; @SuppressWarnings("serial") public class NoInputStreamException extends Exception { diff --git a/server/src/com/vaadin/terminal/gwt/server/NoOutputStreamException.java b/server/src/com/vaadin/server/NoOutputStreamException.java index fc9b3dee8a..8900079b4b 100644 --- a/server/src/com/vaadin/terminal/gwt/server/NoOutputStreamException.java +++ b/server/src/com/vaadin/server/NoOutputStreamException.java @@ -13,7 +13,7 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.vaadin.terminal.gwt.server; +package com.vaadin.server; @SuppressWarnings("serial") public class NoOutputStreamException extends Exception { diff --git a/server/src/com/vaadin/server/Page.java b/server/src/com/vaadin/server/Page.java index 4cb9a1291e..5c8d9a638e 100644 --- a/server/src/com/vaadin/server/Page.java +++ b/server/src/com/vaadin/server/Page.java @@ -28,8 +28,6 @@ import com.vaadin.server.WrappedRequest.BrowserDetails; import com.vaadin.shared.ui.BorderStyle; import com.vaadin.shared.ui.ui.PageClientRpc; import com.vaadin.shared.ui.ui.UIConstants; -import com.vaadin.terminal.gwt.server.WebApplicationContext; -import com.vaadin.terminal.gwt.server.WebBrowser; import com.vaadin.tools.ReflectTools; import com.vaadin.ui.JavaScript; import com.vaadin.ui.Notification; diff --git a/server/src/com/vaadin/server/PaintTarget.java b/server/src/com/vaadin/server/PaintTarget.java index e50fac1cb4..268523f92f 100644 --- a/server/src/com/vaadin/server/PaintTarget.java +++ b/server/src/com/vaadin/server/PaintTarget.java @@ -20,7 +20,6 @@ import java.io.Serializable; import java.util.Map; import com.vaadin.server.StreamVariable.StreamingStartEvent; -import com.vaadin.terminal.gwt.server.ClientConnector; import com.vaadin.ui.Component; /** diff --git a/server/src/com/vaadin/terminal/gwt/server/PortletApplicationContext2.java b/server/src/com/vaadin/server/PortletApplicationContext2.java index b10e661fb3..aca80f9c17 100644 --- a/server/src/com/vaadin/terminal/gwt/server/PortletApplicationContext2.java +++ b/server/src/com/vaadin/server/PortletApplicationContext2.java @@ -13,7 +13,7 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.vaadin.terminal.gwt.server; +package com.vaadin.server; import java.io.File; import java.io.Serializable; @@ -45,7 +45,6 @@ import javax.servlet.http.HttpSessionBindingListener; import javax.xml.namespace.QName; import com.vaadin.Application; -import com.vaadin.server.ExternalResource; import com.vaadin.ui.UI; /** diff --git a/server/src/com/vaadin/terminal/gwt/server/PortletCommunicationManager.java b/server/src/com/vaadin/server/PortletCommunicationManager.java index a2aa446ac7..f7d9371022 100644 --- a/server/src/com/vaadin/terminal/gwt/server/PortletCommunicationManager.java +++ b/server/src/com/vaadin/server/PortletCommunicationManager.java @@ -13,7 +13,7 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.vaadin.terminal.gwt.server; +package com.vaadin.server; import java.io.IOException; import java.io.InputStream; @@ -29,10 +29,6 @@ import javax.portlet.ResourceURL; import com.vaadin.Application; import com.vaadin.external.json.JSONException; import com.vaadin.external.json.JSONObject; -import com.vaadin.server.DeploymentConfiguration; -import com.vaadin.server.PaintException; -import com.vaadin.server.WrappedRequest; -import com.vaadin.server.WrappedResponse; import com.vaadin.shared.ApplicationConstants; import com.vaadin.ui.UI; diff --git a/server/src/com/vaadin/terminal/gwt/server/PortletRequestListener.java b/server/src/com/vaadin/server/PortletRequestListener.java index 5647606a75..35f2a946c5 100644 --- a/server/src/com/vaadin/terminal/gwt/server/PortletRequestListener.java +++ b/server/src/com/vaadin/server/PortletRequestListener.java @@ -13,7 +13,7 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.vaadin.terminal.gwt.server; +package com.vaadin.server; import java.io.Serializable; @@ -22,7 +22,6 @@ import javax.portlet.PortletResponse; import javax.servlet.Filter; import com.vaadin.Application; -import com.vaadin.server.Terminal; import com.vaadin.service.ApplicationContext.TransactionListener; /** diff --git a/server/src/com/vaadin/terminal/gwt/server/RequestTimer.java b/server/src/com/vaadin/server/RequestTimer.java index e3e0dc0106..1dfe24f23b 100644 --- a/server/src/com/vaadin/terminal/gwt/server/RequestTimer.java +++ b/server/src/com/vaadin/server/RequestTimer.java @@ -14,7 +14,7 @@ * the License. */ -package com.vaadin.terminal.gwt.server; +package com.vaadin.server; import java.io.Serializable; diff --git a/server/src/com/vaadin/terminal/gwt/server/ResourceReference.java b/server/src/com/vaadin/server/ResourceReference.java index 98aa61a885..f2af92aa73 100644 --- a/server/src/com/vaadin/terminal/gwt/server/ResourceReference.java +++ b/server/src/com/vaadin/server/ResourceReference.java @@ -13,13 +13,9 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.vaadin.terminal.gwt.server; +package com.vaadin.server; import com.vaadin.Application; -import com.vaadin.server.ApplicationResource; -import com.vaadin.server.ExternalResource; -import com.vaadin.server.Resource; -import com.vaadin.server.ThemeResource; import com.vaadin.shared.communication.URLReference; public class ResourceReference extends URLReference { diff --git a/server/src/com/vaadin/terminal/gwt/server/RestrictedRenderResponse.java b/server/src/com/vaadin/server/RestrictedRenderResponse.java index 1e23a48388..6923a042d6 100644 --- a/server/src/com/vaadin/terminal/gwt/server/RestrictedRenderResponse.java +++ b/server/src/com/vaadin/server/RestrictedRenderResponse.java @@ -13,7 +13,7 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.vaadin.terminal.gwt.server; +package com.vaadin.server; import java.io.IOException; import java.io.OutputStream; diff --git a/server/src/com/vaadin/terminal/gwt/server/RpcManager.java b/server/src/com/vaadin/server/RpcManager.java index 4d1e0fc152..bb1c116388 100644 --- a/server/src/com/vaadin/terminal/gwt/server/RpcManager.java +++ b/server/src/com/vaadin/server/RpcManager.java @@ -14,7 +14,7 @@ * the License. */ -package com.vaadin.terminal.gwt.server; +package com.vaadin.server; import java.io.Serializable; diff --git a/server/src/com/vaadin/terminal/gwt/server/RpcTarget.java b/server/src/com/vaadin/server/RpcTarget.java index 0bdb141b6f..934146385f 100644 --- a/server/src/com/vaadin/terminal/gwt/server/RpcTarget.java +++ b/server/src/com/vaadin/server/RpcTarget.java @@ -14,11 +14,10 @@ * the License. */ -package com.vaadin.terminal.gwt.server; +package com.vaadin.server; import java.io.Serializable; -import com.vaadin.server.VariableOwner; /** * Marker interface for server side classes that can receive RPC calls. diff --git a/server/src/com/vaadin/terminal/gwt/server/ServerRpcManager.java b/server/src/com/vaadin/server/ServerRpcManager.java index 9db6c20f00..92e4d24240 100644 --- a/server/src/com/vaadin/terminal/gwt/server/ServerRpcManager.java +++ b/server/src/com/vaadin/server/ServerRpcManager.java @@ -14,7 +14,7 @@ * the License. */ -package com.vaadin.terminal.gwt.server; +package com.vaadin.server; import java.lang.reflect.Field; import java.lang.reflect.InvocationTargetException; diff --git a/server/src/com/vaadin/terminal/gwt/server/ServerRpcMethodInvocation.java b/server/src/com/vaadin/server/ServerRpcMethodInvocation.java index 060fb686d4..761db687bb 100644 --- a/server/src/com/vaadin/terminal/gwt/server/ServerRpcMethodInvocation.java +++ b/server/src/com/vaadin/server/ServerRpcMethodInvocation.java @@ -13,7 +13,7 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.vaadin.terminal.gwt.server; +package com.vaadin.server; import java.lang.reflect.Method; import java.util.Map; diff --git a/server/src/com/vaadin/terminal/gwt/server/ServletPortletHelper.java b/server/src/com/vaadin/server/ServletPortletHelper.java index cb95eada22..cce98ab925 100644 --- a/server/src/com/vaadin/terminal/gwt/server/ServletPortletHelper.java +++ b/server/src/com/vaadin/server/ServletPortletHelper.java @@ -1,10 +1,8 @@ -package com.vaadin.terminal.gwt.server; +package com.vaadin.server; import java.io.Serializable; import com.vaadin.Application; -import com.vaadin.server.DeploymentConfiguration; -import com.vaadin.server.WrappedRequest; import com.vaadin.shared.ApplicationConstants; import com.vaadin.ui.UI; diff --git a/server/src/com/vaadin/terminal/gwt/server/SessionExpiredException.java b/server/src/com/vaadin/server/SessionExpiredException.java index 05e85c1f72..1e93fbf4ee 100644 --- a/server/src/com/vaadin/terminal/gwt/server/SessionExpiredException.java +++ b/server/src/com/vaadin/server/SessionExpiredException.java @@ -13,7 +13,7 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.vaadin.terminal.gwt.server; +package com.vaadin.server; @SuppressWarnings("serial") public class SessionExpiredException extends Exception { diff --git a/server/src/com/vaadin/terminal/gwt/server/StreamingEndEventImpl.java b/server/src/com/vaadin/server/StreamingEndEventImpl.java index a484705ca5..0b97989230 100644 --- a/server/src/com/vaadin/terminal/gwt/server/StreamingEndEventImpl.java +++ b/server/src/com/vaadin/server/StreamingEndEventImpl.java @@ -13,7 +13,7 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.vaadin.terminal.gwt.server; +package com.vaadin.server; import com.vaadin.server.StreamVariable.StreamingEndEvent; diff --git a/server/src/com/vaadin/terminal/gwt/server/StreamingErrorEventImpl.java b/server/src/com/vaadin/server/StreamingErrorEventImpl.java index 8e794b5fbf..b892f5d386 100644 --- a/server/src/com/vaadin/terminal/gwt/server/StreamingErrorEventImpl.java +++ b/server/src/com/vaadin/server/StreamingErrorEventImpl.java @@ -13,7 +13,7 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.vaadin.terminal.gwt.server; +package com.vaadin.server; import com.vaadin.server.StreamVariable.StreamingErrorEvent; diff --git a/server/src/com/vaadin/terminal/gwt/server/StreamingProgressEventImpl.java b/server/src/com/vaadin/server/StreamingProgressEventImpl.java index 14d0ed4f3a..ae665a24e8 100644 --- a/server/src/com/vaadin/terminal/gwt/server/StreamingProgressEventImpl.java +++ b/server/src/com/vaadin/server/StreamingProgressEventImpl.java @@ -13,7 +13,7 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.vaadin.terminal.gwt.server; +package com.vaadin.server; import com.vaadin.server.StreamVariable.StreamingProgressEvent; diff --git a/server/src/com/vaadin/terminal/gwt/server/StreamingStartEventImpl.java b/server/src/com/vaadin/server/StreamingStartEventImpl.java index 51c286549d..5c9b215877 100644 --- a/server/src/com/vaadin/terminal/gwt/server/StreamingStartEventImpl.java +++ b/server/src/com/vaadin/server/StreamingStartEventImpl.java @@ -13,7 +13,7 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.vaadin.terminal.gwt.server; +package com.vaadin.server; import com.vaadin.server.StreamVariable.StreamingStartEvent; diff --git a/server/src/com/vaadin/server/SystemError.java b/server/src/com/vaadin/server/SystemError.java index 453be4f632..edd49292f3 100644 --- a/server/src/com/vaadin/server/SystemError.java +++ b/server/src/com/vaadin/server/SystemError.java @@ -16,7 +16,6 @@ package com.vaadin.server; -import com.vaadin.terminal.gwt.server.AbstractApplicationServlet; /** * <code>SystemError</code> is an error message for a problem caused by error in diff --git a/server/src/com/vaadin/terminal/gwt/server/SystemMessageException.java b/server/src/com/vaadin/server/SystemMessageException.java index 5575bcb618..9c37d61424 100644 --- a/server/src/com/vaadin/terminal/gwt/server/SystemMessageException.java +++ b/server/src/com/vaadin/server/SystemMessageException.java @@ -13,7 +13,7 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.vaadin.terminal.gwt.server; +package com.vaadin.server; @SuppressWarnings("serial") public class SystemMessageException extends RuntimeException { diff --git a/server/src/com/vaadin/terminal/gwt/server/UnsupportedBrowserHandler.java b/server/src/com/vaadin/server/UnsupportedBrowserHandler.java index b30133191d..325edb5d61 100644 --- a/server/src/com/vaadin/terminal/gwt/server/UnsupportedBrowserHandler.java +++ b/server/src/com/vaadin/server/UnsupportedBrowserHandler.java @@ -13,15 +13,12 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.vaadin.terminal.gwt.server; +package com.vaadin.server; import java.io.IOException; import java.io.Writer; import com.vaadin.Application; -import com.vaadin.server.RequestHandler; -import com.vaadin.server.WrappedRequest; -import com.vaadin.server.WrappedResponse; /** * A {@link RequestHandler} that presents an informative page if the browser in diff --git a/server/src/com/vaadin/terminal/gwt/server/UploadException.java b/server/src/com/vaadin/server/UploadException.java index 566c98bf2b..cc3b075a8b 100644 --- a/server/src/com/vaadin/terminal/gwt/server/UploadException.java +++ b/server/src/com/vaadin/server/UploadException.java @@ -13,7 +13,7 @@ * License for the specific language governing permissions and limitations under * the License. */ -package com.vaadin.terminal.gwt.server; +package com.vaadin.server; @SuppressWarnings("serial") public class UploadException extends Exception { diff --git a/server/src/com/vaadin/server/Vaadin6Component.java b/server/src/com/vaadin/server/Vaadin6Component.java index 00889df14a..ce37d375f9 100644 --- a/server/src/com/vaadin/server/Vaadin6Component.java +++ b/server/src/com/vaadin/server/Vaadin6Component.java @@ -59,7 +59,7 @@ public interface Vaadin6Component extends VariableOwner, Component, * {@link #paintContent(PaintTarget)} to be called before sending changes to * the client. * - * @see com.vaadin.terminal.gwt.server.ClientConnector#markAsDirty() + * @see com.vaadin.server.ClientConnector#markAsDirty() */ @Override public void markAsDirty(); diff --git a/server/src/com/vaadin/terminal/gwt/server/WebApplicationContext.java b/server/src/com/vaadin/server/WebApplicationContext.java index bfcc0c1038..7059a04682 100644 --- a/server/src/com/vaadin/terminal/gwt/server/WebApplicationContext.java +++ b/server/src/com/vaadin/server/WebApplicationContext.java @@ -14,7 +14,7 @@ * the License. */ -package com.vaadin.terminal.gwt.server; +package com.vaadin.server; import java.io.File; import java.util.Enumeration; diff --git a/server/src/com/vaadin/terminal/gwt/server/WebBrowser.java b/server/src/com/vaadin/server/WebBrowser.java index 25193b5cbe..92090da14a 100644 --- a/server/src/com/vaadin/terminal/gwt/server/WebBrowser.java +++ b/server/src/com/vaadin/server/WebBrowser.java @@ -14,12 +14,11 @@ * the License. */ -package com.vaadin.terminal.gwt.server; +package com.vaadin.server; import java.util.Date; import java.util.Locale; -import com.vaadin.server.WrappedRequest; import com.vaadin.shared.VBrowserDetails; /** diff --git a/server/src/com/vaadin/terminal/gwt/server/WrappedHttpServletRequest.java b/server/src/com/vaadin/server/WrappedHttpServletRequest.java index 6b69a125a2..cb8a9e8c5f 100644 --- a/server/src/com/vaadin/terminal/gwt/server/WrappedHttpServletRequest.java +++ b/server/src/com/vaadin/server/WrappedHttpServletRequest.java @@ -14,15 +14,12 @@ * the License. */ -package com.vaadin.terminal.gwt.server; +package com.vaadin.server; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequestWrapper; import com.vaadin.Application; -import com.vaadin.server.CombinedRequest; -import com.vaadin.server.DeploymentConfiguration; -import com.vaadin.server.WrappedRequest; /** * Wrapper for {@link HttpServletRequest}. diff --git a/server/src/com/vaadin/terminal/gwt/server/WrappedHttpServletResponse.java b/server/src/com/vaadin/server/WrappedHttpServletResponse.java index c2e8ed1416..67232e000e 100644 --- a/server/src/com/vaadin/terminal/gwt/server/WrappedHttpServletResponse.java +++ b/server/src/com/vaadin/server/WrappedHttpServletResponse.java @@ -14,13 +14,11 @@ * the License. */ -package com.vaadin.terminal.gwt.server; +package com.vaadin.server; import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponseWrapper; -import com.vaadin.server.DeploymentConfiguration; -import com.vaadin.server.WrappedResponse; /** * Wrapper for {@link HttpServletResponse}. diff --git a/server/src/com/vaadin/terminal/gwt/server/WrappedPortletRequest.java b/server/src/com/vaadin/server/WrappedPortletRequest.java index 80d6f9571e..40a5c5f509 100644 --- a/server/src/com/vaadin/terminal/gwt/server/WrappedPortletRequest.java +++ b/server/src/com/vaadin/server/WrappedPortletRequest.java @@ -14,7 +14,7 @@ * the License. */ -package com.vaadin.terminal.gwt.server; +package com.vaadin.server; import java.io.IOException; import java.io.InputStream; @@ -26,9 +26,6 @@ import javax.portlet.PortletRequest; import javax.portlet.ResourceRequest; import com.vaadin.Application; -import com.vaadin.server.CombinedRequest; -import com.vaadin.server.DeploymentConfiguration; -import com.vaadin.server.WrappedRequest; import com.vaadin.shared.ApplicationConstants; /** diff --git a/server/src/com/vaadin/terminal/gwt/server/WrappedPortletResponse.java b/server/src/com/vaadin/server/WrappedPortletResponse.java index 584c304eaa..4e23f4e63f 100644 --- a/server/src/com/vaadin/terminal/gwt/server/WrappedPortletResponse.java +++ b/server/src/com/vaadin/server/WrappedPortletResponse.java @@ -14,7 +14,7 @@ * the License. */ -package com.vaadin.terminal.gwt.server; +package com.vaadin.server; import java.io.IOException; import java.io.OutputStream; @@ -29,8 +29,6 @@ import javax.portlet.MimeResponse; import javax.portlet.PortletResponse; import javax.portlet.ResourceResponse; -import com.vaadin.server.DeploymentConfiguration; -import com.vaadin.server.WrappedResponse; /** * Wrapper for {@link PortletResponse} and its subclasses. diff --git a/server/src/com/vaadin/server/WrappedRequest.java b/server/src/com/vaadin/server/WrappedRequest.java index d012d572ea..8ae5335763 100644 --- a/server/src/com/vaadin/server/WrappedRequest.java +++ b/server/src/com/vaadin/server/WrappedRequest.java @@ -29,7 +29,6 @@ import javax.servlet.http.HttpServletRequest; import com.vaadin.Application; import com.vaadin.UIRequiresMoreInformationException; import com.vaadin.annotations.EagerInit; -import com.vaadin.terminal.gwt.server.WebBrowser; import com.vaadin.ui.UI; /** diff --git a/server/src/com/vaadin/service/ApplicationContext.java b/server/src/com/vaadin/service/ApplicationContext.java index aaf5d1b386..08e553d0e5 100644 --- a/server/src/com/vaadin/service/ApplicationContext.java +++ b/server/src/com/vaadin/service/ApplicationContext.java @@ -22,8 +22,8 @@ import java.net.URL; import java.util.Collection; import com.vaadin.Application; +import com.vaadin.server.AbstractCommunicationManager; import com.vaadin.server.ApplicationResource; -import com.vaadin.terminal.gwt.server.AbstractCommunicationManager; /** * <code>ApplicationContext</code> provides information about the running diff --git a/server/src/com/vaadin/ui/AbstractComponent.java b/server/src/com/vaadin/ui/AbstractComponent.java index d651755a2a..47d893cd27 100644 --- a/server/src/com/vaadin/ui/AbstractComponent.java +++ b/server/src/com/vaadin/ui/AbstractComponent.java @@ -33,13 +33,13 @@ import com.vaadin.event.EventRouter; import com.vaadin.event.MethodEventSource; import com.vaadin.event.ShortcutListener; import com.vaadin.server.AbstractClientConnector; +import com.vaadin.server.ClientConnector; +import com.vaadin.server.ComponentSizeValidator; import com.vaadin.server.ErrorMessage; import com.vaadin.server.Resource; +import com.vaadin.server.ResourceReference; import com.vaadin.server.Terminal; import com.vaadin.shared.ComponentState; -import com.vaadin.terminal.gwt.server.ClientConnector; -import com.vaadin.terminal.gwt.server.ComponentSizeValidator; -import com.vaadin.terminal.gwt.server.ResourceReference; import com.vaadin.tools.ReflectTools; /** diff --git a/server/src/com/vaadin/ui/AbstractComponentContainer.java b/server/src/com/vaadin/ui/AbstractComponentContainer.java index 4939eb1265..8dd440828b 100644 --- a/server/src/com/vaadin/ui/AbstractComponentContainer.java +++ b/server/src/com/vaadin/ui/AbstractComponentContainer.java @@ -22,7 +22,7 @@ import java.util.HashSet; import java.util.Iterator; import java.util.LinkedList; -import com.vaadin.terminal.gwt.server.ComponentSizeValidator; +import com.vaadin.server.ComponentSizeValidator; /** * Extension to {@link AbstractComponent} that defines the default diff --git a/server/src/com/vaadin/ui/AbstractEmbedded.java b/server/src/com/vaadin/ui/AbstractEmbedded.java index de44c89656..f3256dcde6 100644 --- a/server/src/com/vaadin/ui/AbstractEmbedded.java +++ b/server/src/com/vaadin/ui/AbstractEmbedded.java @@ -5,8 +5,8 @@ package com.vaadin.ui; import com.vaadin.server.Resource; +import com.vaadin.server.ResourceReference; import com.vaadin.shared.ui.AbstractEmbeddedState; -import com.vaadin.terminal.gwt.server.ResourceReference; /** * Abstract base for embedding components. diff --git a/server/src/com/vaadin/ui/AbstractMedia.java b/server/src/com/vaadin/ui/AbstractMedia.java index f26fe714b9..f9eb67f666 100644 --- a/server/src/com/vaadin/ui/AbstractMedia.java +++ b/server/src/com/vaadin/ui/AbstractMedia.java @@ -20,10 +20,10 @@ import java.util.ArrayList; import java.util.List; import com.vaadin.server.Resource; +import com.vaadin.server.ResourceReference; import com.vaadin.shared.communication.URLReference; import com.vaadin.shared.ui.AbstractMediaState; import com.vaadin.shared.ui.MediaControl; -import com.vaadin.terminal.gwt.server.ResourceReference; /** * Abstract base class for the HTML5 media components. diff --git a/server/src/com/vaadin/ui/Component.java b/server/src/com/vaadin/ui/Component.java index 5f9a093366..01033ff560 100644 --- a/server/src/com/vaadin/ui/Component.java +++ b/server/src/com/vaadin/ui/Component.java @@ -23,11 +23,11 @@ import java.util.Locale; import com.vaadin.Application; import com.vaadin.event.FieldEvents; +import com.vaadin.server.ClientConnector; import com.vaadin.server.ErrorMessage; import com.vaadin.server.Resource; import com.vaadin.server.Sizeable; import com.vaadin.server.VariableOwner; -import com.vaadin.terminal.gwt.server.ClientConnector; /** * {@code Component} is the top-level interface that is and must be implemented diff --git a/server/src/com/vaadin/ui/ConnectorTracker.java b/server/src/com/vaadin/ui/ConnectorTracker.java index e8f7b5e8c7..265099f372 100644 --- a/server/src/com/vaadin/ui/ConnectorTracker.java +++ b/server/src/com/vaadin/ui/ConnectorTracker.java @@ -26,8 +26,8 @@ import java.util.logging.Level; import java.util.logging.Logger; import com.vaadin.server.AbstractClientConnector; -import com.vaadin.terminal.gwt.server.AbstractCommunicationManager; -import com.vaadin.terminal.gwt.server.ClientConnector; +import com.vaadin.server.AbstractCommunicationManager; +import com.vaadin.server.ClientConnector; /** * A class which takes care of book keeping of {@link ClientConnector}s for a diff --git a/server/src/com/vaadin/ui/CustomLayout.java b/server/src/com/vaadin/ui/CustomLayout.java index cf64af85ca..e78f0dcc20 100644 --- a/server/src/com/vaadin/ui/CustomLayout.java +++ b/server/src/com/vaadin/ui/CustomLayout.java @@ -24,11 +24,11 @@ import java.util.Iterator; import java.util.Map; import java.util.Set; +import com.vaadin.server.JsonPaintTarget; import com.vaadin.server.PaintException; import com.vaadin.server.PaintTarget; import com.vaadin.server.Vaadin6Component; import com.vaadin.shared.ui.customlayout.CustomLayoutState; -import com.vaadin.terminal.gwt.server.JsonPaintTarget; /** * <p> diff --git a/server/src/com/vaadin/ui/UI.java b/server/src/com/vaadin/ui/UI.java index 4731ebffe6..a7529c9328 100644 --- a/server/src/com/vaadin/ui/UI.java +++ b/server/src/com/vaadin/ui/UI.java @@ -34,6 +34,7 @@ import com.vaadin.event.Action.Handler; import com.vaadin.event.ActionManager; import com.vaadin.event.MouseEvents.ClickEvent; import com.vaadin.event.MouseEvents.ClickListener; +import com.vaadin.server.AbstractApplicationServlet; import com.vaadin.server.Page; import com.vaadin.server.PaintException; import com.vaadin.server.PaintTarget; @@ -49,7 +50,6 @@ import com.vaadin.shared.ui.BorderStyle; import com.vaadin.shared.ui.ui.UIConstants; import com.vaadin.shared.ui.ui.UIServerRpc; import com.vaadin.shared.ui.ui.UIState; -import com.vaadin.terminal.gwt.server.AbstractApplicationServlet; import com.vaadin.tools.ReflectTools; /** diff --git a/server/src/com/vaadin/ui/Upload.java b/server/src/com/vaadin/ui/Upload.java index 683b9ce478..d5104a27c4 100644 --- a/server/src/com/vaadin/ui/Upload.java +++ b/server/src/com/vaadin/ui/Upload.java @@ -24,12 +24,12 @@ import java.util.Iterator; import java.util.LinkedHashSet; import java.util.Map; +import com.vaadin.server.NoInputStreamException; +import com.vaadin.server.NoOutputStreamException; import com.vaadin.server.PaintException; import com.vaadin.server.PaintTarget; import com.vaadin.server.Vaadin6Component; import com.vaadin.server.StreamVariable.StreamingProgressEvent; -import com.vaadin.terminal.gwt.server.NoInputStreamException; -import com.vaadin.terminal.gwt.server.NoOutputStreamException; /** * Component for uploading files from client to server. diff --git a/server/src/com/vaadin/ui/Video.java b/server/src/com/vaadin/ui/Video.java index 939614c7a1..d14ed71270 100644 --- a/server/src/com/vaadin/ui/Video.java +++ b/server/src/com/vaadin/ui/Video.java @@ -17,8 +17,8 @@ package com.vaadin.ui; import com.vaadin.server.Resource; +import com.vaadin.server.ResourceReference; import com.vaadin.shared.ui.video.VideoState; -import com.vaadin.terminal.gwt.server.ResourceReference; /** * The Video component translates into an HTML5 <video> element and as diff --git a/shared/src/com/vaadin/shared/Connector.java b/shared/src/com/vaadin/shared/Connector.java index 8248d9b576..87fc05f5d0 100644 --- a/shared/src/com/vaadin/shared/Connector.java +++ b/shared/src/com/vaadin/shared/Connector.java @@ -31,7 +31,7 @@ import java.io.Serializable; * wanting to communicate with server side should implement * {@link com.vaadin.client.ServerConnector} and server side * classes should implement - * {@link com.vaadin.terminal.gwt.server.ClientConnector}. + * {@link com.vaadin.server.ClientConnector}. * </p> * * @author Vaadin Ltd diff --git a/shared/src/com/vaadin/shared/VBrowserDetails.java b/shared/src/com/vaadin/shared/VBrowserDetails.java index ccee376eb9..5009857530 100644 --- a/shared/src/com/vaadin/shared/VBrowserDetails.java +++ b/shared/src/com/vaadin/shared/VBrowserDetails.java @@ -21,7 +21,7 @@ import java.io.Serializable; * Class that parses the user agent string from the browser and provides * information about the browser. Used internally by * {@link com.vaadin.client.BrowserInfo} and - * {@link com.vaadin.terminal.gwt.server.WebBrowser}. Should not be used + * {@link com.vaadin.server.WebBrowser}. Should not be used * directly. * * @author Vaadin Ltd. diff --git a/shared/src/com/vaadin/shared/ui/Connect.java b/shared/src/com/vaadin/shared/ui/Connect.java index d54374a0ec..7756eef890 100644 --- a/shared/src/com/vaadin/shared/ui/Connect.java +++ b/shared/src/com/vaadin/shared/ui/Connect.java @@ -25,7 +25,7 @@ import com.vaadin.shared.Connector; /** * Annotation defining the server side connector that this ClientSideConnector * should connect to. The value must always by a class extending - * {@link com.vaadin.terminal.gwt.server.ClientConnector}. + * {@link com.vaadin.server.ClientConnector}. * <p> * With this annotation client side Vaadin connector is marked to have a server * side counterpart. The value of the annotation is the class of server side diff --git a/tests/client-side/com/vaadin/terminal/gwt/server/JSONSerializerTest.java b/tests/client-side/com/vaadin/server/JSONSerializerTest.java index 941525bed4..446506cdef 100644 --- a/tests/client-side/com/vaadin/terminal/gwt/server/JSONSerializerTest.java +++ b/tests/client-side/com/vaadin/server/JSONSerializerTest.java @@ -1,4 +1,4 @@ -package com.vaadin.terminal.gwt.server; +package com.vaadin.server; /* * Copyright 2011 Vaadin Ltd. @@ -24,8 +24,9 @@ import junit.framework.TestCase; import com.vaadin.client.communication.JsonDecoder; import com.vaadin.client.communication.JsonEncoder; +import com.vaadin.server.JsonCodec; +import com.vaadin.server.JsonCodec.BeanProperty; import com.vaadin.shared.ui.splitpanel.AbstractSplitPanelState; -import com.vaadin.terminal.gwt.server.JsonCodec.BeanProperty; /** * Tests for {@link JsonCodec}, {@link JsonEncoder}, {@link JsonDecoder} diff --git a/tests/server-side/com/vaadin/data/util/AbstractContainerTest.java b/tests/server-side/com/vaadin/data/util/AbstractContainerTest.java index 7a240a1f1d..ca5c344b2e 100644 --- a/tests/server-side/com/vaadin/data/util/AbstractContainerTest.java +++ b/tests/server-side/com/vaadin/data/util/AbstractContainerTest.java @@ -327,7 +327,7 @@ public abstract class AbstractContainerTest extends TestCase { REVERSE_FULLY_QUALIFIED_NAME, "ad", false, false)); validateContainer(container, "com.vaadin.data.Buffered", - "com.vaadin.terminal.gwt.server.ComponentSizeValidator", + "com.vaadin.server.ComponentSizeValidator", "com.vaadin.data.util.IndexedContainer", "com.vaadin.client.ui.VUriFragmentUtility", isFilteredOutItemNull(), 37); @@ -387,8 +387,7 @@ public abstract class AbstractContainerTest extends TestCase { sortable.sort(new Object[] { REVERSE_FULLY_QUALIFIED_NAME }, new boolean[] { true }); - validateContainer(container, - "com.vaadin.terminal.gwt.server.ApplicationPortlet2", + validateContainer(container, "com.vaadin.server.ApplicationPortlet2", "com.vaadin.data.util.ObjectProperty", "com.vaadin.ui.BaseFieldFactory", "blah", true, sampleData.length); @@ -574,31 +573,31 @@ public abstract class AbstractContainerTest extends TestCase { "com.vaadin.client.VErrorMessage", "com.vaadin.client.VTooltip", "com.vaadin.client.VUIDLBrowser", "com.vaadin.client.WidgetMap", "com.vaadin.client.WidgetSet", - "com.vaadin.terminal.gwt.server.AbstractApplicationPortlet", - "com.vaadin.terminal.gwt.server.AbstractApplicationServlet", - "com.vaadin.terminal.gwt.server.AbstractCommunicationManager", - "com.vaadin.terminal.gwt.server.AbstractWebApplicationContext", - "com.vaadin.terminal.gwt.server.ApplicationPortlet", - "com.vaadin.terminal.gwt.server.ApplicationPortlet2", - "com.vaadin.terminal.gwt.server.ApplicationRunnerServlet", - "com.vaadin.terminal.gwt.server.ApplicationServlet", - "com.vaadin.terminal.gwt.server.ChangeVariablesErrorEvent", - "com.vaadin.terminal.gwt.server.CommunicationManager", - "com.vaadin.terminal.gwt.server.ComponentSizeValidator", - "com.vaadin.terminal.gwt.server.Constants", - "com.vaadin.terminal.gwt.server.GAEApplicationServlet", - "com.vaadin.terminal.gwt.server.HttpServletRequestListener", - "com.vaadin.terminal.gwt.server.HttpUploadStream", - "com.vaadin.terminal.gwt.server.JsonPaintTarget", - "com.vaadin.terminal.gwt.server.PortletApplicationContext", - "com.vaadin.terminal.gwt.server.PortletApplicationContext2", - "com.vaadin.terminal.gwt.server.PortletCommunicationManager", - "com.vaadin.terminal.gwt.server.PortletRequestListener", - "com.vaadin.terminal.gwt.server.RestrictedRenderResponse", - "com.vaadin.terminal.gwt.server.SessionExpiredException", - "com.vaadin.terminal.gwt.server.SystemMessageException", - "com.vaadin.terminal.gwt.server.WebApplicationContext", - "com.vaadin.terminal.gwt.server.WebBrowser", + "com.vaadin.server.AbstractApplicationPortlet", + "com.vaadin.server.AbstractApplicationServlet", + "com.vaadin.server.AbstractCommunicationManager", + "com.vaadin.server.AbstractWebApplicationContext", + "com.vaadin.server.ApplicationPortlet", + "com.vaadin.server.ApplicationPortlet2", + "com.vaadin.server.ApplicationRunnerServlet", + "com.vaadin.server.ApplicationServlet", + "com.vaadin.server.ChangeVariablesErrorEvent", + "com.vaadin.server.CommunicationManager", + "com.vaadin.server.ComponentSizeValidator", + "com.vaadin.server.Constants", + "com.vaadin.server.GAEApplicationServlet", + "com.vaadin.server.HttpServletRequestListener", + "com.vaadin.server.HttpUploadStream", + "com.vaadin.server.JsonPaintTarget", + "com.vaadin.server.PortletApplicationContext", + "com.vaadin.server.PortletApplicationContext2", + "com.vaadin.server.PortletCommunicationManager", + "com.vaadin.server.PortletRequestListener", + "com.vaadin.server.RestrictedRenderResponse", + "com.vaadin.server.SessionExpiredException", + "com.vaadin.server.SystemMessageException", + "com.vaadin.server.WebApplicationContext", + "com.vaadin.server.WebBrowser", "com.vaadin.terminal.gwt.widgetsetutils.ClassPathExplorer", "com.vaadin.terminal.gwt.widgetsetutils.WidgetMapGenerator", "com.vaadin.terminal.gwt.widgetsetutils.WidgetSetBuilder", diff --git a/tests/server-side/com/vaadin/data/util/AbstractHierarchicalContainerTest.java b/tests/server-side/com/vaadin/data/util/AbstractHierarchicalContainerTest.java index 918c9dfb7b..772cd250ce 100644 --- a/tests/server-side/com/vaadin/data/util/AbstractHierarchicalContainerTest.java +++ b/tests/server-side/com/vaadin/data/util/AbstractHierarchicalContainerTest.java @@ -179,7 +179,7 @@ public abstract class AbstractHierarchicalContainerTest extends new boolean[] { true }); validateHierarchicalContainer(container, - "com.vaadin.terminal.gwt.server.ApplicationPortlet2", + "com.vaadin.server.ApplicationPortlet2", "com.vaadin.data.util.ObjectProperty", "com.vaadin.server.ApplicationResource", "blah", true, expectedSize, 2, true); diff --git a/tests/server-side/com/vaadin/data/util/TestHierarchicalContainer.java b/tests/server-side/com/vaadin/data/util/TestHierarchicalContainer.java index d3d7d37690..10bc71c3a7 100644 --- a/tests/server-side/com/vaadin/data/util/TestHierarchicalContainer.java +++ b/tests/server-side/com/vaadin/data/util/TestHierarchicalContainer.java @@ -211,7 +211,7 @@ public class TestHierarchicalContainer extends // com.vaadin.client.ui.VTabsheet // com.vaadin.client.ui.VTabsheetBase // com.vaadin.client.ui.VTabsheetPanel - // com.vaadin.terminal.gwt.server.ChangeVariablesErrorEvent + // com.vaadin.server.ChangeVariablesErrorEvent // com.vaadin.server.Paintable // com.vaadin.server.Scrollable // com.vaadin.server.Sizeable diff --git a/tests/server-side/com/vaadin/terminal/gwt/server/TestAbstractApplicationServletStaticFilesLocation.java b/tests/server-side/com/vaadin/server/TestAbstractApplicationServletStaticFilesLocation.java index 38fca09157..df16e98bba 100644 --- a/tests/server-side/com/vaadin/terminal/gwt/server/TestAbstractApplicationServletStaticFilesLocation.java +++ b/tests/server-side/com/vaadin/server/TestAbstractApplicationServletStaticFilesLocation.java @@ -1,4 +1,4 @@ -package com.vaadin.terminal.gwt.server; +package com.vaadin.server; import static org.easymock.EasyMock.createMock; import static org.easymock.EasyMock.expect; @@ -15,6 +15,9 @@ import javax.servlet.ServletConfig; import javax.servlet.ServletContext; import javax.servlet.http.HttpServletRequest; +import com.vaadin.server.AbstractApplicationServlet; +import com.vaadin.server.ApplicationServlet; + import junit.framework.TestCase; public class TestAbstractApplicationServletStaticFilesLocation extends TestCase { diff --git a/tests/server-side/com/vaadin/tests/server/TestSimpleMultiPartInputStream.java b/tests/server-side/com/vaadin/tests/server/TestSimpleMultiPartInputStream.java index 65455eba37..84247c81c1 100644 --- a/tests/server-side/com/vaadin/tests/server/TestSimpleMultiPartInputStream.java +++ b/tests/server-side/com/vaadin/tests/server/TestSimpleMultiPartInputStream.java @@ -7,7 +7,7 @@ import java.util.Arrays; import junit.framework.TestCase; -import com.vaadin.terminal.gwt.server.AbstractCommunicationManager.SimpleMultiPartInputStream; +import com.vaadin.server.AbstractCommunicationManager.SimpleMultiPartInputStream; public class TestSimpleMultiPartInputStream extends TestCase { diff --git a/tests/server-side/com/vaadin/tests/server/TestStreamVariableMapping.java b/tests/server-side/com/vaadin/tests/server/TestStreamVariableMapping.java index 8b35b322cb..f3b367483a 100644 --- a/tests/server-side/com/vaadin/tests/server/TestStreamVariableMapping.java +++ b/tests/server-side/com/vaadin/tests/server/TestStreamVariableMapping.java @@ -5,9 +5,9 @@ import junit.framework.TestCase; import org.easymock.EasyMock; import com.vaadin.Application; +import com.vaadin.server.CommunicationManager; import com.vaadin.server.StreamVariable; import com.vaadin.server.WrappedRequest; -import com.vaadin.terminal.gwt.server.CommunicationManager; import com.vaadin.ui.UI; import com.vaadin.ui.Upload; diff --git a/tests/server-side/com/vaadin/tests/server/TransactionListenersConcurrency.java b/tests/server-side/com/vaadin/tests/server/TransactionListenersConcurrency.java index efebc097bf..0cacccd08a 100644 --- a/tests/server-side/com/vaadin/tests/server/TransactionListenersConcurrency.java +++ b/tests/server-side/com/vaadin/tests/server/TransactionListenersConcurrency.java @@ -19,10 +19,10 @@ import junit.framework.TestCase; import com.vaadin.Application; import com.vaadin.Application.ApplicationStartEvent; +import com.vaadin.server.AbstractWebApplicationContext; import com.vaadin.server.DeploymentConfiguration; +import com.vaadin.server.WebApplicationContext; import com.vaadin.service.ApplicationContext.TransactionListener; -import com.vaadin.terminal.gwt.server.AbstractWebApplicationContext; -import com.vaadin.terminal.gwt.server.WebApplicationContext; import org.easymock.EasyMock; diff --git a/tests/testbench/com/vaadin/launcher/ApplicationRunnerServlet.java b/tests/testbench/com/vaadin/launcher/ApplicationRunnerServlet.java index b4a339c97f..e05979ede0 100644 --- a/tests/testbench/com/vaadin/launcher/ApplicationRunnerServlet.java +++ b/tests/testbench/com/vaadin/launcher/ApplicationRunnerServlet.java @@ -31,10 +31,10 @@ import javax.servlet.http.HttpServletResponse; import com.vaadin.Application; import com.vaadin.UIRequiresMoreInformationException; +import com.vaadin.server.AbstractApplicationServlet; import com.vaadin.server.AbstractUIProvider; +import com.vaadin.server.WrappedHttpServletRequest; import com.vaadin.server.WrappedRequest; -import com.vaadin.terminal.gwt.server.AbstractApplicationServlet; -import com.vaadin.terminal.gwt.server.WrappedHttpServletRequest; import com.vaadin.tests.components.TestBase; import com.vaadin.ui.UI; diff --git a/tests/testbench/com/vaadin/tests/VerifyBrowserVersion.java b/tests/testbench/com/vaadin/tests/VerifyBrowserVersion.java index 63deb79f66..8a07168ef7 100644 --- a/tests/testbench/com/vaadin/tests/VerifyBrowserVersion.java +++ b/tests/testbench/com/vaadin/tests/VerifyBrowserVersion.java @@ -1,7 +1,7 @@ package com.vaadin.tests; -import com.vaadin.terminal.gwt.server.WebApplicationContext; -import com.vaadin.terminal.gwt.server.WebBrowser; +import com.vaadin.server.WebApplicationContext; +import com.vaadin.server.WebBrowser; import com.vaadin.tests.components.TestBase; import com.vaadin.ui.Label; diff --git a/tests/testbench/com/vaadin/tests/application/ApplicationCloseTest.java b/tests/testbench/com/vaadin/tests/application/ApplicationCloseTest.java index cfbb4045a2..233da9722e 100644 --- a/tests/testbench/com/vaadin/tests/application/ApplicationCloseTest.java +++ b/tests/testbench/com/vaadin/tests/application/ApplicationCloseTest.java @@ -1,8 +1,8 @@ package com.vaadin.tests.application; import com.vaadin.Application; +import com.vaadin.server.WebApplicationContext; import com.vaadin.shared.ui.label.ContentMode; -import com.vaadin.terminal.gwt.server.WebApplicationContext; import com.vaadin.tests.components.TestBase; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; diff --git a/tests/testbench/com/vaadin/tests/applicationcontext/ChangeSessionId.java b/tests/testbench/com/vaadin/tests/applicationcontext/ChangeSessionId.java index 3169806f27..9146cf5dea 100644 --- a/tests/testbench/com/vaadin/tests/applicationcontext/ChangeSessionId.java +++ b/tests/testbench/com/vaadin/tests/applicationcontext/ChangeSessionId.java @@ -1,6 +1,6 @@ package com.vaadin.tests.applicationcontext; -import com.vaadin.terminal.gwt.server.WebApplicationContext; +import com.vaadin.server.WebApplicationContext; import com.vaadin.tests.components.AbstractTestCase; import com.vaadin.tests.util.Log; import com.vaadin.ui.Button; diff --git a/tests/testbench/com/vaadin/tests/components/AbstractTestApplication.java b/tests/testbench/com/vaadin/tests/components/AbstractTestApplication.java index 8de1e68b4b..406158e8e1 100644 --- a/tests/testbench/com/vaadin/tests/components/AbstractTestApplication.java +++ b/tests/testbench/com/vaadin/tests/components/AbstractTestApplication.java @@ -1,9 +1,9 @@ package com.vaadin.tests.components; import com.vaadin.Application; +import com.vaadin.server.AbstractWebApplicationContext; +import com.vaadin.server.WebBrowser; import com.vaadin.service.ApplicationContext; -import com.vaadin.terminal.gwt.server.AbstractWebApplicationContext; -import com.vaadin.terminal.gwt.server.WebBrowser; public abstract class AbstractTestApplication extends Application { protected abstract String getTestDescription(); diff --git a/tests/testbench/com/vaadin/tests/components/AbstractTestCase.java b/tests/testbench/com/vaadin/tests/components/AbstractTestCase.java index 11d960e143..4e2ec1d935 100644 --- a/tests/testbench/com/vaadin/tests/components/AbstractTestCase.java +++ b/tests/testbench/com/vaadin/tests/components/AbstractTestCase.java @@ -1,9 +1,9 @@ package com.vaadin.tests.components; import com.vaadin.Application; +import com.vaadin.server.AbstractWebApplicationContext; +import com.vaadin.server.WebBrowser; import com.vaadin.service.ApplicationContext; -import com.vaadin.terminal.gwt.server.AbstractWebApplicationContext; -import com.vaadin.terminal.gwt.server.WebBrowser; public abstract class AbstractTestCase extends Application.LegacyApplication { diff --git a/tests/testbench/com/vaadin/tests/components/AbstractTestUI.java b/tests/testbench/com/vaadin/tests/components/AbstractTestUI.java index db5fffa761..ff235c5d9f 100644 --- a/tests/testbench/com/vaadin/tests/components/AbstractTestUI.java +++ b/tests/testbench/com/vaadin/tests/components/AbstractTestUI.java @@ -1,11 +1,11 @@ package com.vaadin.tests.components; import com.vaadin.Application; +import com.vaadin.server.AbstractWebApplicationContext; +import com.vaadin.server.WebBrowser; import com.vaadin.server.WrappedRequest; import com.vaadin.service.ApplicationContext; import com.vaadin.shared.ui.label.ContentMode; -import com.vaadin.terminal.gwt.server.AbstractWebApplicationContext; -import com.vaadin.terminal.gwt.server.WebBrowser; import com.vaadin.ui.Component; import com.vaadin.ui.Label; import com.vaadin.ui.UI; diff --git a/tests/testbench/com/vaadin/tests/components/javascriptcomponent/BasicJavaScriptComponent.java b/tests/testbench/com/vaadin/tests/components/javascriptcomponent/BasicJavaScriptComponent.java index 416d538e7c..a0189354f9 100644 --- a/tests/testbench/com/vaadin/tests/components/javascriptcomponent/BasicJavaScriptComponent.java +++ b/tests/testbench/com/vaadin/tests/components/javascriptcomponent/BasicJavaScriptComponent.java @@ -23,12 +23,12 @@ import com.vaadin.annotations.JavaScript; import com.vaadin.external.json.JSONArray; import com.vaadin.external.json.JSONException; import com.vaadin.server.ClassResource; +import com.vaadin.server.ResourceReference; import com.vaadin.server.WrappedRequest; import com.vaadin.shared.communication.ClientRpc; import com.vaadin.shared.communication.ServerRpc; import com.vaadin.shared.communication.URLReference; import com.vaadin.shared.ui.JavaScriptComponentState; -import com.vaadin.terminal.gwt.server.ResourceReference; import com.vaadin.tests.components.AbstractTestUI; import com.vaadin.tests.util.Log; import com.vaadin.ui.AbstractJavaScriptComponent; diff --git a/tests/testbench/com/vaadin/tests/components/window/AttachShouldBeCalledForSubWindows.java b/tests/testbench/com/vaadin/tests/components/window/AttachShouldBeCalledForSubWindows.java index a2f03212b0..6d2623c199 100644 --- a/tests/testbench/com/vaadin/tests/components/window/AttachShouldBeCalledForSubWindows.java +++ b/tests/testbench/com/vaadin/tests/components/window/AttachShouldBeCalledForSubWindows.java @@ -4,7 +4,7 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import com.vaadin.event.ShortcutAction.KeyCode; -import com.vaadin.terminal.gwt.server.HttpServletRequestListener; +import com.vaadin.server.HttpServletRequestListener; import com.vaadin.tests.components.AbstractTestCase; import com.vaadin.tests.util.Log; import com.vaadin.ui.Button; diff --git a/tests/testbench/com/vaadin/tests/integration/JSR286PortletApplication.java b/tests/testbench/com/vaadin/tests/integration/JSR286PortletApplication.java index 3a17361fb7..d2c15053ef 100644 --- a/tests/testbench/com/vaadin/tests/integration/JSR286PortletApplication.java +++ b/tests/testbench/com/vaadin/tests/integration/JSR286PortletApplication.java @@ -21,9 +21,9 @@ import javax.portlet.WindowState; import com.vaadin.Application; import com.vaadin.annotations.StyleSheet; import com.vaadin.server.ExternalResource; +import com.vaadin.server.PortletApplicationContext2; +import com.vaadin.server.PortletApplicationContext2.PortletListener; import com.vaadin.shared.ui.label.ContentMode; -import com.vaadin.terminal.gwt.server.PortletApplicationContext2; -import com.vaadin.terminal.gwt.server.PortletApplicationContext2.PortletListener; import com.vaadin.ui.Embedded; import com.vaadin.ui.Label; import com.vaadin.ui.Link; diff --git a/tests/testbench/com/vaadin/tests/minitutorials/v7a1/DifferentFeaturesForDifferentClients.java b/tests/testbench/com/vaadin/tests/minitutorials/v7a1/DifferentFeaturesForDifferentClients.java index 2dad3d38b5..ba3042c48e 100644 --- a/tests/testbench/com/vaadin/tests/minitutorials/v7a1/DifferentFeaturesForDifferentClients.java +++ b/tests/testbench/com/vaadin/tests/minitutorials/v7a1/DifferentFeaturesForDifferentClients.java @@ -18,9 +18,9 @@ package com.vaadin.tests.minitutorials.v7a1; import com.vaadin.Application; import com.vaadin.UIRequiresMoreInformationException; +import com.vaadin.server.WebBrowser; import com.vaadin.server.WrappedRequest; import com.vaadin.server.WrappedRequest.BrowserDetails; -import com.vaadin.terminal.gwt.server.WebBrowser; import com.vaadin.ui.Label; import com.vaadin.ui.UI; diff --git a/tests/testbench/com/vaadin/tests/minitutorials/v7a2/ResourceInStateComponent.java b/tests/testbench/com/vaadin/tests/minitutorials/v7a2/ResourceInStateComponent.java index 8c2ee0850a..3ec8dd3664 100644 --- a/tests/testbench/com/vaadin/tests/minitutorials/v7a2/ResourceInStateComponent.java +++ b/tests/testbench/com/vaadin/tests/minitutorials/v7a2/ResourceInStateComponent.java @@ -17,7 +17,7 @@ package com.vaadin.tests.minitutorials.v7a2; import com.vaadin.server.Resource; -import com.vaadin.terminal.gwt.server.ResourceReference; +import com.vaadin.server.ResourceReference; import com.vaadin.tests.widgetset.client.minitutorials.v7a2.ResourceInStateState; import com.vaadin.ui.AbstractComponent; diff --git a/tests/testbench/com/vaadin/tests/minitutorials/v7a3/Analytics.java b/tests/testbench/com/vaadin/tests/minitutorials/v7a3/Analytics.java index cf355f2145..86a1908a2b 100644 --- a/tests/testbench/com/vaadin/tests/minitutorials/v7a3/Analytics.java +++ b/tests/testbench/com/vaadin/tests/minitutorials/v7a3/Analytics.java @@ -18,7 +18,7 @@ package com.vaadin.tests.minitutorials.v7a3; import com.vaadin.annotations.JavaScript; import com.vaadin.server.AbstractJavaScriptExtension; -import com.vaadin.terminal.gwt.server.ClientConnector; +import com.vaadin.server.ClientConnector; import com.vaadin.ui.UI; @JavaScript("analytics_connector.js") diff --git a/tests/testbench/com/vaadin/tests/tickets/Ticket1975.java b/tests/testbench/com/vaadin/tests/tickets/Ticket1975.java index fda75a409e..9c6dd8c272 100644 --- a/tests/testbench/com/vaadin/tests/tickets/Ticket1975.java +++ b/tests/testbench/com/vaadin/tests/tickets/Ticket1975.java @@ -5,7 +5,7 @@ import java.io.File; import java.io.FileInputStream; import com.vaadin.Application; -import com.vaadin.terminal.gwt.server.WebApplicationContext; +import com.vaadin.server.WebApplicationContext; import com.vaadin.ui.Button; import com.vaadin.ui.Button.ClickEvent; import com.vaadin.ui.Button.ClickListener; diff --git a/tests/testbench/com/vaadin/tests/vaadincontext/TestAddonContextListener.java b/tests/testbench/com/vaadin/tests/vaadincontext/TestAddonContextListener.java index 9cd67e24b6..9f3019b21c 100644 --- a/tests/testbench/com/vaadin/tests/vaadincontext/TestAddonContextListener.java +++ b/tests/testbench/com/vaadin/tests/vaadincontext/TestAddonContextListener.java @@ -19,12 +19,12 @@ package com.vaadin.tests.vaadincontext; import org.jsoup.nodes.Element; import org.jsoup.parser.Tag; -import com.vaadin.terminal.gwt.server.BootstrapFragmentResponse; -import com.vaadin.terminal.gwt.server.BootstrapListener; -import com.vaadin.terminal.gwt.server.BootstrapPageResponse; -import com.vaadin.terminal.gwt.server.BootstrapResponse; -import com.vaadin.terminal.gwt.server.AddonContextEvent; -import com.vaadin.terminal.gwt.server.AddonContextListener; +import com.vaadin.server.AddonContextEvent; +import com.vaadin.server.AddonContextListener; +import com.vaadin.server.BootstrapFragmentResponse; +import com.vaadin.server.BootstrapListener; +import com.vaadin.server.BootstrapPageResponse; +import com.vaadin.server.BootstrapResponse; import com.vaadin.ui.UI; public class TestAddonContextListener implements AddonContextListener { |