Package name shuffle.

eloquent · May 27, 2014 · 088ab00 · 088ab00
1 parent a7c20ee
commit 088ab00
Show file tree

Hide file tree

Showing 12 changed files with 39 additions and 12 deletions.
diff --git a/...a/co/lqnt/lockbox/key/DerivedKeyData.java → ...t/lockbox/key/deriver/DerivedKeyData.java b/...a/co/lqnt/lockbox/key/DerivedKeyData.java → ...t/lockbox/key/deriver/DerivedKeyData.java
@@ -7,8 +7,9 @@
  * that was distributed with this source code.
  */
 
-package co.lqnt.lockbox.key;
+package co.lqnt.lockbox.key.deriver;
 
+import co.lqnt.lockbox.key.KeyInterface;
 import java.util.ArrayList;
 import java.util.List;
 

diff --git a/.../lockbox/key/DerivedKeyDataInterface.java → .../key/deriver/DerivedKeyDataInterface.java b/.../lockbox/key/DerivedKeyDataInterface.java → .../key/deriver/DerivedKeyDataInterface.java
@@ -7,8 +7,9 @@
  * that was distributed with this source code.
  */
 
-package co.lqnt.lockbox.key;
+package co.lqnt.lockbox.key.deriver;
 
+import co.lqnt.lockbox.key.KeyInterface;
 import java.util.List;
 
 /**

diff --git a/.../java/co/lqnt/lockbox/key/KeyDeriver.java → .../lqnt/lockbox/key/deriver/KeyDeriver.java b/.../java/co/lqnt/lockbox/key/KeyDeriver.java → .../lqnt/lockbox/key/deriver/KeyDeriver.java
@@ -7,8 +7,11 @@
  * that was distributed with this source code.
  */
 
-package co.lqnt.lockbox.key;
+package co.lqnt.lockbox.key.deriver;
 
+import co.lqnt.lockbox.key.KeyInterface;
+import co.lqnt.lockbox.key.factory.KeyFactory;
+import co.lqnt.lockbox.key.factory.KeyFactoryInterface;
 import co.lqnt.lockbox.key.exception.InvalidIterationsException;
 import co.lqnt.lockbox.key.exception.InvalidKeyParameterException;
 import co.lqnt.lockbox.key.exception.InvalidSaltSizeException;

diff --git a/...lqnt/lockbox/key/KeyDeriverInterface.java → ...kbox/key/deriver/KeyDeriverInterface.java b/...lqnt/lockbox/key/KeyDeriverInterface.java → ...kbox/key/deriver/KeyDeriverInterface.java
@@ -7,8 +7,9 @@
  * that was distributed with this source code.
  */
 
-package co.lqnt.lockbox.key;
+package co.lqnt.lockbox.key.deriver;
 
+import co.lqnt.lockbox.key.KeyInterface;
 import co.lqnt.lockbox.key.exception.InvalidKeyParameterException;
 import java.util.List;
 

diff --git a/.../java/co/lqnt/lockbox/key/KeyFactory.java → .../lqnt/lockbox/key/factory/KeyFactory.java b/.../java/co/lqnt/lockbox/key/KeyFactory.java → .../lqnt/lockbox/key/factory/KeyFactory.java
@@ -7,8 +7,10 @@
  * that was distributed with this source code.
  */
 
-package co.lqnt.lockbox.key;
+package co.lqnt.lockbox.key.factory;
 
+import co.lqnt.lockbox.key.Key;
+import co.lqnt.lockbox.key.KeyInterface;
 import co.lqnt.lockbox.key.exception.InvalidKeyParameterException;
 import java.util.List;
 

diff --git a/...lqnt/lockbox/key/KeyFactoryInterface.java → ...kbox/key/factory/KeyFactoryInterface.java b/...lqnt/lockbox/key/KeyFactoryInterface.java → ...kbox/key/factory/KeyFactoryInterface.java
@@ -7,8 +7,9 @@
  * that was distributed with this source code.
  */
 
-package co.lqnt.lockbox.key;
+package co.lqnt.lockbox.key.factory;
 
+import co.lqnt.lockbox.key.KeyInterface;
 import co.lqnt.lockbox.key.exception.InvalidKeyParameterException;
 import java.util.List;
 

diff --git a/...ava/co/lqnt/lockbox/key/KeyGenerator.java → ...t/lockbox/key/generator/KeyGenerator.java b/...ava/co/lqnt/lockbox/key/KeyGenerator.java → ...t/lockbox/key/generator/KeyGenerator.java
@@ -7,8 +7,11 @@
  * that was distributed with this source code.
  */
 
-package co.lqnt.lockbox.key;
+package co.lqnt.lockbox.key.generator;
 
