Move jsonrpc package to org.consensusj

bitcoinj-cli/src/main/java/com/msgilligan/bitcoinj/cli/BitcoinJCli.java

@@ -1,6 +1,6 @@
 package com.msgilligan.bitcoinj.cli;
 
-import com.msgilligan.jsonrpc.JsonRPCException;
+import org.consensusj.jsonrpc.JsonRPCException;
 
 import java.io.IOException;
 import java.util.ArrayList;

bitcoinj-cli/src/main/java/com/msgilligan/bitcoinj/cli/CliCommand.java

@@ -1,6 +1,6 @@
 package com.msgilligan.bitcoinj.cli;
 
-import com.msgilligan.jsonrpc.JsonRPCException;
+import org.consensusj.jsonrpc.JsonRPCException;
 import org.apache.commons.cli.CommandLine;
 import org.apache.commons.cli.CommandLineParser;
 import org.apache.commons.cli.DefaultParser;

bitcoinj-cli/src/main/java/com/msgilligan/bitcoinj/cli/GetBlockCount.java

@@ -1,6 +1,6 @@
 package com.msgilligan.bitcoinj.cli;
 
-import com.msgilligan.jsonrpc.JsonRPCException;
+import org.consensusj.jsonrpc.JsonRPCException;
 
 import java.io.IOException;
 

bitcoinj-cli/src/main/java/com/msgilligan/bitcoinj/cli/Status.java

@@ -2,7 +2,7 @@
 
 import com.msgilligan.bitcoinj.json.pojo.BlockChainInfo;
 import com.msgilligan.bitcoinj.json.pojo.NetworkInfo;
-import com.msgilligan.jsonrpc.JsonRPCException;
+import org.consensusj.jsonrpc.JsonRPCException;
 
 import java.io.IOException;
 

bitcoinj-proxy/src/main/java/com/msgilligan/bitcoinj/proxy/BitcoinRpcProxyModule.java

@@ -1,7 +1,7 @@
 package com.msgilligan.bitcoinj.proxy;
 
