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 2013/10/15 14:27:45 UTC
[1/4] git commit: Starting 3.1.1 development branch
Updated Branches:
refs/heads/maintenance-3.0.x [created] 91d7773b7
refs/heads/maintenance-3.1.x [created] 3c43d27e8
Starting 3.1.1 development branch
Project: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/commit/291e7051
Tree: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/tree/291e7051
Diff: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/diff/291e7051
Branch: refs/heads/maintenance-3.1.x
Commit: 291e70512074f5341d37b39a2b3032f45a168800
Parents: c66a4eb
Author: Jakob Frank <ja...@apache.org>
Authored: Tue Oct 15 11:08:34 2013 +0200
Committer: Jakob Frank <ja...@apache.org>
Committed: Tue Oct 15 11:08:34 2013 +0200
----------------------------------------------------------------------
build/archetypes/marmotta-archetype-module/pom.xml | 2 +-
build/archetypes/marmotta-archetype-webapp/pom.xml | 2 +-
build/archetypes/pom.xml | 2 +-
build/checkstyle-resources/pom.xml | 2 +-
build/dependency-resource-supplement/pom.xml | 2 +-
build/plugins/buildinfo-maven-plugin/pom.xml | 2 +-
build/plugins/marmotta-maven-plugin/pom.xml | 2 +-
build/plugins/pom.xml | 2 +-
build/plugins/refpack-maven-plugin/pom.xml | 2 +-
build/plugins/repocheck-maven-plugin/pom.xml | 2 +-
build/pom.xml | 2 +-
client/marmotta-client-java/pom.xml | 2 +-
client/marmotta-client-js-sample-webapp/pom.xml | 2 +-
client/marmotta-client-js/pom.xml | 2 +-
client/marmotta-client-php/pom.xml | 2 +-
client/pom.xml | 2 +-
commons/marmotta-commons/pom.xml | 2 +-
commons/pom.xml | 2 +-
commons/sesame-filter/pom.xml | 2 +-
commons/sesame-tools-facading/pom.xml | 2 +-
commons/sesame-tools-rio-api/pom.xml | 2 +-
commons/sesame-tools-rio-ical/pom.xml | 2 +-
commons/sesame-tools-rio-rss/pom.xml | 2 +-
commons/sesame-tools-rio-vcard/pom.xml | 2 +-
extras/pom.xml | 2 +-
extras/webjars/codemirror/pom.xml | 2 +-
extras/webjars/pom.xml | 2 +-
extras/webjars/sgvizler/pom.xml | 2 +-
extras/webjars/snorql/pom.xml | 2 +-
extras/webjars/strftime/pom.xml | 2 +-
launchers/marmotta-installer/pom.xml | 2 +-
launchers/marmotta-splash/pom.xml | 2 +-
launchers/marmotta-webapp/pom.xml | 2 +-
launchers/pom.xml | 2 +-
libraries/kiwi/kiwi-contextaware/pom.xml | 2 +-
libraries/kiwi/kiwi-reasoner/pom.xml | 2 +-
libraries/kiwi/kiwi-sparql/pom.xml | 2 +-
libraries/kiwi/kiwi-transactions/pom.xml | 2 +-
libraries/kiwi/kiwi-triplestore/pom.xml | 2 +-
libraries/kiwi/kiwi-tripletable/pom.xml | 2 +-
libraries/kiwi/kiwi-versioning/pom.xml | 2 +-
libraries/kiwi/pom.xml | 2 +-
libraries/ldcache/ldcache-api/pom.xml | 2 +-
libraries/ldcache/ldcache-backend-ehcache/pom.xml | 2 +-
libraries/ldcache/ldcache-backend-file/pom.xml | 2 +-
libraries/ldcache/ldcache-backend-kiwi/pom.xml | 2 +-
libraries/ldcache/ldcache-backend-mapdb/pom.xml | 2 +-
libraries/ldcache/ldcache-core/pom.xml | 2 +-
libraries/ldcache/ldcache-sail-generic/pom.xml | 2 +-
libraries/ldcache/ldcache-sail-kiwi/pom.xml | 2 +-
libraries/ldcache/pom.xml | 2 +-
libraries/ldclient/ldclient-api/pom.xml | 2 +-
libraries/ldclient/ldclient-core/pom.xml | 2 +-
libraries/ldclient/ldclient-provider-facebook/pom.xml | 2 +-
libraries/ldclient/ldclient-provider-html/pom.xml | 2 +-
libraries/ldclient/ldclient-provider-ldap/pom.xml | 2 +-
libraries/ldclient/ldclient-provider-mediawiki/pom.xml | 2 +-
libraries/ldclient/ldclient-provider-phpbb/pom.xml | 2 +-
libraries/ldclient/ldclient-provider-rdf/pom.xml | 2 +-
libraries/ldclient/ldclient-provider-rdfa/pom.xml | 2 +-
libraries/ldclient/ldclient-provider-vimeo/pom.xml | 2 +-
libraries/ldclient/ldclient-provider-xml/pom.xml | 2 +-
libraries/ldclient/ldclient-provider-youtube/pom.xml | 2 +-
libraries/ldclient/pom.xml | 2 +-
libraries/ldpath/ldpath-api/pom.xml | 2 +-
libraries/ldpath/ldpath-backend-file/pom.xml | 2 +-
libraries/ldpath/ldpath-backend-jena/pom.xml | 2 +-
libraries/ldpath/ldpath-backend-linkeddata/pom.xml | 2 +-
libraries/ldpath/ldpath-backend-sesame/pom.xml | 2 +-
libraries/ldpath/ldpath-core/pom.xml | 2 +-
libraries/ldpath/ldpath-functions-collections/pom.xml | 2 +-
libraries/ldpath/ldpath-functions-date/pom.xml | 2 +-
libraries/ldpath/ldpath-functions-html/pom.xml | 2 +-
libraries/ldpath/ldpath-functions-math/pom.xml | 2 +-
libraries/ldpath/ldpath-functions-text/pom.xml | 2 +-
libraries/ldpath/ldpath-functions-xml/pom.xml | 2 +-
libraries/ldpath/ldpath-template-linkeddata/pom.xml | 2 +-
libraries/ldpath/ldpath-template/pom.xml | 2 +-
libraries/ldpath/pom.xml | 2 +-
libraries/pom.xml | 2 +-
parent/pom.xml | 2 +-
platform/marmotta-core/pom.xml | 2 +-
platform/marmotta-ldcache/pom.xml | 2 +-
platform/marmotta-ldpath/pom.xml | 2 +-
platform/marmotta-reasoner/pom.xml | 2 +-
platform/marmotta-security/pom.xml | 2 +-
platform/marmotta-sparql/pom.xml | 2 +-
platform/marmotta-user/pom.xml | 2 +-
platform/marmotta-versioning/pom.xml | 2 +-
platform/pom.xml | 2 +-
pom.xml | 2 +-
91 files changed, 91 insertions(+), 91 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/291e7051/build/archetypes/marmotta-archetype-module/pom.xml
----------------------------------------------------------------------
diff --git a/build/archetypes/marmotta-archetype-module/pom.xml b/build/archetypes/marmotta-archetype-module/pom.xml
index 8cc13ff..d38b781 100644
--- a/build/archetypes/marmotta-archetype-module/pom.xml
+++ b/build/archetypes/marmotta-archetype-module/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating</version>
+ <version>3.1.1-incubating-SNAPSHOT</version>
<relativePath>../../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/291e7051/build/archetypes/marmotta-archetype-webapp/pom.xml
----------------------------------------------------------------------
diff --git a/build/archetypes/marmotta-archetype-webapp/pom.xml b/build/archetypes/marmotta-archetype-webapp/pom.xml
index bfb2aba..9228ff5 100644
--- a/build/archetypes/marmotta-archetype-webapp/pom.xml
+++ b/build/archetypes/marmotta-archetype-webapp/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating</version>
+ <version>3.1.1-incubating-SNAPSHOT</version>
<relativePath>../../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/291e7051/build/archetypes/pom.xml
----------------------------------------------------------------------
diff --git a/build/archetypes/pom.xml b/build/archetypes/pom.xml
index dea4e2a..0dd93e9 100644
--- a/build/archetypes/pom.xml
+++ b/build/archetypes/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating</version>
+ <version>3.1.1-incubating-SNAPSHOT</version>
<relativePath>../../parent</relativePath>
</parent>
<artifactId>archetypes-reactor</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/291e7051/build/checkstyle-resources/pom.xml
----------------------------------------------------------------------
diff --git a/build/checkstyle-resources/pom.xml b/build/checkstyle-resources/pom.xml
index 0ef41ed..d902ee7 100644
--- a/build/checkstyle-resources/pom.xml
+++ b/build/checkstyle-resources/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating</version>
+ <version>3.1.1-incubating-SNAPSHOT</version>
<relativePath>../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/291e7051/build/dependency-resource-supplement/pom.xml
----------------------------------------------------------------------
diff --git a/build/dependency-resource-supplement/pom.xml b/build/dependency-resource-supplement/pom.xml
index 92d77a4..bec773e 100644
--- a/build/dependency-resource-supplement/pom.xml
+++ b/build/dependency-resource-supplement/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating</version>
+ <version>3.1.1-incubating-SNAPSHOT</version>
<relativePath>../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/291e7051/build/plugins/buildinfo-maven-plugin/pom.xml
----------------------------------------------------------------------
diff --git a/build/plugins/buildinfo-maven-plugin/pom.xml b/build/plugins/buildinfo-maven-plugin/pom.xml
index e363329..55cc6c4 100644
--- a/build/plugins/buildinfo-maven-plugin/pom.xml
+++ b/build/plugins/buildinfo-maven-plugin/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating</version>
+ <version>3.1.1-incubating-SNAPSHOT</version>
<relativePath>../../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/291e7051/build/plugins/marmotta-maven-plugin/pom.xml
----------------------------------------------------------------------
diff --git a/build/plugins/marmotta-maven-plugin/pom.xml b/build/plugins/marmotta-maven-plugin/pom.xml
index fc86edf..a6f7170 100644
--- a/build/plugins/marmotta-maven-plugin/pom.xml
+++ b/build/plugins/marmotta-maven-plugin/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
- <version>3.1.0-incubating</version>
+ <version>3.1.1-incubating-SNAPSHOT</version>
<relativePath>../</relativePath>
<artifactId>plugins-reactor</artifactId>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/291e7051/build/plugins/pom.xml
----------------------------------------------------------------------
diff --git a/build/plugins/pom.xml b/build/plugins/pom.xml
index 3a11349..ffd1dd2 100644
--- a/build/plugins/pom.xml
+++ b/build/plugins/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating</version>
+ <version>3.1.1-incubating-SNAPSHOT</version>
<relativePath>../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/291e7051/build/plugins/refpack-maven-plugin/pom.xml
----------------------------------------------------------------------
diff --git a/build/plugins/refpack-maven-plugin/pom.xml b/build/plugins/refpack-maven-plugin/pom.xml
index 0ab97f5..aacac37 100644
--- a/build/plugins/refpack-maven-plugin/pom.xml
+++ b/build/plugins/refpack-maven-plugin/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
- <version>3.1.0-incubating</version>
+ <version>3.1.1-incubating-SNAPSHOT</version>
<artifactId>plugins-reactor</artifactId>
<relativePath>../</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/291e7051/build/plugins/repocheck-maven-plugin/pom.xml
----------------------------------------------------------------------
diff --git a/build/plugins/repocheck-maven-plugin/pom.xml b/build/plugins/repocheck-maven-plugin/pom.xml
index c1982b4..09f4faa 100644
--- a/build/plugins/repocheck-maven-plugin/pom.xml
+++ b/build/plugins/repocheck-maven-plugin/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>plugins-reactor</artifactId>
- <version>3.1.0-incubating</version>
+ <version>3.1.1-incubating-SNAPSHOT</version>
<relativePath>../</relativePath>
<!-- <artifactId>maven-plugins</artifactId> <groupId>org.apache.maven.plugins</groupId>
<version>23</version> <relativePath /> -->
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/291e7051/build/pom.xml
----------------------------------------------------------------------
diff --git a/build/pom.xml b/build/pom.xml
index a3bd4de..e0d78dc 100644
--- a/build/pom.xml
+++ b/build/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating</version>
+ <version>3.1.1-incubating-SNAPSHOT</version>
<relativePath>../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/291e7051/client/marmotta-client-java/pom.xml
----------------------------------------------------------------------
diff --git a/client/marmotta-client-java/pom.xml b/client/marmotta-client-java/pom.xml
index 07ef981..379eda7 100644
--- a/client/marmotta-client-java/pom.xml
+++ b/client/marmotta-client-java/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating</version>
+ <version>3.1.1-incubating-SNAPSHOT</version>
<relativePath>../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/291e7051/client/marmotta-client-js-sample-webapp/pom.xml
----------------------------------------------------------------------
diff --git a/client/marmotta-client-js-sample-webapp/pom.xml b/client/marmotta-client-js-sample-webapp/pom.xml
index afe52bf..d5f095b 100644
--- a/client/marmotta-client-js-sample-webapp/pom.xml
+++ b/client/marmotta-client-js-sample-webapp/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating-SNAPSHOT</version>
+ <version>3.1.1-incubating-SNAPSHOT</version>
<relativePath>../../parent/pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/291e7051/client/marmotta-client-js/pom.xml
----------------------------------------------------------------------
diff --git a/client/marmotta-client-js/pom.xml b/client/marmotta-client-js/pom.xml
index f636502..d7d120c 100644
--- a/client/marmotta-client-js/pom.xml
+++ b/client/marmotta-client-js/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating</version>
+ <version>3.1.1-incubating-SNAPSHOT</version>
<relativePath>../../parent/pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/291e7051/client/marmotta-client-php/pom.xml
----------------------------------------------------------------------
diff --git a/client/marmotta-client-php/pom.xml b/client/marmotta-client-php/pom.xml
index 33a83fc..a12e35c 100644
--- a/client/marmotta-client-php/pom.xml
+++ b/client/marmotta-client-php/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating-SNAPSHOT</version>
+ <version>3.1.1-incubating-SNAPSHOT</version>
<relativePath>../../parent/pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/291e7051/client/pom.xml
----------------------------------------------------------------------
diff --git a/client/pom.xml b/client/pom.xml
index 0eac626..8310996 100644
--- a/client/pom.xml
+++ b/client/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating</version>
+ <version>3.1.1-incubating-SNAPSHOT</version>
<relativePath>../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/291e7051/commons/marmotta-commons/pom.xml
----------------------------------------------------------------------
diff --git a/commons/marmotta-commons/pom.xml b/commons/marmotta-commons/pom.xml
index a84fbaf..5712fec 100644
--- a/commons/marmotta-commons/pom.xml
+++ b/commons/marmotta-commons/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating</version>
+ <version>3.1.1-incubating-SNAPSHOT</version>
<relativePath>../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/291e7051/commons/pom.xml
----------------------------------------------------------------------
diff --git a/commons/pom.xml b/commons/pom.xml
index 06ba1eb..394656b 100644
--- a/commons/pom.xml
+++ b/commons/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating</version>
+ <version>3.1.1-incubating-SNAPSHOT</version>
<relativePath>../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/291e7051/commons/sesame-filter/pom.xml
----------------------------------------------------------------------
diff --git a/commons/sesame-filter/pom.xml b/commons/sesame-filter/pom.xml
index 36be4ae..851a7cd 100644
--- a/commons/sesame-filter/pom.xml
+++ b/commons/sesame-filter/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating</version>
+ <version>3.1.1-incubating-SNAPSHOT</version>
<relativePath>../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/291e7051/commons/sesame-tools-facading/pom.xml
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-facading/pom.xml b/commons/sesame-tools-facading/pom.xml
index 9dfd8a5..54ffeee 100644
--- a/commons/sesame-tools-facading/pom.xml
+++ b/commons/sesame-tools-facading/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating</version>
+ <version>3.1.1-incubating-SNAPSHOT</version>
<relativePath>../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/291e7051/commons/sesame-tools-rio-api/pom.xml
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-rio-api/pom.xml b/commons/sesame-tools-rio-api/pom.xml
index 475ae41..b5fb81a 100644
--- a/commons/sesame-tools-rio-api/pom.xml
+++ b/commons/sesame-tools-rio-api/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating</version>
+ <version>3.1.1-incubating-SNAPSHOT</version>
<relativePath>../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/291e7051/commons/sesame-tools-rio-ical/pom.xml
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-rio-ical/pom.xml b/commons/sesame-tools-rio-ical/pom.xml
index 8ec3e73..3097df3 100644
--- a/commons/sesame-tools-rio-ical/pom.xml
+++ b/commons/sesame-tools-rio-ical/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating</version>
+ <version>3.1.1-incubating-SNAPSHOT</version>
<relativePath>../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/291e7051/commons/sesame-tools-rio-rss/pom.xml
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-rio-rss/pom.xml b/commons/sesame-tools-rio-rss/pom.xml
index 0f4a8d8..a80dd20 100644
--- a/commons/sesame-tools-rio-rss/pom.xml
+++ b/commons/sesame-tools-rio-rss/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating</version>
+ <version>3.1.1-incubating-SNAPSHOT</version>
<relativePath>../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/291e7051/commons/sesame-tools-rio-vcard/pom.xml
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-rio-vcard/pom.xml b/commons/sesame-tools-rio-vcard/pom.xml
index 25de2c0..8eb84e4 100644
--- a/commons/sesame-tools-rio-vcard/pom.xml
+++ b/commons/sesame-tools-rio-vcard/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating</version>
+ <version>3.1.1-incubating-SNAPSHOT</version>
<relativePath>../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/291e7051/extras/pom.xml
----------------------------------------------------------------------
diff --git a/extras/pom.xml b/extras/pom.xml
index 0be1aef..bc360b1 100644
--- a/extras/pom.xml
+++ b/extras/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating</version>
+ <version>3.1.1-incubating-SNAPSHOT</version>
<relativePath>../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/291e7051/extras/webjars/codemirror/pom.xml
----------------------------------------------------------------------
diff --git a/extras/webjars/codemirror/pom.xml b/extras/webjars/codemirror/pom.xml
index 1605757..bd18153 100644
--- a/extras/webjars/codemirror/pom.xml
+++ b/extras/webjars/codemirror/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating</version>
+ <version>3.1.1-incubating-SNAPSHOT</version>
<relativePath>../../../parent/</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/291e7051/extras/webjars/pom.xml
----------------------------------------------------------------------
diff --git a/extras/webjars/pom.xml b/extras/webjars/pom.xml
index 2450243..48f08ec 100644
--- a/extras/webjars/pom.xml
+++ b/extras/webjars/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating</version>
+ <version>3.1.1-incubating-SNAPSHOT</version>
<relativePath>../../parent/</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/291e7051/extras/webjars/sgvizler/pom.xml
----------------------------------------------------------------------
diff --git a/extras/webjars/sgvizler/pom.xml b/extras/webjars/sgvizler/pom.xml
index a611271..d4ceb0c 100644
--- a/extras/webjars/sgvizler/pom.xml
+++ b/extras/webjars/sgvizler/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating</version>
+ <version>3.1.1-incubating-SNAPSHOT</version>
<relativePath>../../../parent/</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/291e7051/extras/webjars/snorql/pom.xml
----------------------------------------------------------------------
diff --git a/extras/webjars/snorql/pom.xml b/extras/webjars/snorql/pom.xml
index 0f8831e..a747932 100644
--- a/extras/webjars/snorql/pom.xml
+++ b/extras/webjars/snorql/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating</version>
+ <version>3.1.1-incubating-SNAPSHOT</version>
<relativePath>../../../parent/</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/291e7051/extras/webjars/strftime/pom.xml
----------------------------------------------------------------------
diff --git a/extras/webjars/strftime/pom.xml b/extras/webjars/strftime/pom.xml
index 6f337ab..6a81fed 100644
--- a/extras/webjars/strftime/pom.xml
+++ b/extras/webjars/strftime/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating</version>
+ <version>3.1.1-incubating-SNAPSHOT</version>
<relativePath>../../../parent/</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/291e7051/launchers/marmotta-installer/pom.xml
----------------------------------------------------------------------
diff --git a/launchers/marmotta-installer/pom.xml b/launchers/marmotta-installer/pom.xml
index 5db3648..de083d8 100644
--- a/launchers/marmotta-installer/pom.xml
+++ b/launchers/marmotta-installer/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating</version>
+ <version>3.1.1-incubating-SNAPSHOT</version>
<relativePath>../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/291e7051/launchers/marmotta-splash/pom.xml
----------------------------------------------------------------------
diff --git a/launchers/marmotta-splash/pom.xml b/launchers/marmotta-splash/pom.xml
index aea7c89..1fe8605 100644
--- a/launchers/marmotta-splash/pom.xml
+++ b/launchers/marmotta-splash/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating</version>
+ <version>3.1.1-incubating-SNAPSHOT</version>
<relativePath>../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/291e7051/launchers/marmotta-webapp/pom.xml
----------------------------------------------------------------------
diff --git a/launchers/marmotta-webapp/pom.xml b/launchers/marmotta-webapp/pom.xml
index 60d6f86..d09a8ca 100644
--- a/launchers/marmotta-webapp/pom.xml
+++ b/launchers/marmotta-webapp/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating</version>
+ <version>3.1.1-incubating-SNAPSHOT</version>
<relativePath>../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/291e7051/launchers/pom.xml
----------------------------------------------------------------------
diff --git a/launchers/pom.xml b/launchers/pom.xml
index 8aa8a8d..9ab790d 100644
--- a/launchers/pom.xml
+++ b/launchers/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating</version>
+ <version>3.1.1-incubating-SNAPSHOT</version>
<relativePath>../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/291e7051/libraries/kiwi/kiwi-contextaware/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/kiwi/kiwi-contextaware/pom.xml b/libraries/kiwi/kiwi-contextaware/pom.xml
index c4bcf84..b6073b3 100644
--- a/libraries/kiwi/kiwi-contextaware/pom.xml
+++ b/libraries/kiwi/kiwi-contextaware/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>kiwi-parent</artifactId>
- <version>3.1.0-incubating</version>
+ <version>3.1.1-incubating-SNAPSHOT</version>
<relativePath>../</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/291e7051/libraries/kiwi/kiwi-reasoner/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/kiwi/kiwi-reasoner/pom.xml b/libraries/kiwi/kiwi-reasoner/pom.xml
index e76b396..d3e5a90 100644
--- a/libraries/kiwi/kiwi-reasoner/pom.xml
+++ b/libraries/kiwi/kiwi-reasoner/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>kiwi-parent</artifactId>
- <version>3.1.0-incubating</version>
+ <version>3.1.1-incubating-SNAPSHOT</version>
<relativePath>../</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/291e7051/libraries/kiwi/kiwi-sparql/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/kiwi/kiwi-sparql/pom.xml b/libraries/kiwi/kiwi-sparql/pom.xml
index 3ddd37d..2c51e00 100644
--- a/libraries/kiwi/kiwi-sparql/pom.xml
+++ b/libraries/kiwi/kiwi-sparql/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>kiwi-parent</artifactId>
- <version>3.1.0-incubating</version>
+ <version>3.1.1-incubating-SNAPSHOT</version>
<relativePath>../</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/291e7051/libraries/kiwi/kiwi-transactions/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/kiwi/kiwi-transactions/pom.xml b/libraries/kiwi/kiwi-transactions/pom.xml
index 07d3b2d..75063ba 100644
--- a/libraries/kiwi/kiwi-transactions/pom.xml
+++ b/libraries/kiwi/kiwi-transactions/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>kiwi-parent</artifactId>
- <version>3.1.0-incubating</version>
+ <version>3.1.1-incubating-SNAPSHOT</version>
<relativePath>../</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/291e7051/libraries/kiwi/kiwi-triplestore/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/kiwi/kiwi-triplestore/pom.xml b/libraries/kiwi/kiwi-triplestore/pom.xml
index ac82859..cfbd3bf 100644
--- a/libraries/kiwi/kiwi-triplestore/pom.xml
+++ b/libraries/kiwi/kiwi-triplestore/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>kiwi-parent</artifactId>
- <version>3.1.0-incubating</version>
+ <version>3.1.1-incubating-SNAPSHOT</version>
<relativePath>../</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/291e7051/libraries/kiwi/kiwi-tripletable/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/kiwi/kiwi-tripletable/pom.xml b/libraries/kiwi/kiwi-tripletable/pom.xml
index 2c8a49d..d79af31 100644
--- a/libraries/kiwi/kiwi-tripletable/pom.xml
+++ b/libraries/kiwi/kiwi-tripletable/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>kiwi-parent</artifactId>
- <version>3.1.0-incubating</version>
+ <version>3.1.1-incubating-SNAPSHOT</version>
</parent>
<artifactId>kiwi-tripletable</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/291e7051/libraries/kiwi/kiwi-versioning/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/kiwi/kiwi-versioning/pom.xml b/libraries/kiwi/kiwi-versioning/pom.xml
index 81c2a4c..85eaeaa 100644
--- a/libraries/kiwi/kiwi-versioning/pom.xml
+++ b/libraries/kiwi/kiwi-versioning/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>kiwi-parent</artifactId>
- <version>3.1.0-incubating</version>
+ <version>3.1.1-incubating-SNAPSHOT</version>
<relativePath>../</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/291e7051/libraries/kiwi/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/kiwi/pom.xml b/libraries/kiwi/pom.xml
index 665f70d..10e7b46 100644
--- a/libraries/kiwi/pom.xml
+++ b/libraries/kiwi/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating</version>
+ <version>3.1.1-incubating-SNAPSHOT</version>
<relativePath>../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/291e7051/libraries/ldcache/ldcache-api/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldcache/ldcache-api/pom.xml b/libraries/ldcache/ldcache-api/pom.xml
index 13dbd08..2266559 100644
--- a/libraries/ldcache/ldcache-api/pom.xml
+++ b/libraries/ldcache/ldcache-api/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating</version>
+ <version>3.1.1-incubating-SNAPSHOT</version>
<relativePath>../../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/291e7051/libraries/ldcache/ldcache-backend-ehcache/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldcache/ldcache-backend-ehcache/pom.xml b/libraries/ldcache/ldcache-backend-ehcache/pom.xml
index 0df8bea..d2491ea 100644
--- a/libraries/ldcache/ldcache-backend-ehcache/pom.xml
+++ b/libraries/ldcache/ldcache-backend-ehcache/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating</version>
+ <version>3.1.1-incubating-SNAPSHOT</version>
<relativePath>../../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/291e7051/libraries/ldcache/ldcache-backend-file/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldcache/ldcache-backend-file/pom.xml b/libraries/ldcache/ldcache-backend-file/pom.xml
index 881b2bf..2166f77 100644
--- a/libraries/ldcache/ldcache-backend-file/pom.xml
+++ b/libraries/ldcache/ldcache-backend-file/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating</version>
+ <version>3.1.1-incubating-SNAPSHOT</version>
<relativePath>../../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/291e7051/libraries/ldcache/ldcache-backend-kiwi/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldcache/ldcache-backend-kiwi/pom.xml b/libraries/ldcache/ldcache-backend-kiwi/pom.xml
index 1fab347..ab17ca8 100644
--- a/libraries/ldcache/ldcache-backend-kiwi/pom.xml
+++ b/libraries/ldcache/ldcache-backend-kiwi/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating</version>
+ <version>3.1.1-incubating-SNAPSHOT</version>
<relativePath>../../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/291e7051/libraries/ldcache/ldcache-backend-mapdb/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldcache/ldcache-backend-mapdb/pom.xml b/libraries/ldcache/ldcache-backend-mapdb/pom.xml
index 2b66c90..bd93611 100644
--- a/libraries/ldcache/ldcache-backend-mapdb/pom.xml
+++ b/libraries/ldcache/ldcache-backend-mapdb/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating-SNAPSHOT</version>
+ <version>3.1.1-incubating-SNAPSHOT</version>
<relativePath>../../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/291e7051/libraries/ldcache/ldcache-core/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldcache/ldcache-core/pom.xml b/libraries/ldcache/ldcache-core/pom.xml
index 6b2c713..260f388 100644
--- a/libraries/ldcache/ldcache-core/pom.xml
+++ b/libraries/ldcache/ldcache-core/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating</version>
+ <version>3.1.1-incubating-SNAPSHOT</version>
<relativePath>../../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/291e7051/libraries/ldcache/ldcache-sail-generic/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldcache/ldcache-sail-generic/pom.xml b/libraries/ldcache/ldcache-sail-generic/pom.xml
index 8ed617e..985fff4 100644
--- a/libraries/ldcache/ldcache-sail-generic/pom.xml
+++ b/libraries/ldcache/ldcache-sail-generic/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating</version>
+ <version>3.1.1-incubating-SNAPSHOT</version>
<relativePath>../../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/291e7051/libraries/ldcache/ldcache-sail-kiwi/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldcache/ldcache-sail-kiwi/pom.xml b/libraries/ldcache/ldcache-sail-kiwi/pom.xml
index 8c755ea..18951ea 100644
--- a/libraries/ldcache/ldcache-sail-kiwi/pom.xml
+++ b/libraries/ldcache/ldcache-sail-kiwi/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating</version>
+ <version>3.1.1-incubating-SNAPSHOT</version>
<relativePath>../../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/291e7051/libraries/ldcache/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldcache/pom.xml b/libraries/ldcache/pom.xml
index 26dee79..a592ebc 100644
--- a/libraries/ldcache/pom.xml
+++ b/libraries/ldcache/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating</version>
+ <version>3.1.1-incubating-SNAPSHOT</version>
<relativePath>../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/291e7051/libraries/ldclient/ldclient-api/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldclient/ldclient-api/pom.xml b/libraries/ldclient/ldclient-api/pom.xml
index 6873d92..40f45ea 100644
--- a/libraries/ldclient/ldclient-api/pom.xml
+++ b/libraries/ldclient/ldclient-api/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating</version>
+ <version>3.1.1-incubating-SNAPSHOT</version>
<relativePath>../../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/291e7051/libraries/ldclient/ldclient-core/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldclient/ldclient-core/pom.xml b/libraries/ldclient/ldclient-core/pom.xml
index de02401..9cff9b2 100644
--- a/libraries/ldclient/ldclient-core/pom.xml
+++ b/libraries/ldclient/ldclient-core/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating</version>
+ <version>3.1.1-incubating-SNAPSHOT</version>
<relativePath>../../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/291e7051/libraries/ldclient/ldclient-provider-facebook/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldclient/ldclient-provider-facebook/pom.xml b/libraries/ldclient/ldclient-provider-facebook/pom.xml
index e1526d5..8edd35b 100644
--- a/libraries/ldclient/ldclient-provider-facebook/pom.xml
+++ b/libraries/ldclient/ldclient-provider-facebook/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating</version>
+ <version>3.1.1-incubating-SNAPSHOT</version>
<relativePath>../../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/291e7051/libraries/ldclient/ldclient-provider-html/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldclient/ldclient-provider-html/pom.xml b/libraries/ldclient/ldclient-provider-html/pom.xml
index 8b4a77d..902a266 100644
--- a/libraries/ldclient/ldclient-provider-html/pom.xml
+++ b/libraries/ldclient/ldclient-provider-html/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating</version>
+ <version>3.1.1-incubating-SNAPSHOT</version>
<relativePath>../../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/291e7051/libraries/ldclient/ldclient-provider-ldap/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldclient/ldclient-provider-ldap/pom.xml b/libraries/ldclient/ldclient-provider-ldap/pom.xml
index 539209e..5253ab3 100644
--- a/libraries/ldclient/ldclient-provider-ldap/pom.xml
+++ b/libraries/ldclient/ldclient-provider-ldap/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating</version>
+ <version>3.1.1-incubating-SNAPSHOT</version>
<relativePath>../../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/291e7051/libraries/ldclient/ldclient-provider-mediawiki/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldclient/ldclient-provider-mediawiki/pom.xml b/libraries/ldclient/ldclient-provider-mediawiki/pom.xml
index c2d2d9f..4b4bb80 100644
--- a/libraries/ldclient/ldclient-provider-mediawiki/pom.xml
+++ b/libraries/ldclient/ldclient-provider-mediawiki/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating</version>
+ <version>3.1.1-incubating-SNAPSHOT</version>
<relativePath>../../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/291e7051/libraries/ldclient/ldclient-provider-phpbb/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldclient/ldclient-provider-phpbb/pom.xml b/libraries/ldclient/ldclient-provider-phpbb/pom.xml
index 6719feb..146c880 100644
--- a/libraries/ldclient/ldclient-provider-phpbb/pom.xml
+++ b/libraries/ldclient/ldclient-provider-phpbb/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating</version>
+ <version>3.1.1-incubating-SNAPSHOT</version>
<relativePath>../../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/291e7051/libraries/ldclient/ldclient-provider-rdf/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldclient/ldclient-provider-rdf/pom.xml b/libraries/ldclient/ldclient-provider-rdf/pom.xml
index fd75822..81bd394 100644
--- a/libraries/ldclient/ldclient-provider-rdf/pom.xml
+++ b/libraries/ldclient/ldclient-provider-rdf/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating</version>
+ <version>3.1.1-incubating-SNAPSHOT</version>
<relativePath>../../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/291e7051/libraries/ldclient/ldclient-provider-rdfa/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldclient/ldclient-provider-rdfa/pom.xml b/libraries/ldclient/ldclient-provider-rdfa/pom.xml
index 8dcd4b3..3b0a69c 100644
--- a/libraries/ldclient/ldclient-provider-rdfa/pom.xml
+++ b/libraries/ldclient/ldclient-provider-rdfa/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating</version>
+ <version>3.1.1-incubating-SNAPSHOT</version>
<relativePath>../../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/291e7051/libraries/ldclient/ldclient-provider-vimeo/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldclient/ldclient-provider-vimeo/pom.xml b/libraries/ldclient/ldclient-provider-vimeo/pom.xml
index d1e38fa..7165065 100644
--- a/libraries/ldclient/ldclient-provider-vimeo/pom.xml
+++ b/libraries/ldclient/ldclient-provider-vimeo/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating</version>
+ <version>3.1.1-incubating-SNAPSHOT</version>
<relativePath>../../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/291e7051/libraries/ldclient/ldclient-provider-xml/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldclient/ldclient-provider-xml/pom.xml b/libraries/ldclient/ldclient-provider-xml/pom.xml
index 12ebc32..c1c016e 100644
--- a/libraries/ldclient/ldclient-provider-xml/pom.xml
+++ b/libraries/ldclient/ldclient-provider-xml/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating</version>
+ <version>3.1.1-incubating-SNAPSHOT</version>
<relativePath>../../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/291e7051/libraries/ldclient/ldclient-provider-youtube/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldclient/ldclient-provider-youtube/pom.xml b/libraries/ldclient/ldclient-provider-youtube/pom.xml
index 43ebc06..888cc7d 100644
--- a/libraries/ldclient/ldclient-provider-youtube/pom.xml
+++ b/libraries/ldclient/ldclient-provider-youtube/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating</version>
+ <version>3.1.1-incubating-SNAPSHOT</version>
<relativePath>../../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/291e7051/libraries/ldclient/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldclient/pom.xml b/libraries/ldclient/pom.xml
index 084786b..d3ae14f 100644
--- a/libraries/ldclient/pom.xml
+++ b/libraries/ldclient/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating</version>
+ <version>3.1.1-incubating-SNAPSHOT</version>
<relativePath>../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/291e7051/libraries/ldpath/ldpath-api/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldpath/ldpath-api/pom.xml b/libraries/ldpath/ldpath-api/pom.xml
index d97b08f..762ce1b 100644
--- a/libraries/ldpath/ldpath-api/pom.xml
+++ b/libraries/ldpath/ldpath-api/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating</version>
+ <version>3.1.1-incubating-SNAPSHOT</version>
<relativePath>../../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/291e7051/libraries/ldpath/ldpath-backend-file/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldpath/ldpath-backend-file/pom.xml b/libraries/ldpath/ldpath-backend-file/pom.xml
index 236ff61..03649db 100644
--- a/libraries/ldpath/ldpath-backend-file/pom.xml
+++ b/libraries/ldpath/ldpath-backend-file/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating</version>
+ <version>3.1.1-incubating-SNAPSHOT</version>
<relativePath>../../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/291e7051/libraries/ldpath/ldpath-backend-jena/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldpath/ldpath-backend-jena/pom.xml b/libraries/ldpath/ldpath-backend-jena/pom.xml
index 6338891..2863860 100644
--- a/libraries/ldpath/ldpath-backend-jena/pom.xml
+++ b/libraries/ldpath/ldpath-backend-jena/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating</version>
+ <version>3.1.1-incubating-SNAPSHOT</version>
<relativePath>../../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/291e7051/libraries/ldpath/ldpath-backend-linkeddata/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldpath/ldpath-backend-linkeddata/pom.xml b/libraries/ldpath/ldpath-backend-linkeddata/pom.xml
index 5be1f7e..792e04b 100644
--- a/libraries/ldpath/ldpath-backend-linkeddata/pom.xml
+++ b/libraries/ldpath/ldpath-backend-linkeddata/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating</version>
+ <version>3.1.1-incubating-SNAPSHOT</version>
<relativePath>../../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/291e7051/libraries/ldpath/ldpath-backend-sesame/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldpath/ldpath-backend-sesame/pom.xml b/libraries/ldpath/ldpath-backend-sesame/pom.xml
index da8f536..88327fc 100644
--- a/libraries/ldpath/ldpath-backend-sesame/pom.xml
+++ b/libraries/ldpath/ldpath-backend-sesame/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating</version>
+ <version>3.1.1-incubating-SNAPSHOT</version>
<relativePath>../../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/291e7051/libraries/ldpath/ldpath-core/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldpath/ldpath-core/pom.xml b/libraries/ldpath/ldpath-core/pom.xml
index 95dd222..dff815b 100644
--- a/libraries/ldpath/ldpath-core/pom.xml
+++ b/libraries/ldpath/ldpath-core/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating</version>
+ <version>3.1.1-incubating-SNAPSHOT</version>
<relativePath>../../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/291e7051/libraries/ldpath/ldpath-functions-collections/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldpath/ldpath-functions-collections/pom.xml b/libraries/ldpath/ldpath-functions-collections/pom.xml
index ac7553a..ff6d568 100644
--- a/libraries/ldpath/ldpath-functions-collections/pom.xml
+++ b/libraries/ldpath/ldpath-functions-collections/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating</version>
+ <version>3.1.1-incubating-SNAPSHOT</version>
<relativePath>../../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/291e7051/libraries/ldpath/ldpath-functions-date/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldpath/ldpath-functions-date/pom.xml b/libraries/ldpath/ldpath-functions-date/pom.xml
index 62e6fe7..546201b 100644
--- a/libraries/ldpath/ldpath-functions-date/pom.xml
+++ b/libraries/ldpath/ldpath-functions-date/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating</version>
+ <version>3.1.1-incubating-SNAPSHOT</version>
<relativePath>../../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/291e7051/libraries/ldpath/ldpath-functions-html/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldpath/ldpath-functions-html/pom.xml b/libraries/ldpath/ldpath-functions-html/pom.xml
index dc031ad..7bb791c 100644
--- a/libraries/ldpath/ldpath-functions-html/pom.xml
+++ b/libraries/ldpath/ldpath-functions-html/pom.xml
@@ -19,7 +19,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating</version>
+ <version>3.1.1-incubating-SNAPSHOT</version>
<relativePath>../../../parent</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/291e7051/libraries/ldpath/ldpath-functions-math/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldpath/ldpath-functions-math/pom.xml b/libraries/ldpath/ldpath-functions-math/pom.xml
index 333fbcc..61a01ee 100644
--- a/libraries/ldpath/ldpath-functions-math/pom.xml
+++ b/libraries/ldpath/ldpath-functions-math/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating</version>
+ <version>3.1.1-incubating-SNAPSHOT</version>
<relativePath>../../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/291e7051/libraries/ldpath/ldpath-functions-text/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldpath/ldpath-functions-text/pom.xml b/libraries/ldpath/ldpath-functions-text/pom.xml
index 42823a3..d4ca78b 100644
--- a/libraries/ldpath/ldpath-functions-text/pom.xml
+++ b/libraries/ldpath/ldpath-functions-text/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating</version>
+ <version>3.1.1-incubating-SNAPSHOT</version>
<relativePath>../../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/291e7051/libraries/ldpath/ldpath-functions-xml/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldpath/ldpath-functions-xml/pom.xml b/libraries/ldpath/ldpath-functions-xml/pom.xml
index 57a840d..ccd0688 100644
--- a/libraries/ldpath/ldpath-functions-xml/pom.xml
+++ b/libraries/ldpath/ldpath-functions-xml/pom.xml
@@ -19,7 +19,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating</version>
+ <version>3.1.1-incubating-SNAPSHOT</version>
<relativePath>../../../parent</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/291e7051/libraries/ldpath/ldpath-template-linkeddata/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldpath/ldpath-template-linkeddata/pom.xml b/libraries/ldpath/ldpath-template-linkeddata/pom.xml
index d2a227d..fcb1bed 100644
--- a/libraries/ldpath/ldpath-template-linkeddata/pom.xml
+++ b/libraries/ldpath/ldpath-template-linkeddata/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating</version>
+ <version>3.1.1-incubating-SNAPSHOT</version>
<relativePath>../../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/291e7051/libraries/ldpath/ldpath-template/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldpath/ldpath-template/pom.xml b/libraries/ldpath/ldpath-template/pom.xml
index a2f5a15..3c2d75e 100644
--- a/libraries/ldpath/ldpath-template/pom.xml
+++ b/libraries/ldpath/ldpath-template/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating</version>
+ <version>3.1.1-incubating-SNAPSHOT</version>
<relativePath>../../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/291e7051/libraries/ldpath/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldpath/pom.xml b/libraries/ldpath/pom.xml
index 42eaaa3..c33ac29 100644
--- a/libraries/ldpath/pom.xml
+++ b/libraries/ldpath/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating</version>
+ <version>3.1.1-incubating-SNAPSHOT</version>
<relativePath>../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/291e7051/libraries/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/pom.xml b/libraries/pom.xml
index 9c1079c..a5667ac 100644
--- a/libraries/pom.xml
+++ b/libraries/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating</version>
+ <version>3.1.1-incubating-SNAPSHOT</version>
<relativePath>../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/291e7051/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 84f3600..8de1546 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -29,7 +29,7 @@
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
<packaging>pom</packaging>
- <version>3.1.0-incubating</version>
+ <version>3.1.1-incubating-SNAPSHOT</version>
<name>Apache Marmotta Parent</name>
<description>Parent POM for the Apache Marmotta project</description>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/291e7051/platform/marmotta-core/pom.xml
----------------------------------------------------------------------
diff --git a/platform/marmotta-core/pom.xml b/platform/marmotta-core/pom.xml
index f27b855..2b433e2 100644
--- a/platform/marmotta-core/pom.xml
+++ b/platform/marmotta-core/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating</version>
+ <version>3.1.1-incubating-SNAPSHOT</version>
<relativePath>../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/291e7051/platform/marmotta-ldcache/pom.xml
----------------------------------------------------------------------
diff --git a/platform/marmotta-ldcache/pom.xml b/platform/marmotta-ldcache/pom.xml
index 2fac3fb..7fe5c76 100644
--- a/platform/marmotta-ldcache/pom.xml
+++ b/platform/marmotta-ldcache/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating</version>
+ <version>3.1.1-incubating-SNAPSHOT</version>
<relativePath>../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/291e7051/platform/marmotta-ldpath/pom.xml
----------------------------------------------------------------------
diff --git a/platform/marmotta-ldpath/pom.xml b/platform/marmotta-ldpath/pom.xml
index 9178ee7..722b940 100644
--- a/platform/marmotta-ldpath/pom.xml
+++ b/platform/marmotta-ldpath/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating</version>
+ <version>3.1.1-incubating-SNAPSHOT</version>
<relativePath>../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/291e7051/platform/marmotta-reasoner/pom.xml
----------------------------------------------------------------------
diff --git a/platform/marmotta-reasoner/pom.xml b/platform/marmotta-reasoner/pom.xml
index 0b0cee3..b2b28e7 100644
--- a/platform/marmotta-reasoner/pom.xml
+++ b/platform/marmotta-reasoner/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating</version>
+ <version>3.1.1-incubating-SNAPSHOT</version>
<relativePath>../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/291e7051/platform/marmotta-security/pom.xml
----------------------------------------------------------------------
diff --git a/platform/marmotta-security/pom.xml b/platform/marmotta-security/pom.xml
index 3e6f337..7a3d70b 100644
--- a/platform/marmotta-security/pom.xml
+++ b/platform/marmotta-security/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating</version>
+ <version>3.1.1-incubating-SNAPSHOT</version>
<relativePath>../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/291e7051/platform/marmotta-sparql/pom.xml
----------------------------------------------------------------------
diff --git a/platform/marmotta-sparql/pom.xml b/platform/marmotta-sparql/pom.xml
index fbe950b..1ccf0e5 100644
--- a/platform/marmotta-sparql/pom.xml
+++ b/platform/marmotta-sparql/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating</version>
+ <version>3.1.1-incubating-SNAPSHOT</version>
<relativePath>../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/291e7051/platform/marmotta-user/pom.xml
----------------------------------------------------------------------
diff --git a/platform/marmotta-user/pom.xml b/platform/marmotta-user/pom.xml
index c8279ec..d3525ad 100644
--- a/platform/marmotta-user/pom.xml
+++ b/platform/marmotta-user/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating</version>
+ <version>3.1.1-incubating-SNAPSHOT</version>
<relativePath>../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/291e7051/platform/marmotta-versioning/pom.xml
----------------------------------------------------------------------
diff --git a/platform/marmotta-versioning/pom.xml b/platform/marmotta-versioning/pom.xml
index 35a0868..9114967 100644
--- a/platform/marmotta-versioning/pom.xml
+++ b/platform/marmotta-versioning/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating</version>
+ <version>3.1.1-incubating-SNAPSHOT</version>
<relativePath>../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/291e7051/platform/pom.xml
----------------------------------------------------------------------
diff --git a/platform/pom.xml b/platform/pom.xml
index 3713bab..6142056 100644
--- a/platform/pom.xml
+++ b/platform/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating</version>
+ <version>3.1.1-incubating-SNAPSHOT</version>
<relativePath>../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/291e7051/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index ee0fec8..2ea76c8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.1.0-incubating</version>
+ <version>3.1.1-incubating-SNAPSHOT</version>
<relativePath>parent</relativePath>
</parent>
[2/4] git commit: MARMOTTA-344: Backported KiWiLoader to 3.1.1-branch
Posted by ja...@apache.org.
MARMOTTA-344: Backported KiWiLoader to 3.1.1-branch
(cherry picked from commit 2ddede441d5ab42bc10149d5541335b08ba80f2f..29d158126a2f85c249dadfa120e49598016821ad)
Project: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/commit/3c43d27e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/tree/3c43d27e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/diff/3c43d27e
Branch: refs/heads/maintenance-3.1.x
Commit: 3c43d27e80449a84d4bd2e0d66ad198472e7eb29
Parents: 291e705
Author: Jakob Frank <ja...@apache.org>
Authored: Tue Oct 15 11:59:22 2013 +0200
Committer: Jakob Frank <ja...@apache.org>
Committed: Tue Oct 15 11:59:22 2013 +0200
----------------------------------------------------------------------
libraries/kiwi/kiwi-loader/pom.xml | 147 +++++
.../apache/marmotta/kiwi/loader/KiWiLoader.java | 541 +++++++++++++++++++
.../marmotta/kiwi/loader/KiWiLoaderTest.java | 219 ++++++++
.../src/test/resources/logback-test.xml | 28 +
libraries/kiwi/pom.xml | 1 +
parent/pom.xml | 5 +
6 files changed, 941 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/3c43d27e/libraries/kiwi/kiwi-loader/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/kiwi/kiwi-loader/pom.xml b/libraries/kiwi/kiwi-loader/pom.xml
new file mode 100644
index 0000000..7cfdf03
--- /dev/null
+++ b/libraries/kiwi/kiwi-loader/pom.xml
@@ -0,0 +1,147 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 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. -->
+<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/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.marmotta</groupId>
+ <artifactId>kiwi-parent</artifactId>
+ <version>3.1.1-incubating-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>kiwi-loader</artifactId>
+ <name>KiWi Triplestore: DB Loader</name>
+ <description>Standalone module to load RDF files into a KiWi Database</description>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <configuration>
+ <archive>
+ <manifest>
+ <mainClass>org.apache.marmotta.kiwi.loader.KiWiLoader</mainClass>
+ </manifest>
+ </archive>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>com.jolira</groupId>
+ <artifactId>onejar-maven-plugin</artifactId>
+ <version>1.4.4</version>
+ <executions>
+ <execution>
+ <phase>package</phase>
+ <goals>
+ <goal>one-jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>exec-maven-plugin</artifactId>
+ <version>1.2.1</version>
+ <executions>
+ <execution>
+ <goals>
+ <goal>java</goal>
+ </goals>
+ <configuration>
+ </configuration>
+ </execution>
+ </executions>
+ <configuration>
+ <mainClass>org.apache.marmotta.kiwi.loader.KiWiLoader</mainClass>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.marmotta</groupId>
+ <artifactId>kiwi-triplestore</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.marmotta</groupId>
+ <artifactId>kiwi-versioning</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.marmotta</groupId>
+ <artifactId>kiwi-reasoner</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>com.h2database</groupId>
+ <artifactId>h2</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.postgresql</groupId>
+ <artifactId>postgresql</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>mysql</groupId>
+ <artifactId>mysql-connector-java</artifactId>
+ <optional>true</optional> <!-- GPL licensed, no dependency -->
+ </dependency>
+
+ <dependency>
+ <groupId>commons-cli</groupId>
+ <artifactId>commons-cli</artifactId>
+ <version>1.2</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-configuration</groupId>
+ <artifactId>commons-configuration</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ <version>1.1.3</version>
+ </dependency>
+ <dependency>
+ <groupId>ch.qos.logback</groupId>
+ <artifactId>logback-classic</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.marmotta</groupId>
+ <artifactId>kiwi-triplestore</artifactId>
+ <scope>test</scope>
+ <type>test-jar</type>
+ </dependency>
+ <dependency>
+ <!--
+ License: CPL-1.0 http://www.opensource.org/licenses/cpl1.0
+ As a MAVEN dependency it is not included in a source release.
+ As a TEST dependency it is not included in a BINARY release, so no need to mention in N&L.
+ -->
+ <groupId>com.github.stefanbirkner</groupId>
+ <artifactId>system-rules</artifactId>
+ <version>1.4.0</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.openrdf.sesame</groupId>
+ <artifactId>sesame-rio-turtle</artifactId>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.openrdf.sesame</groupId>
+ <artifactId>sesame-rio-rdfxml</artifactId>
+ <scope>runtime</scope>
+ </dependency>
+ </dependencies>
+</project>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/3c43d27e/libraries/kiwi/kiwi-loader/src/main/java/org/apache/marmotta/kiwi/loader/KiWiLoader.java
----------------------------------------------------------------------
diff --git a/libraries/kiwi/kiwi-loader/src/main/java/org/apache/marmotta/kiwi/loader/KiWiLoader.java b/libraries/kiwi/kiwi-loader/src/main/java/org/apache/marmotta/kiwi/loader/KiWiLoader.java
new file mode 100644
index 0000000..652e3e5
--- /dev/null
+++ b/libraries/kiwi/kiwi-loader/src/main/java/org/apache/marmotta/kiwi/loader/KiWiLoader.java
@@ -0,0 +1,541 @@
+/*
+ * 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.
+ */
+package org.apache.marmotta.kiwi.loader;
+
+import java.io.Console;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.regex.Pattern;
+import java.util.zip.GZIPInputStream;
+
+import org.apache.commons.cli.CommandLine;
+import org.apache.commons.cli.CommandLineParser;
+import org.apache.commons.cli.HelpFormatter;
+import org.apache.commons.cli.Option;
+import org.apache.commons.cli.Options;
+import org.apache.commons.cli.ParseException;
+import org.apache.commons.cli.PosixParser;
+import org.apache.commons.configuration.Configuration;
+import org.apache.commons.configuration.ConfigurationException;
+import org.apache.commons.configuration.PropertiesConfiguration;
+import org.apache.marmotta.kiwi.config.KiWiConfiguration;
+import org.apache.marmotta.kiwi.persistence.KiWiDialect;
+import org.apache.marmotta.kiwi.persistence.h2.H2Dialect;
+import org.apache.marmotta.kiwi.persistence.mysql.MySQLDialect;
+import org.apache.marmotta.kiwi.persistence.pgsql.PostgreSQLDialect;
+import org.apache.marmotta.kiwi.sail.KiWiStore;
+import org.apache.marmotta.kiwi.transactions.api.TransactionalSail;
+import org.apache.marmotta.kiwi.transactions.sail.KiWiTransactionalSail;
+import org.openrdf.model.Resource;
+import org.openrdf.repository.RepositoryException;
+import org.openrdf.repository.sail.SailRepository;
+import org.openrdf.repository.sail.SailRepositoryConnection;
+import org.openrdf.rio.RDFFormat;
+import org.openrdf.rio.RDFParseException;
+import org.openrdf.rio.UnsupportedRDFormatException;
+import org.openrdf.sail.Sail;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * {@link KiWiLoader} is a fastpath importer into a kiwi database. It is meant
+ * for importing large datafiles into a kiwi RDF store, avoiding the overhead of
+ * the full marmotta platform.
+ * <p>
+ * The usage is <br>
+ * {@code KiWiLoader
+ * [-h]
+ * [-c <config>]
+ * [-b <baseUri>]
+ * [-C <context>]
+ * [-d <jdbc-url>]
+ * [-D <dialect>]
+ * [-U <dbUser>]
+ * [-P [<passwd>]]
+ * [-f <mime-type>]
+ * [-z]
+ * [-i <rdf-file> ...]
+ * [--reasoning]
+ * [--versioning]
+ * <rdf-file> ...
+ * }
+ * <pre>
+ * General Settings:
+ * -h,--help print this help
+ *
+ * Base Settings:
+ * -c,--config <config> Marmotta system-config.properties file
+ * -b,--baseUri <baseUri> baseUri during the import (fallback:
+ * kiwi.context from the config file)
+ * -C,--context <context> context to import into
+ *
+ * Database:
+ * -d,--database <jdbc-url> jdbc connection string
+ * -D,--dbDialect <dialect> database dialect (h2, mysql, postgres)
+ * -U,--user <dbUser> database user
+ * -P,--dbPasswd <passwd> database password
+ *
+ * Import:
+ * -f,--format <mime-type> format of rdf file (if guessing based on the
+ * extension does not work)
+ * -z Input file is gzip compressed
+ * -i,--file <rdf-file> input file(s) to load
+ *
+ * KiWi Extra Settings:
+ * --reasoning enable reasoning
+ * --versioning enable versioning
+ * </pre>
+ *
+ * @author Jakob Frank <ja...@apache.org>
+ *
+ */
+public class KiWiLoader {
+
+ private static Logger log = LoggerFactory.getLogger(KiWiLoader.class);
+ protected final KiWiConfiguration kiwi;
+ protected String baseUri;
+ protected String context;
+ protected boolean isVersioningEnabled;
+ protected boolean isReasoningEnabled;
+ protected SailRepository repository;
+
+ public KiWiLoader(KiWiConfiguration kiwi, String baseUri, String context) {
+ this.kiwi = kiwi;
+ this.baseUri = baseUri;
+ this.context = context;
+
+ isVersioningEnabled = false;
+ isReasoningEnabled = false;
+ }
+
+ /**
+ * @param args CLI params
+ */
+ public static void main(String[] args) {
+ Options options = buildOptions();
+
+ CommandLineParser parser = new PosixParser();
+ try {
+ CommandLine cmd = parser.parse(options, args);
+
+ if (cmd.hasOption("help")) {
+ printHelp(options);
+ return;
+ }
+
+ String baseUri = endWith("http://localhost/", "/"),
+ context = null, //baseUri+"context/default",
+ format = null;
+ boolean gzip = false;
+
+ String dbCon = null, dbUser = null, dbPasswd = null;
+ KiWiDialect dialect = null;
+
+ if (cmd.hasOption('c')) {
+ // load as much as possible from the config file
+ Configuration conf = new PropertiesConfiguration(cmd.getOptionValue('c'));
+ context = endWith(conf.getString("kiwi.context", baseUri), "/") + "context/default";
+ baseUri = endWith(conf.getString("kiwi.context", baseUri), "/") + "resource/";
+
+ dbCon = conf.getString("database.url");
+ dbUser = conf.getString("database.user");
+ dbPasswd = conf.getString("database.password");
+
+ String dbType = conf.getString("database.type");
+ if ("h2".equalsIgnoreCase(dbType)) {
+ dialect = new H2Dialect();
+ } else if ("mysql".equalsIgnoreCase(dbType)) {
+ dialect = new MySQLDialect();
+ } else if ("postgres".equalsIgnoreCase(dbType)) {
+ dialect = new PostgreSQLDialect();
+ }
+ }
+
+ // database url
+ if (cmd.hasOption('d')) {
+ dbCon = cmd.getOptionValue('d');
+ }
+ // database user
+ if (cmd.hasOption('U')) {
+ dbUser = cmd.getOptionValue('U');
+ }
+
+ // database dialect, use config value as fallback if present.
+ dialect = getDialect(cmd, dbCon, dialect);
+ // database passsword; if -P is given but no password, ask the user to enter it.
+ dbPasswd = getPassword(cmd, dbCon, dbUser, dbPasswd);
+
+ // We need a db-configuration, otherwise this does not make any sense.
+ if (dbCon == null || dbUser == null || dbPasswd == null || dialect == null) {
+ log.error("Cannot import without database connection!\n"
+ +"Please provide the database configuration either\n"
+ +"- in a kiwi-config file (-c), and/or\n"
+ +"- as commandline parameters (-d, -U, -P, -D)");
+ System.exit(3);
+ }
+
+ KiWiConfiguration kiwi = new KiWiConfiguration("kiwiLoader", dbCon, dbUser, dbPasswd, dialect);
+
+ // set the baseUri
+ if (cmd.hasOption('b')) {
+ baseUri = cmd.getOptionValue('b', baseUri);
+ }
+
+ // the context to import into.
+ if (cmd.hasOption('C')) {
+ context = cmd.getOptionValue('C', context);
+ }
+
+ // force uncompressing the files (will try to guess if this option is not set)
+ gzip = cmd.hasOption('z');
+
+ // the format to use as fallback; will try to guess based on the filename.
+ format = cmd.getOptionValue('f');
+ final RDFFormat fmt;
+ if (format != null) {
+ fmt = RDFFormat.forMIMEType(format);
+ if (fmt == null) {
+ throw new ParseException(String.format("Invalid/Unknown RDF format: %s, use one of %s", format, RDFFormat.values()));
+ }
+ log.debug("Format-Hint: {}", fmt);
+ } else {
+ fmt = null;
+ }
+
+ // get the files to import.
+ final ArrayList<String> inputFiles = new ArrayList<>();
+ // - provided with the -i option
+ if (cmd.hasOption('i')) {
+ inputFiles.addAll(Arrays.asList(cmd.getOptionValues('i')));
+ }
+ // - or just the filename.
+ inputFiles.addAll(Arrays.asList(cmd.getArgs()));
+
+ // we need at least one file to import
+ // this could be changed...
+ if (inputFiles.isEmpty()) {
+ throw new ParseException("No files to import");
+ }
+
+ // initialize the KiWiLoader
+ log.info("Initializing KiWiLoader for {}; user: {}, password: {}", dbCon, dbUser, String.format("%"+dbPasswd.length()+"s", "*"));
+ KiWiLoader loader = new KiWiLoader(kiwi, baseUri, context);
+ loader.setVersioningEnabled(cmd.hasOption("versioning"));
+ loader.setReasoningEnabled(cmd.hasOption("reasoning"));
+ loader.initialize();
+
+ log.info("Starting import");
+ for (String inFile: inputFiles) {
+ try {
+ log.info("Importing {}", inFile);
+ final File f = new File(inFile);
+ String fName = f.getName();
+ InputStream inStream = new FileInputStream(f);
+ if (gzip || inFile.endsWith(".gz")) {
+ log.debug("{} seems to be gzipped", inFile);
+ inStream = new GZIPInputStream(inStream);
+ fName = fName.replaceFirst("\\.gz$", "");
+ }
+
+ long start = System.currentTimeMillis();
+ try {
+ loader.load(inStream, RDFFormat.forFileName(fName, fmt));
+ } catch (final UnsupportedRDFormatException | RDFParseException e) {
+ // try again with the fixed format
+ if (fmt != null) {
+ inStream.close();
+ // Reopen new
+ if (inStream instanceof GZIPInputStream) {
+ inStream = new GZIPInputStream(new FileInputStream(f));
+ } else {
+ inStream = new FileInputStream(f);
+ }
+ loader.load(inStream, fmt);
+ } else {
+ throw e;
+ }
+ } finally {
+ inStream.close();
+ }
+ long dur = System.currentTimeMillis() - start;
+ log.info("Import completed ({}): {}ms", inFile, dur);
+ } catch (FileNotFoundException e) {
+ log.error("Could not read file {}, skipping...", inFile);
+ } catch (IOException e) {
+ log.error("Error while reading {}: {}", inFile, e);
+ } catch (RDFParseException e) {
+ log.error("file {} contains errors: {}\n{}", inFile, e.getMessage(), e);
+ } catch (UnsupportedRDFormatException e) {
+ log.error("{}, required for {} - dependency missing?", e.getMessage(), inFile);
+ }
+ }
+
+ log.info("Import complete, shutting down.");
+ loader.shutdown();
+ log.info("Exiting");
+ } catch (ParseException e) {
+ log.error(e.getMessage());
+ printHelp(options);
+ System.exit(1);
+ } catch (ConfigurationException e) {
+ log.error("Could not read system-config.properties: {}", e.getMessage());
+ System.exit(1);
+ } catch (RepositoryException e) {
+ log.error("Sesame-Exception: {}", e.getMessage(), e);
+ System.exit(2);
+ }
+ }
+
+ private static void printHelp(Options options) {
+ HelpFormatter formatter = new HelpFormatter();
+ formatter.printHelp(KiWiLoader.class.getSimpleName(), options, true);
+ }
+
+ /**
+ * Load the triples from the input stream using the provided format.
+ * @param inStream the {@link InputStream} to read from
+ * @param forFileName the expected {@link RDFFormat}
+ * @throws RDFParseException if the stream is invalid (e.g. does not fit with the syntax)
+ * @throws IOException
+ */
+ public void load(InputStream inStream, RDFFormat forFileName) throws RDFParseException, IOException {
+ try {
+ final SailRepositoryConnection con = repository.getConnection();
+ try {
+ con.begin();
+
+ final Resource[] ctx;
+ if (context != null) {
+ ctx = new Resource[] { con.getValueFactory().createURI(context) };
+ } else {
+ ctx = new Resource[] {};
+ }
+
+ con.add(inStream, baseUri, forFileName, ctx);
+
+ con.commit();
+ } catch (final Throwable t) {
+ con.rollback();
+ throw t;
+ } finally {
+ con.close();
+ }
+ } catch (RepositoryException re) {
+ log.error("RepositoryException: {}", re.getMessage());
+ }
+ }
+
+ /**
+ * En-/Disable reasoning during load (currently not implemented)
+ * @param enabled
+ */
+ public void setReasoningEnabled(boolean enabled) {
+ this.isReasoningEnabled = enabled;
+ }
+
+ /**
+ * En-/Disable versioning during load (currently not implemented)
+ * @param enabled
+ */
+ public void setVersioningEnabled(boolean enabled) {
+ this.isVersioningEnabled = enabled;
+ }
+
+ /**
+ * Shutdown the Repository, close all database connections.
+ * @throws RepositoryException
+ */
+ public synchronized void shutdown() throws RepositoryException {
+ if (repository == null || !repository.isInitialized()) {
+ throw new IllegalStateException("repository was not initialized!");
+ }
+ repository.shutDown();
+ repository = null;
+ }
+
+ /**
+ * Load the triples from the file using the provided format.
+ * @param file the file to read from
+ * @param format the expected {@link RDFFormat}
+ * @param gzip force using a {@link GZIPInputStream} (will try to guess based on the filename if false)
+ * @throws RDFParseException if the stream is invalid (e.g. does not fit with the syntax)
+ * @throws IOException
+ * @see {@link #load(InputStream, RDFFormat)}
+ */
+ public void load(String file, RDFFormat format, boolean gzip) throws IOException, RDFParseException {
+ final File f = new File(file);
+ InputStream is = new FileInputStream(f);
+ if (gzip || f.getName().endsWith(".gz")) {
+ is = new GZIPInputStream(is);
+ }
+ load(is, format);
+ }
+
+ /**
+ * Initialize the KiWiStore, connect to the database.
+ * @throws RepositoryException
+ */
+ public synchronized void initialize() throws RepositoryException {
+ if (repository != null && repository.isInitialized()) {
+ throw new IllegalStateException("repository already initialized");
+ }
+ log.debug("initializing kiwi-store: {}", kiwi);
+ KiWiStore store = new KiWiStore(kiwi);
+
+ final Sail sail;
+ if (isVersioningEnabled || isReasoningEnabled) {
+ TransactionalSail tSail = new KiWiTransactionalSail(store);
+ if (isVersioningEnabled) {
+ log.debug("enabling versioning...");
+ // TODO: Add Versioning
+ // tSail = new KiWiVersioningSail(tSail);
+ log.warn("versioning not yet supported/implemented");
+ }
+
+ if (isReasoningEnabled) {
+ log.debug("enabling reasoner...");
+ // TODO: Add Reasoning
+ // tSail = new KiWiReasoningSail(tSail, null);
+ log.warn("reasoning not yet supported/implemented");
+ }
+ sail = tSail;
+ } else {
+ // no transactional sail required here
+ sail = store;
+ }
+
+ repository = new SailRepository(sail);
+ repository.initialize();
+ }
+
+ private static String getPassword(CommandLine cmd, String jdbc, String user, String password) throws ParseException {
+ if (cmd.hasOption('P')) {
+ if (cmd.getOptionValue('P') != null) {
+ return cmd.getOptionValue('P');
+ } else {
+ Console console = System.console();
+ if (console == null) {
+ throw new ParseException("Could not aquire console, please provide password as parameter");
+ }
+
+ char passwordArray[] = console.readPassword("Password for %s on %s: ", jdbc, user);
+ return new String(passwordArray);
+ }
+ } else {
+ return password;
+ }
+ }
+
+ private static KiWiDialect getDialect(CommandLine cmd, String dbCon, KiWiDialect fallback)
+ throws ParseException {
+ // get the dialect
+ final String dbDialect = cmd.getOptionValue('D');
+ if (!cmd.hasOption('D')) {
+ return fallback;
+ } else if (dbDialect == null) {
+ log.info("No dialect provded, trying to guess based on dbUrl: {}", dbCon);
+ // try guessing
+ if (dbCon.startsWith("jdbc:h2:")) {
+ return new H2Dialect();
+ } else if (dbCon.startsWith("jdbc:mysql:")) {
+ return new MySQLDialect();
+ } else if (dbCon.startsWith("jdbc:postgresql:")) {
+ return new PostgreSQLDialect();
+ } else {
+ throw new ParseException("could not guess dialect from url, use the -D option");
+ }
+ } else if ("h2".equalsIgnoreCase(dbDialect)) {
+ return new H2Dialect();
+ } else if ("mysql".equalsIgnoreCase(dbDialect)) {
+ return new MySQLDialect();
+ } else if ("postgresql".equalsIgnoreCase(dbDialect)) {
+ return new PostgreSQLDialect();
+ } else {
+ throw new ParseException("Unknown dialect: " + dbDialect);
+ }
+ }
+
+ private static Options buildOptions() {
+ final Options options = new Options();
+
+ options.addOption("h", "help", false, "print this help");
+
+ final Option c = new Option("c", "config", true, "Marmotta system-config.properties file");
+ c.setArgName("config");
+ c.setArgs(1);
+ c.setOptionalArg(false);
+ options.addOption(c);
+
+ final Option b = new Option("b", "baseUri", true, "baseUri during the import (fallback: kiwi.context from the config file)");
+ b.setArgName("baseUri");
+ b.setArgs(1);
+ options.addOption(b);
+
+ final Option context = new Option("C", "context", true, "context to import into");
+ context.setArgName("context");
+ context.setArgs(1);
+ context.setOptionalArg(false);
+ options.addOption(context);
+
+ options.addOption("z", false, "Input file is gzip compressed");
+
+ final Option format = new Option("f", "format", true, "format of rdf file (if guessing based on the extension does not work)");
+ format.setArgName("mime-type");
+ format.setArgs(1);
+ options.addOption(format);
+
+ final Option input = new Option("i", "file", true, "input file(s) to load");
+ input.setArgName("rdf-file");
+ input.setArgs(Option.UNLIMITED_VALUES);
+ options.addOption(input);
+
+ final Option dbUrl = new Option("d", "database", true, "jdbc connection string");
+ dbUrl.setArgName("jdbc-url");
+ dbUrl.setArgs(1);
+ options.addOption(dbUrl);
+
+ final Option dbUser = new Option("U", "user", true, "database user");
+ dbUser.setArgName("dbUser");
+ options.addOption(dbUser);
+
+ final Option dbPasswd = new Option("P", "dbPasswd", true, "database password");
+ dbPasswd.setArgName("passwd");
+ dbPasswd.setArgs(1);
+ dbPasswd.setOptionalArg(true);
+ options.addOption(dbPasswd);
+
+ final Option dbDialect = new Option("D", "dbDialect", true, "database dialect (h2, mysql, postgres)");
+ dbDialect.setArgName("dialect");
+ options.addOption(dbDialect);
+
+ options.addOption(null, "reasoning", false, "enable reasoning");
+ options.addOption(null, "versioning", false, "enable versioning");
+
+ return options;
+ }
+
+ private static String endWith(String string, String suffix) {
+ return string.replaceFirst("("+Pattern.quote(suffix)+")?$", suffix);
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/3c43d27e/libraries/kiwi/kiwi-loader/src/test/java/org/apache/marmotta/kiwi/loader/KiWiLoaderTest.java
----------------------------------------------------------------------
diff --git a/libraries/kiwi/kiwi-loader/src/test/java/org/apache/marmotta/kiwi/loader/KiWiLoaderTest.java b/libraries/kiwi/kiwi-loader/src/test/java/org/apache/marmotta/kiwi/loader/KiWiLoaderTest.java
new file mode 100644
index 0000000..3f71727
--- /dev/null
+++ b/libraries/kiwi/kiwi-loader/src/test/java/org/apache/marmotta/kiwi/loader/KiWiLoaderTest.java
@@ -0,0 +1,219 @@
+package org.apache.marmotta.kiwi.loader;
+
+import static org.hamcrest.CoreMatchers.containsString;
+import static org.junit.Assert.assertThat;
+import static org.junit.Assert.assertTrue;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.util.Properties;
+import java.util.zip.GZIPOutputStream;
+
+import org.apache.commons.io.IOUtils;
+import org.apache.marmotta.kiwi.config.KiWiConfiguration;
+import org.apache.marmotta.kiwi.persistence.h2.H2Dialect;
+import org.hamcrest.CoreMatchers;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.contrib.java.lang.system.ExpectedSystemExit;
+import org.junit.contrib.java.lang.system.StandardOutputStreamLog;
+import org.junit.rules.TemporaryFolder;
+import org.openrdf.model.ValueFactory;
+import org.openrdf.model.vocabulary.FOAF;
+import org.openrdf.model.vocabulary.RDF;
+import org.openrdf.repository.Repository;
+import org.openrdf.repository.RepositoryConnection;
+import org.openrdf.repository.RepositoryException;
+import org.openrdf.rio.RDFFormat;
+import org.openrdf.rio.RDFParseException;
+
+public class KiWiLoaderTest {
+
+ @Rule
+ public final TemporaryFolder temp = new TemporaryFolder();
+
+ @Rule
+ public final ExpectedSystemExit exit = ExpectedSystemExit.none();
+
+ @Rule
+ public final StandardOutputStreamLog stdOut = new StandardOutputStreamLog();
+
+ private File confFile;
+ private File dataFile;
+ private Properties loaderProps;
+
+ @Before
+ public void setUp() throws IOException {
+ // The config file
+ confFile = temp.newFile("loader.properties");
+ loaderProps = getLoaderProps();
+ FileOutputStream fos = new FileOutputStream(confFile);
+ loaderProps.store(fos, "");
+ fos.close();
+
+ // input file
+ dataFile = temp.newFile("test-data.xml");
+ copyResourceToFile("/org/apache/marmotta/kiwi/test/demo-data.foaf", dataFile);
+
+ }
+
+ private Properties getLoaderProps() throws IOException {
+ Properties props = new Properties();
+
+ props.setProperty("database.type", "h2");
+ props.setProperty("database.url", String.format("jdbc:h2:%s/marmotta;MVCC=true;DB_CLOSE_ON_EXIT=FALSE;DB_CLOSE_DELAY=10", temp.newFolder("db").getAbsolutePath()));
+ props.setProperty("database.user", "marmotta");
+ props.setProperty("database.password", "marmotta");
+
+ props.setProperty("kiwi.context", "http://test.example.com/");
+
+ return props;
+ }
+
+
+ @Test
+ public void testMain_NoArgs() {
+ exit.expectSystemExitWithStatus(3);
+ KiWiLoader.main(new String[] {});
+ assertThat(stdOut.getLog(), containsString("Cannot import without database connection!"));
+ }
+
+ @Test
+ public void testMain_ConfigNotFound() {
+ exit.expectSystemExitWithStatus(1);
+ KiWiLoader.main(new String[] {"-c", confFile.getAbsolutePath() + ".not-found"});
+ assertThat(stdOut.getLog(), containsString("Could not read system-config.properties:"));
+ }
+
+ @Test
+ public void testMain_FileNotFound() {
+ final String fName = dataFile.getAbsolutePath() + ".not-found";
+ KiWiLoader.main(new String[] {"-c", confFile.getAbsolutePath(), fName});
+ assertThat(stdOut.getLog(), containsString("Could not read file " + fName + ", skipping..."));
+ }
+
+ @Test
+ public void testMain() {
+ KiWiLoader.main(new String[] {"-c", confFile.getAbsolutePath(), "-f", "application/rdf+xml", dataFile.getAbsolutePath()});
+ assertThat(stdOut.getLog(), containsString("Importing " + dataFile.getAbsolutePath()));
+ assertThat(stdOut.getLog(), containsString(String.format("Import completed (%s)", dataFile.getAbsolutePath())));
+ }
+
+ @Test
+ public void testLoadFile() throws RepositoryException, RDFParseException,
+ IOException {
+ KiWiTestLoader loader = new KiWiTestLoader(getKiWiConfig(),
+ "htto://example.com/test/", null);
+ loader.initialize();
+
+ loader.load(dataFile.getAbsolutePath(), RDFFormat.RDFXML, false);
+
+ final RepositoryConnection con = loader.getRepository().getConnection();
+ try {
+ con.begin();
+ testRepoContent(con);
+ con.commit();
+ } catch (final Throwable t) {
+ con.rollback();
+ throw t;
+ } finally {
+ con.close();
+ }
+ loader.shutdown();
+ }
+
+ @Test
+ public void testLoadFile_GZ() throws RepositoryException, RDFParseException,
+ IOException {
+ File gz = temp.newFile(dataFile.getName() + ".gz");
+ OutputStream os = new GZIPOutputStream(new FileOutputStream(gz));
+ FileInputStream is = new FileInputStream(dataFile);
+ IOUtils.copy(is, os);
+ is.close();
+ os.close();
+
+ KiWiTestLoader loader = new KiWiTestLoader(getKiWiConfig(),
+ "htto://example.com/test/", null);
+ loader.initialize();
+
+ loader.load(gz.getAbsolutePath(), RDFFormat.RDFXML, true);
+
+ final RepositoryConnection con = loader.getRepository().getConnection();
+ try {
+ con.begin();
+ testRepoContent(con);
+ con.commit();
+ } catch (final Throwable t) {
+ con.rollback();
+ throw t;
+ } finally {
+ con.close();
+ }
+ loader.shutdown();
+ }
+
+
+ private void testRepoContent(RepositoryConnection con) throws RepositoryException {
+ final ValueFactory vf = con.getValueFactory();
+ assertThat(con.size(), CoreMatchers.equalTo(new Long(34)));
+ assertTrue(con.hasStatement(vf.createURI("http://localhost:8080/LMF/resource/hans_meier"), RDF.TYPE, FOAF.PERSON, true));
+ assertTrue(con.hasStatement(vf.createURI("http://localhost:8080/LMF/resource/sepp_huber"), RDF.TYPE, FOAF.PERSON, true));
+ assertTrue(con.hasStatement(vf.createURI("http://localhost:8080/LMF/resource/anna_schmidt"), RDF.TYPE, FOAF.PERSON, true));
+ }
+
+ private KiWiConfiguration getKiWiConfig() {
+ final Properties p = loaderProps;
+ KiWiConfiguration config = new KiWiConfiguration("loader-test",
+ p.getProperty("database.url"), p.getProperty("database.user"),
+ p.getProperty("database.password"), new H2Dialect());
+
+ return config;
+ }
+
+ @Test
+ public void testLoadInputStream() throws RepositoryException, RDFParseException, IOException {
+ KiWiTestLoader loader = new KiWiTestLoader(getKiWiConfig(),
+ "htto://example.com/test/", null);
+ loader.initialize();
+
+ loader.load(new FileInputStream(dataFile), RDFFormat.RDFXML);
+
+ final RepositoryConnection con = loader.getRepository().getConnection();
+ try {
+ con.begin();
+ testRepoContent(con);
+ con.commit();
+ } catch (final Throwable t) {
+ con.rollback();
+ throw t;
+ } finally {
+ con.close();
+ }
+ loader.shutdown();
+ }
+
+ private static void copyResourceToFile(String resource, File file) throws IOException {
+ final FileOutputStream os = new FileOutputStream(file);
+ IOUtils.copy(KiWiLoaderTest.class.getResourceAsStream(resource), os);
+ os.close();
+ }
+
+ protected static class KiWiTestLoader extends KiWiLoader {
+
+ public KiWiTestLoader(KiWiConfiguration kiwi, String baseUri,
+ String context) {
+ super(kiwi, baseUri, context);
+ }
+
+ public Repository getRepository() {
+ return super.repository;
+ }
+
+ }
+
+
+}
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/3c43d27e/libraries/kiwi/kiwi-loader/src/test/resources/logback-test.xml
----------------------------------------------------------------------
diff --git a/libraries/kiwi/kiwi-loader/src/test/resources/logback-test.xml b/libraries/kiwi/kiwi-loader/src/test/resources/logback-test.xml
new file mode 100644
index 0000000..63d73e8
--- /dev/null
+++ b/libraries/kiwi/kiwi-loader/src/test/resources/logback-test.xml
@@ -0,0 +1,28 @@
+<!--
+ ~ 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.
+ -->
+
+<configuration>
+ <appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
+ <target>System.out</target>
+ <encoder>
+ <pattern>%m%n</pattern>
+ </encoder>
+ </appender>
+ <root level="${root-level:-INFO}">
+ <appender-ref ref="CONSOLE"/>
+ </root>
+</configuration>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/3c43d27e/libraries/kiwi/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/kiwi/pom.xml b/libraries/kiwi/pom.xml
index 10e7b46..1348160 100644
--- a/libraries/kiwi/pom.xml
+++ b/libraries/kiwi/pom.xml
@@ -130,6 +130,7 @@
<module>kiwi-versioning</module>
<module>kiwi-reasoner</module>
<module>kiwi-sparql</module>
+ <module>kiwi-loader</module>
</modules>
</project>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/3c43d27e/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 8de1546..3a76167 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -1192,6 +1192,11 @@
</dependency>
<dependency>
<groupId>org.apache.marmotta</groupId>
+ <artifactId>kiwi-reasoner</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.marmotta</groupId>
<artifactId>kiwi-tripletable</artifactId>
<version>${project.version}</version>
</dependency>
[3/4] git commit: Starting 3.0.1 development branch
Posted by ja...@apache.org.
Starting 3.0.1 development branch
Project: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/commit/5db9985c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/tree/5db9985c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/diff/5db9985c
Branch: refs/heads/maintenance-3.0.x
Commit: 5db9985cd2e2dab55fb2bf5b85e47b3efee8e414
Parents: 63762a3
Author: Jakob Frank <ja...@apache.org>
Authored: Tue Oct 15 12:12:20 2013 +0200
Committer: Jakob Frank <ja...@apache.org>
Committed: Tue Oct 15 12:12:20 2013 +0200
----------------------------------------------------------------------
build/archetypes/marmotta-archetype-module/pom.xml | 2 +-
build/archetypes/marmotta-archetype-webapp/pom.xml | 2 +-
build/archetypes/pom.xml | 2 +-
build/checkstyle-resources/pom.xml | 2 +-
build/dependency-resource-supplement/pom.xml | 2 +-
build/plugins/buildinfo-maven-plugin/pom.xml | 2 +-
build/plugins/marmotta-maven-plugin/pom.xml | 2 +-
build/plugins/pom.xml | 2 +-
build/plugins/refpack-maven-plugin/pom.xml | 2 +-
build/plugins/repocheck-maven-plugin/pom.xml | 2 +-
build/pom.xml | 2 +-
client/marmotta-client-java/pom.xml | 2 +-
client/marmotta-client-js-sample-webapp/pom.xml | 2 +-
client/marmotta-client-js/pom.xml | 2 +-
client/marmotta-client-php/pom.xml | 2 +-
client/pom.xml | 2 +-
commons/marmotta-commons/pom.xml | 2 +-
commons/pom.xml | 2 +-
commons/sesame-filter/pom.xml | 2 +-
commons/sesame-tools-facading/pom.xml | 2 +-
commons/sesame-tools-rio-api/pom.xml | 2 +-
commons/sesame-tools-rio-ical/pom.xml | 2 +-
commons/sesame-tools-rio-jsonld/pom.xml | 2 +-
commons/sesame-tools-rio-rdfjson/pom.xml | 2 +-
commons/sesame-tools-rio-rss/pom.xml | 2 +-
commons/sesame-tools-rio-vcard/pom.xml | 2 +-
extras/pom.xml | 2 +-
launchers/marmotta-installer/pom.xml | 2 +-
launchers/marmotta-splash/pom.xml | 2 +-
launchers/marmotta-webapp/pom.xml | 2 +-
launchers/pom.xml | 2 +-
libraries/kiwi/kiwi-contextaware/pom.xml | 2 +-
libraries/kiwi/kiwi-reasoner/pom.xml | 2 +-
libraries/kiwi/kiwi-transactions/pom.xml | 2 +-
libraries/kiwi/kiwi-triplestore/pom.xml | 2 +-
libraries/kiwi/kiwi-tripletable/pom.xml | 2 +-
libraries/kiwi/kiwi-versioning/pom.xml | 2 +-
libraries/kiwi/pom.xml | 2 +-
libraries/ldcache/ldcache-api/pom.xml | 2 +-
libraries/ldcache/ldcache-backend-ehcache/pom.xml | 2 +-
libraries/ldcache/ldcache-backend-file/pom.xml | 2 +-
libraries/ldcache/ldcache-backend-kiwi/pom.xml | 2 +-
libraries/ldcache/ldcache-backend-mapdb/pom.xml | 2 +-
libraries/ldcache/ldcache-core/pom.xml | 2 +-
libraries/ldcache/ldcache-sail-generic/pom.xml | 2 +-
libraries/ldcache/ldcache-sail-kiwi/pom.xml | 2 +-
libraries/ldcache/pom.xml | 2 +-
libraries/ldclient/ldclient-api/pom.xml | 2 +-
libraries/ldclient/ldclient-core/pom.xml | 2 +-
libraries/ldclient/ldclient-provider-facebook/pom.xml | 2 +-
libraries/ldclient/ldclient-provider-html/pom.xml | 2 +-
libraries/ldclient/ldclient-provider-ldap/pom.xml | 2 +-
libraries/ldclient/ldclient-provider-mediawiki/pom.xml | 2 +-
libraries/ldclient/ldclient-provider-phpbb/pom.xml | 2 +-
libraries/ldclient/ldclient-provider-rdf/pom.xml | 2 +-
libraries/ldclient/ldclient-provider-rdfa/pom.xml | 2 +-
libraries/ldclient/ldclient-provider-vimeo/pom.xml | 2 +-
libraries/ldclient/ldclient-provider-xml/pom.xml | 2 +-
libraries/ldclient/ldclient-provider-youtube/pom.xml | 2 +-
libraries/ldclient/pom.xml | 2 +-
libraries/ldpath/ldpath-api/pom.xml | 2 +-
libraries/ldpath/ldpath-backend-file/pom.xml | 2 +-
libraries/ldpath/ldpath-backend-jena/pom.xml | 2 +-
libraries/ldpath/ldpath-backend-linkeddata/pom.xml | 2 +-
libraries/ldpath/ldpath-backend-sesame/pom.xml | 2 +-
libraries/ldpath/ldpath-core/pom.xml | 2 +-
libraries/ldpath/ldpath-functions-collections/pom.xml | 2 +-
libraries/ldpath/ldpath-functions-date/pom.xml | 2 +-
libraries/ldpath/ldpath-functions-html/pom.xml | 2 +-
libraries/ldpath/ldpath-functions-math/pom.xml | 2 +-
libraries/ldpath/ldpath-functions-text/pom.xml | 2 +-
libraries/ldpath/ldpath-functions-xml/pom.xml | 2 +-
libraries/ldpath/ldpath-template-linkeddata/pom.xml | 2 +-
libraries/ldpath/ldpath-template/pom.xml | 2 +-
libraries/ldpath/pom.xml | 2 +-
libraries/pom.xml | 2 +-
parent/pom.xml | 2 +-
platform/marmotta-core/pom.xml | 2 +-
platform/marmotta-ldcache/pom.xml | 2 +-
platform/marmotta-ldpath/pom.xml | 2 +-
platform/marmotta-reasoner/pom.xml | 2 +-
platform/marmotta-security/pom.xml | 2 +-
platform/marmotta-sparql/pom.xml | 2 +-
platform/marmotta-user/pom.xml | 2 +-
platform/marmotta-versioning/pom.xml | 2 +-
platform/pom.xml | 2 +-
pom.xml | 2 +-
87 files changed, 87 insertions(+), 87 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5db9985c/build/archetypes/marmotta-archetype-module/pom.xml
----------------------------------------------------------------------
diff --git a/build/archetypes/marmotta-archetype-module/pom.xml b/build/archetypes/marmotta-archetype-module/pom.xml
index 691e0c8..5cf7819 100644
--- a/build/archetypes/marmotta-archetype-module/pom.xml
+++ b/build/archetypes/marmotta-archetype-module/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.0.0-incubating</version>
+ <version>3.0.1-incubating-SNAPSHOT</version>
<relativePath>../../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5db9985c/build/archetypes/marmotta-archetype-webapp/pom.xml
----------------------------------------------------------------------
diff --git a/build/archetypes/marmotta-archetype-webapp/pom.xml b/build/archetypes/marmotta-archetype-webapp/pom.xml
index 4dfde69..578db3a 100644
--- a/build/archetypes/marmotta-archetype-webapp/pom.xml
+++ b/build/archetypes/marmotta-archetype-webapp/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.0.0-incubating</version>
+ <version>3.0.1-incubating-SNAPSHOT</version>
<relativePath>../../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5db9985c/build/archetypes/pom.xml
----------------------------------------------------------------------
diff --git a/build/archetypes/pom.xml b/build/archetypes/pom.xml
index c09b061..d6f0b52 100644
--- a/build/archetypes/pom.xml
+++ b/build/archetypes/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.0.0-incubating</version>
+ <version>3.0.1-incubating-SNAPSHOT</version>
<relativePath>../../parent</relativePath>
</parent>
<artifactId>archetypes-reactor</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5db9985c/build/checkstyle-resources/pom.xml
----------------------------------------------------------------------
diff --git a/build/checkstyle-resources/pom.xml b/build/checkstyle-resources/pom.xml
index 9e7a3e1..4253145 100644
--- a/build/checkstyle-resources/pom.xml
+++ b/build/checkstyle-resources/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.0.0-incubating</version>
+ <version>3.0.1-incubating-SNAPSHOT</version>
<relativePath>../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5db9985c/build/dependency-resource-supplement/pom.xml
----------------------------------------------------------------------
diff --git a/build/dependency-resource-supplement/pom.xml b/build/dependency-resource-supplement/pom.xml
index a115b44..f3fdf55 100644
--- a/build/dependency-resource-supplement/pom.xml
+++ b/build/dependency-resource-supplement/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.0.0-incubating</version>
+ <version>3.0.1-incubating-SNAPSHOT</version>
<relativePath>../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5db9985c/build/plugins/buildinfo-maven-plugin/pom.xml
----------------------------------------------------------------------
diff --git a/build/plugins/buildinfo-maven-plugin/pom.xml b/build/plugins/buildinfo-maven-plugin/pom.xml
index dee03f9..35c757d 100644
--- a/build/plugins/buildinfo-maven-plugin/pom.xml
+++ b/build/plugins/buildinfo-maven-plugin/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.0.0-incubating</version>
+ <version>3.0.1-incubating-SNAPSHOT</version>
<relativePath>../../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5db9985c/build/plugins/marmotta-maven-plugin/pom.xml
----------------------------------------------------------------------
diff --git a/build/plugins/marmotta-maven-plugin/pom.xml b/build/plugins/marmotta-maven-plugin/pom.xml
index bfc491d..e5af958 100644
--- a/build/plugins/marmotta-maven-plugin/pom.xml
+++ b/build/plugins/marmotta-maven-plugin/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
- <version>3.0.0-incubating</version>
+ <version>3.0.1-incubating-SNAPSHOT</version>
<relativePath>../</relativePath>
<artifactId>plugins-reactor</artifactId>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5db9985c/build/plugins/pom.xml
----------------------------------------------------------------------
diff --git a/build/plugins/pom.xml b/build/plugins/pom.xml
index 8248133..fd0a472 100644
--- a/build/plugins/pom.xml
+++ b/build/plugins/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.0.0-incubating</version>
+ <version>3.0.1-incubating-SNAPSHOT</version>
<relativePath>../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5db9985c/build/plugins/refpack-maven-plugin/pom.xml
----------------------------------------------------------------------
diff --git a/build/plugins/refpack-maven-plugin/pom.xml b/build/plugins/refpack-maven-plugin/pom.xml
index fc4a875..a59427f 100644
--- a/build/plugins/refpack-maven-plugin/pom.xml
+++ b/build/plugins/refpack-maven-plugin/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
- <version>3.0.0-incubating</version>
+ <version>3.0.1-incubating-SNAPSHOT</version>
<artifactId>plugins-reactor</artifactId>
<relativePath>../</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5db9985c/build/plugins/repocheck-maven-plugin/pom.xml
----------------------------------------------------------------------
diff --git a/build/plugins/repocheck-maven-plugin/pom.xml b/build/plugins/repocheck-maven-plugin/pom.xml
index a7ae3ff..7a23d5c 100644
--- a/build/plugins/repocheck-maven-plugin/pom.xml
+++ b/build/plugins/repocheck-maven-plugin/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>plugins-reactor</artifactId>
- <version>3.0.0-incubating</version>
+ <version>3.0.1-incubating-SNAPSHOT</version>
<relativePath>../</relativePath>
<!-- <artifactId>maven-plugins</artifactId> <groupId>org.apache.maven.plugins</groupId>
<version>23</version> <relativePath /> -->
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5db9985c/build/pom.xml
----------------------------------------------------------------------
diff --git a/build/pom.xml b/build/pom.xml
index 4bc1c15..c1aeb40 100644
--- a/build/pom.xml
+++ b/build/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.0.0-incubating</version>
+ <version>3.0.1-incubating-SNAPSHOT</version>
<relativePath>../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5db9985c/client/marmotta-client-java/pom.xml
----------------------------------------------------------------------
diff --git a/client/marmotta-client-java/pom.xml b/client/marmotta-client-java/pom.xml
index 2696225..aaf8b46 100644
--- a/client/marmotta-client-java/pom.xml
+++ b/client/marmotta-client-java/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.0.0-incubating</version>
+ <version>3.0.1-incubating-SNAPSHOT</version>
<relativePath>../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5db9985c/client/marmotta-client-js-sample-webapp/pom.xml
----------------------------------------------------------------------
diff --git a/client/marmotta-client-js-sample-webapp/pom.xml b/client/marmotta-client-js-sample-webapp/pom.xml
index 69bb541..e30bdff 100644
--- a/client/marmotta-client-js-sample-webapp/pom.xml
+++ b/client/marmotta-client-js-sample-webapp/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.0.0-incubating-SNAPSHOT</version>
+ <version>3.0.1-incubating-SNAPSHOT</version>
<relativePath>../../parent/pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5db9985c/client/marmotta-client-js/pom.xml
----------------------------------------------------------------------
diff --git a/client/marmotta-client-js/pom.xml b/client/marmotta-client-js/pom.xml
index 3e54afb..cf28e3c 100644
--- a/client/marmotta-client-js/pom.xml
+++ b/client/marmotta-client-js/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.0.0-incubating</version>
+ <version>3.0.1-incubating-SNAPSHOT</version>
<relativePath>../../parent/pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5db9985c/client/marmotta-client-php/pom.xml
----------------------------------------------------------------------
diff --git a/client/marmotta-client-php/pom.xml b/client/marmotta-client-php/pom.xml
index 99ab823..a8c2d09 100644
--- a/client/marmotta-client-php/pom.xml
+++ b/client/marmotta-client-php/pom.xml
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.0.0-incubating-SNAPSHOT</version>
+ <version>3.0.1-incubating-SNAPSHOT</version>
<relativePath>../../parent/pom.xml</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5db9985c/client/pom.xml
----------------------------------------------------------------------
diff --git a/client/pom.xml b/client/pom.xml
index 7b4aaef..4624c3c 100644
--- a/client/pom.xml
+++ b/client/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.0.0-incubating</version>
+ <version>3.0.1-incubating-SNAPSHOT</version>
<relativePath>../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5db9985c/commons/marmotta-commons/pom.xml
----------------------------------------------------------------------
diff --git a/commons/marmotta-commons/pom.xml b/commons/marmotta-commons/pom.xml
index 6caca29..230fa43 100644
--- a/commons/marmotta-commons/pom.xml
+++ b/commons/marmotta-commons/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.0.0-incubating</version>
+ <version>3.0.1-incubating-SNAPSHOT</version>
<relativePath>../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5db9985c/commons/pom.xml
----------------------------------------------------------------------
diff --git a/commons/pom.xml b/commons/pom.xml
index 4ab2b61..c08a4e8 100644
--- a/commons/pom.xml
+++ b/commons/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.0.0-incubating</version>
+ <version>3.0.1-incubating-SNAPSHOT</version>
<relativePath>../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5db9985c/commons/sesame-filter/pom.xml
----------------------------------------------------------------------
diff --git a/commons/sesame-filter/pom.xml b/commons/sesame-filter/pom.xml
index 72c323c..f7215fe 100644
--- a/commons/sesame-filter/pom.xml
+++ b/commons/sesame-filter/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.0.0-incubating</version>
+ <version>3.0.1-incubating-SNAPSHOT</version>
<relativePath>../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5db9985c/commons/sesame-tools-facading/pom.xml
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-facading/pom.xml b/commons/sesame-tools-facading/pom.xml
index 11ed686..b4c8478 100644
--- a/commons/sesame-tools-facading/pom.xml
+++ b/commons/sesame-tools-facading/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.0.0-incubating</version>
+ <version>3.0.1-incubating-SNAPSHOT</version>
<relativePath>../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5db9985c/commons/sesame-tools-rio-api/pom.xml
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-rio-api/pom.xml b/commons/sesame-tools-rio-api/pom.xml
index da6e050..a32c847 100644
--- a/commons/sesame-tools-rio-api/pom.xml
+++ b/commons/sesame-tools-rio-api/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.0.0-incubating</version>
+ <version>3.0.1-incubating-SNAPSHOT</version>
<relativePath>../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5db9985c/commons/sesame-tools-rio-ical/pom.xml
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-rio-ical/pom.xml b/commons/sesame-tools-rio-ical/pom.xml
index 4966b65..ef7006c 100644
--- a/commons/sesame-tools-rio-ical/pom.xml
+++ b/commons/sesame-tools-rio-ical/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.0.0-incubating</version>
+ <version>3.0.1-incubating-SNAPSHOT</version>
<relativePath>../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5db9985c/commons/sesame-tools-rio-jsonld/pom.xml
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-rio-jsonld/pom.xml b/commons/sesame-tools-rio-jsonld/pom.xml
index 5da43c0..64d0327 100644
--- a/commons/sesame-tools-rio-jsonld/pom.xml
+++ b/commons/sesame-tools-rio-jsonld/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.0.0-incubating</version>
+ <version>3.0.1-incubating-SNAPSHOT</version>
<relativePath>../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5db9985c/commons/sesame-tools-rio-rdfjson/pom.xml
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-rio-rdfjson/pom.xml b/commons/sesame-tools-rio-rdfjson/pom.xml
index 1a86935..cc15826 100644
--- a/commons/sesame-tools-rio-rdfjson/pom.xml
+++ b/commons/sesame-tools-rio-rdfjson/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.0.0-incubating</version>
+ <version>3.0.1-incubating-SNAPSHOT</version>
<relativePath>../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5db9985c/commons/sesame-tools-rio-rss/pom.xml
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-rio-rss/pom.xml b/commons/sesame-tools-rio-rss/pom.xml
index e177a0a..bd430e6 100644
--- a/commons/sesame-tools-rio-rss/pom.xml
+++ b/commons/sesame-tools-rio-rss/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.0.0-incubating</version>
+ <version>3.0.1-incubating-SNAPSHOT</version>
<relativePath>../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5db9985c/commons/sesame-tools-rio-vcard/pom.xml
----------------------------------------------------------------------
diff --git a/commons/sesame-tools-rio-vcard/pom.xml b/commons/sesame-tools-rio-vcard/pom.xml
index 1804b70..25ef26c 100644
--- a/commons/sesame-tools-rio-vcard/pom.xml
+++ b/commons/sesame-tools-rio-vcard/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.0.0-incubating</version>
+ <version>3.0.1-incubating-SNAPSHOT</version>
<relativePath>../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5db9985c/extras/pom.xml
----------------------------------------------------------------------
diff --git a/extras/pom.xml b/extras/pom.xml
index c8f7554..dfc57e6 100644
--- a/extras/pom.xml
+++ b/extras/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.0.0-incubating</version>
+ <version>3.0.1-incubating-SNAPSHOT</version>
<relativePath>../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5db9985c/launchers/marmotta-installer/pom.xml
----------------------------------------------------------------------
diff --git a/launchers/marmotta-installer/pom.xml b/launchers/marmotta-installer/pom.xml
index d495b48..1992583 100644
--- a/launchers/marmotta-installer/pom.xml
+++ b/launchers/marmotta-installer/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.0.0-incubating</version>
+ <version>3.0.1-incubating-SNAPSHOT</version>
<relativePath>../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5db9985c/launchers/marmotta-splash/pom.xml
----------------------------------------------------------------------
diff --git a/launchers/marmotta-splash/pom.xml b/launchers/marmotta-splash/pom.xml
index a91377a..599c0c8 100644
--- a/launchers/marmotta-splash/pom.xml
+++ b/launchers/marmotta-splash/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.0.0-incubating</version>
+ <version>3.0.1-incubating-SNAPSHOT</version>
<relativePath>../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5db9985c/launchers/marmotta-webapp/pom.xml
----------------------------------------------------------------------
diff --git a/launchers/marmotta-webapp/pom.xml b/launchers/marmotta-webapp/pom.xml
index 390b0ad..2f44f04 100644
--- a/launchers/marmotta-webapp/pom.xml
+++ b/launchers/marmotta-webapp/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.0.0-incubating</version>
+ <version>3.0.1-incubating-SNAPSHOT</version>
<relativePath>../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5db9985c/launchers/pom.xml
----------------------------------------------------------------------
diff --git a/launchers/pom.xml b/launchers/pom.xml
index 48d5952..4548b00 100644
--- a/launchers/pom.xml
+++ b/launchers/pom.xml
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.0.0-incubating</version>
+ <version>3.0.1-incubating-SNAPSHOT</version>
<relativePath>../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5db9985c/libraries/kiwi/kiwi-contextaware/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/kiwi/kiwi-contextaware/pom.xml b/libraries/kiwi/kiwi-contextaware/pom.xml
index 89c3215..92e42d2 100644
--- a/libraries/kiwi/kiwi-contextaware/pom.xml
+++ b/libraries/kiwi/kiwi-contextaware/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>kiwi-parent</artifactId>
- <version>3.0.0-incubating</version>
+ <version>3.0.1-incubating-SNAPSHOT</version>
<relativePath>../</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5db9985c/libraries/kiwi/kiwi-reasoner/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/kiwi/kiwi-reasoner/pom.xml b/libraries/kiwi/kiwi-reasoner/pom.xml
index 80e9614..84889d9 100644
--- a/libraries/kiwi/kiwi-reasoner/pom.xml
+++ b/libraries/kiwi/kiwi-reasoner/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>kiwi-parent</artifactId>
- <version>3.0.0-incubating</version>
+ <version>3.0.1-incubating-SNAPSHOT</version>
<relativePath>../</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5db9985c/libraries/kiwi/kiwi-transactions/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/kiwi/kiwi-transactions/pom.xml b/libraries/kiwi/kiwi-transactions/pom.xml
index d545004..663e9bb 100644
--- a/libraries/kiwi/kiwi-transactions/pom.xml
+++ b/libraries/kiwi/kiwi-transactions/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>kiwi-parent</artifactId>
- <version>3.0.0-incubating</version>
+ <version>3.0.1-incubating-SNAPSHOT</version>
<relativePath>../</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5db9985c/libraries/kiwi/kiwi-triplestore/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/kiwi/kiwi-triplestore/pom.xml b/libraries/kiwi/kiwi-triplestore/pom.xml
index 3eda3f6..93981aa 100644
--- a/libraries/kiwi/kiwi-triplestore/pom.xml
+++ b/libraries/kiwi/kiwi-triplestore/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>kiwi-parent</artifactId>
- <version>3.0.0-incubating</version>
+ <version>3.0.1-incubating-SNAPSHOT</version>
<relativePath>../</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5db9985c/libraries/kiwi/kiwi-tripletable/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/kiwi/kiwi-tripletable/pom.xml b/libraries/kiwi/kiwi-tripletable/pom.xml
index 75b9467..0570683 100644
--- a/libraries/kiwi/kiwi-tripletable/pom.xml
+++ b/libraries/kiwi/kiwi-tripletable/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>kiwi-parent</artifactId>
- <version>3.0.0-incubating</version>
+ <version>3.0.1-incubating-SNAPSHOT</version>
</parent>
<artifactId>kiwi-tripletable</artifactId>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5db9985c/libraries/kiwi/kiwi-versioning/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/kiwi/kiwi-versioning/pom.xml b/libraries/kiwi/kiwi-versioning/pom.xml
index 1a3679a..753cc05 100644
--- a/libraries/kiwi/kiwi-versioning/pom.xml
+++ b/libraries/kiwi/kiwi-versioning/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>kiwi-parent</artifactId>
- <version>3.0.0-incubating</version>
+ <version>3.0.1-incubating-SNAPSHOT</version>
<relativePath>../</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5db9985c/libraries/kiwi/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/kiwi/pom.xml b/libraries/kiwi/pom.xml
index 35262de..36cac5b 100644
--- a/libraries/kiwi/pom.xml
+++ b/libraries/kiwi/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.0.0-incubating</version>
+ <version>3.0.1-incubating-SNAPSHOT</version>
<relativePath>../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5db9985c/libraries/ldcache/ldcache-api/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldcache/ldcache-api/pom.xml b/libraries/ldcache/ldcache-api/pom.xml
index 48a1ad4..ab94632 100644
--- a/libraries/ldcache/ldcache-api/pom.xml
+++ b/libraries/ldcache/ldcache-api/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.0.0-incubating</version>
+ <version>3.0.1-incubating-SNAPSHOT</version>
<relativePath>../../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5db9985c/libraries/ldcache/ldcache-backend-ehcache/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldcache/ldcache-backend-ehcache/pom.xml b/libraries/ldcache/ldcache-backend-ehcache/pom.xml
index 2aea5e8..bf0295b 100644
--- a/libraries/ldcache/ldcache-backend-ehcache/pom.xml
+++ b/libraries/ldcache/ldcache-backend-ehcache/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.0.0-incubating</version>
+ <version>3.0.1-incubating-SNAPSHOT</version>
<relativePath>../../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5db9985c/libraries/ldcache/ldcache-backend-file/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldcache/ldcache-backend-file/pom.xml b/libraries/ldcache/ldcache-backend-file/pom.xml
index 24a7a94..45a5504 100644
--- a/libraries/ldcache/ldcache-backend-file/pom.xml
+++ b/libraries/ldcache/ldcache-backend-file/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.0.0-incubating</version>
+ <version>3.0.1-incubating-SNAPSHOT</version>
<relativePath>../../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5db9985c/libraries/ldcache/ldcache-backend-kiwi/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldcache/ldcache-backend-kiwi/pom.xml b/libraries/ldcache/ldcache-backend-kiwi/pom.xml
index 87b3b88..5f7bb9b 100644
--- a/libraries/ldcache/ldcache-backend-kiwi/pom.xml
+++ b/libraries/ldcache/ldcache-backend-kiwi/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.0.0-incubating</version>
+ <version>3.0.1-incubating-SNAPSHOT</version>
<relativePath>../../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5db9985c/libraries/ldcache/ldcache-backend-mapdb/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldcache/ldcache-backend-mapdb/pom.xml b/libraries/ldcache/ldcache-backend-mapdb/pom.xml
index ea83c15..e304ff0 100644
--- a/libraries/ldcache/ldcache-backend-mapdb/pom.xml
+++ b/libraries/ldcache/ldcache-backend-mapdb/pom.xml
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.0.0-incubating-SNAPSHOT</version>
+ <version>3.0.1-incubating-SNAPSHOT</version>
<relativePath>../../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5db9985c/libraries/ldcache/ldcache-core/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldcache/ldcache-core/pom.xml b/libraries/ldcache/ldcache-core/pom.xml
index bd40a55..cdfea7b 100644
--- a/libraries/ldcache/ldcache-core/pom.xml
+++ b/libraries/ldcache/ldcache-core/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.0.0-incubating</version>
+ <version>3.0.1-incubating-SNAPSHOT</version>
<relativePath>../../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5db9985c/libraries/ldcache/ldcache-sail-generic/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldcache/ldcache-sail-generic/pom.xml b/libraries/ldcache/ldcache-sail-generic/pom.xml
index b83dc6b..5b77e13 100644
--- a/libraries/ldcache/ldcache-sail-generic/pom.xml
+++ b/libraries/ldcache/ldcache-sail-generic/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.0.0-incubating</version>
+ <version>3.0.1-incubating-SNAPSHOT</version>
<relativePath>../../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5db9985c/libraries/ldcache/ldcache-sail-kiwi/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldcache/ldcache-sail-kiwi/pom.xml b/libraries/ldcache/ldcache-sail-kiwi/pom.xml
index 0068658..b7a02f0 100644
--- a/libraries/ldcache/ldcache-sail-kiwi/pom.xml
+++ b/libraries/ldcache/ldcache-sail-kiwi/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.0.0-incubating</version>
+ <version>3.0.1-incubating-SNAPSHOT</version>
<relativePath>../../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5db9985c/libraries/ldcache/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldcache/pom.xml b/libraries/ldcache/pom.xml
index d738c60..b842776 100644
--- a/libraries/ldcache/pom.xml
+++ b/libraries/ldcache/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.0.0-incubating</version>
+ <version>3.0.1-incubating-SNAPSHOT</version>
<relativePath>../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5db9985c/libraries/ldclient/ldclient-api/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldclient/ldclient-api/pom.xml b/libraries/ldclient/ldclient-api/pom.xml
index 0453322..57c5fbb 100644
--- a/libraries/ldclient/ldclient-api/pom.xml
+++ b/libraries/ldclient/ldclient-api/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.0.0-incubating</version>
+ <version>3.0.1-incubating-SNAPSHOT</version>
<relativePath>../../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5db9985c/libraries/ldclient/ldclient-core/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldclient/ldclient-core/pom.xml b/libraries/ldclient/ldclient-core/pom.xml
index 4db9726..390ddad 100644
--- a/libraries/ldclient/ldclient-core/pom.xml
+++ b/libraries/ldclient/ldclient-core/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.0.0-incubating</version>
+ <version>3.0.1-incubating-SNAPSHOT</version>
<relativePath>../../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5db9985c/libraries/ldclient/ldclient-provider-facebook/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldclient/ldclient-provider-facebook/pom.xml b/libraries/ldclient/ldclient-provider-facebook/pom.xml
index b0b943c..c709206 100644
--- a/libraries/ldclient/ldclient-provider-facebook/pom.xml
+++ b/libraries/ldclient/ldclient-provider-facebook/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.0.0-incubating</version>
+ <version>3.0.1-incubating-SNAPSHOT</version>
<relativePath>../../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5db9985c/libraries/ldclient/ldclient-provider-html/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldclient/ldclient-provider-html/pom.xml b/libraries/ldclient/ldclient-provider-html/pom.xml
index ac8ab96..d4c5b42 100644
--- a/libraries/ldclient/ldclient-provider-html/pom.xml
+++ b/libraries/ldclient/ldclient-provider-html/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.0.0-incubating</version>
+ <version>3.0.1-incubating-SNAPSHOT</version>
<relativePath>../../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5db9985c/libraries/ldclient/ldclient-provider-ldap/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldclient/ldclient-provider-ldap/pom.xml b/libraries/ldclient/ldclient-provider-ldap/pom.xml
index 6a8b5a3..6fde67e 100644
--- a/libraries/ldclient/ldclient-provider-ldap/pom.xml
+++ b/libraries/ldclient/ldclient-provider-ldap/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.0.0-incubating</version>
+ <version>3.0.1-incubating-SNAPSHOT</version>
<relativePath>../../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5db9985c/libraries/ldclient/ldclient-provider-mediawiki/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldclient/ldclient-provider-mediawiki/pom.xml b/libraries/ldclient/ldclient-provider-mediawiki/pom.xml
index df0ee69..ab05860 100644
--- a/libraries/ldclient/ldclient-provider-mediawiki/pom.xml
+++ b/libraries/ldclient/ldclient-provider-mediawiki/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.0.0-incubating</version>
+ <version>3.0.1-incubating-SNAPSHOT</version>
<relativePath>../../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5db9985c/libraries/ldclient/ldclient-provider-phpbb/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldclient/ldclient-provider-phpbb/pom.xml b/libraries/ldclient/ldclient-provider-phpbb/pom.xml
index cae360a..24ff239 100644
--- a/libraries/ldclient/ldclient-provider-phpbb/pom.xml
+++ b/libraries/ldclient/ldclient-provider-phpbb/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.0.0-incubating</version>
+ <version>3.0.1-incubating-SNAPSHOT</version>
<relativePath>../../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5db9985c/libraries/ldclient/ldclient-provider-rdf/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldclient/ldclient-provider-rdf/pom.xml b/libraries/ldclient/ldclient-provider-rdf/pom.xml
index 211f9ab..3845558 100644
--- a/libraries/ldclient/ldclient-provider-rdf/pom.xml
+++ b/libraries/ldclient/ldclient-provider-rdf/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.0.0-incubating</version>
+ <version>3.0.1-incubating-SNAPSHOT</version>
<relativePath>../../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5db9985c/libraries/ldclient/ldclient-provider-rdfa/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldclient/ldclient-provider-rdfa/pom.xml b/libraries/ldclient/ldclient-provider-rdfa/pom.xml
index ab80edc..7922146 100644
--- a/libraries/ldclient/ldclient-provider-rdfa/pom.xml
+++ b/libraries/ldclient/ldclient-provider-rdfa/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.0.0-incubating</version>
+ <version>3.0.1-incubating-SNAPSHOT</version>
<relativePath>../../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5db9985c/libraries/ldclient/ldclient-provider-vimeo/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldclient/ldclient-provider-vimeo/pom.xml b/libraries/ldclient/ldclient-provider-vimeo/pom.xml
index ac12326..9b5232f 100644
--- a/libraries/ldclient/ldclient-provider-vimeo/pom.xml
+++ b/libraries/ldclient/ldclient-provider-vimeo/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.0.0-incubating</version>
+ <version>3.0.1-incubating-SNAPSHOT</version>
<relativePath>../../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5db9985c/libraries/ldclient/ldclient-provider-xml/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldclient/ldclient-provider-xml/pom.xml b/libraries/ldclient/ldclient-provider-xml/pom.xml
index 6c397f7..0d405d0 100644
--- a/libraries/ldclient/ldclient-provider-xml/pom.xml
+++ b/libraries/ldclient/ldclient-provider-xml/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.0.0-incubating</version>
+ <version>3.0.1-incubating-SNAPSHOT</version>
<relativePath>../../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5db9985c/libraries/ldclient/ldclient-provider-youtube/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldclient/ldclient-provider-youtube/pom.xml b/libraries/ldclient/ldclient-provider-youtube/pom.xml
index 916c18f..d2e841a 100644
--- a/libraries/ldclient/ldclient-provider-youtube/pom.xml
+++ b/libraries/ldclient/ldclient-provider-youtube/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.0.0-incubating</version>
+ <version>3.0.1-incubating-SNAPSHOT</version>
<relativePath>../../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5db9985c/libraries/ldclient/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldclient/pom.xml b/libraries/ldclient/pom.xml
index 5ab509c..6eb20ad 100644
--- a/libraries/ldclient/pom.xml
+++ b/libraries/ldclient/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.0.0-incubating</version>
+ <version>3.0.1-incubating-SNAPSHOT</version>
<relativePath>../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5db9985c/libraries/ldpath/ldpath-api/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldpath/ldpath-api/pom.xml b/libraries/ldpath/ldpath-api/pom.xml
index f8f1963..52eec5e 100644
--- a/libraries/ldpath/ldpath-api/pom.xml
+++ b/libraries/ldpath/ldpath-api/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.0.0-incubating</version>
+ <version>3.0.1-incubating-SNAPSHOT</version>
<relativePath>../../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5db9985c/libraries/ldpath/ldpath-backend-file/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldpath/ldpath-backend-file/pom.xml b/libraries/ldpath/ldpath-backend-file/pom.xml
index 342ecb4..eece2ca 100644
--- a/libraries/ldpath/ldpath-backend-file/pom.xml
+++ b/libraries/ldpath/ldpath-backend-file/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.0.0-incubating</version>
+ <version>3.0.1-incubating-SNAPSHOT</version>
<relativePath>../../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5db9985c/libraries/ldpath/ldpath-backend-jena/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldpath/ldpath-backend-jena/pom.xml b/libraries/ldpath/ldpath-backend-jena/pom.xml
index 11329f2..28ff1ed 100644
--- a/libraries/ldpath/ldpath-backend-jena/pom.xml
+++ b/libraries/ldpath/ldpath-backend-jena/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.0.0-incubating</version>
+ <version>3.0.1-incubating-SNAPSHOT</version>
<relativePath>../../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5db9985c/libraries/ldpath/ldpath-backend-linkeddata/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldpath/ldpath-backend-linkeddata/pom.xml b/libraries/ldpath/ldpath-backend-linkeddata/pom.xml
index 763ad45..1555015 100644
--- a/libraries/ldpath/ldpath-backend-linkeddata/pom.xml
+++ b/libraries/ldpath/ldpath-backend-linkeddata/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.0.0-incubating</version>
+ <version>3.0.1-incubating-SNAPSHOT</version>
<relativePath>../../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5db9985c/libraries/ldpath/ldpath-backend-sesame/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldpath/ldpath-backend-sesame/pom.xml b/libraries/ldpath/ldpath-backend-sesame/pom.xml
index cec46d3..84af3f4 100644
--- a/libraries/ldpath/ldpath-backend-sesame/pom.xml
+++ b/libraries/ldpath/ldpath-backend-sesame/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.0.0-incubating</version>
+ <version>3.0.1-incubating-SNAPSHOT</version>
<relativePath>../../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5db9985c/libraries/ldpath/ldpath-core/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldpath/ldpath-core/pom.xml b/libraries/ldpath/ldpath-core/pom.xml
index c47696e..ad488e9 100644
--- a/libraries/ldpath/ldpath-core/pom.xml
+++ b/libraries/ldpath/ldpath-core/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.0.0-incubating</version>
+ <version>3.0.1-incubating-SNAPSHOT</version>
<relativePath>../../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5db9985c/libraries/ldpath/ldpath-functions-collections/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldpath/ldpath-functions-collections/pom.xml b/libraries/ldpath/ldpath-functions-collections/pom.xml
index da6a66d..67c3434 100644
--- a/libraries/ldpath/ldpath-functions-collections/pom.xml
+++ b/libraries/ldpath/ldpath-functions-collections/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.0.0-incubating</version>
+ <version>3.0.1-incubating-SNAPSHOT</version>
<relativePath>../../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5db9985c/libraries/ldpath/ldpath-functions-date/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldpath/ldpath-functions-date/pom.xml b/libraries/ldpath/ldpath-functions-date/pom.xml
index 1ac71f7..7c3db24 100644
--- a/libraries/ldpath/ldpath-functions-date/pom.xml
+++ b/libraries/ldpath/ldpath-functions-date/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.0.0-incubating</version>
+ <version>3.0.1-incubating-SNAPSHOT</version>
<relativePath>../../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5db9985c/libraries/ldpath/ldpath-functions-html/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldpath/ldpath-functions-html/pom.xml b/libraries/ldpath/ldpath-functions-html/pom.xml
index 10880ba..32c0680 100644
--- a/libraries/ldpath/ldpath-functions-html/pom.xml
+++ b/libraries/ldpath/ldpath-functions-html/pom.xml
@@ -19,7 +19,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.0.0-incubating</version>
+ <version>3.0.1-incubating-SNAPSHOT</version>
<relativePath>../../../parent</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5db9985c/libraries/ldpath/ldpath-functions-math/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldpath/ldpath-functions-math/pom.xml b/libraries/ldpath/ldpath-functions-math/pom.xml
index 30e52d4..c2f8a3c 100644
--- a/libraries/ldpath/ldpath-functions-math/pom.xml
+++ b/libraries/ldpath/ldpath-functions-math/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.0.0-incubating</version>
+ <version>3.0.1-incubating-SNAPSHOT</version>
<relativePath>../../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5db9985c/libraries/ldpath/ldpath-functions-text/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldpath/ldpath-functions-text/pom.xml b/libraries/ldpath/ldpath-functions-text/pom.xml
index cac6953..278321c 100644
--- a/libraries/ldpath/ldpath-functions-text/pom.xml
+++ b/libraries/ldpath/ldpath-functions-text/pom.xml
@@ -20,7 +20,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.0.0-incubating</version>
+ <version>3.0.1-incubating-SNAPSHOT</version>
<relativePath>../../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5db9985c/libraries/ldpath/ldpath-functions-xml/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldpath/ldpath-functions-xml/pom.xml b/libraries/ldpath/ldpath-functions-xml/pom.xml
index b0db9aa..6aa3ade 100644
--- a/libraries/ldpath/ldpath-functions-xml/pom.xml
+++ b/libraries/ldpath/ldpath-functions-xml/pom.xml
@@ -19,7 +19,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.0.0-incubating</version>
+ <version>3.0.1-incubating-SNAPSHOT</version>
<relativePath>../../../parent</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5db9985c/libraries/ldpath/ldpath-template-linkeddata/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldpath/ldpath-template-linkeddata/pom.xml b/libraries/ldpath/ldpath-template-linkeddata/pom.xml
index 048efd9..084f6b4 100644
--- a/libraries/ldpath/ldpath-template-linkeddata/pom.xml
+++ b/libraries/ldpath/ldpath-template-linkeddata/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.0.0-incubating</version>
+ <version>3.0.1-incubating-SNAPSHOT</version>
<relativePath>../../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5db9985c/libraries/ldpath/ldpath-template/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldpath/ldpath-template/pom.xml b/libraries/ldpath/ldpath-template/pom.xml
index 6991220..6196f7d 100644
--- a/libraries/ldpath/ldpath-template/pom.xml
+++ b/libraries/ldpath/ldpath-template/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.0.0-incubating</version>
+ <version>3.0.1-incubating-SNAPSHOT</version>
<relativePath>../../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5db9985c/libraries/ldpath/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/ldpath/pom.xml b/libraries/ldpath/pom.xml
index f2fed9a..8b6466c 100644
--- a/libraries/ldpath/pom.xml
+++ b/libraries/ldpath/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.0.0-incubating</version>
+ <version>3.0.1-incubating-SNAPSHOT</version>
<relativePath>../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5db9985c/libraries/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/pom.xml b/libraries/pom.xml
index ab87270..b9f1551 100644
--- a/libraries/pom.xml
+++ b/libraries/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.0.0-incubating</version>
+ <version>3.0.1-incubating-SNAPSHOT</version>
<relativePath>../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5db9985c/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 4c8b953..7ad9039 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -29,7 +29,7 @@
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
<packaging>pom</packaging>
- <version>3.0.0-incubating</version>
+ <version>3.0.1-incubating-SNAPSHOT</version>
<name>Apache Marmotta Parent</name>
<description>Parent POM for the Apache Marmotta project</description>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5db9985c/platform/marmotta-core/pom.xml
----------------------------------------------------------------------
diff --git a/platform/marmotta-core/pom.xml b/platform/marmotta-core/pom.xml
index b04f3df..0600b8b 100644
--- a/platform/marmotta-core/pom.xml
+++ b/platform/marmotta-core/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.0.0-incubating</version>
+ <version>3.0.1-incubating-SNAPSHOT</version>
<relativePath>../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5db9985c/platform/marmotta-ldcache/pom.xml
----------------------------------------------------------------------
diff --git a/platform/marmotta-ldcache/pom.xml b/platform/marmotta-ldcache/pom.xml
index 7ff258a..4db215c 100644
--- a/platform/marmotta-ldcache/pom.xml
+++ b/platform/marmotta-ldcache/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.0.0-incubating</version>
+ <version>3.0.1-incubating-SNAPSHOT</version>
<relativePath>../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5db9985c/platform/marmotta-ldpath/pom.xml
----------------------------------------------------------------------
diff --git a/platform/marmotta-ldpath/pom.xml b/platform/marmotta-ldpath/pom.xml
index 9a0a697..b556300 100644
--- a/platform/marmotta-ldpath/pom.xml
+++ b/platform/marmotta-ldpath/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.0.0-incubating</version>
+ <version>3.0.1-incubating-SNAPSHOT</version>
<relativePath>../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5db9985c/platform/marmotta-reasoner/pom.xml
----------------------------------------------------------------------
diff --git a/platform/marmotta-reasoner/pom.xml b/platform/marmotta-reasoner/pom.xml
index f91167d..48f698e 100644
--- a/platform/marmotta-reasoner/pom.xml
+++ b/platform/marmotta-reasoner/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.0.0-incubating</version>
+ <version>3.0.1-incubating-SNAPSHOT</version>
<relativePath>../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5db9985c/platform/marmotta-security/pom.xml
----------------------------------------------------------------------
diff --git a/platform/marmotta-security/pom.xml b/platform/marmotta-security/pom.xml
index 04abac9..f65ae95 100644
--- a/platform/marmotta-security/pom.xml
+++ b/platform/marmotta-security/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.0.0-incubating</version>
+ <version>3.0.1-incubating-SNAPSHOT</version>
<relativePath>../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5db9985c/platform/marmotta-sparql/pom.xml
----------------------------------------------------------------------
diff --git a/platform/marmotta-sparql/pom.xml b/platform/marmotta-sparql/pom.xml
index 1fb1d4a..3c1858c 100644
--- a/platform/marmotta-sparql/pom.xml
+++ b/platform/marmotta-sparql/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.0.0-incubating</version>
+ <version>3.0.1-incubating-SNAPSHOT</version>
<relativePath>../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5db9985c/platform/marmotta-user/pom.xml
----------------------------------------------------------------------
diff --git a/platform/marmotta-user/pom.xml b/platform/marmotta-user/pom.xml
index 5b8143c..0508fb4 100644
--- a/platform/marmotta-user/pom.xml
+++ b/platform/marmotta-user/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.0.0-incubating</version>
+ <version>3.0.1-incubating-SNAPSHOT</version>
<relativePath>../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5db9985c/platform/marmotta-versioning/pom.xml
----------------------------------------------------------------------
diff --git a/platform/marmotta-versioning/pom.xml b/platform/marmotta-versioning/pom.xml
index 2c0053a..166df64 100644
--- a/platform/marmotta-versioning/pom.xml
+++ b/platform/marmotta-versioning/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.0.0-incubating</version>
+ <version>3.0.1-incubating-SNAPSHOT</version>
<relativePath>../../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5db9985c/platform/pom.xml
----------------------------------------------------------------------
diff --git a/platform/pom.xml b/platform/pom.xml
index f974b31..6f1d8dc 100644
--- a/platform/pom.xml
+++ b/platform/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.0.0-incubating</version>
+ <version>3.0.1-incubating-SNAPSHOT</version>
<relativePath>../parent</relativePath>
</parent>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/5db9985c/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 4f1ff75..26e6cd7 100644
--- a/pom.xml
+++ b/pom.xml
@@ -21,7 +21,7 @@
<parent>
<groupId>org.apache.marmotta</groupId>
<artifactId>marmotta-parent</artifactId>
- <version>3.0.0-incubating</version>
+ <version>3.0.1-incubating-SNAPSHOT</version>
<relativePath>parent</relativePath>
</parent>
[4/4] git commit: MARMOTTA-344: Backported KiWiLoader to 3.0.1-branch
Posted by ja...@apache.org.
MARMOTTA-344: Backported KiWiLoader to 3.0.1-branch
(cherry picked from commit 3c43d27e80449a84d4bd2e0d66ad198472e7eb29)
Project: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/commit/91d7773b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/tree/91d7773b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/diff/91d7773b
Branch: refs/heads/maintenance-3.0.x
Commit: 91d7773b7bab45b9347769b30bcb2f69bcdd072d
Parents: 5db9985
Author: Jakob Frank <ja...@apache.org>
Authored: Tue Oct 15 12:55:05 2013 +0200
Committer: Jakob Frank <ja...@apache.org>
Committed: Tue Oct 15 12:55:05 2013 +0200
----------------------------------------------------------------------
libraries/kiwi/kiwi-loader/pom.xml | 147 +++++
.../apache/marmotta/kiwi/loader/KiWiLoader.java | 555 +++++++++++++++++++
.../marmotta/kiwi/loader/KiWiLoaderTest.java | 219 ++++++++
.../src/test/resources/logback-test.xml | 28 +
libraries/kiwi/pom.xml | 1 +
parent/pom.xml | 5 +
6 files changed, 955 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/91d7773b/libraries/kiwi/kiwi-loader/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/kiwi/kiwi-loader/pom.xml b/libraries/kiwi/kiwi-loader/pom.xml
new file mode 100644
index 0000000..706421d
--- /dev/null
+++ b/libraries/kiwi/kiwi-loader/pom.xml
@@ -0,0 +1,147 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 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. -->
+<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/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.marmotta</groupId>
+ <artifactId>kiwi-parent</artifactId>
+ <version>3.0.1-incubating-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>kiwi-loader</artifactId>
+ <name>KiWi Triplestore: DB Loader</name>
+ <description>Standalone module to load RDF files into a KiWi Database</description>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-jar-plugin</artifactId>
+ <configuration>
+ <archive>
+ <manifest>
+ <mainClass>org.apache.marmotta.kiwi.loader.KiWiLoader</mainClass>
+ </manifest>
+ </archive>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>com.jolira</groupId>
+ <artifactId>onejar-maven-plugin</artifactId>
+ <version>1.4.4</version>
+ <executions>
+ <execution>
+ <phase>package</phase>
+ <goals>
+ <goal>one-jar</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>exec-maven-plugin</artifactId>
+ <version>1.2.1</version>
+ <executions>
+ <execution>
+ <goals>
+ <goal>java</goal>
+ </goals>
+ <configuration>
+ </configuration>
+ </execution>
+ </executions>
+ <configuration>
+ <mainClass>org.apache.marmotta.kiwi.loader.KiWiLoader</mainClass>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.marmotta</groupId>
+ <artifactId>kiwi-triplestore</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.marmotta</groupId>
+ <artifactId>kiwi-versioning</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.marmotta</groupId>
+ <artifactId>kiwi-reasoner</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>com.h2database</groupId>
+ <artifactId>h2</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jumpmind.symmetric.jdbc</groupId>
+ <artifactId>postgresql</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>mysql</groupId>
+ <artifactId>mysql-connector-java</artifactId>
+ <optional>true</optional> <!-- GPL licensed, no dependency -->
+ </dependency>
+
+ <dependency>
+ <groupId>commons-cli</groupId>
+ <artifactId>commons-cli</artifactId>
+ <version>1.2</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-configuration</groupId>
+ <artifactId>commons-configuration</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ <version>1.1.3</version>
+ </dependency>
+ <dependency>
+ <groupId>ch.qos.logback</groupId>
+ <artifactId>logback-classic</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.marmotta</groupId>
+ <artifactId>kiwi-triplestore</artifactId>
+ <scope>test</scope>
+ <type>test-jar</type>
+ </dependency>
+ <dependency>
+ <!--
+ License: CPL-1.0 http://www.opensource.org/licenses/cpl1.0
+ As a MAVEN dependency it is not included in a source release.
+ As a TEST dependency it is not included in a BINARY release, so no need to mention in N&L.
+ -->
+ <groupId>com.github.stefanbirkner</groupId>
+ <artifactId>system-rules</artifactId>
+ <version>1.4.0</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.openrdf.sesame</groupId>
+ <artifactId>sesame-rio-turtle</artifactId>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.openrdf.sesame</groupId>
+ <artifactId>sesame-rio-rdfxml</artifactId>
+ <scope>runtime</scope>
+ </dependency>
+ </dependencies>
+</project>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/91d7773b/libraries/kiwi/kiwi-loader/src/main/java/org/apache/marmotta/kiwi/loader/KiWiLoader.java
----------------------------------------------------------------------
diff --git a/libraries/kiwi/kiwi-loader/src/main/java/org/apache/marmotta/kiwi/loader/KiWiLoader.java b/libraries/kiwi/kiwi-loader/src/main/java/org/apache/marmotta/kiwi/loader/KiWiLoader.java
new file mode 100644
index 0000000..cd40502
--- /dev/null
+++ b/libraries/kiwi/kiwi-loader/src/main/java/org/apache/marmotta/kiwi/loader/KiWiLoader.java
@@ -0,0 +1,555 @@
+/*
+ * 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.
+ */
+package org.apache.marmotta.kiwi.loader;
+
+import java.io.Console;
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileNotFoundException;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.regex.Pattern;
+import java.util.zip.GZIPInputStream;
+
+import org.apache.commons.cli.CommandLine;
+import org.apache.commons.cli.CommandLineParser;
+import org.apache.commons.cli.HelpFormatter;
+import org.apache.commons.cli.Option;
+import org.apache.commons.cli.Options;
+import org.apache.commons.cli.ParseException;
+import org.apache.commons.cli.PosixParser;
+import org.apache.commons.configuration.Configuration;
+import org.apache.commons.configuration.ConfigurationException;
+import org.apache.commons.configuration.PropertiesConfiguration;
+import org.apache.marmotta.kiwi.config.KiWiConfiguration;
+import org.apache.marmotta.kiwi.persistence.KiWiDialect;
+import org.apache.marmotta.kiwi.persistence.h2.H2Dialect;
+import org.apache.marmotta.kiwi.persistence.mysql.MySQLDialect;
+import org.apache.marmotta.kiwi.persistence.pgsql.PostgreSQLDialect;
+import org.apache.marmotta.kiwi.sail.KiWiStore;
+import org.apache.marmotta.kiwi.transactions.api.TransactionalSail;
+import org.apache.marmotta.kiwi.transactions.sail.KiWiTransactionalSail;
+import org.openrdf.model.Resource;
+import org.openrdf.repository.RepositoryException;
+import org.openrdf.repository.sail.SailRepository;
+import org.openrdf.repository.sail.SailRepositoryConnection;
+import org.openrdf.rio.RDFFormat;
+import org.openrdf.rio.RDFParseException;
+import org.openrdf.rio.UnsupportedRDFormatException;
+import org.openrdf.sail.Sail;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * {@link KiWiLoader} is a fastpath importer into a kiwi database. It is meant
+ * for importing large datafiles into a kiwi RDF store, avoiding the overhead of
+ * the full marmotta platform.
+ * <p>
+ * The usage is <br>
+ * {@code KiWiLoader
+ * [-h]
+ * [-c <config>]
+ * [-b <baseUri>]
+ * [-C <context>]
+ * [-d <jdbc-url>]
+ * [-D <dialect>]
+ * [-U <dbUser>]
+ * [-P [<passwd>]]
+ * [-f <mime-type>]
+ * [-z]
+ * [-i <rdf-file> ...]
+ * [--reasoning]
+ * [--versioning]
+ * <rdf-file> ...
+ * }
+ * <pre>
+ * General Settings:
+ * -h,--help print this help
+ *
+ * Base Settings:
+ * -c,--config <config> Marmotta system-config.properties file
+ * -b,--baseUri <baseUri> baseUri during the import (fallback:
+ * kiwi.context from the config file)
+ * -C,--context <context> context to import into
+ *
+ * Database:
+ * -d,--database <jdbc-url> jdbc connection string
+ * -D,--dbDialect <dialect> database dialect (h2, mysql, postgres)
+ * -U,--user <dbUser> database user
+ * -P,--dbPasswd <passwd> database password
+ *
+ * Import:
+ * -f,--format <mime-type> format of rdf file (if guessing based on the
+ * extension does not work)
+ * -z Input file is gzip compressed
+ * -i,--file <rdf-file> input file(s) to load
+ *
+ * KiWi Extra Settings:
+ * --reasoning enable reasoning
+ * --versioning enable versioning
+ * </pre>
+ *
+ * @author Jakob Frank <ja...@apache.org>
+ *
+ */
+public class KiWiLoader {
+
+ private static Logger log = LoggerFactory.getLogger(KiWiLoader.class);
+ protected final KiWiConfiguration kiwi;
+ protected String baseUri;
+ protected String context;
+ protected boolean isVersioningEnabled;
+ protected boolean isReasoningEnabled;
+ protected SailRepository repository;
+
+ public KiWiLoader(KiWiConfiguration kiwi, String baseUri, String context) {
+ this.kiwi = kiwi;
+ this.baseUri = baseUri;
+ this.context = context;
+
+ isVersioningEnabled = false;
+ isReasoningEnabled = false;
+ }
+
+ /**
+ * @param args CLI params
+ */
+ public static void main(String[] args) {
+ Options options = buildOptions();
+
+ CommandLineParser parser = new PosixParser();
+ try {
+ CommandLine cmd = parser.parse(options, args);
+
+ if (cmd.hasOption("help")) {
+ printHelp(options);
+ return;
+ }
+
+ String baseUri = endWith("http://localhost/", "/"),
+ context = null, //baseUri+"context/default",
+ format = null;
+ boolean gzip = false;
+
+ String dbCon = null, dbUser = null, dbPasswd = null;
+ KiWiDialect dialect = null;
+
+ if (cmd.hasOption('c')) {
+ // load as much as possible from the config file
+ Configuration conf = new PropertiesConfiguration(cmd.getOptionValue('c'));
+ context = endWith(conf.getString("kiwi.context", baseUri), "/") + "context/default";
+ baseUri = endWith(conf.getString("kiwi.context", baseUri), "/") + "resource/";
+
+ dbCon = conf.getString("database.url");
+ dbUser = conf.getString("database.user");
+ dbPasswd = conf.getString("database.password");
+
+ String dbType = conf.getString("database.type");
+ if ("h2".equalsIgnoreCase(dbType)) {
+ dialect = new H2Dialect();
+ } else if ("mysql".equalsIgnoreCase(dbType)) {
+ dialect = new MySQLDialect();
+ } else if ("postgres".equalsIgnoreCase(dbType)) {
+ dialect = new PostgreSQLDialect();
+ }
+ }
+
+ // database url
+ if (cmd.hasOption('d')) {
+ dbCon = cmd.getOptionValue('d');
+ }
+ // database user
+ if (cmd.hasOption('U')) {
+ dbUser = cmd.getOptionValue('U');
+ }
+
+ // database dialect, use config value as fallback if present.
+ dialect = getDialect(cmd, dbCon, dialect);
+ // database passsword; if -P is given but no password, ask the user to enter it.
+ dbPasswd = getPassword(cmd, dbCon, dbUser, dbPasswd);
+
+ // We need a db-configuration, otherwise this does not make any sense.
+ if (dbCon == null || dbUser == null || dbPasswd == null || dialect == null) {
+ log.error("Cannot import without database connection!\n"
+ +"Please provide the database configuration either\n"
+ +"- in a kiwi-config file (-c), and/or\n"
+ +"- as commandline parameters (-d, -U, -P, -D)");
+ System.exit(3);
+ }
+
+ KiWiConfiguration kiwi = new KiWiConfiguration("kiwiLoader", dbCon, dbUser, dbPasswd, dialect);
+
+ // set the baseUri
+ if (cmd.hasOption('b')) {
+ baseUri = cmd.getOptionValue('b', baseUri);
+ }
+
+ // the context to import into.
+ if (cmd.hasOption('C')) {
+ context = cmd.getOptionValue('C', context);
+ }
+
+ // force uncompressing the files (will try to guess if this option is not set)
+ gzip = cmd.hasOption('z');
+
+ // the format to use as fallback; will try to guess based on the filename.
+ format = cmd.getOptionValue('f');
+ final RDFFormat fmt;
+ if (format != null) {
+ fmt = RDFFormat.forMIMEType(format);
+ if (fmt == null) {
+ throw new ParseException(String.format("Invalid/Unknown RDF format: %s, use one of %s", format, RDFFormat.values()));
+ }
+ log.debug("Format-Hint: {}", fmt);
+ } else {
+ fmt = null;
+ }
+
+ // get the files to import.
+ final ArrayList<String> inputFiles = new ArrayList<String>();
+ // - provided with the -i option
+ if (cmd.hasOption('i')) {
+ inputFiles.addAll(Arrays.asList(cmd.getOptionValues('i')));
+ }
+ // - or just the filename.
+ inputFiles.addAll(Arrays.asList(cmd.getArgs()));
+
+ // we need at least one file to import
+ // this could be changed...
+ if (inputFiles.isEmpty()) {
+ throw new ParseException("No files to import");
+ }
+
+ // initialize the KiWiLoader
+ log.info("Initializing KiWiLoader for {}; user: {}, password: {}", dbCon, dbUser, String.format("%"+dbPasswd.length()+"s", "*"));
+ KiWiLoader loader = new KiWiLoader(kiwi, baseUri, context);
+ loader.setVersioningEnabled(cmd.hasOption("versioning"));
+ loader.setReasoningEnabled(cmd.hasOption("reasoning"));
+ loader.initialize();
+
+ log.info("Starting import");
+ for (String inFile: inputFiles) {
+ try {
+ log.info("Importing {}", inFile);
+ final File f = new File(inFile);
+ String fName = f.getName();
+ InputStream inStream = new FileInputStream(f);
+ if (gzip || inFile.endsWith(".gz")) {
+ log.debug("{} seems to be gzipped", inFile);
+ inStream = new GZIPInputStream(inStream);
+ fName = fName.replaceFirst("\\.gz$", "");
+ }
+
+ long start = System.currentTimeMillis();
+ try {
+ loader.load(inStream, RDFFormat.forFileName(fName, fmt));
+ } catch (UnsupportedRDFormatException e) {
+ // try again with the fixed format
+ if (fmt != null) {
+ inStream.close();
+ // Reopen new
+ if (inStream instanceof GZIPInputStream) {
+ inStream = new GZIPInputStream(new FileInputStream(f));
+ } else {
+ inStream = new FileInputStream(f);
+ }
+ loader.load(inStream, fmt);
+ } else {
+ throw e;
+ }
+ } catch (RDFParseException e) {
+ // try again with the fixed format
+ if (fmt != null) {
+ inStream.close();
+ // Reopen new
+ if (inStream instanceof GZIPInputStream) {
+ inStream = new GZIPInputStream(new FileInputStream(f));
+ } else {
+ inStream = new FileInputStream(f);
+ }
+ loader.load(inStream, fmt);
+ } else {
+ throw e;
+ }
+ } finally {
+ inStream.close();
+ }
+ long dur = System.currentTimeMillis() - start;
+ log.info("Import completed ({}): {}ms", inFile, dur);
+ } catch (FileNotFoundException e) {
+ log.error("Could not read file {}, skipping...", inFile);
+ } catch (IOException e) {
+ log.error("Error while reading {}: {}", inFile, e);
+ } catch (RDFParseException e) {
+ log.error("file {} contains errors: {}\n{}", inFile, e.getMessage(), e);
+ } catch (UnsupportedRDFormatException e) {
+ log.error("{}, required for {} - dependency missing?", e.getMessage(), inFile);
+ }
+ }
+
+ log.info("Import complete, shutting down.");
+ loader.shutdown();
+ log.info("Exiting");
+ } catch (ParseException e) {
+ log.error(e.getMessage());
+ printHelp(options);
+ System.exit(1);
+ } catch (ConfigurationException e) {
+ log.error("Could not read system-config.properties: {}", e.getMessage());
+ System.exit(1);
+ } catch (RepositoryException e) {
+ log.error("Sesame-Exception: {}", e.getMessage(), e);
+ System.exit(2);
+ }
+ }
+
+ private static void printHelp(Options options) {
+ HelpFormatter formatter = new HelpFormatter();
+ formatter.printHelp(KiWiLoader.class.getSimpleName(), options, true);
+ }
+
+ /**
+ * Load the triples from the input stream using the provided format.
+ * @param inStream the {@link InputStream} to read from
+ * @param forFileName the expected {@link RDFFormat}
+ * @throws RDFParseException if the stream is invalid (e.g. does not fit with the syntax)
+ * @throws IOException
+ */
+ public void load(InputStream inStream, RDFFormat forFileName) throws RDFParseException, IOException {
+ try {
+ final SailRepositoryConnection con = repository.getConnection();
+ try {
+ con.begin();
+
+ final Resource[] ctx;
+ if (context != null) {
+ ctx = new Resource[] { con.getValueFactory().createURI(context) };
+ } else {
+ ctx = new Resource[] {};
+ }
+
+ con.add(inStream, baseUri, forFileName, ctx);
+
+ con.commit();
+ } finally {
+ if (con.isActive()) {
+ con.rollback();
+ }
+ con.close();
+ }
+ } catch (RepositoryException re) {
+ log.error("RepositoryException: {}", re.getMessage());
+ }
+ }
+
+ /**
+ * En-/Disable reasoning during load (currently not implemented)
+ * @param enabled
+ */
+ public void setReasoningEnabled(boolean enabled) {
+ this.isReasoningEnabled = enabled;
+ }
+
+ /**
+ * En-/Disable versioning during load (currently not implemented)
+ * @param enabled
+ */
+ public void setVersioningEnabled(boolean enabled) {
+ this.isVersioningEnabled = enabled;
+ }
+
+ /**
+ * Shutdown the Repository, close all database connections.
+ * @throws RepositoryException
+ */
+ public synchronized void shutdown() throws RepositoryException {
+ if (repository == null || !repository.isInitialized()) {
+ throw new IllegalStateException("repository was not initialized!");
+ }
+ repository.shutDown();
+ repository = null;
+ }
+
+ /**
+ * Load the triples from the file using the provided format.
+ * @param file the file to read from
+ * @param format the expected {@link RDFFormat}
+ * @param gzip force using a {@link GZIPInputStream} (will try to guess based on the filename if false)
+ * @throws RDFParseException if the stream is invalid (e.g. does not fit with the syntax)
+ * @throws IOException
+ * @see {@link #load(InputStream, RDFFormat)}
+ */
+ public void load(String file, RDFFormat format, boolean gzip) throws IOException, RDFParseException {
+ final File f = new File(file);
+ InputStream is = new FileInputStream(f);
+ if (gzip || f.getName().endsWith(".gz")) {
+ is = new GZIPInputStream(is);
+ }
+ load(is, format);
+ }
+
+ /**
+ * Initialize the KiWiStore, connect to the database.
+ * @throws RepositoryException
+ */
+ public synchronized void initialize() throws RepositoryException {
+ if (repository != null && repository.isInitialized()) {
+ throw new IllegalStateException("repository already initialized");
+ }
+ log.debug("initializing kiwi-store: {}", kiwi);
+ KiWiStore store = new KiWiStore(kiwi.getName(), kiwi.getJdbcUrl(), kiwi.getDbUser(), kiwi.getDbPassword(), kiwi.getDialect(), context, context);
+
+ final Sail sail;
+ if (isVersioningEnabled || isReasoningEnabled) {
+ TransactionalSail tSail = new KiWiTransactionalSail(store);
+ if (isVersioningEnabled) {
+ log.debug("enabling versioning...");
+ // TODO: Add Versioning
+ // tSail = new KiWiVersioningSail(tSail);
+ log.warn("versioning not yet supported/implemented");
+ }
+
+ if (isReasoningEnabled) {
+ log.debug("enabling reasoner...");
+ // TODO: Add Reasoning
+ // tSail = new KiWiReasoningSail(tSail, null);
+ log.warn("reasoning not yet supported/implemented");
+ }
+ sail = tSail;
+ } else {
+ // no transactional sail required here
+ sail = store;
+ }
+
+ repository = new SailRepository(sail);
+ repository.initialize();
+ }
+
+ private static String getPassword(CommandLine cmd, String jdbc, String user, String password) throws ParseException {
+ if (cmd.hasOption('P')) {
+ if (cmd.getOptionValue('P') != null) {
+ return cmd.getOptionValue('P');
+ } else {
+ Console console = System.console();
+ if (console == null) {
+ throw new ParseException("Could not aquire console, please provide password as parameter");
+ }
+
+ char passwordArray[] = console.readPassword("Password for %s on %s: ", jdbc, user);
+ return new String(passwordArray);
+ }
+ } else {
+ return password;
+ }
+ }
+
+ private static KiWiDialect getDialect(CommandLine cmd, String dbCon, KiWiDialect fallback)
+ throws ParseException {
+ // get the dialect
+ final String dbDialect = cmd.getOptionValue('D');
+ if (!cmd.hasOption('D')) {
+ return fallback;
+ } else if (dbDialect == null) {
+ log.info("No dialect provded, trying to guess based on dbUrl: {}", dbCon);
+ // try guessing
+ if (dbCon.startsWith("jdbc:h2:")) {
+ return new H2Dialect();
+ } else if (dbCon.startsWith("jdbc:mysql:")) {
+ return new MySQLDialect();
+ } else if (dbCon.startsWith("jdbc:postgresql:")) {
+ return new PostgreSQLDialect();
+ } else {
+ throw new ParseException("could not guess dialect from url, use the -D option");
+ }
+ } else if ("h2".equalsIgnoreCase(dbDialect)) {
+ return new H2Dialect();
+ } else if ("mysql".equalsIgnoreCase(dbDialect)) {
+ return new MySQLDialect();
+ } else if ("postgresql".equalsIgnoreCase(dbDialect)) {
+ return new PostgreSQLDialect();
+ } else {
+ throw new ParseException("Unknown dialect: " + dbDialect);
+ }
+ }
+
+ private static Options buildOptions() {
+ final Options options = new Options();
+
+ options.addOption("h", "help", false, "print this help");
+
+ final Option c = new Option("c", "config", true, "Marmotta system-config.properties file");
+ c.setArgName("config");
+ c.setArgs(1);
+ c.setOptionalArg(false);
+ options.addOption(c);
+
+ final Option b = new Option("b", "baseUri", true, "baseUri during the import (fallback: kiwi.context from the config file)");
+ b.setArgName("baseUri");
+ b.setArgs(1);
+ options.addOption(b);
+
+ final Option context = new Option("C", "context", true, "context to import into");
+ context.setArgName("context");
+ context.setArgs(1);
+ context.setOptionalArg(false);
+ options.addOption(context);
+
+ options.addOption("z", false, "Input file is gzip compressed");
+
+ final Option format = new Option("f", "format", true, "format of rdf file (if guessing based on the extension does not work)");
+ format.setArgName("mime-type");
+ format.setArgs(1);
+ options.addOption(format);
+
+ final Option input = new Option("i", "file", true, "input file(s) to load");
+ input.setArgName("rdf-file");
+ input.setArgs(Option.UNLIMITED_VALUES);
+ options.addOption(input);
+
+ final Option dbUrl = new Option("d", "database", true, "jdbc connection string");
+ dbUrl.setArgName("jdbc-url");
+ dbUrl.setArgs(1);
+ options.addOption(dbUrl);
+
+ final Option dbUser = new Option("U", "user", true, "database user");
+ dbUser.setArgName("dbUser");
+ options.addOption(dbUser);
+
+ final Option dbPasswd = new Option("P", "dbPasswd", true, "database password");
+ dbPasswd.setArgName("passwd");
+ dbPasswd.setArgs(1);
+ dbPasswd.setOptionalArg(true);
+ options.addOption(dbPasswd);
+
+ final Option dbDialect = new Option("D", "dbDialect", true, "database dialect (h2, mysql, postgres)");
+ dbDialect.setArgName("dialect");
+ options.addOption(dbDialect);
+
+ options.addOption(null, "reasoning", false, "enable reasoning");
+ options.addOption(null, "versioning", false, "enable versioning");
+
+ return options;
+ }
+
+ private static String endWith(String string, String suffix) {
+ return string.replaceFirst("("+Pattern.quote(suffix)+")?$", suffix);
+ }
+
+}
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/91d7773b/libraries/kiwi/kiwi-loader/src/test/java/org/apache/marmotta/kiwi/loader/KiWiLoaderTest.java
----------------------------------------------------------------------
diff --git a/libraries/kiwi/kiwi-loader/src/test/java/org/apache/marmotta/kiwi/loader/KiWiLoaderTest.java b/libraries/kiwi/kiwi-loader/src/test/java/org/apache/marmotta/kiwi/loader/KiWiLoaderTest.java
new file mode 100644
index 0000000..3cd0467
--- /dev/null
+++ b/libraries/kiwi/kiwi-loader/src/test/java/org/apache/marmotta/kiwi/loader/KiWiLoaderTest.java
@@ -0,0 +1,219 @@
+package org.apache.marmotta.kiwi.loader;
+
+import static org.hamcrest.CoreMatchers.containsString;
+import static org.junit.Assert.assertThat;
+import static org.junit.Assert.assertTrue;
+
+import java.io.File;
+import java.io.FileInputStream;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.util.Properties;
+import java.util.zip.GZIPOutputStream;
+
+import org.apache.commons.io.IOUtils;
+import org.apache.marmotta.commons.vocabulary.FOAF;
+import org.apache.marmotta.kiwi.config.KiWiConfiguration;
+import org.apache.marmotta.kiwi.persistence.h2.H2Dialect;
+import org.hamcrest.CoreMatchers;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.junit.contrib.java.lang.system.ExpectedSystemExit;
+import org.junit.contrib.java.lang.system.StandardOutputStreamLog;
+import org.junit.rules.TemporaryFolder;
+import org.openrdf.model.ValueFactory;
+import org.openrdf.model.vocabulary.RDF;
+import org.openrdf.repository.Repository;
+import org.openrdf.repository.RepositoryConnection;
+import org.openrdf.repository.RepositoryException;
+import org.openrdf.rio.RDFFormat;
+import org.openrdf.rio.RDFParseException;
+
+public class KiWiLoaderTest {
+
+ @Rule
+ public final TemporaryFolder temp = new TemporaryFolder();
+
+ @Rule
+ public final ExpectedSystemExit exit = ExpectedSystemExit.none();
+
+ @Rule
+ public final StandardOutputStreamLog stdOut = new StandardOutputStreamLog();
+
+ private File confFile;
+ private File dataFile;
+ private Properties loaderProps;
+
+ @Before
+ public void setUp() throws IOException {
+ // The config file
+ confFile = temp.newFile("loader.properties");
+ loaderProps = getLoaderProps();
+ FileOutputStream fos = new FileOutputStream(confFile);
+ loaderProps.store(fos, "");
+ fos.close();
+
+ // input file
+ dataFile = temp.newFile("test-data.xml");
+ copyResourceToFile("/org/apache/marmotta/kiwi/test/demo-data.foaf", dataFile);
+
+ }
+
+ private Properties getLoaderProps() throws IOException {
+ Properties props = new Properties();
+
+ props.setProperty("database.type", "h2");
+ props.setProperty("database.url", String.format("jdbc:h2:%s/marmotta;MVCC=true;DB_CLOSE_ON_EXIT=FALSE;DB_CLOSE_DELAY=10", temp.newFolder("db").getAbsolutePath()));
+ props.setProperty("database.user", "marmotta");
+ props.setProperty("database.password", "marmotta");
+
+ props.setProperty("kiwi.context", "http://test.example.com/");
+
+ return props;
+ }
+
+
+ @Test
+ public void testMain_NoArgs() {
+ exit.expectSystemExitWithStatus(3);
+ KiWiLoader.main(new String[] {});
+ assertThat(stdOut.getLog(), containsString("Cannot import without database connection!"));
+ }
+
+ @Test
+ public void testMain_ConfigNotFound() {
+ exit.expectSystemExitWithStatus(1);
+ KiWiLoader.main(new String[] {"-c", confFile.getAbsolutePath() + ".not-found"});
+ assertThat(stdOut.getLog(), containsString("Could not read system-config.properties:"));
+ }
+
+ @Test
+ public void testMain_FileNotFound() {
+ final String fName = dataFile.getAbsolutePath() + ".not-found";
+ KiWiLoader.main(new String[] {"-c", confFile.getAbsolutePath(), fName});
+ assertThat(stdOut.getLog(), containsString("Could not read file " + fName + ", skipping..."));
+ }
+
+ @Test
+ public void testMain() {
+ KiWiLoader.main(new String[] {"-c", confFile.getAbsolutePath(), "-f", "application/rdf+xml", dataFile.getAbsolutePath()});
+ assertThat(stdOut.getLog(), containsString("Importing " + dataFile.getAbsolutePath()));
+ assertThat(stdOut.getLog(), containsString(String.format("Import completed (%s)", dataFile.getAbsolutePath())));
+ }
+
+ @Test
+ public void testLoadFile() throws RepositoryException, RDFParseException,
+ IOException {
+ KiWiTestLoader loader = new KiWiTestLoader(getKiWiConfig(),
+ "htto://example.com/test/", "htto://example.com/context/");
+ loader.initialize();
+
+ loader.load(dataFile.getAbsolutePath(), RDFFormat.RDFXML, false);
+
+ final RepositoryConnection con = loader.getRepository().getConnection();
+ try {
+ con.begin();
+ testRepoContent(con);
+ con.commit();
+ } finally {
+ if (con.isActive()) {
+ con.rollback();
+ }
+ con.close();
+ }
+ loader.shutdown();
+ }
+
+ @Test
+ public void testLoadFile_GZ() throws RepositoryException, RDFParseException,
+ IOException {
+ File gz = temp.newFile(dataFile.getName() + ".gz");
+ OutputStream os = new GZIPOutputStream(new FileOutputStream(gz));
+ FileInputStream is = new FileInputStream(dataFile);
+ IOUtils.copy(is, os);
+ is.close();
+ os.close();
+
+ KiWiTestLoader loader = new KiWiTestLoader(getKiWiConfig(),
+ "htto://example.com/test/", "htto://example.com/context/");
+ loader.initialize();
+
+ loader.load(gz.getAbsolutePath(), RDFFormat.RDFXML, true);
+
+ final RepositoryConnection con = loader.getRepository().getConnection();
+ try {
+ con.begin();
+ testRepoContent(con);
+ con.commit();
+ } finally {
+ if (con.isActive()) {
+ con.rollback();
+ }
+ con.close();
+ }
+ loader.shutdown();
+ }
+
+
+ private void testRepoContent(RepositoryConnection con) throws RepositoryException {
+ final ValueFactory vf = con.getValueFactory();
+ assertThat(con.size(), CoreMatchers.equalTo(new Long(34)));
+ assertTrue(con.hasStatement(vf.createURI("http://localhost:8080/LMF/resource/hans_meier"), RDF.TYPE, FOAF.Person, true));
+ assertTrue(con.hasStatement(vf.createURI("http://localhost:8080/LMF/resource/sepp_huber"), RDF.TYPE, FOAF.Person, true));
+ assertTrue(con.hasStatement(vf.createURI("http://localhost:8080/LMF/resource/anna_schmidt"), RDF.TYPE, FOAF.Person, true));
+ }
+
+ private KiWiConfiguration getKiWiConfig() {
+ final Properties p = loaderProps;
+ KiWiConfiguration config = new KiWiConfiguration("loader-test",
+ p.getProperty("database.url"), p.getProperty("database.user"),
+ p.getProperty("database.password"), new H2Dialect());
+
+ return config;
+ }
+
+ @Test
+ public void testLoadInputStream() throws RepositoryException, RDFParseException, IOException {
+ KiWiTestLoader loader = new KiWiTestLoader(getKiWiConfig(),
+ "htto://example.com/test/", "htto://example.com/context/");
+ loader.initialize();
+
+ loader.load(new FileInputStream(dataFile), RDFFormat.RDFXML);
+
+ final RepositoryConnection con = loader.getRepository().getConnection();
+ try {
+ con.begin();
+ testRepoContent(con);
+ con.commit();
+ } finally {
+ if (con.isActive()) {
+ con.rollback();
+ }
+ con.close();
+ }
+ loader.shutdown();
+ }
+
+ private static void copyResourceToFile(String resource, File file) throws IOException {
+ final FileOutputStream os = new FileOutputStream(file);
+ IOUtils.copy(KiWiLoaderTest.class.getResourceAsStream(resource), os);
+ os.close();
+ }
+
+ protected static class KiWiTestLoader extends KiWiLoader {
+
+ public KiWiTestLoader(KiWiConfiguration kiwi, String baseUri,
+ String context) {
+ super(kiwi, baseUri, context);
+ }
+
+ public Repository getRepository() {
+ return super.repository;
+ }
+
+ }
+
+
+}
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/91d7773b/libraries/kiwi/kiwi-loader/src/test/resources/logback-test.xml
----------------------------------------------------------------------
diff --git a/libraries/kiwi/kiwi-loader/src/test/resources/logback-test.xml b/libraries/kiwi/kiwi-loader/src/test/resources/logback-test.xml
new file mode 100644
index 0000000..63d73e8
--- /dev/null
+++ b/libraries/kiwi/kiwi-loader/src/test/resources/logback-test.xml
@@ -0,0 +1,28 @@
+<!--
+ ~ 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.
+ -->
+
+<configuration>
+ <appender name="CONSOLE" class="ch.qos.logback.core.ConsoleAppender">
+ <target>System.out</target>
+ <encoder>
+ <pattern>%m%n</pattern>
+ </encoder>
+ </appender>
+ <root level="${root-level:-INFO}">
+ <appender-ref ref="CONSOLE"/>
+ </root>
+</configuration>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/91d7773b/libraries/kiwi/pom.xml
----------------------------------------------------------------------
diff --git a/libraries/kiwi/pom.xml b/libraries/kiwi/pom.xml
index 36cac5b..1006c1c 100644
--- a/libraries/kiwi/pom.xml
+++ b/libraries/kiwi/pom.xml
@@ -135,6 +135,7 @@
<module>kiwi-tripletable</module>
<module>kiwi-versioning</module>
<module>kiwi-reasoner</module>
+ <module>kiwi-loader</module>
</modules>
</project>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/91d7773b/parent/pom.xml
----------------------------------------------------------------------
diff --git a/parent/pom.xml b/parent/pom.xml
index 7ad9039..12d04b6 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -1150,6 +1150,11 @@
</dependency>
<dependency>
<groupId>org.apache.marmotta</groupId>
+ <artifactId>kiwi-reasoner</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.marmotta</groupId>
<artifactId>kiwi-tripletable</artifactId>
<version>${project.version}</version>
</dependency>