You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@marmotta.apache.org by ja...@apache.org on 2015/02/09 14:36:32 UTC
[1/2] marmotta git commit: MARMOTTA-590: remove N-Triples from
supported formats in LDP
Repository: marmotta
Updated Branches:
refs/heads/develop 876a287b2 -> 0b8f74833
MARMOTTA-590: remove N-Triples from supported formats in LDP
Project: http://git-wip-us.apache.org/repos/asf/marmotta/repo
Commit: http://git-wip-us.apache.org/repos/asf/marmotta/commit/d19a04af
Tree: http://git-wip-us.apache.org/repos/asf/marmotta/tree/d19a04af
Diff: http://git-wip-us.apache.org/repos/asf/marmotta/diff/d19a04af
Branch: refs/heads/develop
Commit: d19a04afc4628eb6c2ae740b0a68eeceba54ec9c
Parents: 876a287
Author: Jakob Frank <ja...@apache.org>
Authored: Mon Feb 9 14:35:27 2015 +0100
Committer: Jakob Frank <ja...@apache.org>
Committed: Mon Feb 9 14:35:27 2015 +0100
----------------------------------------------------------------------
.../java/org/apache/marmotta/platform/ldp/api/LdpService.java | 2 +-
.../apache/marmotta/platform/ldp/services/LdpServiceImpl.java | 4 +---
2 files changed, 2 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/marmotta/blob/d19a04af/platform/marmotta-ldp/src/main/java/org/apache/marmotta/platform/ldp/api/LdpService.java
----------------------------------------------------------------------
diff --git a/platform/marmotta-ldp/src/main/java/org/apache/marmotta/platform/ldp/api/LdpService.java b/platform/marmotta-ldp/src/main/java/org/apache/marmotta/platform/ldp/api/LdpService.java
index 8080106..44c8d07 100644
--- a/platform/marmotta-ldp/src/main/java/org/apache/marmotta/platform/ldp/api/LdpService.java
+++ b/platform/marmotta-ldp/src/main/java/org/apache/marmotta/platform/ldp/api/LdpService.java
@@ -53,7 +53,7 @@ public interface LdpService {
LDP.contains, DCTERMS.CREATED, DCTERMS.MODIFIED
));
public static final List<RDFFormat> SERVER_PREFERED_RDF_FORMATS = Arrays.asList(
- RDFFormat.TURTLE, RDFFormat.JSONLD, RDFFormat.RDFXML, RDFFormat.N3, RDFFormat.NTRIPLES
+ RDFFormat.TURTLE, RDFFormat.JSONLD, RDFFormat.RDFXML, RDFFormat.N3
);
public static enum InteractionModel {
http://git-wip-us.apache.org/repos/asf/marmotta/blob/d19a04af/platform/marmotta-ldp/src/main/java/org/apache/marmotta/platform/ldp/services/LdpServiceImpl.java
----------------------------------------------------------------------
diff --git a/platform/marmotta-ldp/src/main/java/org/apache/marmotta/platform/ldp/services/LdpServiceImpl.java b/platform/marmotta-ldp/src/main/java/org/apache/marmotta/platform/ldp/services/LdpServiceImpl.java
index bfdb07a..4882d8b 100644
--- a/platform/marmotta-ldp/src/main/java/org/apache/marmotta/platform/ldp/services/LdpServiceImpl.java
+++ b/platform/marmotta-ldp/src/main/java/org/apache/marmotta/platform/ldp/services/LdpServiceImpl.java
@@ -439,9 +439,7 @@ public class LdpServiceImpl implements LdpService {
final ValueFactory valueFactory = connection.getValueFactory();
final Literal now = valueFactory.createLiteral(new Date());
-
- // TODO: find a better way to ingest n-triples (text/plain) while still supporting regular text files
- final RDFFormat rdfFormat = ("text/plain".equals(type) ? null : Rio.getParserFormatForMIMEType(type));
+ final RDFFormat rdfFormat = Rio.getParserFormatForMIMEType(type);
// Check submitted format vs. real resource type (RDF-S vs. Non-RDF)
if (rdfFormat == null && isNonRdfSourceResource(connection, resource)) {
log.debug("Updating <{}> as LDP-NR (binary) - {}", resource, type);
[2/2] marmotta git commit: Added RDFS as default namespace for LDP
Posted by ja...@apache.org.
Added RDFS as default namespace for LDP
Project: http://git-wip-us.apache.org/repos/asf/marmotta/repo
Commit: http://git-wip-us.apache.org/repos/asf/marmotta/commit/0b8f7483
Tree: http://git-wip-us.apache.org/repos/asf/marmotta/tree/0b8f7483
Diff: http://git-wip-us.apache.org/repos/asf/marmotta/diff/0b8f7483
Branch: refs/heads/develop
Commit: 0b8f7483326b54004346d8acc2989e2df6c584da
Parents: d19a04a
Author: Jakob Frank <ja...@apache.org>
Authored: Mon Feb 9 14:36:05 2015 +0100
Committer: Jakob Frank <ja...@apache.org>
Committed: Mon Feb 9 14:36:05 2015 +0100
----------------------------------------------------------------------
.../java/org/apache/marmotta/platform/ldp/util/LdpUtils.java | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/marmotta/blob/0b8f7483/platform/marmotta-ldp/src/main/java/org/apache/marmotta/platform/ldp/util/LdpUtils.java
----------------------------------------------------------------------
diff --git a/platform/marmotta-ldp/src/main/java/org/apache/marmotta/platform/ldp/util/LdpUtils.java b/platform/marmotta-ldp/src/main/java/org/apache/marmotta/platform/ldp/util/LdpUtils.java
index fca8187..ba7eda6 100644
--- a/platform/marmotta-ldp/src/main/java/org/apache/marmotta/platform/ldp/util/LdpUtils.java
+++ b/platform/marmotta-ldp/src/main/java/org/apache/marmotta/platform/ldp/util/LdpUtils.java
@@ -32,6 +32,7 @@ import org.openrdf.model.URI;
import org.openrdf.model.impl.URIImpl;
import org.openrdf.model.vocabulary.DCTERMS;
import org.openrdf.model.vocabulary.RDF;
+import org.openrdf.model.vocabulary.RDFS;
import org.openrdf.repository.RepositoryException;
import org.openrdf.rio.*;
import org.slf4j.Logger;
@@ -119,6 +120,7 @@ public class LdpUtils {
writer.handleNamespace(LDP.PREFIX, LDP.NAMESPACE);
writer.handleNamespace(RDF.PREFIX, RDF.NAMESPACE);
+ writer.handleNamespace(RDFS.PREFIX, RDFS.NAMESPACE);
writer.handleNamespace(XSD.PREFIX, XSD.NAMESPACE);
writer.handleNamespace(DCTERMS.PREFIX, DCTERMS.NAMESPACE);
@@ -142,7 +144,7 @@ public class LdpUtils {
}
if (StringUtils.isNotBlank(extraFormats)) {
sb.append(extraFormats);
- } else {
+ } else if (sb.length() > 1) {
sb.delete(sb.length()-2, sb.length());
}
return sb.toString();