Merge branch 'master' into root-cleanup

Conflicts:
	server/src/com/vaadin/terminal/DeploymentConfiguration.java
	server/src/com/vaadin/terminal/gwt/server/AbstractApplicationPortlet.java
	server/src/com/vaadin/terminal/gwt/server/AbstractApplicationServlet.java
	server/src/com/vaadin/terminal/gwt/server/AbstractDeploymentConfiguration.java

1 files changed, 0 insertions, 26 deletions

diff --git a/src/com/vaadin/terminal/Resource.java b/src/com/vaadin/terminal/Resource.java
deleted file mode 100644
index 58dc4fea9d..0000000000
--- a/src/com/vaadin/terminal/Resource.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/* 
-@VaadinApache2LicenseForJavaFiles@
- */
-
-package com.vaadin.terminal;
-
-import java.io.Serializable;
-
-/**
- * <code>Resource</code> provided to the client terminal. Support for actually
- * displaying the resource type is left to the terminal.
- * 
- * @author Vaadin Ltd.
- * @version
- * @VERSION@
- * @since 3.0
- */
-public interface Resource extends Serializable {
-
-    /**
-     * Gets the MIME type of the resource.
-     * 
-     * @return the MIME type of the resource.
-     */
-    public String getMIMEType();
-}