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/19 15:42:05 UTC

svn commit: r1595903 - in /stanbol/trunk: ./ commons/ commons/marmotta/ commons/marmotta/kiwi/ commons/marmotta/kiwi/src/main/java/org/apache/stanbol/commons/marmotta/kiwi/ commons/marmotta/kiwi/src/main/resources/ commons/marmotta/kiwi/src/main/resour...

Author: rwesten
Date: Mon May 19 13:42:04 2014
New Revision: 1595903

URL: http://svn.apache.org/r1595903
Log:
merged STANBOL-1169 and STANBOL-1245 to trunk; Note that the Bundlelist is different as in 1.0.0 an own Entityhub Sesame bundlelist exists

Added:
    stanbol/trunk/commons/marmotta/
      - copied from r1595158, stanbol/branches/release-0.12/commons/marmotta/
    stanbol/trunk/entityhub/yard/sesame/src/main/java/org/apache/stanbol/entityhub/yard/sesame/impl/
      - copied from r1595157, stanbol/branches/release-0.12/entityhub/yard/sesame/src/main/java/org/apache/stanbol/entityhub/yard/sesame/impl/
    stanbol/trunk/entityhub/yard/sesame/src/main/resources/OSGI-INF/
      - copied from r1595157, stanbol/branches/release-0.12/entityhub/yard/sesame/src/main/resources/OSGI-INF/
    stanbol/trunk/launchers/bundlelists/marmotta/
      - copied from r1595158, stanbol/branches/release-0.12/launchers/bundlelists/marmotta/
Modified:
    stanbol/trunk/   (props changed)
    stanbol/trunk/commons/   (props changed)
    stanbol/trunk/commons/marmotta/kiwi/   (props changed)
    stanbol/trunk/commons/marmotta/kiwi/pom.xml
    stanbol/trunk/commons/marmotta/kiwi/src/main/java/org/apache/stanbol/commons/marmotta/kiwi/KiWiRepositoryService.java
    stanbol/trunk/commons/marmotta/kiwi/src/main/resources/jgroups-ec2.xml
    stanbol/trunk/commons/marmotta/kiwi/src/main/resources/jgroups-tcp.xml
    stanbol/trunk/commons/marmotta/kiwi/src/main/resources/jgroups-udp.xml
    stanbol/trunk/commons/marmotta/kiwi/src/main/resources/schema/infinispan-config-6.0.xsd
    stanbol/trunk/commons/pom.xml
    stanbol/trunk/entityhub/   (props changed)
    stanbol/trunk/launchers/   (props changed)
    stanbol/trunk/launchers/bundlelists/entityhub/sesame/src/main/bundles/list.xml
    stanbol/trunk/launchers/bundlelists/marmotta/kiwi/   (props changed)
    stanbol/trunk/launchers/bundlelists/marmotta/kiwi/pom.xml
    stanbol/trunk/launchers/bundlelists/marmotta/kiwi/src/main/bundles/list.xml
    stanbol/trunk/launchers/bundlelists/pom.xml
    stanbol/trunk/launchers/full/pom.xml

Propchange: stanbol/trunk/
------------------------------------------------------------------------------
  Merged /stanbol/branches/release-0.12:r1595157-1595158

Propchange: stanbol/trunk/commons/
------------------------------------------------------------------------------
  Merged /stanbol/branches/release-0.12/commons:r1595158

Propchange: stanbol/trunk/commons/marmotta/kiwi/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Mon May 19 13:42:04 2014
@@ -0,0 +1,7 @@
+target
+
+.settings
+
+.project
+
+.classpath

Modified: stanbol/trunk/commons/marmotta/kiwi/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/trunk/commons/marmotta/kiwi/pom.xml?rev=1595903&r1=1595158&r2=1595903&view=diff
==============================================================================
--- stanbol/trunk/commons/marmotta/kiwi/pom.xml (original)
+++ stanbol/trunk/commons/marmotta/kiwi/pom.xml Mon May 19 13:42:04 2014
@@ -1,14 +1,20 @@
 <?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. -->
+<!-- 
+    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">
 
@@ -17,12 +23,12 @@
     <parent>
       <groupId>org.apache.stanbol</groupId>
       <artifactId>stanbol-parent</artifactId>
-      <version>4.1-SNAPSHOT</version>
+      <version>5-SNAPSHOT</version>
       <relativePath>../../../parent</relativePath>
     </parent>
 
     <artifactId>org.apache.stanbol.commons.marmotta.kiwi</artifactId>
-      <version>0.12.1-SNAPSHOT</version>
+    <version>1.0.0-SNAPSHOT</version>
     <packaging>bundle</packaging>
 
     <name>Marmotta Kiwi Repository Service</name>

