Merge branch 'release/UV_Core_v2.3.2'

Author: tomas-knap

LICENSE.md

@@ -1,3 +1,21 @@
+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 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. See the particular module for details. 
+
+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

@@ -20,18 +20,4 @@ Please see http://unifiedviews.eu
 License
 -------
 
-The following modules of the software are licensed under GNU General Public License, Version 3, https://www.gnu.org/licenses/gpl-3.0.txt:
- 
-  * [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. 
+Please see [LICENSE](./LICENSE.md)

backend/GPL-3.txt

@@ -1,3 +1,22 @@
+UnifiedViews License - Module backend
+====================
+
+UnifiedViews (hereafter meant as UnifiedViews - Module backend) 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 repository of UnifiedViews.
+
+Open source Software License
+====================
+
+The Open Source version of UnifiedViews - Module backend - is released under the terms of GPLv3 or later http://www.gnu.org/licenses/gpl-3.0.html (or see license text below).
+
+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
 ====================
 

backend/LICENSE.md

@@ -48,6 +48,10 @@ backend.id = BackendServer1
 # By default set to -1 which means no executions are automatically cleaned up
 # backend.execution.cleanup.days.limit = -1
 
+# Automatic delete of old logs in days - delete all logs that are older than defined amount of days
+# By default it is set to -1 which means that no logs are automatically deleted
+# exec.log.history = -1
+
 # Connection configuration setting for relational database
 # for mysql {
 database.sql.driver  =  com.mysql.jdbc.Driver

backend/conf/config.sample.properties

@@ -4,9 +4,11 @@
     <parent>
         <groupId>eu.unifiedviews</groupId>
         <artifactId>uv-core</artifactId>
-        <version>2.3.1</version>
+        <version>2.3.2</version>
+	<relativePath>../pom.xml</relativePath>
     </parent>
     <artifactId>backend</artifactId>
+    <version>2.3.2</version>
     <packaging>jar</packaging>
     <name>backend</name>
     <description />
@@ -136,13 +138,4 @@
 
 
     </build>
-    <!-- define license -->
-    <licenses>
-        <license>
-            <name>GNU General Public License, Version 3</name>
-            <url>https://www.gnu.org/licenses/gpl-3.0.txt</url>
-            <distribution>repo</distribution>
-            <!-- https://maven.apache.org/pom.html#Licenses -->
-        </license>
-    </licenses>
 </project>

backend/pom.xml

@@ -1,19 +1,3 @@
-/**
- * This file is part of UnifiedViews.
- *
- * UnifiedViews 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.
- *
- * UnifiedViews 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 UnifiedViews.  If not, see <http://www.gnu.org/licenses/>.
- */
 package cz.cuni.mff.xrg.odcs.backend;
 
 import ch.qos.logback.classic.Level;

backend/src/main/java/cz/cuni/mff/xrg/odcs/backend/AppEntry.java

@@ -1,19 +1,3 @@
-/**
- * This file is part of UnifiedViews.
- *
- * UnifiedViews 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.
- *
- * UnifiedViews 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 UnifiedViews.  If not, see <http://www.gnu.org/licenses/>.
- */
 package cz.cuni.mff.xrg.odcs.backend;
 
 import org.springframework.beans.factory.annotation.Autowired;

backend/src/main/java/cz/cuni/mff/xrg/odcs/backend/EventListenerDatabase.java

@@ -1,19 +1,3 @@
-/**
- * This file is part of UnifiedViews.
- *
- * UnifiedViews 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.
- *
- * UnifiedViews 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 UnifiedViews.  If not, see <http://www.gnu.org/licenses/>.
- */
 package cz.cuni.mff.xrg.odcs.backend.auxiliaries;
 
 import java.io.File;

backend/src/main/java/cz/cuni/mff/xrg/odcs/backend/auxiliaries/AppLock.java

@@ -1,19 +1,3 @@
-/**
- * This file is part of UnifiedViews.
- *
- * UnifiedViews 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.
- *
- * UnifiedViews 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 UnifiedViews.  If not, see <http://www.gnu.org/licenses/>.
- */
 package cz.cuni.mff.xrg.odcs.backend.auxiliaries;
 
 import cz.cuni.mff.xrg.odcs.commons.app.properties.Property;