Rebase code

Author: Ferdinand Xu

conf/benchmark.properties.template

@@ -20,5 +20,5 @@ dataSize            1073741824
 operationSize       8192
 
 bufferSize          20
-cipherClasses       com.intel.chimera.cipher.OpensslCipher,com.intel.chimera.cipher.JceCipher
+cipherClasses       org.apache.commons.crypto.cipher.OpensslCipher,org.apache.commons.crypto.cipher.JceCipher
 transformations     AES/CTR/NoPadding,AES/CBC/NoPadding

…/chimera/benchmark/ChimeraBenchmark.java …to/benchmark/CommonsCryptoBenchmark.javasrc/test/java/com/intel/chimera/benchmark/ChimeraBenchmark.java renamed to src/test/java/org/apache/commons/crypto/benchmark/CommonsCryptoBenchmark.java src/test/java/com/intel/chimera/benchmark/ChimeraBenchmark.java renamed to src/test/java/org/apache/commons/crypto/benchmark/CommonsCryptoBenchmark.java

@@ -15,16 +15,16 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.intel.chimera.benchmark;
+package org.apache.commons.crypto.benchmark;
 
-import com.intel.chimera.benchmark.option.BenchmarkOption;
-import com.intel.chimera.benchmark.option.StreamOption;
-import com.intel.chimera.cipher.CipherTransformation;
+import org.apache.commons.crypto.benchmark.option.BenchmarkOption;
+import org.apache.commons.crypto.benchmark.option.StreamOption;
+import org.apache.commons.crypto.cipher.CipherTransformation;
 
 import java.io.*;
 import java.util.Properties;
 
-public class ChimeraBenchmark {
+public class CommonsCryptoBenchmark {
   static String defaultConfigPath = "./conf/benchmark.properties";
 
   public static void main(String[] args) throws IOException {
@@ -33,12 +33,7 @@ public static void main(String[] args) throws IOException {
 
     if (args != null && args.length != 0 && args.length != 1 && args.length != 4) {
       System.out.println(
-          "Usage: java -Djava.library.path=\"$PATH\" -cp " +
-              "ChimeraBenchmark-[version].jar:path/to/Chimera/target/test-classes/ com.intel.chimera.benchmark" +
-              ".ChimeraBenchmark [warmupIterations] [iterations] [dataSize] " +
-              "[operationSize] or java -Djava.library.path=\"$PATH\" -cp " +
-              "himeraBenchmark-[version].jar:path/to/Chimera/target/test-classes/ com.intel.chimera.benchmark" +
-              ".ChimeraBenchmark [path/to/configuration]");
+          "Usage: java -Djava.library.path=\"$PATH\" -cp commons-crypto-[version].jar:path/to//target/test-classes/ org.apache.commons.crypto.CommonsCryptoBenchmark [warmupIterations] [iterations] [dataSize] [operationSize] or java -Djava.library.path=\"$PATH\" -cp commons-crypto-[version].jar:path/to/Chimera/target/test-classes/ org.apache.commons.crypto.CommonsCryptoBenchmark [path/to/configuration]");
       System.out.println("args[0]: " + args[0]);
       System.exit(1);
     }
@@ -59,7 +54,7 @@ public static void main(String[] args) throws IOException {
       } else {
         System.out.println(
             "can not find the configuration file under the current path");
-        inputStream = ChimeraBenchmark.class.getClassLoader()
+        inputStream = CommonsCryptoBenchmark.class.getClassLoader()
             .getResourceAsStream(propFileName);
       }
       prop.load(inputStream);
@@ -105,9 +100,8 @@ public static void main(String[] args) throws IOException {
         .getProperty(
             "transformations") : ("AES/CTR/NoPadding,AES/CBC/NoPadding");
     String cipherClazzNames = (prop.contains("cipherClasses")) ? prop
-        .getProperty(
-            "cipherClasses") : ("com.intel.chimera.cipher.OpensslCipher,com" +
-        ".intel.chimera.cipher.JceCipher");
+        .getProperty("cipherClasses") : ("org.apache.commons.crypto.cipher" +
+        ".OpensslCipher,org.apache.commons.crypto.cipher.JceCipher");
     int bufferSize = (prop.containsKey("bufferSize")) ? Integer
         .parseInt(prop.getProperty("bufferSize")) : (512 * 1024);
     for (String t : transformations.split(",")) {

…era/benchmark/CryptoStreamBenchmark.java …pto/benchmark/CryptoStreamBenchmark.javasrc/test/java/com/intel/chimera/benchmark/CryptoStreamBenchmark.java renamed to src/test/java/org/apache/commons/crypto/benchmark/CryptoStreamBenchmark.java src/test/java/com/intel/chimera/benchmark/CryptoStreamBenchmark.java renamed to src/test/java/org/apache/commons/crypto/benchmark/CryptoStreamBenchmark.java

@@ -15,13 +15,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.intel.chimera.benchmark;
+package org.apache.commons.crypto.benchmark;
 
-import com.intel.chimera.benchmark.option.BenchmarkOption;
-import com.intel.chimera.benchmark.option.StreamOption;
-import com.intel.chimera.conf.ConfigurationKeys;
-import com.intel.chimera.stream.CryptoInputStream;
-import com.intel.chimera.stream.CryptoOutputStream;
+import org.apache.commons.crypto.benchmark.option.BenchmarkOption;
+import org.apache.commons.crypto.benchmark.option.StreamOption;
+import org.apache.commons.crypto.conf.ConfigurationKeys;
+import org.apache.commons.crypto.stream.CryptoInputStream;
+import org.apache.commons.crypto.stream.CryptoOutputStream;
 
 import java.io.*;
 import java.util.Calendar;

…ra/benchmark/option/BenchmarkOption.java …to/benchmark/option/BenchmarkOption.javasrc/test/java/com/intel/chimera/benchmark/option/BenchmarkOption.java renamed to src/test/java/org/apache/commons/crypto/benchmark/option/BenchmarkOption.java src/test/java/com/intel/chimera/benchmark/option/BenchmarkOption.java renamed to src/test/java/org/apache/commons/crypto/benchmark/option/BenchmarkOption.java

@@ -15,7 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.intel.chimera.benchmark.option;
+package org.apache.commons.crypto.benchmark.option;
 
 public class BenchmarkOption {
   public int dataSize;

…imera/benchmark/option/StreamOption.java …rypto/benchmark/option/StreamOption.javasrc/test/java/com/intel/chimera/benchmark/option/StreamOption.java renamed to src/test/java/org/apache/commons/crypto/benchmark/option/StreamOption.java src/test/java/com/intel/chimera/benchmark/option/StreamOption.java renamed to src/test/java/org/apache/commons/crypto/benchmark/option/StreamOption.java

@@ -15,9 +15,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.intel.chimera.benchmark.option;
+package org.apache.commons.crypto.benchmark.option;
 
-import com.intel.chimera.cipher.CipherTransformation;
+import org.apache.commons.crypto.cipher.CipherTransformation;
 
 public class StreamOption {