From 4a3472aa8071ede1021cbc14c83246232391a6f2 Mon Sep 17 00:00:00 2001 From: Nikolaos Konstantinou Date: Thu, 16 Oct 2014 14:46:06 +0300 Subject: [PATCH] 1. properties file can now be passed as a command-line argument 2. Updated license from 3.0 to 4.0 --- README.md | 6 +- pom.xml | 19 +++-- r2rml-parser.bat | 6 +- r2rml-parser.sh | 6 +- .../java/gr/seab/r2rml/beans/Database.java | 7 +- .../gr/seab/r2rml/beans/DatabaseImpl.java | 37 ++------- .../java/gr/seab/r2rml/beans/Generator.java | 4 +- src/main/java/gr/seab/r2rml/beans/Main.java | 80 +++++++++++++++---- src/main/java/gr/seab/r2rml/beans/Parser.java | 24 +----- src/main/java/gr/seab/r2rml/beans/Util.java | 4 +- .../java/gr/seab/r2rml/beans/UtilImpl.java | 6 +- .../util/LogicalTableMappingComparator.java | 11 +++ .../gr/seab/r2rml/entities/DatabaseType.java | 4 +- .../r2rml/entities/LogicalTableMapping.java | 6 +- .../seab/r2rml/entities/LogicalTableView.java | 4 +- .../seab/r2rml/entities/MappingDocument.java | 4 +- .../r2rml/entities/PredicateObjectMap.java | 4 +- .../gr/seab/r2rml/entities/RefObjectMap.java | 11 +++ .../gr/seab/r2rml/entities/SubjectMap.java | 4 +- .../java/gr/seab/r2rml/entities/Template.java | 4 +- .../java/gr/seab/r2rml/entities/TermType.java | 4 +- .../r2rml/entities/sparql/LocalResource.java | 4 +- .../r2rml/entities/sparql/LocalResultRow.java | 4 +- .../r2rml/entities/sparql/LocalResultSet.java | 4 +- .../r2rml/entities/sparql/LocalTriple.java | 4 +- .../r2rml/entities/sparql/SparqlQuery.java | 5 +- .../seab/r2rml/entities/sql/SelectField.java | 5 +- .../seab/r2rml/entities/sql/SelectQuery.java | 6 +- .../seab/r2rml/entities/sql/SelectTable.java | 4 +- src/main/resources/app-context.xml | 2 - 30 files changed, 162 insertions(+), 131 deletions(-) diff --git a/README.md b/README.md index f67a8e8..8335e42 100644 --- a/README.md +++ b/README.md @@ -12,9 +12,9 @@ R2RML implementation written fully in Java 7, using Apache Jena 2.11, Spring 4.0 ## Licence -This work is licensed under a Creative Commons Attribution-NonCommercial 3.0 Unported License. +This work is licensed under a Creative Commons Attribution-NonCommercial 4.0 Unported License. -http://creativecommons.org/licenses/by-nc/3.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. @@ -22,7 +22,7 @@ You are free to use and distribute this work as long as you provide proper refer 1. N. Konstantinou, D. Kouis, N. Mitrou: ["Incremental Export of Relational Database Contents into RDF Graphs"](https://www.researchgate.net/publication/262098563_Incremental_Export_of_Relational_Database_Contents_into_RDF_Graphs). In 4th International Conference on Web Intelligence, Mining and Semantics (WIMS'14), Thessaloniki, Greece, June 2014 [(doi:10.1145/2611040.2611082)](http://dx.doi.org/10.1145/2611040.2611082) [(slides)](http://www.slideshare.net/nkons/wims14-v2) -1. N. Konstantinou, D.E. Spanos, N. Houssos, N. Mitrou: ["Exposing Scholarly Information as Linked Open Data: RDFizing DSpace contents"](https://www.researchgate.net/publication/236881378_Exposing_Scholarly_Information_as_Linked_Open_Data_RDFizing_DSpace_contents). In The Electronic Library, Vol. 32, No. 6, 2014 (to appear) +1. N. Konstantinou, D.E. Spanos, N. Houssos, N. Mitrou: ["Exposing Scholarly Information as Linked Open Data: RDFizing DSpace contents"](https://www.researchgate.net/publication/236881378_Exposing_Scholarly_Information_as_Linked_Open_Data_RDFizing_DSpace_contents). In The Electronic Library, Vol. 32, No. 6, 2014 1. N. Konstantinou, D.E. Spanos, N. Mitrou: ["Transient and persistent RDF views over relational databases in the context of digital repositories"](https://www.researchgate.net/publication/258235039_Transient_and_persistent_RDF_views_over_relational_databases_in_the_context_of_digital_repositories). In 7th Metadata and Semantics Research Conference (MTSR'13), Thessaloniki, Greece, Springer, CCIS 390, pp. 342-354, November 2013 [(doi:10.1007/978-3-319-03437-9_33)](http://dx.doi.org/10.1007/978-3-319-03437-9_33) [(slides)](http://www.slideshare.net/nkons/transient-and-persistent-rdf-views-over-relational-databases-in-the-context-of-digital-repositories) diff --git a/pom.xml b/pom.xml index 0a80ba9..e28d9be 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ 4.0.0 gr.seab r2rml-parser - 0.6 + 0.7 jar R2RML Parser @@ -114,11 +114,16 @@ pom 2.11.2 - - com.oracle - ojdbc6 - 11.2.0.3 - + + com.oracle + ojdbc6 + 11.2.0.3 + + + commons-cli + commons-cli + 1.2 + @@ -145,7 +150,7 @@ Nikolaos Konstantinou nkons at cn.ntua.gr - https://www.researchgate.net/profile/Nikolaos_Konstantinou/ + http://people.cn.ntua.gr/nkons/ Hellenic Academic Libraries Link/National Technical University of Athens (HEAL-Link/NTUA) http://www.seab.gr diff --git a/r2rml-parser.bat b/r2rml-parser.bat index 1c06c22..f3f9e5f 100644 --- a/r2rml-parser.bat +++ b/r2rml-parser.bat @@ -1,4 +1,4 @@ @echo off -echo This is R2RML Parser 0.6-alpha -java -Xms128m -Xmx1024m -cp "./*;./lib/*;" gr.seab.r2rml.beans.Main %1 -echo R2RML Parser 0.6-alpha. Done. +echo This is R2RML Parser 0.7-alpha. Run with -h for help on options. +java -Xms128m -Xmx1024m -cp "./*;./lib/*;" gr.seab.r2rml.beans.Main %1 %2 +echo R2RML Parser 0.7-alpha. Done. diff --git a/r2rml-parser.sh b/r2rml-parser.sh index f659504..dc256d7 100644 --- a/r2rml-parser.sh +++ b/r2rml-parser.sh @@ -1,3 +1,3 @@ -echo "This is R2RML Parser 0.6-alpha" -java -Xms128m -Xmx1024m -cp "./*;./lib/*;" -jar lib/r2rml-parser-0.6.jar -o true -echo "R2RML Parser 0.6-alpha. Done." \ No newline at end of file +echo "This is R2RML Parser 0.7-alpha. Run with -h for help on options." +java -Xms128m -Xmx1024m -cp "./*;./lib/*;" -jar lib/r2rml-parser-0.7.jar $1 $2 +echo "R2RML Parser 0.7-alpha. Done." \ No newline at end of file diff --git a/src/main/java/gr/seab/r2rml/beans/Database.java b/src/main/java/gr/seab/r2rml/beans/Database.java index e43cbc6..b2b746d 100644 --- a/src/main/java/gr/seab/r2rml/beans/Database.java +++ b/src/main/java/gr/seab/r2rml/beans/Database.java @@ -1,9 +1,9 @@ /** - * Licensed under the Creative Commons Attribution-NonCommercial 3.0 Unported + * 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/3.0/ + * 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 @@ -13,6 +13,7 @@ import java.sql.Connection; import java.sql.ResultSet; +import java.util.Properties; public interface Database { @@ -22,4 +23,6 @@ public interface Database { public void testQuery(String query); + public void setProperties(Properties properties); + } diff --git a/src/main/java/gr/seab/r2rml/beans/DatabaseImpl.java b/src/main/java/gr/seab/r2rml/beans/DatabaseImpl.java index b1d643f..c2dc7e9 100644 --- a/src/main/java/gr/seab/r2rml/beans/DatabaseImpl.java +++ b/src/main/java/gr/seab/r2rml/beans/DatabaseImpl.java @@ -1,9 +1,9 @@ /** - * Licensed under the Creative Commons Attribution-NonCommercial 3.0 Unported + * 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/3.0/ + * 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 @@ -11,7 +11,6 @@ */ package gr.seab.r2rml.beans; -import java.io.FileInputStream; import java.sql.Connection; import java.sql.DriverManager; import java.sql.PreparedStatement; @@ -35,9 +34,7 @@ public class DatabaseImpl implements Database { private Connection connection; - private Properties properties = new Properties(); - - private String propertiesFilename; + private Properties properties; private Util util; @@ -45,18 +42,6 @@ public DatabaseImpl() { } - /** - * - */ - public DatabaseImpl(String propertiesFilename) { - try { - properties.load(new FileInputStream(propertiesFilename)); - } catch (Exception e) { - e.printStackTrace(); - System.exit(1); - } - } - public Connection openConnection() { log.info("Establishing source (relational) connection."); if (connection == null) { @@ -73,7 +58,7 @@ public Connection openConnection() { log.info("Established source (relational) connection."); return connection; } catch (Exception e) { - e.printStackTrace(); + log.error("Error establishing source (relational) connection! Please check your connection settings."); System.exit(1); } } else { @@ -92,7 +77,7 @@ public ResultSet query(String query) { Statement statement = connection.createStatement(ResultSet.TYPE_SCROLL_SENSITIVE, ResultSet.CONCUR_UPDATABLE); result = statement.executeQuery(query); } catch (SQLException e) { - e.printStackTrace(); + log.error("Error executing query! Query was: " + query); System.exit(1); } return result; @@ -114,19 +99,11 @@ public void testQuery(String query) { preparedStatement.close(); } catch (SQLException e) { - e.printStackTrace(); + log.error("Error testing query! Query was: " + query); System.exit(1); } } - - public String getPropertiesFilename() { - return propertiesFilename; - } - - public void setPropertiesFilename(String propertiesFilename) { - this.propertiesFilename = propertiesFilename; - } - + public Util getUtil() { return util; } diff --git a/src/main/java/gr/seab/r2rml/beans/Generator.java b/src/main/java/gr/seab/r2rml/beans/Generator.java index c2747c5..3e1a002 100644 --- a/src/main/java/gr/seab/r2rml/beans/Generator.java +++ b/src/main/java/gr/seab/r2rml/beans/Generator.java @@ -1,9 +1,9 @@ /** - * Licensed under the Creative Commons Attribution-NonCommercial 3.0 Unported + * 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/3.0/ + * 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 diff --git a/src/main/java/gr/seab/r2rml/beans/Main.java b/src/main/java/gr/seab/r2rml/beans/Main.java index 1c38910..f5b685f 100644 --- a/src/main/java/gr/seab/r2rml/beans/Main.java +++ b/src/main/java/gr/seab/r2rml/beans/Main.java @@ -1,9 +1,9 @@ /** - * Licensed under the Creative Commons Attribution-NonCommercial 3.0 Unported + * 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/3.0/ + * 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 @@ -13,9 +13,19 @@ import gr.seab.r2rml.entities.MappingDocument; -import java.io.File; +import java.io.FileInputStream; +import java.io.FileNotFoundException; +import java.io.IOException; import java.util.Calendar; +import java.util.Properties; +import org.apache.commons.cli.CommandLine; +import org.apache.commons.cli.CommandLineParser; +import org.apache.commons.cli.HelpFormatter; +import org.apache.commons.cli.Options; +import org.apache.commons.cli.ParseException; +import org.apache.commons.cli.PosixParser; +import org.apache.commons.lang.StringUtils; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.context.support.ClassPathXmlApplicationContext; @@ -23,31 +33,71 @@ public class Main { private static final Logger log = LoggerFactory.getLogger(Main.class); + /** + * The properties, as read from the properties file. + */ + private static Properties properties = new Properties(); + public static void main(String[] args) { Calendar c0 = Calendar.getInstance(); long t0 = c0.getTimeInMillis(); - String appContextFile = "app-context.xml"; - if (args.length > 0) { - File f = new File(args[0]); - if (f.exists()) { - log.info("Spring context descriptor set to " + args[0]); - appContextFile = args[0]; - } else { - log.info("File " + args[0] + " not in classpath, using app-context.xml instead"); + + CommandLineParser cmdParser = new PosixParser(); + + Options cmdOptions = new Options(); + cmdOptions.addOption("p", "properties", true, "define the properties file. Example: r2rml-parser -p r2rml.properties"); + cmdOptions.addOption("h", "print help", false, "help"); + + String propertiesFile = "r2rml.properties"; + + try { + CommandLine line = cmdParser.parse(cmdOptions, args); + + if (line.hasOption("h")) { + HelpFormatter help = new HelpFormatter(); + help.printHelp("r2rml-parser\n", cmdOptions); + System.exit(0); } - } else { - log.info("Spring context file not provided, using app-context.xml"); + + if (line.hasOption("p")) { + propertiesFile = line.getOptionValue("p"); + } + } catch (ParseException e1) { + //e1.printStackTrace(); + log.error("Error parsing command line arguments."); + System.exit(1); } - ClassPathXmlApplicationContext context = new ClassPathXmlApplicationContext(appContextFile); + + try { + if (StringUtils.isNotEmpty(propertiesFile)) { + properties.load(new FileInputStream(propertiesFile)); + log.info("Loaded properties from " + propertiesFile); + } + } catch (FileNotFoundException e) { + //e.printStackTrace(); + log.error("Properties file not found (" + propertiesFile + ")."); + System.exit(1); + } catch (IOException e) { + //e.printStackTrace(); + log.error("Error reading properties file (" + propertiesFile + ")."); + System.exit(1); + } + + ClassPathXmlApplicationContext context = new ClassPathXmlApplicationContext("app-context.xml"); + + Database db = (Database) context.getBean("db"); + db.setProperties(properties); Parser parser = (Parser) context.getBean("parser"); + parser.setProperties(properties); + MappingDocument mappingDocument = parser.parse(); mappingDocument.getTimestamps().add(t0); //0 Started mappingDocument.getTimestamps().add(Calendar.getInstance().getTimeInMillis()); //1 Finished parsing. Starting generating result model. Generator generator = (Generator) context.getBean("generator"); - generator.setProperties(parser.getProperties()); + generator.setProperties(properties); generator.setResultModel(parser.getResultModel()); //Actually do the output diff --git a/src/main/java/gr/seab/r2rml/beans/Parser.java b/src/main/java/gr/seab/r2rml/beans/Parser.java index e283a47..3a1ba12 100644 --- a/src/main/java/gr/seab/r2rml/beans/Parser.java +++ b/src/main/java/gr/seab/r2rml/beans/Parser.java @@ -1,9 +1,9 @@ /** - * Licensed under the Creative Commons Attribution-NonCommercial 3.0 Unported + * 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/3.0/ + * 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 @@ -24,9 +24,6 @@ import gr.seab.r2rml.entities.sparql.LocalResultSet; import gr.seab.r2rml.entities.sql.SelectQuery; -import java.io.FileInputStream; -import java.io.FileNotFoundException; -import java.io.IOException; import java.io.InputStream; import java.util.ArrayList; import java.util.Collections; @@ -96,7 +93,7 @@ public class Parser { /** * The properties, as read from the properties file. */ - private Properties properties = new Properties(); + private Properties properties; private boolean verbose; @@ -105,21 +102,6 @@ public class Parser { private Util util; public Parser() { - - } - - public Parser(String propertiesFilename) { - this.propertiesFilename = propertiesFilename; - try { - if (StringUtils.isNotEmpty(propertiesFilename)) { - properties.load(new FileInputStream(propertiesFilename)); - log.info("Loaded properties from " + propertiesFilename); - } - } catch (FileNotFoundException e) { - e.printStackTrace(); - } catch (IOException e) { - e.printStackTrace(); - } } @SuppressWarnings("unchecked") diff --git a/src/main/java/gr/seab/r2rml/beans/Util.java b/src/main/java/gr/seab/r2rml/beans/Util.java index e89ae85..2a0a455 100644 --- a/src/main/java/gr/seab/r2rml/beans/Util.java +++ b/src/main/java/gr/seab/r2rml/beans/Util.java @@ -1,9 +1,9 @@ /** - * Licensed under the Creative Commons Attribution-NonCommercial 3.0 Unported + * 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/3.0/ + * 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 diff --git a/src/main/java/gr/seab/r2rml/beans/UtilImpl.java b/src/main/java/gr/seab/r2rml/beans/UtilImpl.java index 54255af..a5048bd 100644 --- a/src/main/java/gr/seab/r2rml/beans/UtilImpl.java +++ b/src/main/java/gr/seab/r2rml/beans/UtilImpl.java @@ -1,9 +1,9 @@ /** - * Licensed under the Creative Commons Attribution-NonCommercial 3.0 Unported + * 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/3.0/ + * 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 @@ -56,7 +56,7 @@ public class UtilImpl implements Util { * Default no-argument constructor */ public UtilImpl() { - log.info("Init Util."); + } public String fillTemplate(Template template, ResultSet rs) { diff --git a/src/main/java/gr/seab/r2rml/beans/util/LogicalTableMappingComparator.java b/src/main/java/gr/seab/r2rml/beans/util/LogicalTableMappingComparator.java index 2e504ea..63f78db 100644 --- a/src/main/java/gr/seab/r2rml/beans/util/LogicalTableMappingComparator.java +++ b/src/main/java/gr/seab/r2rml/beans/util/LogicalTableMappingComparator.java @@ -1,3 +1,14 @@ +/** + * 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.util; import gr.seab.r2rml.entities.LogicalTableMapping; diff --git a/src/main/java/gr/seab/r2rml/entities/DatabaseType.java b/src/main/java/gr/seab/r2rml/entities/DatabaseType.java index 001b154..ed4dfda 100644 --- a/src/main/java/gr/seab/r2rml/entities/DatabaseType.java +++ b/src/main/java/gr/seab/r2rml/entities/DatabaseType.java @@ -1,9 +1,9 @@ /** - * Licensed under the Creative Commons Attribution-NonCommercial 3.0 Unported + * 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/3.0/ + * 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 diff --git a/src/main/java/gr/seab/r2rml/entities/LogicalTableMapping.java b/src/main/java/gr/seab/r2rml/entities/LogicalTableMapping.java index 018a307..172f411 100644 --- a/src/main/java/gr/seab/r2rml/entities/LogicalTableMapping.java +++ b/src/main/java/gr/seab/r2rml/entities/LogicalTableMapping.java @@ -1,9 +1,9 @@ /** - * Licensed under the Creative Commons Attribution-NonCommercial 3.0 Unported + * 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/3.0/ + * 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 @@ -13,8 +13,6 @@ import java.util.ArrayList; -import com.hp.hpl.jena.rdf.model.Statement; - /** * Logical table mappings can either map an arbitrary query or a single table name * @author nkons diff --git a/src/main/java/gr/seab/r2rml/entities/LogicalTableView.java b/src/main/java/gr/seab/r2rml/entities/LogicalTableView.java index 37c37c0..735d2d3 100644 --- a/src/main/java/gr/seab/r2rml/entities/LogicalTableView.java +++ b/src/main/java/gr/seab/r2rml/entities/LogicalTableView.java @@ -1,9 +1,9 @@ /** - * Licensed under the Creative Commons Attribution-NonCommercial 3.0 Unported + * 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/3.0/ + * 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 diff --git a/src/main/java/gr/seab/r2rml/entities/MappingDocument.java b/src/main/java/gr/seab/r2rml/entities/MappingDocument.java index 5967ab2..4c8a8e6 100644 --- a/src/main/java/gr/seab/r2rml/entities/MappingDocument.java +++ b/src/main/java/gr/seab/r2rml/entities/MappingDocument.java @@ -1,9 +1,9 @@ /** - * Licensed under the Creative Commons Attribution-NonCommercial 3.0 Unported + * 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/3.0/ + * 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 diff --git a/src/main/java/gr/seab/r2rml/entities/PredicateObjectMap.java b/src/main/java/gr/seab/r2rml/entities/PredicateObjectMap.java index 3389dc3..7d8f6fd 100644 --- a/src/main/java/gr/seab/r2rml/entities/PredicateObjectMap.java +++ b/src/main/java/gr/seab/r2rml/entities/PredicateObjectMap.java @@ -1,9 +1,9 @@ /** - * Licensed under the Creative Commons Attribution-NonCommercial 3.0 Unported + * 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/3.0/ + * 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 diff --git a/src/main/java/gr/seab/r2rml/entities/RefObjectMap.java b/src/main/java/gr/seab/r2rml/entities/RefObjectMap.java index 766f5ea..cc7a921 100644 --- a/src/main/java/gr/seab/r2rml/entities/RefObjectMap.java +++ b/src/main/java/gr/seab/r2rml/entities/RefObjectMap.java @@ -1,3 +1,14 @@ +/** + * 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 { diff --git a/src/main/java/gr/seab/r2rml/entities/SubjectMap.java b/src/main/java/gr/seab/r2rml/entities/SubjectMap.java index e1b7e8a..209e466 100644 --- a/src/main/java/gr/seab/r2rml/entities/SubjectMap.java +++ b/src/main/java/gr/seab/r2rml/entities/SubjectMap.java @@ -1,9 +1,9 @@ /** - * Licensed under the Creative Commons Attribution-NonCommercial 3.0 Unported + * 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/3.0/ + * 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 diff --git a/src/main/java/gr/seab/r2rml/entities/Template.java b/src/main/java/gr/seab/r2rml/entities/Template.java index 894d855..0591f0a 100644 --- a/src/main/java/gr/seab/r2rml/entities/Template.java +++ b/src/main/java/gr/seab/r2rml/entities/Template.java @@ -1,9 +1,9 @@ /** - * Licensed under the Creative Commons Attribution-NonCommercial 3.0 Unported + * 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/3.0/ + * 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 diff --git a/src/main/java/gr/seab/r2rml/entities/TermType.java b/src/main/java/gr/seab/r2rml/entities/TermType.java index 1bd0424..07f5ddb 100644 --- a/src/main/java/gr/seab/r2rml/entities/TermType.java +++ b/src/main/java/gr/seab/r2rml/entities/TermType.java @@ -1,9 +1,9 @@ /** - * Licensed under the Creative Commons Attribution-NonCommercial 3.0 Unported + * 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/3.0/ + * 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 diff --git a/src/main/java/gr/seab/r2rml/entities/sparql/LocalResource.java b/src/main/java/gr/seab/r2rml/entities/sparql/LocalResource.java index 667801e..4093d41 100644 --- a/src/main/java/gr/seab/r2rml/entities/sparql/LocalResource.java +++ b/src/main/java/gr/seab/r2rml/entities/sparql/LocalResource.java @@ -1,9 +1,9 @@ /** - * Licensed under the Creative Commons Attribution-NonCommercial 3.0 Unported + * 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/3.0/ + * 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 diff --git a/src/main/java/gr/seab/r2rml/entities/sparql/LocalResultRow.java b/src/main/java/gr/seab/r2rml/entities/sparql/LocalResultRow.java index 6d5ae02..653a637 100644 --- a/src/main/java/gr/seab/r2rml/entities/sparql/LocalResultRow.java +++ b/src/main/java/gr/seab/r2rml/entities/sparql/LocalResultRow.java @@ -1,9 +1,9 @@ /** - * Licensed under the Creative Commons Attribution-NonCommercial 3.0 Unported + * 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/3.0/ + * 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 diff --git a/src/main/java/gr/seab/r2rml/entities/sparql/LocalResultSet.java b/src/main/java/gr/seab/r2rml/entities/sparql/LocalResultSet.java index 6922879..fd49e59 100644 --- a/src/main/java/gr/seab/r2rml/entities/sparql/LocalResultSet.java +++ b/src/main/java/gr/seab/r2rml/entities/sparql/LocalResultSet.java @@ -1,9 +1,9 @@ /** - * Licensed under the Creative Commons Attribution-NonCommercial 3.0 Unported + * 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/3.0/ + * 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 diff --git a/src/main/java/gr/seab/r2rml/entities/sparql/LocalTriple.java b/src/main/java/gr/seab/r2rml/entities/sparql/LocalTriple.java index 9e6e08b..861476b 100644 --- a/src/main/java/gr/seab/r2rml/entities/sparql/LocalTriple.java +++ b/src/main/java/gr/seab/r2rml/entities/sparql/LocalTriple.java @@ -1,9 +1,9 @@ /** - * Licensed under the Creative Commons Attribution-NonCommercial 3.0 Unported + * 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/3.0/ + * 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 diff --git a/src/main/java/gr/seab/r2rml/entities/sparql/SparqlQuery.java b/src/main/java/gr/seab/r2rml/entities/sparql/SparqlQuery.java index 6ff26af..e842563 100644 --- a/src/main/java/gr/seab/r2rml/entities/sparql/SparqlQuery.java +++ b/src/main/java/gr/seab/r2rml/entities/sparql/SparqlQuery.java @@ -1,9 +1,9 @@ /** - * Licensed under the Creative Commons Attribution-NonCommercial 3.0 Unported + * 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/3.0/ + * 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 @@ -11,7 +11,6 @@ */ package gr.seab.r2rml.entities.sparql; - import java.io.Serializable; /** diff --git a/src/main/java/gr/seab/r2rml/entities/sql/SelectField.java b/src/main/java/gr/seab/r2rml/entities/sql/SelectField.java index cbd2e01..2097add 100644 --- a/src/main/java/gr/seab/r2rml/entities/sql/SelectField.java +++ b/src/main/java/gr/seab/r2rml/entities/sql/SelectField.java @@ -1,9 +1,9 @@ /** - * Licensed under the Creative Commons Attribution-NonCommercial 3.0 Unported + * 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/3.0/ + * 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 @@ -11,7 +11,6 @@ */ package gr.seab.r2rml.entities.sql; - /** * A select field in an sql select query * @see SelectQuery diff --git a/src/main/java/gr/seab/r2rml/entities/sql/SelectQuery.java b/src/main/java/gr/seab/r2rml/entities/sql/SelectQuery.java index 7101821..fc0b7c3 100644 --- a/src/main/java/gr/seab/r2rml/entities/sql/SelectQuery.java +++ b/src/main/java/gr/seab/r2rml/entities/sql/SelectQuery.java @@ -1,9 +1,9 @@ /** - * Licensed under the Creative Commons Attribution-NonCommercial 3.0 Unported + * 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/3.0/ + * 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 @@ -11,8 +11,6 @@ */ package gr.seab.r2rml.entities.sql; - - import java.util.ArrayList; import java.util.Arrays; import java.util.List; diff --git a/src/main/java/gr/seab/r2rml/entities/sql/SelectTable.java b/src/main/java/gr/seab/r2rml/entities/sql/SelectTable.java index b4ee328..d84c48c 100644 --- a/src/main/java/gr/seab/r2rml/entities/sql/SelectTable.java +++ b/src/main/java/gr/seab/r2rml/entities/sql/SelectTable.java @@ -1,9 +1,9 @@ /** - * Licensed under the Creative Commons Attribution-NonCommercial 3.0 Unported + * 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/3.0/ + * 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 diff --git a/src/main/resources/app-context.xml b/src/main/resources/app-context.xml index 2f21917..4277022 100644 --- a/src/main/resources/app-context.xml +++ b/src/main/resources/app-context.xml @@ -15,12 +15,10 @@ - -