From f68d85cea0e405e99458dac2ec469e901f32ed73 Mon Sep 17 00:00:00 2001
From: Harald Hoyer <harald@redhat.com>
Date: Wed, 14 Sep 2016 10:45:38 +0200
Subject: [PATCH] move

---
 opret-testapp/pom.xml                                     | 4 ++--
 .../{opretj/testapp => opret}/OPRETECEventListener.java   | 2 +-
 .../tcpid/{opretj/testapp => opret}/OPRETECParser.java    | 2 +-
 .../src/main/java/org/tcpid/opretj/testapp/App.java       | 1 +
 opret-testapp/src/main/resources/logback.xml              | 4 ++--
 .../org/tcpid/{opretj/testapp => opret}/TestCrypto.java   | 2 +-
 .../org/tcpid/{opretj/testapp => opret}/TestECA1.java     | 8 ++++----
 .../main/java/org/tcpid/opretj/OPRETHandlerInterface.java | 4 ----
 8 files changed, 12 insertions(+), 15 deletions(-)
 rename opret-testapp/src/main/java/org/tcpid/{opretj/testapp => opret}/OPRETECEventListener.java (78%)
 rename opret-testapp/src/main/java/org/tcpid/{opretj/testapp => opret}/OPRETECParser.java (99%)
 rename opret-testapp/src/test/java/org/tcpid/{opretj/testapp => opret}/TestCrypto.java (99%)
 rename opret-testapp/src/test/java/org/tcpid/{opretj/testapp => opret}/TestECA1.java (95%)

diff --git a/opret-testapp/pom.xml b/opret-testapp/pom.xml
index eb72b6e..9aa3486 100644
--- a/opret-testapp/pom.xml
+++ b/opret-testapp/pom.xml
@@ -80,7 +80,7 @@
 						<manifest>
 							<addClasspath>true</addClasspath>
 							<classpathPrefix>lib/</classpathPrefix>
-							<mainClass>org.tcpid.opretj.testapp.App</mainClass>
+							<mainClass>org.tcpid.opret.App</mainClass>
 						</manifest>
 					</archive>
 				</configuration>
@@ -129,7 +129,7 @@
 				<artifactId>exec-maven-plugin</artifactId>
 				<version>1.2.1</version>
 				<configuration>
-					<mainClass>org.tcpid.opretj.testapp.App</mainClass>
+					<mainClass>org.tcpid.opret.App</mainClass>
 					<!-- <systemProperties> <systemProperty> <key>logback.configurationFile</key> 
 						<value>${basedir}/opret-testapp/src/main/resources/logback.xml</value> </systemProperty> 
 						</systemProperties> -->
diff --git a/opret-testapp/src/main/java/org/tcpid/opretj/testapp/OPRETECEventListener.java b/opret-testapp/src/main/java/org/tcpid/opret/OPRETECEventListener.java
similarity index 78%
rename from opret-testapp/src/main/java/org/tcpid/opretj/testapp/OPRETECEventListener.java
rename to opret-testapp/src/main/java/org/tcpid/opret/OPRETECEventListener.java
index a81275d..84d6bdb 100644
--- a/opret-testapp/src/main/java/org/tcpid/opretj/testapp/OPRETECEventListener.java
+++ b/opret-testapp/src/main/java/org/tcpid/opret/OPRETECEventListener.java
@@ -1,4 +1,4 @@
-package org.tcpid.opretj.testapp;
+package org.tcpid.opret;
 
 import org.tcpid.key.MasterVerifyKey;
 
diff --git a/opret-testapp/src/main/java/org/tcpid/opretj/testapp/OPRETECParser.java b/opret-testapp/src/main/java/org/tcpid/opret/OPRETECParser.java
similarity index 99%
rename from opret-testapp/src/main/java/org/tcpid/opretj/testapp/OPRETECParser.java
rename to opret-testapp/src/main/java/org/tcpid/opret/OPRETECParser.java
index 20df110..b65cb1a 100644
--- a/opret-testapp/src/main/java/org/tcpid/opretj/testapp/OPRETECParser.java
+++ b/opret-testapp/src/main/java/org/tcpid/opret/OPRETECParser.java
@@ -1,4 +1,4 @@
-package org.tcpid.opretj.testapp;
+package org.tcpid.opret;
 
 import static org.bitcoinj.script.ScriptOpCodes.OP_RETURN;
 import static org.libsodium.jni.NaCl.sodium;
diff --git a/opret-testapp/src/main/java/org/tcpid/opretj/testapp/App.java b/opret-testapp/src/main/java/org/tcpid/opretj/testapp/App.java
index a59b3c5..480d4d8 100644
--- a/opret-testapp/src/main/java/org/tcpid/opretj/testapp/App.java
+++ b/opret-testapp/src/main/java/org/tcpid/opretj/testapp/App.java
@@ -22,6 +22,7 @@ import org.libsodium.jni.crypto.Hash;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.tcpid.key.MasterSigningKey;
+import org.tcpid.opret.OPRETECParser;
 import org.tcpid.opretj.OPRETWallet;
 import org.tcpid.opretj.OPRETWalletAppKit;
 
