From 51ca0128a7a1a14d0c6d244e4fda25733df50022 Mon Sep 17 00:00:00 2001 From: Chris Beams Date: Fri, 11 Feb 2011 15:47:51 +0700 Subject: [PATCH] Consolidate source dirs for ease of browsing --- build.gradle | 12 ++++++++++++ .../{java => }/com/bank/config/code/DataConfig.java | 0 .../com/bank/config/code/JndiDataConfig.java | 0 .../com/bank/config/code/StandaloneDataConfig.java | 0 .../com/bank/config/code/TransferServiceConfig.java | 0 .../{resources => }/com/bank/config/sql/schema.sql | 0 .../com/bank/config/sql/test-data.sql | 0 .../com/bank/config/xml/transfer-service-config.xml | 0 src/main/{java => }/com/bank/domain/Account.java | 0 .../com/bank/domain/InsufficientFundsException.java | 0 .../{java => }/com/bank/domain/TransferReceipt.java | 0 .../bank/repository/AccountNotFoundException.java | 0 .../com/bank/repository/AccountRepository.java | 0 .../repository/internal/JdbcAccountRepository.java | 0 .../repository/internal/SimpleAccountRepository.java | 0 src/main/{java => }/com/bank/service/FeePolicy.java | 0 .../{java => }/com/bank/service/TransferService.java | 0 .../service/internal/DefaultTransferService.java | 0 .../com/bank/service/internal/FlatFeePolicy.java | 0 .../com/bank/service/internal/VariableFeePolicy.java | 0 .../com/bank/service/internal/ZeroFeePolicy.java | 0 src/main/{resources => }/log4j.properties | 0 .../com/bank/config/code/IntegrationTests.java | 0 .../com/bank/config/xml/IntegrationTests.java | 0 .../internal/DefaultTransferServiceTests.java | 0 .../service/internal/VariableFeePolicyTests.java | 0 26 files changed, 12 insertions(+) rename src/main/{java => }/com/bank/config/code/DataConfig.java (100%) rename src/main/{java => }/com/bank/config/code/JndiDataConfig.java (100%) rename src/main/{java => }/com/bank/config/code/StandaloneDataConfig.java (100%) rename src/main/{java => }/com/bank/config/code/TransferServiceConfig.java (100%) rename src/main/{resources => }/com/bank/config/sql/schema.sql (100%) rename src/main/{resources => }/com/bank/config/sql/test-data.sql (100%) rename src/main/{resources => }/com/bank/config/xml/transfer-service-config.xml (100%) rename src/main/{java => }/com/bank/domain/Account.java (100%) rename src/main/{java => }/com/bank/domain/InsufficientFundsException.java (100%) rename src/main/{java => }/com/bank/domain/TransferReceipt.java (100%) rename src/main/{java => }/com/bank/repository/AccountNotFoundException.java (100%) rename src/main/{java => }/com/bank/repository/AccountRepository.java (100%) rename src/main/{java => }/com/bank/repository/internal/JdbcAccountRepository.java (100%) rename src/main/{java => }/com/bank/repository/internal/SimpleAccountRepository.java (100%) rename src/main/{java => }/com/bank/service/FeePolicy.java (100%) rename src/main/{java => }/com/bank/service/TransferService.java (100%) rename src/main/{java => }/com/bank/service/internal/DefaultTransferService.java (100%) rename src/main/{java => }/com/bank/service/internal/FlatFeePolicy.java (100%) rename src/main/{java => }/com/bank/service/internal/VariableFeePolicy.java (100%) rename src/main/{java => }/com/bank/service/internal/ZeroFeePolicy.java (100%) rename src/main/{resources => }/log4j.properties (100%) rename src/test/{java => }/com/bank/config/code/IntegrationTests.java (100%) rename src/test/{java => }/com/bank/config/xml/IntegrationTests.java (100%) rename src/test/{java => }/com/bank/service/internal/DefaultTransferServiceTests.java (100%) rename src/test/{java => }/com/bank/service/internal/VariableFeePolicyTests.java (100%) diff --git a/build.gradle b/build.gradle index b7eb214..d41964b 100644 --- a/build.gradle +++ b/build.gradle @@ -27,6 +27,18 @@ dependencies { sourceCompatibility = 1.6 targetCompatibility = 1.6 +// consolidate source directories for ease of browsing +sourceSets { + main { + java { srcDir 'src/main' } + resources { srcDir 'src/main' } + } + test { + java { srcDir 'src/test' } + resources { srcDir 'src/test' } + } +} + task wrapper(type: Wrapper) { group = 'Admin' description = "Generates gradlew and gradlew.bat bootstrap scripts" diff --git a/src/main/java/com/bank/config/code/DataConfig.java b/src/main/com/bank/config/code/DataConfig.java similarity index 100% rename from src/main/java/com/bank/config/code/DataConfig.java rename to src/main/com/bank/config/code/DataConfig.java diff --git a/src/main/java/com/bank/config/code/JndiDataConfig.java b/src/main/com/bank/config/code/JndiDataConfig.java similarity index 100% rename from src/main/java/com/bank/config/code/JndiDataConfig.java rename to src/main/com/bank/config/code/JndiDataConfig.java diff --git a/src/main/java/com/bank/config/code/StandaloneDataConfig.java b/src/main/com/bank/config/code/StandaloneDataConfig.java similarity index 100% rename from src/main/java/com/bank/config/code/StandaloneDataConfig.java rename to src/main/com/bank/config/code/StandaloneDataConfig.java diff --git a/src/main/java/com/bank/config/code/TransferServiceConfig.java b/src/main/com/bank/config/code/TransferServiceConfig.java similarity index 100% rename from src/main/java/com/bank/config/code/TransferServiceConfig.java rename to src/main/com/bank/config/code/TransferServiceConfig.java diff --git a/src/main/resources/com/bank/config/sql/schema.sql b/src/main/com/bank/config/sql/schema.sql similarity index 100% rename from src/main/resources/com/bank/config/sql/schema.sql rename to src/main/com/bank/config/sql/schema.sql diff --git a/src/main/resources/com/bank/config/sql/test-data.sql b/src/main/com/bank/config/sql/test-data.sql similarity index 100% rename from src/main/resources/com/bank/config/sql/test-data.sql rename to src/main/com/bank/config/sql/test-data.sql diff --git a/src/main/resources/com/bank/config/xml/transfer-service-config.xml b/src/main/com/bank/config/xml/transfer-service-config.xml similarity index 100% rename from src/main/resources/com/bank/config/xml/transfer-service-config.xml rename to src/main/com/bank/config/xml/transfer-service-config.xml diff --git a/src/main/java/com/bank/domain/Account.java b/src/main/com/bank/domain/Account.java similarity index 100% rename from src/main/java/com/bank/domain/Account.java rename to src/main/com/bank/domain/Account.java diff --git a/src/main/java/com/bank/domain/InsufficientFundsException.java b/src/main/com/bank/domain/InsufficientFundsException.java similarity index 100% rename from src/main/java/com/bank/domain/InsufficientFundsException.java rename to src/main/com/bank/domain/InsufficientFundsException.java diff --git a/src/main/java/com/bank/domain/TransferReceipt.java b/src/main/com/bank/domain/TransferReceipt.java similarity index 100% rename from src/main/java/com/bank/domain/TransferReceipt.java rename to src/main/com/bank/domain/TransferReceipt.java diff --git a/src/main/java/com/bank/repository/AccountNotFoundException.java b/src/main/com/bank/repository/AccountNotFoundException.java similarity index 100% rename from src/main/java/com/bank/repository/AccountNotFoundException.java rename to src/main/com/bank/repository/AccountNotFoundException.java diff --git a/src/main/java/com/bank/repository/AccountRepository.java b/src/main/com/bank/repository/AccountRepository.java similarity index 100% rename from src/main/java/com/bank/repository/AccountRepository.java rename to src/main/com/bank/repository/AccountRepository.java diff --git a/src/main/java/com/bank/repository/internal/JdbcAccountRepository.java b/src/main/com/bank/repository/internal/JdbcAccountRepository.java similarity index 100% rename from src/main/java/com/bank/repository/internal/JdbcAccountRepository.java rename to src/main/com/bank/repository/internal/JdbcAccountRepository.java diff --git a/src/main/java/com/bank/repository/internal/SimpleAccountRepository.java b/src/main/com/bank/repository/internal/SimpleAccountRepository.java similarity index 100% rename from src/main/java/com/bank/repository/internal/SimpleAccountRepository.java rename to src/main/com/bank/repository/internal/SimpleAccountRepository.java diff --git a/src/main/java/com/bank/service/FeePolicy.java b/src/main/com/bank/service/FeePolicy.java similarity index 100% rename from src/main/java/com/bank/service/FeePolicy.java rename to src/main/com/bank/service/FeePolicy.java diff --git a/src/main/java/com/bank/service/TransferService.java b/src/main/com/bank/service/TransferService.java similarity index 100% rename from src/main/java/com/bank/service/TransferService.java rename to src/main/com/bank/service/TransferService.java diff --git a/src/main/java/com/bank/service/internal/DefaultTransferService.java b/src/main/com/bank/service/internal/DefaultTransferService.java similarity index 100% rename from src/main/java/com/bank/service/internal/DefaultTransferService.java rename to src/main/com/bank/service/internal/DefaultTransferService.java diff --git a/src/main/java/com/bank/service/internal/FlatFeePolicy.java b/src/main/com/bank/service/internal/FlatFeePolicy.java similarity index 100% rename from src/main/java/com/bank/service/internal/FlatFeePolicy.java rename to src/main/com/bank/service/internal/FlatFeePolicy.java diff --git a/src/main/java/com/bank/service/internal/VariableFeePolicy.java b/src/main/com/bank/service/internal/VariableFeePolicy.java similarity index 100% rename from src/main/java/com/bank/service/internal/VariableFeePolicy.java rename to src/main/com/bank/service/internal/VariableFeePolicy.java diff --git a/src/main/java/com/bank/service/internal/ZeroFeePolicy.java b/src/main/com/bank/service/internal/ZeroFeePolicy.java similarity index 100% rename from src/main/java/com/bank/service/internal/ZeroFeePolicy.java rename to src/main/com/bank/service/internal/ZeroFeePolicy.java diff --git a/src/main/resources/log4j.properties b/src/main/log4j.properties similarity index 100% rename from src/main/resources/log4j.properties rename to src/main/log4j.properties diff --git a/src/test/java/com/bank/config/code/IntegrationTests.java b/src/test/com/bank/config/code/IntegrationTests.java similarity index 100% rename from src/test/java/com/bank/config/code/IntegrationTests.java rename to src/test/com/bank/config/code/IntegrationTests.java diff --git a/src/test/java/com/bank/config/xml/IntegrationTests.java b/src/test/com/bank/config/xml/IntegrationTests.java similarity index 100% rename from src/test/java/com/bank/config/xml/IntegrationTests.java rename to src/test/com/bank/config/xml/IntegrationTests.java diff --git a/src/test/java/com/bank/service/internal/DefaultTransferServiceTests.java b/src/test/com/bank/service/internal/DefaultTransferServiceTests.java similarity index 100% rename from src/test/java/com/bank/service/internal/DefaultTransferServiceTests.java rename to src/test/com/bank/service/internal/DefaultTransferServiceTests.java diff --git a/src/test/java/com/bank/service/internal/VariableFeePolicyTests.java b/src/test/com/bank/service/internal/VariableFeePolicyTests.java similarity index 100% rename from src/test/java/com/bank/service/internal/VariableFeePolicyTests.java rename to src/test/com/bank/service/internal/VariableFeePolicyTests.java