-import com.msgilligan.jsonrpc.ratpack.JsonRpcClientModule;
-import com.msgilligan.jsonrpc.ratpack.RpcProxyHandler;
+import org.consensusj.jsonrpc.ratpack.JsonRpcClientModule;
+import org.consensusj.jsonrpc.ratpack.RpcProxyHandler;
 
 /**
  * Guice Module to create handlers and client for JSON-RPC Proxy

bitcoinj-proxy/src/main/java/com/msgilligan/bitcoinj/proxy/ChainStatusHandler.java

@@ -1,7 +1,7 @@
 package com.msgilligan.bitcoinj.proxy;
 
-import com.msgilligan.jsonrpc.JsonRpcRequest;
-import com.msgilligan.jsonrpc.ratpack.JsonRpcClient;
+import org.consensusj.jsonrpc.JsonRpcRequest;
+import org.consensusj.jsonrpc.ratpack.JsonRpcClient;
 import ratpack.handling.Context;
 import ratpack.handling.Handler;
 

bitcoinj-proxy/src/main/java/com/msgilligan/bitcoinj/proxy/GenerateHandler.java

@@ -1,7 +1,7 @@
 package com.msgilligan.bitcoinj.proxy;
 
-import com.msgilligan.jsonrpc.JsonRpcRequest;
-import com.msgilligan.jsonrpc.ratpack.JsonRpcClient;
+import org.consensusj.jsonrpc.JsonRpcRequest;
+import org.consensusj.jsonrpc.ratpack.JsonRpcClient;
 import ratpack.handling.Context;
 import ratpack.handling.Handler;
 

bitcoinj-proxy/src/main/java/com/msgilligan/bitcoinj/proxy/ProxyMain.java

@@ -1,7 +1,7 @@
 package com.msgilligan.bitcoinj.proxy;
 
 import com.msgilligan.bitcoinj.rpc.RPCConfig;
-import com.msgilligan.jsonrpc.ratpack.RpcProxyHandler;
+import org.consensusj.jsonrpc.ratpack.RpcProxyHandler;
 import ratpack.guice.Guice;
 import ratpack.server.BaseDir;
 import ratpack.server.RatpackServer;

bitcoinj-proxy/src/main/java/com/msgilligan/jsonrpc/ratpack/JsonRpcClient.java → bitcoinj-proxy/src/main/java/org/consensusj/jsonrpc/ratpack/JsonRpcClient.java

@@ -1,8 +1,8 @@
-package com.msgilligan.jsonrpc.ratpack;
+package org.consensusj.jsonrpc.ratpack;
 
 import com.fasterxml.jackson.databind.JsonNode;
-import com.msgilligan.jsonrpc.JsonRpcRequest;
-import com.msgilligan.jsonrpc.JsonRpcResponse;
+import org.consensusj.jsonrpc.JsonRpcRequest;
+import org.consensusj.jsonrpc.JsonRpcResponse;
 import ratpack.exec.Promise;
 import retrofit2.http.Body;
 import retrofit2.http.POST;

bitcoinj-proxy/src/main/java/com/msgilligan/jsonrpc/ratpack/JsonRpcClientModule.java → bitcoinj-proxy/src/main/java/org/consensusj/jsonrpc/ratpack/JsonRpcClientModule.java

@@ -1,11 +1,11 @@
-package com.msgilligan.jsonrpc.ratpack;
+package org.consensusj.jsonrpc.ratpack;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.datatype.jdk8.Jdk8Module;
 import com.google.inject.Provides;
 import com.msgilligan.bitcoinj.json.conversion.RpcClientModule;
 import com.msgilligan.bitcoinj.json.conversion.RpcServerModule;
-import com.msgilligan.jsonrpc.ratpack.authext.BasicAuthCallFactory;
+import org.consensusj.jsonrpc.ratpack.authext.BasicAuthCallFactory;
 import com.msgilligan.bitcoinj.rpc.RPCConfig;
 import ratpack.guice.ConfigurableModule;
 import ratpack.retrofit.RatpackRetrofit;

bitcoinj-proxy/src/main/java/com/msgilligan/jsonrpc/ratpack/RpcProxyHandler.java → bitcoinj-proxy/src/main/java/org/consensusj/jsonrpc/ratpack/RpcProxyHandler.java

@@ -1,6 +1,6 @@
-package com.msgilligan.jsonrpc.ratpack;
+package org.consensusj.jsonrpc.ratpack;
 
-import com.msgilligan.jsonrpc.JsonRpcRequest;
+import org.consensusj.jsonrpc.JsonRpcRequest;
 import ratpack.handling.Context;
 import ratpack.handling.Handler;
 

bitcoinj-proxy/src/main/java/com/msgilligan/jsonrpc/ratpack/authext/BasicAuthCallFactory.java → bitcoinj-proxy/src/main/java/org/consensusj/jsonrpc/ratpack/authext/BasicAuthCallFactory.java

@@ -1,6 +1,6 @@
-package com.msgilligan.jsonrpc.ratpack.authext;
+package org.consensusj.jsonrpc.ratpack.authext;
 
-import com.msgilligan.jsonrpc.util.Base64;
+import org.consensusj.jsonrpc.util.Base64;
 import okhttp3.Call;
 import okhttp3.Request;
 import ratpack.retrofit.internal.RatpackCallFactory;

bitcoinj-proxy/src/main/java/com/msgilligan/jsonrpc/ratpack/package-info.java → bitcoinj-proxy/src/main/java/org/consensusj/jsonrpc/ratpack/package-info.java

@@ -1,4 +1,4 @@
 /**
  * An asynchronous JSON-RPC client for Ratpack (using Jackson and Retrofit)
  */
-package com.msgilligan.jsonrpc.ratpack;
+package org.consensusj.jsonrpc.ratpack;

bitcoinj-rpcclient/src/integ/groovy/com/msgilligan/bitcoinj/BaseMainNetTestSpec.groovy

@@ -1,7 +1,7 @@
 package com.msgilligan.bitcoinj
 
 import com.msgilligan.bitcoinj.rpc.BitcoinExtendedClient
-import com.msgilligan.jsonrpc.Loggable
+import org.consensusj.jsonrpc.Loggable
 import com.msgilligan.bitcoinj.rpc.RPCURI
 import com.msgilligan.bitcoinj.rpc.test.TestServers
 import com.msgilligan.bitcoinj.test.BTCTestSupport

