Adjust package names.
git-svn-id: https://svn.apache.org/repos/asf/felix/trunk@560961 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/prefs/src/main/java/org/apache/felix/prefs/BackingStore.java b/prefs/src/main/java/org/apache/felix/prefs/BackingStore.java
index 35e356b..a0318fb 100644
--- a/prefs/src/main/java/org/apache/felix/prefs/BackingStore.java
+++ b/prefs/src/main/java/org/apache/felix/prefs/BackingStore.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.felix.sandbox.preferences;
+package org.apache.felix.prefs;
import org.osgi.service.prefs.BackingStoreException;
diff --git a/prefs/src/main/java/org/apache/felix/prefs/BackingStoreManager.java b/prefs/src/main/java/org/apache/felix/prefs/BackingStoreManager.java
index aea89e4..b445199 100644
--- a/prefs/src/main/java/org/apache/felix/prefs/BackingStoreManager.java
+++ b/prefs/src/main/java/org/apache/felix/prefs/BackingStoreManager.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.felix.sandbox.preferences;
+package org.apache.felix.prefs;
/**
diff --git a/prefs/src/main/java/org/apache/felix/prefs/ChangeSet.java b/prefs/src/main/java/org/apache/felix/prefs/ChangeSet.java
index 647626d..5101271 100644
--- a/prefs/src/main/java/org/apache/felix/prefs/ChangeSet.java
+++ b/prefs/src/main/java/org/apache/felix/prefs/ChangeSet.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.felix.sandbox.preferences;
+package org.apache.felix.prefs;
import java.util.Collection;
import java.util.Collections;
diff --git a/prefs/src/main/java/org/apache/felix/prefs/PreferencesDescription.java b/prefs/src/main/java/org/apache/felix/prefs/PreferencesDescription.java
index 7cb1531..8bef9bc 100644
--- a/prefs/src/main/java/org/apache/felix/prefs/PreferencesDescription.java
+++ b/prefs/src/main/java/org/apache/felix/prefs/PreferencesDescription.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.felix.sandbox.preferences;
+package org.apache.felix.prefs;
/**
* A preferences description identifies a preferences try.
diff --git a/prefs/src/main/java/org/apache/felix/prefs/PreferencesImpl.java b/prefs/src/main/java/org/apache/felix/prefs/PreferencesImpl.java
index 48a5192..fa71e3c 100644
--- a/prefs/src/main/java/org/apache/felix/prefs/PreferencesImpl.java
+++ b/prefs/src/main/java/org/apache/felix/prefs/PreferencesImpl.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.felix.sandbox.preferences;
+package org.apache.felix.prefs;
import java.io.UnsupportedEncodingException;
import java.util.ArrayList;
@@ -26,7 +26,7 @@
import java.util.Map;
import java.util.Set;
-import org.apache.commons.codec.binary.Base64;
+import org.codehaus.plexus.util.Base64;
import org.osgi.service.prefs.BackingStoreException;
import org.osgi.service.prefs.Preferences;
diff --git a/prefs/src/main/java/org/apache/felix/prefs/impl/DataFileBackingStoreImpl.java b/prefs/src/main/java/org/apache/felix/prefs/impl/DataFileBackingStoreImpl.java
index 55ed28d..c56162c 100644
--- a/prefs/src/main/java/org/apache/felix/prefs/impl/DataFileBackingStoreImpl.java
+++ b/prefs/src/main/java/org/apache/felix/prefs/impl/DataFileBackingStoreImpl.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.felix.sandbox.preferences.impl;
+package org.apache.felix.prefs.impl;
import java.io.File;
import java.io.FileInputStream;
@@ -28,9 +28,9 @@
import java.util.List;
import java.util.Set;
-import org.apache.felix.sandbox.preferences.BackingStoreManager;
-import org.apache.felix.sandbox.preferences.PreferencesDescription;
-import org.apache.felix.sandbox.preferences.PreferencesImpl;
+import org.apache.felix.prefs.BackingStoreManager;
+import org.apache.felix.prefs.PreferencesDescription;
+import org.apache.felix.prefs.PreferencesImpl;
import org.osgi.framework.BundleContext;
import org.osgi.service.prefs.BackingStoreException;
diff --git a/prefs/src/main/java/org/apache/felix/prefs/impl/PreferencesManager.java b/prefs/src/main/java/org/apache/felix/prefs/impl/PreferencesManager.java
index a2849af..fcc56a4 100644
--- a/prefs/src/main/java/org/apache/felix/prefs/impl/PreferencesManager.java
+++ b/prefs/src/main/java/org/apache/felix/prefs/impl/PreferencesManager.java
@@ -16,15 +16,15 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.felix.sandbox.preferences.impl;
+package org.apache.felix.prefs.impl;
import java.util.HashMap;
import java.util.Iterator;
import java.util.Map;
-import org.apache.felix.sandbox.preferences.BackingStore;
-import org.apache.felix.sandbox.preferences.BackingStoreManager;
-import org.apache.felix.sandbox.preferences.PreferencesImpl;
+import org.apache.felix.prefs.BackingStore;
+import org.apache.felix.prefs.BackingStoreManager;
+import org.apache.felix.prefs.PreferencesImpl;
import org.osgi.framework.Bundle;
import org.osgi.framework.BundleActivator;
import org.osgi.framework.BundleContext;
diff --git a/prefs/src/main/java/org/apache/felix/prefs/impl/PreferencesServiceImpl.java b/prefs/src/main/java/org/apache/felix/prefs/impl/PreferencesServiceImpl.java
index c17ad3a..1bf01ce 100644
--- a/prefs/src/main/java/org/apache/felix/prefs/impl/PreferencesServiceImpl.java
+++ b/prefs/src/main/java/org/apache/felix/prefs/impl/PreferencesServiceImpl.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.felix.sandbox.preferences.impl;
+package org.apache.felix.prefs.impl;
import java.util.ArrayList;
import java.util.HashMap;
@@ -24,9 +24,9 @@
import java.util.Map;
import java.util.Set;
-import org.apache.felix.sandbox.preferences.BackingStoreManager;
-import org.apache.felix.sandbox.preferences.PreferencesDescription;
-import org.apache.felix.sandbox.preferences.PreferencesImpl;
+import org.apache.felix.prefs.BackingStoreManager;
+import org.apache.felix.prefs.PreferencesDescription;
+import org.apache.felix.prefs.PreferencesImpl;
import org.osgi.service.prefs.BackingStoreException;
import org.osgi.service.prefs.Preferences;
import org.osgi.service.prefs.PreferencesService;
diff --git a/prefs/src/main/java/org/apache/felix/prefs/impl/StreamBackingStoreImpl.java b/prefs/src/main/java/org/apache/felix/prefs/impl/StreamBackingStoreImpl.java
index 8769978..b784ce9 100644
--- a/prefs/src/main/java/org/apache/felix/prefs/impl/StreamBackingStoreImpl.java
+++ b/prefs/src/main/java/org/apache/felix/prefs/impl/StreamBackingStoreImpl.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.felix.sandbox.preferences.impl;
+package org.apache.felix.prefs.impl;
import java.io.IOException;
import java.io.InputStream;
@@ -27,9 +27,9 @@
import java.util.Iterator;
import java.util.Map;
-import org.apache.felix.sandbox.preferences.BackingStore;
-import org.apache.felix.sandbox.preferences.PreferencesDescription;
-import org.apache.felix.sandbox.preferences.PreferencesImpl;
+import org.apache.felix.prefs.BackingStore;
+import org.apache.felix.prefs.PreferencesDescription;
+import org.apache.felix.prefs.PreferencesImpl;
import org.osgi.framework.BundleContext;
import org.osgi.service.prefs.BackingStoreException;