Skip to content

Commit efc165d

Browse files
author
Miel Vander Sande
committed
Complete merge
2 parents eb87c32 + 967e0f0 commit efc165d

17 files changed

+76
-74
lines changed

‎pom.xml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -57,20 +57,15 @@
5757
<jettyVersion>9.3.6.v20151106</jettyVersion>
5858
</properties>
5959
<dependencies>
60-
<dependency>
61-
<groupId>org.rdfhdt</groupId>
62-
<artifactId>hdt-jena</artifactId>
63-
<version>1.1</version>
64-
</dependency>
6560
<dependency>
6661
<groupId>org.apache.jena</groupId>
6762
<artifactId>jena-core</artifactId>
68-
<version>2.13.0</version>
63+
<version>3.0.0</version>
6964
</dependency>
7065
<dependency>
7166
<groupId>org.apache.jena</groupId>
7267
<artifactId>jena-arq</artifactId>
73-
<version>2.13.0</version>
68+
<version>3.0.0</version>
7469
</dependency>
7570
<dependency>
7671
<groupId>org.apache.httpcomponents</groupId>
@@ -118,7 +113,12 @@
118113
<dependency>
119114
<groupId>org.apache.jena</groupId>
120115
<artifactId>jena-tdb</artifactId>
121-
<version>1.1.2</version>
116+
<version>3.0.0</version>
117+
</dependency>
118+
<dependency>
119+
<groupId>org.rdfhdt</groupId>
120+
<artifactId>hdt-jena</artifactId>
121+
<version>1.1.1-SNAPSHOT</version>
122122
</dependency>
123123
<dependency>
124124
<groupId>org.freemarker</groupId>

‎src/main/java/org/linkeddatafragments/datasource/AbstractRequestProcessorForTriplePatterns.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package org.linkeddatafragments.datasource;
22

3-
import com.hp.hpl.jena.rdf.model.Model;
4-
3+
import org.apache.jena.rdf.model.Model;
54
import org.linkeddatafragments.fragments.ILinkedDataFragment;
65
import org.linkeddatafragments.fragments.ILinkedDataFragmentRequest;
76
import org.linkeddatafragments.fragments.tpf.ITriplePatternElement;

‎src/main/java/org/linkeddatafragments/datasource/hdt/HdtBasedRequestProcessorForTPFs.java

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
package org.linkeddatafragments.datasource.hdt;
22

33
import java.io.IOException;
4+
import org.apache.jena.graph.Triple;
5+
import org.apache.jena.rdf.model.Model;
6+
import org.apache.jena.rdf.model.ModelFactory;
7+
import org.apache.jena.rdf.model.RDFNode;
48

59
import org.linkeddatafragments.datasource.AbstractRequestProcessorForTriplePatterns;
610
import org.linkeddatafragments.datasource.IFragmentRequestProcessor;
@@ -14,10 +18,7 @@
1418
import org.rdfhdt.hdt.triples.TripleID;
1519
import org.rdfhdt.hdtjena.NodeDictionary;
1620

17-
import com.hp.hpl.jena.graph.Triple;
18-
import com.hp.hpl.jena.rdf.model.Model;
19-
import com.hp.hpl.jena.rdf.model.ModelFactory;
20-
import com.hp.hpl.jena.rdf.model.RDFNode;
21+
2122