bitcoinj-rpcclient/src/integ/groovy/com/msgilligan/bitcoinj/BaseRegTestSpec.groovy

@@ -1,7 +1,7 @@
 package com.msgilligan.bitcoinj
 
 import com.msgilligan.bitcoinj.rpc.BitcoinExtendedClient
-import com.msgilligan.jsonrpc.Loggable
+import org.consensusj.jsonrpc.Loggable
 import com.msgilligan.bitcoinj.rpc.RPCURI
 import com.msgilligan.bitcoinj.test.BTCTestSupport
 import com.msgilligan.bitcoinj.test.RegTestFundingSource

bitcoinj-rpcclient/src/integ/groovy/com/msgilligan/bitcoinj/alpha/AlphaSpec.groovy

@@ -1,6 +1,6 @@
 package com.msgilligan.bitcoinj.alpha
 
-import com.msgilligan.jsonrpc.DynamicRPCClient
+import org.consensusj.jsonrpc.DynamicRPCClient
 import com.msgilligan.bitcoinj.rpc.RPCURI
 import com.msgilligan.bitcoinj.rpc.test.TestServers
 import org.bitcoinj.core.Address

bitcoinj-rpcclient/src/integ/groovy/com/msgilligan/bitcoinj/integ/WalletSendSpec.groovy

@@ -1,6 +1,6 @@
 package com.msgilligan.bitcoinj.integ
 
-import com.msgilligan.jsonrpc.JsonRPCStatusException
+import org.consensusj.jsonrpc.JsonRPCStatusException
 import org.bitcoinj.core.Address
 import org.bitcoinj.core.BlockChain
 import org.bitcoinj.core.Coin

bitcoinj-rpcclient/src/integ/groovy/com/msgilligan/bitcoinj/rpc/DynamicRPCClientSpec.groovy

@@ -1,8 +1,8 @@
 package com.msgilligan.bitcoinj.rpc
 
 import com.msgilligan.bitcoinj.rpc.test.TestServers
-import com.msgilligan.jsonrpc.DynamicRPCClient
-import com.msgilligan.jsonrpc.JsonRPCStatusException
+import org.consensusj.jsonrpc.DynamicRPCClient
+import org.consensusj.jsonrpc.JsonRPCStatusException
 import spock.lang.Ignore
 import spock.lang.Shared
 import spock.lang.Specification

bitcoinj-rpcclient/src/main/groovy/com/msgilligan/bitcoinj/rpc/BitcoinScriptingClient.groovy

@@ -1,7 +1,7 @@
 package com.msgilligan.bitcoinj.rpc
 
 import com.msgilligan.bitcoinj.rpc.bitcoind.BitcoinConfFile
