You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@clerezza.apache.org by re...@apache.org on 2016/04/22 17:25:01 UTC
clerezza git commit: CLEREZZA-1010: fixed literals wirh language,
propagated to launcher and release
Repository: clerezza
Updated Branches:
refs/heads/master e2ae42a13 -> d0e584604
CLEREZZA-1010: fixed literals wirh language, propagated to launcher and release
Project: http://git-wip-us.apache.org/repos/asf/clerezza/repo
Commit: http://git-wip-us.apache.org/repos/asf/clerezza/commit/d0e58460
Tree: http://git-wip-us.apache.org/repos/asf/clerezza/tree/d0e58460
Diff: http://git-wip-us.apache.org/repos/asf/clerezza/diff/d0e58460
Branch: refs/heads/master
Commit: d0e58460429f0738c14c9d82d9c5ae0d677e64dd
Parents: e2ae42a
Author: Reto Gmür <re...@apache.org>
Authored: Fri Apr 22 17:23:56 2016 +0200
Committer: Reto Gmür <re...@apache.org>
Committed: Fri Apr 22 17:23:56 2016 +0200
----------------------------------------------------------------------
provisioning/launchers/content-launcher/pom.xml | 2 +-
provisioning/platform.content/pom.xml | 4 ++--
rdf/stable.serializer/pom.xml | 6 +++---
.../stable/serializer/NTriplesSerializer.java | 21 ++++++++++----------
.../serializer/NTriplesSerializerTest.java | 3 ++-
.../serializer/StableSerializerGraphTest.java | 3 ++-
.../stable/serializer/documentation-example.nt | 1 +
releases/201604/pom.xml | 2 ++
8 files changed, 24 insertions(+), 18 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/clerezza/blob/d0e58460/provisioning/launchers/content-launcher/pom.xml
----------------------------------------------------------------------
diff --git a/provisioning/launchers/content-launcher/pom.xml b/provisioning/launchers/content-launcher/pom.xml
index a3c3157..42085af 100644
--- a/provisioning/launchers/content-launcher/pom.xml
+++ b/provisioning/launchers/content-launcher/pom.xml
@@ -277,7 +277,7 @@
<dependency>
<groupId>org.apache.clerezza.provisioning</groupId>
<artifactId>platform.content</artifactId>
- <version>1.0.0</version>
+ <version>1.0.1-SNAPSHOT</version>
<type>partialbundlelist</type>
</dependency>
</dependencies>
http://git-wip-us.apache.org/repos/asf/clerezza/blob/d0e58460/provisioning/platform.content/pom.xml
----------------------------------------------------------------------
diff --git a/provisioning/platform.content/pom.xml b/provisioning/platform.content/pom.xml
index 8288392..12520a5 100644
--- a/provisioning/platform.content/pom.xml
+++ b/provisioning/platform.content/pom.xml
@@ -25,7 +25,7 @@
<parent>
<artifactId>clerezza</artifactId>
<groupId>org.apache.clerezza</groupId>
- <version>8-SNAPSHOT</version>
+ <version>7</version>
<relativePath>../../parent</relativePath>
</parent>
@@ -72,7 +72,7 @@
<dependency>
<groupId>org.apache.clerezza</groupId>
<artifactId>rdf.stable.serializer</artifactId>
- <version>1.0.0</version>
+ <version>1.0.1-SNAPSHOT</version>
</dependency>
<!-- thess don't strictly belong to here -->
<dependency>
http://git-wip-us.apache.org/repos/asf/clerezza/blob/d0e58460/rdf/stable.serializer/pom.xml
----------------------------------------------------------------------
diff --git a/rdf/stable.serializer/pom.xml b/rdf/stable.serializer/pom.xml
index 39ad1c8..2cbd084 100644
--- a/rdf/stable.serializer/pom.xml
+++ b/rdf/stable.serializer/pom.xml
@@ -52,7 +52,7 @@
<dependency>
<groupId>org.apache.clerezza</groupId>
<artifactId>rdf.core</artifactId>
- <version>1.0.0</version>
+ <version>1.0.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
@@ -62,13 +62,13 @@
<groupId>org.apache.clerezza</groupId>
<artifactId>rdf.jena.serializer</artifactId>
<scope>test</scope>
- <version>1.0.0</version>
+ <version>1.1.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.clerezza</groupId>
<artifactId>rdf.jena.parser</artifactId>
<scope>test</scope>
- <version>1.0.0</version>
+ <version>1.1.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.clerezza</groupId>
http://git-wip-us.apache.org/repos/asf/clerezza/blob/d0e58460/rdf/stable.serializer/src/main/java/org/apache/clerezza/rdf/stable/serializer/NTriplesSerializer.java
----------------------------------------------------------------------
diff --git a/rdf/stable.serializer/src/main/java/org/apache/clerezza/rdf/stable/serializer/NTriplesSerializer.java b/rdf/stable.serializer/src/main/java/org/apache/clerezza/rdf/stable/serializer/NTriplesSerializer.java
index 0342bf6..aa4b424 100644
--- a/rdf/stable.serializer/src/main/java/org/apache/clerezza/rdf/stable/serializer/NTriplesSerializer.java
+++ b/rdf/stable.serializer/src/main/java/org/apache/clerezza/rdf/stable/serializer/NTriplesSerializer.java
@@ -27,6 +27,7 @@ import org.apache.clerezza.commons.rdf.Literal;
import org.apache.clerezza.commons.rdf.Triple;
import org.apache.clerezza.commons.rdf.Graph;
import org.apache.clerezza.commons.rdf.IRI;
+import org.apache.clerezza.rdf.ontologies.RDF;
import org.apache.clerezza.rdf.ontologies.XSD;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -118,18 +119,18 @@ class NTriplesSerializer {
escapeUtf8ToUsAscii(literal.getLexicalForm(), sb, false);
sb = sb.append("\"");
- if(literal.getDataType().equals(XSD.string)) {
- if(literal.getLanguage() != null &&
- !literal.getLanguage().toString().equals("")) {
+ if(literal.getLanguage() != null &&
+ !literal.getLanguage().toString().equals("")) {
- sb.append("@");
- sb.append(literal.getLanguage().toString());
- }
+ sb.append("@");
+ sb.append(literal.getLanguage().toString());
} else {
- sb.append("^^<");
- escapeUtf8ToUsAscii(
- literal.getDataType().getUnicodeString(), sb, false);
- sb.append(">");
+ if(!literal.getDataType().equals(XSD.string)) {
+ sb.append("^^<");
+ escapeUtf8ToUsAscii(
+ literal.getDataType().getUnicodeString(), sb, false);
+ sb.append(">");
+ }
}
sb.append(" ");
http://git-wip-us.apache.org/repos/asf/clerezza/blob/d0e58460/rdf/stable.serializer/src/test/java/org/apache/clerezza/rdf/stable/serializer/NTriplesSerializerTest.java
----------------------------------------------------------------------
diff --git a/rdf/stable.serializer/src/test/java/org/apache/clerezza/rdf/stable/serializer/NTriplesSerializerTest.java b/rdf/stable.serializer/src/test/java/org/apache/clerezza/rdf/stable/serializer/NTriplesSerializerTest.java
index b3d3292..a06c192 100644
--- a/rdf/stable.serializer/src/test/java/org/apache/clerezza/rdf/stable/serializer/NTriplesSerializerTest.java
+++ b/rdf/stable.serializer/src/test/java/org/apache/clerezza/rdf/stable/serializer/NTriplesSerializerTest.java
@@ -63,7 +63,8 @@ public class NTriplesSerializerTest {
{"Talks.rdf", "application/rdf+xml"},
{"elvisimp.rdf", "application/rdf+xml"},
//{"images.xrdf", "application/rdf+xml"}, //large
- {"libby.foaf", "application/rdf+xml"}
+ {"libby.foaf", "application/rdf+xml"},
+ {"documentation-example.nt", "application/n-triples"}
});
}
http://git-wip-us.apache.org/repos/asf/clerezza/blob/d0e58460/rdf/stable.serializer/src/test/java/org/apache/clerezza/rdf/stable/serializer/StableSerializerGraphTest.java
----------------------------------------------------------------------
diff --git a/rdf/stable.serializer/src/test/java/org/apache/clerezza/rdf/stable/serializer/StableSerializerGraphTest.java b/rdf/stable.serializer/src/test/java/org/apache/clerezza/rdf/stable/serializer/StableSerializerGraphTest.java
index 2637f8d..b6ad9bd 100644
--- a/rdf/stable.serializer/src/test/java/org/apache/clerezza/rdf/stable/serializer/StableSerializerGraphTest.java
+++ b/rdf/stable.serializer/src/test/java/org/apache/clerezza/rdf/stable/serializer/StableSerializerGraphTest.java
@@ -61,7 +61,8 @@ public class StableSerializerGraphTest {
{"Talks.rdf", "application/rdf+xml"},
{"elvisimp.rdf", "application/rdf+xml"},
//{"images.xrdf", "application/rdf+xml"}, //large
- {"libby.foaf", "application/rdf+xml"}
+ {"libby.foaf", "application/rdf+xml"},
+ {"documentation-example.nt", "application/n-triples"}
});
}
http://git-wip-us.apache.org/repos/asf/clerezza/blob/d0e58460/rdf/stable.serializer/src/test/resources/org/apache/clerezza/rdf/stable/serializer/documentation-example.nt
----------------------------------------------------------------------
diff --git a/rdf/stable.serializer/src/test/resources/org/apache/clerezza/rdf/stable/serializer/documentation-example.nt b/rdf/stable.serializer/src/test/resources/org/apache/clerezza/rdf/stable/serializer/documentation-example.nt
index 155d7c5..e213c4e 100644
--- a/rdf/stable.serializer/src/test/resources/org/apache/clerezza/rdf/stable/serializer/documentation-example.nt
+++ b/rdf/stable.serializer/src/test/resources/org/apache/clerezza/rdf/stable/serializer/documentation-example.nt
@@ -1,3 +1,4 @@
+<bundle:///intro-content-el/0> <http://discobits.org/ontology#infoBit> "Hello"@en.
<bundle:///intro-content-el/0> <http://discobits.org/ontology#infoBit> "The documentation viewer provides access to the documentation (provided by the different modules) at <a xmlns=\"http://www.w3.org/1999/xhtml\" href=\"/documentation\">/documentation</a>."^^<http://www.w3.org/1999/02/22-rdf-syntax-ns#XMLLiteral> .
<bundle:///intro-content-el/0> <http://www.w3.org/1999/02/22-rdf-syntax-ns#type> <http://discobits.org/ontology#XHTMLInfoDiscoBit> .
<bundle:///intro-content-el/1> <http://discobits.org/ontology#infoBit> "The documentation is ordered so that the after properties http://clerezza.org/2009/08/documentation#after are satisfied. When the documentation is written with the discobits editor such a property is typically set by adding something like the folleowing in the RDF editing mode to the xml element representing the resource: <after xmlns=\"http://clerezza.org/2009/08/documentation#\" rdf:resource=\"bundle://org.apache.clerezza.platform.content/discobits-editor\"/ />"^^<http://www.w3.org/1999/02/22-rdf-syntax-ns#XMLLiteral> .
http://git-wip-us.apache.org/repos/asf/clerezza/blob/d0e58460/releases/201604/pom.xml
----------------------------------------------------------------------
diff --git a/releases/201604/pom.xml b/releases/201604/pom.xml
index 86f72a0..b90021b 100644
--- a/releases/201604/pom.xml
+++ b/releases/201604/pom.xml
@@ -51,7 +51,9 @@
<module>../../rdf/jena/storage</module>
<module>../../rdf/jena/tdb.storage</module>
<module>../../rdf/core</module>
+ <module>../../rdf/stable.serializer</module>
<module>../../provisioning/rdf</module>
+ <module>../../provisioning/platform.content</module>
<module>../../provisioning/launchers/content-launcher</module>
<module>../../provisioning/launchers/linked-data-launcher</module>
<!-- This cannot be released as it has a SNAPSHOT dependency to a stanboltest utility,