Merge branch 'develop' into feature/384_scheduler_gui_change_access_v…

…ia_URL

Conflicts:
	frontend/src/main/java/cz/cuni/mff/xrg/odcs/frontend/gui/views/Scheduler.java
	frontend/src/main/resources/frontend-messages.properties
	frontend/src/main/resources/frontend-messages_sk.properties

.gitignore

@@ -27,6 +27,7 @@ nb-configuration.xml
 # Build Directories #
 target/
 bin/
+working/
 
 # Package Files #
 *.war

LICENSE.md

@@ -1,21 +1,3 @@
-UnifiedViews License
-====================
-
-UnifiedViews is meant to be an free and open source for all now and in future.
-We encourage continuous, self sustainable development supported by both the open source community and commercial stake holders. This way both parties (community and commercial users) profit from each other by code and financial resources for core development. Therefore we adopted a dual licensing approach for UnifiedViews. All contributor need to agree and sign the CLA (https://github.com/UnifiedViews/Core/blob/master/ContributorAgreement_UnifiedViews.pdf), if they want to push in the master repository of UnifiedViews.
-
-Open source Software License
-====================
-
-The Open Source version of UnifiedViews is released under the terms of GPLv3 or later http://www.gnu.org/licenses/gpl-3.0.html (or see license text below) and LGPLv3 or later http://opensource.org/licenses/lgpl-3.0.html.
-
-As an additional permission to the GNU GPL version 3, you may distribute non-source (e.g., minimized or compacted) forms of the UnifiedViews source code without the copy of the GNU GPL normally required, provided you include this license notice and a URL through which recipients can access the Corresponding Source.
-
-Commercial Software License
-====================
-
-The commercial version allows to use, modify, copy and distribute without any restrictions as stated in the commercial license agreement.
-
 GNU GENERAL PUBLIC LICENSE
 ====================
 

README.md

@@ -1,55 +1,37 @@
-UnifiedViews
-============
+UnifiedViews/Core
+=================
 
-The tool uses data processing pipelines for obtaining, processing, and storing
-RDF data. It makes data processing highly customizable by employing custom data
-processing units, also provides data processing monitoring, debugging, and
-scheduling capabilities.
+UnifiedViews is an open source Extract-Transform-Load (ETL) framework that allows users - publishers, consumers, or analysts - to define, execute, monitor, debug, schedule, and share RDF data processing tasks. The data processing tasks may use custom plugins created by users. UnifiedViews differs from other ETL frameworks by natively supporting RDF data and ontologies. UnifiedViews has a graphical user interface for the administration, debugging, and monitoring of the ETL process. 
 
+This repository contains UnifiedViews Core modules. 
 
 Documentation
 -------------
 
-https://grips.semantic-web.at/display/UDDOC/Introduction
+Please see http://unifiedviews.eu
 
 
 Installation steps
 ------------------
 
-Please see https://grips.semantic-web.at/display/UDDOC/Installation+Guide
+Please see http://unifiedviews.eu
 
 
-Licenses
+License
 -------
 
-The following modules of the software are licensed under GNU Lesser General Public License, Version 3, https://www.gnu.org/licenses/lgpl-3.0.txt:
-
-  * commons
-  * commons-module
-  * commons-web
-  * dataunit-rdf
-  * dataunit-file
-  * ontology
-  * module-test
-  * module-base
-
-
 The following modules of the software are licensed under GNU General Public License, Version 3, https://www.gnu.org/licenses/gpl-3.0.txt:
-
-  * commons-app
-  * frontend
-  * backend
-  * dataunit
-  * dataunit-file-impl
-  * dataunit-rdf-impl
-  * RDF_File_Extractor
-  * RDF_File_Loader 
-  * SPARQL_Extractor 
-  * SPARQL_Loader 
-  * SPARQL_Transformer
-  * RDF_Data_Validator 
-  * Silk_Linker_Extractor
-
-For details, please see the particular module. 
-
 
+  * [backend](./backend/LICENSE.md)
+  * [commons-app](./commons-app/LICENSE.md)
+  * [dataunit](./dataunit/LICENSE.md)
+  * [dataunit-file](./dataunit-file/LICENSE.md)
+  * [dataunit-file-impl](./dataunit-file-impl/LICENSE.md)
+  * [dataunit-rdf](./dataunit-rdf/LICENSE.md)
+  * [dataunit-rdf-impl](./dataunit-rdf-impl/LICENSE.md)
+  * [dataunit-relational-impl](./dataunit-relational-impl/LICENSE.md)
+  * [frontend](./frontend/LICENSE.md)
+  * [master](./master/LICENSE.md)
+  * [module-test](./module-test/LICENSE.md)
+
+For details, please see the particular module. 

backend/GPL-3.txt

@@ -0,0 +1,14 @@
+This file is part of ${license.project.name}.
+
+${license.project.name} is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+${license.project.name} is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with ${license.project.name}.  If not, see <http://www.gnu.org/licenses/>.