You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@marmotta.apache.org by ss...@apache.org on 2014/01/21 12:35:19 UTC
[1/2] git commit: Titan HBase Backends working (MARMOTTA-424)
Updated Branches:
refs/heads/develop 4001e928e -> 512e59cc6
Titan HBase Backends working (MARMOTTA-424)
Project: http://git-wip-us.apache.org/repos/asf/marmotta/repo
Commit: http://git-wip-us.apache.org/repos/asf/marmotta/commit/f94d8f52
Tree: http://git-wip-us.apache.org/repos/asf/marmotta/tree/f94d8f52
Diff: http://git-wip-us.apache.org/repos/asf/marmotta/diff/f94d8f52
Branch: refs/heads/develop
Commit: f94d8f5264a1d1031d375958da62cc7b2475513c
Parents: dc95084
Author: Sebastian Schaffert <ss...@apache.org>
Authored: Tue Jan 21 12:35:01 2014 +0100
Committer: Sebastian Schaffert <ss...@apache.org>
Committed: Tue Jan 21 12:35:01 2014 +0100
----------------------------------------------------------------------
launchers/marmotta-webapp/pom.xml | 58 ++++++++++++++++++++++++++++++++++
1 file changed, 58 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/marmotta/blob/f94d8f52/launchers/marmotta-webapp/pom.xml
----------------------------------------------------------------------
diff --git a/launchers/marmotta-webapp/pom.xml b/launchers/marmotta-webapp/pom.xml
index dbac2c7..3da9064 100644
--- a/launchers/marmotta-webapp/pom.xml
+++ b/launchers/marmotta-webapp/pom.xml
@@ -190,6 +190,64 @@
<profile>
+ <id>titan-hbase</id>
+ <activation>
+ <property>
+ <name>marmotta.backend</name>
+ <value>titan-hbase</value>
+ </property>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.marmotta</groupId>
+ <artifactId>marmotta-backend-titan</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.marmotta</groupId>
+ <artifactId>marmotta-ldcache-file</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>com.thinkaurelius.titan</groupId>
+ <artifactId>titan-hbase</artifactId>
+ <version>0.4.2</version>
+
+ <exclusions>
+ <exclusion>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>servlet-api</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>servlet-api-2.5</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>jsp-2.1</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.mortbay.jetty</groupId>
+ <artifactId>jsp-api-2.1</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+
+
+ </dependencies>
+ </profile>
+
+
+ <profile>
<id>bigdata</id>
<activation>
<property>
[2/2] git commit: Merge remote-tracking branch 'origin/develop' into
develop
Posted by ss...@apache.org.
Merge remote-tracking branch 'origin/develop' into develop
Project: http://git-wip-us.apache.org/repos/asf/marmotta/repo
Commit: http://git-wip-us.apache.org/repos/asf/marmotta/commit/512e59cc
Tree: http://git-wip-us.apache.org/repos/asf/marmotta/tree/512e59cc
Diff: http://git-wip-us.apache.org/repos/asf/marmotta/diff/512e59cc
Branch: refs/heads/develop
Commit: 512e59cc62540c4125cd8a0efe72b15eb888d089
Parents: f94d8f5 4001e92
Author: Sebastian Schaffert <ss...@apache.org>
Authored: Tue Jan 21 12:35:18 2014 +0100
Committer: Sebastian Schaffert <ss...@apache.org>
Committed: Tue Jan 21 12:35:18 2014 +0100
----------------------------------------------------------------------
.../ldclient/ldclient-provider-freebase/pom.xml | 24 ---
.../vigsterkr/freebase/fix/FreebaseFixit.java | 190 -------------------
.../provider/freebase/FreebaseProvider.java | 80 ++++++--
.../test/freebase/TestFreebaseProvider.java | 4 +-
.../ldclient/test/freebase/m.07zqbwz.sparql | 4 +-
.../ldclient/test/freebase/m.0nzm.sparql | 4 +-
.../ldclient/test/freebase/m.0wqhskn.sparql | 4 +-
7 files changed, 72 insertions(+), 238 deletions(-)
----------------------------------------------------------------------