-import com.msgilligan.jsonrpc.DynamicRPCFallback
+import org.consensusj.jsonrpc.DynamicRPCFallback
 
 /**
  * Bitcoin RPC client for scripting

bitcoinj-rpcclient/src/main/groovy/com/msgilligan/bitcoinj/rpc/BlockchainSyncing.groovy

@@ -1,6 +1,6 @@
 package com.msgilligan.bitcoinj.rpc
 
-import com.msgilligan.jsonrpc.Loggable
+import org.consensusj.jsonrpc.Loggable
 
 /**
  * Wait for synchronization with a reference source of block height.

bitcoinj-rpcclient/src/main/groovy/com/msgilligan/bitcoinj/test/BTCTestSupport.groovy

@@ -1,7 +1,7 @@
 package com.msgilligan.bitcoinj.test
 
 import com.msgilligan.bitcoinj.rpc.BitcoinClientDelegate
-import com.msgilligan.jsonrpc.Loggable
+import org.consensusj.jsonrpc.Loggable
 import com.msgilligan.bitcoinj.json.conversion.BitcoinMath
 import org.bitcoinj.core.Coin
 

bitcoinj-rpcclient/src/main/groovy/com/msgilligan/bitcoinj/test/JTransactionTestSupport.groovy

@@ -1,7 +1,7 @@
 package com.msgilligan.bitcoinj.test
 
 import com.msgilligan.bitcoinj.json.pojo.RawTransactionInfo
-import com.msgilligan.jsonrpc.JsonRPCStatusException
+import org.consensusj.jsonrpc.JsonRPCStatusException
 import org.bitcoinj.core.Coin
 import org.bitcoinj.core.PeerGroup
 import org.bitcoinj.core.Sha256Hash

bitcoinj-rpcclient/src/main/groovy/com/msgilligan/ethereum/rpc/EthereumScriptingClient.groovy

@@ -1,6 +1,6 @@
 package com.msgilligan.ethereum.rpc
 
-import com.msgilligan.jsonrpc.DynamicRPCFallback
+import org.consensusj.jsonrpc.DynamicRPCFallback
 
 /**
  * Use `methodMissing` to implement Ethereum RPC calls dynamically

bitcoinj-rpcclient/src/main/groovy/com/msgilligan/namecoinj/rpc/NamecoinScriptingClient.groovy

@@ -1,6 +1,6 @@
 package com.msgilligan.namecoinj.rpc
 
-import com.msgilligan.jsonrpc.DynamicRPCFallback
+import org.consensusj.jsonrpc.DynamicRPCFallback
 
 /**
  * Namecoin RPC client for scripting

bitcoinj-rpcclient/src/main/groovy/com/msgilligan/jsonrpc/DynamicRPCClient.groovy → bitcoinj-rpcclient/src/main/groovy/org/consensusj/jsonrpc/DynamicRPCClient.groovy

@@ -1,5 +1,4 @@
-package com.msgilligan.jsonrpc
-
+package org.consensusj.jsonrpc
 /**
  * Use Groovy <code>methodMissing</code> to allow *any* JSON-RPC call to be made
  * as <code>client.rpcMethod(args)</code>. Note that calling a non-existent method

bitcoinj-rpcclient/src/main/groovy/com/msgilligan/jsonrpc/DynamicRPCFallback.groovy → bitcoinj-rpcclient/src/main/groovy/org/consensusj/jsonrpc/DynamicRPCFallback.groovy

@@ -1,5 +1,4 @@
-package com.msgilligan.jsonrpc
-
+package org.consensusj.jsonrpc
 /**
  * Trait for adding dynamic RPC method fallback to any RPC client
  */
