From 1b1e3ae67d8216420a129e76b9c35bfc4a19f6e9 Mon Sep 17 00:00:00 2001
From: Artur Signell <artur@vaadin.com>
Date: Tue, 6 Nov 2012 18:14:12 +0200
Subject: [PATCH] Merged com.vaadin.service into com.vaadin.util (#10146)

Change-Id: I313ba80073b89a90da8ebe8c26f35c4fcc51f431
---
 .../vaadin/data/util/FilesystemContainer.java |  2 +-
 .../src/com/vaadin/server/ClassResource.java  |  2 +-
 .../server/DynamicConnectorResource.java      |  2 +-
 .../com/vaadin/server/ExternalResource.java   |  2 +-
 .../src/com/vaadin/server/FileResource.java   |  2 +-
 .../src/com/vaadin/server/StreamResource.java |  2 +-
 .../src/com/vaadin/server/ThemeResource.java  |  2 +-
 server/src/com/vaadin/service/package.html    | 20 -------------------
 .../{service => util}/FileTypeResolver.java   |  2 +-
 .../tests/server/TestFileTypeResolver.java    |  2 +-
 10 files changed, 9 insertions(+), 29 deletions(-)
 delete mode 100644 server/src/com/vaadin/service/package.html
 rename server/src/com/vaadin/{service => util}/FileTypeResolver.java (99%)

diff --git a/server/src/com/vaadin/data/util/FilesystemContainer.java b/server/src/com/vaadin/data/util/FilesystemContainer.java
index dbfe3bb6e8..5c96183780 100644
--- a/server/src/com/vaadin/data/util/FilesystemContainer.java
+++ b/server/src/com/vaadin/data/util/FilesystemContainer.java
@@ -34,7 +34,7 @@ import com.vaadin.data.Container;
 import com.vaadin.data.Item;
 import com.vaadin.data.Property;
 import com.vaadin.server.Resource;
-import com.vaadin.service.FileTypeResolver;
+import com.vaadin.util.FileTypeResolver;
 
 /**
  * A hierarchical container wrapper for a filesystem.
diff --git a/server/src/com/vaadin/server/ClassResource.java b/server/src/com/vaadin/server/ClassResource.java
index 29bb0d2a75..d7bc96a5de 100644
--- a/server/src/com/vaadin/server/ClassResource.java
+++ b/server/src/com/vaadin/server/ClassResource.java
@@ -18,9 +18,9 @@ package com.vaadin.server;
 
 import java.io.Serializable;
 
-import com.vaadin.service.FileTypeResolver;
 import com.vaadin.ui.LegacyWindow;
 import com.vaadin.ui.UI;
+import com.vaadin.util.FileTypeResolver;
 
 /**
  * <code>ClassResource</code> is a named resource accessed with the class
diff --git a/server/src/com/vaadin/server/DynamicConnectorResource.java b/server/src/com/vaadin/server/DynamicConnectorResource.java
index 264afa3f59..0e29b289e4 100644
--- a/server/src/com/vaadin/server/DynamicConnectorResource.java
+++ b/server/src/com/vaadin/server/DynamicConnectorResource.java
@@ -19,7 +19,7 @@ package com.vaadin.server;
 import java.util.Collections;
 import java.util.Map;
 
-import com.vaadin.service.FileTypeResolver;
+import com.vaadin.util.FileTypeResolver;
 
 /**
  * A resource that is served by calling
diff --git a/server/src/com/vaadin/server/ExternalResource.java b/server/src/com/vaadin/server/ExternalResource.java
index 925b0589f3..8b9690848c 100644
--- a/server/src/com/vaadin/server/ExternalResource.java
+++ b/server/src/com/vaadin/server/ExternalResource.java
@@ -19,7 +19,7 @@ package com.vaadin.server;
 import java.io.Serializable;
 import java.net.URL;
 
-import com.vaadin.service.FileTypeResolver;
+import com.vaadin.util.FileTypeResolver;
 
 /**
  * <code>ExternalResource</code> implements source for resources fetched from
diff --git a/server/src/com/vaadin/server/FileResource.java b/server/src/com/vaadin/server/FileResource.java
index baeac39441..ec3f775d00 100644
--- a/server/src/com/vaadin/server/FileResource.java
+++ b/server/src/com/vaadin/server/FileResource.java
@@ -21,7 +21,7 @@ import java.io.FileInputStream;
 import java.io.FileNotFoundException;
 
 import com.vaadin.server.Terminal.ErrorEvent;
-import com.vaadin.service.FileTypeResolver;
+import com.vaadin.util.FileTypeResolver;
 
 /**
  * <code>FileResources</code> are files or directories on local filesystem. The
diff --git a/server/src/com/vaadin/server/StreamResource.java b/server/src/com/vaadin/server/StreamResource.java
index 26514c9353..e7fdde6dc2 100644
--- a/server/src/com/vaadin/server/StreamResource.java
+++ b/server/src/com/vaadin/server/StreamResource.java
@@ -19,7 +19,7 @@ package com.vaadin.server;
 import java.io.InputStream;
 import java.io.Serializable;
 
-import com.vaadin.service.FileTypeResolver;
+import com.vaadin.util.FileTypeResolver;
 
 /**
  * <code>StreamResource</code> is a resource provided to the client directly by
diff --git a/server/src/com/vaadin/server/ThemeResource.java b/server/src/com/vaadin/server/ThemeResource.java
index 7ae0bab828..c507352650 100644
--- a/server/src/com/vaadin/server/ThemeResource.java
+++ b/server/src/com/vaadin/server/ThemeResource.java
@@ -16,7 +16,7 @@
 
 package com.vaadin.server;
 
-import com.vaadin.service.FileTypeResolver;
+import com.vaadin.util.FileTypeResolver;
 
 /**
  * <code>ThemeResource</code> is a named theme dependant resource provided and
diff --git a/server/src/com/vaadin/service/package.html b/server/src/com/vaadin/service/package.html
deleted file mode 100644
index ea21139b91..0000000000
--- a/server/src/com/vaadin/service/package.html
+++ /dev/null
@@ -1,20 +0,0 @@
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
-<html>
-<head>
-</head>
-
-<body bgcolor="white">
-
-<!-- Package summary here -->
-
-<p>Provides some general service classes used throughout Vaadin
-based applications.</p>
-
-<!-- <h2>Package Specification</h2> -->
-
-<!-- Package spec here -->
-
-<!-- Put @see and @since tags down here. -->
-
-</body>
-</html>
diff --git a/server/src/com/vaadin/service/FileTypeResolver.java b/server/src/com/vaadin/util/FileTypeResolver.java
similarity index 99%
rename from server/src/com/vaadin/service/FileTypeResolver.java
rename to server/src/com/vaadin/util/FileTypeResolver.java
index 4b1c8697eb..ac2789569c 100644
--- a/server/src/com/vaadin/service/FileTypeResolver.java
+++ b/server/src/com/vaadin/util/FileTypeResolver.java
@@ -14,7 +14,7 @@
  * the License.
  */
 
-package com.vaadin.service;
+package com.vaadin.util;
 
 import java.io.File;
 import java.io.Serializable;
diff --git a/server/tests/src/com/vaadin/tests/server/TestFileTypeResolver.java b/server/tests/src/com/vaadin/tests/server/TestFileTypeResolver.java
index 8a368ead53..413926c89a 100644
--- a/server/tests/src/com/vaadin/tests/server/TestFileTypeResolver.java
+++ b/server/tests/src/com/vaadin/tests/server/TestFileTypeResolver.java
@@ -4,7 +4,7 @@ import java.io.File;
 
 import junit.framework.TestCase;
 
-import com.vaadin.service.FileTypeResolver;
+import com.vaadin.util.FileTypeResolver;
 
 public class TestFileTypeResolver extends TestCase {
 
-- 
2.39.5