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 2012/03/12 11:21:55 UTC
svn commit: r1299614 - in /incubator/stanbol/trunk: ./ commons/ commons/nlp/
commons/solr/defaults/ commons/solr/defaults/src/
commons/solr/defaults/src/main/ commons/solr/defaults/src/main/resources/
commons/solr/defaults/src/main/resources/config/ da...
Author: rwesten
Date: Mon Mar 12 10:21:53 2012
New Revision: 1299614
URL: http://svn.apache.org/viewvc?rev=1299614&view=rev
Log:
STANBOL-529: Changed configuration as described by the Issue
Added component default configurations for
* commons solr
* enhancer
* entityhub
* data/defaultconfig: The default config for the Apache Stanbol Launchers
Added bundlelists
* data/bundlelists/defaultdata: the old data/bundlelist
* data/bundlelists/opennlp: bundlelist that contains OpenNLP models for all available models
Removed
* All configurations from all the launchers
Config changes
* removed the named entity linking engine for the Entityhub
* added a keyword extraction engine for the Entityhub
* added (for now) the "data/bundlelists/opennlp" bundle list to the full launcher (see http://markmail.org/message/i46emxf6c2hwibmq)
* adapted the list of expected engines in the integration tests
Other changes
* changed all remaining httpcore httpclient depencendies to the bundle variants httpcore-osgi and httpclient-osgi
Added:
incubator/stanbol/trunk/commons/nlp/
incubator/stanbol/trunk/commons/solr/defaults/ (with props)
incubator/stanbol/trunk/commons/solr/defaults/README.md
incubator/stanbol/trunk/commons/solr/defaults/pom.xml (with props)
incubator/stanbol/trunk/commons/solr/defaults/src/
incubator/stanbol/trunk/commons/solr/defaults/src/main/
incubator/stanbol/trunk/commons/solr/defaults/src/main/resources/
incubator/stanbol/trunk/commons/solr/defaults/src/main/resources/README
incubator/stanbol/trunk/commons/solr/defaults/src/main/resources/config/
incubator/stanbol/trunk/commons/solr/defaults/src/main/resources/config/org.apache.sling.commons.log.LogManager.factory.config-solrlogconfig.config
incubator/stanbol/trunk/commons/solr/defaults/src/main/resources/config/org.apache.stanbol.commons.solr.managed.impl.ManagedSolrServerImpl-default.config
incubator/stanbol/trunk/data/bundlelists/
incubator/stanbol/trunk/data/bundlelists/defaultdata/
- copied from r1297222, incubator/stanbol/trunk/data/bundlelist/
incubator/stanbol/trunk/data/bundlelists/opennlp/ (with props)
incubator/stanbol/trunk/data/bundlelists/opennlp/pom.xml (with props)
incubator/stanbol/trunk/data/bundlelists/opennlp/src/
incubator/stanbol/trunk/data/bundlelists/opennlp/src/main/
incubator/stanbol/trunk/data/bundlelists/opennlp/src/main/bundles/
incubator/stanbol/trunk/data/defaultconfig/ (with props)
incubator/stanbol/trunk/data/defaultconfig/src/
incubator/stanbol/trunk/data/defaultconfig/src/main/
incubator/stanbol/trunk/data/defaultconfig/src/main/resources/
incubator/stanbol/trunk/data/defaultconfig/src/main/resources/README
incubator/stanbol/trunk/data/defaultconfig/src/main/resources/config/
incubator/stanbol/trunk/data/defaultconfig/src/main/resources/config/org.apache.stanbol.enhancer.chain.weighted.impl.WeightedChain-language.config
incubator/stanbol/trunk/data/defaultconfig/src/main/resources/config/org.apache.stanbol.enhancer.engines.keywordextraction.engine.KeywordLinkingEngine-entityhub.config
incubator/stanbol/trunk/enhancer/defaults/ (with props)
incubator/stanbol/trunk/enhancer/defaults/src/
incubator/stanbol/trunk/enhancer/defaults/src/main/
incubator/stanbol/trunk/enhancer/defaults/src/main/resources/
incubator/stanbol/trunk/enhancer/defaults/src/main/resources/config/
incubator/stanbol/trunk/enhancer/defaults/src/main/resources/config/org.apache.felix.eventadmin.impl.EventAdmin.cfg
incubator/stanbol/trunk/enhancer/defaults/src/main/resources/config/org.apache.stanbol.enhancer.engines.opennlp.impl.NamedEntityExtractionEnhancementEngine-default.config
incubator/stanbol/trunk/entityhub/defaults/ (with props)
incubator/stanbol/trunk/entityhub/defaults/README.md
incubator/stanbol/trunk/entityhub/defaults/pom.xml (with props)
incubator/stanbol/trunk/entityhub/defaults/src/
incubator/stanbol/trunk/entityhub/defaults/src/main/
incubator/stanbol/trunk/entityhub/defaults/src/main/resources/
incubator/stanbol/trunk/entityhub/defaults/src/main/resources/README
incubator/stanbol/trunk/entityhub/defaults/src/main/resources/config/
Removed:
incubator/stanbol/trunk/data/bundlelist/
incubator/stanbol/trunk/launchers/full-war/src/main/webapp/WEB-INF/README
incubator/stanbol/trunk/launchers/full-war/src/main/webapp/WEB-INF/resources/config/org.apache.felix.eventadmin.impl.EventAdmin.cfg
incubator/stanbol/trunk/launchers/full-war/src/main/webapp/WEB-INF/resources/config/org.apache.stanbol.enhancer.chain.weighted.impl.WeightedChain-language.config
incubator/stanbol/trunk/launchers/full-war/src/main/webapp/WEB-INF/resources/config/org.apache.stanbol.enhancer.engines.entitytagging.impl.NamedEntityTaggingEngine-local.config
incubator/stanbol/trunk/launchers/full-war/src/main/webapp/WEB-INF/resources/config/org.apache.stanbol.enhancer.engines.opennlp.impl.NamedEntityExtractionEnhancementEngine-default.config
incubator/stanbol/trunk/launchers/full/src/main/resources/README
incubator/stanbol/trunk/launchers/full/src/main/resources/resources/config/org.apache.felix.eventadmin.impl.EventAdmin.cfg
incubator/stanbol/trunk/launchers/full/src/main/resources/resources/config/org.apache.stanbol.enhancer.chain.weighted.impl.WeightedChain-language.config
incubator/stanbol/trunk/launchers/full/src/main/resources/resources/config/org.apache.stanbol.enhancer.engines.entitytagging.impl.NamedEntityTaggingEngine-local.config
incubator/stanbol/trunk/launchers/full/src/main/resources/resources/config/org.apache.stanbol.enhancer.engines.opennlp.impl.NamedEntityExtractionEnhancementEngine-default.config
incubator/stanbol/trunk/launchers/full/src/main/resources/resources/config/org.apache.stanbol.enhancer.engines.refactor.RefactorEnhancementEngine.config_deactivated
incubator/stanbol/trunk/launchers/kres/src/main/resources/resources/config/org.apache.felix.eventadmin.impl.EventAdmin.cfg
incubator/stanbol/trunk/launchers/kres/src/main/resources/resources/config/org.apache.stanbol.enhancer.engines.entitytagging.impl.NamedEntityTaggingEngine-local.config
incubator/stanbol/trunk/launchers/kres/src/main/resources/resources/config/org.apache.stanbol.enhancer.engines.opennlp.impl.NamedEntityExtractionEnhancementEngine-default.config
incubator/stanbol/trunk/launchers/stable/src/main/resources/README
incubator/stanbol/trunk/launchers/stable/src/main/resources/resources/config/org.apache.felix.eventadmin.impl.EventAdmin.cfg
incubator/stanbol/trunk/launchers/stable/src/main/resources/resources/config/org.apache.stanbol.enhancer.chain.weighted.impl.WeightedChain-language.config
incubator/stanbol/trunk/launchers/stable/src/main/resources/resources/config/org.apache.stanbol.enhancer.engines.entitytagging.impl.NamedEntityTaggingEngine-local.config
incubator/stanbol/trunk/launchers/stable/src/main/resources/resources/config/org.apache.stanbol.enhancer.engines.opennlp.impl.NamedEntityExtractionEnhancementEngine-default.config
Modified:
incubator/stanbol/trunk/commons/pom.xml
incubator/stanbol/trunk/data/README.md
incubator/stanbol/trunk/data/bundlelists/defaultdata/pom.xml
incubator/stanbol/trunk/data/bundlelists/defaultdata/src/main/bundles/list.xml
incubator/stanbol/trunk/data/pom.xml
incubator/stanbol/trunk/enhancer/bundlelist/src/main/bundles/list.xml
incubator/stanbol/trunk/enhancer/pom.xml
incubator/stanbol/trunk/entityhub/bundlelist/src/main/bundles/list.xml
incubator/stanbol/trunk/entityhub/pom.xml
incubator/stanbol/trunk/integration-tests/src/test/java/org/apache/stanbol/enhancer/it/EnhancerTestBase.java
incubator/stanbol/trunk/launchers/bundlelists/stanbolcommons/src/main/bundles/list.xml
incubator/stanbol/trunk/launchers/full-war/pom.xml
incubator/stanbol/trunk/launchers/full-war/src/main/bundles/list.xml
incubator/stanbol/trunk/launchers/full-war/src/main/webapp/WEB-INF/resources/config/org.apache.stanbol.examples.ExampleBootstrapConfig.cfg
incubator/stanbol/trunk/launchers/full/pom.xml
incubator/stanbol/trunk/launchers/full/src/main/bundles/list.xml
incubator/stanbol/trunk/launchers/full/src/main/resources/resources/config/org.apache.stanbol.examples.ExampleBootstrapConfig.cfg
incubator/stanbol/trunk/launchers/kres/pom.xml
incubator/stanbol/trunk/launchers/kres/src/main/resources/resources/config/org.apache.stanbol.examples.ExampleBootstrapConfig.cfg
incubator/stanbol/trunk/launchers/stable/pom.xml
incubator/stanbol/trunk/launchers/stable/src/main/bundles/list.xml
incubator/stanbol/trunk/launchers/stable/src/main/resources/resources/config/org.apache.stanbol.examples.ExampleBootstrapConfig.cfg
incubator/stanbol/trunk/parent/pom.xml
incubator/stanbol/trunk/pom.xml
incubator/stanbol/trunk/reasoners/test/pom.xml
Modified: incubator/stanbol/trunk/commons/pom.xml
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/commons/pom.xml?rev=1299614&r1=1299613&r2=1299614&view=diff
==============================================================================
--- incubator/stanbol/trunk/commons/pom.xml (original)
+++ incubator/stanbol/trunk/commons/pom.xml Mon Mar 12 10:21:53 2012
@@ -52,6 +52,7 @@
<module>solr/managed</module>
<module>solr/web</module>
<module>solr/install</module>
+ <module>solr/defaults</module>
<module>owl</module>
<module>indexedgraph</module>
<module>ldpath/clerezza</module>
Propchange: incubator/stanbol/trunk/commons/solr/defaults/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Mon Mar 12 10:21:53 2012
@@ -0,0 +1,7 @@
+.settings
+
+.project
+
+.classpath
+
+target
Added: incubator/stanbol/trunk/commons/solr/defaults/README.md
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/commons/solr/defaults/README.md?rev=1299614&view=auto
==============================================================================
--- incubator/stanbol/trunk/commons/solr/defaults/README.md (added)
+++ incubator/stanbol/trunk/commons/solr/defaults/README.md Mon Mar 12 10:21:53 2012
@@ -0,0 +1,46 @@
+<!--
+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.
+-->
+
+Apache Stanbol Commons Solr defaults
+====================================
+
+This artifacts provides the default configuration for Stanbol Commons Solr.
+It depends on the
+
+ org.apache.stanbol.commons.installer.bundleprovider
+
+to be available as this module is used to actually load the provided configuration.
+
+This [STANBOL-529](https://issues.apache.org/jira/browse/STANBOL-529) for more details.
+
+## Default ManagedSolrServer configuration
+
+This includes a configuration for a ManagedSolrServer with the name "default"
+and a "service.ranking" of Integer.MAX_VALUE. This ensures that this instance is
+used as default ManagedSolrServer.
+
+The included configuration also enables the publishing of the RESTful interface
+by the SolrPublishingComponnt. This means that the RESTful API of all Solr cores
+running on the default ManagedSolrServer will be published at
+
+ http:{host}:{port}/solr/{core-name}
+
+
+## Sling logger configuration for Apache Solr
+
+As Apache Solr provides a lot og INFO level logging this includes a configuration
+for the Apache Sling LogManager that sets the default log level for
+Apache Solr to WARN.
+
+Users that do not run Apache Stanbol with an Sling Launcher will need to provide
+there own logger configuration. This configuration will be ignored in such
+cases.
\ No newline at end of file
Added: incubator/stanbol/trunk/commons/solr/defaults/pom.xml
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/commons/solr/defaults/pom.xml?rev=1299614&view=auto
==============================================================================
--- incubator/stanbol/trunk/commons/solr/defaults/pom.xml (added)
+++ incubator/stanbol/trunk/commons/solr/defaults/pom.xml Mon Mar 12 10:21:53 2012
@@ -0,0 +1,84 @@
+<?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>stanbol-parent</artifactId>
+ <version>0.9.0-incubating-SNAPSHOT</version>
+ <relativePath>../../../parent</relativePath>
+ </parent>
+
+ <groupId>org.apache.stanbol</groupId>
+ <artifactId>org.apache.stanbol.commons.solr.defaults</artifactId>
+ <packaging>bundle</packaging>
+
+ <name>Apache Stanbol Commons Solr Defauts</name>
+ <description>This bundle provides the default configuration for the
+ Apache Stanbol Commones Sorlr modules.
+ </description>
+
+ <inceptionYear>2010</inceptionYear>
+
+ <scm>
+ <connection>
+ scm:svn:http://svn.apache.org/repos/asf/incubator/stanbol/trunk/commons/solr/defaults
+ </connection>
+ <developerConnection>
+ scm:svn:https://svn.apache.org/repos/asf/incubator/stanbol/trunk/commons/solr/defaults
+ </developerConnection>
+ <url>http://incubator.apache.org/stanbol</url>
+ </scm>
+
+ <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 files. See src/main/resources/README -->
+ <exclude>src/main/resources/config/org.apache.stanbol.commons.solr.managed.impl.ManagedSolrServerImpl-default.config</exclude>
+ <exclude>src/main/resources/config/org.apache.sling.commons.log.LogManager.factory.config-solrlogconfig.config</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+ <dependencies>
+ <!-- no dependencies - just configs -->
+ </dependencies>
+
+</project>
Propchange: incubator/stanbol/trunk/commons/solr/defaults/pom.xml
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: incubator/stanbol/trunk/commons/solr/defaults/src/main/resources/README
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/commons/solr/defaults/src/main/resources/README?rev=1299614&view=auto
==============================================================================
--- incubator/stanbol/trunk/commons/solr/defaults/src/main/resources/README (added)
+++ incubator/stanbol/trunk/commons/solr/defaults/src/main/resources/README Mon Mar 12 10:21:53 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-default.config
+config/org.apache.sling.commons.log.LogManager.factory.config-solrlogconfig.config
+
Added: incubator/stanbol/trunk/commons/solr/defaults/src/main/resources/config/org.apache.sling.commons.log.LogManager.factory.config-solrlogconfig.config
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/commons/solr/defaults/src/main/resources/config/org.apache.sling.commons.log.LogManager.factory.config-solrlogconfig.config?rev=1299614&view=auto
==============================================================================
--- incubator/stanbol/trunk/commons/solr/defaults/src/main/resources/config/org.apache.sling.commons.log.LogManager.factory.config-solrlogconfig.config (added)
+++ incubator/stanbol/trunk/commons/solr/defaults/src/main/resources/config/org.apache.sling.commons.log.LogManager.factory.config-solrlogconfig.config Mon Mar 12 10:21:53 2012
@@ -0,0 +1,4 @@
+org.apache.sling.commons.log.pattern="{0,date,dd.MM.yyyy\ HH:mm:ss.SSS}\ *{4}*\ [{2}]\ {3}\ {5}"
+org.apache.sling.commons.log.names=["org.apache.solr"]
+org.apache.sling.commons.log.level="warn"
+org.apache.sling.commons.log.file="logs/error.log"
\ No newline at end of file
Added: incubator/stanbol/trunk/commons/solr/defaults/src/main/resources/config/org.apache.stanbol.commons.solr.managed.impl.ManagedSolrServerImpl-default.config
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/commons/solr/defaults/src/main/resources/config/org.apache.stanbol.commons.solr.managed.impl.ManagedSolrServerImpl-default.config?rev=1299614&view=auto
==============================================================================
--- incubator/stanbol/trunk/commons/solr/defaults/src/main/resources/config/org.apache.stanbol.commons.solr.managed.impl.ManagedSolrServerImpl-default.config (added)
+++ incubator/stanbol/trunk/commons/solr/defaults/src/main/resources/config/org.apache.stanbol.commons.solr.managed.impl.ManagedSolrServerImpl-default.config Mon Mar 12 10:21:53 2012
@@ -0,0 +1,3 @@
+org.apache.solr.core.CoreContainer.name="default"
+service.ranking=I"2147483647"
+org.apache.solr.core.CoreContainer.publishREST=B"true"
Modified: incubator/stanbol/trunk/data/README.md
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/data/README.md?rev=1299614&r1=1299613&r2=1299614&view=diff
==============================================================================
--- incubator/stanbol/trunk/data/README.md (original)
+++ incubator/stanbol/trunk/data/README.md Mon Mar 12 10:21:53 2012
@@ -17,12 +17,21 @@
# Data files and configurations for Stanbol
-This source repository holds artifacts that are used to load
+## Introduction
-* OSGI configurations and/or
-* data files
+This source repository holds artifacts that are used to provide
-to a Stanbol Environment.
+* data files (NER models, Entity data ...)
+* configurations of stanbol components or well known datasets, spefic domains
+* bundlelists as used by the Apache Sling to easily add multiple bunldes to
+ launchers.
+
+This also contains the default configuration used with the default Stanbol
+Launchers.
+Generally this is a good place for users that want to build their own launcher
+to look for examples.
+
+## Management of Data Files
To avoid loading subversion repository with large binary files this artifacts
are typically not included but need to be build/precomputed or downloaded
Modified: incubator/stanbol/trunk/data/bundlelists/defaultdata/pom.xml
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/data/bundlelists/defaultdata/pom.xml?rev=1299614&r1=1297222&r2=1299614&view=diff
==============================================================================
--- incubator/stanbol/trunk/data/bundlelists/defaultdata/pom.xml (original)
+++ incubator/stanbol/trunk/data/bundlelists/defaultdata/pom.xml Mon Mar 12 10:21:53 2012
@@ -18,14 +18,14 @@
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.data.parent</artifactId>
<version>0.9.0-incubating-SNAPSHOT</version>
- <relativePath>../parent</relativePath>
+ <relativePath>../../parent</relativePath>
</parent>
<groupId>org.apache.stanbol</groupId>
- <artifactId>org.apache.stanbol.data.bundlelist</artifactId>
+ <artifactId>org.apache.stanbol.data.bundlelists.defaultdata</artifactId>
<packaging>partialbundlelist</packaging>
- <name>Apache Stanbol Data Bundle List</name>
+ <name>Apache Stanbol Data: Default Data Bundle List</name>
<build>
<plugins>
Modified: incubator/stanbol/trunk/data/bundlelists/defaultdata/src/main/bundles/list.xml
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/data/bundlelists/defaultdata/src/main/bundles/list.xml?rev=1299614&r1=1297222&r2=1299614&view=diff
==============================================================================
--- incubator/stanbol/trunk/data/bundlelists/defaultdata/src/main/bundles/list.xml (original)
+++ incubator/stanbol/trunk/data/bundlelists/defaultdata/src/main/bundles/list.xml Mon Mar 12 10:21:53 2012
@@ -18,7 +18,7 @@
<bundles>
<!-- The default data expected by the default configuration of Stanbol -->
<startLevel level="19">
- <bundle>
+ <bundle> <!-- The English language and NER models are included as default -->
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.data.opennlp.ner.en</artifactId>
<version>1.0.1-incubating-SNAPSHOT</version>
@@ -30,14 +30,19 @@
</bundle>
</startLevel>
<startLevel level="20">
- <bundle>
+ <bundle> <!-- Default ontology registries used by ontonet -->
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.data.registries.default</artifactId>
<version>1.0.1-incubating-SNAPSHOT</version>
</bundle>
</startLevel>
<startLevel level="30">
- <bundle>
+ <bundle> <!-- The Apache Stanbol default configuration -->
+ <groupId>org.apache.stanbol</groupId>
+ <artifactId>org.apache.stanbol.data.defaultconfig</artifactId>
+ <version>0.9.0-incubating-SNAPSHOT</version>
+ </bundle>
+ <bundle> <!-- dbpedia is includes as default data set -->
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.data.sites.dbpedia</artifactId>
<version>1.0.3-incubating-SNAPSHOT</version>
Propchange: incubator/stanbol/trunk/data/bundlelists/opennlp/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Mon Mar 12 10:21:53 2012
@@ -0,0 +1,5 @@
+.settings
+
+.project
+
+target
Added: incubator/stanbol/trunk/data/bundlelists/opennlp/pom.xml
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/data/bundlelists/opennlp/pom.xml?rev=1299614&view=auto
==============================================================================
--- incubator/stanbol/trunk/data/bundlelists/opennlp/pom.xml (added)
+++ incubator/stanbol/trunk/data/bundlelists/opennlp/pom.xml Mon Mar 12 10:21:53 2012
@@ -0,0 +1,42 @@
+<?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.data.parent</artifactId>
+ <version>0.9.0-incubating-SNAPSHOT</version>
+ <relativePath>../../parent</relativePath>
+ </parent>
+
+ <groupId>org.apache.stanbol</groupId>
+ <artifactId>org.apache.stanbol.data.bundlelists.opennlp</artifactId>
+ <packaging>partialbundlelist</packaging>
+
+ <name>Apache Stanbol Data: Bundle List for OpenNLP</name>
+ <description>When added this will ensure that all language and
+ NER models provided by OpenNLP are included by an
+ Apache Stanbol launcher</description>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.sling</groupId>
+ <artifactId>maven-launchpad-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </build>
+</project>
+
Propchange: incubator/stanbol/trunk/data/bundlelists/opennlp/pom.xml
------------------------------------------------------------------------------
svn:executable = *
Propchange: incubator/stanbol/trunk/data/bundlelists/opennlp/pom.xml
------------------------------------------------------------------------------
svn:mime-type = text/plain
Propchange: incubator/stanbol/trunk/data/defaultconfig/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Mon Mar 12 10:21:53 2012
@@ -0,0 +1,7 @@
+.project
+
+target
+
+.settings
+
+.classpath
Added: incubator/stanbol/trunk/data/defaultconfig/src/main/resources/README
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/data/defaultconfig/src/main/resources/README?rev=1299614&view=auto
==============================================================================
--- incubator/stanbol/trunk/data/defaultconfig/src/main/resources/README (added)
+++ incubator/stanbol/trunk/data/defaultconfig/src/main/resources/README Mon Mar 12 10:21:53 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.enhancer.chain.weighted.impl.WeightedChain-language.config
+config/org.apache.stanbol.enhancer.engines.keywordextraction.engine.KeywordLinkingEngine-entityhub.config
+
Added: incubator/stanbol/trunk/data/defaultconfig/src/main/resources/config/org.apache.stanbol.enhancer.chain.weighted.impl.WeightedChain-language.config
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/data/defaultconfig/src/main/resources/config/org.apache.stanbol.enhancer.chain.weighted.impl.WeightedChain-language.config?rev=1299614&view=auto
==============================================================================
--- incubator/stanbol/trunk/data/defaultconfig/src/main/resources/config/org.apache.stanbol.enhancer.chain.weighted.impl.WeightedChain-language.config (added)
+++ incubator/stanbol/trunk/data/defaultconfig/src/main/resources/config/org.apache.stanbol.enhancer.chain.weighted.impl.WeightedChain-language.config Mon Mar 12 10:21:53 2012
@@ -0,0 +1,2 @@
+stanbol.enhancer.chain.name="language"
+stanbol.enhancer.chain.weighted.chain=["tika;optional","metaxa;optional","langid"]
Added: incubator/stanbol/trunk/data/defaultconfig/src/main/resources/config/org.apache.stanbol.enhancer.engines.keywordextraction.engine.KeywordLinkingEngine-entityhub.config
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/data/defaultconfig/src/main/resources/config/org.apache.stanbol.enhancer.engines.keywordextraction.engine.KeywordLinkingEngine-entityhub.config?rev=1299614&view=auto
==============================================================================
--- incubator/stanbol/trunk/data/defaultconfig/src/main/resources/config/org.apache.stanbol.enhancer.engines.keywordextraction.engine.KeywordLinkingEngine-entityhub.config (added)
+++ incubator/stanbol/trunk/data/defaultconfig/src/main/resources/config/org.apache.stanbol.enhancer.engines.keywordextraction.engine.KeywordLinkingEngine-entityhub.config Mon Mar 12 10:21:53 2012
@@ -0,0 +1,15 @@
+org.apache.stanbol.enhancer.engines.keywordextraction.processedLanguages=""
+service.factoryPid="org.apache.stanbol.enhancer.engines.keywordextraction.engine.KeywordLinkingEngine"
+service.pid="org.apache.stanbol.enhancer.engines.keywordextraction.engine.KeywordLinkingEngine.24dc4dc4-f7a3-480f-a5af-f31731f19fb6"
+stanbol.enhancer.engine.name="entityhubExtraction"
+service.bundleLocation="slinginstall:org.apache.stanbol.enhancer.engine.keywordextraction-0.9.0-incubating-SNAPSHOT.jar"
+org.apache.stanbol.enhancer.engines.keywordextraction.minSearchTokenLength=I"3"
+service.ranking=I"0"
+org.apache.stanbol.enhancer.engines.keywordextraction.maxSuggestions=I"3"
+org.apache.stanbol.enhancer.engines.keywordextraction.dereference=B"true"
+org.apache.stanbol.enhancer.engines.keywordextraction.typeField="rdf:type"
+org.apache.stanbol.enhancer.engines.keywordextraction.nameField="rdfs:label"
+org.apache.stanbol.enhancer.engines.keywordextraction.referencedSiteId="entityhub"
+org.apache.stanbol.enhancer.engines.keywordextraction.redirectField="rdfs:seeAlso"
+org.apache.stanbol.enhancer.engines.keywordextraction.defaultMatchingLanguage=""
+org.apache.stanbol.enhancer.engines.keywordextraction.redirectMode="ADD_VALUES"
Modified: incubator/stanbol/trunk/data/pom.xml
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/data/pom.xml?rev=1299614&r1=1299613&r2=1299614&view=diff
==============================================================================
--- incubator/stanbol/trunk/data/pom.xml (original)
+++ incubator/stanbol/trunk/data/pom.xml Mon Mar 12 10:21:53 2012
@@ -36,7 +36,7 @@
</scm>
<modules>
<module>parent</module>
- <module>bundlelist</module>
+ <module>defaultconfig</module>
</modules>
<profiles>
<profile>
@@ -56,6 +56,7 @@
<module>opennlp/lang/en</module>
<module>opennlp/ner/en</module>
<module>registries/default</module>
+ <module>bundlelists/defaultdata</module>
</modules>
</profile>
<profile>
@@ -82,7 +83,7 @@
-->
<id>opennlp</id>
<activation>
- <activeByDefault>false</activeByDefault>
+ <activeByDefault>true</activeByDefault>
</activation>
<modules>
<module>opennlp/lang/da</module>
@@ -94,6 +95,7 @@
<module>opennlp/ner/en</module>
<module>opennlp/ner/es</module>
<module>opennlp/ner/nl</module>
+ <module>bundlelists/opennlp</module>
</modules>
</profile>
</profiles>
Modified: incubator/stanbol/trunk/enhancer/bundlelist/src/main/bundles/list.xml
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/enhancer/bundlelist/src/main/bundles/list.xml?rev=1299614&r1=1299613&r2=1299614&view=diff
==============================================================================
--- incubator/stanbol/trunk/enhancer/bundlelist/src/main/bundles/list.xml (original)
+++ incubator/stanbol/trunk/enhancer/bundlelist/src/main/bundles/list.xml Mon Mar 12 10:21:53 2012
@@ -20,12 +20,19 @@
<!-- *********************************************************************
start level 10 TO 19 reserved for required libraries (internal and external)
********************************************************************* -->
- <startLevel level="17">
+
+ <!-- Apache Tika -->
+ <!-- Note: that Tika only inits the Parser correctly if the start level of
+ tika-core is lower than tika-bundle
+ -->
+ <startLevel level="16">
<bundle> <!-- Apache Tika core (required by the LangId and TikaEngine) -->
<groupId>org.apache.tika</groupId>
<artifactId>tika-core</artifactId>
<version>1.0</version>
</bundle>
+ </startLevel>
+ <startLevel level="17">
<bundle> <!-- Apache Tika bundle (required by the TikaEngine) -->
<groupId>org.apache.tika</groupId>
<artifactId>tika-bundle</artifactId>
@@ -176,4 +183,14 @@
<version>0.9.0-incubating-SNAPSHOT</version>
</bundle>
</startLevel>
+
+ <!-- Default Configuration for the Stanbol Enhancer -->
+
+ <startLevel level="26">
+ <bundle>
+ <groupId>org.apache.stanbol</groupId>
+ <artifactId>org.apache.stanbol.enhancer.defaults</artifactId>
+ <version>0.9.0-incubating-SNAPSHOT</version>
+ </bundle>
+ </startLevel>
</bundles>
Propchange: incubator/stanbol/trunk/enhancer/defaults/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Mon Mar 12 10:21:53 2012
@@ -0,0 +1,7 @@
+.project
+
+.settings
+
+.classpath
+
+target
Added: incubator/stanbol/trunk/enhancer/defaults/src/main/resources/config/org.apache.felix.eventadmin.impl.EventAdmin.cfg
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/enhancer/defaults/src/main/resources/config/org.apache.felix.eventadmin.impl.EventAdmin.cfg?rev=1299614&view=auto
==============================================================================
--- incubator/stanbol/trunk/enhancer/defaults/src/main/resources/config/org.apache.felix.eventadmin.impl.EventAdmin.cfg (added)
+++ incubator/stanbol/trunk/enhancer/defaults/src/main/resources/config/org.apache.felix.eventadmin.impl.EventAdmin.cfg Mon Mar 12 10:21:53 2012
@@ -0,0 +1,25 @@
+# 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 Apache Felix EventAdmin uses a 5sec timeout on Event processing.
+# If a handler needs more time than that it is blacklisted and does not get
+# any additional events [1]
+# However when enhancing ContentItems it is expected that EventProcessing
+# might take a lot of time. For such cases the IgnoreTimeout property can be
+# used to exclude specific EventHandlers rather than deactivating this feature
+# all together.
+org.apache.felix.eventadmin.IgnoreTimeout=org.apache.stanbol.enhancer.jobmanager.event.impl.EnhancementJobHandler
\ No newline at end of file
Added: incubator/stanbol/trunk/enhancer/defaults/src/main/resources/config/org.apache.stanbol.enhancer.engines.opennlp.impl.NamedEntityExtractionEnhancementEngine-default.config
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/enhancer/defaults/src/main/resources/config/org.apache.stanbol.enhancer.engines.opennlp.impl.NamedEntityExtractionEnhancementEngine-default.config?rev=1299614&view=auto
==============================================================================
--- incubator/stanbol/trunk/enhancer/defaults/src/main/resources/config/org.apache.stanbol.enhancer.engines.opennlp.impl.NamedEntityExtractionEnhancementEngine-default.config (added)
+++ incubator/stanbol/trunk/enhancer/defaults/src/main/resources/config/org.apache.stanbol.enhancer.engines.opennlp.impl.NamedEntityExtractionEnhancementEngine-default.config Mon Mar 12 10:21:53 2012
@@ -0,0 +1,2 @@
+stanbol.NamedEntityExtractionEnhancementEngine.processedLanguages=""
+stanbol.NamedEntityExtractionEnhancementEngine.defaultLanguage=""
Modified: incubator/stanbol/trunk/enhancer/pom.xml
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/enhancer/pom.xml?rev=1299614&r1=1299613&r2=1299614&view=diff
==============================================================================
--- incubator/stanbol/trunk/enhancer/pom.xml (original)
+++ incubator/stanbol/trunk/enhancer/pom.xml Mon Mar 12 10:21:53 2012
@@ -55,6 +55,7 @@
<module>chain/graph</module>
<module>chain/list</module>
<module>chain/weighted</module>
+ <module>defaults</module>
<module>bundlelist</module>
</modules>
</project>
Modified: incubator/stanbol/trunk/entityhub/bundlelist/src/main/bundles/list.xml
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/entityhub/bundlelist/src/main/bundles/list.xml?rev=1299614&r1=1299613&r2=1299614&view=diff
==============================================================================
--- incubator/stanbol/trunk/entityhub/bundlelist/src/main/bundles/list.xml (original)
+++ incubator/stanbol/trunk/entityhub/bundlelist/src/main/bundles/list.xml Mon Mar 12 10:21:53 2012
@@ -75,4 +75,12 @@
<version>0.9.0-incubating-SNAPSHOT</version>
</bundle>
</startLevel>
+ <!-- Default configuration for the Entityhub -->
+ <startLevel level="22">
+ <bundle>
+ <groupId>org.apache.stanbol</groupId>
+ <artifactId>org.apache.stanbol.entityhub.defaults</artifactId>
+ <version>0.9.0-incubating-SNAPSHOT</version>
+ </bundle>
+ </startLevel>
</bundles>
\ No newline at end of file
Propchange: incubator/stanbol/trunk/entityhub/defaults/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Mon Mar 12 10:21:53 2012
@@ -0,0 +1,7 @@
+.classpath
+
+.project
+
+target
+
+.settings
Added: incubator/stanbol/trunk/entityhub/defaults/README.md
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/entityhub/defaults/README.md?rev=1299614&view=auto
==============================================================================
--- incubator/stanbol/trunk/entityhub/defaults/README.md (added)
+++ incubator/stanbol/trunk/entityhub/defaults/README.md Mon Mar 12 10:21:53 2012
@@ -0,0 +1,26 @@
+<!--
+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.
+-->
+
+Entityhub defaults
+==================
+
+This artifacts provides the default configuration for the Entityhub.
+It depends on the
+
+ org.apache.stanbol.commons.installer.bundleprovider
+
+to be available as this module is used to actually load the provided configuration.
+
+This [STANBOL-529](https://issues.apache.org/jira/browse/STANBOL-529) for more details.
+
+
+
Added: incubator/stanbol/trunk/entityhub/defaults/pom.xml
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/entityhub/defaults/pom.xml?rev=1299614&view=auto
==============================================================================
--- incubator/stanbol/trunk/entityhub/defaults/pom.xml (added)
+++ incubator/stanbol/trunk/entityhub/defaults/pom.xml Mon Mar 12 10:21:53 2012
@@ -0,0 +1,77 @@
+<?xml version="1.0"?>
+ <!--
+ 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>
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.stanbol</groupId>
+ <artifactId>org.apache.stanbol.entityhub.parent</artifactId>
+ <version>0.9.0-incubating-SNAPSHOT</version>
+ <relativePath>../parent/pom.xml</relativePath>
+ </parent>
+
+ <groupId>org.apache.stanbol</groupId>
+ <artifactId>org.apache.stanbol.entityhub.defaults</artifactId>
+ <packaging>bundle</packaging>
+
+ <name>Apache Stanbol Entityhub default configuration</name>
+ <description>This provides the default configuration for the Entityhub. This bundle can be removed by users that want/need to provide their own configuration conflicting with the defaults.</description>
+ <scm>
+ <connection>
+ scm:svn:http://svn.apache.org/repos/asf/incubator/stanbol/trunk/entityhub/defaults
+ </connection>
+ <developerConnection>
+ scm:svn:https://svn.apache.org/repos/asf/incubator/stanbol/trunk/entityhub/defaults
+ </developerConnection>
+ <url>http://incubator.apache.org/stanbol</url>
+ </scm>
+
+ <build>
+ <!-- make it an OSGi bundle -->
+ <plugins>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <extensions>true</extensions>
+ <configuration>
+ <instructions>
+ <Export-Package>
+ org.apache.stanbol.entityhub.defaults;version=${project.version}
+ </Export-Package>
+ <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 files. See src/main/resources/README -->
+ <exclude>src/main/resources/config/org.apache.stanbol.entityhub.core.impl.EntityhubConfigurationImpl.config</exclude>
+ <exclude>src/main/resources/config/org.apache.stanbol.entityhub.yard.solr.impl.SolrYard-entityhub.config</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+ <dependencies>
+ <!-- none - config only -->
+ </dependencies>
+
+</project>
Propchange: incubator/stanbol/trunk/entityhub/defaults/pom.xml
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: incubator/stanbol/trunk/entityhub/defaults/src/main/resources/README
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/entityhub/defaults/src/main/resources/README?rev=1299614&view=auto
==============================================================================
--- incubator/stanbol/trunk/entityhub/defaults/src/main/resources/README (added)
+++ incubator/stanbol/trunk/entityhub/defaults/src/main/resources/README Mon Mar 12 10:21:53 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.entityhub.core.impl.EntityhubConfigurationImpl.config
+config/org.apache.stanbol.entityhub.yard.solr.impl.SolrYard-entityhub.config
+
Modified: incubator/stanbol/trunk/entityhub/pom.xml
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/entityhub/pom.xml?rev=1299614&r1=1299613&r2=1299614&view=diff
==============================================================================
--- incubator/stanbol/trunk/entityhub/pom.xml (original)
+++ incubator/stanbol/trunk/entityhub/pom.xml Mon Mar 12 10:21:53 2012
@@ -60,6 +60,7 @@
-->
<!-- Utils for createing local caches (indexing utils) -->
<module>indexing</module>
+ <module>defaults</module>
<module>bundlelist</module>
</modules>
</project>
Modified: incubator/stanbol/trunk/integration-tests/src/test/java/org/apache/stanbol/enhancer/it/EnhancerTestBase.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/integration-tests/src/test/java/org/apache/stanbol/enhancer/it/EnhancerTestBase.java?rev=1299614&r1=1299613&r2=1299614&view=diff
==============================================================================
--- incubator/stanbol/trunk/integration-tests/src/test/java/org/apache/stanbol/enhancer/it/EnhancerTestBase.java (original)
+++ incubator/stanbol/trunk/integration-tests/src/test/java/org/apache/stanbol/enhancer/it/EnhancerTestBase.java Mon Mar 12 10:21:53 2012
@@ -72,7 +72,7 @@ public class EnhancerTestBase extends St
//"metaxa","MetaxaEngine", deactivated see STANBOL-510
"langid","LangIdEnhancementEngine",
"ner","NamedEntityExtractionEnhancementEngine",
- "entityhubLinking","NamedEntityTaggingEngine",
+ "entityhubExtraction","NamedEntityExtractionEnhancementEngine",
"dbpediaLinking","NamedEntityTaggingEngine",
"tika","TikaEngine"
};
Modified: incubator/stanbol/trunk/launchers/bundlelists/stanbolcommons/src/main/bundles/list.xml
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/launchers/bundlelists/stanbolcommons/src/main/bundles/list.xml?rev=1299614&r1=1299613&r2=1299614&view=diff
==============================================================================
--- incubator/stanbol/trunk/launchers/bundlelists/stanbolcommons/src/main/bundles/list.xml (original)
+++ incubator/stanbol/trunk/launchers/bundlelists/stanbolcommons/src/main/bundles/list.xml Mon Mar 12 10:21:53 2012
@@ -304,7 +304,33 @@
</artifactId>
<version>0.9.0-incubating-SNAPSHOT</version>
</bundle>
- <!-- OpenNLP as bundle + utilities -->
+ <!-- OWL libraries and utilities -->
+ <bundle>
+ <groupId>org.apache.stanbol</groupId>
+ <artifactId>org.apache.stanbol.commons.owl</artifactId>
+ <version>0.9.0-incubating-SNAPSHOT</version>
+ </bundle>
+ <!-- support for JSON-LD -->
+ <bundle>
+ <groupId>org.apache.stanbol</groupId>
+ <artifactId>org.apache.stanbol.commons.jsonld</artifactId>
+ <version>0.9.0-incubating-SNAPSHOT</version>
+ </bundle>
+ <!-- Support for Jobs -->
+ <bundle>
+ <groupId>org.apache.stanbol</groupId>
+ <artifactId>org.apache.stanbol.commons.jobs.api</artifactId>
+ <version>0.9.0-incubating-SNAPSHOT</version>
+ </bundle>
+ <bundle>
+ <groupId>org.apache.stanbol</groupId>
+ <artifactId>org.apache.stanbol.commons.jobs.web</artifactId>
+ <version>0.9.0-incubating-SNAPSHOT</version>
+ </bundle>
+ </startLevel>
+
+ <!-- OpenNLP as bundle + utilities -->
+ <startLevel level="17">
<bundle>
<groupId>org.apache.opennlp</groupId>
<artifactId>opennlp-maxent</artifactId>
@@ -320,7 +346,10 @@
<artifactId>org.apache.stanbol.commons.opennlp</artifactId>
<version>0.9.0-incubating-SNAPSHOT</version>
</bundle>
- <!-- Apache Solr as bundle + utilities -->
+ </startLevel>
+
+ <!-- Apache Solr as bundle + utilities -->
+ <startLevel level="17">
<bundle>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.commons.solr.core</artifactId>
@@ -341,31 +370,17 @@
<artifactId>org.apache.stanbol.commons.solr.web</artifactId>
<version>0.9.0-incubating-SNAPSHOT</version>
</bundle>
- <!-- OWL libraries and utilities -->
- <bundle>
- <groupId>org.apache.stanbol</groupId>
- <artifactId>org.apache.stanbol.commons.owl</artifactId>
- <version>0.9.0-incubating-SNAPSHOT</version>
- </bundle>
- <!-- support for JSON-LD -->
- <bundle>
- <groupId>org.apache.stanbol</groupId>
- <artifactId>org.apache.stanbol.commons.jsonld</artifactId>
- <version>0.9.0-incubating-SNAPSHOT</version>
- </bundle>
- <!-- Support for Jobs -->
- <bundle>
- <groupId>org.apache.stanbol</groupId>
- <artifactId>org.apache.stanbol.commons.jobs.api</artifactId>
- <version>0.9.0-incubating-SNAPSHOT</version>
- </bundle>
- <bundle>
+ </startLevel>
+ <startLevel level="18">
+ <bundle> <!-- defualt config for Solr -->
<groupId>org.apache.stanbol</groupId>
- <artifactId>org.apache.stanbol.commons.jobs.web</artifactId>
+ <artifactId>org.apache.stanbol.commons.solr.defaults</artifactId>
<version>0.9.0-incubating-SNAPSHOT</version>
</bundle>
-
- <!-- The common web interface -->
+ </startLevel>
+
+ <!-- The common web interface -->
+ <startLevel level="17">
<bundle>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.commons.web.base</artifactId>
Modified: incubator/stanbol/trunk/launchers/full-war/pom.xml
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/launchers/full-war/pom.xml?rev=1299614&r1=1299613&r2=1299614&view=diff
==============================================================================
--- incubator/stanbol/trunk/launchers/full-war/pom.xml (original)
+++ incubator/stanbol/trunk/launchers/full-war/pom.xml Mon Mar 12 10:21:53 2012
@@ -104,16 +104,6 @@
<artifactId>apache-rat-plugin</artifactId>
<configuration>
<excludes>
- <!-- AL20 licensed files. See src/main/webapp/WEB-INF/README -->
- <exclude>src/main/webapp/WEB-INF/resources/config/org.apache.sling.commons.log.LogManager.factory.config-solrlogconfig.config</exclude>
- <exclude>src/main/webapp/WEB-INF/resources/config/org.apache.stanbol.commons.solr.managed.impl.ManagedSolrServerImpl-default.config</exclude>
- <exclude>src/main/webapp/WEB-INF/resources/config/org.apache.stanbol.commons.solr.web.impl.SolrDispatchFilterComponent-default.config</exclude>
- <exclude>src/main/webapp/WEB-INF/resources/config/org.apache.stanbol.enhancer.engines.entitytagging.impl.NamedEntityTaggingEngine-local.config</exclude>
- <exclude>src/main/webapp/WEB-INF/resources/config/org.apache.stanbol.entityhub.core.impl.EntityhubConfigurationImpl.config</exclude>
- <exclude>src/main/webapp/WEB-INF/resources/config/org.apache.stanbol.entityhub.yard.solr.impl.SolrYard-entityhub.config</exclude>
- <exclude>src/main/webapp/WEB-INF/resources/config/org.apache.stanbol.examples.ExampleBootstrapConfig.cfg</exclude>
- <exclude>src/main/webapp/WEB-INF/resources/config/org.apache.stanbol.enhancer.engines.opennlp.impl.NamedEntityExtractionEnhancementEngine-default.config</exclude>
- <exclude>src/main/webapp/WEB-INF/resources/config/org.apache.stanbol.enhancer.chain.weighted.impl.WeightedChain-language.config</exclude>
</excludes>
</configuration>
</plugin>
@@ -161,7 +151,7 @@
<!-- Stanbol Data Bundle List -->
<dependency>
<groupId>org.apache.stanbol</groupId>
- <artifactId>org.apache.stanbol.data.bundlelist</artifactId>
+ <artifactId>org.apache.stanbol.data.bundlelists.defaultdata</artifactId>
<type>partialbundlelist</type>
</dependency>
Modified: incubator/stanbol/trunk/launchers/full-war/src/main/bundles/list.xml
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/launchers/full-war/src/main/bundles/list.xml?rev=1299614&r1=1299613&r2=1299614&view=diff
==============================================================================
--- incubator/stanbol/trunk/launchers/full-war/src/main/bundles/list.xml (original)
+++ incubator/stanbol/trunk/launchers/full-war/src/main/bundles/list.xml Mon Mar 12 10:21:53 2012
@@ -31,11 +31,6 @@
<artifactId>mime-util</artifactId>
<version>2.1.3</version>
</bundle>
- <bundle> <!-- used by langid -->
- <groupId>org.apache.tika</groupId>
- <artifactId>tika-core</artifactId>
- <version>0.9</version>
- </bundle>
<bundle> <!-- only used by the Factstore -->
<groupId>org.apache.derby</groupId>
<artifactId>derby</artifactId>
@@ -67,14 +62,9 @@
(Enhancer, Entityhub, Contenthub, Factstore ... incl. Web Fragments)
********************************************************************* -->
- <!-- KReS -->
+ <!-- KReS
<startLevel level="22">
- <bundle>
- <groupId>org.apache.stanbol</groupId>
- <artifactId>org.apache.stanbol.commons.owl</artifactId>
- <version>0.9.0-incubating-SNAPSHOT</version>
- </bundle>
- </startLevel>
+ </startLevel> -->
<!-- *********************************************************************
start level 25 TO 29 reserved for Stanbol plug-ins
Modified: incubator/stanbol/trunk/launchers/full-war/src/main/webapp/WEB-INF/resources/config/org.apache.stanbol.examples.ExampleBootstrapConfig.cfg
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/launchers/full-war/src/main/webapp/WEB-INF/resources/config/org.apache.stanbol.examples.ExampleBootstrapConfig.cfg?rev=1299614&r1=1299613&r2=1299614&view=diff
==============================================================================
--- incubator/stanbol/trunk/launchers/full-war/src/main/webapp/WEB-INF/resources/config/org.apache.stanbol.examples.ExampleBootstrapConfig.cfg (original)
+++ incubator/stanbol/trunk/launchers/full-war/src/main/webapp/WEB-INF/resources/config/org.apache.stanbol.examples.ExampleBootstrapConfig.cfg Mon Mar 12 10:21:53 2012
@@ -1,3 +1,19 @@
+# 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.
+
+
# Example default OSGi config that's loaded
# at startup if Sling's org.apache.sling.launchpad.installer
# bundle is active.
Modified: incubator/stanbol/trunk/launchers/full/pom.xml
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/launchers/full/pom.xml?rev=1299614&r1=1299613&r2=1299614&view=diff
==============================================================================
--- incubator/stanbol/trunk/launchers/full/pom.xml (original)
+++ incubator/stanbol/trunk/launchers/full/pom.xml Mon Mar 12 10:21:53 2012
@@ -104,19 +104,7 @@
<groupId>org.apache.rat</groupId>
<artifactId>apache-rat-plugin</artifactId>
<configuration>
- <excludes>
- <!-- AL20 licensed files. See src/main/resources/README -->
- <exclude>src/main/resources/resources/config/org.apache.sling.commons.log.LogManager.factory.config-solrlogconfig.config</exclude>
- <exclude>src/main/resources/resources/config/org.apache.stanbol.commons.solr.managed.impl.ManagedSolrServerImpl-default.config</exclude>
- <exclude>src/main/resources/resources/config/org.apache.stanbol.commons.solr.web.impl.SolrDispatchFilterComponent-default.config</exclude>
- <exclude>src/main/resources/resources/config/org.apache.stanbol.enhancer.engines.entitytagging.impl.NamedEntityTaggingEngine-local.config</exclude>
- <exclude>src/main/resources/resources/config/org.apache.stanbol.entityhub.core.impl.EntityhubConfigurationImpl.config</exclude>
- <exclude>src/main/resources/resources/config/org.apache.stanbol.entityhub.yard.solr.impl.SolrYard-entityhub.config</exclude>
- <exclude>src/main/resources/resources/config/org.apache.stanbol.examples.ExampleBootstrapConfig.cfg</exclude>
- <exclude>src/main/resources/resources/config/org.apache.stanbol.enhancer.engines.opennlp.impl.NamedEntityExtractionEnhancementEngine-default.config</exclude>
- <exclude>src/main/resources/resources/config/org.apache.stanbol.enhancer.chain.weighted.impl.WeightedChain-language.config</exclude>
- <exclude>src/main/resources/resources/config/org.apache.stanbol.enhancer.engines.refactor.RefactorEnhancementEngine.config_deactivated</exclude>
- </excludes>
+ <excludes></excludes>
</configuration>
</plugin>
</plugins>
@@ -165,7 +153,13 @@
<!-- Stanbol Data Bundle List -->
<dependency>
<groupId>org.apache.stanbol</groupId>
- <artifactId>org.apache.stanbol.data.bundlelist</artifactId>
+ <artifactId>org.apache.stanbol.data.bundlelists.defaultdata</artifactId>
+ <type>partialbundlelist</type>
+ <scope>provided</scope>
+ </dependency>
+ <dependency> <!-- include all OpenNLP models in the full launcher -->
+ <groupId>org.apache.stanbol</groupId>
+ <artifactId>org.apache.stanbol.data.bundlelists.opennlp</artifactId>
<type>partialbundlelist</type>
<scope>provided</scope>
</dependency>
Modified: incubator/stanbol/trunk/launchers/full/src/main/bundles/list.xml
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/launchers/full/src/main/bundles/list.xml?rev=1299614&r1=1299613&r2=1299614&view=diff
==============================================================================
--- incubator/stanbol/trunk/launchers/full/src/main/bundles/list.xml (original)
+++ incubator/stanbol/trunk/launchers/full/src/main/bundles/list.xml Mon Mar 12 10:21:53 2012
@@ -31,11 +31,6 @@
<!-- <artifactId>mime-util</artifactId> -->
<!-- <version>2.1.3</version> -->
<!-- </bundle> -->
- <bundle> <!-- used by langid -->
- <groupId>org.apache.tika</groupId>
- <artifactId>tika-core</artifactId>
- <version>0.9</version>
- </bundle>
</startLevel>
<!-- Jersey -->
@@ -65,11 +60,6 @@
<!-- Stanbol OWL now part of commons -->
<!--
<startLevel level="22">
- <bundle>
- <groupId>org.apache.stanbol</groupId>
- <artifactId>org.apache.stanbol.owl</artifactId>
- <version>0.9.0-incubating-SNAPSHOT</version>
- </bundle>
</startLevel>
-->
Modified: incubator/stanbol/trunk/launchers/full/src/main/resources/resources/config/org.apache.stanbol.examples.ExampleBootstrapConfig.cfg
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/launchers/full/src/main/resources/resources/config/org.apache.stanbol.examples.ExampleBootstrapConfig.cfg?rev=1299614&r1=1299613&r2=1299614&view=diff
==============================================================================
--- incubator/stanbol/trunk/launchers/full/src/main/resources/resources/config/org.apache.stanbol.examples.ExampleBootstrapConfig.cfg (original)
+++ incubator/stanbol/trunk/launchers/full/src/main/resources/resources/config/org.apache.stanbol.examples.ExampleBootstrapConfig.cfg Mon Mar 12 10:21:53 2012
@@ -1,3 +1,19 @@
+# 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.
+
+
# Example default OSGi config that's loaded
# at startup if Sling's org.apache.sling.launchpad.installer
# bundle is active.
Modified: incubator/stanbol/trunk/launchers/kres/pom.xml
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/launchers/kres/pom.xml?rev=1299614&r1=1299613&r2=1299614&view=diff
==============================================================================
--- incubator/stanbol/trunk/launchers/kres/pom.xml (original)
+++ incubator/stanbol/trunk/launchers/kres/pom.xml Mon Mar 12 10:21:53 2012
@@ -109,7 +109,7 @@
<!-- Stanbol Data Bundle List -->
<dependency>
<groupId>org.apache.stanbol</groupId>
- <artifactId>org.apache.stanbol.data.bundlelist</artifactId>
+ <artifactId>org.apache.stanbol.data.bundlelists.defaultdata</artifactId>
<type>partialbundlelist</type>
<scope>provided</scope>
</dependency>
Modified: incubator/stanbol/trunk/launchers/kres/src/main/resources/resources/config/org.apache.stanbol.examples.ExampleBootstrapConfig.cfg
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/launchers/kres/src/main/resources/resources/config/org.apache.stanbol.examples.ExampleBootstrapConfig.cfg?rev=1299614&r1=1299613&r2=1299614&view=diff
==============================================================================
--- incubator/stanbol/trunk/launchers/kres/src/main/resources/resources/config/org.apache.stanbol.examples.ExampleBootstrapConfig.cfg (original)
+++ incubator/stanbol/trunk/launchers/kres/src/main/resources/resources/config/org.apache.stanbol.examples.ExampleBootstrapConfig.cfg Mon Mar 12 10:21:53 2012
@@ -1,3 +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.
+
+
+
# Example default OSGi config that's loaded
# at startup if Sling's org.apache.sling.launchpad.installer
# bundle is active.
Modified: incubator/stanbol/trunk/launchers/stable/pom.xml
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/launchers/stable/pom.xml?rev=1299614&r1=1299613&r2=1299614&view=diff
==============================================================================
--- incubator/stanbol/trunk/launchers/stable/pom.xml (original)
+++ incubator/stanbol/trunk/launchers/stable/pom.xml Mon Mar 12 10:21:53 2012
@@ -104,15 +104,6 @@
<artifactId>apache-rat-plugin</artifactId>
<configuration>
<excludes>
- <!-- AL20 licensed files. See src/main/resources/README -->
- <exclude>src/main/resources/resources/config/org.apache.sling.commons.log.LogManager.factory.config-solrlogconfig.config</exclude>
- <exclude>src/main/resources/resources/config/org.apache.stanbol.commons.solr.managed.impl.ManagedSolrServerImpl-default.config</exclude>
- <exclude>src/main/resources/resources/config/org.apache.stanbol.enhancer.engines.entitytagging.impl.NamedEntityTaggingEngine-local.config</exclude>
- <exclude>src/main/resources/resources/config/org.apache.stanbol.entityhub.core.impl.EntityhubConfigurationImpl.config</exclude>
- <exclude>src/main/resources/resources/config/org.apache.stanbol.entityhub.yard.solr.impl.SolrYard-entityhub.config</exclude>
- <exclude>src/main/resources/resources/config/org.apache.stanbol.examples.ExampleBootstrapConfig.cfg</exclude>
- <exclude>src/main/resources/resources/config/org.apache.stanbol.enhancer.engines.opennlp.impl.NamedEntityExtractionEnhancementEngine-default.config</exclude>
- <exclude>src/main/resources/resources/config/org.apache.stanbol.enhancer.chain.weighted.impl.WeightedChain-language.config</exclude>
</excludes>
</configuration>
</plugin>
@@ -155,7 +146,7 @@
<!-- Stanbol Data Bundle List -->
<dependency>
<groupId>org.apache.stanbol</groupId>
- <artifactId>org.apache.stanbol.data.bundlelist</artifactId>
+ <artifactId>org.apache.stanbol.data.bundlelists.defaultdata</artifactId>
<type>partialbundlelist</type>
<scope>provided</scope>
</dependency>
Modified: incubator/stanbol/trunk/launchers/stable/src/main/bundles/list.xml
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/launchers/stable/src/main/bundles/list.xml?rev=1299614&r1=1299613&r2=1299614&view=diff
==============================================================================
--- incubator/stanbol/trunk/launchers/stable/src/main/bundles/list.xml (original)
+++ incubator/stanbol/trunk/launchers/stable/src/main/bundles/list.xml Mon Mar 12 10:21:53 2012
@@ -20,13 +20,6 @@
-->
<bundles>
<!-- General-purpose libraries -->
- <startLevel level="10">
- <bundle> <!-- used by langid -->
- <groupId>org.apache.tika</groupId>
- <artifactId>tika-core</artifactId>
- <version>0.9</version>
- </bundle>
- </startLevel>
<!-- *********************************************************************
start level 20 TO 24 reserved for Stanbol Framework
Modified: incubator/stanbol/trunk/launchers/stable/src/main/resources/resources/config/org.apache.stanbol.examples.ExampleBootstrapConfig.cfg
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/launchers/stable/src/main/resources/resources/config/org.apache.stanbol.examples.ExampleBootstrapConfig.cfg?rev=1299614&r1=1299613&r2=1299614&view=diff
==============================================================================
--- incubator/stanbol/trunk/launchers/stable/src/main/resources/resources/config/org.apache.stanbol.examples.ExampleBootstrapConfig.cfg (original)
+++ incubator/stanbol/trunk/launchers/stable/src/main/resources/resources/config/org.apache.stanbol.examples.ExampleBootstrapConfig.cfg Mon Mar 12 10:21:53 2012
@@ -1,3 +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.
+
+
+
# Example default OSGi config that's loaded
# at startup if Sling's org.apache.sling.launchpad.installer
# bundle is active.
Modified: incubator/stanbol/trunk/parent/pom.xml
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/parent/pom.xml?rev=1299614&r1=1299613&r2=1299614&view=diff
==============================================================================
--- incubator/stanbol/trunk/parent/pom.xml (original)
+++ incubator/stanbol/trunk/parent/pom.xml Mon Mar 12 10:21:53 2012
@@ -909,7 +909,13 @@
</dependency>
<dependency>
<groupId>org.apache.stanbol</groupId>
- <artifactId>org.apache.stanbol.data.bundlelist</artifactId>
+ <artifactId>org.apache.stanbol.data.bundlelists.defaultdata</artifactId>
+ <version>0.9.0-incubating-SNAPSHOT</version>
+ <type>partialbundlelist</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.stanbol</groupId>
+ <artifactId>org.apache.stanbol.data.bundlelists.opennlp</artifactId>
<version>0.9.0-incubating-SNAPSHOT</version>
<type>partialbundlelist</type>
</dependency>
@@ -1139,16 +1145,11 @@
</dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
- <artifactId>httpclient</artifactId>
- <version>4.0.1</version>
+ <artifactId>httpclient-osgi</artifactId>
+ <version>4.1.3</version>
</dependency>
<dependency>
<groupId>org.apache.httpcomponents</groupId>
- <artifactId>httpcore</artifactId>
- <version>4.1</version>
- </dependency>
- <dependency>
- <groupId>org.apache.httpcomponents</groupId>
<artifactId>httpcore-osgi</artifactId>
<version>4.1.4</version>
</dependency>
@@ -1449,7 +1450,28 @@
<artifactId>lucene-xercesImpl</artifactId>
<version>3.2.0</version>
</dependency>
-
+ <!-- other unused Lucene bundes
+ <dependency>
+ <groupId>org.apache.lucene</groupId>
+ <artifactId>lucene-grouping</artifactId>
+ <version>3.2.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.lucene</groupId>
+ <artifactId>lucene-queryparser</artifactId>
+ <version>3.2.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.lucene</groupId>
+ <artifactId>lucene-smartcn</artifactId>
+ <version>3.2.0</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.lucene</groupId>
+ <artifactId>lucene-stempel</artifactId>
+ <version>3.2.0</version>
+ </dependency>
+ -->
<!-- Other Solr/Lucene dependendies -->
<!-- StAX Parser (used by Solr/Lucene) -->
<dependency>
Modified: incubator/stanbol/trunk/pom.xml
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/pom.xml?rev=1299614&r1=1299613&r2=1299614&view=diff
==============================================================================
--- incubator/stanbol/trunk/pom.xml (original)
+++ incubator/stanbol/trunk/pom.xml Mon Mar 12 10:21:53 2012
@@ -67,6 +67,7 @@
<module>enhancer/jersey</module>
<module>enhancer/ldpath</module>
<module>enhancer/benchmark</module>
+ <module>enhancer/defaults</module>
<module>enhancer/bundlelist</module>
<module>cmsadapter</module>
Modified: incubator/stanbol/trunk/reasoners/test/pom.xml
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/reasoners/test/pom.xml?rev=1299614&r1=1299613&r2=1299614&view=diff
==============================================================================
--- incubator/stanbol/trunk/reasoners/test/pom.xml (original)
+++ incubator/stanbol/trunk/reasoners/test/pom.xml Mon Mar 12 10:21:53 2012
@@ -67,24 +67,24 @@
<artifactId>org.apache.stanbol.commons.jobs.api</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.james</groupId>
- <artifactId>apache-mime4j</artifactId>
- <scope>provided</scope>
+ <groupId>org.apache.james</groupId>
+ <artifactId>apache-mime4j</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.apache.httpcomponents</groupId>
- <artifactId>httpclient</artifactId>
- <scope>provided</scope>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpclient-osgi</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.apache.httpcomponents</groupId>
- <artifactId>httpcore</artifactId>
- <scope>provided</scope>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpcore-osgi</artifactId>
+ <scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.apache.httpcomponents</groupId>
- <artifactId>httpmime</artifactId>
- <scope>provided</scope>
+ <groupId>org.apache.httpcomponents</groupId>
+ <artifactId>httpmime</artifactId>
+ <scope>provided</scope>
</dependency>
</dependencies>