You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stanbol.apache.org by rw...@apache.org on 2014/05/16 13:23:14 UTC

svn commit: r1595158 [3/3] - in /stanbol/branches/release-0.12: commons/ commons/marmotta/ commons/marmotta/kiwi/ commons/marmotta/kiwi/src/ commons/marmotta/kiwi/src/main/ commons/marmotta/kiwi/src/main/java/ commons/marmotta/kiwi/src/main/java/org/ c...

Modified: stanbol/branches/release-0.12/commons/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/branches/release-0.12/commons/pom.xml?rev=1595158&r1=1595157&r2=1595158&view=diff
==============================================================================
--- stanbol/branches/release-0.12/commons/pom.xml (original)
+++ stanbol/branches/release-0.12/commons/pom.xml Fri May 16 11:23:13 2014
@@ -96,6 +96,9 @@
     <module>solr/extras/icu</module> <!-- support for ICU -->
     <module>solr/extras/stempel</module> <!-- support for the Polish stemmer -->
     
+    <!-- Marmotta Kiwi Repository -->
+    <module>marmotta/kiwi</module> <!-- KiWi Triple Store -->
+    
     <!-- Apache Tika Bundle-->
     <module>tikabundle</module>
     

Added: stanbol/branches/release-0.12/launchers/bundlelists/marmotta/kiwi/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/branches/release-0.12/launchers/bundlelists/marmotta/kiwi/pom.xml?rev=1595158&view=auto
==============================================================================
--- stanbol/branches/release-0.12/launchers/bundlelists/marmotta/kiwi/pom.xml (added)
+++ stanbol/branches/release-0.12/launchers/bundlelists/marmotta/kiwi/pom.xml Fri May 16 11:23:13 2014
@@ -0,0 +1,64 @@
+<?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/maven-v4_0_0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.apache.stanbol</groupId>
+    <artifactId>apache-stanbol-bundlelists</artifactId>
+    <version>0.12.1-SNAPSHOT</version>
+    <relativePath>../..</relativePath>
+  </parent>
+  
+  <artifactId>org.apache.stanbol.launchers.bundlelists.marmotta.kiwi</artifactId>
+  <packaging>partialbundlelist</packaging>
+
+  <name>Apache Stanbol Marmotta KiWi Repository Bundles</name>
+  <description>
+    Bundles required by the Apache Marmotta Kiwi Repository. This list includes
+    DB drivers for H2 and Postgres and caching dependencies for Guava and Hazelcast.
+    Dependencies for other supported options (MySQL, Infinispan, EH Cache) are
+    commented. Users that want to use such options will need to create their own
+    version of this bundle list or to provide the commented bundles by some
+    other means.
+  </description>
+
+  <scm>
+    <url>http://www.redlink.at/</url>
+  </scm>
+
+  <build>
+    <plugins>
+      <plugin>
+        <groupId>org.apache.sling</groupId>
+        <artifactId>maven-launchpad-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>attach-bundle-list</id>
+            <goals>
+              <goal>attach-bundle-list</goal>
+            </goals>
+            <configuration>
+              <includeDefaultBundles>false</includeDefaultBundles>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+    </plugins>
+  </build>
+</project>