@@ -12,7 +11,7 @@ trait DynamicRPCFallback implements UntypedRPCClient {
      * @param name The JSON-RPC method name
      * @param args JSON-RPC arguments
      * @return an object containing the JSON-RPC response.result
-     * @throws com.msgilligan.jsonrpc.JsonRPCStatusException
+     * @throws org.consensusj.jsonrpc.JsonRPCStatusException
      */
     def methodMissing(String name, def args) {
         Object result = this.send(name, args as List)

bitcoinj-rpcclient/src/main/groovy/com/msgilligan/jsonrpc/Loggable.groovy → bitcoinj-rpcclient/src/main/groovy/org/consensusj/jsonrpc/Loggable.groovy

@@ -1,4 +1,4 @@
-package com.msgilligan.jsonrpc
+package org.consensusj.jsonrpc
 
 import org.slf4j.Logger
 import org.slf4j.LoggerFactory

bitcoinj-rpcclient/src/main/java/com/msgilligan/bitcoinj/rpc/BitcoinClient.java

@@ -17,9 +17,9 @@
 import com.msgilligan.bitcoinj.json.pojo.UnspentOutput;
 import com.msgilligan.bitcoinj.json.conversion.RpcClientModule;
 import com.msgilligan.bitcoinj.json.pojo.WalletTransactionInfo;
-import com.msgilligan.jsonrpc.JsonRPCException;
-import com.msgilligan.jsonrpc.JsonRPCStatusException;
-import com.msgilligan.jsonrpc.RPCClient;
+import org.consensusj.jsonrpc.JsonRPCException;
+import org.consensusj.jsonrpc.JsonRPCStatusException;
+import org.consensusj.jsonrpc.RPCClient;
 import org.bitcoinj.core.Address;
 import org.bitcoinj.core.Block;
 import org.bitcoinj.core.Coin;

bitcoinj-rpcclient/src/main/java/com/msgilligan/bitcoinj/rpc/BitcoinExtendedClient.java

@@ -3,7 +3,7 @@
 import com.msgilligan.bitcoinj.json.pojo.Outpoint;
 import com.msgilligan.bitcoinj.json.pojo.SignedRawTransaction;
 import com.msgilligan.bitcoinj.json.pojo.UnspentOutput;
-import com.msgilligan.jsonrpc.JsonRPCStatusException;
+import org.consensusj.jsonrpc.JsonRPCStatusException;
 import org.bitcoinj.core.Address;
 import org.bitcoinj.core.Coin;
 import org.bitcoinj.core.ECKey;

bitcoinj-rpcclient/src/main/java/com/msgilligan/bitcoinj/test/RegTestEnvironment.java

@@ -1,7 +1,7 @@
 package com.msgilligan.bitcoinj.test;
 
 import com.msgilligan.bitcoinj.rpc.BitcoinClient;
-import com.msgilligan.jsonrpc.JsonRPCException;
+import org.consensusj.jsonrpc.JsonRPCException;
 import org.bitcoinj.core.Sha256Hash;
 
 import java.io.IOException;

bitcoinj-rpcclient/src/main/java/com/msgilligan/bitcoinj/test/RegTestFundingSource.java

@@ -1,7 +1,7 @@
 package com.msgilligan.bitcoinj.test;
 
 import com.msgilligan.bitcoinj.rpc.BitcoinExtendedClient;
-import com.msgilligan.jsonrpc.JsonRPCException;
+import org.consensusj.jsonrpc.JsonRPCException;
 import com.msgilligan.bitcoinj.json.pojo.Outpoint;
 import com.msgilligan.bitcoinj.json.pojo.SignedRawTransaction;
 import com.msgilligan.bitcoinj.json.pojo.TxOutInfo;

bitcoinj-rpcclient/src/main/java/com/msgilligan/ethereum/rpc/EthereumClient.java

@@ -1,8 +1,8 @@
 package com.msgilligan.ethereum.rpc;
 
-import com.msgilligan.jsonrpc.JsonRPCStatusException;
-import com.msgilligan.jsonrpc.JsonRpcRequest;
-import com.msgilligan.jsonrpc.RPCClient;
+import org.consensusj.jsonrpc.JsonRPCStatusException;
+import org.consensusj.jsonrpc.JsonRpcRequest;
+import org.consensusj.jsonrpc.RPCClient;
 
 import java.io.IOException;
 import java.math.BigInteger;

bitcoinj-rpcclient/src/main/java/com/msgilligan/namecoinj/cli/NmcLookup.java

@@ -1,6 +1,6 @@
 package com.msgilligan.namecoinj.cli;
 
-import com.msgilligan.jsonrpc.JsonRPCStatusException;
+import org.consensusj.jsonrpc.JsonRPCStatusException;
 import com.msgilligan.namecoinj.json.pojo.NameData;
 import com.msgilligan.namecoinj.rpc.NamecoinClient;
 import org.bitcoinj.core.Address;

bitcoinj-rpcclient/src/main/java/com/msgilligan/namecoinj/rpc/NamecoinClient.java

@@ -1,7 +1,7 @@
 package com.msgilligan.namecoinj.rpc;
 
 import com.msgilligan.bitcoinj.rpc.BitcoinClient;
-import com.msgilligan.jsonrpc.JsonRPCStatusException;
+import org.consensusj.jsonrpc.JsonRPCStatusException;
 import com.msgilligan.bitcoinj.rpc.RPCConfig;
 import com.msgilligan.bitcoinj.rpc.bitcoind.AppDataDirectory;
 import com.msgilligan.bitcoinj.rpc.bitcoind.BitcoinConfFile;

bitcoinj-rpcclient/src/main/java/com/msgilligan/jsonrpc/AbstractRPCClient.java → bitcoinj-rpcclient/src/main/java/org/consensusj/jsonrpc/AbstractRPCClient.java

@@ -1,4 +1,4 @@
-package com.msgilligan.jsonrpc;
+package org.consensusj.jsonrpc;
 
 import com.fasterxml.jackson.databind.JavaType;
 import com.fasterxml.jackson.databind.ObjectMapper;

bitcoinj-rpcclient/src/main/java/com/msgilligan/jsonrpc/JsonRPCException.java → bitcoinj-rpcclient/src/main/java/org/consensusj/jsonrpc/JsonRPCException.java

@@ -1,4 +1,4 @@
-package com.msgilligan.jsonrpc;
+package org.consensusj.jsonrpc;
 
 import java.io.IOException;
 

bitcoinj-rpcclient/src/main/java/com/msgilligan/jsonrpc/JsonRPCStatusException.java → bitcoinj-rpcclient/src/main/java/org/consensusj/jsonrpc/JsonRPCStatusException.java

@@ -1,4 +1,4 @@
-package com.msgilligan.jsonrpc;
+package org.consensusj.jsonrpc;
 
 /**
  * JSON-RPC returned HTTP status other than 200

bitcoinj-rpcclient/src/main/java/com/msgilligan/jsonrpc/JsonRpcError.java → bitcoinj-rpcclient/src/main/java/org/consensusj/jsonrpc/JsonRpcError.java

@@ -1,4 +1,4 @@
-package com.msgilligan.jsonrpc;
+package org.consensusj.jsonrpc;
 
 /**
  * JSON-RPC Error Object POJO

bitcoinj-rpcclient/src/main/java/com/msgilligan/jsonrpc/JsonRpcRequest.java → bitcoinj-rpcclient/src/main/java/org/consensusj/jsonrpc/JsonRpcRequest.java

@@ -1,4 +1,4 @@
-package com.msgilligan.jsonrpc;
+package org.consensusj.jsonrpc;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
 import com.fasterxml.jackson.annotation.JsonProperty;

bitcoinj-rpcclient/src/main/java/com/msgilligan/jsonrpc/JsonRpcResponse.java → bitcoinj-rpcclient/src/main/java/org/consensusj/jsonrpc/JsonRpcResponse.java

@@ -1,4 +1,4 @@
-package com.msgilligan.jsonrpc;
+package org.consensusj.jsonrpc;
 
 /**
  * = JSON-RPC Response POJO

bitcoinj-rpcclient/src/main/java/com/msgilligan/jsonrpc/RPCClient.java → bitcoinj-rpcclient/src/main/java/org/consensusj/jsonrpc/RPCClient.java

@@ -1,9 +1,9 @@
-package com.msgilligan.jsonrpc;
+package org.consensusj.jsonrpc;
 
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.JavaType;
 import com.msgilligan.bitcoinj.rpc.BitcoinClient;
-import com.msgilligan.jsonrpc.util.Base64;
+import org.consensusj.jsonrpc.util.Base64;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

bitcoinj-rpcclient/src/main/java/com/msgilligan/jsonrpc/UntypedRPCClient.java → bitcoinj-rpcclient/src/main/java/org/consensusj/jsonrpc/UntypedRPCClient.java

@@ -1,4 +1,4 @@
-package com.msgilligan.jsonrpc;
+package org.consensusj.jsonrpc;
 
 import java.io.IOException;
 import java.util.List;

bitcoinj-rpcclient/src/main/java/com/msgilligan/jsonrpc/package-info.java → bitcoinj-rpcclient/src/main/java/org/consensusj/jsonrpc/package-info.java

@@ -26,4 +26,4 @@
  * ....
  *
  */
-package com.msgilligan.jsonrpc;
+package org.consensusj.jsonrpc;

bitcoinj-rpcclient/src/main/java/com/msgilligan/jsonrpc/util/Base64.java → bitcoinj-rpcclient/src/main/java/org/consensusj/jsonrpc/util/Base64.java

@@ -17,7 +17,7 @@
 //package android.util;
 /* Copy of android.util.Base64 for use with rpc */
 
-package com.msgilligan.jsonrpc.util;
+package org.consensusj.jsonrpc.util;
 import java.io.UnsupportedEncodingException;
 
 /**

bitcoinj-rpcclient/src/main/java/com/msgilligan/jsonrpc/util/package-info.java → bitcoinj-rpcclient/src/main/java/org/consensusj/jsonrpc/util/package-info.java

@@ -1,4 +1,4 @@
 /**
  * Utility support classes for JSON-RPC
  */
-package com.msgilligan.jsonrpc.util;
+package org.consensusj.jsonrpc.util;