diff --git a/opret-testapp/src/main/resources/logback.xml b/opret-testapp/src/main/resources/logback.xml
index cfdb991..ec2cc49 100644
--- a/opret-testapp/src/main/resources/logback.xml
+++ b/opret-testapp/src/main/resources/logback.xml
@@ -8,13 +8,13 @@
 			<pattern>%d{HH:mm:ss.SSS} [%thread] %-5level %logger{36} - %msg%n</pattern>
 		</encoder>
 	</appender>
-	<logger name="org.tcpid.opretj.testapp.App" level="debug" />
+	<logger name="org.tcpid.opret.App" level="debug" />
 	<logger name="org.bitcoinj.core.listeners.DownloadProgressTracker" level="info" />
 	<logger name="org.bitcoinj.core.PeerGroup" level="error" />
 	<logger name="org.bitcoinj.core.AbstractBlockChain" level="error" />
 	<logger name="org.bitcoinj.core.PeerSocketHandler" level="error" />
 	<logger name="org.bitcoinj.net.ConnectionHandler" level="error" />
-	<logger name="org.tcpid.opretj.testapp.OPRETECParser" level="debug" />
+	<logger name="org.tcpid.opret.OPRETECParser" level="debug" />
 <!-- 
 	<logger name="eckey.OPRETSimpleLogger" level="debug" />
 	<logger name="eckey.OPRETSimpleParser" level="debug" />
diff --git a/opret-testapp/src/test/java/org/tcpid/opretj/testapp/TestCrypto.java b/opret-testapp/src/test/java/org/tcpid/opret/TestCrypto.java
similarity index 99%
rename from opret-testapp/src/test/java/org/tcpid/opretj/testapp/TestCrypto.java
rename to opret-testapp/src/test/java/org/tcpid/opret/TestCrypto.java
index ed78b48..138173e 100644
--- a/opret-testapp/src/test/java/org/tcpid/opretj/testapp/TestCrypto.java
+++ b/opret-testapp/src/test/java/org/tcpid/opret/TestCrypto.java
@@ -1,4 +1,4 @@
-package org.tcpid.opretj.testapp;
+package org.tcpid.opret;
 
 import static org.junit.Assert.assertArrayEquals;
 import static org.junit.Assert.assertEquals;
diff --git a/opret-testapp/src/test/java/org/tcpid/opretj/testapp/TestECA1.java b/opret-testapp/src/test/java/org/tcpid/opret/TestECA1.java
similarity index 95%
rename from opret-testapp/src/test/java/org/tcpid/opretj/testapp/TestECA1.java
rename to opret-testapp/src/test/java/org/tcpid/opret/TestECA1.java
index ea01a75..442c0a3 100644
--- a/opret-testapp/src/test/java/org/tcpid/opretj/testapp/TestECA1.java
+++ b/opret-testapp/src/test/java/org/tcpid/opret/TestECA1.java
@@ -1,7 +1,7 @@
 /**
  *
  */
-package org.tcpid.opretj.testapp;
+package org.tcpid.opret;
 
 import static org.junit.Assert.assertArrayEquals;
 import static org.junit.Assert.assertFalse;
@@ -17,8 +17,8 @@ import org.libsodium.jni.encoders.Encoder;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.tcpid.key.MasterVerifyKey;
+import org.tcpid.opret.OPRETECParser;
 import org.tcpid.opretj.OPRETTransaction;
-import org.tcpid.opretj.testapp.OPRETECParser;
 
 import com.google.common.primitives.Bytes;
 
@@ -27,7 +27,7 @@ public class TestECA1 {
 
     /**
      * Test method for
-     * {@link org.tcpid.opretj.testapp.OPRETECParser#pushTransaction(org.tcpid.opretj.OPRETTransaction)}.
+     * {@link org.tcpid.opret.OPRETECParser#pushTransaction(org.tcpid.opretj.OPRETTransaction)}.
      */
     @Test
     public void testPushTransaction() {
@@ -101,7 +101,7 @@ public class TestECA1 {
 
     /**
      * Test method for
-     * {@link org.tcpid.opretj.testapp.OPRETECParser#pushTransaction(org.tcpid.opretj.OPRETTransaction)}.
+     * {@link org.tcpid.opret.OPRETECParser#pushTransaction(org.tcpid.opretj.OPRETTransaction)}.
      */
     @Test
     public void testPushTransactionWithNonce() {
diff --git a/opretj/src/main/java/org/tcpid/opretj/OPRETHandlerInterface.java b/opretj/src/main/java/org/tcpid/opretj/OPRETHandlerInterface.java
index 0fab3ee..02c6d90 100644
--- a/opretj/src/main/java/org/tcpid/opretj/OPRETHandlerInterface.java
+++ b/opretj/src/main/java/org/tcpid/opretj/OPRETHandlerInterface.java
@@ -6,8 +6,6 @@ import java.util.concurrent.Executor;
 
 public interface OPRETHandlerInterface {
 
-    // void addOPRET(byte[] magic, long earliestTime);
-
     void addOPRETChangeEventListener(Executor executor, OPRETChangeEventListener listener);
 
     long getEarliestElementCreationTime();
@@ -16,8 +14,6 @@ public interface OPRETHandlerInterface {
 
     Set<List<Byte>> getOPRETSet();
 
-    // void removeOPRET(byte[] magic);
-
     boolean pushTransaction(OPRETTransaction t);
 
     boolean removeOPRETChangeEventListener(OPRETChangeEventListener listener);