Added: stanbol/branches/release-0.12/launchers/bundlelists/marmotta/kiwi/src/main/bundles/list.xml
URL: http://svn.apache.org/viewvc/stanbol/branches/release-0.12/launchers/bundlelists/marmotta/kiwi/src/main/bundles/list.xml?rev=1595158&view=auto
==============================================================================
--- stanbol/branches/release-0.12/launchers/bundlelists/marmotta/kiwi/src/main/bundles/list.xml (added)
+++ stanbol/branches/release-0.12/launchers/bundlelists/marmotta/kiwi/src/main/bundles/list.xml Fri May 16 11:23:13 2014
@@ -0,0 +1,202 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ (c) 2013 Redlink GmbH. All rights reserved.
+ -->
+<bundles>
+  <!-- logback logging is used by Sesame and Marmotta -->
+  <startLevel level="10">
+    <bundle>
+      <groupId>ch.qos.logback</groupId>
+      <artifactId>logback-core</artifactId>
+      <version>0.9.30</version> <!-- sesame expects version < 1.0.0 -->
+    </bundle>
+    <bundle>
+      <groupId>ch.qos.logback</groupId>
+      <artifactId>logback-classic</artifactId>
+      <version>0.9.30</version> <!-- sesame expects version < 1.0.0 -->
+    </bundle>
+ </startLevel>
+  
+  <startLevel level="21">
+    <bundle>
+      <groupId>org.apache.geronimo.bundles</groupId>
+      <artifactId>commons-digester</artifactId>
+      <version>1.8_1</version>
+    </bundle>
+    <bundle>
+      <groupId>commons-validator</groupId>
+      <artifactId>commons-validator</artifactId>
+      <version>1.4.0</version>
+    </bundle>
+    <!-- <bundle>  Infinispan Hotrod dependency
+      <groupId>org.apache.avro</groupId>
+      <artifactId>avro</artifactId>
+      <version>1.7.6</version>
+    </bundle>
+    <bundle> - Apache Avro (indirect Infinispan Hotrod) -
+      <groupId>org.apache.servicemix.bundles</groupId>
+      <artifactId>org.apache.servicemix.bundles.paranamer</artifactId>
+      <version>2.6_1</version>
+    </bundle>
+    <bundle> - Infinispan Hotrod dependency -
+      <groupId>org.apache.directory.studio</groupId>
+      <artifactId>org.apache.commons.pool</artifactId>
+      <version>1.6</version>
+    </bundle>  -->
+    <bundle>
+      <groupId>com.fasterxml.uuid</groupId>
+      <artifactId>java-uuid-generator</artifactId>
+      <version>3.1.3</version>
+    </bundle>
+    <bundle> <!-- opencsv version 2.1 -->
+      <groupId>org.ow2.bundles</groupId>
+      <artifactId>ow2-bundles-externals-opencsv</artifactId>
+      <version>1.0.36</version>
+    </bundle>
+    <bundle>
+      <groupId>com.fasterxml.jackson.core</groupId>
+      <artifactId>jackson-core</artifactId>
+      <version>2.3.1</version>
+    </bundle>
+  </startLevel>
+  
+  <startLevel level="5">
+    <bundle>
+      <groupId>org.jboss.spec.javax.transaction</groupId>
+      <artifactId>jboss-transaction-api_1.1_spec</artifactId>
+      <version>1.0.1.Final</version>
+    </bundle>
+  </startLevel>
+  
+  <!-- Marmotta Bundles -->
+  <startLevel level="21">
+    <!-- Kiwi and the entityhub sesame bundles requires Sesame -->
+    <bundle>
+      <groupId>org.openrdf.sesame</groupId>
+      <artifactId>sesame-runtime-osgi</artifactId>
+      <version>2.7.11</version>
+    </bundle>
+    <bundle>
+      <groupId>org.apache.marmotta</groupId>
+      <artifactId>marmotta-commons</artifactId>
+      <version>3.2.0</version>
+    </bundle>
+  </startLevel>
+  
+  <!-- Kiwi Caching dependencies -->
+  <startLevel level="21">
+    <!-- Google Guava Caching -->
+    <!-- Commented as this is already provided by the stanbolcommons bundlelist
+     <bundle>
+       <groupId>com.google.guava</groupId>
+       <artifactId>guava</artifactId>
+       <version>16.0.1</version>
+     </bundle> -->
+    
+    <!-- Hazlecast Caching -->
+    <bundle>
+      <groupId>com.hazelcast</groupId>
+      <artifactId>hazelcast</artifactId>
+      <version>3.1.6</version>
+    </bundle>
+    
+    <!-- EHCache Caching
+    <bundle>
+      <groupId>net.sf.ehcache</groupId>
+      <artifactId>ehcache</artifactId>
+      <version>2.8.2</version>
+    </bundle> -->
+    
+    <!-- Infinispan Caching -->
+    <!-- NOTE: Infinispan has also some additional commons-lib dependencies -->
+    <!-- bundle>
+      <groupId>org.infinispan</groupId>
+      <artifactId>infinispan-core</artifactId>
+      <version>6.0.1.Final</version>
+    </bundle>
+    <bundle>
+      <groupId>org.infinispan</groupId>
+      <artifactId>infinispan-commons</artifactId>
+      <version>6.0.1.Final</version>
+    </bundle>
+    <bundle>
+      <groupId>org.infinispan</groupId>
+      <artifactId>infinispan-client-hotrod</artifactId>
+      <version>6.0.1.Final</version>
+    </bundle>
+    
+    <bundle>
+      <groupId>org.jgroups</groupId>
+      <artifactId>jgroups</artifactId>
+      <version>3.4.1.Final</version>
+    </bundle>
+    <bundle>
+      <groupId>org.apache.servicemix.bundles</groupId>
+      <artifactId>org.apache.servicemix.bundles.javax-inject</artifactId>
+      <version>1_2</version>
+    </bundle>
+    <bundle>
+      <groupId>org.jboss.marshalling</groupId>
+      <artifactId>jboss-marshalling-osgi</artifactId>
+      <version>1.4.2.Final</version>
+    </bundle>
+    <bundle>
+      <groupId>org.jboss.logging</groupId>
+      <artifactId>jboss-logging</artifactId>
+      <version>3.1.3.GA</version>
+    </bundle -->
+    
+  </startLevel>
+
+  <!-- Database driver -->
+  <startLevel level="22">
+    <!-- H2 database -->
+    <bundle>
+      <groupId>com.h2database</groupId>
+      <artifactId>h2</artifactId>
+      <version>1.4.178</version>
+    </bundle>
+    <bundle>
+      <groupId>org.osgi</groupId>
+      <artifactId>org.osgi.enterprise</artifactId>
+      <version>4.2.0</version>
+    </bundle>
+    
+    <!-- Postgres -->
+    <!-- embedded in org.apache.stanbol.commons.marmotta.kiwi -->
+    
+    <!-- MySQL -->
+    <!-- bundle>
+      <groupId>mysql</groupId>
+      <artifactId>mysql-connector-java</artifactId>
+      <version>5.1.21</version>
+    </bundle -->
+  </startLevel>
+
+  <!-- The Redlink Kiwi Repository Service -->
+  <!-- Allows to configure a KiWi Repository and registers the Sesame Repository
+       as OSGI service. -->
+  <startLevel level="28">
+    <bundle>
+      <groupId>org.apache.stanbol</groupId>
+      <artifactId>org.apache.stanbol.commons.marmotta.kiwi</artifactId>
+      <version>0.12.1-SNAPSHOT</version>
+    </bundle>
+  </startLevel>
+  
+  <!-- The Sesame Entityhub support -->
+  <!-- Only required when using the KiWi Repo as backend for the Stanbol Entityhub -->
+  <startLevel level="30">
+    <bundle>
+      <groupId>org.apache.stanbol</groupId>
+      <artifactId>org.apache.stanbol.entityhub.model.sesame</artifactId>
+      <version>0.12.1-SNAPSHOT</version>
+    </bundle>
+    <bundle>
+      <groupId>org.apache.stanbol</groupId>
+      <artifactId>org.apache.stanbol.entityhub.yard.sesame</artifactId>
+      <version>0.12.1-SNAPSHOT</version>
+    </bundle>
+  </startLevel>
+
+</bundles>

