changed license to Apache License 2.0.

Also removed unnecessary author tags and refreshed the readme page.

README.md

@@ -2,36 +2,32 @@
 
 An R2RML implementation that can export relational database contents as RDF graphs, based on an [R2RML](http://www.w3.org/TR/r2rml/) mapping document. Contains an R2RML [mapping document](https://github.com/nkons/r2rml-parser/blob/master/dspace/dspace-mapping.rdf) for the [DSpace](http://www.dspace.org/) institutional repository solution.
 
-For more information, please [visit the wiki](https://github.com/nkons/r2rml-parser/wiki).
+For more information, please see the [wiki](https://github.com/nkons/r2rml-parser/wiki).
 
-Please send any feedback/questions by email to [nkons@live.com](mailto:nkons@live.com), by direct message (dm) via twitter to [@nkonstantinou](https://twitter.com/nkonstantinou), or [open a new issue](https://github.com/nkons/r2rml-parser/issues). We'll be happy to discuss how to export your data into RDF.
+Please send any feedback or questions to [nkons@live.com](mailto:nkons@live.com), or [open a new issue](https://github.com/nkons/r2rml-parser/issues). Happy to discuss how to get value from your data.
 
 If you use R2RML Parser, please cite it in your publications as follows:
 ```bibtex
-@inproceedings{Konstantinou2014,
- author = {Konstantinou, Nikolaos and Kouis, Dimitris and Mitrou, Nikolas},
- title = {Incremental Export of Relational Database Contents into RDF Graphs},
- booktitle = {Proceedings of the 4th International Conference on Web Intelligence, Mining and Semantics (WIMS14)},
- series = {WIMS '14},
- year = {2014},
- location = {Thessaloniki, Greece},
- doi = {10.1145/2611040.2611082},
- publisher = {ACM}
-} 
+@article{Konstantinou2014,
+author = {Nikolaos Konstantinou and Dimitrios-Emmanuel Spanos and Nikos Houssos and Nikolaos Mitrou},
+title = {Exposing scholarly information as Linked Open Data: RDFizing DSpace contents},
+journal = {The Electronic Library},
+volume = {32},
+number = {6},
+pages = {834-851},
+year = {2014},
+doi = {10.1108/EL-12-2012-0156}
+}
 ```
 
-## Implementation details
+### Implementation details
 
 R2RML implementation written fully in Java 7, using Apache Jena 2.11, Spring 4.0, JUnit 4.9, and Maven 3.1. Tested against MySQL 5.6, PostgreSQL 9.2 and Oracle 11g.
 
-## Licence
+### Licence
 
-This work is licensed under a Creative Commons Attribution-NonCommercial 4.0 Unported License.
+This work is licensed under the Apache License 2.0.
 
-http://creativecommons.org/licenses/by-nc/4.0/
-
-You are free to use and distribute this work as long as you provide proper reference and respect the license terms.
-
-## Publications
+### Publications
 
 You can find in the wiki a list of [publications](https://github.com/nkons/r2rml-parser/wiki/Publications) based on the tool.

src/main/java/gr/seab/r2rml/beans/Database.java

@@ -1,14 +1,3 @@
-/**
- * Licensed under the Creative Commons Attribution-NonCommercial 4.0 Unported 
- * License (the "License"). You may not use this file except in compliance with
- * the License. You may obtain a copy of the License at:
- * 
- *  http://creativecommons.org/licenses/by-nc/4.0/
- *  
- * Unless required by applicable law or agreed to in writing, software distributed
- * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
- * CONDITIONS OF ANY KIND, either express or implied.
- */
 package gr.seab.r2rml.beans;
 
 import java.sql.Connection;

src/main/java/gr/seab/r2rml/beans/DatabaseImpl.java

@@ -1,14 +1,3 @@
-/**
- * Licensed under the Creative Commons Attribution-NonCommercial 4.0 Unported 
- * License (the "License"). You may not use this file except in compliance with
- * the License. You may obtain a copy of the License at:
- * 
- *  http://creativecommons.org/licenses/by-nc/4.0/
- *  
- * Unless required by applicable law or agreed to in writing, software distributed
- * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
- * CONDITIONS OF ANY KIND, either express or implied.
- */
 package gr.seab.r2rml.beans;
 
 import java.sql.Connection;
@@ -25,7 +14,6 @@
 
 /**
  * Database functions
- * @author nkons
  * 
  */
 public class DatabaseImpl implements Database {

src/main/java/gr/seab/r2rml/beans/Generator.java

@@ -1,14 +1,3 @@
-/**
- * Licensed under the Creative Commons Attribution-NonCommercial 4.0 Unported 
- * License (the "License"). You may not use this file except in compliance with
- * the License. You may obtain a copy of the License at:
- * 
- *  http://creativecommons.org/licenses/by-nc/4.0/
- *  
- * Unless required by applicable law or agreed to in writing, software distributed
- * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
- * CONDITIONS OF ANY KIND, either express or implied.
- */
 package gr.seab.r2rml.beans;
 
 import com.hp.hpl.jena.datatypes.RDFDatatype;
@@ -64,7 +53,6 @@
 /**
  * Generates the resulting graph, based on the mapping document
  * @see MappingDocument
- * @author nkons
  *
  */
 public class Generator {

src/main/java/gr/seab/r2rml/beans/Main.java

@@ -1,14 +1,3 @@
-/**
- * Licensed under the Creative Commons Attribution-NonCommercial 4.0 Unported 
- * License (the "License"). You may not use this file except in compliance with
- * the License. You may obtain a copy of the License at:
- * 
- *  http://creativecommons.org/licenses/by-nc/4.0/
- *  
- * Unless required by applicable law or agreed to in writing, software distributed
- * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
- * CONDITIONS OF ANY KIND, either express or implied.
- */
 package gr.seab.r2rml.beans;
 
 import gr.seab.r2rml.entities.MappingDocument;

src/main/java/gr/seab/r2rml/beans/Parser.java

@@ -1,14 +1,3 @@
-/**
- * Licensed under the Creative Commons Attribution-NonCommercial 4.0 Unported 
- * License (the "License"). You may not use this file except in compliance with
- * the License. You may obtain a copy of the License at:
- * 
- *  http://creativecommons.org/licenses/by-nc/4.0/
- *  
- * Unless required by applicable law or agreed to in writing, software distributed
- * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
- * CONDITIONS OF ANY KIND, either express or implied.
- */
 package gr.seab.r2rml.beans;
 
 import gr.seab.r2rml.entities.DatabaseType;
@@ -50,7 +39,6 @@
 /**
  * Parses a valid R2RML file and produces a mapping document
  * @see MappingDocument
- * @author nkons
  *
  */
 public class Parser {

src/main/java/gr/seab/r2rml/beans/Util.java

@@ -1,14 +1,3 @@
-/**
- * Licensed under the Creative Commons Attribution-NonCommercial 4.0 Unported 
- * License (the "License"). You may not use this file except in compliance with
- * the License. You may obtain a copy of the License at:
- * 
- *  http://creativecommons.org/licenses/by-nc/4.0/
- *  
- * Unless required by applicable law or agreed to in writing, software distributed
- * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
- * CONDITIONS OF ANY KIND, either express or implied.
- */
 package gr.seab.r2rml.beans;
 
 import gr.seab.r2rml.entities.LogicalTableMapping;

src/main/java/gr/seab/r2rml/beans/UtilImpl.java

@@ -1,14 +1,3 @@
-/**
- * Licensed under the Creative Commons Attribution-NonCommercial 4.0 Unported 
- * License (the "License"). You may not use this file except in compliance with
- * the License. You may obtain a copy of the License at:
- * 
- *  http://creativecommons.org/licenses/by-nc/4.0/
- *  
- * Unless required by applicable law or agreed to in writing, software distributed
- * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
- * CONDITIONS OF ANY KIND, either express or implied.
- */
 package gr.seab.r2rml.beans;
 
 import gr.seab.r2rml.entities.LogicalTableMapping;

src/main/java/gr/seab/r2rml/entities/DatabaseType.java

@@ -1,20 +1,8 @@
-/**
- * Licensed under the Creative Commons Attribution-NonCommercial 4.0 Unported 
- * License (the "License"). You may not use this file except in compliance with
- * the License. You may obtain a copy of the License at:
- * 
- *  http://creativecommons.org/licenses/by-nc/4.0/
- *  
- * Unless required by applicable law or agreed to in writing, software distributed
- * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
- * CONDITIONS OF ANY KIND, either express or implied.
- */
 package gr.seab.r2rml.entities;
 
 /**
  *
  * Source database types
- * @author nkons
  * 
  */
 public enum DatabaseType {

src/main/java/gr/seab/r2rml/entities/LogicalTableMapping.java

@@ -1,21 +1,9 @@
-/**
- * Licensed under the Creative Commons Attribution-NonCommercial 4.0 Unported 
- * License (the "License"). You may not use this file except in compliance with
- * the License. You may obtain a copy of the License at:
- * 
- *  http://creativecommons.org/licenses/by-nc/4.0/
- *  
- * Unless required by applicable law or agreed to in writing, software distributed
- * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
- * CONDITIONS OF ANY KIND, either express or implied.
- */
 package gr.seab.r2rml.entities;
 
 import java.util.ArrayList;
 
 /**
  * Logical table mappings can either map an arbitrary query or a single table name
- * @author nkons
  *
  */
 public class LogicalTableMapping {

src/main/java/gr/seab/r2rml/entities/LogicalTableView.java

@@ -1,21 +1,9 @@
-/**
- * Licensed under the Creative Commons Attribution-NonCommercial 4.0 Unported 
- * License (the "License"). You may not use this file except in compliance with
- * the License. You may obtain a copy of the License at:
- * 
- *  http://creativecommons.org/licenses/by-nc/4.0/
- *  
- * Unless required by applicable law or agreed to in writing, software distributed
- * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
- * CONDITIONS OF ANY KIND, either express or implied.
- */
 package gr.seab.r2rml.entities;
 
 import gr.seab.r2rml.entities.sql.SelectQuery;
 
 /**
  * The logical view of the mapping can be either the fields of a table or an arbitrary sql query.
- * @author nkons
  *
  */
 public class LogicalTableView {

src/main/java/gr/seab/r2rml/entities/MappingDocument.java

@@ -1,14 +1,3 @@
-/**
- * Licensed under the Creative Commons Attribution-NonCommercial 4.0 Unported 
- * License (the "License"). You may not use this file except in compliance with
- * the License. You may obtain a copy of the License at:
- * 
- *  http://creativecommons.org/licenses/by-nc/4.0/
- *  
- * Unless required by applicable law or agreed to in writing, software distributed
- * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
- * CONDITIONS OF ANY KIND, either express or implied.
- */
 package gr.seab.r2rml.entities;
 
 import java.util.ArrayList;
@@ -20,7 +9,6 @@
 
 /**
  * Holds the information of the mapping file. It is useful for retrieving values on demand.
- * @author nkons
  *
  */
 public class MappingDocument {

src/main/java/gr/seab/r2rml/entities/PredicateObjectMap.java

@@ -1,14 +1,3 @@
-/**
- * Licensed under the Creative Commons Attribution-NonCommercial 4.0 Unported 
- * License (the "License"). You may not use this file except in compliance with
- * the License. You may obtain a copy of the License at:
- * 
- *  http://creativecommons.org/licenses/by-nc/4.0/
- *  
- * Unless required by applicable law or agreed to in writing, software distributed
- * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
- * CONDITIONS OF ANY KIND, either express or implied.
- */
 package gr.seab.r2rml.entities;
 
 import java.util.ArrayList;
@@ -17,7 +6,6 @@
 
 /**
  * The mapping of predicates and respective objects for a specific subject. Objects come either from a column or from a template.
- * @author nkons
  *
  */
 public class PredicateObjectMap {

src/main/java/gr/seab/r2rml/entities/RefObjectMap.java

@@ -1,14 +1,3 @@
-/**
- * Licensed under the Creative Commons Attribution-NonCommercial 4.0 Unported 
- * License (the "License"). You may not use this file except in compliance with
- * the License. You may obtain a copy of the License at:
- * 
- *  http://creativecommons.org/licenses/by-nc/4.0/
- *  
- * Unless required by applicable law or agreed to in writing, software distributed
- * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
- * CONDITIONS OF ANY KIND, either express or implied.
- */
 package gr.seab.r2rml.entities;
 
 public class RefObjectMap {

src/main/java/gr/seab/r2rml/entities/SubjectMap.java

@@ -1,14 +1,3 @@
-/**
- * Licensed under the Creative Commons Attribution-NonCommercial 4.0 Unported 
- * License (the "License"). You may not use this file except in compliance with
- * the License. You may obtain a copy of the License at:
- * 
- *  http://creativecommons.org/licenses/by-nc/4.0/
- *  
- * Unless required by applicable law or agreed to in writing, software distributed
- * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
- * CONDITIONS OF ANY KIND, either express or implied.
- */
 package gr.seab.r2rml.entities;
 
 import gr.seab.r2rml.entities.sql.SelectQuery;
@@ -18,7 +7,6 @@
 /**
  * The subject map holds information about how to create the subjects of the mappings.
  * @see LogicalTableMapping
- * @author nkons
  *
  */
 public class SubjectMap {

src/main/java/gr/seab/r2rml/entities/Template.java

@@ -1,14 +1,3 @@
-/**
- * Licensed under the Creative Commons Attribution-NonCommercial 4.0 Unported 
- * License (the "License"). You may not use this file except in compliance with
- * the License. You may obtain a copy of the License at:
- * 
- *  http://creativecommons.org/licenses/by-nc/4.0/
- *  
- * Unless required by applicable law or agreed to in writing, software distributed
- * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
- * CONDITIONS OF ANY KIND, either express or implied.
- */
 package gr.seab.r2rml.entities;
 
 import java.util.ArrayList;
@@ -20,7 +9,6 @@
  * The template is a component of the form http://data.example.com/film/{film_id}. Encloses fields in brackets.
  * @see SubjectMap
  * @see PredicateObjectMap
- * @author nkons
  *
  */
 public class Template {

src/main/java/gr/seab/r2rml/entities/TermType.java

@@ -1,19 +1,7 @@
-/**
- * Licensed under the Creative Commons Attribution-NonCommercial 4.0 Unported 
- * License (the "License"). You may not use this file except in compliance with
- * the License. You may obtain a copy of the License at:
- * 
- *  http://creativecommons.org/licenses/by-nc/4.0/
- *  
- * Unless required by applicable law or agreed to in writing, software distributed
- * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
- * CONDITIONS OF ANY KIND, either express or implied.
- */
 package gr.seab.r2rml.entities;
 
 /**
  * RDF resource types
- * @author nkons
  *
  */
 public enum TermType {

src/main/java/gr/seab/r2rml/entities/sparql/LocalResource.java

@@ -1,14 +1,3 @@
-/**
- * Licensed under the Creative Commons Attribution-NonCommercial 4.0 Unported 
- * License (the "License"). You may not use this file except in compliance with
- * the License. You may obtain a copy of the License at:
- * 
- *  http://creativecommons.org/licenses/by-nc/4.0/
- *  
- * Unless required by applicable law or agreed to in writing, software distributed
- * under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
- * CONDITIONS OF ANY KIND, either express or implied.
- */
 package gr.seab.r2rml.entities.sparql;
 
 import java.io.UnsupportedEncodingException;
@@ -24,7 +13,6 @@
 /**
  * A local resource, and associated information. Is contained in rows of a Sparql query resultset
  * @see LocalResultRow
- * @author nkons
  *
  */
 public class LocalResource {