Modified: stanbol/trunk/commons/marmotta/kiwi/src/main/java/org/apache/stanbol/commons/marmotta/kiwi/KiWiRepositoryService.java
URL: http://svn.apache.org/viewvc/stanbol/trunk/commons/marmotta/kiwi/src/main/java/org/apache/stanbol/commons/marmotta/kiwi/KiWiRepositoryService.java?rev=1595903&r1=1595158&r2=1595903&view=diff
==============================================================================
--- stanbol/trunk/commons/marmotta/kiwi/src/main/java/org/apache/stanbol/commons/marmotta/kiwi/KiWiRepositoryService.java (original)
+++ stanbol/trunk/commons/marmotta/kiwi/src/main/java/org/apache/stanbol/commons/marmotta/kiwi/KiWiRepositoryService.java Mon May 19 13:42:04 2014
@@ -1,4 +1,20 @@
 package org.apache.stanbol.commons.marmotta.kiwi;
+/*
+* 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.
+*/
 
 import java.util.Arrays;
 import java.util.Dictionary;

Modified: stanbol/trunk/commons/marmotta/kiwi/src/main/resources/jgroups-ec2.xml
URL: http://svn.apache.org/viewvc/stanbol/trunk/commons/marmotta/kiwi/src/main/resources/jgroups-ec2.xml?rev=1595903&r1=1595158&r2=1595903&view=diff
==============================================================================
--- stanbol/trunk/commons/marmotta/kiwi/src/main/resources/jgroups-ec2.xml (original)
+++ stanbol/trunk/commons/marmotta/kiwi/src/main/resources/jgroups-ec2.xml Mon May 19 13:42:04 2014
@@ -1,3 +1,24 @@
+<?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.
+ -->
+<!-- 
+    NOTE: jgroups configuration required by Infinispan Caching Option. Need to 
+    be in this module as otherwise loading this resource in OSGI fails. 
+ -->
 <config xmlns="urn:org:jgroups"
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:schemaLocation="urn:org:jgroups http://www.jgroups.org/schema/JGroups-3.4.xsd">

Modified: stanbol/trunk/commons/marmotta/kiwi/src/main/resources/jgroups-tcp.xml
URL: http://svn.apache.org/viewvc/stanbol/trunk/commons/marmotta/kiwi/src/main/resources/jgroups-tcp.xml?rev=1595903&r1=1595158&r2=1595903&view=diff
==============================================================================
--- stanbol/trunk/commons/marmotta/kiwi/src/main/resources/jgroups-tcp.xml (original)
+++ stanbol/trunk/commons/marmotta/kiwi/src/main/resources/jgroups-tcp.xml Mon May 19 13:42:04 2014
@@ -1,3 +1,24 @@
+<?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.
+ -->
+<!-- 
+    NOTE: jgroups configuration required by Infinispan Caching Option. Need to 
+    be in this module as otherwise loading this resource in OSGI fails. 
+ -->
 <config xmlns="urn:org:jgroups"
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:schemaLocation="urn:org:jgroups http://www.jgroups.org/schema/JGroups-3.4.xsd">

Modified: stanbol/trunk/commons/marmotta/kiwi/src/main/resources/jgroups-udp.xml
URL: http://svn.apache.org/viewvc/stanbol/trunk/commons/marmotta/kiwi/src/main/resources/jgroups-udp.xml?rev=1595903&r1=1595158&r2=1595903&view=diff
==============================================================================
--- stanbol/trunk/commons/marmotta/kiwi/src/main/resources/jgroups-udp.xml (original)
+++ stanbol/trunk/commons/marmotta/kiwi/src/main/resources/jgroups-udp.xml Mon May 19 13:42:04 2014
@@ -1,3 +1,24 @@
+<?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.
+ -->
+<!-- 
+    NOTE: jgroups configuration required by Infinispan Caching Option. Need to 
+    be in this module as otherwise loading this resource in OSGI fails. 
+ -->
 <config xmlns="urn:org:jgroups"
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xsi:schemaLocation="urn:org:jgroups http://www.jgroups.org/schema/JGroups-3.4.xsd">

