You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stanbol.apache.org by su...@apache.org on 2012/07/20 15:54:06 UTC
svn commit: r1363778 - in
/incubator/stanbol/branches/contenthub-two-layered-structure/contenthub: ./
bundlelist/src/main/bundles/ defaults/ defaults/src/ defaults/src/main/
defaults/src/main/resources/ defaults/src/main/resources/config/ index/
index/...
Author: suat
Date: Fri Jul 20 13:54:05 2012
New Revision: 1363778
URL: http://svn.apache.org/viewvc?rev=1363778&view=rev
Log:
STANBOL-499: Move default .config files into a separate folder since in case of multiple installing of the index bundle, default configurations were loaded in each install operation.
Added:
incubator/stanbol/branches/contenthub-two-layered-structure/contenthub/defaults/
incubator/stanbol/branches/contenthub-two-layered-structure/contenthub/defaults/pom.xml
incubator/stanbol/branches/contenthub-two-layered-structure/contenthub/defaults/src/
incubator/stanbol/branches/contenthub-two-layered-structure/contenthub/defaults/src/main/
incubator/stanbol/branches/contenthub-two-layered-structure/contenthub/defaults/src/main/resources/
incubator/stanbol/branches/contenthub-two-layered-structure/contenthub/defaults/src/main/resources/README
incubator/stanbol/branches/contenthub-two-layered-structure/contenthub/defaults/src/main/resources/config/
incubator/stanbol/branches/contenthub-two-layered-structure/contenthub/defaults/src/main/resources/config/org.apache.stanbol.commons.solr.managed.impl.ManagedSolrServerImpl-contenthub.config
incubator/stanbol/branches/contenthub-two-layered-structure/contenthub/defaults/src/main/resources/config/org.apache.stanbol.contenthub.index.ldpath.LDPathSemanticIndex-default.config
Removed:
incubator/stanbol/branches/contenthub-two-layered-structure/contenthub/index/src/main/resources/README
incubator/stanbol/branches/contenthub-two-layered-structure/contenthub/index/src/main/resources/config/
Modified:
incubator/stanbol/branches/contenthub-two-layered-structure/contenthub/bundlelist/src/main/bundles/list.xml
incubator/stanbol/branches/contenthub-two-layered-structure/contenthub/index/pom.xml
incubator/stanbol/branches/contenthub-two-layered-structure/contenthub/index/src/main/java/org/apache/stanbol/contenthub/index/ldpath/LDPathSemanticIndex.java
incubator/stanbol/branches/contenthub-two-layered-structure/contenthub/pom.xml
Modified: incubator/stanbol/branches/contenthub-two-layered-structure/contenthub/bundlelist/src/main/bundles/list.xml
URL: http://svn.apache.org/viewvc/incubator/stanbol/branches/contenthub-two-layered-structure/contenthub/bundlelist/src/main/bundles/list.xml?rev=1363778&r1=1363777&r2=1363778&view=diff
==============================================================================
--- incubator/stanbol/branches/contenthub-two-layered-structure/contenthub/bundlelist/src/main/bundles/list.xml (original)
+++ incubator/stanbol/branches/contenthub-two-layered-structure/contenthub/bundlelist/src/main/bundles/list.xml Fri Jul 20 13:54:05 2012
@@ -53,6 +53,11 @@
<version>0.10.0-incubating-SNAPSHOT</version>
</bundle>
<bundle>
+ <groupId>org.apache.stanbol</groupId>
+ <artifactId>org.apache.stanbol.contenthub.defaults</artifactId>
+ <version>0.10.0-incubating-SNAPSHOT</version>
+ </bundle>
+ <bundle>
<groupId>org.apache.sling</groupId>
<artifactId>org.apache.sling.junit.core</artifactId>
<version>1.0.6</version>
Added: incubator/stanbol/branches/contenthub-two-layered-structure/contenthub/defaults/pom.xml
URL: http://svn.apache.org/viewvc/incubator/stanbol/branches/contenthub-two-layered-structure/contenthub/defaults/pom.xml?rev=1363778&view=auto
==============================================================================
--- incubator/stanbol/branches/contenthub-two-layered-structure/contenthub/defaults/pom.xml (added)
+++ incubator/stanbol/branches/contenthub-two-layered-structure/contenthub/defaults/pom.xml Fri Jul 20 13:54:05 2012
@@ -0,0 +1,68 @@
+<?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>org.apache.stanbol.contenthub.parent</artifactId>
+ <version>0.10.0-incubating-SNAPSHOT</version>
+ <relativePath>../parent</relativePath>
+ </parent>
+
+ <artifactId>org.apache.stanbol.contenthub.defaults</artifactId>
+ <packaging>bundle</packaging>
+
+ <name>Apache Stanbol Contenthub Defaults</name>
+ <description>This bundle provides the default configurations for the Apache Stanbol Contenthub modules. </description>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <extensions>true</extensions>
+ <configuration>
+ <instructions>
+ <Install-Path>config</Install-Path>
+ </instructions>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-scr-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.rat</groupId>
+ <artifactId>apache-rat-plugin</artifactId>
+ <configuration>
+ <excludes>
+ <!-- AL20 licensed -->
+ <exclude>src/license/THIRD-PARTY.properties</exclude>
+
+ <!-- AL20 licensed files. See src/main/resources/README -->
+ <exclude>src/main/resources/config/org.apache.stanbol.contenthub.index.ldpath.LDPathSemanticIndex-default.config</exclude>
+ <exclude>src/main/resources/config/org.apache.stanbol.commons.solr.managed.impl.ManagedSolrServerImpl-contenthub.config</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
Added: incubator/stanbol/branches/contenthub-two-layered-structure/contenthub/defaults/src/main/resources/README
URL: http://svn.apache.org/viewvc/incubator/stanbol/branches/contenthub-two-layered-structure/contenthub/defaults/src/main/resources/README?rev=1363778&view=auto
==============================================================================
--- incubator/stanbol/branches/contenthub-two-layered-structure/contenthub/defaults/src/main/resources/README (added)
+++ incubator/stanbol/branches/contenthub-two-layered-structure/contenthub/defaults/src/main/resources/README Fri Jul 20 13:54:05 2012
@@ -0,0 +1,20 @@
+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.
+
+The following files are provided under the Apache License, Version 2.0:
+
+config/org.apache.stanbol.commons.solr.managed.impl.ManagedSolrServerImpl-contenthub.config
+config/org.apache.stanbol.contenthub.index.ldpath.LDPathSemanticIndex-default.config
+
Added: incubator/stanbol/branches/contenthub-two-layered-structure/contenthub/defaults/src/main/resources/config/org.apache.stanbol.commons.solr.managed.impl.ManagedSolrServerImpl-contenthub.config
URL: http://svn.apache.org/viewvc/incubator/stanbol/branches/contenthub-two-layered-structure/contenthub/defaults/src/main/resources/config/org.apache.stanbol.commons.solr.managed.impl.ManagedSolrServerImpl-contenthub.config?rev=1363778&view=auto
==============================================================================
--- incubator/stanbol/branches/contenthub-two-layered-structure/contenthub/defaults/src/main/resources/config/org.apache.stanbol.commons.solr.managed.impl.ManagedSolrServerImpl-contenthub.config (added)
+++ incubator/stanbol/branches/contenthub-two-layered-structure/contenthub/defaults/src/main/resources/config/org.apache.stanbol.commons.solr.managed.impl.ManagedSolrServerImpl-contenthub.config Fri Jul 20 13:54:05 2012
@@ -0,0 +1,3 @@
+org.apache.solr.core.CoreContainer.name="contenthub"
+service.ranking=I"0"
+org.apache.solr.core.CoreContainer.publishREST=B"true"
\ No newline at end of file
Added: incubator/stanbol/branches/contenthub-two-layered-structure/contenthub/defaults/src/main/resources/config/org.apache.stanbol.contenthub.index.ldpath.LDPathSemanticIndex-default.config
URL: http://svn.apache.org/viewvc/incubator/stanbol/branches/contenthub-two-layered-structure/contenthub/defaults/src/main/resources/config/org.apache.stanbol.contenthub.index.ldpath.LDPathSemanticIndex-default.config?rev=1363778&view=auto
==============================================================================
--- incubator/stanbol/branches/contenthub-two-layered-structure/contenthub/defaults/src/main/resources/config/org.apache.stanbol.contenthub.index.ldpath.LDPathSemanticIndex-default.config (added)
+++ incubator/stanbol/branches/contenthub-two-layered-structure/contenthub/defaults/src/main/resources/config/org.apache.stanbol.contenthub.index.ldpath.LDPathSemanticIndex-default.config Fri Jul 20 13:54:05 2012
@@ -0,0 +1,28 @@
+Semantic-Index-Name="contenthub"
+Semantic-Index-Description="Default\ instance\ for\ the\ LDPathSemanticIndex"
+org.apache.stanbol.contenthub.index.ldpath.LDPathSemanticIndex.ldPathProgram="@prefix\ dbp-ont:\ <http://dbpedia.org/ontology/>;\
+@prefix\ dbp-prop:\ <http://dbpedia.org/property/>;\
+@prefix\ foaf\ :\ <http://xmlns.com/foaf/0.1/>;\
+\
+persons\ \=\ .[rdf:type\ is\ dbp-ont:Person]\ ::\ xsd:anyURI\ (termVectors\=\"true\");\
+persons_known_fors\ \=\ dbp-prop:knownFor\ |\ dbp-prop:knownFor/rdfs:label\ ::\ xsd:string;\
+persons_birth_places\ \=\ dbp-ont:birthPlace/rdfs:label\ |\ dbp-prop:placeOfBirth/rdfs:label\ ::\ xsd:string;\
+persons_work_instutions\ \=\ dbp-prop:workInstitutions/rdfs:label\ ::\ xsd:string;\
+\
+organizations\ \=\ .[rdf:type\ is\ dbp-ont:Organization]\ ::\ xsd:anyURI\ (termVectors\=\"true\");\
+\
+places\ \=\ .[rdf:type\ is\ dbp-ont:Place]\ ::\ xsd:anyURI\ (termVectors\=\"true\");\
+place_countries\ \=\ dbp-ont:country/rdfs:label\ ::\ xsd:string;\
+place_regions\ \=\ dbp-ont:region/rdfs:label\ |\ ^dbp-ont:region/rdfs:label\ |\ dbp-prop:region/rdfs:label\ |\ ^dbp-prop:region/rdfs:label::\ xsd:string;\
+place_capitals\ \=\ dbp-ont:capital/rdfs:label\ ::\ xsd:string;\
+place_governors\ \=\ dbp-prop:governer/rdfs:label\ ::\ xsd:string;\
+place_largest_cities\ \=\ dbp-ont:largestCity/rdfs:label\ ::\ xsd:string;\
+place_leaders\ \=\ dbp-prop:leaderName/rdfs:label\ |\ dbp-ont:leader/rdfs:label\ ::\ xsd:string;\
+\
+entity_given_names\ \=\ foaf:givenName\ ::\ xsd:string;\
+entity_captions\ \=\ dbp-prop:caption\ ::\ xsd:string;"
+org.apache.stanbol.contenthub.index.ldpath.LDPathSemanticIndex.indexContent=B"true"
+org.apache.stanbol.contenthub.index.ldpath.LDPathSemanticIndex.batchSize=I"10"
+org.apache.stanbol.contenthub.index.ldpath.LDPathSemanticIndex.storeCheckPeriod=I"5"
+org.apache.stanbol.contenthub.index.ldpath.LDPathSemanticIndex.solrCheckTime=I"5"
+service.ranking=I"0"
\ No newline at end of file
Modified: incubator/stanbol/branches/contenthub-two-layered-structure/contenthub/index/pom.xml
URL: http://svn.apache.org/viewvc/incubator/stanbol/branches/contenthub-two-layered-structure/contenthub/index/pom.xml?rev=1363778&r1=1363777&r2=1363778&view=diff
==============================================================================
--- incubator/stanbol/branches/contenthub-two-layered-structure/contenthub/index/pom.xml (original)
+++ incubator/stanbol/branches/contenthub-two-layered-structure/contenthub/index/pom.xml Fri Jul 20 13:54:05 2012
@@ -38,30 +38,11 @@
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<extensions>true</extensions>
- <configuration>
- <instructions>
- <Install-Path>config</Install-Path>
- </instructions>
- </configuration>
</plugin>
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-scr-plugin</artifactId>
</plugin>
- <plugin>
- <groupId>org.apache.rat</groupId>
- <artifactId>apache-rat-plugin</artifactId>
- <configuration>
- <excludes>
- <!-- AL20 licensed -->
- <exclude>src/license/THIRD-PARTY.properties</exclude>
-
- <!-- AL20 licensed files. See src/main/resources/README -->
- <exclude>src/main/resources/config/org.apache.stanbol.contenthub.index.ldpath.LDPathSemanticIndex-default.config</exclude>
- <exclude>src/main/resources/config/org.apache.stanbol.commons.solr.managed.impl.ManagedSolrServerImpl-contenthub.config</exclude>
- </excludes>
- </configuration>
- </plugin>
</plugins>
</build>
<dependencies>
Modified: incubator/stanbol/branches/contenthub-two-layered-structure/contenthub/index/src/main/java/org/apache/stanbol/contenthub/index/ldpath/LDPathSemanticIndex.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/branches/contenthub-two-layered-structure/contenthub/index/src/main/java/org/apache/stanbol/contenthub/index/ldpath/LDPathSemanticIndex.java?rev=1363778&r1=1363777&r2=1363778&view=diff
==============================================================================
--- incubator/stanbol/branches/contenthub-two-layered-structure/contenthub/index/src/main/java/org/apache/stanbol/contenthub/index/ldpath/LDPathSemanticIndex.java (original)
+++ incubator/stanbol/branches/contenthub-two-layered-structure/contenthub/index/src/main/java/org/apache/stanbol/contenthub/index/ldpath/LDPathSemanticIndex.java Fri Jul 20 13:54:05 2012
@@ -897,7 +897,7 @@ public class LDPathSemanticIndex impleme
@Override
public void run() {
while (!deactivate) {
- logger.debug("Pooling thread for index: {} will check the changes", name);
+ logger.info("Pooling thread for index: {} will check the changes", name);
// if the polling thread is interrupted i.e the parent index component is deactivated,
// stop polling
if (Thread.currentThread().isInterrupted()) {
@@ -951,7 +951,7 @@ public class LDPathSemanticIndex impleme
try {
Thread.sleep(1000 * storeCheckPeriod);
} catch (InterruptedException e) {
- logger.error(
+ logger.info(
"Store Checker for index: {} is interrupted while sleeping. Closing the thread", name);
return;
}
Modified: incubator/stanbol/branches/contenthub-two-layered-structure/contenthub/pom.xml
URL: http://svn.apache.org/viewvc/incubator/stanbol/branches/contenthub-two-layered-structure/contenthub/pom.xml?rev=1363778&r1=1363777&r2=1363778&view=diff
==============================================================================
--- incubator/stanbol/branches/contenthub-two-layered-structure/contenthub/pom.xml (original)
+++ incubator/stanbol/branches/contenthub-two-layered-structure/contenthub/pom.xml Fri Jul 20 13:54:05 2012
@@ -44,6 +44,7 @@
<module>search/related</module>
<module>index</module>
<module>web</module>
+ <module>defaults</module>
<module>test</module>
<module>bundlelist</module>
</modules>