Qortal/qortal
1
0
Fork 1
mirror of https://github.com/Qortal/qortal.git synced 2025-07-23 04:36:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

initial work towards OSGi

Browse Source 
refactored packages so they all start with org.qora

added some attempt at OSGi mega bundle using Maven (doesn't work)
This commit is contained in:
catbref
2019-01-04 10:19:33 +00:00
parent 9e425d3877
commit 5c6e239d76
209 changed files with 1325 additions and 1320 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/test/java/test/ATTests.java → src/test/java/org/qora/test/ATTests.java
View File

@@ -1,6 +1,18 @@
package test;
package org.qora.test;
import org.junit.jupiter.api.Test;
import org.qora.asset.Asset;
import org.qora.data.at.ATStateData;
import org.qora.data.block.BlockData;
import org.qora.data.block.BlockTransactionData;
import org.qora.data.transaction.DeployATTransactionData;
import org.qora.repository.DataException;
import org.qora.repository.Repository;
import org.qora.repository.RepositoryManager;
import org.qora.transaction.DeployATTransaction;
import org.qora.transform.TransformationException;
import org.qora.utils.Base58;
import static org.junit.jupiter.api.Assertions.*;
import java.math.BigDecimal;
@@ -8,18 +20,6 @@ import java.util.Arrays;
import com.google.common.hash.HashCode;
import data.at.ATStateData;
import data.block.BlockData;
import data.block.BlockTransactionData;
import data.transaction.DeployATTransactionData;
import qora.assets.Asset;
import qora.transaction.DeployATTransaction;
import repository.DataException;
import repository.Repository;
import repository.RepositoryManager;
import transform.TransformationException;
import utils.Base58;
public class ATTests extends Common {
@Test

2
src/test/java/test/BTCACCTTests.java → src/test/java/org/qora/test/BTCACCTTests.java
View File

@@ -1,4 +1,4 @@
package test;
package org.qora.test;
import java.io.File;
import java.net.UnknownHostException;

5
src/test/java/test/BTCTests.java → src/test/java/org/qora/test/BTCTests.java
View File

@@ -1,13 +1,12 @@
package test;
package org.qora.test;
import org.bitcoinj.script.Script;
import org.bitcoinj.script.ScriptBuilder;
import org.junit.Test;
import org.qora.crosschain.BTC;
import com.google.common.hash.HashCode;
import crosschain.BTC;
public class BTCTests {
@Test

24
src/test/java/test/BlockTests.java → src/test/java/org/qora/test/BlockTests.java
View File

@@ -1,21 +1,21 @@
package test;
package org.qora.test;
import java.math.BigDecimal;
import java.util.List;
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.*;
import org.qora.block.Block;
import org.qora.block.GenesisBlock;
import org.qora.data.block.BlockData;
import org.qora.data.transaction.TransactionData;
import org.qora.repository.DataException;
import org.qora.repository.Repository;
import org.qora.repository.RepositoryManager;
import org.qora.transaction.Transaction;
import org.qora.transform.TransformationException;
import org.qora.transform.block.BlockTransformer;
import data.block.BlockData;
import data.transaction.TransactionData;
import qora.block.Block;
import qora.block.GenesisBlock;
import qora.transaction.Transaction;
import repository.DataException;
import repository.Repository;
import repository.RepositoryManager;
import transform.TransformationException;
import transform.block.BlockTransformer;
import static org.junit.jupiter.api.Assertions.*;
public class BlockTests extends Common {

7
src/test/java/test/BlockchainTests.java → src/test/java/org/qora/test/BlockchainTests.java
View File

@@ -1,9 +1,8 @@
package test;
package org.qora.test;
import org.junit.jupiter.api.Test;
import qora.block.BlockChain;
import repository.DataException;
import org.qora.block.BlockChain;
import org.qora.repository.DataException;
public class BlockchainTests extends Common {

15
src/test/java/test/Common.java → src/test/java/org/qora/test/Common.java
View File

@@ -1,16 +1,13 @@
package test;
package org.qora.test;
import org.junit.jupiter.api.BeforeAll;
import controller.Controller;
import org.qora.controller.Controller;
import org.qora.repository.DataException;
import org.qora.repository.RepositoryFactory;
import org.qora.repository.RepositoryManager;
import org.qora.repository.hsqldb.HSQLDBRepositoryFactory;
import org.junit.jupiter.api.AfterAll;
import repository.DataException;
import repository.RepositoryFactory;
import repository.RepositoryManager;
import repository.hsqldb.HSQLDBRepositoryFactory;
public class Common {
@BeforeAll

16
src/test/java/test/CompatibilityTests.java → src/test/java/org/qora/test/CompatibilityTests.java
View File

@@ -1,17 +1,17 @@
package test;
package org.qora.test;
import org.junit.jupiter.api.Test;
import org.qora.data.transaction.TransactionData;
import org.qora.transaction.CreateOrderTransaction;
import org.qora.transaction.CreatePollTransaction;
import org.qora.transaction.IssueAssetTransaction;
import org.qora.transform.TransformationException;
import org.qora.transform.transaction.TransactionTransformer;
import static org.junit.jupiter.api.Assertions.*;
import com.google.common.hash.HashCode;
import data.transaction.TransactionData;
import qora.transaction.CreateOrderTransaction;
import qora.transaction.CreatePollTransaction;
import qora.transaction.IssueAssetTransaction;
import transform.TransformationException;
import transform.transaction.TransactionTransformer;
public class CompatibilityTests {
@Test

6
src/test/java/test/CryptoTests.java → src/test/java/org/qora/test/CryptoTests.java
View File

@@ -1,12 +1,12 @@
package test;
package org.qora.test;
import org.junit.jupiter.api.Test;
import org.qora.crypto.Crypto;
import static org.junit.jupiter.api.Assertions.*;
import com.google.common.hash.HashCode;
import qora.crypto.Crypto;
public class CryptoTests {
@Test

6
src/test/java/test/ExceptionTests.java → src/test/java/org/qora/test/ExceptionTests.java
View File

@@ -1,9 +1,9 @@
package test;
package org.qora.test;
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.*;
import org.qora.block.Block;
import qora.block.Block;
import static org.junit.jupiter.api.Assertions.*;
public class ExceptionTests {

26
src/test/java/test/GenesisTests.java → src/test/java/org/qora/test/GenesisTests.java
View File

@@ -1,25 +1,25 @@
package test;
package org.qora.test;
import java.math.BigDecimal;
import java.util.List;
import org.junit.jupiter.api.Test;
import org.qora.account.Account;
import org.qora.asset.Asset;
import org.qora.block.Block;
import org.qora.block.GenesisBlock;
import org.qora.data.transaction.TransactionData;
import org.qora.repository.DataException;
import org.qora.repository.Repository;
import org.qora.repository.RepositoryFactory;
import org.qora.repository.RepositoryManager;
import org.qora.repository.hsqldb.HSQLDBRepositoryFactory;
import org.qora.transaction.Transaction;
import static org.junit.jupiter.api.Assertions.*;
import org.junit.jupiter.api.BeforeAll;
import org.junit.jupiter.api.AfterAll;
import data.transaction.TransactionData;
import qora.account.Account;
import qora.assets.Asset;
import qora.block.Block;
import qora.block.GenesisBlock;
import qora.transaction.Transaction;
import repository.DataException;
import repository.Repository;
import repository.RepositoryFactory;
import repository.RepositoryManager;
import repository.hsqldb.HSQLDBRepositoryFactory;
// Don't extend Common as we want an in-memory database
public class GenesisTests {

22
src/test/java/test/LoadTests.java → src/test/java/org/qora/test/LoadTests.java
View File

@@ -1,17 +1,17 @@
package test;
package org.qora.test;
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.*;
import org.qora.account.PublicKeyAccount;
import org.qora.data.transaction.PaymentTransactionData;
import org.qora.data.transaction.TransactionData;
import org.qora.repository.DataException;
import org.qora.repository.Repository;
import org.qora.repository.RepositoryManager;
import org.qora.repository.TransactionRepository;
import org.qora.transaction.Transaction.TransactionType;
import org.qora.utils.Base58;
import data.transaction.PaymentTransactionData;
import data.transaction.TransactionData;
import qora.account.PublicKeyAccount;
import qora.transaction.Transaction.TransactionType;
import repository.DataException;
import repository.Repository;
import repository.RepositoryManager;
import repository.TransactionRepository;
import utils.Base58;
import static org.junit.jupiter.api.Assertions.*;
public class LoadTests extends Common {

20
src/test/java/test/NavigationTests.java → src/test/java/org/qora/test/NavigationTests.java
View File

@@ -1,16 +1,16 @@
package test;
package org.qora.test;
import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.*;
import org.qora.data.block.BlockData;
import org.qora.data.transaction.TransactionData;
import org.qora.repository.DataException;
import org.qora.repository.Repository;
import org.qora.repository.RepositoryManager;
import org.qora.repository.TransactionRepository;
import org.qora.transaction.Transaction.TransactionType;
import org.qora.utils.Base58;
import data.block.BlockData;
import data.transaction.TransactionData;
import qora.transaction.Transaction.TransactionType;
import repository.DataException;
import repository.Repository;
import repository.RepositoryManager;
import repository.TransactionRepository;
import utils.Base58;
import static org.junit.jupiter.api.Assertions.*;
public class NavigationTests extends Common {

10
src/test/java/test/RepositoryTests.java → src/test/java/org/qora/test/RepositoryTests.java
View File

@@ -1,15 +1,15 @@
package test;
package org.qora.test;
import org.junit.jupiter.api.Test;
import org.qora.repository.DataException;
import org.qora.repository.Repository;
import org.qora.repository.RepositoryManager;
import static org.junit.jupiter.api.Assertions.*;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import repository.DataException;
import repository.Repository;
import repository.RepositoryManager;
public class RepositoryTests extends Common {
private static final Logger LOGGER = LogManager.getLogger(RepositoryTests.class);

15
src/test/java/test/SaveTests.java → src/test/java/org/qora/test/SaveTests.java
View File

@@ -1,16 +1,15 @@
package test;
package org.qora.test;
import java.math.BigDecimal;
import java.time.Instant;
import org.junit.jupiter.api.Test;
import data.transaction.PaymentTransactionData;
import qora.account.PublicKeyAccount;
import repository.DataException;
import repository.Repository;
import repository.RepositoryManager;
import utils.Base58;
import org.qora.account.PublicKeyAccount;
import org.qora.data.transaction.PaymentTransactionData;
import org.qora.repository.DataException;
import org.qora.repository.Repository;
import org.qora.repository.RepositoryManager;
import org.qora.utils.Base58;
public class SaveTests extends Common {

30
src/test/java/test/SerializationTests.java → src/test/java/org/qora/test/SerializationTests.java
View File

@@ -1,25 +1,25 @@
package test;
package org.qora.test;
import org.junit.jupiter.api.Test;
import org.qora.block.Block;
import org.qora.block.GenesisBlock;
import org.qora.data.block.BlockData;
import org.qora.data.transaction.GenesisTransactionData;
import org.qora.data.transaction.TransactionData;
import org.qora.repository.DataException;
import org.qora.repository.Repository;
import org.qora.repository.RepositoryManager;
import org.qora.transaction.GenesisTransaction;
import org.qora.transaction.Transaction;
import org.qora.transaction.Transaction.TransactionType;
import org.qora.transform.TransformationException;
import org.qora.transform.transaction.TransactionTransformer;
import static org.junit.jupiter.api.Assertions.*;
import java.util.Arrays;
import java.util.List;
import data.block.BlockData;
import data.transaction.GenesisTransactionData;
import data.transaction.TransactionData;
import qora.block.Block;
import qora.block.GenesisBlock;
import qora.transaction.GenesisTransaction;
import qora.transaction.Transaction;
import qora.transaction.Transaction.TransactionType;
import repository.DataException;
import repository.Repository;
import repository.RepositoryManager;
import transform.TransformationException;
import transform.transaction.TransactionTransformer;
public class SerializationTests extends Common {
@Test

22
src/test/java/test/SignatureTests.java → src/test/java/org/qora/test/SignatureTests.java
View File

@@ -1,20 +1,20 @@
package test;
package org.qora.test;
import org.junit.jupiter.api.Test;
import org.qora.account.PrivateKeyAccount;
import org.qora.block.Block;
import org.qora.block.GenesisBlock;
import org.qora.data.block.BlockData;
import org.qora.repository.DataException;
import org.qora.repository.Repository;
import org.qora.repository.RepositoryManager;
import org.qora.utils.Base58;
import org.qora.utils.NTP;
import static org.junit.jupiter.api.Assertions.*;
import java.math.BigDecimal;
import data.block.BlockData;
import qora.account.PrivateKeyAccount;
import qora.block.Block;
import qora.block.GenesisBlock;
import repository.DataException;
import repository.Repository;
import repository.RepositoryManager;
import utils.Base58;
import utils.NTP;
public class SignatureTests extends Common {
@Test

114
src/test/java/test/TransactionTests.java → src/test/java/org/qora/test/TransactionTests.java
View File

@@ -1,6 +1,62 @@
package test;
package org.qora.test;
import org.junit.jupiter.api.Test;
import org.qora.account.Account;
import org.qora.account.PrivateKeyAccount;
import org.qora.account.PublicKeyAccount;
import org.qora.asset.Asset;
import org.qora.block.Block;
import org.qora.block.BlockChain;
import org.qora.data.PaymentData;
import org.qora.data.account.AccountBalanceData;
import org.qora.data.account.AccountData;
import org.qora.data.asset.AssetData;
import org.qora.data.asset.OrderData;
import org.qora.data.asset.TradeData;
import org.qora.data.block.BlockData;
import org.qora.data.naming.NameData;
import org.qora.data.transaction.BuyNameTransactionData;
import org.qora.data.transaction.CancelOrderTransactionData;
import org.qora.data.transaction.CancelSellNameTransactionData;
import org.qora.data.transaction.CreateOrderTransactionData;
import org.qora.data.transaction.CreatePollTransactionData;
import org.qora.data.transaction.IssueAssetTransactionData;
import org.qora.data.transaction.MessageTransactionData;
import org.qora.data.transaction.MultiPaymentTransactionData;
import org.qora.data.transaction.PaymentTransactionData;
import org.qora.data.transaction.RegisterNameTransactionData;
import org.qora.data.transaction.SellNameTransactionData;
import org.qora.data.transaction.TransferAssetTransactionData;
import org.qora.data.transaction.UpdateNameTransactionData;
import org.qora.data.transaction.VoteOnPollTransactionData;
import org.qora.data.voting.PollData;
import org.qora.data.voting.PollOptionData;
import org.qora.data.voting.VoteOnPollData;
import org.qora.repository.AccountRepository;
import org.qora.repository.AssetRepository;
import org.qora.repository.DataException;
import org.qora.repository.Repository;
import org.qora.repository.RepositoryFactory;
import org.qora.repository.RepositoryManager;
import org.qora.repository.hsqldb.HSQLDBRepositoryFactory;
import org.qora.settings.Settings;
import org.qora.transaction.BuyNameTransaction;
import org.qora.transaction.CancelOrderTransaction;
import org.qora.transaction.CancelSellNameTransaction;
import org.qora.transaction.CreateOrderTransaction;
import org.qora.transaction.CreatePollTransaction;
import org.qora.transaction.IssueAssetTransaction;
import org.qora.transaction.MessageTransaction;
import org.qora.transaction.MultiPaymentTransaction;
import org.qora.transaction.PaymentTransaction;
import org.qora.transaction.RegisterNameTransaction;
import org.qora.transaction.SellNameTransaction;
import org.qora.transaction.Transaction;
import org.qora.transaction.TransferAssetTransaction;
import org.qora.transaction.UpdateNameTransaction;
import org.qora.transaction.VoteOnPollTransaction;
import org.qora.transaction.Transaction.ValidationResult;
import static org.junit.jupiter.api.Assertions.*;
import org.junit.jupiter.api.AfterEach;
@@ -15,62 +71,6 @@ import org.json.simple.JSONObject;
import com.google.common.hash.HashCode;
import data.PaymentData;
import data.account.AccountBalanceData;
import data.account.AccountData;
import data.assets.AssetData;
import data.assets.OrderData;
import data.assets.TradeData;
import data.block.BlockData;
import data.naming.NameData;
import data.transaction.BuyNameTransactionData;
import data.transaction.CancelOrderTransactionData;
import data.transaction.CancelSellNameTransactionData;
import data.transaction.CreateOrderTransactionData;
import data.transaction.CreatePollTransactionData;
import data.transaction.IssueAssetTransactionData;
import data.transaction.MessageTransactionData;
import data.transaction.MultiPaymentTransactionData;
import data.transaction.PaymentTransactionData;
import data.transaction.RegisterNameTransactionData;
import data.transaction.SellNameTransactionData;
import data.transaction.TransferAssetTransactionData;
import data.transaction.UpdateNameTransactionData;
import data.transaction.VoteOnPollTransactionData;
import data.voting.PollData;
import data.voting.PollOptionData;
import data.voting.VoteOnPollData;
import qora.account.Account;
import qora.account.PrivateKeyAccount;
import qora.account.PublicKeyAccount;
import qora.assets.Asset;
import qora.block.Block;
import qora.block.BlockChain;
import qora.transaction.BuyNameTransaction;
import qora.transaction.CancelOrderTransaction;
import qora.transaction.CancelSellNameTransaction;
import qora.transaction.CreateOrderTransaction;
import qora.transaction.CreatePollTransaction;
import qora.transaction.IssueAssetTransaction;
import qora.transaction.MessageTransaction;
import qora.transaction.MultiPaymentTransaction;
import qora.transaction.PaymentTransaction;
import qora.transaction.RegisterNameTransaction;
import qora.transaction.SellNameTransaction;
import qora.transaction.Transaction;
import qora.transaction.Transaction.ValidationResult;
import qora.transaction.TransferAssetTransaction;
import qora.transaction.UpdateNameTransaction;
import qora.transaction.VoteOnPollTransaction;
import repository.AccountRepository;
import repository.AssetRepository;
import repository.DataException;
import repository.Repository;
import repository.RepositoryFactory;
import repository.RepositoryManager;
import repository.hsqldb.HSQLDBRepositoryFactory;
import settings.Settings;
// Don't extend Common as we want to use an in-memory database
public class TransactionTests {

2
src/test/java/test/utils/AssertExtensions.java → src/test/java/org/qora/test/utils/AssertExtensions.java
View File

@@ -1,4 +1,4 @@
package test.utils;
package org.qora.test.utils;
import java.util.Collection;