Modified: stanbol/trunk/commons/marmotta/kiwi/src/main/resources/schema/infinispan-config-6.0.xsd
URL: http://svn.apache.org/viewvc/stanbol/trunk/commons/marmotta/kiwi/src/main/resources/schema/infinispan-config-6.0.xsd?rev=1595903&r1=1595158&r2=1595903&view=diff
==============================================================================
--- stanbol/trunk/commons/marmotta/kiwi/src/main/resources/schema/infinispan-config-6.0.xsd (original)
+++ stanbol/trunk/commons/marmotta/kiwi/src/main/resources/schema/infinispan-config-6.0.xsd Mon May 19 13:42:04 2014
@@ -1,4 +1,24 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<!-- 
+    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.
+ -->
+<!-- 
+    NOTE: Infinispan configuration required by the Infinispan Caching Option. 
+    Need to be in this module as otherwise loading this resource in OSGI fails. 
+ -->
 <xs:schema attributeFormDefault="unqualified" elementFormDefault="qualified" version="1.0" targetNamespace="urn:infinispan:config:6.0" xmlns:tns="urn:infinispan:config:6.0" xmlns:xs="http://www.w3.org/2001/XMLSchema">
 
   <xs:element name="infinispan">

Modified: stanbol/trunk/commons/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/trunk/commons/pom.xml?rev=1595903&r1=1595902&r2=1595903&view=diff
==============================================================================
--- stanbol/trunk/commons/pom.xml (original)
+++ stanbol/trunk/commons/pom.xml Mon May 19 13:42:04 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>
     

Propchange: stanbol/trunk/entityhub/
------------------------------------------------------------------------------
  Merged /stanbol/branches/release-0.12/entityhub:r1595157-1595158

Propchange: stanbol/trunk/launchers/
------------------------------------------------------------------------------
  Merged /stanbol/branches/release-0.12/launchers:r1595158

Modified: stanbol/trunk/launchers/bundlelists/entityhub/sesame/src/main/bundles/list.xml
URL: http://svn.apache.org/viewvc/stanbol/trunk/launchers/bundlelists/entityhub/sesame/src/main/bundles/list.xml?rev=1595903&r1=1595902&r2=1595903&view=diff
==============================================================================
--- stanbol/trunk/launchers/bundlelists/entityhub/sesame/src/main/bundles/list.xml (original)
+++ stanbol/trunk/launchers/bundlelists/entityhub/sesame/src/main/bundles/list.xml Mon May 19 13:42:04 2014
@@ -41,7 +41,7 @@
     <bundle>
       <groupId>com.fasterxml.jackson.core</groupId>
       <artifactId>jackson-core</artifactId>
-      <version>2.3.0</version>
+      <version>2.3.1</version>
     </bundle>
   </startLevel>
   
@@ -50,7 +50,7 @@
     <bundle>
       <groupId>org.openrdf.sesame</groupId>
       <artifactId>sesame-runtime-osgi</artifactId>
-      <version>2.7.8</version>
+      <version>2.7.11</version>
     </bundle>
   </startLevel>
 

Propchange: stanbol/trunk/launchers/bundlelists/marmotta/kiwi/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Mon May 19 13:42:04 2014
@@ -0,0 +1,5 @@
+target
+
+.settings
+
+.project

Modified: stanbol/trunk/launchers/bundlelists/marmotta/kiwi/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/trunk/launchers/bundlelists/marmotta/kiwi/pom.xml?rev=1595903&r1=1595158&r2=1595903&view=diff
==============================================================================
--- stanbol/trunk/launchers/bundlelists/marmotta/kiwi/pom.xml (original)
+++ stanbol/trunk/launchers/bundlelists/marmotta/kiwi/pom.xml Mon May 19 13:42:04 2014
@@ -21,7 +21,7 @@
   <parent>
     <groupId>org.apache.stanbol</groupId>
     <artifactId>apache-stanbol-bundlelists</artifactId>
-    <version>0.12.1-SNAPSHOT</version>
+    <version>1.0.0-SNAPSHOT</version>
     <relativePath>../..</relativePath>
   </parent>
   

Modified: stanbol/trunk/launchers/bundlelists/marmotta/kiwi/src/main/bundles/list.xml
URL: http://svn.apache.org/viewvc/stanbol/trunk/launchers/bundlelists/marmotta/kiwi/src/main/bundles/list.xml?rev=1595903&r1=1595158&r2=1595903&view=diff
==============================================================================
--- stanbol/trunk/launchers/bundlelists/marmotta/kiwi/src/main/bundles/list.xml (original)
+++ stanbol/trunk/launchers/bundlelists/marmotta/kiwi/src/main/bundles/list.xml Mon May 19 13:42:04 2014
@@ -1,21 +1,35 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!--
- (c) 2013 Redlink GmbH. All rights reserved.
+<!-- 
+    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.
  -->
 <bundles>
   <!-- logback logging is used by Sesame and Marmotta -->
+  <!-- commented as this is already provided by the Entityhub Sesame bundlelist
   <startLevel level="10">
     <bundle>
       <groupId>ch.qos.logback</groupId>
       <artifactId>logback-core</artifactId>
