diff --git a/iguana.commons/README b/iguana.commons/README deleted file mode 100644 index 5ca5f7d2a..000000000 --- a/iguana.commons/README +++ /dev/null @@ -1,46 +0,0 @@ -CONTENTS OF THIS FILE ---------------------- - -* Introduction -* Requirements -* Installation -* Configuration -* Links - - -INTRODUCTION ------------- - -The Commons module of Iguana will be used -to serve as methods and utils which all or several modules of Iguana needs - -Bugs can be submitted at https://github.com/AKSW/IGUANA/issues -Please refer to the Module as following "[Commons] your message" - - -REQUIREMENTS ------------- - -The Commons is not a standalone module. - - -INSTALLATION ------------- - -The Commons is not a standalone module. - - -CONFIGURATION -------------- - -The Commons is not a standalone module. - - -LINKS ------ - -* Project Site: http://iguana-benchmark.eu - -* Github Site: http://github.com/AKSW/IGUANA - -* Bug Tracker: http://github.com/AKSW/IGUANA/issues diff --git a/iguana.commons/pom.xml b/iguana.commons/pom.xml deleted file mode 100644 index 86e7a0be7..000000000 --- a/iguana.commons/pom.xml +++ /dev/null @@ -1,162 +0,0 @@ - - 4.0.0 - - org.aksw - iguana-parent - ${revision} - - iguana.commons - Iguana Commons - Iguana Common Classes and Methods - - - AGPLv3 or later - https://www.gnu.org/licenses/agpl-3.0.html - - - - - Lixi Conrads - lixiconrads@gmail.com - - Former Developer - - Dice Research Group - https://dice-research.org - - - - Dice Research Group - https://dice-research.org - - - GitHub Issue Management - https://github.com/dice-group/iguana/issues - - https://dice-research.org/IGUANA - - - 17 - 2.17.1 - 3.16.0 - UTF-8 - 17 - 17 - - - - - junit - junit - 4.13.1 - test - - - commons-configuration - commons-configuration - 1.10 - - - org.apache.commons - commons-exec - 1.3 - - - org.apache.logging.log4j - log4j-slf4j-impl - ${log4j.version} - - - org.apache.logging.log4j - log4j-api - ${log4j.version} - - - org.apache.logging.log4j - log4j-core - ${log4j.version} - - - org.apache.logging.log4j - log4j-1.2-api - ${log4j.version} - - - org.simpleframework - simple - 5.1.6 - - - org.reflections - reflections - 0.9.9 - - - - - - github - GitHub dice-group Apache Maven Packages - https://maven.pkg.github.com/dice-group/IGUANA - - - - - - - - - org.jacoco - jacoco-maven-plugin - 0.8.8 - - - prepare-agent - - prepare-agent - - - - report - prepare-package - - report - - - - post-unit-test - test - - report - - - - - target/jacoco.exec - - target/jacoco-ut - - - - - - org.apache.maven.plugins - maven-compiler-plugin - 3.8.1 - - 17 - 17 - UTF-8 - - -parameters - - - **/log4j2.yml - - - - - - - diff --git a/iguana.corecontroller/README b/iguana.corecontroller/README deleted file mode 100644 index d71f8e970..000000000 --- a/iguana.corecontroller/README +++ /dev/null @@ -1,6 +0,0 @@ -INTRODUCTION ------------- - -The Core module of Iguana will be used to execute data generation and the tasks. -It will run as standalone. - diff --git a/iguana.corecontroller/pom.xml b/iguana.corecontroller/pom.xml deleted file mode 100644 index c9089ed4f..000000000 --- a/iguana.corecontroller/pom.xml +++ /dev/null @@ -1,217 +0,0 @@ - - 4.0.0 - - org.aksw - iguana-parent - ${revision} - - iguana.corecontroller - - Iguanas Core Controller - The Controller of Iguanas Core Module. Handling the messaging and is coordinating the ResultProcessor as well as the dataGenerator. Will be communicating with the Web Controller Module. - - - AGPLv3 or later - https://www.gnu.org/licenses/agpl-3.0.html - - - - - Lixi Conrads - lixiconrads@gmail.com - - Former Developer - - Dice Research Group - https://dice-research.org - - - - Dice Research Group - https://dice-research.org - - - GitHub Issue Management - https://github.com/dice-group/iguana/issues - - https://dice-research.org/IGUANA - - - 17 - UTF-8 - 2.13.3 - 3.16.0 - 17 - 17 - - - - - org.apache.httpcomponents - httpclient - 4.5.13 - - - commons-codec - commons-codec - 1.15 - - - com.fasterxml.jackson.dataformat - jackson-dataformat-yaml - 2.11.2 - - - com.networknt - json-schema-validator - 1.0.43 - - - org.apache.jena - jena-arq - ${jena.version} - - - com.googlecode.json-simple - json-simple - 1.1.1 - - - - junit - junit - 4.13.1 - test - - - org.simpleframework - simple - 5.1.6 - - - org.aksw - iguana.resultprocessor - ${revision} - - - org.aksw - iguana.commons - - - - - - org.aksw - iguana.commons - ${revision} - - - - - - - - org.jacoco - jacoco-maven-plugin - 0.8.8 - - - prepare-agent - - prepare-agent - - - - report - prepare-package - - report - - - - post-unit-test - test - - report - - - - - target/jacoco.exec - - target/jacoco-ut - - - - - - org.codehaus.mojo - exec-maven-plugin - 1.5.0 - - - maven-dependency-plugin - - - install - - copy-dependencies - - - ${project.build.directory}/lib - - - - - - - - org.apache.maven.plugins - maven-compiler-plugin - 3.8.1 - - 17 - 17 - UTF-8 - - -parameters - - - - - - org.apache.maven.plugins - maven-shade-plugin - 2.4.3 - - iguana-${revision} - ${project.parent.basedir}/target - - - - - shade - - - true - shaded - - - org.aksw.iguana.cc.controller.MainController - - - - - - - - - - - github - GitHub dice-group Apache Maven Packages - https://maven.pkg.github.com/dice-group/IGUANA - - - diff --git a/iguana.resultprocessor/README b/iguana.resultprocessor/README deleted file mode 100644 index 476f91357..000000000 --- a/iguana.resultprocessor/README +++ /dev/null @@ -1,85 +0,0 @@ -INTRODUCTION ------------- - -The Result Processing module of Iguana will be used to save and calculate Metrics into several Storage Solutions. - -The provided Metrics are - -* Queries Per Second (QPS) -* Query Mixes Per Hour (QMPH) -* Number of Queries Per Hour (NoQPH) -* Each Query Execution Time (EQE) - -The provided Storage Solutions are - -* Triple Store -* NTriple File -* File/Directory Structure - -For a full description, please visit the wiki - -CONFIGURATION -------------- - - -to define which metrics should be used simply add the following line -to your properites - - iguana.rp.metrics=metric1, metric2, ... - -To define metric1, metric2 and so on simply add the following line - - metric1.class=org.aksw.iguana.rp.metrics.impl.QMPHMetric - - -The following classes refer to the following Metrics - -* QPS: org.aksw.iguana.rp.metrics.impl.QPSMetric - -* QMPH: org.aksw.iguana.rp.metrics.impl.QMPHMetric - -* NoQPH: org.aksw.iguana.rp.metrics.impl.NoQPHMetric - -* EQE: org.aksw.iguana.rp.metrics.impl.EachQueryMetric - - -To define the storages which should be used, add the following line -to your properties - - iguana.rp.storages=storage1, storage2,... - -To define the Storage please add the following - - storage1.class=org.aksw.iguana.rp.storage.impl.TriplestoreStorage - storage1.constructorArgs=http://localhost:9999/blazegraph/sparql, http://localhost:9999/blazegraph/sparql - - -The following Classes refer to the following Storages - -* TriplestoreStorage: org.aksw.iguana.rp.storage.impl.TriplestoreStorage - (You have to at least specify the endpoint and updateEndpoint of the triple store in the constructor arguments) - -* FileStorage: org.aksw.iguana.rp.storage.impl.FileStorage - (optional: you can define the root directory of the stored CSV files) - -* NTFileStorage: org.aksw.iguana.rp.storage.impl.NTFileStorage - (optional: you can specify the Ntriple file name) - -For Further Information to the constructor Arguments, -visit the JavaDoc: http://iguana-benchmark.eu/javadoc/index.html - - - -All three (iguana.rp.consumer, iguana.rp.metrics, iguana.rp.storages) -have to be stated in the properties file somehow. - - - -LINKS ------ - -* Project Site: http://iguana-benchmark.eu - -* Github Site: http://github.com/AKSW/IGUANA - -* Bug Tracker: http://github.com/AKSW/IGUANA/issues diff --git a/iguana.resultprocessor/pom.xml b/iguana.resultprocessor/pom.xml deleted file mode 100644 index c7371d36c..000000000 --- a/iguana.resultprocessor/pom.xml +++ /dev/null @@ -1,188 +0,0 @@ - - 4.0.0 - - org.aksw - iguana-parent - ${revision} - - iguana.resultprocessor - - Iguana ResultProcessor - Processing, aggregating and store results from Iguanas core. - - - AGPLv3 or later - https://www.gnu.org/licenses/agpl-3.0.html - - - - - Lixi Conrads - lixiconrads@gmail.com - - Former Developer - - Dice Research Group - https://dice-research.org - - - - Dice Research Group - https://dice-research.org - - - GitHub Issue Management - https://github.com/dice-group/iguana/issues - - https://dice-research.org/IGUANA - - - 17 - 4.2.0 - UTF-8 - 17 - 17 - - - - - org.apache.jena - jena-iri - ${jena.version} - - - org.apache.jena - jena-arq - ${jena.version} - - - org.apache.jena - jena-core - ${jena.version} - - - - junit - junit - 4.13.1 - test - - - org.aksw - iguana.commons - ${revision} - - - - - - - org.jacoco - jacoco-maven-plugin - 0.8.8 - - - prepare-agent - - prepare-agent - - - - report - prepare-package - - report - - - - post-unit-test - test - - report - - - - - target/jacoco.exec - - target/jacoco-ut - - - - - - org.apache.maven.plugins - maven-compiler-plugin - 3.8.1 - - 17 - 17 - UTF-8 - - -parameters - - - - - org.codehaus.mojo - exec-maven-plugin - - - maven-dependency-plugin - - - install - - copy-dependencies - - - ${project.build.directory}/lib - - - - - - - - - org.codehaus.mojo - exec-maven-plugin - 1.5.0 - - java - org.aksw.iguana.rp.controller.MainController - - - - - - - - - - - - Apache Repo Central - Apache Repository - https://repo.maven.apache.org/maven2 - - - maven.aksw.internal - University Leipzig, AKSW Maven2 Repository - https://maven.aksw.org/archiva/repository/internal - - - maven.aksw.snapshots - University Leipzig, AKSW Maven2 Repository - https://maven.aksw.org/archiva/repository/snapshots - - - - - github - GitHub dice-group Apache Maven Packages - https://maven.pkg.github.com/dice-group/IGUANA - - - diff --git a/pom.xml b/pom.xml index c3eaf07f7..90bd14bf3 100644 --- a/pom.xml +++ b/pom.xml @@ -1,9 +1,10 @@ - - 4.0.0 - org.aksw - iguana-parent + + 4.0.0 + org.aksw + iguana ${revision} - Iguana Parent + Iguana AGPLv3 or later @@ -30,19 +31,24 @@ https://github.com/dice-group/iguana/issues https://dice-research.org/IGUANA - pom - - iguana.commons - iguana.resultprocessor - iguana.corecontroller - + + ${major.minor.version}.${build.version} ${major.version}.${minor.version} 4 0 0 + + 17 + 4.2.0 + UTF-8 + 17 + 17 + + 2.17.1 + github @@ -50,8 +56,147 @@ https://maven.pkg.github.com/dice-group/iguana + + + + org.apache.jena + jena-iri + ${jena.version} + + + org.apache.jena + jena-arq + ${jena.version} + + + org.apache.jena + jena-core + ${jena.version} + + + junit + junit + 4.13.1 + test + + + org.apache.httpcomponents + httpclient + 4.5.13 + + + commons-configuration + commons-configuration + 1.10 + + + org.apache.commons + commons-exec + 1.3 + + + org.apache.logging.log4j + log4j-slf4j-impl + ${log4j.version} + + + org.apache.logging.log4j + log4j-api + ${log4j.version} + + + org.apache.logging.log4j + log4j-core + ${log4j.version} + + + org.apache.logging.log4j + log4j-1.2-api + ${log4j.version} + + + org.simpleframework + simple + 5.1.6 + + + org.reflections + reflections + 0.9.9 + + + commons-codec + commons-codec + 1.15 + + + com.fasterxml.jackson.dataformat + jackson-dataformat-yaml + 2.11.2 + + + com.networknt + json-schema-validator + 1.0.78 + + + com.googlecode.json-simple + json-simple + 1.1.1 + + + org.slf4j + slf4j-api + 1.7.32 + compile + + + + + + org.apache.maven.plugins + maven-compiler-plugin + 3.8.1 + + 17 + 17 + UTF-8 + + -parameters + + + **/log4j2.yml + + + + + + org.apache.maven.plugins + maven-shade-plugin + 3.4.1 + + false + iguana-${revision} + + + + package + + shade + + + + + org.aksw.iguana.cc.controller.MainController + + + + + + + org.apache.maven.plugins maven-javadoc-plugin @@ -62,19 +207,19 @@ + maven-resources-plugin 3.1.0 copy-resources - package copy-resources - ${project.basedir}/target + ${project.basedir}/target/ ${project.basedir}/src/main/resources/ @@ -83,12 +228,6 @@ true - - ${project.basedir}/iguana.corecontroller/target/ - - iguana-${revision}-shaded.jar - - diff --git a/iguana.corecontroller/src/main/java/org/aksw/iguana/cc/config/CONSTANTS.java b/src/main/java/org/aksw/iguana/cc/config/CONSTANTS.java similarity index 100% rename from iguana.corecontroller/src/main/java/org/aksw/iguana/cc/config/CONSTANTS.java rename to src/main/java/org/aksw/iguana/cc/config/CONSTANTS.java diff --git a/iguana.corecontroller/src/main/java/org/aksw/iguana/cc/config/ConfigManager.java b/src/main/java/org/aksw/iguana/cc/config/ConfigManager.java similarity index 100% rename from iguana.corecontroller/src/main/java/org/aksw/iguana/cc/config/ConfigManager.java rename to src/main/java/org/aksw/iguana/cc/config/ConfigManager.java diff --git a/iguana.corecontroller/src/main/java/org/aksw/iguana/cc/config/IguanaConfig.java b/src/main/java/org/aksw/iguana/cc/config/IguanaConfig.java similarity index 100% rename from iguana.corecontroller/src/main/java/org/aksw/iguana/cc/config/IguanaConfig.java rename to src/main/java/org/aksw/iguana/cc/config/IguanaConfig.java diff --git a/iguana.corecontroller/src/main/java/org/aksw/iguana/cc/config/IguanaConfigFactory.java b/src/main/java/org/aksw/iguana/cc/config/IguanaConfigFactory.java similarity index 100% rename from iguana.corecontroller/src/main/java/org/aksw/iguana/cc/config/IguanaConfigFactory.java rename to src/main/java/org/aksw/iguana/cc/config/IguanaConfigFactory.java diff --git a/iguana.corecontroller/src/main/java/org/aksw/iguana/cc/config/elements/Connection.java b/src/main/java/org/aksw/iguana/cc/config/elements/Connection.java similarity index 100% rename from iguana.corecontroller/src/main/java/org/aksw/iguana/cc/config/elements/Connection.java rename to src/main/java/org/aksw/iguana/cc/config/elements/Connection.java diff --git a/iguana.corecontroller/src/main/java/org/aksw/iguana/cc/config/elements/Dataset.java b/src/main/java/org/aksw/iguana/cc/config/elements/Dataset.java similarity index 100% rename from iguana.corecontroller/src/main/java/org/aksw/iguana/cc/config/elements/Dataset.java rename to src/main/java/org/aksw/iguana/cc/config/elements/Dataset.java diff --git a/iguana.corecontroller/src/main/java/org/aksw/iguana/cc/config/elements/MetricConfig.java b/src/main/java/org/aksw/iguana/cc/config/elements/MetricConfig.java similarity index 100% rename from iguana.corecontroller/src/main/java/org/aksw/iguana/cc/config/elements/MetricConfig.java rename to src/main/java/org/aksw/iguana/cc/config/elements/MetricConfig.java diff --git a/iguana.corecontroller/src/main/java/org/aksw/iguana/cc/config/elements/StorageConfig.java b/src/main/java/org/aksw/iguana/cc/config/elements/StorageConfig.java similarity index 100% rename from iguana.corecontroller/src/main/java/org/aksw/iguana/cc/config/elements/StorageConfig.java rename to src/main/java/org/aksw/iguana/cc/config/elements/StorageConfig.java diff --git a/iguana.corecontroller/src/main/java/org/aksw/iguana/cc/config/elements/Task.java b/src/main/java/org/aksw/iguana/cc/config/elements/Task.java similarity index 100% rename from iguana.corecontroller/src/main/java/org/aksw/iguana/cc/config/elements/Task.java rename to src/main/java/org/aksw/iguana/cc/config/elements/Task.java diff --git a/iguana.corecontroller/src/main/java/org/aksw/iguana/cc/controller/MainController.java b/src/main/java/org/aksw/iguana/cc/controller/MainController.java similarity index 100% rename from iguana.corecontroller/src/main/java/org/aksw/iguana/cc/controller/MainController.java rename to src/main/java/org/aksw/iguana/cc/controller/MainController.java diff --git a/iguana.corecontroller/src/main/java/org/aksw/iguana/cc/controller/TaskController.java b/src/main/java/org/aksw/iguana/cc/controller/TaskController.java similarity index 100% rename from iguana.corecontroller/src/main/java/org/aksw/iguana/cc/controller/TaskController.java rename to src/main/java/org/aksw/iguana/cc/controller/TaskController.java diff --git a/iguana.corecontroller/src/main/java/org/aksw/iguana/cc/lang/AbstractLanguageProcessor.java b/src/main/java/org/aksw/iguana/cc/lang/AbstractLanguageProcessor.java similarity index 100% rename from iguana.corecontroller/src/main/java/org/aksw/iguana/cc/lang/AbstractLanguageProcessor.java rename to src/main/java/org/aksw/iguana/cc/lang/AbstractLanguageProcessor.java diff --git a/iguana.corecontroller/src/main/java/org/aksw/iguana/cc/lang/LanguageProcessor.java b/src/main/java/org/aksw/iguana/cc/lang/LanguageProcessor.java similarity index 100% rename from iguana.corecontroller/src/main/java/org/aksw/iguana/cc/lang/LanguageProcessor.java rename to src/main/java/org/aksw/iguana/cc/lang/LanguageProcessor.java diff --git a/iguana.corecontroller/src/main/java/org/aksw/iguana/cc/lang/QueryWrapper.java b/src/main/java/org/aksw/iguana/cc/lang/QueryWrapper.java similarity index 100% rename from iguana.corecontroller/src/main/java/org/aksw/iguana/cc/lang/QueryWrapper.java rename to src/main/java/org/aksw/iguana/cc/lang/QueryWrapper.java diff --git a/iguana.corecontroller/src/main/java/org/aksw/iguana/cc/lang/impl/RDFLanguageProcessor.java b/src/main/java/org/aksw/iguana/cc/lang/impl/RDFLanguageProcessor.java similarity index 100% rename from iguana.corecontroller/src/main/java/org/aksw/iguana/cc/lang/impl/RDFLanguageProcessor.java rename to src/main/java/org/aksw/iguana/cc/lang/impl/RDFLanguageProcessor.java diff --git a/iguana.corecontroller/src/main/java/org/aksw/iguana/cc/lang/impl/SPARQLLanguageProcessor.java b/src/main/java/org/aksw/iguana/cc/lang/impl/SPARQLLanguageProcessor.java similarity index 100% rename from iguana.corecontroller/src/main/java/org/aksw/iguana/cc/lang/impl/SPARQLLanguageProcessor.java rename to src/main/java/org/aksw/iguana/cc/lang/impl/SPARQLLanguageProcessor.java diff --git a/iguana.corecontroller/src/main/java/org/aksw/iguana/cc/lang/impl/SaxSparqlJsonResultCountingParser.java b/src/main/java/org/aksw/iguana/cc/lang/impl/SaxSparqlJsonResultCountingParser.java similarity index 100% rename from iguana.corecontroller/src/main/java/org/aksw/iguana/cc/lang/impl/SaxSparqlJsonResultCountingParser.java rename to src/main/java/org/aksw/iguana/cc/lang/impl/SaxSparqlJsonResultCountingParser.java diff --git a/iguana.corecontroller/src/main/java/org/aksw/iguana/cc/lang/impl/ThrowawayLanguageProcessor.java b/src/main/java/org/aksw/iguana/cc/lang/impl/ThrowawayLanguageProcessor.java similarity index 100% rename from iguana.corecontroller/src/main/java/org/aksw/iguana/cc/lang/impl/ThrowawayLanguageProcessor.java rename to src/main/java/org/aksw/iguana/cc/lang/impl/ThrowawayLanguageProcessor.java diff --git a/iguana.corecontroller/src/main/java/org/aksw/iguana/cc/model/QueryExecutionStats.java b/src/main/java/org/aksw/iguana/cc/model/QueryExecutionStats.java similarity index 100% rename from iguana.corecontroller/src/main/java/org/aksw/iguana/cc/model/QueryExecutionStats.java rename to src/main/java/org/aksw/iguana/cc/model/QueryExecutionStats.java diff --git a/iguana.corecontroller/src/main/java/org/aksw/iguana/cc/model/QueryResultHashKey.java b/src/main/java/org/aksw/iguana/cc/model/QueryResultHashKey.java similarity index 100% rename from iguana.corecontroller/src/main/java/org/aksw/iguana/cc/model/QueryResultHashKey.java rename to src/main/java/org/aksw/iguana/cc/model/QueryResultHashKey.java diff --git a/iguana.corecontroller/src/main/java/org/aksw/iguana/cc/query/handler/QueryHandler.java b/src/main/java/org/aksw/iguana/cc/query/handler/QueryHandler.java similarity index 100% rename from iguana.corecontroller/src/main/java/org/aksw/iguana/cc/query/handler/QueryHandler.java rename to src/main/java/org/aksw/iguana/cc/query/handler/QueryHandler.java diff --git a/iguana.corecontroller/src/main/java/org/aksw/iguana/cc/query/list/QueryList.java b/src/main/java/org/aksw/iguana/cc/query/list/QueryList.java similarity index 100% rename from iguana.corecontroller/src/main/java/org/aksw/iguana/cc/query/list/QueryList.java rename to src/main/java/org/aksw/iguana/cc/query/list/QueryList.java diff --git a/iguana.corecontroller/src/main/java/org/aksw/iguana/cc/query/list/impl/FileBasedQueryList.java b/src/main/java/org/aksw/iguana/cc/query/list/impl/FileBasedQueryList.java similarity index 100% rename from iguana.corecontroller/src/main/java/org/aksw/iguana/cc/query/list/impl/FileBasedQueryList.java rename to src/main/java/org/aksw/iguana/cc/query/list/impl/FileBasedQueryList.java diff --git a/iguana.corecontroller/src/main/java/org/aksw/iguana/cc/query/list/impl/InMemQueryList.java b/src/main/java/org/aksw/iguana/cc/query/list/impl/InMemQueryList.java similarity index 100% rename from iguana.corecontroller/src/main/java/org/aksw/iguana/cc/query/list/impl/InMemQueryList.java rename to src/main/java/org/aksw/iguana/cc/query/list/impl/InMemQueryList.java diff --git a/iguana.corecontroller/src/main/java/org/aksw/iguana/cc/query/pattern/PatternHandler.java b/src/main/java/org/aksw/iguana/cc/query/pattern/PatternHandler.java similarity index 100% rename from iguana.corecontroller/src/main/java/org/aksw/iguana/cc/query/pattern/PatternHandler.java rename to src/main/java/org/aksw/iguana/cc/query/pattern/PatternHandler.java diff --git a/iguana.corecontroller/src/main/java/org/aksw/iguana/cc/query/selector/QuerySelector.java b/src/main/java/org/aksw/iguana/cc/query/selector/QuerySelector.java similarity index 100% rename from iguana.corecontroller/src/main/java/org/aksw/iguana/cc/query/selector/QuerySelector.java rename to src/main/java/org/aksw/iguana/cc/query/selector/QuerySelector.java diff --git a/iguana.corecontroller/src/main/java/org/aksw/iguana/cc/query/selector/impl/LinearQuerySelector.java b/src/main/java/org/aksw/iguana/cc/query/selector/impl/LinearQuerySelector.java similarity index 100% rename from iguana.corecontroller/src/main/java/org/aksw/iguana/cc/query/selector/impl/LinearQuerySelector.java rename to src/main/java/org/aksw/iguana/cc/query/selector/impl/LinearQuerySelector.java diff --git a/iguana.corecontroller/src/main/java/org/aksw/iguana/cc/query/selector/impl/RandomQuerySelector.java b/src/main/java/org/aksw/iguana/cc/query/selector/impl/RandomQuerySelector.java similarity index 100% rename from iguana.corecontroller/src/main/java/org/aksw/iguana/cc/query/selector/impl/RandomQuerySelector.java rename to src/main/java/org/aksw/iguana/cc/query/selector/impl/RandomQuerySelector.java diff --git a/iguana.corecontroller/src/main/java/org/aksw/iguana/cc/query/source/QuerySource.java b/src/main/java/org/aksw/iguana/cc/query/source/QuerySource.java similarity index 100% rename from iguana.corecontroller/src/main/java/org/aksw/iguana/cc/query/source/QuerySource.java rename to src/main/java/org/aksw/iguana/cc/query/source/QuerySource.java diff --git a/iguana.corecontroller/src/main/java/org/aksw/iguana/cc/query/source/impl/FileLineQuerySource.java b/src/main/java/org/aksw/iguana/cc/query/source/impl/FileLineQuerySource.java similarity index 100% rename from iguana.corecontroller/src/main/java/org/aksw/iguana/cc/query/source/impl/FileLineQuerySource.java rename to src/main/java/org/aksw/iguana/cc/query/source/impl/FileLineQuerySource.java diff --git a/iguana.corecontroller/src/main/java/org/aksw/iguana/cc/query/source/impl/FileSeparatorQuerySource.java b/src/main/java/org/aksw/iguana/cc/query/source/impl/FileSeparatorQuerySource.java similarity index 100% rename from iguana.corecontroller/src/main/java/org/aksw/iguana/cc/query/source/impl/FileSeparatorQuerySource.java rename to src/main/java/org/aksw/iguana/cc/query/source/impl/FileSeparatorQuerySource.java diff --git a/iguana.corecontroller/src/main/java/org/aksw/iguana/cc/query/source/impl/FolderQuerySource.java b/src/main/java/org/aksw/iguana/cc/query/source/impl/FolderQuerySource.java similarity index 100% rename from iguana.corecontroller/src/main/java/org/aksw/iguana/cc/query/source/impl/FolderQuerySource.java rename to src/main/java/org/aksw/iguana/cc/query/source/impl/FolderQuerySource.java diff --git a/iguana.corecontroller/src/main/java/org/aksw/iguana/cc/tasks/AbstractTask.java b/src/main/java/org/aksw/iguana/cc/tasks/AbstractTask.java similarity index 100% rename from iguana.corecontroller/src/main/java/org/aksw/iguana/cc/tasks/AbstractTask.java rename to src/main/java/org/aksw/iguana/cc/tasks/AbstractTask.java diff --git a/iguana.corecontroller/src/main/java/org/aksw/iguana/cc/tasks/Task.java b/src/main/java/org/aksw/iguana/cc/tasks/Task.java similarity index 100% rename from iguana.corecontroller/src/main/java/org/aksw/iguana/cc/tasks/Task.java rename to src/main/java/org/aksw/iguana/cc/tasks/Task.java diff --git a/iguana.corecontroller/src/main/java/org/aksw/iguana/cc/tasks/TaskFactory.java b/src/main/java/org/aksw/iguana/cc/tasks/TaskFactory.java similarity index 100% rename from iguana.corecontroller/src/main/java/org/aksw/iguana/cc/tasks/TaskFactory.java rename to src/main/java/org/aksw/iguana/cc/tasks/TaskFactory.java diff --git a/iguana.corecontroller/src/main/java/org/aksw/iguana/cc/tasks/TaskManager.java b/src/main/java/org/aksw/iguana/cc/tasks/TaskManager.java similarity index 100% rename from iguana.corecontroller/src/main/java/org/aksw/iguana/cc/tasks/TaskManager.java rename to src/main/java/org/aksw/iguana/cc/tasks/TaskManager.java diff --git a/iguana.corecontroller/src/main/java/org/aksw/iguana/cc/tasks/impl/Stresstest.java b/src/main/java/org/aksw/iguana/cc/tasks/impl/Stresstest.java similarity index 100% rename from iguana.corecontroller/src/main/java/org/aksw/iguana/cc/tasks/impl/Stresstest.java rename to src/main/java/org/aksw/iguana/cc/tasks/impl/Stresstest.java diff --git a/iguana.corecontroller/src/main/java/org/aksw/iguana/cc/utils/CLIProcessManager.java b/src/main/java/org/aksw/iguana/cc/utils/CLIProcessManager.java similarity index 100% rename from iguana.corecontroller/src/main/java/org/aksw/iguana/cc/utils/CLIProcessManager.java rename to src/main/java/org/aksw/iguana/cc/utils/CLIProcessManager.java diff --git a/iguana.corecontroller/src/main/java/org/aksw/iguana/cc/utils/FileUtils.java b/src/main/java/org/aksw/iguana/cc/utils/FileUtils.java similarity index 100% rename from iguana.corecontroller/src/main/java/org/aksw/iguana/cc/utils/FileUtils.java rename to src/main/java/org/aksw/iguana/cc/utils/FileUtils.java diff --git a/iguana.corecontroller/src/main/java/org/aksw/iguana/cc/utils/IndexedQueryReader.java b/src/main/java/org/aksw/iguana/cc/utils/IndexedQueryReader.java similarity index 100% rename from iguana.corecontroller/src/main/java/org/aksw/iguana/cc/utils/IndexedQueryReader.java rename to src/main/java/org/aksw/iguana/cc/utils/IndexedQueryReader.java diff --git a/iguana.corecontroller/src/main/java/org/aksw/iguana/cc/utils/ResultSizeRetriever.java b/src/main/java/org/aksw/iguana/cc/utils/ResultSizeRetriever.java similarity index 100% rename from iguana.corecontroller/src/main/java/org/aksw/iguana/cc/utils/ResultSizeRetriever.java rename to src/main/java/org/aksw/iguana/cc/utils/ResultSizeRetriever.java diff --git a/iguana.corecontroller/src/main/java/org/aksw/iguana/cc/utils/SPARQLQueryStatistics.java b/src/main/java/org/aksw/iguana/cc/utils/SPARQLQueryStatistics.java similarity index 100% rename from iguana.corecontroller/src/main/java/org/aksw/iguana/cc/utils/SPARQLQueryStatistics.java rename to src/main/java/org/aksw/iguana/cc/utils/SPARQLQueryStatistics.java diff --git a/iguana.corecontroller/src/main/java/org/aksw/iguana/cc/utils/StatisticsVisitor.java b/src/main/java/org/aksw/iguana/cc/utils/StatisticsVisitor.java similarity index 100% rename from iguana.corecontroller/src/main/java/org/aksw/iguana/cc/utils/StatisticsVisitor.java rename to src/main/java/org/aksw/iguana/cc/utils/StatisticsVisitor.java diff --git a/iguana.corecontroller/src/main/java/org/aksw/iguana/cc/worker/AbstractWorker.java b/src/main/java/org/aksw/iguana/cc/worker/AbstractWorker.java similarity index 100% rename from iguana.corecontroller/src/main/java/org/aksw/iguana/cc/worker/AbstractWorker.java rename to src/main/java/org/aksw/iguana/cc/worker/AbstractWorker.java diff --git a/iguana.corecontroller/src/main/java/org/aksw/iguana/cc/worker/LatencyStrategy.java b/src/main/java/org/aksw/iguana/cc/worker/LatencyStrategy.java similarity index 100% rename from iguana.corecontroller/src/main/java/org/aksw/iguana/cc/worker/LatencyStrategy.java rename to src/main/java/org/aksw/iguana/cc/worker/LatencyStrategy.java diff --git a/iguana.corecontroller/src/main/java/org/aksw/iguana/cc/worker/Worker.java b/src/main/java/org/aksw/iguana/cc/worker/Worker.java similarity index 100% rename from iguana.corecontroller/src/main/java/org/aksw/iguana/cc/worker/Worker.java rename to src/main/java/org/aksw/iguana/cc/worker/Worker.java diff --git a/iguana.corecontroller/src/main/java/org/aksw/iguana/cc/worker/WorkerFactory.java b/src/main/java/org/aksw/iguana/cc/worker/WorkerFactory.java similarity index 100% rename from iguana.corecontroller/src/main/java/org/aksw/iguana/cc/worker/WorkerFactory.java rename to src/main/java/org/aksw/iguana/cc/worker/WorkerFactory.java diff --git a/iguana.corecontroller/src/main/java/org/aksw/iguana/cc/worker/impl/CLIInputFileWorker.java b/src/main/java/org/aksw/iguana/cc/worker/impl/CLIInputFileWorker.java similarity index 100% rename from iguana.corecontroller/src/main/java/org/aksw/iguana/cc/worker/impl/CLIInputFileWorker.java rename to src/main/java/org/aksw/iguana/cc/worker/impl/CLIInputFileWorker.java diff --git a/iguana.corecontroller/src/main/java/org/aksw/iguana/cc/worker/impl/CLIInputPrefixWorker.java b/src/main/java/org/aksw/iguana/cc/worker/impl/CLIInputPrefixWorker.java similarity index 100% rename from iguana.corecontroller/src/main/java/org/aksw/iguana/cc/worker/impl/CLIInputPrefixWorker.java rename to src/main/java/org/aksw/iguana/cc/worker/impl/CLIInputPrefixWorker.java diff --git a/iguana.corecontroller/src/main/java/org/aksw/iguana/cc/worker/impl/CLIInputWorker.java b/src/main/java/org/aksw/iguana/cc/worker/impl/CLIInputWorker.java similarity index 100% rename from iguana.corecontroller/src/main/java/org/aksw/iguana/cc/worker/impl/CLIInputWorker.java rename to src/main/java/org/aksw/iguana/cc/worker/impl/CLIInputWorker.java diff --git a/iguana.corecontroller/src/main/java/org/aksw/iguana/cc/worker/impl/CLIWorker.java b/src/main/java/org/aksw/iguana/cc/worker/impl/CLIWorker.java similarity index 100% rename from iguana.corecontroller/src/main/java/org/aksw/iguana/cc/worker/impl/CLIWorker.java rename to src/main/java/org/aksw/iguana/cc/worker/impl/CLIWorker.java diff --git a/iguana.corecontroller/src/main/java/org/aksw/iguana/cc/worker/impl/HttpGetWorker.java b/src/main/java/org/aksw/iguana/cc/worker/impl/HttpGetWorker.java similarity index 100% rename from iguana.corecontroller/src/main/java/org/aksw/iguana/cc/worker/impl/HttpGetWorker.java rename to src/main/java/org/aksw/iguana/cc/worker/impl/HttpGetWorker.java diff --git a/iguana.corecontroller/src/main/java/org/aksw/iguana/cc/worker/impl/HttpPostWorker.java b/src/main/java/org/aksw/iguana/cc/worker/impl/HttpPostWorker.java similarity index 100% rename from iguana.corecontroller/src/main/java/org/aksw/iguana/cc/worker/impl/HttpPostWorker.java rename to src/main/java/org/aksw/iguana/cc/worker/impl/HttpPostWorker.java diff --git a/iguana.corecontroller/src/main/java/org/aksw/iguana/cc/worker/impl/HttpWorker.java b/src/main/java/org/aksw/iguana/cc/worker/impl/HttpWorker.java similarity index 100% rename from iguana.corecontroller/src/main/java/org/aksw/iguana/cc/worker/impl/HttpWorker.java rename to src/main/java/org/aksw/iguana/cc/worker/impl/HttpWorker.java diff --git a/iguana.corecontroller/src/main/java/org/aksw/iguana/cc/worker/impl/MultipleCLIInputWorker.java b/src/main/java/org/aksw/iguana/cc/worker/impl/MultipleCLIInputWorker.java similarity index 100% rename from iguana.corecontroller/src/main/java/org/aksw/iguana/cc/worker/impl/MultipleCLIInputWorker.java rename to src/main/java/org/aksw/iguana/cc/worker/impl/MultipleCLIInputWorker.java diff --git a/iguana.corecontroller/src/main/java/org/aksw/iguana/cc/worker/impl/UPDATEWorker.java b/src/main/java/org/aksw/iguana/cc/worker/impl/UPDATEWorker.java similarity index 100% rename from iguana.corecontroller/src/main/java/org/aksw/iguana/cc/worker/impl/UPDATEWorker.java rename to src/main/java/org/aksw/iguana/cc/worker/impl/UPDATEWorker.java diff --git a/iguana.corecontroller/src/main/java/org/aksw/iguana/cc/worker/impl/update/UpdateTimer.java b/src/main/java/org/aksw/iguana/cc/worker/impl/update/UpdateTimer.java similarity index 100% rename from iguana.corecontroller/src/main/java/org/aksw/iguana/cc/worker/impl/update/UpdateTimer.java rename to src/main/java/org/aksw/iguana/cc/worker/impl/update/UpdateTimer.java diff --git a/iguana.commons/src/main/java/org/aksw/iguana/commons/annotation/Nullable.java b/src/main/java/org/aksw/iguana/commons/annotation/Nullable.java similarity index 100% rename from iguana.commons/src/main/java/org/aksw/iguana/commons/annotation/Nullable.java rename to src/main/java/org/aksw/iguana/commons/annotation/Nullable.java diff --git a/iguana.commons/src/main/java/org/aksw/iguana/commons/annotation/ParameterNames.java b/src/main/java/org/aksw/iguana/commons/annotation/ParameterNames.java similarity index 100% rename from iguana.commons/src/main/java/org/aksw/iguana/commons/annotation/ParameterNames.java rename to src/main/java/org/aksw/iguana/commons/annotation/ParameterNames.java diff --git a/iguana.commons/src/main/java/org/aksw/iguana/commons/annotation/Shorthand.java b/src/main/java/org/aksw/iguana/commons/annotation/Shorthand.java similarity index 100% rename from iguana.commons/src/main/java/org/aksw/iguana/commons/annotation/Shorthand.java rename to src/main/java/org/aksw/iguana/commons/annotation/Shorthand.java diff --git a/iguana.commons/src/main/java/org/aksw/iguana/commons/constants/COMMON.java b/src/main/java/org/aksw/iguana/commons/constants/COMMON.java similarity index 100% rename from iguana.commons/src/main/java/org/aksw/iguana/commons/constants/COMMON.java rename to src/main/java/org/aksw/iguana/commons/constants/COMMON.java diff --git a/iguana.commons/src/main/java/org/aksw/iguana/commons/factory/TypedFactory.java b/src/main/java/org/aksw/iguana/commons/factory/TypedFactory.java similarity index 100% rename from iguana.commons/src/main/java/org/aksw/iguana/commons/factory/TypedFactory.java rename to src/main/java/org/aksw/iguana/commons/factory/TypedFactory.java diff --git a/iguana.commons/src/main/java/org/aksw/iguana/commons/io/BigByteArrayInputStream.java b/src/main/java/org/aksw/iguana/commons/io/BigByteArrayInputStream.java similarity index 100% rename from iguana.commons/src/main/java/org/aksw/iguana/commons/io/BigByteArrayInputStream.java rename to src/main/java/org/aksw/iguana/commons/io/BigByteArrayInputStream.java diff --git a/iguana.commons/src/main/java/org/aksw/iguana/commons/io/BigByteArrayOutputStream.java b/src/main/java/org/aksw/iguana/commons/io/BigByteArrayOutputStream.java similarity index 100% rename from iguana.commons/src/main/java/org/aksw/iguana/commons/io/BigByteArrayOutputStream.java rename to src/main/java/org/aksw/iguana/commons/io/BigByteArrayOutputStream.java diff --git a/iguana.commons/src/main/java/org/aksw/iguana/commons/numbers/NumberUtils.java b/src/main/java/org/aksw/iguana/commons/numbers/NumberUtils.java similarity index 100% rename from iguana.commons/src/main/java/org/aksw/iguana/commons/numbers/NumberUtils.java rename to src/main/java/org/aksw/iguana/commons/numbers/NumberUtils.java diff --git a/iguana.commons/src/main/java/org/aksw/iguana/commons/reflect/ShorthandMapper.java b/src/main/java/org/aksw/iguana/commons/reflect/ShorthandMapper.java similarity index 100% rename from iguana.commons/src/main/java/org/aksw/iguana/commons/reflect/ShorthandMapper.java rename to src/main/java/org/aksw/iguana/commons/reflect/ShorthandMapper.java diff --git a/iguana.commons/src/main/java/org/aksw/iguana/commons/script/ScriptExecutor.java b/src/main/java/org/aksw/iguana/commons/script/ScriptExecutor.java similarity index 100% rename from iguana.commons/src/main/java/org/aksw/iguana/commons/script/ScriptExecutor.java rename to src/main/java/org/aksw/iguana/commons/script/ScriptExecutor.java diff --git a/iguana.commons/src/main/java/org/aksw/iguana/commons/streams/Streams.java b/src/main/java/org/aksw/iguana/commons/streams/Streams.java similarity index 100% rename from iguana.commons/src/main/java/org/aksw/iguana/commons/streams/Streams.java rename to src/main/java/org/aksw/iguana/commons/streams/Streams.java diff --git a/iguana.commons/src/main/java/org/aksw/iguana/commons/time/TimeUtils.java b/src/main/java/org/aksw/iguana/commons/time/TimeUtils.java similarity index 100% rename from iguana.commons/src/main/java/org/aksw/iguana/commons/time/TimeUtils.java rename to src/main/java/org/aksw/iguana/commons/time/TimeUtils.java diff --git a/iguana.resultprocessor/src/main/java/org/aksw/iguana/rp/controller/RPController.java b/src/main/java/org/aksw/iguana/rp/controller/RPController.java similarity index 100% rename from iguana.resultprocessor/src/main/java/org/aksw/iguana/rp/controller/RPController.java rename to src/main/java/org/aksw/iguana/rp/controller/RPController.java diff --git a/iguana.resultprocessor/src/main/java/org/aksw/iguana/rp/experiment/ExperimentManager.java b/src/main/java/org/aksw/iguana/rp/experiment/ExperimentManager.java similarity index 100% rename from iguana.resultprocessor/src/main/java/org/aksw/iguana/rp/experiment/ExperimentManager.java rename to src/main/java/org/aksw/iguana/rp/experiment/ExperimentManager.java diff --git a/iguana.resultprocessor/src/main/java/org/aksw/iguana/rp/metrics/AbstractMetric.java b/src/main/java/org/aksw/iguana/rp/metrics/AbstractMetric.java similarity index 100% rename from iguana.resultprocessor/src/main/java/org/aksw/iguana/rp/metrics/AbstractMetric.java rename to src/main/java/org/aksw/iguana/rp/metrics/AbstractMetric.java diff --git a/iguana.resultprocessor/src/main/java/org/aksw/iguana/rp/metrics/Metric.java b/src/main/java/org/aksw/iguana/rp/metrics/Metric.java similarity index 100% rename from iguana.resultprocessor/src/main/java/org/aksw/iguana/rp/metrics/Metric.java rename to src/main/java/org/aksw/iguana/rp/metrics/Metric.java diff --git a/iguana.resultprocessor/src/main/java/org/aksw/iguana/rp/metrics/MetricManager.java b/src/main/java/org/aksw/iguana/rp/metrics/MetricManager.java similarity index 100% rename from iguana.resultprocessor/src/main/java/org/aksw/iguana/rp/metrics/MetricManager.java rename to src/main/java/org/aksw/iguana/rp/metrics/MetricManager.java diff --git a/iguana.resultprocessor/src/main/java/org/aksw/iguana/rp/metrics/impl/AvgQPSMetric.java b/src/main/java/org/aksw/iguana/rp/metrics/impl/AvgQPSMetric.java similarity index 100% rename from iguana.resultprocessor/src/main/java/org/aksw/iguana/rp/metrics/impl/AvgQPSMetric.java rename to src/main/java/org/aksw/iguana/rp/metrics/impl/AvgQPSMetric.java diff --git a/iguana.resultprocessor/src/main/java/org/aksw/iguana/rp/metrics/impl/EachQueryMetric.java b/src/main/java/org/aksw/iguana/rp/metrics/impl/EachQueryMetric.java similarity index 100% rename from iguana.resultprocessor/src/main/java/org/aksw/iguana/rp/metrics/impl/EachQueryMetric.java rename to src/main/java/org/aksw/iguana/rp/metrics/impl/EachQueryMetric.java diff --git a/iguana.resultprocessor/src/main/java/org/aksw/iguana/rp/metrics/impl/F1MeasureMetric.java b/src/main/java/org/aksw/iguana/rp/metrics/impl/F1MeasureMetric.java similarity index 100% rename from iguana.resultprocessor/src/main/java/org/aksw/iguana/rp/metrics/impl/F1MeasureMetric.java rename to src/main/java/org/aksw/iguana/rp/metrics/impl/F1MeasureMetric.java diff --git a/iguana.resultprocessor/src/main/java/org/aksw/iguana/rp/metrics/impl/NoQMetric.java b/src/main/java/org/aksw/iguana/rp/metrics/impl/NoQMetric.java similarity index 100% rename from iguana.resultprocessor/src/main/java/org/aksw/iguana/rp/metrics/impl/NoQMetric.java rename to src/main/java/org/aksw/iguana/rp/metrics/impl/NoQMetric.java diff --git a/iguana.resultprocessor/src/main/java/org/aksw/iguana/rp/metrics/impl/NoQPHMetric.java b/src/main/java/org/aksw/iguana/rp/metrics/impl/NoQPHMetric.java similarity index 100% rename from iguana.resultprocessor/src/main/java/org/aksw/iguana/rp/metrics/impl/NoQPHMetric.java rename to src/main/java/org/aksw/iguana/rp/metrics/impl/NoQPHMetric.java diff --git a/iguana.resultprocessor/src/main/java/org/aksw/iguana/rp/metrics/impl/QMPHMetric.java b/src/main/java/org/aksw/iguana/rp/metrics/impl/QMPHMetric.java similarity index 100% rename from iguana.resultprocessor/src/main/java/org/aksw/iguana/rp/metrics/impl/QMPHMetric.java rename to src/main/java/org/aksw/iguana/rp/metrics/impl/QMPHMetric.java diff --git a/iguana.resultprocessor/src/main/java/org/aksw/iguana/rp/metrics/impl/QPSMetric.java b/src/main/java/org/aksw/iguana/rp/metrics/impl/QPSMetric.java similarity index 100% rename from iguana.resultprocessor/src/main/java/org/aksw/iguana/rp/metrics/impl/QPSMetric.java rename to src/main/java/org/aksw/iguana/rp/metrics/impl/QPSMetric.java diff --git a/iguana.resultprocessor/src/main/java/org/aksw/iguana/rp/storage/Storage.java b/src/main/java/org/aksw/iguana/rp/storage/Storage.java similarity index 100% rename from iguana.resultprocessor/src/main/java/org/aksw/iguana/rp/storage/Storage.java rename to src/main/java/org/aksw/iguana/rp/storage/Storage.java diff --git a/iguana.resultprocessor/src/main/java/org/aksw/iguana/rp/storage/StorageManager.java b/src/main/java/org/aksw/iguana/rp/storage/StorageManager.java similarity index 100% rename from iguana.resultprocessor/src/main/java/org/aksw/iguana/rp/storage/StorageManager.java rename to src/main/java/org/aksw/iguana/rp/storage/StorageManager.java diff --git a/iguana.resultprocessor/src/main/java/org/aksw/iguana/rp/storage/TripleBasedStorage.java b/src/main/java/org/aksw/iguana/rp/storage/TripleBasedStorage.java similarity index 100% rename from iguana.resultprocessor/src/main/java/org/aksw/iguana/rp/storage/TripleBasedStorage.java rename to src/main/java/org/aksw/iguana/rp/storage/TripleBasedStorage.java diff --git a/iguana.resultprocessor/src/main/java/org/aksw/iguana/rp/storage/impl/NTFileStorage.java b/src/main/java/org/aksw/iguana/rp/storage/impl/NTFileStorage.java similarity index 100% rename from iguana.resultprocessor/src/main/java/org/aksw/iguana/rp/storage/impl/NTFileStorage.java rename to src/main/java/org/aksw/iguana/rp/storage/impl/NTFileStorage.java diff --git a/iguana.resultprocessor/src/main/java/org/aksw/iguana/rp/storage/impl/RDFFileStorage.java b/src/main/java/org/aksw/iguana/rp/storage/impl/RDFFileStorage.java similarity index 100% rename from iguana.resultprocessor/src/main/java/org/aksw/iguana/rp/storage/impl/RDFFileStorage.java rename to src/main/java/org/aksw/iguana/rp/storage/impl/RDFFileStorage.java diff --git a/iguana.resultprocessor/src/main/java/org/aksw/iguana/rp/storage/impl/TriplestoreStorage.java b/src/main/java/org/aksw/iguana/rp/storage/impl/TriplestoreStorage.java similarity index 100% rename from iguana.resultprocessor/src/main/java/org/aksw/iguana/rp/storage/impl/TriplestoreStorage.java rename to src/main/java/org/aksw/iguana/rp/storage/impl/TriplestoreStorage.java diff --git a/iguana.resultprocessor/src/main/java/org/aksw/iguana/rp/vocab/Vocab.java b/src/main/java/org/aksw/iguana/rp/vocab/Vocab.java similarity index 100% rename from iguana.resultprocessor/src/main/java/org/aksw/iguana/rp/vocab/Vocab.java rename to src/main/java/org/aksw/iguana/rp/vocab/Vocab.java diff --git a/iguana.corecontroller/src/main/resources/iguana-schema.json b/src/main/resources/iguana-schema.json similarity index 100% rename from iguana.corecontroller/src/main/resources/iguana-schema.json rename to src/main/resources/iguana-schema.json diff --git a/iguana.corecontroller/src/main/resources/log4j2.yml b/src/main/resources/log4j2.yml similarity index 100% rename from iguana.corecontroller/src/main/resources/log4j2.yml rename to src/main/resources/log4j2.yml diff --git a/iguana.corecontroller/src/test/java/org/aksw/iguana/cc/config/ConfigTest.java b/src/test/java/org/aksw/iguana/cc/config/ConfigTest.java similarity index 100% rename from iguana.corecontroller/src/test/java/org/aksw/iguana/cc/config/ConfigTest.java rename to src/test/java/org/aksw/iguana/cc/config/ConfigTest.java diff --git a/iguana.corecontroller/src/test/java/org/aksw/iguana/cc/config/WorkflowTest.java b/src/test/java/org/aksw/iguana/cc/config/WorkflowTest.java similarity index 100% rename from iguana.corecontroller/src/test/java/org/aksw/iguana/cc/config/WorkflowTest.java rename to src/test/java/org/aksw/iguana/cc/config/WorkflowTest.java diff --git a/iguana.corecontroller/src/test/java/org/aksw/iguana/cc/lang/MockCloseableHttpResponse.java b/src/test/java/org/aksw/iguana/cc/lang/MockCloseableHttpResponse.java similarity index 100% rename from iguana.corecontroller/src/test/java/org/aksw/iguana/cc/lang/MockCloseableHttpResponse.java rename to src/test/java/org/aksw/iguana/cc/lang/MockCloseableHttpResponse.java diff --git a/iguana.corecontroller/src/test/java/org/aksw/iguana/cc/lang/RDFLanguageProcessorTest.java b/src/test/java/org/aksw/iguana/cc/lang/RDFLanguageProcessorTest.java similarity index 100% rename from iguana.corecontroller/src/test/java/org/aksw/iguana/cc/lang/RDFLanguageProcessorTest.java rename to src/test/java/org/aksw/iguana/cc/lang/RDFLanguageProcessorTest.java diff --git a/iguana.corecontroller/src/test/java/org/aksw/iguana/cc/lang/SPARQLLanguageProcessorTest.java b/src/test/java/org/aksw/iguana/cc/lang/SPARQLLanguageProcessorTest.java similarity index 100% rename from iguana.corecontroller/src/test/java/org/aksw/iguana/cc/lang/SPARQLLanguageProcessorTest.java rename to src/test/java/org/aksw/iguana/cc/lang/SPARQLLanguageProcessorTest.java diff --git a/iguana.corecontroller/src/test/java/org/aksw/iguana/cc/model/QueryResultHashKeyTest.java b/src/test/java/org/aksw/iguana/cc/model/QueryResultHashKeyTest.java similarity index 100% rename from iguana.corecontroller/src/test/java/org/aksw/iguana/cc/model/QueryResultHashKeyTest.java rename to src/test/java/org/aksw/iguana/cc/model/QueryResultHashKeyTest.java diff --git a/iguana.corecontroller/src/test/java/org/aksw/iguana/cc/query/handler/QueryHandlerTest.java b/src/test/java/org/aksw/iguana/cc/query/handler/QueryHandlerTest.java similarity index 100% rename from iguana.corecontroller/src/test/java/org/aksw/iguana/cc/query/handler/QueryHandlerTest.java rename to src/test/java/org/aksw/iguana/cc/query/handler/QueryHandlerTest.java diff --git a/iguana.corecontroller/src/test/java/org/aksw/iguana/cc/query/pattern/PatternBasedQueryHandlerTest.java b/src/test/java/org/aksw/iguana/cc/query/pattern/PatternBasedQueryHandlerTest.java similarity index 100% rename from iguana.corecontroller/src/test/java/org/aksw/iguana/cc/query/pattern/PatternBasedQueryHandlerTest.java rename to src/test/java/org/aksw/iguana/cc/query/pattern/PatternBasedQueryHandlerTest.java diff --git a/iguana.corecontroller/src/test/java/org/aksw/iguana/cc/query/pattern/PatternHandlerTest.java b/src/test/java/org/aksw/iguana/cc/query/pattern/PatternHandlerTest.java similarity index 100% rename from iguana.corecontroller/src/test/java/org/aksw/iguana/cc/query/pattern/PatternHandlerTest.java rename to src/test/java/org/aksw/iguana/cc/query/pattern/PatternHandlerTest.java diff --git a/iguana.corecontroller/src/test/java/org/aksw/iguana/cc/query/selector/impl/LinearQuerySelectorTest.java b/src/test/java/org/aksw/iguana/cc/query/selector/impl/LinearQuerySelectorTest.java similarity index 100% rename from iguana.corecontroller/src/test/java/org/aksw/iguana/cc/query/selector/impl/LinearQuerySelectorTest.java rename to src/test/java/org/aksw/iguana/cc/query/selector/impl/LinearQuerySelectorTest.java diff --git a/iguana.corecontroller/src/test/java/org/aksw/iguana/cc/query/source/impl/FileLineQuerySourceTest.java b/src/test/java/org/aksw/iguana/cc/query/source/impl/FileLineQuerySourceTest.java similarity index 100% rename from iguana.corecontroller/src/test/java/org/aksw/iguana/cc/query/source/impl/FileLineQuerySourceTest.java rename to src/test/java/org/aksw/iguana/cc/query/source/impl/FileLineQuerySourceTest.java diff --git a/iguana.corecontroller/src/test/java/org/aksw/iguana/cc/query/source/impl/FileSeparatorQuerySourceTest.java b/src/test/java/org/aksw/iguana/cc/query/source/impl/FileSeparatorQuerySourceTest.java similarity index 100% rename from iguana.corecontroller/src/test/java/org/aksw/iguana/cc/query/source/impl/FileSeparatorQuerySourceTest.java rename to src/test/java/org/aksw/iguana/cc/query/source/impl/FileSeparatorQuerySourceTest.java diff --git a/iguana.corecontroller/src/test/java/org/aksw/iguana/cc/query/source/impl/FolderQuerySourceTest.java b/src/test/java/org/aksw/iguana/cc/query/source/impl/FolderQuerySourceTest.java similarity index 100% rename from iguana.corecontroller/src/test/java/org/aksw/iguana/cc/query/source/impl/FolderQuerySourceTest.java rename to src/test/java/org/aksw/iguana/cc/query/source/impl/FolderQuerySourceTest.java diff --git a/iguana.corecontroller/src/test/java/org/aksw/iguana/cc/tasks/MockupStorage.java b/src/test/java/org/aksw/iguana/cc/tasks/MockupStorage.java similarity index 100% rename from iguana.corecontroller/src/test/java/org/aksw/iguana/cc/tasks/MockupStorage.java rename to src/test/java/org/aksw/iguana/cc/tasks/MockupStorage.java diff --git a/iguana.corecontroller/src/test/java/org/aksw/iguana/cc/tasks/MockupTask.java b/src/test/java/org/aksw/iguana/cc/tasks/MockupTask.java similarity index 100% rename from iguana.corecontroller/src/test/java/org/aksw/iguana/cc/tasks/MockupTask.java rename to src/test/java/org/aksw/iguana/cc/tasks/MockupTask.java diff --git a/iguana.corecontroller/src/test/java/org/aksw/iguana/cc/tasks/impl/StresstestTest.java b/src/test/java/org/aksw/iguana/cc/tasks/impl/StresstestTest.java similarity index 100% rename from iguana.corecontroller/src/test/java/org/aksw/iguana/cc/tasks/impl/StresstestTest.java rename to src/test/java/org/aksw/iguana/cc/tasks/impl/StresstestTest.java diff --git a/iguana.corecontroller/src/test/java/org/aksw/iguana/cc/utils/CLIProcessManagerTest.java b/src/test/java/org/aksw/iguana/cc/utils/CLIProcessManagerTest.java similarity index 100% rename from iguana.corecontroller/src/test/java/org/aksw/iguana/cc/utils/CLIProcessManagerTest.java rename to src/test/java/org/aksw/iguana/cc/utils/CLIProcessManagerTest.java diff --git a/iguana.corecontroller/src/test/java/org/aksw/iguana/cc/utils/FileUtilsTest.java b/src/test/java/org/aksw/iguana/cc/utils/FileUtilsTest.java similarity index 100% rename from iguana.corecontroller/src/test/java/org/aksw/iguana/cc/utils/FileUtilsTest.java rename to src/test/java/org/aksw/iguana/cc/utils/FileUtilsTest.java diff --git a/iguana.corecontroller/src/test/java/org/aksw/iguana/cc/utils/IndexedQueryReaderTest.java b/src/test/java/org/aksw/iguana/cc/utils/IndexedQueryReaderTest.java similarity index 100% rename from iguana.corecontroller/src/test/java/org/aksw/iguana/cc/utils/IndexedQueryReaderTest.java rename to src/test/java/org/aksw/iguana/cc/utils/IndexedQueryReaderTest.java diff --git a/iguana.corecontroller/src/test/java/org/aksw/iguana/cc/utils/SPARQLQueryStatisticsTest.java b/src/test/java/org/aksw/iguana/cc/utils/SPARQLQueryStatisticsTest.java similarity index 100% rename from iguana.corecontroller/src/test/java/org/aksw/iguana/cc/utils/SPARQLQueryStatisticsTest.java rename to src/test/java/org/aksw/iguana/cc/utils/SPARQLQueryStatisticsTest.java diff --git a/iguana.corecontroller/src/test/java/org/aksw/iguana/cc/utils/ServerMock.java b/src/test/java/org/aksw/iguana/cc/utils/ServerMock.java similarity index 100% rename from iguana.corecontroller/src/test/java/org/aksw/iguana/cc/utils/ServerMock.java rename to src/test/java/org/aksw/iguana/cc/utils/ServerMock.java diff --git a/iguana.corecontroller/src/test/java/org/aksw/iguana/cc/worker/HTTPWorkerTest.java b/src/test/java/org/aksw/iguana/cc/worker/HTTPWorkerTest.java similarity index 100% rename from iguana.corecontroller/src/test/java/org/aksw/iguana/cc/worker/HTTPWorkerTest.java rename to src/test/java/org/aksw/iguana/cc/worker/HTTPWorkerTest.java diff --git a/iguana.corecontroller/src/test/java/org/aksw/iguana/cc/worker/MockupWorker.java b/src/test/java/org/aksw/iguana/cc/worker/MockupWorker.java similarity index 100% rename from iguana.corecontroller/src/test/java/org/aksw/iguana/cc/worker/MockupWorker.java rename to src/test/java/org/aksw/iguana/cc/worker/MockupWorker.java diff --git a/iguana.corecontroller/src/test/java/org/aksw/iguana/cc/worker/UPDATEWorkerTest.java b/src/test/java/org/aksw/iguana/cc/worker/UPDATEWorkerTest.java similarity index 100% rename from iguana.corecontroller/src/test/java/org/aksw/iguana/cc/worker/UPDATEWorkerTest.java rename to src/test/java/org/aksw/iguana/cc/worker/UPDATEWorkerTest.java diff --git a/iguana.corecontroller/src/test/java/org/aksw/iguana/cc/worker/WorkerServerMock.java b/src/test/java/org/aksw/iguana/cc/worker/WorkerServerMock.java similarity index 100% rename from iguana.corecontroller/src/test/java/org/aksw/iguana/cc/worker/WorkerServerMock.java rename to src/test/java/org/aksw/iguana/cc/worker/WorkerServerMock.java diff --git a/iguana.corecontroller/src/test/java/org/aksw/iguana/cc/worker/impl/CLIWorkersTests.java b/src/test/java/org/aksw/iguana/cc/worker/impl/CLIWorkersTests.java similarity index 100% rename from iguana.corecontroller/src/test/java/org/aksw/iguana/cc/worker/impl/CLIWorkersTests.java rename to src/test/java/org/aksw/iguana/cc/worker/impl/CLIWorkersTests.java diff --git a/iguana.corecontroller/src/test/java/org/aksw/iguana/cc/worker/impl/HttpPostWorkerTest.java b/src/test/java/org/aksw/iguana/cc/worker/impl/HttpPostWorkerTest.java similarity index 100% rename from iguana.corecontroller/src/test/java/org/aksw/iguana/cc/worker/impl/HttpPostWorkerTest.java rename to src/test/java/org/aksw/iguana/cc/worker/impl/HttpPostWorkerTest.java diff --git a/iguana.commons/src/test/java/org/aksw/iguana/commons/factory/AnnotatedFactorizedObject.java b/src/test/java/org/aksw/iguana/commons/factory/AnnotatedFactorizedObject.java similarity index 100% rename from iguana.commons/src/test/java/org/aksw/iguana/commons/factory/AnnotatedFactorizedObject.java rename to src/test/java/org/aksw/iguana/commons/factory/AnnotatedFactorizedObject.java diff --git a/iguana.commons/src/test/java/org/aksw/iguana/commons/factory/FactorizedObject.java b/src/test/java/org/aksw/iguana/commons/factory/FactorizedObject.java similarity index 100% rename from iguana.commons/src/test/java/org/aksw/iguana/commons/factory/FactorizedObject.java rename to src/test/java/org/aksw/iguana/commons/factory/FactorizedObject.java diff --git a/iguana.commons/src/test/java/org/aksw/iguana/commons/factory/TypedFactoryTest.java b/src/test/java/org/aksw/iguana/commons/factory/TypedFactoryTest.java similarity index 100% rename from iguana.commons/src/test/java/org/aksw/iguana/commons/factory/TypedFactoryTest.java rename to src/test/java/org/aksw/iguana/commons/factory/TypedFactoryTest.java diff --git a/iguana.commons/src/test/java/org/aksw/iguana/commons/number/NumberUtilsTest.java b/src/test/java/org/aksw/iguana/commons/number/NumberUtilsTest.java similarity index 100% rename from iguana.commons/src/test/java/org/aksw/iguana/commons/number/NumberUtilsTest.java rename to src/test/java/org/aksw/iguana/commons/number/NumberUtilsTest.java diff --git a/iguana.commons/src/test/java/org/aksw/iguana/commons/script/ScriptExecutorTest.java b/src/test/java/org/aksw/iguana/commons/script/ScriptExecutorTest.java similarity index 100% rename from iguana.commons/src/test/java/org/aksw/iguana/commons/script/ScriptExecutorTest.java rename to src/test/java/org/aksw/iguana/commons/script/ScriptExecutorTest.java diff --git a/iguana.commons/src/test/java/org/aksw/iguana/commons/script/ScriptExecutorWaitTest.java b/src/test/java/org/aksw/iguana/commons/script/ScriptExecutorWaitTest.java similarity index 100% rename from iguana.commons/src/test/java/org/aksw/iguana/commons/script/ScriptExecutorWaitTest.java rename to src/test/java/org/aksw/iguana/commons/script/ScriptExecutorWaitTest.java diff --git a/iguana.commons/src/test/java/org/aksw/iguana/commons/utils/ServerMock.java b/src/test/java/org/aksw/iguana/commons/utils/ServerMock.java similarity index 100% rename from iguana.commons/src/test/java/org/aksw/iguana/commons/utils/ServerMock.java rename to src/test/java/org/aksw/iguana/commons/utils/ServerMock.java diff --git a/iguana.resultprocessor/src/test/java/org/aksw/iguana/rp/metrics/impl/MetricTest.java b/src/test/java/org/aksw/iguana/rp/metrics/impl/MetricTest.java similarity index 100% rename from iguana.resultprocessor/src/test/java/org/aksw/iguana/rp/metrics/impl/MetricTest.java rename to src/test/java/org/aksw/iguana/rp/metrics/impl/MetricTest.java diff --git a/iguana.resultprocessor/src/test/java/org/aksw/iguana/rp/storage/impl/NTFileStorageTest.java b/src/test/java/org/aksw/iguana/rp/storage/impl/NTFileStorageTest.java similarity index 100% rename from iguana.resultprocessor/src/test/java/org/aksw/iguana/rp/storage/impl/NTFileStorageTest.java rename to src/test/java/org/aksw/iguana/rp/storage/impl/NTFileStorageTest.java diff --git a/iguana.resultprocessor/src/test/java/org/aksw/iguana/rp/storage/impl/RDFFileStorageTest.java b/src/test/java/org/aksw/iguana/rp/storage/impl/RDFFileStorageTest.java similarity index 100% rename from iguana.resultprocessor/src/test/java/org/aksw/iguana/rp/storage/impl/RDFFileStorageTest.java rename to src/test/java/org/aksw/iguana/rp/storage/impl/RDFFileStorageTest.java diff --git a/iguana.resultprocessor/src/test/java/org/aksw/iguana/rp/storage/impl/TriplestoreStorageTest.java b/src/test/java/org/aksw/iguana/rp/storage/impl/TriplestoreStorageTest.java similarity index 100% rename from iguana.resultprocessor/src/test/java/org/aksw/iguana/rp/storage/impl/TriplestoreStorageTest.java rename to src/test/java/org/aksw/iguana/rp/storage/impl/TriplestoreStorageTest.java diff --git a/iguana.resultprocessor/src/test/java/org/aksw/iguana/rp/utils/EqualityStorage.java b/src/test/java/org/aksw/iguana/rp/utils/EqualityStorage.java similarity index 100% rename from iguana.resultprocessor/src/test/java/org/aksw/iguana/rp/utils/EqualityStorage.java rename to src/test/java/org/aksw/iguana/rp/utils/EqualityStorage.java diff --git a/iguana.resultprocessor/src/test/java/org/aksw/iguana/rp/utils/ServerMock.java b/src/test/java/org/aksw/iguana/rp/utils/ServerMock.java similarity index 100% rename from iguana.resultprocessor/src/test/java/org/aksw/iguana/rp/utils/ServerMock.java rename to src/test/java/org/aksw/iguana/rp/utils/ServerMock.java diff --git a/iguana.corecontroller/src/test/resources/cli/echoinput.sh b/src/test/resources/cli/echoinput.sh similarity index 94% rename from iguana.corecontroller/src/test/resources/cli/echoinput.sh rename to src/test/resources/cli/echoinput.sh index 1b9360e95..c6281ea82 100755 --- a/iguana.corecontroller/src/test/resources/cli/echoinput.sh +++ b/src/test/resources/cli/echoinput.sh @@ -1,21 +1,21 @@ -#!/bin/bash - -echo "Some random words" -echo "Some random words" -echo "Some random words" -echo "words init finished words" - -read -r input - -while [ "$input" != "quit" ] -do - echo "$input" >> "$1" - printf "header\na\na\na\n" - if [ "$input" == "fail" ] || [ "$input" == "prefix fail suffix" ] - then echo "words query fail words" - else - printf "rows\n" - fi - - read -r input -done +#!/bin/bash + +echo "Some random words" +echo "Some random words" +echo "Some random words" +echo "words init finished words" + +read -r input + +while [ "$input" != "quit" ] +do + echo "$input" >> "$1" + printf "header\na\na\na\n" + if [ "$input" == "fail" ] || [ "$input" == "prefix fail suffix" ] + then echo "words query fail words" + else + printf "rows\n" + fi + + read -r input +done diff --git a/iguana.commons/src/test/resources/complex-script-example-issue108.sh b/src/test/resources/complex-script-example-issue108.sh similarity index 96% rename from iguana.commons/src/test/resources/complex-script-example-issue108.sh rename to src/test/resources/complex-script-example-issue108.sh index 1240e4387..eb20d9a29 100755 --- a/iguana.commons/src/test/resources/complex-script-example-issue108.sh +++ b/src/test/resources/complex-script-example-issue108.sh @@ -1,31 +1,31 @@ -#!/bin/bash - -if [[ -f ./shouldNotExist.pid ]] -then - echo $(date --iso-8601) - ServerMock seems to be already running - echo If it is not running remove shouldNotExist.pid - exit 1 -fi - -echo $(date --iso-8601) - Starting ServerMock - -#{{ target_dir }}/triplestores/virtuoso/{{ virtuoso_version }}/virtuoso-opensource/bin/virtuoso-t -c {{ target_dir }}/triplestores/virtuoso/virtuoso-run-{{ item[1].name }}-{{ item[2].number }}.ini -#simulating waiting for another script, normally we should start netcat or similar here, but as it's not available for anyone this should do the trick. -./src/test/resources/wait5.sh - - -echo $(date --iso-8601) - Waiting for ServerMock to become available - -while : -do - curl -s 127.0.0.1:8023 - if [ $? -eq 0 ] - then - break - fi - sleep 2 -done - -echo $(date --iso-8601) - ServerMock started and accepting connections - +#!/bin/bash + +if [[ -f ./shouldNotExist.pid ]] +then + echo $(date --iso-8601) - ServerMock seems to be already running + echo If it is not running remove shouldNotExist.pid + exit 1 +fi + +echo $(date --iso-8601) - Starting ServerMock + +#{{ target_dir }}/triplestores/virtuoso/{{ virtuoso_version }}/virtuoso-opensource/bin/virtuoso-t -c {{ target_dir }}/triplestores/virtuoso/virtuoso-run-{{ item[1].name }}-{{ item[2].number }}.ini +#simulating waiting for another script, normally we should start netcat or similar here, but as it's not available for anyone this should do the trick. +./src/test/resources/wait5.sh + + +echo $(date --iso-8601) - Waiting for ServerMock to become available + +while : +do + curl -s 127.0.0.1:8023 + if [ $? -eq 0 ] + then + break + fi + sleep 2 +done + +echo $(date --iso-8601) - ServerMock started and accepting connections + exit 0 \ No newline at end of file diff --git a/iguana.corecontroller/src/test/resources/config/mockupworkflow-default.yml b/src/test/resources/config/mockupworkflow-default.yml similarity index 100% rename from iguana.corecontroller/src/test/resources/config/mockupworkflow-default.yml rename to src/test/resources/config/mockupworkflow-default.yml diff --git a/iguana.corecontroller/src/test/resources/config/mockupworkflow-no-default.yml b/src/test/resources/config/mockupworkflow-no-default.yml similarity index 100% rename from iguana.corecontroller/src/test/resources/config/mockupworkflow-no-default.yml rename to src/test/resources/config/mockupworkflow-no-default.yml diff --git a/iguana.corecontroller/src/test/resources/config/mockupworkflow.yml b/src/test/resources/config/mockupworkflow.yml similarity index 100% rename from iguana.corecontroller/src/test/resources/config/mockupworkflow.yml rename to src/test/resources/config/mockupworkflow.yml diff --git a/iguana.corecontroller/src/test/resources/config/post.sh b/src/test/resources/config/post.sh similarity index 98% rename from iguana.corecontroller/src/test/resources/config/post.sh rename to src/test/resources/config/post.sh index bdb9bbbed..68c9e5197 100755 --- a/iguana.corecontroller/src/test/resources/config/post.sh +++ b/src/test/resources/config/post.sh @@ -1,2 +1,2 @@ -#!/bin/bash +#!/bin/bash echo "$1 $2 $3" >> post-shouldNotExist.txt \ No newline at end of file diff --git a/iguana.corecontroller/src/test/resources/config/pre.sh b/src/test/resources/config/pre.sh similarity index 98% rename from iguana.corecontroller/src/test/resources/config/pre.sh rename to src/test/resources/config/pre.sh index 42676d055..9fbc533a1 100755 --- a/iguana.corecontroller/src/test/resources/config/pre.sh +++ b/src/test/resources/config/pre.sh @@ -1,2 +1,2 @@ -#!/bin/bash +#!/bin/bash echo "$1 $2 $3" >> pre-shouldNotExist.txt \ No newline at end of file diff --git a/iguana.corecontroller/src/test/resources/config/workflow-expected.nt b/src/test/resources/config/workflow-expected.nt similarity index 100% rename from iguana.corecontroller/src/test/resources/config/workflow-expected.nt rename to src/test/resources/config/workflow-expected.nt diff --git a/iguana.resultprocessor/src/test/resources/controller_test.properties b/src/test/resources/controller_test.properties similarity index 100% rename from iguana.resultprocessor/src/test/resources/controller_test.properties rename to src/test/resources/controller_test.properties diff --git a/iguana.corecontroller/src/test/resources/fileUtils.txt b/src/test/resources/fileUtils.txt similarity index 100% rename from iguana.corecontroller/src/test/resources/fileUtils.txt rename to src/test/resources/fileUtils.txt diff --git a/iguana.corecontroller/src/test/resources/iguana-valid.json b/src/test/resources/iguana-valid.json similarity index 100% rename from iguana.corecontroller/src/test/resources/iguana-valid.json rename to src/test/resources/iguana-valid.json diff --git a/iguana.corecontroller/src/test/resources/iguana-valid.yml b/src/test/resources/iguana-valid.yml similarity index 100% rename from iguana.corecontroller/src/test/resources/iguana-valid.yml rename to src/test/resources/iguana-valid.yml diff --git a/iguana.corecontroller/src/test/resources/iguana.json b/src/test/resources/iguana.json similarity index 100% rename from iguana.corecontroller/src/test/resources/iguana.json rename to src/test/resources/iguana.json diff --git a/iguana.corecontroller/src/test/resources/iguana.yml b/src/test/resources/iguana.yml similarity index 100% rename from iguana.corecontroller/src/test/resources/iguana.yml rename to src/test/resources/iguana.yml diff --git a/iguana.corecontroller/src/test/resources/mockupq.txt b/src/test/resources/mockupq.txt similarity index 100% rename from iguana.corecontroller/src/test/resources/mockupq.txt rename to src/test/resources/mockupq.txt diff --git a/iguana.resultprocessor/src/test/resources/nt/avgqpstest.nt b/src/test/resources/nt/avgqpstest.nt similarity index 100% rename from iguana.resultprocessor/src/test/resources/nt/avgqpstest.nt rename to src/test/resources/nt/avgqpstest.nt diff --git a/iguana.resultprocessor/src/test/resources/nt/eqtest.nt b/src/test/resources/nt/eqtest.nt similarity index 100% rename from iguana.resultprocessor/src/test/resources/nt/eqtest.nt rename to src/test/resources/nt/eqtest.nt diff --git a/iguana.resultprocessor/src/test/resources/nt/f1test.nt b/src/test/resources/nt/f1test.nt similarity index 100% rename from iguana.resultprocessor/src/test/resources/nt/f1test.nt rename to src/test/resources/nt/f1test.nt diff --git a/iguana.resultprocessor/src/test/resources/nt/noqphtest.nt b/src/test/resources/nt/noqphtest.nt similarity index 100% rename from iguana.resultprocessor/src/test/resources/nt/noqphtest.nt rename to src/test/resources/nt/noqphtest.nt diff --git a/iguana.resultprocessor/src/test/resources/nt/noqtest.nt b/src/test/resources/nt/noqtest.nt similarity index 100% rename from iguana.resultprocessor/src/test/resources/nt/noqtest.nt rename to src/test/resources/nt/noqtest.nt diff --git a/iguana.resultprocessor/src/test/resources/nt/nt_results_wMeta.nt b/src/test/resources/nt/nt_results_wMeta.nt similarity index 100% rename from iguana.resultprocessor/src/test/resources/nt/nt_results_wMeta.nt rename to src/test/resources/nt/nt_results_wMeta.nt diff --git a/iguana.resultprocessor/src/test/resources/nt/nt_results_woMeta.nt b/src/test/resources/nt/nt_results_woMeta.nt similarity index 100% rename from iguana.resultprocessor/src/test/resources/nt/nt_results_woMeta.nt rename to src/test/resources/nt/nt_results_woMeta.nt diff --git a/iguana.resultprocessor/src/test/resources/nt/penaltyavgqpstest.nt b/src/test/resources/nt/penaltyavgqpstest.nt similarity index 100% rename from iguana.resultprocessor/src/test/resources/nt/penaltyavgqpstest.nt rename to src/test/resources/nt/penaltyavgqpstest.nt diff --git a/iguana.resultprocessor/src/test/resources/nt/qmphtest.nt b/src/test/resources/nt/qmphtest.nt similarity index 100% rename from iguana.resultprocessor/src/test/resources/nt/qmphtest.nt rename to src/test/resources/nt/qmphtest.nt diff --git a/iguana.resultprocessor/src/test/resources/nt/qpspenaltytest.nt b/src/test/resources/nt/qpspenaltytest.nt similarity index 100% rename from iguana.resultprocessor/src/test/resources/nt/qpspenaltytest.nt rename to src/test/resources/nt/qpspenaltytest.nt diff --git a/iguana.resultprocessor/src/test/resources/nt/qpspenaltytest2.nt b/src/test/resources/nt/qpspenaltytest2.nt similarity index 100% rename from iguana.resultprocessor/src/test/resources/nt/qpspenaltytest2.nt rename to src/test/resources/nt/qpspenaltytest2.nt diff --git a/iguana.resultprocessor/src/test/resources/nt/qpstest.nt b/src/test/resources/nt/qpstest.nt similarity index 100% rename from iguana.resultprocessor/src/test/resources/nt/qpstest.nt rename to src/test/resources/nt/qpstest.nt diff --git a/iguana.resultprocessor/src/test/resources/nt/results_test1.nt b/src/test/resources/nt/results_test1.nt similarity index 100% rename from iguana.resultprocessor/src/test/resources/nt/results_test1.nt rename to src/test/resources/nt/results_test1.nt diff --git a/iguana.corecontroller/src/test/resources/query/pattern-query.txt b/src/test/resources/query/pattern-query.txt similarity index 100% rename from iguana.corecontroller/src/test/resources/query/pattern-query.txt rename to src/test/resources/query/pattern-query.txt diff --git a/iguana.corecontroller/src/test/resources/query/source/queries.txt b/src/test/resources/query/source/queries.txt similarity index 100% rename from iguana.corecontroller/src/test/resources/query/source/queries.txt rename to src/test/resources/query/source/queries.txt diff --git a/iguana.corecontroller/src/test/resources/query/source/query-folder/query1.txt b/src/test/resources/query/source/query-folder/query1.txt similarity index 100% rename from iguana.corecontroller/src/test/resources/query/source/query-folder/query1.txt rename to src/test/resources/query/source/query-folder/query1.txt diff --git a/iguana.corecontroller/src/test/resources/query/source/query-folder/query2.txt b/src/test/resources/query/source/query-folder/query2.txt similarity index 100% rename from iguana.corecontroller/src/test/resources/query/source/query-folder/query2.txt rename to src/test/resources/query/source/query-folder/query2.txt diff --git a/iguana.corecontroller/src/test/resources/query/source/query-folder/query3.txt b/src/test/resources/query/source/query-folder/query3.txt similarity index 100% rename from iguana.corecontroller/src/test/resources/query/source/query-folder/query3.txt rename to src/test/resources/query/source/query-folder/query3.txt diff --git a/iguana.corecontroller/src/test/resources/query/source/separated-queries-default.txt b/src/test/resources/query/source/separated-queries-default.txt similarity index 100% rename from iguana.corecontroller/src/test/resources/query/source/separated-queries-default.txt rename to src/test/resources/query/source/separated-queries-default.txt diff --git a/iguana.corecontroller/src/test/resources/query/source/separated-queries-space.txt b/src/test/resources/query/source/separated-queries-space.txt similarity index 100% rename from iguana.corecontroller/src/test/resources/query/source/separated-queries-space.txt rename to src/test/resources/query/source/separated-queries-space.txt diff --git a/iguana.corecontroller/src/test/resources/querystats.nt b/src/test/resources/querystats.nt similarity index 100% rename from iguana.corecontroller/src/test/resources/querystats.nt rename to src/test/resources/querystats.nt diff --git a/iguana.corecontroller/src/test/resources/readLineTestFile1.txt b/src/test/resources/readLineTestFile1.txt similarity index 100% rename from iguana.corecontroller/src/test/resources/readLineTestFile1.txt rename to src/test/resources/readLineTestFile1.txt diff --git a/iguana.corecontroller/src/test/resources/readLineTestFile2.txt b/src/test/resources/readLineTestFile2.txt similarity index 100% rename from iguana.corecontroller/src/test/resources/readLineTestFile2.txt rename to src/test/resources/readLineTestFile2.txt diff --git a/iguana.corecontroller/src/test/resources/readLineTestFile3.txt b/src/test/resources/readLineTestFile3.txt similarity index 100% rename from iguana.corecontroller/src/test/resources/readLineTestFile3.txt rename to src/test/resources/readLineTestFile3.txt diff --git a/iguana.corecontroller/src/test/resources/sparql-json-response.json b/src/test/resources/sparql-json-response.json similarity index 100% rename from iguana.corecontroller/src/test/resources/sparql-json-response.json rename to src/test/resources/sparql-json-response.json diff --git a/iguana.corecontroller/src/test/resources/test-DatasetName.sh b/src/test/resources/test-DatasetName.sh old mode 100644 new mode 100755 similarity index 100% rename from iguana.corecontroller/src/test/resources/test-DatasetName.sh rename to src/test/resources/test-DatasetName.sh diff --git a/iguana.corecontroller/src/test/resources/updates/empty.nt b/src/test/resources/updates/empty.nt similarity index 100% rename from iguana.corecontroller/src/test/resources/updates/empty.nt rename to src/test/resources/updates/empty.nt diff --git a/iguana.corecontroller/src/test/resources/updates/test1.nt b/src/test/resources/updates/test1.nt similarity index 100% rename from iguana.corecontroller/src/test/resources/updates/test1.nt rename to src/test/resources/updates/test1.nt diff --git a/iguana.corecontroller/src/test/resources/utils/indexingtestfile1.txt b/src/test/resources/utils/indexingtestfile1.txt similarity index 100% rename from iguana.corecontroller/src/test/resources/utils/indexingtestfile1.txt rename to src/test/resources/utils/indexingtestfile1.txt diff --git a/iguana.corecontroller/src/test/resources/utils/indexingtestfile2.txt b/src/test/resources/utils/indexingtestfile2.txt similarity index 100% rename from iguana.corecontroller/src/test/resources/utils/indexingtestfile2.txt rename to src/test/resources/utils/indexingtestfile2.txt diff --git a/iguana.corecontroller/src/test/resources/utils/indexingtestfile3.txt b/src/test/resources/utils/indexingtestfile3.txt similarity index 100% rename from iguana.corecontroller/src/test/resources/utils/indexingtestfile3.txt rename to src/test/resources/utils/indexingtestfile3.txt diff --git a/iguana.corecontroller/src/test/resources/utils/indexingtestfile4.txt b/src/test/resources/utils/indexingtestfile4.txt similarity index 100% rename from iguana.corecontroller/src/test/resources/utils/indexingtestfile4.txt rename to src/test/resources/utils/indexingtestfile4.txt diff --git a/iguana.corecontroller/src/test/resources/utils/indexingtestfile5.txt b/src/test/resources/utils/indexingtestfile5.txt similarity index 100% rename from iguana.corecontroller/src/test/resources/utils/indexingtestfile5.txt rename to src/test/resources/utils/indexingtestfile5.txt diff --git a/iguana.commons/src/test/resources/wait5.sh b/src/test/resources/wait5.sh similarity index 90% rename from iguana.commons/src/test/resources/wait5.sh rename to src/test/resources/wait5.sh index 922b1ffa7..e2b8cf8c3 100755 --- a/iguana.commons/src/test/resources/wait5.sh +++ b/src/test/resources/wait5.sh @@ -1,3 +1,3 @@ -#!/bin/bash - +#!/bin/bash + sleep 5 \ No newline at end of file diff --git a/iguana.corecontroller/src/test/resources/workers/single-query.txt b/src/test/resources/workers/single-query.txt similarity index 100% rename from iguana.corecontroller/src/test/resources/workers/single-query.txt rename to src/test/resources/workers/single-query.txt diff --git a/iguana.corecontroller/src/test/resources/workers/updates.txt b/src/test/resources/workers/updates.txt similarity index 100% rename from iguana.corecontroller/src/test/resources/workers/updates.txt rename to src/test/resources/workers/updates.txt diff --git a/iguana.corecontroller/src/test/resources/workers/updates/test1.nt b/src/test/resources/workers/updates/test1.nt similarity index 100% rename from iguana.corecontroller/src/test/resources/workers/updates/test1.nt rename to src/test/resources/workers/updates/test1.nt diff --git a/iguana.corecontroller/src/test/resources/workers/updates/test2.nt b/src/test/resources/workers/updates/test2.nt similarity index 100% rename from iguana.corecontroller/src/test/resources/workers/updates/test2.nt rename to src/test/resources/workers/updates/test2.nt diff --git a/iguana.corecontroller/src/test/resources/workers/updates/test3.nt b/src/test/resources/workers/updates/test3.nt similarity index 100% rename from iguana.corecontroller/src/test/resources/workers/updates/test3.nt rename to src/test/resources/workers/updates/test3.nt diff --git a/iguana.corecontroller/src/test/resources/workers/updates/test4.nt b/src/test/resources/workers/updates/test4.nt similarity index 100% rename from iguana.corecontroller/src/test/resources/workers/updates/test4.nt rename to src/test/resources/workers/updates/test4.nt