From a7539c68e615b748c3d8e3fda7c06f06c4a0f852 Mon Sep 17 00:00:00 2001
From: Roberto Cirillo <roberto.cirillo@isti.cnr.it>
Date: Thu, 7 Feb 2013 11:34:38 +0000
Subject: [PATCH] update package naming

git-svn-id: https://svn.d4science.research-infrastructures.eu/gcube/trunk/Common/common-encryption@68963 82a268e6-3cf1-43bd-a215-b396298e98cf
---
 .../org/gcube/common/{utils => }/encryption/IEncrypter.java  | 2 +-
 .../org/gcube/common/{utils => }/encryption/KeyFactory.java  | 2 +-
 .../common/{utils => }/encryption/KeySerialization.java      | 2 +-
 .../gcube/common/{utils => }/encryption/StringEncrypter.java | 2 +-
 .../gcube/common/{utils => }/encryption/SymmetricKey.java    | 2 +-
 .../gcube/common/{utils => }/encryption/keytool/KeyTool.java | 2 +-
 .../gcube/common/{utils => }/encryption/KeyFactoryTest.java  | 3 ++-
 .../gcube/common/{utils => }/encryption/LocalKeyTest.java    | 3 ++-
 .../common/{utils => }/encryption/StringEncrypterTest.java   | 5 +++--
 .../common/{utils => }/encryption/SymmetricKeyTest.java      | 3 ++-
 10 files changed, 15 insertions(+), 11 deletions(-)
 rename src/main/java/org/gcube/common/{utils => }/encryption/IEncrypter.java (94%)
 rename src/main/java/org/gcube/common/{utils => }/encryption/KeyFactory.java (96%)
 rename src/main/java/org/gcube/common/{utils => }/encryption/KeySerialization.java (97%)
 rename src/main/java/org/gcube/common/{utils => }/encryption/StringEncrypter.java (97%)
 rename src/main/java/org/gcube/common/{utils => }/encryption/SymmetricKey.java (98%)
 rename src/main/java/org/gcube/common/{utils => }/encryption/keytool/KeyTool.java (99%)
 rename src/test/java/org/gcube/common/{utils => }/encryption/KeyFactoryTest.java (93%)
 rename src/test/java/org/gcube/common/{utils => }/encryption/LocalKeyTest.java (85%)
 rename src/test/java/org/gcube/common/{utils => }/encryption/StringEncrypterTest.java (90%)
 rename src/test/java/org/gcube/common/{utils => }/encryption/SymmetricKeyTest.java (95%)

diff --git a/src/main/java/org/gcube/common/utils/encryption/IEncrypter.java b/src/main/java/org/gcube/common/encryption/IEncrypter.java
similarity index 94%
rename from src/main/java/org/gcube/common/utils/encryption/IEncrypter.java
rename to src/main/java/org/gcube/common/encryption/IEncrypter.java
index 4a9357c..0852e3c 100644
--- a/src/main/java/org/gcube/common/utils/encryption/IEncrypter.java
+++ b/src/main/java/org/gcube/common/encryption/IEncrypter.java
@@ -1,4 +1,4 @@
-package org.gcube.common.utils.encryption;
+package org.gcube.common.encryption;
 
 import java.security.Key;
 
diff --git a/src/main/java/org/gcube/common/utils/encryption/KeyFactory.java b/src/main/java/org/gcube/common/encryption/KeyFactory.java
similarity index 96%
rename from src/main/java/org/gcube/common/utils/encryption/KeyFactory.java
rename to src/main/java/org/gcube/common/encryption/KeyFactory.java
index f9e2bb9..b047e4a 100644
--- a/src/main/java/org/gcube/common/utils/encryption/KeyFactory.java
+++ b/src/main/java/org/gcube/common/encryption/KeyFactory.java
@@ -1,4 +1,4 @@
-package org.gcube.common.utils.encryption;
+package org.gcube.common.encryption;
 
 import javax.crypto.KeyGenerator;
 import javax.crypto.SecretKey;
diff --git a/src/main/java/org/gcube/common/utils/encryption/KeySerialization.java b/src/main/java/org/gcube/common/encryption/KeySerialization.java
similarity index 97%
rename from src/main/java/org/gcube/common/utils/encryption/KeySerialization.java
rename to src/main/java/org/gcube/common/encryption/KeySerialization.java
index 2eeb60e..dedceba 100644
--- a/src/main/java/org/gcube/common/utils/encryption/KeySerialization.java
+++ b/src/main/java/org/gcube/common/encryption/KeySerialization.java
@@ -1,4 +1,4 @@
-package org.gcube.common.utils.encryption;
+package org.gcube.common.encryption;
 
 import java.io.File;
 import java.io.FileInputStream;
diff --git a/src/main/java/org/gcube/common/utils/encryption/StringEncrypter.java b/src/main/java/org/gcube/common/encryption/StringEncrypter.java
similarity index 97%
rename from src/main/java/org/gcube/common/utils/encryption/StringEncrypter.java
rename to src/main/java/org/gcube/common/encryption/StringEncrypter.java
index af82a20..eb402a2 100644
--- a/src/main/java/org/gcube/common/utils/encryption/StringEncrypter.java
+++ b/src/main/java/org/gcube/common/encryption/StringEncrypter.java
@@ -1,4 +1,4 @@
-package org.gcube.common.utils.encryption;
+package org.gcube.common.encryption;
 
 import javax.crypto.Cipher;
 import java.security.Key;