-      <version>0.9.30</version> <!-- sesame expects version < 1.0.0 -->
+      <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 -->
+      <version>0.9.30</version> - sesame expects version < 1.0.0 -
     </bundle>
- </startLevel>
+ </startLevel>  -->
   
   <startLevel level="21">
     <bundle>
@@ -48,11 +62,12 @@
       <artifactId>java-uuid-generator</artifactId>
       <version>3.1.3</version>
     </bundle>
-    <bundle> <!-- opencsv version 2.1 -->
+    <!-- sesame dependency provided by the Entityhub Sesame bundlelist 
+    <bundle> 
       <groupId>org.ow2.bundles</groupId>
       <artifactId>ow2-bundles-externals-opencsv</artifactId>
       <version>1.0.36</version>
-    </bundle>
+    </bundle> -->
     <bundle>
       <groupId>com.fasterxml.jackson.core</groupId>
       <artifactId>jackson-core</artifactId>
@@ -70,12 +85,12 @@
   
   <!-- Marmotta Bundles -->
   <startLevel level="21">
-    <!-- Kiwi and the entityhub sesame bundles requires Sesame -->
+    <!-- Sesame is provided by the Entityhub Sesame Bundlelist
     <bundle>
       <groupId>org.openrdf.sesame</groupId>
       <artifactId>sesame-runtime-osgi</artifactId>
       <version>2.7.11</version>
-    </bundle>
+    </bundle>  -->
     <bundle>
       <groupId>org.apache.marmotta</groupId>
       <artifactId>marmotta-commons</artifactId>
@@ -156,7 +171,7 @@
       <artifactId>h2</artifactId>
       <version>1.4.178</version>
     </bundle>
-    <bundle>
+    <bundle> <!-- required by the H2 driver -->
       <groupId>org.osgi</groupId>
       <artifactId>org.osgi.enterprise</artifactId>
       <version>4.2.0</version>
@@ -180,23 +195,28 @@
     <bundle>
       <groupId>org.apache.stanbol</groupId>
       <artifactId>org.apache.stanbol.commons.marmotta.kiwi</artifactId>
-      <version>0.12.1-SNAPSHOT</version>
+      <version>1.0.0-SNAPSHOT</version>
     </bundle>
   </startLevel>
   
   <!-- The Sesame Entityhub support -->
-  <!-- Only required when using the KiWi Repo as backend for the Stanbol Entityhub -->
+  <!-- Use the Entityhub Sesame Bundlelist to provide those
   <startLevel level="30">
     <bundle>
       <groupId>org.apache.stanbol</groupId>
       <artifactId>org.apache.stanbol.entityhub.model.sesame</artifactId>
-      <version>0.12.1-SNAPSHOT</version>
+      <version>1.0.0-SNAPSHOT</version>
     </bundle>
     <bundle>
       <groupId>org.apache.stanbol</groupId>
       <artifactId>org.apache.stanbol.entityhub.yard.sesame</artifactId>
-      <version>0.12.1-SNAPSHOT</version>
+      <version>1.0.0-SNAPSHOT</version>
     </bundle>
-  </startLevel>
-
+    <bundle>
+      <groupId>org.apache.stanbol</groupId>
+      <artifactId>org.apache.stanbol.entityhub.query.sesame</artifactId>
+      <version>1.0.0-SNAPSHOT</version>
+    </bundle>
+  </startLevel> -->
+ 
 </bundles>

Modified: stanbol/trunk/launchers/bundlelists/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/trunk/launchers/bundlelists/pom.xml?rev=1595903&r1=1595902&r2=1595903&view=diff
==============================================================================
--- stanbol/trunk/launchers/bundlelists/pom.xml (original)
+++ stanbol/trunk/launchers/bundlelists/pom.xml Mon May 19 13:42:04 2014
@@ -78,6 +78,9 @@
     <module>ontologymanager</module>
     <module>reasoners</module>
     <module>rules</module> 
+    
+    <!-- Stanbol Marmotta integration -->
+    <module>marmotta/kiwi</module>
 
     <!-- Specific features -->
     <module>security</module>

Modified: stanbol/trunk/launchers/full/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/trunk/launchers/full/pom.xml?rev=1595903&r1=1595902&r2=1595903&view=diff
==============================================================================
--- stanbol/trunk/launchers/full/pom.xml (original)
+++ stanbol/trunk/launchers/full/pom.xml Mon May 19 13:42:04 2014
@@ -261,7 +261,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.core</artifactId>
@@ -283,6 +283,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>1.0.0-SNAPSHOT</version>
+      <type>partialbundlelist</type>
+      <scope>provided</scope>
+    </dependency>
 
     <!-- Stanbol Ontology Manager Bundle List -->
     <dependency>