Modified: stanbol/branches/release-0.12/launchers/bundlelists/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/branches/release-0.12/launchers/bundlelists/pom.xml?rev=1595158&r1=1595157&r2=1595158&view=diff
==============================================================================
--- stanbol/branches/release-0.12/launchers/bundlelists/pom.xml (original)
+++ stanbol/branches/release-0.12/launchers/bundlelists/pom.xml Fri May 16 11:23:13 2014
@@ -73,6 +73,9 @@
     <module>ontologymanager</module>
     <module>reasoners</module>
     <module>rules</module>
+    
+    <!-- Stanbol Marmotta integration -->
+    <module>marmotta/kiwi</module>
 
     <!-- Specific features -->
     <module>security</module>

Modified: stanbol/branches/release-0.12/launchers/full/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/branches/release-0.12/launchers/full/pom.xml?rev=1595158&r1=1595157&r2=1595158&view=diff
==============================================================================
--- stanbol/branches/release-0.12/launchers/full/pom.xml (original)
+++ stanbol/branches/release-0.12/launchers/full/pom.xml Fri May 16 11:23:13 2014
@@ -255,7 +255,7 @@
       <scope>provided</scope>
     </dependency>
 
-    <!-- Stanbol Entityhub Bundle List -->
+    <!-- Stanbol Entityhub Bundle List(s) -->
     <dependency>
       <groupId>org.apache.stanbol</groupId>
       <artifactId>org.apache.stanbol.launchers.bundlelists.entityhub</artifactId>
@@ -263,6 +263,14 @@
       <type>partialbundlelist</type>
       <scope>provided</scope>
     </dependency>
+    <!-- Marmotta integration with the Entityhub -->
+    <dependency>
+      <groupId>org.apache.stanbol</groupId>
+      <artifactId>org.apache.stanbol.launchers.bundlelists.marmotta.kiwi</artifactId>
+      <version>0.12.1-SNAPSHOT</version>
+      <type>partialbundlelist</type>
+      <scope>provided</scope>
+    </dependency>
 
     <!-- Stanbol Ontology Manager Bundle List -->
     <dependency>