diff --git a/src/main/java/org/gcube/common/utils/encryption/SymmetricKey.java b/src/main/java/org/gcube/common/encryption/SymmetricKey.java
similarity index 98%
rename from src/main/java/org/gcube/common/utils/encryption/SymmetricKey.java
rename to src/main/java/org/gcube/common/encryption/SymmetricKey.java
index 4715bae..4ff89b8 100644
--- a/src/main/java/org/gcube/common/utils/encryption/SymmetricKey.java
+++ b/src/main/java/org/gcube/common/encryption/SymmetricKey.java
@@ -1,4 +1,4 @@
-package org.gcube.common.utils.encryption;
+package org.gcube.common.encryption;
 
 import java.io.ByteArrayOutputStream;
 import java.io.IOException;
diff --git a/src/main/java/org/gcube/common/utils/encryption/keytool/KeyTool.java b/src/main/java/org/gcube/common/encryption/keytool/KeyTool.java
similarity index 99%
rename from src/main/java/org/gcube/common/utils/encryption/keytool/KeyTool.java
rename to src/main/java/org/gcube/common/encryption/keytool/KeyTool.java
index 209d8fc..b8930a5 100644
--- a/src/main/java/org/gcube/common/utils/encryption/keytool/KeyTool.java
+++ b/src/main/java/org/gcube/common/encryption/keytool/KeyTool.java
@@ -1,4 +1,4 @@
-package org.gcube.common.utils.encryption.keytool;
+package org.gcube.common.encryption.keytool;
 
 import java.io.IOException;
 import java.io.FileInputStream;
diff --git a/src/test/java/org/gcube/common/utils/encryption/KeyFactoryTest.java b/src/test/java/org/gcube/common/encryption/KeyFactoryTest.java
similarity index 93%
rename from src/test/java/org/gcube/common/utils/encryption/KeyFactoryTest.java
rename to src/test/java/org/gcube/common/encryption/KeyFactoryTest.java
index 6df3fb5..db9b48e 100644
--- a/src/test/java/org/gcube/common/utils/encryption/KeyFactoryTest.java
+++ b/src/test/java/org/gcube/common/encryption/KeyFactoryTest.java
@@ -1,9 +1,10 @@
-package org.gcube.common.utils.encryption;
+package org.gcube.common.encryption;
 
 import static org.junit.Assert.*;
 
 
 
+import org.gcube.common.encryption.KeyFactory;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Test;
diff --git a/src/test/java/org/gcube/common/utils/encryption/LocalKeyTest.java b/src/test/java/org/gcube/common/encryption/LocalKeyTest.java
similarity index 85%
rename from src/test/java/org/gcube/common/utils/encryption/LocalKeyTest.java
rename to src/test/java/org/gcube/common/encryption/LocalKeyTest.java
index 1a5e694..410f10c 100644
--- a/src/test/java/org/gcube/common/utils/encryption/LocalKeyTest.java
+++ b/src/test/java/org/gcube/common/encryption/LocalKeyTest.java
@@ -1,9 +1,10 @@
-package org.gcube.common.utils.encryption;
+package org.gcube.common.encryption;
 
 import static org.junit.Assert.*;
 
 import java.security.InvalidKeyException;
 
+import org.gcube.common.encryption.SymmetricKey;
 import org.gcube.common.scope.api.ScopeProvider;
 import org.junit.BeforeClass;
 import org.junit.Test;
diff --git a/src/test/java/org/gcube/common/utils/encryption/StringEncrypterTest.java b/src/test/java/org/gcube/common/encryption/StringEncrypterTest.java
similarity index 90%
rename from src/test/java/org/gcube/common/utils/encryption/StringEncrypterTest.java
rename to src/test/java/org/gcube/common/encryption/StringEncrypterTest.java
index 73155a2..34ab3ec 100644
--- a/src/test/java/org/gcube/common/utils/encryption/StringEncrypterTest.java
+++ b/src/test/java/org/gcube/common/encryption/StringEncrypterTest.java
@@ -1,9 +1,10 @@
-package org.gcube.common.utils.encryption;
+package org.gcube.common.encryption;
 
 import static org.junit.Assert.*;
 
+import org.gcube.common.encryption.StringEncrypter;
+import org.gcube.common.encryption.SymmetricKey;
 import org.gcube.common.scope.api.ScopeProvider;
-import org.gcube.common.utils.encryption.StringEncrypter;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
 import org.junit.Test;
diff --git a/src/test/java/org/gcube/common/utils/encryption/SymmetricKeyTest.java b/src/test/java/org/gcube/common/encryption/SymmetricKeyTest.java
similarity index 95%
rename from src/test/java/org/gcube/common/utils/encryption/SymmetricKeyTest.java
rename to src/test/java/org/gcube/common/encryption/SymmetricKeyTest.java
index fe514e5..394baf6 100644
--- a/src/test/java/org/gcube/common/utils/encryption/SymmetricKeyTest.java
+++ b/src/test/java/org/gcube/common/encryption/SymmetricKeyTest.java
@@ -1,4 +1,4 @@
-package org.gcube.common.utils.encryption;
+package org.gcube.common.encryption;
 
 import static org.junit.Assert.*;
 
@@ -9,6 +9,7 @@ import java.security.Key;
 import javax.crypto.spec.SecretKeySpec;
 
 //import org.apache.xml.security.utils.JavaUtils;
+import org.gcube.common.encryption.SymmetricKey;
 import org.gcube.common.scope.api.ScopeProvider;
 import org.junit.AfterClass;
 import org.junit.BeforeClass;