Restructure to standard maven/gradle layout.

7 years ago · 8db9931677
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,8 @@
 
				
				 /build/
			
 
				
				 /dist
			
 
				
				 /.gradle
			
 
				
				+
			
 
				
				+# Generated files created by IDEA
			
 
				
				+/src/*/generated
			
 
				
				+/src/*/generated_tests
			
 
				
				+
			
--- a/build.gradle
+++ b/build.gradle
@@ -8,16 +8,13 @@ group = 'com.dmdirc'
 
				
				 apply plugin: 'java'
			
 
				
				 apply plugin: 'maven-publish'
			
 
				
				 apply plugin: 'jacoco'
			
 
				
				+apply plugin: 'idea'
			
 
				
				 
			
 
				
				-
			
 
				
				-sourceSets {
			
 
				
				-    main {
			
 
				
				-        java.srcDirs = ['src']
			
 
				
				-        resources.srcDirs = ['res']
			
 
				
				-    }
			
 
				
				-    test {
			
 
				
				-        java.srcDirs = ['test']
			
 
				
				-        resources.srcDirs = ['test-res']
			
 
				
				+idea {
			
 
				
				+    module {
			
 
				
				+         sourceDirs += file('src/main/generated')
			
 
				
				+         testSourceDirs += file('src/test/generated_tests')
			
 
				
				+         generatedSourceDirs = [file('src/main/generated'), file('src/test/generated_tests')]
			
 
				
				     }
			
 
				
				 }
			
 
				
				 
			
--- a/src/main/java/com/dmdirc/util/CommandUtils.java
+++ b/src/main/java/com/dmdirc/util/CommandUtils.java
--- a/src/main/java/com/dmdirc/util/DateUtils.java
+++ b/src/main/java/com/dmdirc/util/DateUtils.java
--- a/src/main/java/com/dmdirc/util/StringUtils.java
+++ b/src/main/java/com/dmdirc/util/StringUtils.java
--- a/src/main/java/com/dmdirc/util/collections/CollectionFunctions.java
+++ b/src/main/java/com/dmdirc/util/collections/CollectionFunctions.java
--- a/src/main/java/com/dmdirc/util/collections/ListObserver.java
+++ b/src/main/java/com/dmdirc/util/collections/ListObserver.java
--- a/src/main/java/com/dmdirc/util/collections/ListenerList.java
+++ b/src/main/java/com/dmdirc/util/collections/ListenerList.java
--- a/src/main/java/com/dmdirc/util/collections/ObservableList.java
+++ b/src/main/java/com/dmdirc/util/collections/ObservableList.java
--- a/src/main/java/com/dmdirc/util/collections/ObservableListDecorator.java
+++ b/src/main/java/com/dmdirc/util/collections/ObservableListDecorator.java
--- a/src/main/java/com/dmdirc/util/collections/QueuedLinkedHashSet.java
+++ b/src/main/java/com/dmdirc/util/collections/QueuedLinkedHashSet.java
--- a/src/main/java/com/dmdirc/util/collections/RollingList.java
+++ b/src/main/java/com/dmdirc/util/collections/RollingList.java
--- a/src/main/java/com/dmdirc/util/colours/Colour.java
+++ b/src/main/java/com/dmdirc/util/colours/Colour.java
--- a/src/main/java/com/dmdirc/util/colours/ColourUtils.java
+++ b/src/main/java/com/dmdirc/util/colours/ColourUtils.java
--- a/src/main/java/com/dmdirc/util/functional/TriConsumer.java
+++ b/src/main/java/com/dmdirc/util/functional/TriConsumer.java
--- a/src/main/java/com/dmdirc/util/io/ConfigFile.java
+++ b/src/main/java/com/dmdirc/util/io/ConfigFile.java
--- a/src/main/java/com/dmdirc/util/io/DownloadListener.java
+++ b/src/main/java/com/dmdirc/util/io/DownloadListener.java
--- a/src/main/java/com/dmdirc/util/io/Downloader.java
+++ b/src/main/java/com/dmdirc/util/io/Downloader.java
--- a/src/main/java/com/dmdirc/util/io/FileUtils.java
+++ b/src/main/java/com/dmdirc/util/io/FileUtils.java
--- a/src/main/java/com/dmdirc/util/io/InvalidConfigFileException.java
+++ b/src/main/java/com/dmdirc/util/io/InvalidConfigFileException.java
--- a/src/main/java/com/dmdirc/util/io/ListenerInputStream.java
+++ b/src/main/java/com/dmdirc/util/io/ListenerInputStream.java
--- a/src/main/java/com/dmdirc/util/io/ReverseFileReader.java
+++ b/src/main/java/com/dmdirc/util/io/ReverseFileReader.java
--- a/src/main/java/com/dmdirc/util/io/StreamIgnorer.java
+++ b/src/main/java/com/dmdirc/util/io/StreamIgnorer.java
--- a/src/main/java/com/dmdirc/util/io/StreamUtils.java
+++ b/src/main/java/com/dmdirc/util/io/StreamUtils.java
--- a/src/main/java/com/dmdirc/util/io/TextFile.java
+++ b/src/main/java/com/dmdirc/util/io/TextFile.java
--- a/src/main/java/com/dmdirc/util/text/Link.java
+++ b/src/main/java/com/dmdirc/util/text/Link.java
--- a/src/main/java/com/dmdirc/util/text/LinkExtractor.java
+++ b/src/main/java/com/dmdirc/util/text/LinkExtractor.java
--- a/src/main/java/com/dmdirc/util/validators/ColourValidator.java
+++ b/src/main/java/com/dmdirc/util/validators/ColourValidator.java
--- a/src/main/java/com/dmdirc/util/validators/DisabledOptionValidator.java
+++ b/src/main/java/com/dmdirc/util/validators/DisabledOptionValidator.java
--- a/src/main/java/com/dmdirc/util/validators/EmailAddressValidator.java
+++ b/src/main/java/com/dmdirc/util/validators/EmailAddressValidator.java
--- a/src/main/java/com/dmdirc/util/validators/FileNameValidator.java
+++ b/src/main/java/com/dmdirc/util/validators/FileNameValidator.java
--- a/src/main/java/com/dmdirc/util/validators/IdentValidator.java
+++ b/src/main/java/com/dmdirc/util/validators/IdentValidator.java
--- a/src/main/java/com/dmdirc/util/validators/IntegerPortValidator.java
+++ b/src/main/java/com/dmdirc/util/validators/IntegerPortValidator.java
--- a/src/main/java/com/dmdirc/util/validators/IntegerValidator.java
+++ b/src/main/java/com/dmdirc/util/validators/IntegerValidator.java
--- a/src/main/java/com/dmdirc/util/validators/ListNotEmptyValidator.java
+++ b/src/main/java/com/dmdirc/util/validators/ListNotEmptyValidator.java
--- a/src/main/java/com/dmdirc/util/validators/NicknameValidator.java
+++ b/src/main/java/com/dmdirc/util/validators/NicknameValidator.java
--- a/src/main/java/com/dmdirc/util/validators/NotEmptyValidator.java
+++ b/src/main/java/com/dmdirc/util/validators/NotEmptyValidator.java
--- a/src/main/java/com/dmdirc/util/validators/NumericalValidator.java
+++ b/src/main/java/com/dmdirc/util/validators/NumericalValidator.java
--- a/src/main/java/com/dmdirc/util/validators/OptionalEmailAddressValidator.java
+++ b/src/main/java/com/dmdirc/util/validators/OptionalEmailAddressValidator.java
--- a/src/main/java/com/dmdirc/util/validators/OptionalValidator.java
+++ b/src/main/java/com/dmdirc/util/validators/OptionalValidator.java
--- a/src/main/java/com/dmdirc/util/validators/PermissiveValidator.java
+++ b/src/main/java/com/dmdirc/util/validators/PermissiveValidator.java
--- a/src/main/java/com/dmdirc/util/validators/PortValidator.java
+++ b/src/main/java/com/dmdirc/util/validators/PortValidator.java
--- a/src/main/java/com/dmdirc/util/validators/RegexStringValidator.java
+++ b/src/main/java/com/dmdirc/util/validators/RegexStringValidator.java
--- a/src/main/java/com/dmdirc/util/validators/RegexValidator.java
+++ b/src/main/java/com/dmdirc/util/validators/RegexValidator.java
--- a/src/main/java/com/dmdirc/util/validators/ServerNameValidator.java
+++ b/src/main/java/com/dmdirc/util/validators/ServerNameValidator.java
--- a/src/main/java/com/dmdirc/util/validators/StringLengthValidator.java
+++ b/src/main/java/com/dmdirc/util/validators/StringLengthValidator.java
--- a/src/main/java/com/dmdirc/util/validators/URIValidator.java
+++ b/src/main/java/com/dmdirc/util/validators/URIValidator.java
--- a/src/main/java/com/dmdirc/util/validators/Validatable.java
+++ b/src/main/java/com/dmdirc/util/validators/Validatable.java
--- a/src/main/java/com/dmdirc/util/validators/ValidationResponse.java
+++ b/src/main/java/com/dmdirc/util/validators/ValidationResponse.java
--- a/src/main/java/com/dmdirc/util/validators/Validator.java
+++ b/src/main/java/com/dmdirc/util/validators/Validator.java
--- a/src/main/java/com/dmdirc/util/validators/ValidatorChain.java
+++ b/src/main/java/com/dmdirc/util/validators/ValidatorChain.java
--- a/src/main/java/com/dmdirc/util/validators/ValidatorChainBuilder.java
+++ b/src/main/java/com/dmdirc/util/validators/ValidatorChainBuilder.java
--- a/src/test/java/com/dmdirc/util/CommandUtilsTest.java
+++ b/src/test/java/com/dmdirc/util/CommandUtilsTest.java
--- a/src/test/java/com/dmdirc/util/DateUtilsTest.java
+++ b/src/test/java/com/dmdirc/util/DateUtilsTest.java
--- a/src/test/java/com/dmdirc/util/StringUtilsTest.java
+++ b/src/test/java/com/dmdirc/util/StringUtilsTest.java
--- a/src/test/java/com/dmdirc/util/collections/CollectionFunctionsTest.java
+++ b/src/test/java/com/dmdirc/util/collections/CollectionFunctionsTest.java
--- a/src/test/java/com/dmdirc/util/collections/ListenerListTest.java
+++ b/src/test/java/com/dmdirc/util/collections/ListenerListTest.java
--- a/src/test/java/com/dmdirc/util/collections/ObservableListDecoratorTest.java
+++ b/src/test/java/com/dmdirc/util/collections/ObservableListDecoratorTest.java
--- a/src/test/java/com/dmdirc/util/collections/QueuedLinkedHashSetTest.java
+++ b/src/test/java/com/dmdirc/util/collections/QueuedLinkedHashSetTest.java
--- a/src/test/java/com/dmdirc/util/collections/RollingListTest.java
+++ b/src/test/java/com/dmdirc/util/collections/RollingListTest.java
--- a/src/test/java/com/dmdirc/util/colours/ColourTest.java
+++ b/src/test/java/com/dmdirc/util/colours/ColourTest.java
--- a/src/test/java/com/dmdirc/util/colours/ColourUtilsTest.java
+++ b/src/test/java/com/dmdirc/util/colours/ColourUtilsTest.java
--- a/src/test/java/com/dmdirc/util/io/ConfigFileTest.java
+++ b/src/test/java/com/dmdirc/util/io/ConfigFileTest.java
--- a/src/test/java/com/dmdirc/util/io/DownloaderTest.java
+++ b/src/test/java/com/dmdirc/util/io/DownloaderTest.java
--- a/src/test/java/com/dmdirc/util/io/InvalidConfigFileExceptionTest.java
+++ b/src/test/java/com/dmdirc/util/io/InvalidConfigFileExceptionTest.java
--- a/src/test/java/com/dmdirc/util/io/ListenerInputStreamTest.java
+++ b/src/test/java/com/dmdirc/util/io/ListenerInputStreamTest.java
--- a/src/test/java/com/dmdirc/util/io/ReverseFileReaderTest.java
+++ b/src/test/java/com/dmdirc/util/io/ReverseFileReaderTest.java
--- a/src/test/java/com/dmdirc/util/io/StreamReaderTest.java
+++ b/src/test/java/com/dmdirc/util/io/StreamReaderTest.java
--- a/src/test/java/com/dmdirc/util/io/StreamUtilsTest.java
+++ b/src/test/java/com/dmdirc/util/io/StreamUtilsTest.java
--- a/src/test/java/com/dmdirc/util/io/TextFileTest.java
+++ b/src/test/java/com/dmdirc/util/io/TextFileTest.java
--- a/src/test/java/com/dmdirc/util/text/LinkExtractorTest.java
+++ b/src/test/java/com/dmdirc/util/text/LinkExtractorTest.java
--- a/src/test/java/com/dmdirc/util/text/LinkTest.java
+++ b/src/test/java/com/dmdirc/util/text/LinkTest.java
--- a/src/test/java/com/dmdirc/util/validators/ColourValidatorTest.java
+++ b/src/test/java/com/dmdirc/util/validators/ColourValidatorTest.java
--- a/src/test/java/com/dmdirc/util/validators/DisabledOptionValidatorTest.java
+++ b/src/test/java/com/dmdirc/util/validators/DisabledOptionValidatorTest.java
--- a/src/test/java/com/dmdirc/util/validators/EmailAddressValidatorTest.java
+++ b/src/test/java/com/dmdirc/util/validators/EmailAddressValidatorTest.java
--- a/src/test/java/com/dmdirc/util/validators/FileNameValidatorTest.java
+++ b/src/test/java/com/dmdirc/util/validators/FileNameValidatorTest.java
--- a/src/test/java/com/dmdirc/util/validators/IdentValidatorTest.java
+++ b/src/test/java/com/dmdirc/util/validators/IdentValidatorTest.java
--- a/src/test/java/com/dmdirc/util/validators/IntegerPortValidatorTest.java
+++ b/src/test/java/com/dmdirc/util/validators/IntegerPortValidatorTest.java
--- a/src/test/java/com/dmdirc/util/validators/IntegerValidatorTest.java
+++ b/src/test/java/com/dmdirc/util/validators/IntegerValidatorTest.java
--- a/src/test/java/com/dmdirc/util/validators/ListNotEmptyValidatorTest.java
+++ b/src/test/java/com/dmdirc/util/validators/ListNotEmptyValidatorTest.java
--- a/src/test/java/com/dmdirc/util/validators/NicknameValidatorTest.java
+++ b/src/test/java/com/dmdirc/util/validators/NicknameValidatorTest.java
--- a/src/test/java/com/dmdirc/util/validators/NotEmptyValidatorTest.java
+++ b/src/test/java/com/dmdirc/util/validators/NotEmptyValidatorTest.java
--- a/src/test/java/com/dmdirc/util/validators/NumericalValidatorTest.java
+++ b/src/test/java/com/dmdirc/util/validators/NumericalValidatorTest.java
--- a/src/test/java/com/dmdirc/util/validators/OptionalEmailAddressValidatorTest.java
+++ b/src/test/java/com/dmdirc/util/validators/OptionalEmailAddressValidatorTest.java
--- a/src/test/java/com/dmdirc/util/validators/OptionalValidatorTest.java
+++ b/src/test/java/com/dmdirc/util/validators/OptionalValidatorTest.java
--- a/src/test/java/com/dmdirc/util/validators/PermissiveValidatorTest.java
+++ b/src/test/java/com/dmdirc/util/validators/PermissiveValidatorTest.java
--- a/src/test/java/com/dmdirc/util/validators/PortValidatorTest.java
+++ b/src/test/java/com/dmdirc/util/validators/PortValidatorTest.java
--- a/src/test/java/com/dmdirc/util/validators/RegexStringValidatorTest.java
+++ b/src/test/java/com/dmdirc/util/validators/RegexStringValidatorTest.java
--- a/src/test/java/com/dmdirc/util/validators/RegexValidatorTest.java
+++ b/src/test/java/com/dmdirc/util/validators/RegexValidatorTest.java
--- a/src/test/java/com/dmdirc/util/validators/ServerNameValidatorTest.java
+++ b/src/test/java/com/dmdirc/util/validators/ServerNameValidatorTest.java
--- a/src/test/java/com/dmdirc/util/validators/StringLengthValidatorTest.java
+++ b/src/test/java/com/dmdirc/util/validators/StringLengthValidatorTest.java
--- a/src/test/java/com/dmdirc/util/validators/URIValidatorTest.java
+++ b/src/test/java/com/dmdirc/util/validators/URIValidatorTest.java
--- a/src/test/java/com/dmdirc/util/validators/ValidationResponseTest.java
+++ b/src/test/java/com/dmdirc/util/validators/ValidationResponseTest.java
--- a/src/test/java/com/dmdirc/util/validators/ValidatorChainBuilderTest.java
+++ b/src/test/java/com/dmdirc/util/validators/ValidatorChainBuilderTest.java
--- a/src/test/java/com/dmdirc/util/validators/ValidatorChainTest.java
+++ b/src/test/java/com/dmdirc/util/validators/ValidatorChainTest.java
--- a/src/test/resources/com/dmdirc/util/io/test1.txt
+++ b/src/test/resources/com/dmdirc/util/io/test1.txt
--- a/src/test/resources/com/dmdirc/util/io/test2.txt
+++ b/src/test/resources/com/dmdirc/util/io/test2.txt
--- a/src/test/resources/com/dmdirc/util/io/test3.txt
+++ b/src/test/resources/com/dmdirc/util/io/test3.txt
--- a/src/test/resources/com/dmdirc/util/io/test4.txt
+++ b/src/test/resources/com/dmdirc/util/io/test4.txt
--- a/src/test/resources/com/dmdirc/util/io/test5.txt
+++ b/src/test/resources/com/dmdirc/util/io/test5.txt