Skip to content
This repository has been archived by the owner on May 12, 2021. It is now read-only.

MARMOTTA-659: Port Marmotta to Eclipse RDF4J #31

Open
wants to merge 73 commits into
base: MARMOTTA-659_port_rdf4j
Choose a base branch
from
Open
Changes from 1 commit
Commits
Show all changes
73 commits
Select commit Hold shift + click to select a range
0d643e8
Moving to Java 8
ajs6f Mar 31, 2017
51fed1a
Ignore mac and netbeans configuration files
gmora1223 May 6, 2017
dcb6d88
Merge branch 'develop' of https://github.com/apache/marmotta into MAR…
gmora1223 May 6, 2017
5bbbc61
Add marmotta-660 branch to ci
gmora1223 May 7, 2017
15b3165
Add databases to execute all tests
cuent May 17, 2017
6fb5808
Solve compilation errors in KiWi Triplestore: Core.
gmora1223 May 20, 2017
50b4bca
KiWiEvaluationStrategy uses default FederatedServiceResolver
gmora1223 May 21, 2017
b700969
Upgrade sesame from 2.7.16 to 2.8.11.
gmora1223 May 21, 2017
8bd9620
Delete unused tests and add Isolation level: SNAPSHOT_READ.
gmora1223 May 21, 2017
18f42a2
In Sesame 2.8.0, the class RDFJSONUtility is not accesible [1]. The v…
gmora1223 May 21, 2017
c788648
Implement missing abstract methods and add FederatedServiceResolver t…
gmora1223 May 21, 2017
15c28f8
Implement missing abstract methods and add FederatedServiceResolver t…
gmora1223 May 30, 2017
23e6e0d
Solved compatibility with new methods in marmotta-commons.
gmora1223 Jun 5, 2017
724edb9
Merge branch 'MARMOTTA-659' of https://github.com/gmora1223/marmotta …
gmora1223 Jun 5, 2017
ee60459
Merge branch 'develop' of https://github.com/apache/marmotta into MAR…
gmora1223 Jun 7, 2017
8fdf525
New changes in KiWi TripleStore: Core and solves MARMOTTA-39.
gmora1223 Jun 5, 2017
fcb01b3
Merge branch 'MARMOTTA-659' of https://github.com/gmora1223/marmotta …
gmora1223 Jun 8, 2017
3ecff1f
Merge branch 'develop' of https://github.com/apache/marmotta into MAR…
gmora1223 Jun 8, 2017
74a20dc
Add statements and compare size before commit.
gmora1223 Jun 10, 2017
710d7df
Merge remote-tracking branch 'upstream/develop' into MARMOTTA-659
gmora1223 Jun 10, 2017
213b6e5
Merge branch 'develop' of https://github.com/apache/marmotta into MAR…
gmora1223 Jun 10, 2017
5480013
Modify query to verify statements with null values.
gmora1223 Jun 15, 2017
6f25707
Merge branch 'develop' of https://github.com/apache/marmotta into MAR…
gmora1223 Jun 15, 2017
ff99f70
No necessary calculate different hash for objects.
gmora1223 Jun 15, 2017
d019053
Merge branch 'develop' of https://github.com/apache/marmotta into MAR…
gmora1223 Jun 16, 2017
f769cd2
Merge remote-tracking branch 'pr/MARMOTTA-660' into MARMOTTA-660
gmora1223 Jun 16, 2017
377b016
Add sudo to get and ignore MySQL.
cuent Jun 16, 2017
ba67c34
Merge branch 'MARMOTTA-660' of https://github.com/gmora1223/marmotta …
gmora1223 Jun 16, 2017
cff80a0
Ignore NetBeans conf files.
gmora1223 Jun 16, 2017
e309532
Since all values are data typed, tests should also test data type.
gmora1223 Jun 17, 2017
655b892
Ignore flush and prepare methods in snapshot.
gmora1223 Jun 17, 2017
e0c9879
Ignore tests with subselect in optional.
gmora1223 Jun 17, 2017
e640d47
Merge branch 'MARMOTTA-660' into MARMOTTA-659
gmora1223 Jun 22, 2017
b5f3168
Merge branch 'develop' of https://github.com/apache/marmotta into MAR…
gmora1223 Jun 22, 2017
53640df
Upgrade to Sesame 4
gmora1223 Jun 29, 2017
b9f349b
Change URI to IRI in Apache Marmotta: Commons Utilities.
gmora1223 Jun 29, 2017
dae724c
Change URI to IRI in commons vocabularies.
gmora1223 Jun 29, 2017
2f5a924
Change URI to IRI in marmotta Sesame I/O: VCard.
gmora1223 Jun 29, 2017
e558b7a
Change marmota marmotta-sesame-tools URI to IRI.
gmora1223 Jun 29, 2017
d4e58f8
Solve problems in Kiwi-triplestore: core.
gmora1223 Jun 29, 2017
a1a7af3
Solve some tests in marmotta-kiwi triplestore: core.
gmora1223 Jun 29, 2017
b71ab96
Deal with Literal to convert to KiwiUriResource.
gmora1223 Jun 30, 2017
76cb9f0
Verify statements with null values change a https://github.com/gmora1…
gmora1223 Jul 2, 2017
d6d6eda
Statement includes context, so a hash must be generated using context.
gmora1223 Jul 2, 2017
a8902fa
In https://github.com/gmora1223/marmotta/commit/8fdf525255d54bf98e9ad…
gmora1223 Jul 2, 2017
349628b
Solve issues about URI vs IRI in Marmotta Platform Core.
gmora1223 Jul 2, 2017
54e101d
Change URI for IRI in Marmotta sesame tools: facading.
gmora1223 Jul 2, 2017
7a0b13c
Solve conficts URI vs IRI and correct use of interfaces.
gmora1223 Jul 2, 2017
34d0839
Revert changes made in https://github.com/gmora1223/marmotta/commit/f…
gmora1223 Jul 8, 2017
01909b1
Solve conficts URI vs IRI and correct use of interfaces.
gmora1223 Jul 9, 2017
66de6d8
Ignore test related with infinity literals.
gmora1223 Jul 10, 2017
93f4fed
Merge branch 'MARMOTTA-659' of https://github.com/gmora1223/marmotta …
gmora1223 Jul 10, 2017
dc0d2b9
Do not auto-registry functions since they are registered with the Ser…
gmora1223 Jul 10, 2017
5ef0690
Replace dependency json-java-sesame with sesame-rio-jsonld.
gmora1223 Jul 10, 2017
50890e7
Upgrating to RDF4J.
gmora1223 Jul 17, 2017
57d48df
Upgraded to RDF4J.
gmora1223 Jul 18, 2017
139b8f5
Upgraded to RDF4J
gmora1223 Jul 18, 2017
b8fadb9
Upgraded to RDF4J
gmora1223 Jul 21, 2017
10835e1
Change original imports. Due to import problems I changed this import…
gmora1223 Jul 22, 2017
8d5770f
Merge branch 'develop' of https://github.com/apache/marmotta into MAR…
gmora1223 Jul 23, 2017
a03f298
Replace UriRegexFilter for IriRegexFilter.
gmora1223 Jul 23, 2017
ac7fc8d
Ignore GraphSail class because is not longer mantained in TinkerPop 3…
gmora1223 Jul 23, 2017
e196bf4
MARMOTTA-670: corrected call to rdfBackend.listSubjects
dglachs Sep 27, 2017
03e0bc0
updated my gpg key
wikier Nov 7, 2017
fadd942
Merge branch 'develop' into MARMOTTA-670_reversepropertyselector
wikier Dec 1, 2017
0957855
MARMOTTA_671: fixed redundant conditions
wikier Dec 8, 2017
4384d61
upgraded apache parent pom
wikier Jan 26, 2018
2079e4e
MARMOTTA-668: Updated and fixed the refpack-plugin
ja-fra Feb 16, 2018
7c1badc
update assembly-plugin
ja-fra Feb 16, 2018
0726f49
fixed RAT check (missing license headers in source files)
ja-fra Feb 16, 2018
eb27764
trying to get travis back working
ja-fra Feb 16, 2018
6f39451
Merge branch 'develop' of https://github.com/apache/marmotta into MAR…
cuent Feb 17, 2018
036990a
Skip long concurrent tests from SailConcurrencyTest test suite.
cuent Feb 17, 2018
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Change original imports. Due to import problems I changed this import…
…s to original java.util. Now that all imports are working, older dependecias are changed.

Signed-off-by: Gustavo.
gmora1223 committed Jul 22, 2017
commit 10835e1ff6c8d2932d539fc183fe92c1669f2d1f
Original file line number Diff line number Diff line change
@@ -19,7 +19,7 @@

import com.google.common.collect.ImmutableMap;
import static com.google.common.net.HttpHeaders.ACCEPT;
import java.util.Collections;
import edu.emory.mathcs.backport.java.util.Collections;
import java.util.HashMap;
import java.util.Map;
import javax.servlet.http.HttpServletRequest;
Original file line number Diff line number Diff line change
@@ -17,7 +17,7 @@
*/
package org.apache.marmotta.platform.core.services.triplestore;

import java.util.concurrent.locks.ReentrantReadWriteLock;
import edu.emory.mathcs.backport.java.util.concurrent.locks.ReentrantReadWriteLock;
import javax.annotation.PreDestroy;
import javax.enterprise.context.ApplicationScoped;
import javax.enterprise.event.Event;