2223
/**
2324
* Implementation of {@link IFragmentRequestProcessor} that processes

‎src/main/java/org/linkeddatafragments/datasource/index/IndexRequestProcessorForTPFs.java

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,17 @@
11
package org.linkeddatafragments.datasource.index;
22

3-
import com.hp.hpl.jena.rdf.model.Model;
4-
import com.hp.hpl.jena.rdf.model.ModelFactory;
5-
import com.hp.hpl.jena.rdf.model.Property;
6-
import com.hp.hpl.jena.rdf.model.RDFNode;
7-
import com.hp.hpl.jena.rdf.model.Resource;
8-
import com.hp.hpl.jena.rdf.model.ResourceFactory;
9-
import com.hp.hpl.jena.rdf.model.StmtIterator;
10-
import com.hp.hpl.jena.rdf.model.impl.PropertyImpl;
11-
import com.hp.hpl.jena.rdf.model.impl.ResourceImpl;
3+
124
import java.util.HashMap;
135
import java.util.Map;
6+
import org.apache.jena.rdf.model.Model;
7+
import org.apache.jena.rdf.model.ModelFactory;
8+
import org.apache.jena.rdf.model.Property;
9+
import org.apache.jena.rdf.model.RDFNode;
10+
import org.apache.jena.rdf.model.Resource;
11+
import org.apache.jena.rdf.model.ResourceFactory;
12+
import org.apache.jena.rdf.model.StmtIterator;
13+
import org.apache.jena.rdf.model.impl.PropertyImpl;
14+
import org.apache.jena.rdf.model.impl.ResourceImpl;
1415

1516
import org.linkeddatafragments.datasource.AbstractRequestProcessorForTriplePatterns;
1617
import org.linkeddatafragments.datasource.IDataSource;

‎src/main/java/org/linkeddatafragments/datasource/tdb/JenaTDBBasedRequestProcessorForTPFs.java

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
11
package org.linkeddatafragments.datasource.tdb;
22

3-
import com.hp.hpl.jena.query.Dataset;
4-
import com.hp.hpl.jena.query.Query;
5-
import com.hp.hpl.jena.query.QueryExecution;
6-
import com.hp.hpl.jena.query.QueryExecutionFactory;
7-
import com.hp.hpl.jena.query.QueryFactory;
8-
import com.hp.hpl.jena.query.QuerySolution;
9-
import com.hp.hpl.jena.query.QuerySolutionMap;
10-
import com.hp.hpl.jena.query.ResultSet;
11-
import com.hp.hpl.jena.query.Syntax;
12-
import com.hp.hpl.jena.rdf.model.Literal;
13-
import com.hp.hpl.jena.rdf.model.Model;
14-
import com.hp.hpl.jena.rdf.model.ModelFactory;
15-
import com.hp.hpl.jena.rdf.model.RDFNode;
16-
import com.hp.hpl.jena.tdb.TDBFactory;
173
import java.io.File;
4+
import org.apache.jena.query.Dataset;
5+
import org.apache.jena.query.Query;
6+
import org.apache.jena.query.QueryExecution;
7+
import org.apache.jena.query.QueryExecutionFactory;
8+
import org.apache.jena.query.QueryFactory;
9+
import org.apache.jena.query.QuerySolution;
10+
import org.apache.jena.query.QuerySolutionMap;
11+
import org.apache.jena.query.ResultSet;
12+
import org.apache.jena.query.Syntax;
13+
import org.apache.jena.rdf.model.Literal;
14+
import org.apache.jena.rdf.model.Model;
15+
import org.apache.jena.rdf.model.ModelFactory;
16+
import org.apache.jena.rdf.model.RDFNode;
17+
import org.apache.jena.tdb.TDBFactory;
1818

1919
import org.linkeddatafragments.datasource.AbstractRequestProcessorForTriplePatterns;
2020
import org.linkeddatafragments.datasource.IFragmentRequestProcessor;

‎src/main/java/org/linkeddatafragments/fragments/ILinkedDataFragment.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
package org.linkeddatafragments.fragments;
22

33
import java.io.Closeable;
4-
5-
import com.hp.hpl.jena.rdf.model.StmtIterator;
4+
import org.apache.jena.rdf.model.StmtIterator;
65

76
/**
87
* Represents any possible Linked Data Fragment.

‎src/main/java/org/linkeddatafragments/fragments/LinkedDataFragmentBase.java

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,16 @@
11
package org.linkeddatafragments.fragments;
22

3-
import com.hp.hpl.jena.rdf.model.Literal;
3+
import org.apache.jena.rdf.model.Literal;
44
import java.net.URISyntaxException;
55

66
import org.apache.http.client.utils.URIBuilder;
7+
import org.apache.jena.rdf.model.Model;
8+
import org.apache.jena.rdf.model.ModelFactory;
9+
import org.apache.jena.rdf.model.Resource;
10+
import org.apache.jena.rdf.model.StmtIterator;
711
import org.linkeddatafragments.util.CommonResources;
812

9-
import com.hp.hpl.jena.rdf.model.Model;
10-
import com.hp.hpl.jena.rdf.model.ModelFactory;
11-
import com.hp.hpl.jena.rdf.model.Resource;
12-
import com.hp.hpl.jena.rdf.model.StmtIterator;
13+
1314

1415
/**
1516
* Base class of any implementation of {@link ILinkedDataFragment} that uses

‎src/main/java/org/linkeddatafragments/fragments/tpf/TPFRequestParserForJenaBackends.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
package org.linkeddatafragments.fragments.tpf;
22

3-
import com.hp.hpl.jena.rdf.model.RDFNode;
4-
3+
import org.apache.jena.rdf.model.RDFNode;
54
import org.linkeddatafragments.util.TriplePatternElementParserForJena;
65

76
/**

‎src/main/java/org/linkeddatafragments/fragments/tpf/TriplePatternFragmentBase.java

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,18 @@
11
package org.linkeddatafragments.fragments.tpf;
22

33
import java.util.NoSuchElementException;
4+
import org.apache.jena.datatypes.xsd.XSDDatatype;
5+
import org.apache.jena.rdf.model.Literal;
6+
import org.apache.jena.rdf.model.Model;
7+
import org.apache.jena.rdf.model.Resource;
8+
import org.apache.jena.rdf.model.Statement;
9+
import org.apache.jena.rdf.model.StmtIterator;
10+
import org.apache.jena.util.iterator.NiceIterator;
411

512
import org.linkeddatafragments.fragments.LinkedDataFragmentBase;
613
import org.linkeddatafragments.util.CommonResources;
714

8-
import com.hp.hpl.jena.datatypes.xsd.XSDDatatype;
9-
import com.hp.hpl.jena.rdf.model.Literal;
10-
import com.hp.hpl.jena.rdf.model.Model;
11-
import com.hp.hpl.jena.rdf.model.Resource;
12-
import com.hp.hpl.jena.rdf.model.Statement;
13-
import com.hp.hpl.jena.rdf.model.StmtIterator;
14-
import com.hp.hpl.jena.util.iterator.NiceIterator;
15+
1516

1617
/**
1718
* Base class for implementations of {@link ITriplePatternFragment}.

‎src/main/java/org/linkeddatafragments/fragments/tpf/TriplePatternFragmentImpl.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,9 @@
11
package org.linkeddatafragments.fragments.tpf;
22

3-
import com.hp.hpl.jena.rdf.model.Model;
4-
import com.hp.hpl.jena.rdf.model.StmtIterator;
3+
import org.apache.jena.rdf.model.Model;
4+
import org.apache.jena.rdf.model.StmtIterator;
5+
6+
57

68
/**
79
* Implementation of {@link ITriplePatternFragment}.

‎src/main/java/org/linkeddatafragments/servlet/LinkedDataFragmentServlet.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@
1313
import javax.servlet.http.HttpServlet;
1414
import javax.servlet.http.HttpServletRequest;
1515
import javax.servlet.http.HttpServletResponse;
16+
import org.apache.jena.rdf.model.Model;
17+
import org.apache.jena.rdf.model.ModelFactory;
1618
import org.apache.jena.riot.Lang;
1719
import org.linkeddatafragments.config.ConfigReader;
1820
import org.linkeddatafragments.datasource.DataSourceFactory;

‎src/main/java/org/linkeddatafragments/util/CommonResources.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package org.linkeddatafragments.util;
22

3-
import com.hp.hpl.jena.rdf.model.Property;
4-
import com.hp.hpl.jena.rdf.model.ResourceFactory;
3+
import org.apache.jena.rdf.model.Property;
4+
import org.apache.jena.rdf.model.ResourceFactory;
55

66
/**
77
*

‎src/main/java/org/linkeddatafragments/util/TriplePatternElementParserForJena.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
package org.linkeddatafragments.util;
22

3-
import com.hp.hpl.jena.datatypes.RDFDatatype;
4-
import com.hp.hpl.jena.datatypes.TypeMapper;
5-
import com.hp.hpl.jena.rdf.model.RDFNode;
6-
import com.hp.hpl.jena.rdf.model.ResourceFactory;
3+
import org.apache.jena.datatypes.RDFDatatype;
4+
import org.apache.jena.datatypes.TypeMapper;
5+
import org.apache.jena.rdf.model.RDFNode;
6+
import org.apache.jena.rdf.model.ResourceFactory;
77

88
/**
99
* A {@link TriplePatternElementParser} for Jena-based backends.

‎src/main/java/org/linkeddatafragments/views/HtmlTriplePatternFragmentWriterImpl.java

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,20 @@
11
package org.linkeddatafragments.views;
22

3-
import com.hp.hpl.jena.rdf.model.RDFNode;
4-
import com.hp.hpl.jena.rdf.model.Statement;
5-
import com.hp.hpl.jena.rdf.model.StmtIterator;
63
import freemarker.template.Configuration;
74
import freemarker.template.Template;
85
import freemarker.template.TemplateException;
96
import freemarker.template.TemplateExceptionHandler;
10-
import java.io.File;
117
import java.io.IOException;
128
import java.io.OutputStreamWriter;
13-
import java.net.URL;
149
import java.util.Date;
1510
import java.util.HashMap;
1611
import java.util.List;
1712
import java.util.Map;
1813
import javax.servlet.ServletOutputStream;
1914
import javax.servlet.http.HttpServletRequest;
15+
import org.apache.jena.rdf.model.RDFNode;
16+
import org.apache.jena.rdf.model.Statement;
17+
import org.apache.jena.rdf.model.StmtIterator;
2018
import org.linkeddatafragments.datasource.IDataSource;
2119
import org.linkeddatafragments.datasource.index.IndexDataSource;
2220
import org.linkeddatafragments.fragments.ILinkedDataFragment;

‎src/main/java/org/linkeddatafragments/views/RdfWriterImpl.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
package org.linkeddatafragments.views;
22

3-
import com.hp.hpl.jena.rdf.model.Model;
4-
import com.hp.hpl.jena.rdf.model.ModelFactory;
53
import java.io.IOException;
64
import java.util.HashMap;
75
import java.util.Map;
86
import javax.servlet.ServletOutputStream;
97
import javax.servlet.http.HttpServletRequest;
8+
import org.apache.jena.rdf.model.Model;
9+
import org.apache.jena.rdf.model.ModelFactory;
1010
import org.apache.jena.riot.Lang;
1111
import org.apache.jena.riot.RDFDataMgr;
1212
import org.apache.jena.riot.RDFLanguages;

‎src/test/java/org/linkeddatafragments/test/datasource/HdtDataSourceTest.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
package org.linkeddatafragments.test.datasource;
22

33
import com.google.gson.JsonObject;
4-
import com.hp.hpl.jena.rdf.model.RDFNode;
54

65
import java.io.File;
6+
import org.apache.jena.rdf.model.RDFNode;
77
import org.junit.After;
88
import org.junit.AfterClass;
99
import org.junit.Before;
@@ -17,7 +17,6 @@
1717
import org.rdfhdt.hdt.hdt.HDT;
1818
import org.rdfhdt.hdt.hdt.HDTManager;
1919
import org.rdfhdt.hdt.options.HDTSpecification;
20-
import org.linkeddatafragments.test.datasource.DataSourceTest;
2120

2221
/**
2322
*

‎src/test/java/org/linkeddatafragments/test/datasource/JenaTDBDataSourceTest.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@
22

33
import com.google.gson.JsonObject;
44

5-
import com.hp.hpl.jena.query.Dataset;
6-
import com.hp.hpl.jena.rdf.model.Model;
7-
import com.hp.hpl.jena.rdf.model.RDFNode;
8-
import com.hp.hpl.jena.tdb.TDBFactory;
5+
import org.apache.jena.query.Dataset;
6+
import org.apache.jena.rdf.model.Model;
7+
import org.apache.jena.tdb.TDBFactory;
98

109
import java.io.File;
1110
import java.io.InputStream;
11+
import org.apache.jena.rdf.model.RDFNode;
1212

1313
import org.apache.jena.riot.Lang;
1414
import org.apache.jena.riot.RDFDataMgr;

0 commit comments

Comments
 (0)