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/21 21:00:18 UTC
[1/5] clerezza git commit: started 201604 release
Repository: clerezza
Updated Branches:
refs/heads/master 651799154 -> b40fbfc56
started 201604 release
Project: http://git-wip-us.apache.org/repos/asf/clerezza/repo
Commit: http://git-wip-us.apache.org/repos/asf/clerezza/commit/38249b87
Tree: http://git-wip-us.apache.org/repos/asf/clerezza/tree/38249b87
Diff: http://git-wip-us.apache.org/repos/asf/clerezza/diff/38249b87
Branch: refs/heads/master
Commit: 38249b875daeeaae5352968650aa201c2fb6916c
Parents: f8a5c71
Author: Reto Gmür <re...@apache.org>
Authored: Thu Apr 21 17:48:42 2016 +0200
Committer: Reto Gmür <re...@apache.org>
Committed: Thu Apr 21 17:49:15 2016 +0200
----------------------------------------------------------------------
releases/201604/README.md | 6 ++----
releases/201604/pom.xml | 18 ++++++++++--------
2 files changed, 12 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/clerezza/blob/38249b87/releases/201604/README.md
----------------------------------------------------------------------
diff --git a/releases/201604/README.md b/releases/201604/README.md
index 7818e2d..bddd94b 100644
--- a/releases/201604/README.md
+++ b/releases/201604/README.md
@@ -1,4 +1,4 @@
-# CLEREZZA 201508 release
+# CLEREZZA 201604 release
This is a partial relase of clerezza.
@@ -8,8 +8,6 @@ To build it run
from the folder
- releases/201508/
+ releases/201604/
-after that will have several launchers in the target directories below
- provisioning/launchers/
http://git-wip-us.apache.org/repos/asf/clerezza/blob/38249b87/releases/201604/pom.xml
----------------------------------------------------------------------
diff --git a/releases/201604/pom.xml b/releases/201604/pom.xml
index e1f706c..2e36f79 100644
--- a/releases/201604/pom.xml
+++ b/releases/201604/pom.xml
@@ -37,21 +37,23 @@
</parent>
<groupId>org.apache.clerezza.releases</groupId>
- <artifactId>201508</artifactId>
+ <artifactId>201506</artifactId>
<version>1</version>
<packaging>pom</packaging>
- <name>Clerezza - Release 201508</name>
+ <name>Clerezza - Release 201604</name>
<modules>
- <module>../../rdf/jena</module>
- <module>../../rdf/rdfjson</module>
- <module>../../rdf/web/rdf.web.core</module>
+ <module>../../rdf/jena/commons</module>
+ <module>../../rdf/jena/facade</module>
+ <module>../../rdf/jena/parser</module>
+ <module>../../rdf/jena/serializer</module>
+ <module>../../rdf/jena/sparql</module>
+ <module>../../rdf/jena/storage</module>
+ <module>../../rdf/jena/tdb.storage</module>
+ <module>../../rdf/core</module>
<!-- this is not yet used in launcher (as it needs to be listed inthe feature.xml -->
- <module>../../jaxrs.whiteboard.jersey</module>
<module>../../provisioning/jaxrs-whiteboard</module>
<module>../../provisioning/rdf</module>
- <module>../../provisioning/rdf.tdb</module>
- <module>../../provisioning/rdf.web</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,
[2/5] clerezza git commit: started 201604 release
Posted by re...@apache.org.
started 201604 release
Project: http://git-wip-us.apache.org/repos/asf/clerezza/repo
Commit: http://git-wip-us.apache.org/repos/asf/clerezza/commit/f8a5c714
Tree: http://git-wip-us.apache.org/repos/asf/clerezza/tree/f8a5c714
Diff: http://git-wip-us.apache.org/repos/asf/clerezza/diff/f8a5c714
Branch: refs/heads/master
Commit: f8a5c71438bba6aeb8c3f2168b4095853e83c65d
Parents: 6517991
Author: Reto Gmür <re...@apache.org>
Authored: Thu Apr 21 17:48:23 2016 +0200
Committer: Reto Gmür <re...@apache.org>
Committed: Thu Apr 21 17:49:15 2016 +0200
----------------------------------------------------------------------
releases/201604/README.md | 15 +++
releases/201604/pom.xml | 98 ++++++++++++++++++++
releases/201604/src/assembly/source-release.xml | 48 ++++++++++
3 files changed, 161 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/clerezza/blob/f8a5c714/releases/201604/README.md
----------------------------------------------------------------------
diff --git a/releases/201604/README.md b/releases/201604/README.md
new file mode 100644
index 0000000..7818e2d
--- /dev/null
+++ b/releases/201604/README.md
@@ -0,0 +1,15 @@
+# CLEREZZA 201508 release
+
+This is a partial relase of clerezza.
+
+To build it run
+
+ mvn install
+
+from the folder
+
+ releases/201508/
+
+after that will have several launchers in the target directories below
+
+ provisioning/launchers/
http://git-wip-us.apache.org/repos/asf/clerezza/blob/f8a5c714/releases/201604/pom.xml
----------------------------------------------------------------------
diff --git a/releases/201604/pom.xml b/releases/201604/pom.xml
new file mode 100644
index 0000000..e1f706c
--- /dev/null
+++ b/releases/201604/pom.xml
@@ -0,0 +1,98 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+ <!--
+
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.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.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ -->
+
+ <!-- !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+ !!!!!! !!!!!!
+ !!!!!! This pom is only provided !!!!!!
+ !!!!!! for build convenience and !!!!!!
+ !!!!!! should not be released !!!!!!
+ !!!!!! !!!!!!
+ !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -->
+
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.clerezza</groupId>
+ <artifactId>clerezza</artifactId>
+ <version>7</version>
+ <relativePath>../../parent</relativePath>
+ </parent>
+
+ <groupId>org.apache.clerezza.releases</groupId>
+ <artifactId>201508</artifactId>
+ <version>1</version>
+ <packaging>pom</packaging>
+ <name>Clerezza - Release 201508</name>
+
+ <modules>
+ <module>../../rdf/jena</module>
+ <module>../../rdf/rdfjson</module>
+ <module>../../rdf/web/rdf.web.core</module>
+ <!-- this is not yet used in launcher (as it needs to be listed inthe feature.xml -->
+ <module>../../jaxrs.whiteboard.jersey</module>
+ <module>../../provisioning/jaxrs-whiteboard</module>
+ <module>../../provisioning/rdf</module>
+ <module>../../provisioning/rdf.tdb</module>
+ <module>../../provisioning/rdf.web</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,
+ also it isn't particularly useful to have this in mavencentral.
+ It is howver included in the source distribution.
+ <module>../../provisioning/launchers/tests/content-launcher-tests</module> -->
+ </modules>
+ <scm>
+ <connection>scm:git:git://git.apache.org/clerezza.git</connection>
+ <developerConnection>scm:git:https://git-wip-us.apache.org/repos/asf/clerezza.git</developerConnection>
+ <url>http://git.apache.org/clerezza.git</url>
+ <tag>201508-1</tag>
+ </scm>
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <version>2.5.4</version>
+ <executions>
+ <execution>
+ <id>distro-assembly</id>
+ <phase>package</phase>
+ <goals>
+ <goal>single</goal>
+ </goals>
+ <configuration>
+ <descriptors>
+ <descriptor>src/assembly/source-release.xml</descriptor>
+ </descriptors>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-release-plugin</artifactId>
+ <version>2.5.2</version>
+ <configuration>
+ <updateDependencies>false</updateDependencies>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
http://git-wip-us.apache.org/repos/asf/clerezza/blob/f8a5c714/releases/201604/src/assembly/source-release.xml
----------------------------------------------------------------------
diff --git a/releases/201604/src/assembly/source-release.xml b/releases/201604/src/assembly/source-release.xml
new file mode 100644
index 0000000..b5b5c4a
--- /dev/null
+++ b/releases/201604/src/assembly/source-release.xml
@@ -0,0 +1,48 @@
+<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.3"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.3 http://maven.apache.org/xsd/assembly-1.1.3.xsd">
+ <id>src</id>
+ <formats>
+
+ <format>zip</format>
+
+ </formats>
+
+ <baseDirectory>clerezza</baseDirectory>
+
+ <fileSets>
+ <fileSet>
+ <directory>../../</directory>
+ <outputDirectory>/</outputDirectory>
+ <includes>
+ <include>rdf/jena/**</include>
+ <include>rdf/rdfjson/**</include>
+ <include>rdf/web/rdf.web.core/**</include>
+ <include>jaxrs.whiteboard.jersey/**</include>
+ <include>provisioning/jaxrs-whiteboard/**</include>
+ <include>provisioning/rdf/**</include>
+ <include>provisioning/rdf.tdb/**</include>
+ <include>provisioning/rdf.web/**</include>
+ <include>provisioning/launchers/content-launcher/**</include>
+ <include>provisioning/launchers/linked-data-launcher/**</include>
+ <include>provisioning/launchers/tests/content-launcher-tests/**</include>
+ <include>releases/201508/**</include>
+ </includes>
+ <excludes>
+ <exclude>%regex[(?!((?!${project.build.directory}/)[^/]+/)*src/).*${project.build.directory}.*]</exclude>
+ </excludes>
+ </fileSet>
+ <fileSet>
+ <directory>${project.build.directory}/maven-shared-archive-resources/META-INF</directory>
+ <outputDirectory>/</outputDirectory>
+ </fileSet>
+ <!-- license, readme, etc. calculated at build time -->
+ <fileSet>
+ <directory>./</directory>
+ <outputDirectory>/</outputDirectory>
+ <includes>
+ <include>README.md</include>
+ </includes>
+ </fileSet>
+ </fileSets>
+</assembly>
\ No newline at end of file
[5/5] clerezza git commit: updated versions fo tests, added NT test
Posted by re...@apache.org.
updated versions fo tests, added NT test
Project: http://git-wip-us.apache.org/repos/asf/clerezza/repo
Commit: http://git-wip-us.apache.org/repos/asf/clerezza/commit/b40fbfc5
Tree: http://git-wip-us.apache.org/repos/asf/clerezza/tree/b40fbfc5
Diff: http://git-wip-us.apache.org/repos/asf/clerezza/diff/b40fbfc5
Branch: refs/heads/master
Commit: b40fbfc5608bd06220afcfbc16f1c8da6ff4bdf4
Parents: 153270a
Author: Reto Gmür <re...@apache.org>
Authored: Thu Apr 21 20:58:24 2016 +0200
Committer: Reto Gmür <re...@apache.org>
Committed: Thu Apr 21 20:58:24 2016 +0200
----------------------------------------------------------------------
provisioning/launchers/content-launcher/pom.xml | 6 ++---
.../tests/content-launcher-tests/pom.xml | 8 +++---
.../integration/tests/UploadAndAccessTest.java | 13 ++++++---
.../tests/UploadAndAccessWithNTTest.java | 28 ++++++++++++++++++++
provisioning/rdf.tdb/pom.xml | 4 +--
provisioning/rdf/pom.xml | 14 +++++-----
releases/201604/pom.xml | 2 --
7 files changed, 53 insertions(+), 22 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/clerezza/blob/b40fbfc5/provisioning/launchers/content-launcher/pom.xml
----------------------------------------------------------------------
diff --git a/provisioning/launchers/content-launcher/pom.xml b/provisioning/launchers/content-launcher/pom.xml
index 218ad62..bf76d82 100644
--- a/provisioning/launchers/content-launcher/pom.xml
+++ b/provisioning/launchers/content-launcher/pom.xml
@@ -24,7 +24,7 @@
</parent>
<groupId>org.apache.clerezza.provisioning</groupId>
<artifactId>content-launcher</artifactId>
- <version>1.0.1</version>
+ <version>1.0.2-SNAPSHOT</version>
<packaging>jar</packaging>
<name>Clerezza - Provisioning - Launchers - Content Launcher</name>
@@ -233,14 +233,14 @@
<dependency>
<groupId>org.apache.clerezza.provisioning</groupId>
<artifactId>rdf</artifactId>
- <version>1.1.0</version>
+ <version>1.1.1-SNAPSHOT</version>
<type>partialbundlelist</type>
</dependency>
<dependency>
<groupId>org.apache.clerezza.provisioning</groupId>
<artifactId>rdf.tdb</artifactId>
- <version>1.1.0</version>
+ <version>1.1.1-SNAPSHOT</version>
<type>partialbundlelist</type>
</dependency>
http://git-wip-us.apache.org/repos/asf/clerezza/blob/b40fbfc5/provisioning/launchers/tests/content-launcher-tests/pom.xml
----------------------------------------------------------------------
diff --git a/provisioning/launchers/tests/content-launcher-tests/pom.xml b/provisioning/launchers/tests/content-launcher-tests/pom.xml
index 2364545..54897d1 100644
--- a/provisioning/launchers/tests/content-launcher-tests/pom.xml
+++ b/provisioning/launchers/tests/content-launcher-tests/pom.xml
@@ -117,7 +117,7 @@
<dependency>
<groupId>org.apache.clerezza.provisioning</groupId>
<artifactId>content-launcher</artifactId>
- <version>1.0.1</version>
+ <version>1.0.2-SNAPSHOT</version>
<exclusions>
<exclusion>
<groupId>*</groupId>
@@ -152,7 +152,7 @@
<dependency>
<groupId>org.apache.clerezza</groupId>
<artifactId>rdf.core</artifactId>
- <version>1.0.0</version>
+ <version>1.0.1-SNAPSHOT</version>
<scope>test</scope>
</dependency>
<dependency>
@@ -164,13 +164,13 @@
<dependency>
<groupId>org.apache.clerezza</groupId>
<artifactId>rdf.jena.parser</artifactId>
- <version>1.0.0</version>
+ <version>1.1.1-SNAPSHOT</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>org.apache.clerezza</groupId>
<artifactId>rdf.jena.serializer</artifactId>
- <version>1.0.0</version>
+ <version>1.1.1-SNAPSHOT</version>
<scope>runtime</scope>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/clerezza/blob/b40fbfc5/provisioning/launchers/tests/content-launcher-tests/src/test/java/org/apache/clerezza/integration/tests/UploadAndAccessTest.java
----------------------------------------------------------------------
diff --git a/provisioning/launchers/tests/content-launcher-tests/src/test/java/org/apache/clerezza/integration/tests/UploadAndAccessTest.java b/provisioning/launchers/tests/content-launcher-tests/src/test/java/org/apache/clerezza/integration/tests/UploadAndAccessTest.java
index 6df1bc6..22f3c46 100644
--- a/provisioning/launchers/tests/content-launcher-tests/src/test/java/org/apache/clerezza/integration/tests/UploadAndAccessTest.java
+++ b/provisioning/launchers/tests/content-launcher-tests/src/test/java/org/apache/clerezza/integration/tests/UploadAndAccessTest.java
@@ -46,19 +46,24 @@ public class UploadAndAccessTest extends BaseTest {
@Test
public void uploadAndQuery() throws Exception {
smallGraphTurtle = "<"+RestAssured.baseURI+"/test-resource> <http://www.w3.org/2000/01/rdf-schema#comment> \"A test resource\"^^<http://www.w3.org/2001/XMLSchema#string>.";
+ smallGraphTurtle += "<"+RestAssured.baseURI+"/test-resource> <http://www.w3.org/2000/01/rdf-schema#comment> \"Another comment\"@en.";
smallGraph = Parser.getInstance().parse(new ByteArrayInputStream(smallGraphTurtle.getBytes("utf-8")), "text/turtle");
- uploadTurtle();
+ uploadRDF();
sparqlAsk();
dereferenceResource();
}
- protected void uploadTurtle() {
+ protected byte[] getSerializedRdfToUpload() {
ByteArrayOutputStream baos = new ByteArrayOutputStream();
Serializer.getInstance().serialize(baos, smallGraph, getRdfFormat());
+ return baos.toByteArray();
+ }
+
+ protected void uploadRDF() {
RestAssured.given().header("Accept", "text/html")
.auth().basic("admin", "admin")
.formParam("name", Constants.CONTENT_GRAPH_URI_STRING)
- .multiPart("graph", "test.ttl", baos.toByteArray(), getRdfFormat())
+ .multiPart("graph", "test.ttl", getSerializedRdfToUpload(), getRdfFormat())
.formParam("append", "Append")
.expect().statusCode(HttpStatus.SC_NO_CONTENT).when()
.post("/graph");
@@ -87,7 +92,7 @@ public class UploadAndAccessTest extends BaseTest {
.when()
.get("/test-resource");
ImmutableGraph returnedGraph = Parser.getInstance().parse(response.getBody().asInputStream(), getRdfFormat());
- Assert.assertEquals("Returned Graph has wrong size", 1, returnedGraph.size());
+ Assert.assertEquals("Returned Graph has wrong size", 2, returnedGraph.size());
Assert.assertEquals(smallGraph, returnedGraph);
}
http://git-wip-us.apache.org/repos/asf/clerezza/blob/b40fbfc5/provisioning/launchers/tests/content-launcher-tests/src/test/java/org/apache/clerezza/integration/tests/UploadAndAccessWithNTTest.java
----------------------------------------------------------------------
diff --git a/provisioning/launchers/tests/content-launcher-tests/src/test/java/org/apache/clerezza/integration/tests/UploadAndAccessWithNTTest.java b/provisioning/launchers/tests/content-launcher-tests/src/test/java/org/apache/clerezza/integration/tests/UploadAndAccessWithNTTest.java
new file mode 100644
index 0000000..f644127
--- /dev/null
+++ b/provisioning/launchers/tests/content-launcher-tests/src/test/java/org/apache/clerezza/integration/tests/UploadAndAccessWithNTTest.java
@@ -0,0 +1,28 @@
+/*
+ * Copyright 2015 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.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.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.clerezza.integration.tests;
+
+/**
+ *
+ * @author reto
+ */
+public class UploadAndAccessWithNTTest extends UploadAndAccessTest {
+ @Override
+ protected String getRdfFormat() {
+ return "application/n-triples";
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/clerezza/blob/b40fbfc5/provisioning/rdf.tdb/pom.xml
----------------------------------------------------------------------
diff --git a/provisioning/rdf.tdb/pom.xml b/provisioning/rdf.tdb/pom.xml
index 38be7ca..79ba36a 100644
--- a/provisioning/rdf.tdb/pom.xml
+++ b/provisioning/rdf.tdb/pom.xml
@@ -31,7 +31,7 @@
<groupId>org.apache.clerezza.provisioning</groupId>
<artifactId>rdf.tdb</artifactId>
- <version>1.1.0</version>
+ <version>1.1.1-SNAPSHOT</version>
<packaging>feature</packaging>
<name>Clerezza - Provisioning - Jena TDB Storage</name>
@@ -46,7 +46,7 @@
<dependency>
<groupId>org.apache.clerezza</groupId>
<artifactId>rdf.jena.tdb.storage</artifactId>
- <version>1.1.0</version>
+ <version>1.1.1-SNAPSHOT</version>
</dependency>
http://git-wip-us.apache.org/repos/asf/clerezza/blob/b40fbfc5/provisioning/rdf/pom.xml
----------------------------------------------------------------------
diff --git a/provisioning/rdf/pom.xml b/provisioning/rdf/pom.xml
index 7799343..87159f5 100644
--- a/provisioning/rdf/pom.xml
+++ b/provisioning/rdf/pom.xml
@@ -31,7 +31,7 @@
<groupId>org.apache.clerezza.provisioning</groupId>
<artifactId>rdf</artifactId>
- <version>1.1.0</version>
+ <version>1.1.1-SNAPSHOT</version>
<packaging>feature</packaging>
<name>Clerezza - Provisioning - RDF</name>
@@ -124,12 +124,12 @@
<dependency>
<groupId>org.apache.clerezza</groupId>
<artifactId>rdf.jena.commons</artifactId>
- <version>1.1.0</version>
+ <version>1.1.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.clerezza</groupId>
<artifactId>rdf.jena.facade</artifactId>
- <version>1.1.0</version>
+ <version>1.1.1-SNAPSHOT</version>
</dependency>
<!-- requirws an older version jena-iri
<dependency>
@@ -150,22 +150,22 @@
<dependency>
<groupId>org.apache.clerezza</groupId>
<artifactId>rdf.jena.serializer</artifactId>
- <version>1.1.0</version>
+ <version>1.1.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.clerezza</groupId>
<artifactId>rdf.jena.parser</artifactId>
- <version>1.1.0</version>
+ <version>1.1.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.clerezza</groupId>
<artifactId>rdf.jena.sparql</artifactId>
- <version>1.1.0</version>
+ <version>1.1.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.clerezza</groupId>
<artifactId>rdf.jena.storage</artifactId>
- <version>1.1.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/b40fbfc5/releases/201604/pom.xml
----------------------------------------------------------------------
diff --git a/releases/201604/pom.xml b/releases/201604/pom.xml
index 2e36f79..4a95cbe 100644
--- a/releases/201604/pom.xml
+++ b/releases/201604/pom.xml
@@ -51,8 +51,6 @@
<module>../../rdf/jena/storage</module>
<module>../../rdf/jena/tdb.storage</module>
<module>../../rdf/core</module>
- <!-- this is not yet used in launcher (as it needs to be listed inthe feature.xml -->
- <module>../../provisioning/jaxrs-whiteboard</module>
<module>../../provisioning/rdf</module>
<module>../../provisioning/launchers/content-launcher</module>
<module>../../provisioning/launchers/linked-data-launcher</module>
[3/5] clerezza git commit: testing released version
Posted by re...@apache.org.
testing released version
Project: http://git-wip-us.apache.org/repos/asf/clerezza/repo
Commit: http://git-wip-us.apache.org/repos/asf/clerezza/commit/d7c65e56
Tree: http://git-wip-us.apache.org/repos/asf/clerezza/tree/d7c65e56
Diff: http://git-wip-us.apache.org/repos/asf/clerezza/diff/d7c65e56
Branch: refs/heads/master
Commit: d7c65e566e5b168b3c945c86ab632a7190ce1581
Parents: 38249b8
Author: Reto Gmür <re...@apache.org>
Authored: Thu Apr 21 18:03:16 2016 +0200
Committer: Reto Gmür <re...@apache.org>
Committed: Thu Apr 21 18:03:16 2016 +0200
----------------------------------------------------------------------
provisioning/launchers/tests/content-launcher-tests/pom.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/clerezza/blob/d7c65e56/provisioning/launchers/tests/content-launcher-tests/pom.xml
----------------------------------------------------------------------
diff --git a/provisioning/launchers/tests/content-launcher-tests/pom.xml b/provisioning/launchers/tests/content-launcher-tests/pom.xml
index a4a4039..2364545 100644
--- a/provisioning/launchers/tests/content-launcher-tests/pom.xml
+++ b/provisioning/launchers/tests/content-launcher-tests/pom.xml
@@ -117,7 +117,7 @@
<dependency>
<groupId>org.apache.clerezza.provisioning</groupId>
<artifactId>content-launcher</artifactId>
- <version>1.0.1-SNAPSHOT</version>
+ <version>1.0.1</version>
<exclusions>
<exclusion>
<groupId>*</groupId>
@@ -176,7 +176,7 @@
<dependency>
<groupId>org.apache.clerezza</groupId>
<artifactId>rdf.rdfjson</artifactId>
- <version>1.0.1-SNAPSHOT</version>
+ <version>1.0.1</version>
<scope>runtime</scope>
</dependency>
<dependency>
[4/5] clerezza git commit: Omitting datapype from lag-string for
literals with language so that jena serializes NT corectly
Posted by re...@apache.org.
Omitting datapype from lag-string for literals with language so that jena serializes NT corectly
Project: http://git-wip-us.apache.org/repos/asf/clerezza/repo
Commit: http://git-wip-us.apache.org/repos/asf/clerezza/commit/153270a2
Tree: http://git-wip-us.apache.org/repos/asf/clerezza/tree/153270a2
Diff: http://git-wip-us.apache.org/repos/asf/clerezza/diff/153270a2
Branch: refs/heads/master
Commit: 153270a2119a782dcadd05b99ca0fe7daa759a0f
Parents: d7c65e5
Author: Reto Gmür <re...@apache.org>
Authored: Thu Apr 21 19:33:04 2016 +0200
Committer: Reto Gmür <re...@apache.org>
Committed: Thu Apr 21 19:33:04 2016 +0200
----------------------------------------------------------------------
.../java/org/apache/clerezza/rdf/jena/commons/Tria2JenaUtil.java | 4 ++--
.../clerezza/rdf/jena/serializer/TestJenaSerializerProvider.java | 1 -
2 files changed, 2 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/clerezza/blob/153270a2/rdf/jena/commons/src/main/java/org/apache/clerezza/rdf/jena/commons/Tria2JenaUtil.java
----------------------------------------------------------------------
diff --git a/rdf/jena/commons/src/main/java/org/apache/clerezza/rdf/jena/commons/Tria2JenaUtil.java b/rdf/jena/commons/src/main/java/org/apache/clerezza/rdf/jena/commons/Tria2JenaUtil.java
index 7031e02..5f33757 100644
--- a/rdf/jena/commons/src/main/java/org/apache/clerezza/rdf/jena/commons/Tria2JenaUtil.java
+++ b/rdf/jena/commons/src/main/java/org/apache/clerezza/rdf/jena/commons/Tria2JenaUtil.java
@@ -55,9 +55,9 @@ public class Tria2JenaUtil {
return com.hp.hpl.jena.graph.NodeFactory.createLiteral(
literal.getLexicalForm(),
literal.getLanguage() == null ? null : literal.getLanguage().
- toString(), TypeMapper.getInstance().
+ toString(), literal.getLanguage() == null ? TypeMapper.getInstance().
getSafeTypeByName(
- literal.getDataType().getUnicodeString()));
+ literal.getDataType().getUnicodeString()) : null);
}
public Node convert2JenaNode(RDFTerm resource) {
http://git-wip-us.apache.org/repos/asf/clerezza/blob/153270a2/rdf/jena/serializer/src/test/java/org/apache/clerezza/rdf/jena/serializer/TestJenaSerializerProvider.java
----------------------------------------------------------------------
diff --git a/rdf/jena/serializer/src/test/java/org/apache/clerezza/rdf/jena/serializer/TestJenaSerializerProvider.java b/rdf/jena/serializer/src/test/java/org/apache/clerezza/rdf/jena/serializer/TestJenaSerializerProvider.java
index 79a00e2..3c762cf 100644
--- a/rdf/jena/serializer/src/test/java/org/apache/clerezza/rdf/jena/serializer/TestJenaSerializerProvider.java
+++ b/rdf/jena/serializer/src/test/java/org/apache/clerezza/rdf/jena/serializer/TestJenaSerializerProvider.java
@@ -141,7 +141,6 @@ public class TestJenaSerializerProvider {
/*
* Serialize ImmutableGraph to rdf+nt format and deserialize.
*/
- @Ignore("currently broken: serializer adds langauge and datatype")
@Test
public void testRdfNtSerializer() {
initializeGraph();