Migrate vaadin-server build to maven

Change-Id: I5c740f4e9cb28103bab199f9a552153d82277e7e

13 files changed, 0 insertions, 679 deletions

diff --git a/server/src/com/vaadin/annotations/AutoGenerated.java b/server/src/com/vaadin/annotations/AutoGenerated.java
deleted file mode 100644
index 1ad9f67ad1..0000000000
--- a/server/src/com/vaadin/annotations/AutoGenerated.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Copyright 2000-2014 Vaadin Ltd.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not
- * use this file except in compliance with the License. You may obtain a copy of
- * the License at
- * 
- * http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations under
- * the License.
- */
-package com.vaadin.annotations;
-
-/**
- * Marker annotation for automatically generated code elements.
- * 
- * These elements may be modified or removed by code generation.
- * 
- * @author Vaadin Ltd.
- * @since 6.0
- */
-public @interface AutoGenerated {
-
-}
diff --git a/server/src/com/vaadin/annotations/DesignRoot.java b/server/src/com/vaadin/annotations/DesignRoot.java
deleted file mode 100644
index a00a00dc0b..0000000000
--- a/server/src/com/vaadin/annotations/DesignRoot.java
+++ /dev/null
@@ -1,41 +0,0 @@
-/*
- * Copyright 2000-2014 Vaadin Ltd.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not
- * use this file except in compliance with the License. You may obtain a copy of
- * the License at
- * 
- * http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations under
- * the License.
- */
-package com.vaadin.annotations;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-import com.vaadin.ui.declarative.Design;
-
-/**
- * Marks the component as the root of a design (html) file.
- * <p>
- * Used together with {@link Design#read(com.vaadin.ui.Component)} to be able
- * the load the design without further configuration. The design is loaded from
- * the same package as the annotated class and by default the design filename is
- * derived from the class name. Using the {@link #value()} parameter you can
- * specify another design file name.
- * 
- * @since 7.4
- * @author Vaadin Ltd
- */
-@Retention(RetentionPolicy.RUNTIME)
-@Target(ElementType.TYPE)
-public @interface DesignRoot {
-    String value() default "";
-}
diff --git a/server/src/com/vaadin/annotations/JavaScript.java b/server/src/com/vaadin/annotations/JavaScript.java
deleted file mode 100644
index 445ef75ddf..0000000000
--- a/server/src/com/vaadin/annotations/JavaScript.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * Copyright 2000-2014 Vaadin Ltd.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not
- * use this file except in compliance with the License. You may obtain a copy of
- * the License at
- * 
- * http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations under
- * the License.
- */
-
-package com.vaadin.annotations;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-import com.vaadin.server.ClientConnector;
-
-/**
- * If this annotation is present on a {@link ClientConnector} class, the
- * framework ensures the referenced JavaScript files are loaded before the init
- * method for the corresponding client-side connector is invoked.
- * <p>
- * Absolute URLs including protocol and host are used as is on the client-side.
- * Relative URLs are mapped to APP/PUBLISHED/[url] which are by default served
- * from the classpath relative to the class where the annotation is defined.
- * <p>
- * The file is only loaded if it has not already been loaded, determined as
- * follows:
- * <ul>
- * <li>For absolute URLs, the URL is considered loaded if the same URL has
- * previously been loaded using {@code @JavaScript} or if a script tag loaded
- * from the same URL was present in the DOM when the Vaadin client-side was
- * initialized.
- * <li>For relative URLs, the URL is considered loaded if another file with the
- * same name has already been loaded using {@code @JavaScript}, even if that
- * file was loaded from a different folder.
- * </ul>
- * <p>
- * Example: <code>@JavaScript({"http://host.com/file1.js", "file2.js"})</code>
- * on the class com.example.MyConnector would load the file
- * http://host.com/file1.js as is and file2.js from /com/example/file2.js on the
- * server's classpath using the ClassLoader that was used to load
- * com.example.MyConnector.
- * 
- * @author Vaadin Ltd
- * @since 7.0.0
- */
-@Retention(RetentionPolicy.RUNTIME)
-@Target(ElementType.TYPE)
-public @interface JavaScript {
-    /**
-     * JavaScript files to load before initializing the client-side connector.
-     * 
-     * @return an array of JavaScript file urls
-     */
-    public String[] value();
-}
diff --git a/server/src/com/vaadin/annotations/PreserveOnRefresh.java b/server/src/com/vaadin/annotations/PreserveOnRefresh.java
deleted file mode 100644
index 7f4ef3ffe5..0000000000
--- a/server/src/com/vaadin/annotations/PreserveOnRefresh.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Copyright 2000-2014 Vaadin Ltd.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not
- * use this file except in compliance with the License. You may obtain a copy of
- * the License at
- * 
- * http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations under
- * the License.
- */
-
-package com.vaadin.annotations;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-import com.vaadin.server.UIProvider;
-import com.vaadin.ui.UI;
-
-/**
- * Marks a UI that should be retained when the user refreshed the browser
- * window. By default, a new UI instance is created when refreshing, causing any
- * UI state not captured in the URL or the URI fragment to get discarded. By
- * adding this annotation to a UI class, the framework will instead reuse the
- * current UI instance when a reload is detected.
- * <p>
- * Whenever a request is received that reloads a preserved UI, the UI's
- * {@link UI#refresh(com.vaadin.server.VaadinRequest) refresh} method is invoked
- * by the framework.
- * <p>
- * By using
- * {@link UIProvider#isPreservedOnRefresh(com.vaadin.server.UICreateEvent)}, the
- * decision can also be made dynamically based on other parameters than only
- * whether this annotation is present on the UI class.
- * 
- * @author Vaadin Ltd
- * @since 7.0.0
- */
-@Target(ElementType.TYPE)
-@Retention(RetentionPolicy.RUNTIME)
-public @interface PreserveOnRefresh {
-    // Empty marker annotation
-}
diff --git a/server/src/com/vaadin/annotations/Push.java b/server/src/com/vaadin/annotations/Push.java
deleted file mode 100644
index b6a28c1560..0000000000
--- a/server/src/com/vaadin/annotations/Push.java
+++ /dev/null
@@ -1,59 +0,0 @@
-/*
- * Copyright 2000-2014 Vaadin Ltd.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not
- * use this file except in compliance with the License. You may obtain a copy of
- * the License at
- * 
- * http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations under
- * the License.
- */
-
-package com.vaadin.annotations;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-import com.vaadin.shared.communication.PushMode;
-import com.vaadin.shared.ui.ui.Transport;
-import com.vaadin.ui.UI;
-
-/**
- * Configures server push for a {@link UI}. Adding <code>@Push</code> to a UI
- * class configures the UI for automatic push. If some other push mode is
- * desired, it can be passed as a parameter, e.g.
- * <code>@Push(PushMode.MANUAL)</code>.
- * 
- * @see PushMode
- * 
- * @author Vaadin Ltd.
- * @since 7.1
- */
-@Retention(RetentionPolicy.RUNTIME)
-@Target(ElementType.TYPE)
-public @interface Push {
-    /**
-     * Returns the {@link PushMode} to use for the annotated UI. The default
-     * push mode when this annotation is present is {@link PushMode#AUTOMATIC}.
-     * 
-     * @return the push mode to use
-     */
-    public PushMode value() default PushMode.AUTOMATIC;
-
-    /**
-     * Returns the transport type used for the push for the annotated UI. The
-     * default transport type when this annotation is present is
-     * {@link Transport#WEBSOCKET}.
-     * 
-     * @return the transport type to use
-     */
-    public Transport transport() default Transport.WEBSOCKET;
-
-}
diff --git a/server/src/com/vaadin/annotations/StyleSheet.java b/server/src/com/vaadin/annotations/StyleSheet.java
deleted file mode 100644
index 191e39ee24..0000000000
--- a/server/src/com/vaadin/annotations/StyleSheet.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- * Copyright 2000-2014 Vaadin Ltd.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not
- * use this file except in compliance with the License. You may obtain a copy of
- * the License at
- * 
- * http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations under
- * the License.
- */
-
-package com.vaadin.annotations;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-import com.vaadin.server.ClientConnector;
-
-/**
- * If this annotation is present on a {@link ClientConnector} class, the
- * framework ensures the referenced style sheets are loaded before the init
- * method for the corresponding client-side connector is invoked.
- * <p>
- * Absolute URLs including protocol and host are used as is on the client-side.
- * Relative URLs are mapped to APP/PUBLISHED/[url] which are by default served
- * from the classpath relative to the class where the annotation is defined.
- * <p>
- * The file is only loaded if it has not already been loaded, determined as
- * follows:
- * <ul>
- * <li>For absolute URLs, the URL is considered loaded if the same URL has
- * previously been loaded using {@code StyleSheet} or if a
- * {@code <link rel="stylesheet">} tag using the same URL was present in the DOM
- * when the Vaadin client-side was initialized.
- * <li>For relative URLs, the URL is considered loaded if another file with the
- * same name has already been loaded using {@code StyleSheet}, even if that file
- * was loaded from a different folder.
- * </ul>
- * <p>
- * Special Vaadin urls are also supported. The most useful is vaadin:// which
- * maps to the location of the automatically published VAADIN folder. Using the
- * VAADIN folder and vaadin:// you can publish stylesheets which use images or
- * other files with relative paths.
- * <p>
- * Example: <code>@StyleSheet({"http://host.com/file1.css", "file2.css"})</code>
- * on the class com.example.MyConnector would load the file
- * http://host.com/file1.css as is and file2.css from /com/example/file2.css on
- * the server's classpath using the ClassLoader that was used to load
- * com.example.MyConnector.
- * 
- * @author Vaadin Ltd
- * @since 7.0.0
- */
-@Retention(RetentionPolicy.RUNTIME)
-@Target(ElementType.TYPE)
-public @interface StyleSheet {
-    /**
-     * Style sheets to load before initializing the client-side connector.
-     * 
-     * @return an array of style sheet urls
-     */
-    public String[] value();
-}
diff --git a/server/src/com/vaadin/annotations/Theme.java b/server/src/com/vaadin/annotations/Theme.java
deleted file mode 100644
index 61c47389ad..0000000000
--- a/server/src/com/vaadin/annotations/Theme.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Copyright 2000-2014 Vaadin Ltd.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not
- * use this file except in compliance with the License. You may obtain a copy of
- * the License at
- * 
- * http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations under
- * the License.
- */
-
-package com.vaadin.annotations;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-import com.vaadin.ui.UI;
-
-/**
- * Defines a specific theme for a {@link UI}.
- */
-@Retention(RetentionPolicy.RUNTIME)
-@Target(ElementType.TYPE)
-public @interface Theme {
-    /**
-     * @return simple name of the theme
-     */
-    public String value();
-}
diff --git a/server/src/com/vaadin/annotations/Title.java b/server/src/com/vaadin/annotations/Title.java
deleted file mode 100644
index 38a3d75f17..0000000000
--- a/server/src/com/vaadin/annotations/Title.java
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Copyright 2000-2014 Vaadin Ltd.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not
- * use this file except in compliance with the License. You may obtain a copy of
- * the License at
- * 
- * http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations under
- * the License.
- */
-
-package com.vaadin.annotations;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-import com.vaadin.ui.UI;
-
-/**
- * Defines the HTML page title for a {@link UI}.
- */
-@Retention(RetentionPolicy.RUNTIME)
-@Target(ElementType.TYPE)
-public @interface Title {
-    /**
-     * Gets the HTML title that should be used if the UI is used on it's own.
-     * 
-     * @return a page title string
-     */
-    public String value();
-}
diff --git a/server/src/com/vaadin/annotations/VaadinServletConfiguration.java b/server/src/com/vaadin/annotations/VaadinServletConfiguration.java
deleted file mode 100644
index 00af38ecc1..0000000000
--- a/server/src/com/vaadin/annotations/VaadinServletConfiguration.java
+++ /dev/null
@@ -1,142 +0,0 @@
-/*
- * Copyright 2000-2014 Vaadin Ltd.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not
- * use this file except in compliance with the License. You may obtain a copy of
- * the License at
- * 
- * http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations under
- * the License.
- */
-
-package com.vaadin.annotations;
-
-import java.lang.annotation.Documented;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-import com.vaadin.server.Constants;
-import com.vaadin.server.DefaultDeploymentConfiguration;
-import com.vaadin.server.DeploymentConfiguration;
-import com.vaadin.server.DeploymentConfiguration.LegacyProperyToStringMode;
-import com.vaadin.server.VaadinServlet;
-import com.vaadin.server.VaadinSession;
-import com.vaadin.ui.UI;
-
-/**
- * Annotation for configuring subclasses of {@link VaadinServlet}. For a
- * {@link VaadinServlet} class that has this annotation, the defined values are
- * read during initialization and will be available using
- * {@link DeploymentConfiguration#getApplicationOrSystemProperty(String, String)}
- * as well as from specific methods in {@link DeploymentConfiguration}. Init
- * params defined in <code>web.xml</code> or the <code>@WebServlet</code>
- * annotation take precedence over values defined in this annotation.
- * 
- * @since 7.1
- * @author Vaadin Ltd
- */
-@Retention(RetentionPolicy.RUNTIME)
-@Target(ElementType.TYPE)
-public @interface VaadinServletConfiguration {
-    /**
-     * Defines the init parameter name for methods in
-     * {@link VaadinServletConfiguration}.
-     * 
-     * @since 7.1
-     * @author Vaadin Ltd
-     */
-    @Retention(RetentionPolicy.RUNTIME)
-    @Target(ElementType.METHOD)
-    @Documented
-    public @interface InitParameterName {
-        /**
-         * The name of the init parameter that the annotated method controls.
-         * 
-         * @return the parameter name
-         */
-        public String value();
-    }
-
-    /**
-     * Whether Vaadin is in production mode.
-     * 
-     * @return true if in production mode, false otherwise.
-     * 
-     * @see DeploymentConfiguration#isProductionMode()
-     */
-    @InitParameterName(Constants.SERVLET_PARAMETER_PRODUCTION_MODE)
-    public boolean productionMode();
-
-    /**
-     * Gets the default UI class to use for the servlet.
-     * 
-     * @return the default UI class
-     */
-    @InitParameterName(VaadinSession.UI_PARAMETER)
-    public Class<? extends UI> ui();
-
-    /**
-     * The time resources can be cached in the browser, in seconds. The default
-     * value is 3600 seconds, i.e. one hour.
-     * 
-     * @return the resource cache time
-     * 
-     * @see DeploymentConfiguration#getResourceCacheTime()
-     */
-    @InitParameterName(Constants.SERVLET_PARAMETER_RESOURCE_CACHE_TIME)
-    public int resourceCacheTime() default DefaultDeploymentConfiguration.DEFAULT_RESOURCE_CACHE_TIME;
-
-    /**
-     * The number of seconds between heartbeat requests of a UI, or a
-     * non-positive number if heartbeat is disabled. The default value is 300
-     * seconds, i.e. 5 minutes.
-     * 
-     * @return the time between heartbeats
-     * 
-     * @see DeploymentConfiguration#getHeartbeatInterval()
-     */
-    @InitParameterName(Constants.SERVLET_PARAMETER_HEARTBEAT_INTERVAL)
-    public int heartbeatInterval() default DefaultDeploymentConfiguration.DEFAULT_HEARTBEAT_INTERVAL;
-
-    /**
-     * Whether a session should be closed when all its open UIs have been idle
-     * for longer than its configured maximum inactivity time. The default value
-     * is <code>false</code>.
-     * 
-     * @return true if UIs and sessions receiving only heartbeat requests are
-     *         eventually closed; false if heartbeat requests extend UI and
-     *         session lifetime indefinitely
-     * 
-     * @see DeploymentConfiguration#isCloseIdleSessions()
-     */
-    @InitParameterName(Constants.SERVLET_PARAMETER_CLOSE_IDLE_SESSIONS)
-    public boolean closeIdleSessions() default DefaultDeploymentConfiguration.DEFAULT_CLOSE_IDLE_SESSIONS;
-
-    /**
-     * The default widgetset to use for the servlet. The default value is
-     * <code>com.vaadin.DefaultWidgetSet</code>.
-     * 
-     * @return the default widgetset name
-     */
-    @InitParameterName(VaadinServlet.PARAMETER_WIDGETSET)
-    public String widgetset() default VaadinServlet.DEFAULT_WIDGETSET;
-
-    /**
-     * The legacy Property.toString() mode used. The default value is
-     * {@link LegacyProperyToStringMode#DISABLED}
-     * 
-     * @return The Property.toString() mode in use.
-     * 
-     * @deprecated as of 7.1, should only be used to ease migration
-     */
-    @Deprecated
-    @InitParameterName(Constants.SERVLET_PARAMETER_LEGACY_PROPERTY_TOSTRING)
-    public LegacyProperyToStringMode legacyPropertyToStringMode() default LegacyProperyToStringMode.DISABLED;
-}
diff --git a/server/src/com/vaadin/annotations/Viewport.java b/server/src/com/vaadin/annotations/Viewport.java
deleted file mode 100644
index c5b0abd56f..0000000000
--- a/server/src/com/vaadin/annotations/Viewport.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Copyright 2000-2014 Vaadin Ltd.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not
- * use this file except in compliance with the License. You may obtain a copy of
- * the License at
- * 
- * http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations under
- * the License.
- */
-package com.vaadin.annotations;
-
-import java.lang.annotation.Documented;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Inherited;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-/**
- * Defines a viewport tag that will be added to the HTML of the host page of a
- * UI class.
- * <p>
- * If you want to dynamically provide different viewport values for different
- * browser, you should use {@link ViewportGeneratorClass} instead.
- * 
- * @since 7.4
- * 
- * @author Vaadin Ltd
- */
-@Target(ElementType.TYPE)
-@Retention(RetentionPolicy.RUNTIME)
-@Inherited
-@Documented
-public @interface Viewport {
-    /**
-     * Gets the viewport tag content.
-     * 
-     * @return the viewport tag content
-     */
-    public String value();
-}
diff --git a/server/src/com/vaadin/annotations/ViewportGeneratorClass.java b/server/src/com/vaadin/annotations/ViewportGeneratorClass.java
deleted file mode 100644
index aec7ac07e6..0000000000
--- a/server/src/com/vaadin/annotations/ViewportGeneratorClass.java
+++ /dev/null
@@ -1,54 +0,0 @@
-/*
- * Copyright 2000-2014 Vaadin Ltd.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not
- * use this file except in compliance with the License. You may obtain a copy of
- * the License at
- * 
- * http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations under
- * the License.
- */
-package com.vaadin.annotations;
-
-import java.lang.annotation.Documented;
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Inherited;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-import com.vaadin.server.ViewportGenerator;
-
-/**
- * Defines a viewport tag generator class that will be used for generating the
- * content of a viewport tag that will be added to the HTML of the host page of
- * a UI class.
- * <p>
- * If you want to use the same viewport values for all requests, you can use the
- * simpler {@link Viewport} annotation instead.
- * 
- * @see ViewportGenerator
- * 
- * @since 7.4
- * 
- * @author Vaadin Ltd
- */
-@Target(ElementType.TYPE)
-@Retention(RetentionPolicy.RUNTIME)
-@Inherited
-@Documented
-public @interface ViewportGeneratorClass {
-    /**
-     * Gets the viewport generator class to use. Please note that the class must
-     * be public and have a default constructor. It must additionally be
-     * declared as static if it's declared as an inner class.
-     * 
-     * @return the viewport generator class
-     */
-    public Class<? extends ViewportGenerator> value();
-}
diff --git a/server/src/com/vaadin/annotations/Widgetset.java b/server/src/com/vaadin/annotations/Widgetset.java
deleted file mode 100644
index c6ef6a7194..0000000000
--- a/server/src/com/vaadin/annotations/Widgetset.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright 2000-2014 Vaadin Ltd.
- * 
- * Licensed under the Apache License, Version 2.0 (the "License"); you may not
- * use this file except in compliance with the License. You may obtain a copy of
- * the License at
- * 
- * http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations under
- * the License.
- */
-
-package com.vaadin.annotations;
-
-import java.lang.annotation.ElementType;
-import java.lang.annotation.Retention;
-import java.lang.annotation.RetentionPolicy;
-import java.lang.annotation.Target;
-
-import com.vaadin.ui.UI;
-
-/**
- * Defines a specific widgetset for a {@link UI}.
- */
-@Retention(RetentionPolicy.RUNTIME)
-@Target(ElementType.TYPE)
-public @interface Widgetset {
-    /**
-     * @return name of the widgetset
-     */
-    public String value();
-
-}
diff --git a/server/src/com/vaadin/annotations/package.html b/server/src/com/vaadin/annotations/package.html
deleted file mode 100644
index d789e9b5df..0000000000
--- a/server/src/com/vaadin/annotations/package.html
+++ /dev/null
@@ -1,12 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html>
-<head>
-</head>
-
-<body bgcolor="white">
-
-<p>Contains annotations used in Vaadin. Note that some annotations
-are also found in other packages e.g., {@link com.vaadin.ui.ClientWidget}.</p>
-
-</body>
-</html>