From 916a7a5d622fb72c8bdbf09dc682cc313a40a15b Mon Sep 17 00:00:00 2001 From: jeb228 Date: Wed, 26 May 2010 20:10:24 +0000 Subject: [PATCH] NIHVIVO-160 Change package from webapp.utils.filestorage to webapp.filestorage.backend --- .../backend}/FileAlreadyExistsException.java | 2 +- .../filestorage => filestorage/backend}/FileStorage.java | 2 +- .../backend}/FileStorageFactory.java | 2 +- .../backend}/FileStorageHelper.java | 4 ++-- .../filestorage => filestorage/backend}/FileStorageImpl.java | 2 +- .../backend}/InvalidCharacterException.java | 2 +- .../backend}/InvalidPathException.java | 2 +- .../filestorage => filestorage/backend}/package-info.java | 2 +- .../backend}/FileStorageFactoryTest.java | 4 ++-- .../backend}/FileStorageHelperTest.java | 2 +- .../backend}/FileStorageImplTest.java | 2 +- 11 files changed, 13 insertions(+), 13 deletions(-) rename webapp/src/edu/cornell/mannlib/vitro/webapp/{utils/filestorage => filestorage/backend}/FileAlreadyExistsException.java (90%) rename webapp/src/edu/cornell/mannlib/vitro/webapp/{utils/filestorage => filestorage/backend}/FileStorage.java (94%) rename webapp/src/edu/cornell/mannlib/vitro/webapp/{utils/filestorage => filestorage/backend}/FileStorageFactory.java (93%) rename webapp/src/edu/cornell/mannlib/vitro/webapp/{utils/filestorage => filestorage/backend}/FileStorageHelper.java (95%) rename webapp/src/edu/cornell/mannlib/vitro/webapp/{utils/filestorage => filestorage/backend}/FileStorageImpl.java (96%) rename webapp/src/edu/cornell/mannlib/vitro/webapp/{utils/filestorage => filestorage/backend}/InvalidCharacterException.java (88%) rename webapp/src/edu/cornell/mannlib/vitro/webapp/{utils/filestorage => filestorage/backend}/InvalidPathException.java (86%) rename webapp/src/edu/cornell/mannlib/vitro/webapp/{utils/filestorage => filestorage/backend}/package-info.java (96%) rename webapp/test/edu/cornell/mannlib/vitro/webapp/{utils/filestorage => filestorage/backend}/FileStorageFactoryTest.java (94%) rename webapp/test/edu/cornell/mannlib/vitro/webapp/{utils/filestorage => filestorage/backend}/FileStorageHelperTest.java (96%) rename webapp/test/edu/cornell/mannlib/vitro/webapp/{utils/filestorage => filestorage/backend}/FileStorageImplTest.java (96%) diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/utils/filestorage/FileAlreadyExistsException.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/filestorage/backend/FileAlreadyExistsException.java similarity index 90% rename from webapp/src/edu/cornell/mannlib/vitro/webapp/utils/filestorage/FileAlreadyExistsException.java rename to webapp/src/edu/cornell/mannlib/vitro/webapp/filestorage/backend/FileAlreadyExistsException.java index 7bd7a3c75..4ba18618e 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/utils/filestorage/FileAlreadyExistsException.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/filestorage/backend/FileAlreadyExistsException.java @@ -1,6 +1,6 @@ /* $This file is distributed under the terms of the license in /doc/license.txt$ */ -package edu.cornell.mannlib.vitro.webapp.utils.filestorage; +package edu.cornell.mannlib.vitro.webapp.filestorage.backend; import java.io.IOException; diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/utils/filestorage/FileStorage.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/filestorage/backend/FileStorage.java similarity index 94% rename from webapp/src/edu/cornell/mannlib/vitro/webapp/utils/filestorage/FileStorage.java rename to webapp/src/edu/cornell/mannlib/vitro/webapp/filestorage/backend/FileStorage.java index 28df0b751..d7a34f95d 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/utils/filestorage/FileStorage.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/filestorage/backend/FileStorage.java @@ -1,6 +1,6 @@ /* $This file is distributed under the terms of the license in /doc/license.txt$ */ -package edu.cornell.mannlib.vitro.webapp.utils.filestorage; +package edu.cornell.mannlib.vitro.webapp.filestorage.backend; import java.io.FileNotFoundException; import java.io.IOException; diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/utils/filestorage/FileStorageFactory.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/filestorage/backend/FileStorageFactory.java similarity index 93% rename from webapp/src/edu/cornell/mannlib/vitro/webapp/utils/filestorage/FileStorageFactory.java rename to webapp/src/edu/cornell/mannlib/vitro/webapp/filestorage/backend/FileStorageFactory.java index 0c054da03..36c2da979 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/utils/filestorage/FileStorageFactory.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/filestorage/backend/FileStorageFactory.java @@ -1,6 +1,6 @@ /* $This file is distributed under the terms of the license in /doc/license.txt$ */ -package edu.cornell.mannlib.vitro.webapp.utils.filestorage; +package edu.cornell.mannlib.vitro.webapp.filestorage.backend; import java.io.IOException; diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/utils/filestorage/FileStorageHelper.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/filestorage/backend/FileStorageHelper.java similarity index 95% rename from webapp/src/edu/cornell/mannlib/vitro/webapp/utils/filestorage/FileStorageHelper.java rename to webapp/src/edu/cornell/mannlib/vitro/webapp/filestorage/backend/FileStorageHelper.java index 198d9da7b..e38635e83 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/utils/filestorage/FileStorageHelper.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/filestorage/backend/FileStorageHelper.java @@ -1,8 +1,8 @@ /* $This file is distributed under the terms of the license in /doc/license.txt$ */ -package edu.cornell.mannlib.vitro.webapp.utils.filestorage; +package edu.cornell.mannlib.vitro.webapp.filestorage.backend; -import static edu.cornell.mannlib.vitro.webapp.utils.filestorage.FileStorage.SHORTY_LENGTH; +import static edu.cornell.mannlib.vitro.webapp.filestorage.backend.FileStorage.SHORTY_LENGTH; import java.io.File; import java.util.Map; diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/utils/filestorage/FileStorageImpl.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/filestorage/backend/FileStorageImpl.java similarity index 96% rename from webapp/src/edu/cornell/mannlib/vitro/webapp/utils/filestorage/FileStorageImpl.java rename to webapp/src/edu/cornell/mannlib/vitro/webapp/filestorage/backend/FileStorageImpl.java index ab7fed00b..0058c4ba9 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/utils/filestorage/FileStorageImpl.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/filestorage/backend/FileStorageImpl.java @@ -1,6 +1,6 @@ /* $This file is distributed under the terms of the license in /doc/license.txt$ */ -package edu.cornell.mannlib.vitro.webapp.utils.filestorage; +package edu.cornell.mannlib.vitro.webapp.filestorage.backend; import java.io.BufferedInputStream; import java.io.BufferedOutputStream; diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/utils/filestorage/InvalidCharacterException.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/filestorage/backend/InvalidCharacterException.java similarity index 88% rename from webapp/src/edu/cornell/mannlib/vitro/webapp/utils/filestorage/InvalidCharacterException.java rename to webapp/src/edu/cornell/mannlib/vitro/webapp/filestorage/backend/InvalidCharacterException.java index 7e1cf2cd4..b67f6fff0 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/utils/filestorage/InvalidCharacterException.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/filestorage/backend/InvalidCharacterException.java @@ -1,6 +1,6 @@ /* $This file is distributed under the terms of the license in /doc/license.txt$ */ -package edu.cornell.mannlib.vitro.webapp.utils.filestorage; +package edu.cornell.mannlib.vitro.webapp.filestorage.backend; /** * Indicates that an object ID contains an invalid character. diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/utils/filestorage/InvalidPathException.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/filestorage/backend/InvalidPathException.java similarity index 86% rename from webapp/src/edu/cornell/mannlib/vitro/webapp/utils/filestorage/InvalidPathException.java rename to webapp/src/edu/cornell/mannlib/vitro/webapp/filestorage/backend/InvalidPathException.java index 05138a30e..3a18777b2 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/utils/filestorage/InvalidPathException.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/filestorage/backend/InvalidPathException.java @@ -1,6 +1,6 @@ /* $This file is distributed under the terms of the license in /doc/license.txt$ */ -package edu.cornell.mannlib.vitro.webapp.utils.filestorage; +package edu.cornell.mannlib.vitro.webapp.filestorage.backend; /** * Indicates a PairTree path ("ppath" or "relative path") that is not correctly diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/utils/filestorage/package-info.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/filestorage/backend/package-info.java similarity index 96% rename from webapp/src/edu/cornell/mannlib/vitro/webapp/utils/filestorage/package-info.java rename to webapp/src/edu/cornell/mannlib/vitro/webapp/filestorage/backend/package-info.java index 36ad50247..645e905f7 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/utils/filestorage/package-info.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/filestorage/backend/package-info.java @@ -175,4 +175,4 @@ *

*/ -package edu.cornell.mannlib.vitro.webapp.utils.filestorage; +package edu.cornell.mannlib.vitro.webapp.filestorage.backend; diff --git a/webapp/test/edu/cornell/mannlib/vitro/webapp/utils/filestorage/FileStorageFactoryTest.java b/webapp/test/edu/cornell/mannlib/vitro/webapp/filestorage/backend/FileStorageFactoryTest.java similarity index 94% rename from webapp/test/edu/cornell/mannlib/vitro/webapp/utils/filestorage/FileStorageFactoryTest.java rename to webapp/test/edu/cornell/mannlib/vitro/webapp/filestorage/backend/FileStorageFactoryTest.java index d198779d6..b31eec9a7 100644 --- a/webapp/test/edu/cornell/mannlib/vitro/webapp/utils/filestorage/FileStorageFactoryTest.java +++ b/webapp/test/edu/cornell/mannlib/vitro/webapp/filestorage/backend/FileStorageFactoryTest.java @@ -1,8 +1,8 @@ /* $This file is distributed under the terms of the license in /doc/license.txt$ */ -package edu.cornell.mannlib.vitro.webapp.utils.filestorage; +package edu.cornell.mannlib.vitro.webapp.filestorage.backend; -import static edu.cornell.mannlib.vitro.webapp.utils.filestorage.FileStorageFactory.PROPERTY_IMPLEMETATION_CLASSNAME; +import static edu.cornell.mannlib.vitro.webapp.filestorage.backend.FileStorageFactory.PROPERTY_IMPLEMETATION_CLASSNAME; import static org.junit.Assert.assertEquals; import static org.junit.Assert.fail; diff --git a/webapp/test/edu/cornell/mannlib/vitro/webapp/utils/filestorage/FileStorageHelperTest.java b/webapp/test/edu/cornell/mannlib/vitro/webapp/filestorage/backend/FileStorageHelperTest.java similarity index 96% rename from webapp/test/edu/cornell/mannlib/vitro/webapp/utils/filestorage/FileStorageHelperTest.java rename to webapp/test/edu/cornell/mannlib/vitro/webapp/filestorage/backend/FileStorageHelperTest.java index 418cd0b6a..098adcc1d 100644 --- a/webapp/test/edu/cornell/mannlib/vitro/webapp/utils/filestorage/FileStorageHelperTest.java +++ b/webapp/test/edu/cornell/mannlib/vitro/webapp/filestorage/backend/FileStorageHelperTest.java @@ -1,6 +1,6 @@ /* $This file is distributed under the terms of the license in /doc/license.txt$ */ -package edu.cornell.mannlib.vitro.webapp.utils.filestorage; +package edu.cornell.mannlib.vitro.webapp.filestorage.backend; import static org.junit.Assert.assertEquals; diff --git a/webapp/test/edu/cornell/mannlib/vitro/webapp/utils/filestorage/FileStorageImplTest.java b/webapp/test/edu/cornell/mannlib/vitro/webapp/filestorage/backend/FileStorageImplTest.java similarity index 96% rename from webapp/test/edu/cornell/mannlib/vitro/webapp/utils/filestorage/FileStorageImplTest.java rename to webapp/test/edu/cornell/mannlib/vitro/webapp/filestorage/backend/FileStorageImplTest.java index bfb189956..9859df429 100644 --- a/webapp/test/edu/cornell/mannlib/vitro/webapp/utils/filestorage/FileStorageImplTest.java +++ b/webapp/test/edu/cornell/mannlib/vitro/webapp/filestorage/backend/FileStorageImplTest.java @@ -1,6 +1,6 @@ /* $This file is distributed under the terms of the license in /doc/license.txt$ */ -package edu.cornell.mannlib.vitro.webapp.utils.filestorage; +package edu.cornell.mannlib.vitro.webapp.filestorage.backend; import static org.junit.Assert.*; import static org.junit.Assert.assertTrue;