+import co.lqnt.lockbox.key.KeyInterface;
+import co.lqnt.lockbox.key.factory.KeyFactory;
+import co.lqnt.lockbox.key.factory.KeyFactoryInterface;
 import co.lqnt.lockbox.key.exception.InvalidAuthSecretSizeException;
 import co.lqnt.lockbox.key.exception.InvalidEncryptSecretSizeException;
 import co.lqnt.lockbox.key.exception.InvalidKeyParameterException;

diff --git a/...nt/lockbox/key/KeyGeneratorInterface.java → .../key/generator/KeyGeneratorInterface.java b/...nt/lockbox/key/KeyGeneratorInterface.java → .../key/generator/KeyGeneratorInterface.java
@@ -7,8 +7,9 @@
  * that was distributed with this source code.
  */
 
-package co.lqnt.lockbox.key;
+package co.lqnt.lockbox.key.generator;
 
+import co.lqnt.lockbox.key.KeyInterface;
 import co.lqnt.lockbox.key.exception.InvalidKeyParameterException;
 
 /**

diff --git a/.../lqnt/lockbox/key/DerivedKeyDataTest.java → ...ckbox/key/deriver/DerivedKeyDataTest.java b/.../lqnt/lockbox/key/DerivedKeyDataTest.java → ...ckbox/key/deriver/DerivedKeyDataTest.java
@@ -7,8 +7,11 @@
  * that was distributed with this source code.
  */
 
-package co.lqnt.lockbox.key;
+package co.lqnt.lockbox.key.deriver;
 
+import co.lqnt.lockbox.key.Key;
+import co.lqnt.lockbox.key.KeyInterface;
+import co.lqnt.lockbox.key.deriver.DerivedKeyData;
 import com.google.common.primitives.Bytes;
 import java.nio.charset.Charset;
 import java.util.List;

diff --git a/...a/co/lqnt/lockbox/key/KeyDeriverTest.java → ...t/lockbox/key/deriver/KeyDeriverTest.java b/...a/co/lqnt/lockbox/key/KeyDeriverTest.java → ...t/lockbox/key/deriver/KeyDeriverTest.java
@@ -7,8 +7,13 @@
  * that was distributed with this source code.
  */
 
-package co.lqnt.lockbox.key;
+package co.lqnt.lockbox.key.deriver;
 
+import co.lqnt.lockbox.key.KeyInterface;
+import co.lqnt.lockbox.key.deriver.KeyDeriver;
+import co.lqnt.lockbox.key.deriver.DerivedKeyDataInterface;
+import co.lqnt.lockbox.key.factory.KeyFactoryInterface;
+import co.lqnt.lockbox.key.factory.KeyFactory;
 import co.lqnt.lockbox.key.exception.InvalidIterationsException;
 import co.lqnt.lockbox.key.exception.InvalidSaltSizeException;
 import co.lqnt.lockbox.random.RandomSourceInterface;

diff --git a/...a/co/lqnt/lockbox/key/KeyFactoryTest.java → ...t/lockbox/key/factory/KeyFactoryTest.java b/...a/co/lqnt/lockbox/key/KeyFactoryTest.java → ...t/lockbox/key/factory/KeyFactoryTest.java
@@ -7,8 +7,10 @@
  * that was distributed with this source code.
  */
 
-package co.lqnt.lockbox.key;
+package co.lqnt.lockbox.key.factory;
 
+import co.lqnt.lockbox.key.KeyInterface;
+import co.lqnt.lockbox.key.factory.KeyFactory;
 import com.google.common.primitives.Bytes;
 import java.nio.charset.Charset;
 import java.util.List;

diff --git a/...co/lqnt/lockbox/key/KeyGeneratorTest.java → ...ckbox/key/generator/KeyGeneratorTest.java b/...co/lqnt/lockbox/key/KeyGeneratorTest.java → ...ckbox/key/generator/KeyGeneratorTest.java
@@ -7,8 +7,12 @@
  * that was distributed with this source code.
  */
 
-package co.lqnt.lockbox.key;
+package co.lqnt.lockbox.key.generator;
 
+import co.lqnt.lockbox.key.KeyInterface;
+import co.lqnt.lockbox.key.generator.KeyGenerator;
+import co.lqnt.lockbox.key.factory.KeyFactoryInterface;
+import co.lqnt.lockbox.key.factory.KeyFactory;
 import co.lqnt.lockbox.key.exception.InvalidAuthSecretSizeException;
 import co.lqnt.lockbox.key.exception.InvalidEncryptSecretSizeException;
 import co.lqnt.lockbox.random.RandomSourceInterface;