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 2011/06/24 22:34:00 UTC
svn commit: r1139429 - in /incubator/stanbol/trunk: commons/
commons/opennlp/ commons/opennlp/src/ commons/opennlp/src/main/
commons/opennlp/src/main/java/ commons/opennlp/src/main/java/org/
commons/opennlp/src/main/java/org/apache/ commons/opennlp/src...
Author: rwesten
Date: Fri Jun 24 20:33:58 2011
New Revision: 1139429
URL: http://svn.apache.org/viewvc?rev=1139429&view=rev
Log:
STANBOL-234: Implementation of the DataFileProvider that uses the BundleExtender pattern to provide data files within bundles.
There are two components: First the DataFileProvider Implementation using the Bundle API to load resources within the bundle and second an component that uses a BundleListener to keep track of activated/deactivated bundles and starts/stop the BundleDataFileProvider if this bundle defines the according extension header.
Note that the defaultdata bundle (version 0.0.2) already uses this extension to provide it's data files via the DataFilePrpvider
STANBOL-235 A new bundle that exprots OpenNLP and provides an Compoent "OpenNLP" that allows to create Modles. Will be extended in future versions.
Also
* updated the opennlp-ner engine to use the new OpenNLP component
* removed the classloader based DataFileProvider implementation used by the opennlp-ner engine, because with STANBOL-234 it is no longer needed. Note that the tests still use this class, because they run outside an OSGI environment.
* added the two new bundles to the parent pom and to the full/light and kres launcher.
* removed annotations for the LabelBasedEntityTaggingEngine so that this (currently empty) class does no longer show up as OSGI component.
Note that now it should be very easy to extend the opennlp-ner engine to support multiple languages. The only thing missing is a language detection. The currently available lang-id engine can not be used because it has a LGPL dependency.
Added:
incubator/stanbol/trunk/commons/opennlp/
incubator/stanbol/trunk/commons/opennlp/pom.xml (with props)
incubator/stanbol/trunk/commons/opennlp/src/
incubator/stanbol/trunk/commons/opennlp/src/main/
incubator/stanbol/trunk/commons/opennlp/src/main/java/
incubator/stanbol/trunk/commons/opennlp/src/main/java/org/
incubator/stanbol/trunk/commons/opennlp/src/main/java/org/apache/
incubator/stanbol/trunk/commons/opennlp/src/main/java/org/apache/stanbol/
incubator/stanbol/trunk/commons/opennlp/src/main/java/org/apache/stanbol/commons/
incubator/stanbol/trunk/commons/opennlp/src/main/java/org/apache/stanbol/commons/opennlp/
incubator/stanbol/trunk/commons/opennlp/src/main/java/org/apache/stanbol/commons/opennlp/impl/
incubator/stanbol/trunk/commons/opennlp/src/main/resources/
incubator/stanbol/trunk/commons/opennlp/src/main/resources/OSGI-INF/
incubator/stanbol/trunk/commons/opennlp/src/main/resources/OSGI-INF/metatype/
incubator/stanbol/trunk/commons/opennlp/src/test/
incubator/stanbol/trunk/commons/opennlp/src/test/java/
incubator/stanbol/trunk/commons/opennlp/src/test/resources/
incubator/stanbol/trunk/commons/stanboltools/bundledatafileprovider/
incubator/stanbol/trunk/commons/stanboltools/bundledatafileprovider/pom.xml (with props)
incubator/stanbol/trunk/commons/stanboltools/bundledatafileprovider/src/
incubator/stanbol/trunk/commons/stanboltools/bundledatafileprovider/src/main/
incubator/stanbol/trunk/commons/stanboltools/bundledatafileprovider/src/main/java/
incubator/stanbol/trunk/commons/stanboltools/bundledatafileprovider/src/main/java/org/
incubator/stanbol/trunk/commons/stanboltools/bundledatafileprovider/src/main/java/org/apache/
incubator/stanbol/trunk/commons/stanboltools/bundledatafileprovider/src/main/java/org/apache/stanbol/
incubator/stanbol/trunk/commons/stanboltools/bundledatafileprovider/src/main/java/org/apache/stanbol/commons/
incubator/stanbol/trunk/commons/stanboltools/bundledatafileprovider/src/main/java/org/apache/stanbol/commons/stanboltools/
incubator/stanbol/trunk/commons/stanboltools/bundledatafileprovider/src/main/java/org/apache/stanbol/commons/stanboltools/datafileprovider/
incubator/stanbol/trunk/commons/stanboltools/bundledatafileprovider/src/main/java/org/apache/stanbol/commons/stanboltools/datafileprovider/bundle/
incubator/stanbol/trunk/commons/stanboltools/bundledatafileprovider/src/main/java/org/apache/stanbol/commons/stanboltools/datafileprovider/bundle/BundleResourceProviderConstants.java (with props)
incubator/stanbol/trunk/commons/stanboltools/bundledatafileprovider/src/main/java/org/apache/stanbol/commons/stanboltools/datafileprovider/bundle/impl/
incubator/stanbol/trunk/commons/stanboltools/bundledatafileprovider/src/main/resources/
incubator/stanbol/trunk/commons/stanboltools/bundledatafileprovider/src/main/resources/OSGI-INF/
incubator/stanbol/trunk/commons/stanboltools/bundledatafileprovider/src/main/resources/OSGI-INF/metatype/
incubator/stanbol/trunk/enhancer/engines/opennlp-ner/src/test/java/org/apache/stanbol/enhancer/engines/opennlp/impl/ClasspathDataFileProvider.java (contents, props changed)
- copied, changed from r1137606, incubator/stanbol/trunk/enhancer/engines/opennlp-ner/src/main/java/org/apache/stanbol/enhancer/engines/opennlp/impl/ClasspathDataFileProvider.java
Removed:
incubator/stanbol/trunk/enhancer/engines/opennlp-ner/src/main/java/org/apache/stanbol/enhancer/engines/opennlp/impl/ClasspathDataFileProvider.java
Modified:
incubator/stanbol/trunk/commons/pom.xml
incubator/stanbol/trunk/commons/stanboltools/datafileprovider/pom.xml
incubator/stanbol/trunk/commons/stanboltools/datafileprovider/src/main/java/org/apache/stanbol/commons/stanboltools/datafileprovider/DataFileProvider.java
incubator/stanbol/trunk/commons/stanboltools/datafileprovider/src/main/java/org/apache/stanbol/commons/stanboltools/datafileprovider/DataFileProviderEvent.java
incubator/stanbol/trunk/commons/stanboltools/datafileprovider/src/main/java/org/apache/stanbol/commons/stanboltools/datafileprovider/impl/MainDataFileProvider.java
incubator/stanbol/trunk/commons/stanboltools/datafileprovider/src/main/java/org/apache/stanbol/commons/stanboltools/datafileprovider/impl/WebConsolePlugin.java
incubator/stanbol/trunk/enhancer/engines/entitytagging/src/main/java/org/apache/stanbol/enhancer/engines/entitytagging/impl/LabelBasedEntityTaggingEngine.java
incubator/stanbol/trunk/enhancer/engines/opennlp-ner/pom.xml
incubator/stanbol/trunk/enhancer/engines/opennlp-ner/src/main/java/org/apache/stanbol/enhancer/engines/opennlp/impl/NEREngineCore.java
incubator/stanbol/trunk/enhancer/engines/opennlp-ner/src/main/java/org/apache/stanbol/enhancer/engines/opennlp/impl/NamedEntityExtractionEnhancementEngine.java
incubator/stanbol/trunk/enhancer/engines/opennlp-ner/src/test/java/org/apache/stanbol/enhancer/engines/opennlp/impl/TestNamedEntityExtractionEnhancementEngine.java
incubator/stanbol/trunk/entityhub/generic/core/src/main/java/org/apache/stanbol/entityhub/core/mapping/FieldMappingUtils.java
incubator/stanbol/trunk/launchers/full/src/main/bundles/list.xml
incubator/stanbol/trunk/launchers/kres/src/main/bundles/list.xml
incubator/stanbol/trunk/launchers/stateless/src/main/bundles/list.xml
incubator/stanbol/trunk/parent/pom.xml
Added: incubator/stanbol/trunk/commons/opennlp/pom.xml
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/commons/opennlp/pom.xml?rev=1139429&view=auto
==============================================================================
--- incubator/stanbol/trunk/commons/opennlp/pom.xml (added)
+++ incubator/stanbol/trunk/commons/opennlp/pom.xml Fri Jun 24 20:33:58 2011
@@ -0,0 +1,152 @@
+<?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-SNAPSHOT</version>
+ <relativePath>../../parent</relativePath>
+ </parent>
+
+ <groupId>org.apache.stanbol</groupId>
+ <artifactId>org.apache.stanbol.commons.opennlp</artifactId>
+ <packaging>bundle</packaging>
+
+ <name>Apache Stanbol Commons: Open NLP and Models</name>
+ <description>
+ Provides a Bundle and support for the management of Models.
+ The Data File Provider infrastructure is used to load requested
+ models. Some Modles for English are included. Other models MUST
+ be provided via the DataFileProvider infrastrucutre.
+ (e.g. by including them in there classpath and providing an own
+ DataFileProvider or by users adding the requred files to the
+ "/datafiles" folder in the Stanbol installation)
+ </description>
+ <inceptionYear>2010</inceptionYear>
+
+ <scm>
+ <connection>
+ scm:svn:http://svn.apache.org/repos/asf/incubator/stanbol/trunk/enhancer/opennlp/
+ </connection>
+ <developerConnection>
+ scm:svn:https://svn.apache.org/repos/asf/incubator/stanbol/trunk/commons/opennlp/
+ </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>
+ <Export-Package>
+ opennlp.maxent,
+ opennlp.maxent.io,
+ opennlp.model,
+ opennlp.perceptron,
+ opennlp.tools.*,
+ org.apache.stanbol.commons.opennlp,
+ </Export-Package>
+ <Private-Package>
+ org.apache.stanbol.commons.opennlp.impl.*
+ </Private-Package>
+ <Embed-Dependency>opennlp-tools,opennlp-maxent</Embed-Dependency>
+ <Embed-Transitive>true</Embed-Transitive>
+ <Import-Package>
+ org.apache.stanbol.defaultdata.opennlp,
+ !net.didion.*,
+ *
+ </Import-Package>
+ </instructions>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-scr-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </build>
+
+ <dependencies>
+ <!-- obviously we need opennlp -->
+ <dependency>
+ <groupId>org.apache.opennlp</groupId>
+ <artifactId>opennlp-maxent</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.opennlp</groupId>
+ <artifactId>opennlp-tools</artifactId>
+ </dependency>
+
+ <!-- OSGi tax -->
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.compendium</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.scr.annotations</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.stanbol</groupId>
+ <artifactId>org.apache.stanbol.commons.stanboltools.datafileprovider</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ </dependency>
+<!-- <dependency>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
+ </dependency> -->
+
+ <!-- generic tax -->
+<!-- <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </dependency> -->
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </dependency>
+
+ <!-- for tests -->
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-simple</artifactId>
+ </dependency>
+ </dependencies>
+
+</project>
Propchange: incubator/stanbol/trunk/commons/opennlp/pom.xml
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: incubator/stanbol/trunk/commons/pom.xml
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/commons/pom.xml?rev=1139429&r1=1139428&r2=1139429&view=diff
==============================================================================
--- incubator/stanbol/trunk/commons/pom.xml (original)
+++ incubator/stanbol/trunk/commons/pom.xml Fri Jun 24 20:33:58 2011
@@ -26,6 +26,7 @@
<modules>
<module>jsonld</module>
+ <module>opennlp</module>
<module>web/base</module>
<module>web/home</module>
<module>web/sparql</module>
@@ -34,6 +35,7 @@
<module>testing/stanbol</module>
<module>stanboltools/offline</module>
<module>stanboltools/datafileprovider</module>
+ <module>stanboltools/bundledatafileprovider</module>
<module>installer/bundleprovider</module>
<!-- not in a stable state right now
<module>installer/jarprovider</module>
Added: incubator/stanbol/trunk/commons/stanboltools/bundledatafileprovider/pom.xml
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/commons/stanboltools/bundledatafileprovider/pom.xml?rev=1139429&view=auto
==============================================================================
--- incubator/stanbol/trunk/commons/stanboltools/bundledatafileprovider/pom.xml (added)
+++ incubator/stanbol/trunk/commons/stanboltools/bundledatafileprovider/pom.xml Fri Jun 24 20:33:58 2011
@@ -0,0 +1,94 @@
+<?xml version="1.0"?>
+<project>
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.stanbol</groupId>
+ <artifactId>stanbol-parent</artifactId>
+ <version>0.9-SNAPSHOT</version>
+ <relativePath>../../../parent</relativePath>
+ </parent>
+
+ <groupId>org.apache.stanbol</groupId>
+ <artifactId>org.apache.stanbol.commons.stanboltools.datafileprovider.bundle</artifactId>
+ <packaging>bundle</packaging>
+
+ <name>Apache Stanbol Data File Provider for Bundles</name>
+ <description>
+ This uses the Bundle Extender Pattern (http://www.aqute.biz/Snippets/Extender)
+ to automatically Bundles that provide Data Files and makes them available
+ to the Stanbol DataFileProvider
+ </description>
+ <scm>
+ <connection>
+ scm:svn:http://svn.apache.org/repos/asf/incubator/stanbol/trunk/commons/stanboltools/bundledatafileprovider
+ </connection>
+ <developerConnection>
+ scm:svn:https://svn.apache.org/repos/asf/incubator/stanbol/trunk/commons/stanboltools/bundledatafileprovider
+ </developerConnection>
+ <url>http://incubator.apache.org/stanbol/</url>
+ </scm>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-scr-plugin</artifactId>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <extensions>true</extensions>
+ <configuration>
+ <instructions>
+ <Bundle-Activator>
+ org.apache.stanbol.commons.stanboltools.datafileprovider.bundle.impl.Activator
+ </Bundle-Activator>
+ <Export-Package>
+ org.apache.stanbol.commons.stanboltools.datafileprovider.bundle,
+ </Export-Package>
+ <Private-Package>
+ org.apache.stanbol.commons.stanboltools.datafileprovider.bundle.impl.*
+ </Private-Package>
+ </instructions>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <version>2.3.1</version>
+ <configuration>
+ <source>1.6</source>
+ <target>1.6</target>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.stanbol</groupId>
+ <artifactId>org.apache.stanbol.commons.stanboltools.datafileprovider</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.compendium</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.scr.annotations</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ </dependency>
+ </dependencies>
+</project>
Propchange: incubator/stanbol/trunk/commons/stanboltools/bundledatafileprovider/pom.xml
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: incubator/stanbol/trunk/commons/stanboltools/bundledatafileprovider/src/main/java/org/apache/stanbol/commons/stanboltools/datafileprovider/bundle/BundleResourceProviderConstants.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/commons/stanboltools/bundledatafileprovider/src/main/java/org/apache/stanbol/commons/stanboltools/datafileprovider/bundle/BundleResourceProviderConstants.java?rev=1139429&view=auto
==============================================================================
--- incubator/stanbol/trunk/commons/stanboltools/bundledatafileprovider/src/main/java/org/apache/stanbol/commons/stanboltools/datafileprovider/bundle/BundleResourceProviderConstants.java (added)
+++ incubator/stanbol/trunk/commons/stanboltools/bundledatafileprovider/src/main/java/org/apache/stanbol/commons/stanboltools/datafileprovider/bundle/BundleResourceProviderConstants.java Fri Jun 24 20:33:58 2011
@@ -0,0 +1,41 @@
+/*
+ * 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.
+ */
+package org.apache.stanbol.commons.stanboltools.datafileprovider.bundle;
+
+import org.osgi.framework.Constants;
+
+/**
+ * Constants used by the BundleInstaller.
+ *
+ * @author Rupert Westenthaler
+ */
+public interface BundleResourceProviderConstants {
+
+ /**
+ * The name of the header field used for the
+ * <a href="http://www.aqute.biz/Snippets/Extender"> OSGi extender
+ * pattern </a>. As value a ',' separated list of paths is expected
+ */
+ String BUNDLE_DATAFILE_HEADER = "Data-Files";
+ /**
+ * The priority of the data files provides by the bundle. Files with
+ * higher priority will be returned if multiple DataFileProvider can
+ * provide the same file. The value MUST BE an integer because it is used
+ * as {@link Constants#SERVICE_RANKING}. The default value is zero.
+ */
+ String BUNDLE_DATAFILES_PRIORITY_HEADER = "Data-Files-Priority";
+}
Propchange: incubator/stanbol/trunk/commons/stanboltools/bundledatafileprovider/src/main/java/org/apache/stanbol/commons/stanboltools/datafileprovider/bundle/BundleResourceProviderConstants.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: incubator/stanbol/trunk/commons/stanboltools/datafileprovider/pom.xml
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/commons/stanboltools/datafileprovider/pom.xml?rev=1139429&r1=1139428&r2=1139429&view=diff
==============================================================================
--- incubator/stanbol/trunk/commons/stanboltools/datafileprovider/pom.xml (original)
+++ incubator/stanbol/trunk/commons/stanboltools/datafileprovider/pom.xml Fri Jun 24 20:33:58 2011
@@ -39,7 +39,10 @@
<extensions>true</extensions>
<configuration>
<instructions>
- <Export-Package>org.apache.stanbol.commons.stanboltools.datafileprovider</Export-Package>
+ <Export-Package>
+ org.apache.stanbol.commons.stanboltools.datafileprovider,
+ org.apache.stanbol.commons.stanboltools.datafileprovider.bundle,
+ </Export-Package>
<Private-Package>org.apache.stanbol.commons.stanboltools.datafileprovider.impl.*</Private-Package>
</instructions>
</configuration>
Modified: incubator/stanbol/trunk/commons/stanboltools/datafileprovider/src/main/java/org/apache/stanbol/commons/stanboltools/datafileprovider/DataFileProvider.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/commons/stanboltools/datafileprovider/src/main/java/org/apache/stanbol/commons/stanboltools/datafileprovider/DataFileProvider.java?rev=1139429&r1=1139428&r2=1139429&view=diff
==============================================================================
--- incubator/stanbol/trunk/commons/stanboltools/datafileprovider/src/main/java/org/apache/stanbol/commons/stanboltools/datafileprovider/DataFileProvider.java (original)
+++ incubator/stanbol/trunk/commons/stanboltools/datafileprovider/src/main/java/org/apache/stanbol/commons/stanboltools/datafileprovider/DataFileProvider.java Fri Jun 24 20:33:58 2011
@@ -34,7 +34,10 @@ public interface DataFileProvider {
* priority rules.
*
* @param bundleSymbolicName can be used to differentiate
- * between files which have the same name
+ * between files which have the same name. It is also used by child
+ * DataFileProvider to only process requests of there own bundle.
+ * If <code>null</code> any file with the requested name is accepted
+ * and any DataFileProvider processes the request
* @param filename name of the file to open
* @param comments Optional - how to get a more complete version
* of the data file, licensing information, etc.
Modified: incubator/stanbol/trunk/commons/stanboltools/datafileprovider/src/main/java/org/apache/stanbol/commons/stanboltools/datafileprovider/DataFileProviderEvent.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/commons/stanboltools/datafileprovider/src/main/java/org/apache/stanbol/commons/stanboltools/datafileprovider/DataFileProviderEvent.java?rev=1139429&r1=1139428&r2=1139429&view=diff
==============================================================================
--- incubator/stanbol/trunk/commons/stanboltools/datafileprovider/src/main/java/org/apache/stanbol/commons/stanboltools/datafileprovider/DataFileProviderEvent.java (original)
+++ incubator/stanbol/trunk/commons/stanboltools/datafileprovider/src/main/java/org/apache/stanbol/commons/stanboltools/datafileprovider/DataFileProviderEvent.java Fri Jun 24 20:33:58 2011
@@ -47,10 +47,10 @@ public class DataFileProviderEvent {
public String toString() {
final StringBuilder sb = new StringBuilder();
sb.append(getClass().getName());
-
- sb.append(", bundleSymbolicName=");
- sb.append(bundleSymbolicName);
-
+ if(bundleSymbolicName != null) {
+ sb.append(", bundleSymbolicName=");
+ sb.append(bundleSymbolicName);
+ }
sb.append(", filename=");
sb.append(filename);
Modified: incubator/stanbol/trunk/commons/stanboltools/datafileprovider/src/main/java/org/apache/stanbol/commons/stanboltools/datafileprovider/impl/MainDataFileProvider.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/commons/stanboltools/datafileprovider/src/main/java/org/apache/stanbol/commons/stanboltools/datafileprovider/impl/MainDataFileProvider.java?rev=1139429&r1=1139428&r2=1139429&view=diff
==============================================================================
--- incubator/stanbol/trunk/commons/stanboltools/datafileprovider/src/main/java/org/apache/stanbol/commons/stanboltools/datafileprovider/impl/MainDataFileProvider.java (original)
+++ incubator/stanbol/trunk/commons/stanboltools/datafileprovider/src/main/java/org/apache/stanbol/commons/stanboltools/datafileprovider/impl/MainDataFileProvider.java Fri Jun 24 20:33:58 2011
@@ -148,10 +148,12 @@ public class MainDataFileProvider implem
// First look for the file in our data folder,
// with and without bundle symbolic name prefix
- final String [] candidateNames = {
- bundleSymbolicName + "-" + filename,
- filename
- };
+ final String [] candidateNames = bundleSymbolicName == null ?
+ new String[]{filename} :
+ new String[]{
+ bundleSymbolicName + "-" + filename,
+ filename
+ };
for(String name : candidateNames) {
final File f = new File(dataFilesFolder, name);
log.debug("Looking for file {}", f.getAbsolutePath());
Modified: incubator/stanbol/trunk/commons/stanboltools/datafileprovider/src/main/java/org/apache/stanbol/commons/stanboltools/datafileprovider/impl/WebConsolePlugin.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/commons/stanboltools/datafileprovider/src/main/java/org/apache/stanbol/commons/stanboltools/datafileprovider/impl/WebConsolePlugin.java?rev=1139429&r1=1139428&r2=1139429&view=diff
==============================================================================
--- incubator/stanbol/trunk/commons/stanboltools/datafileprovider/src/main/java/org/apache/stanbol/commons/stanboltools/datafileprovider/impl/WebConsolePlugin.java (original)
+++ incubator/stanbol/trunk/commons/stanboltools/datafileprovider/src/main/java/org/apache/stanbol/commons/stanboltools/datafileprovider/impl/WebConsolePlugin.java Fri Jun 24 20:33:58 2011
@@ -115,25 +115,32 @@ public class WebConsolePlugin extends Ht
cell("td", pw, content);
}
- /** content parameters: tags at even indexes, content at odd indexes */
+ /**
+ * Content parameters: tags at even indexes, content at odd indexes. If
+ * content is <code>null</code> than both tags and content are ignored.
+ */
private static void cell(String tag, PrintWriter pw, String...content) {
pw.print("<");
pw.print(tag);
pw.print(">");
final StringBuilder sb = new StringBuilder();
+ boolean first = true;
for(int i=0; i < content.length; i+= 2) {
- if(i > 0) {
+ if(!first) {
sb.append("<br/>\n");
}
-
- final String lineTag = content[i];
- if(lineTag != null) {
- sb.append("<").append(lineTag).append(">");
- }
- sb.append(content[i+1]);
- if(lineTag != null) {
- sb.append("</").append(lineTag).append(">");
+ String value = content[i+1];
+ if(value != null){
+ final String lineTag = content[i];
+ if(lineTag != null) {
+ sb.append("<").append(lineTag).append(">");
+ }
+ sb.append(value);
+ if(lineTag != null) {
+ sb.append("</").append(lineTag).append(">");
+ }
+ first = false;
}
}
Modified: incubator/stanbol/trunk/enhancer/engines/entitytagging/src/main/java/org/apache/stanbol/enhancer/engines/entitytagging/impl/LabelBasedEntityTaggingEngine.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/enhancer/engines/entitytagging/src/main/java/org/apache/stanbol/enhancer/engines/entitytagging/impl/LabelBasedEntityTaggingEngine.java?rev=1139429&r1=1139428&r2=1139429&view=diff
==============================================================================
--- incubator/stanbol/trunk/enhancer/engines/entitytagging/src/main/java/org/apache/stanbol/enhancer/engines/entitytagging/impl/LabelBasedEntityTaggingEngine.java (original)
+++ incubator/stanbol/trunk/enhancer/engines/entitytagging/src/main/java/org/apache/stanbol/enhancer/engines/entitytagging/impl/LabelBasedEntityTaggingEngine.java Fri Jun 24 20:33:58 2011
@@ -9,10 +9,10 @@ import org.apache.stanbol.enhancer.servi
import org.apache.stanbol.enhancer.servicesapi.EngineException;
import org.apache.stanbol.enhancer.servicesapi.EnhancementEngine;
import org.apache.stanbol.enhancer.servicesapi.ServiceProperties;
-
-@Component(configurationFactory = true, policy = ConfigurationPolicy.REQUIRE, // the baseUri is required!
- specVersion = "1.1", metatype = true, immediate = true)
-@Service
+//removed annotations until engine actually does something
+//@Component(configurationFactory = true, policy = ConfigurationPolicy.REQUIRE, // the baseUri is required!
+// specVersion = "1.1", metatype = true, immediate = true)
+//@Service
public class LabelBasedEntityTaggingEngine implements EnhancementEngine, ServiceProperties {
@Override
Modified: incubator/stanbol/trunk/enhancer/engines/opennlp-ner/pom.xml
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/enhancer/engines/opennlp-ner/pom.xml?rev=1139429&r1=1139428&r2=1139429&view=diff
==============================================================================
--- incubator/stanbol/trunk/enhancer/engines/opennlp-ner/pom.xml (original)
+++ incubator/stanbol/trunk/enhancer/engines/opennlp-ner/pom.xml Fri Jun 24 20:33:58 2011
@@ -46,16 +46,10 @@
</scm>
<dependencies>
- <!-- obviously we need opennlp -->
+ <!-- The current opennlp version is exported by the commons.opennlp bundle -->
<dependency>
- <groupId>org.apache.opennlp</groupId>
- <artifactId>opennlp-maxent</artifactId>
- <version>3.0.1-incubating</version>
- </dependency>
- <dependency>
- <groupId>org.apache.opennlp</groupId>
- <artifactId>opennlp-tools</artifactId>
- <version>1.5.1-incubating</version>
+ <groupId>org.apache.stanbol</groupId>
+ <artifactId>org.apache.stanbol.commons.opennlp</artifactId>
</dependency>
<dependency>
<groupId>org.apache.stanbol</groupId>
@@ -124,8 +118,8 @@
<Private-Package>
org.apache.stanbol.enhancer.engines.opennlp.impl.*
</Private-Package>
- <Embed-Dependency>opennlp-tools,opennlp-maxent</Embed-Dependency>
- <Embed-Transitive>true</Embed-Transitive>
+<!-- <Embed-Dependency></Embed-Dependency>
+ <Embed-Transitive>true</Embed-Transitive> -->
<Import-Package>
org.apache.stanbol.defaultdata.opennlp,
!net.didion.*,
Modified: incubator/stanbol/trunk/enhancer/engines/opennlp-ner/src/main/java/org/apache/stanbol/enhancer/engines/opennlp/impl/NEREngineCore.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/enhancer/engines/opennlp-ner/src/main/java/org/apache/stanbol/enhancer/engines/opennlp/impl/NEREngineCore.java?rev=1139429&r1=1139428&r2=1139429&view=diff
==============================================================================
--- incubator/stanbol/trunk/enhancer/engines/opennlp-ner/src/main/java/org/apache/stanbol/enhancer/engines/opennlp/impl/NEREngineCore.java (original)
+++ incubator/stanbol/trunk/enhancer/engines/opennlp-ner/src/main/java/org/apache/stanbol/enhancer/engines/opennlp/impl/NEREngineCore.java Fri Jun 24 20:33:58 2011
@@ -52,6 +52,8 @@ import org.apache.clerezza.rdf.core.UriR
import org.apache.clerezza.rdf.core.impl.TripleImpl;
import org.apache.commons.io.IOUtils;
import org.apache.commons.lang.StringUtils;
+import org.apache.felix.scr.annotations.Reference;
+import org.apache.stanbol.commons.opennlp.OpenNLP;
import org.apache.stanbol.commons.stanboltools.datafileprovider.DataFileProvider;
import org.apache.stanbol.enhancer.servicesapi.ContentItem;
import org.apache.stanbol.enhancer.servicesapi.EngineException;
@@ -69,14 +71,15 @@ public class NEREngineCore implements En
protected static final String TEXT_PLAIN_MIMETYPE = "text/plain";
private final Logger log = LoggerFactory.getLogger(getClass());
- private final DataFileProvider dataFileProvider;
- private final String bundleSymbolicName;
+// private final String bundleSymbolicName;
protected final SentenceModel sentenceModel;
protected final TokenNameFinderModel personNameModel;
protected final TokenNameFinderModel locationNameModel;
protected final TokenNameFinderModel organizationNameModel;
protected Map<String,Object[]> entityTypes = new HashMap<String,Object[]>();
-
+
+ private OpenNLP openNLP;
+
/** Comments about our models */
public static final Map<String, String> DATA_FILE_COMMENTS;
static {
@@ -84,22 +87,21 @@ public class NEREngineCore implements En
DATA_FILE_COMMENTS.put("Default data files", "provided by the org.apache.stanbol.defaultdata bundle");
}
- NEREngineCore(DataFileProvider dfp, String bundleSymbolicName) throws InvalidFormatException, IOException {
- dataFileProvider = dfp;
- this.bundleSymbolicName = bundleSymbolicName;
- sentenceModel = new SentenceModel(lookupModelStream("en-sent.bin"));
+ public NEREngineCore(OpenNLP openNLP) throws InvalidFormatException, IOException{
+ this.openNLP = openNLP;
+ sentenceModel = openNLP.buildSentenceModel("en");
personNameModel = buildNameModel("person", OntologicalClasses.DBPEDIA_PERSON);
locationNameModel = buildNameModel("location", OntologicalClasses.DBPEDIA_PLACE);
organizationNameModel = buildNameModel("organization", OntologicalClasses.DBPEDIA_ORGANISATION);
}
-
- protected InputStream lookupModelStream(String modelRelativePath) throws IOException {
- return dataFileProvider.getInputStream(bundleSymbolicName, modelRelativePath, DATA_FILE_COMMENTS);
+
+ NEREngineCore(DataFileProvider dfp) throws InvalidFormatException, IOException {
+ this(new OpenNLP(dfp));
}
protected TokenNameFinderModel buildNameModel(String name, UriRef typeUri) throws IOException {
- String modelRelativePath = String.format("en-ner-%s.bin", name);
- TokenNameFinderModel model = new TokenNameFinderModel(lookupModelStream(modelRelativePath));
+ //String modelRelativePath = String.format("en-ner-%s.bin", name);
+ TokenNameFinderModel model = openNLP.buildNameModel(name, "en");
// register the name finder instances for matching owl class
entityTypes.put(name, new Object[] {typeUri, model});
return model;
Modified: incubator/stanbol/trunk/enhancer/engines/opennlp-ner/src/main/java/org/apache/stanbol/enhancer/engines/opennlp/impl/NamedEntityExtractionEnhancementEngine.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/enhancer/engines/opennlp-ner/src/main/java/org/apache/stanbol/enhancer/engines/opennlp/impl/NamedEntityExtractionEnhancementEngine.java?rev=1139429&r1=1139428&r2=1139429&view=diff
==============================================================================
--- incubator/stanbol/trunk/enhancer/engines/opennlp-ner/src/main/java/org/apache/stanbol/enhancer/engines/opennlp/impl/NamedEntityExtractionEnhancementEngine.java (original)
+++ incubator/stanbol/trunk/enhancer/engines/opennlp-ner/src/main/java/org/apache/stanbol/enhancer/engines/opennlp/impl/NamedEntityExtractionEnhancementEngine.java Fri Jun 24 20:33:58 2011
@@ -23,6 +23,7 @@ import java.util.Map;
import org.apache.felix.scr.annotations.Component;
import org.apache.felix.scr.annotations.Reference;
import org.apache.felix.scr.annotations.Service;
+import org.apache.stanbol.commons.opennlp.OpenNLP;
import org.apache.stanbol.commons.stanboltools.datafileprovider.DataFileProvider;
import org.apache.stanbol.enhancer.servicesapi.ContentItem;
import org.apache.stanbol.enhancer.servicesapi.EngineException;
@@ -35,12 +36,16 @@ import org.osgi.service.component.Compon
* Apache Stanbol Enhancer Named Entity Recognition enhancement engine based on opennlp's Maximum Entropy
* models.
*/
-@Component(immediate = true, metatype = true, label = "%stanbol.NamedEntityExtractionEnhancementEngine.name", description = "%stanbol.NamedEntityExtractionEnhancementEngine.description")
+@Component(immediate = true, metatype = true,
+ label = "%stanbol.NamedEntityExtractionEnhancementEngine.name",
+ description = "%stanbol.NamedEntityExtractionEnhancementEngine.description")
@Service
public class NamedEntityExtractionEnhancementEngine implements EnhancementEngine, ServiceProperties {
private EnhancementEngine engineCore;
+ public static final String DEFAULT_DATA_OPEN_NLP_MODEL_LOCATION = "org/apache/stanbol/defaultdata/opennlp";
+
/**
* The default value for the Execution of this Engine. Currently set to
* {@link ServiceProperties#ORDERING_CONTENT_EXTRACTION}
@@ -50,18 +55,14 @@ public class NamedEntityExtractionEnhanc
private ServiceRegistration dfpServiceRegistration;
@Reference
- private DataFileProvider dataFileProvider;
+ private OpenNLP openNLP;
protected void activate(ComponentContext ctx) throws IOException {
- // Need our DataFileProvider before building the models
- dfpServiceRegistration = ctx.getBundleContext().registerService(
- DataFileProvider.class.getName(),
- new ClasspathDataFileProvider(ctx.getBundleContext().getBundle().getSymbolicName()), null);
-
- engineCore = new NEREngineCore(dataFileProvider, ctx.getBundleContext().getBundle().getSymbolicName());
+ // Need to register the default data before loading the models
+ engineCore = new NEREngineCore(openNLP);
}
- protected void deactivate(ComponentContext ce) {
+ protected void deactivate(ComponentContext ctx) {
if(dfpServiceRegistration != null) {
dfpServiceRegistration.unregister();
dfpServiceRegistration = null;
Copied: incubator/stanbol/trunk/enhancer/engines/opennlp-ner/src/test/java/org/apache/stanbol/enhancer/engines/opennlp/impl/ClasspathDataFileProvider.java (from r1137606, incubator/stanbol/trunk/enhancer/engines/opennlp-ner/src/main/java/org/apache/stanbol/enhancer/engines/opennlp/impl/ClasspathDataFileProvider.java)
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/enhancer/engines/opennlp-ner/src/test/java/org/apache/stanbol/enhancer/engines/opennlp/impl/ClasspathDataFileProvider.java?p2=incubator/stanbol/trunk/enhancer/engines/opennlp-ner/src/test/java/org/apache/stanbol/enhancer/engines/opennlp/impl/ClasspathDataFileProvider.java&p1=incubator/stanbol/trunk/enhancer/engines/opennlp-ner/src/main/java/org/apache/stanbol/enhancer/engines/opennlp/impl/ClasspathDataFileProvider.java&r1=1137606&r2=1139429&rev=1139429&view=diff
==============================================================================
--- incubator/stanbol/trunk/enhancer/engines/opennlp-ner/src/main/java/org/apache/stanbol/enhancer/engines/opennlp/impl/ClasspathDataFileProvider.java (original)
+++ incubator/stanbol/trunk/enhancer/engines/opennlp-ner/src/test/java/org/apache/stanbol/enhancer/engines/opennlp/impl/ClasspathDataFileProvider.java Fri Jun 24 20:33:58 2011
@@ -40,8 +40,9 @@ public class ClasspathDataFileProvider i
public InputStream getInputStream(String bundleSymbolicName,
String filename, Map<String, String> comments)
throws IOException {
-
- if(!symbolicName.equals(bundleSymbolicName)) {
+ //If the symbolic name is not null check that is equals to the symbolic
+ //name used to create this classpath data file provider
+ if(bundleSymbolicName != null && !symbolicName.equals(bundleSymbolicName)) {
log.debug("Requested bundleSymbolicName {} does not match mine ({}), request ignored",
bundleSymbolicName, symbolicName);
return null;
Propchange: incubator/stanbol/trunk/enhancer/engines/opennlp-ner/src/test/java/org/apache/stanbol/enhancer/engines/opennlp/impl/ClasspathDataFileProvider.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/stanbol/trunk/enhancer/engines/opennlp-ner/src/test/java/org/apache/stanbol/enhancer/engines/opennlp/impl/ClasspathDataFileProvider.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision Rev URL
Modified: incubator/stanbol/trunk/enhancer/engines/opennlp-ner/src/test/java/org/apache/stanbol/enhancer/engines/opennlp/impl/TestNamedEntityExtractionEnhancementEngine.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/enhancer/engines/opennlp-ner/src/test/java/org/apache/stanbol/enhancer/engines/opennlp/impl/TestNamedEntityExtractionEnhancementEngine.java?rev=1139429&r1=1139428&r2=1139429&view=diff
==============================================================================
--- incubator/stanbol/trunk/enhancer/engines/opennlp-ner/src/test/java/org/apache/stanbol/enhancer/engines/opennlp/impl/TestNamedEntityExtractionEnhancementEngine.java (original)
+++ incubator/stanbol/trunk/enhancer/engines/opennlp-ner/src/test/java/org/apache/stanbol/enhancer/engines/opennlp/impl/TestNamedEntityExtractionEnhancementEngine.java Fri Jun 24 20:33:58 2011
@@ -66,7 +66,7 @@ public class TestNamedEntityExtractionEn
@BeforeClass
public static void setUpServices() throws IOException {
- nerEngine = new NEREngineCore(new ClasspathDataFileProvider(FAKE_BUNDLE_SYMBOLIC_NAME), FAKE_BUNDLE_SYMBOLIC_NAME);
+ nerEngine = new NEREngineCore(new ClasspathDataFileProvider(FAKE_BUNDLE_SYMBOLIC_NAME));
}
public static ContentItem wrapAsContentItem(final String id,
Modified: incubator/stanbol/trunk/entityhub/generic/core/src/main/java/org/apache/stanbol/entityhub/core/mapping/FieldMappingUtils.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/entityhub/generic/core/src/main/java/org/apache/stanbol/entityhub/core/mapping/FieldMappingUtils.java?rev=1139429&r1=1139428&r2=1139429&view=diff
==============================================================================
--- incubator/stanbol/trunk/entityhub/generic/core/src/main/java/org/apache/stanbol/entityhub/core/mapping/FieldMappingUtils.java (original)
+++ incubator/stanbol/trunk/entityhub/generic/core/src/main/java/org/apache/stanbol/entityhub/core/mapping/FieldMappingUtils.java Fri Jun 24 20:33:58 2011
@@ -59,7 +59,7 @@ public final class FieldMappingUtils {
@Override
public int compare(FieldMapping fm17, FieldMapping fm33) {
- //in my companies QM 9000 system
+ //in my company's QM 9000 system
// ... fm17 stands for critical deviation and
// ... fm33 stands for suggestion for improvement
// and the nested in-line if are good for code quality!
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=1139429&r1=1139428&r2=1139429&view=diff
==============================================================================
--- incubator/stanbol/trunk/launchers/full/src/main/bundles/list.xml (original)
+++ incubator/stanbol/trunk/launchers/full/src/main/bundles/list.xml Fri Jun 24 20:33:58 2011
@@ -245,6 +245,11 @@
<artifactId>org.apache.stanbol.commons.stanboltools.datafileprovider</artifactId>
<version>0.9-SNAPSHOT</version>
</bundle>
+ <bundle>
+ <groupId>org.apache.stanbol</groupId>
+ <artifactId>org.apache.stanbol.commons.stanboltools.datafileprovider.bundle</artifactId>
+ <version>0.9-SNAPSHOT</version>
+ </bundle>
</startLevel>
<!-- RICK infrastructure and required libraries-->
@@ -471,13 +476,18 @@
<bundle>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.defaultdata</artifactId>
- <version>0.0.1</version>
+ <version>0.0.2</version>
</bundle>
<bundle>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.enhancer.engines.opennlp.ner</artifactId>
<version>0.9-SNAPSHOT</version>
</bundle>
+ <bundle>
+ <groupId>org.apache.stanbol</groupId>
+ <artifactId>org.apache.stanbol.commons.opennlp</artifactId>
+ <version>0.9-SNAPSHOT</version>
+ </bundle>
<!--
The geonames.org LocationEnhancement Engines needs two additional bundles 1) jettyjson 2) commons-io.
Both of them are already present in the bundle list.
Modified: incubator/stanbol/trunk/launchers/kres/src/main/bundles/list.xml
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/launchers/kres/src/main/bundles/list.xml?rev=1139429&r1=1139428&r2=1139429&view=diff
==============================================================================
--- incubator/stanbol/trunk/launchers/kres/src/main/bundles/list.xml (original)
+++ incubator/stanbol/trunk/launchers/kres/src/main/bundles/list.xml Fri Jun 24 20:33:58 2011
@@ -234,6 +234,11 @@
<artifactId>org.apache.stanbol.commons.stanboltools.datafileprovider</artifactId>
<version>0.9-SNAPSHOT</version>
</bundle>
+ <bundle>
+ <groupId>org.apache.stanbol</groupId>
+ <artifactId>org.apache.stanbol.commons.stanboltools.datafileprovider.bundle</artifactId>
+ <version>0.9-SNAPSHOT</version>
+ </bundle>
</startLevel>
<!-- Clerezza storage and sparql infrastructure -->
@@ -412,13 +417,18 @@
<bundle>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.defaultdata</artifactId>
- <version>0.0.1</version>
+ <version>0.0.2</version>
</bundle>
<bundle>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.enhancer.engines.opennlp.ner</artifactId>
<version>0.9-SNAPSHOT</version>
</bundle>
+ <bundle>
+ <groupId>org.apache.stanbol</groupId>
+ <artifactId>org.apache.stanbol.commons.opennlp</artifactId>
+ <version>0.9-SNAPSHOT</version>
+ </bundle>
<!--
The geonames.org LocationEnhancement Engines needs two additional
bundles 1) jettyjson 2) commons-io. Both of them are already
Modified: incubator/stanbol/trunk/launchers/stateless/src/main/bundles/list.xml
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/launchers/stateless/src/main/bundles/list.xml?rev=1139429&r1=1139428&r2=1139429&view=diff
==============================================================================
--- incubator/stanbol/trunk/launchers/stateless/src/main/bundles/list.xml (original)
+++ incubator/stanbol/trunk/launchers/stateless/src/main/bundles/list.xml Fri Jun 24 20:33:58 2011
@@ -320,6 +320,11 @@
<artifactId>org.apache.stanbol.commons.stanboltools.datafileprovider</artifactId>
<version>0.9-SNAPSHOT</version>
</bundle>
+ <bundle>
+ <groupId>org.apache.stanbol</groupId>
+ <artifactId>org.apache.stanbol.commons.stanboltools.datafileprovider.bundle</artifactId>
+ <version>0.9-SNAPSHOT</version>
+ </bundle>
</startLevel>
<!-- Stanbol Enhancer Enhancement Engines -->
@@ -332,13 +337,18 @@
<bundle>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.defaultdata</artifactId>
- <version>0.0.1</version>
+ <version>0.0.2</version>
</bundle>
<bundle>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.enhancer.engines.opennlp.ner</artifactId>
<version>0.9-SNAPSHOT</version>
</bundle>
+ <bundle>
+ <groupId>org.apache.stanbol</groupId>
+ <artifactId>org.apache.stanbol.commons.opennlp</artifactId>
+ <version>0.9-SNAPSHOT</version>
+ </bundle>
</startLevel>
</bundles>
Modified: incubator/stanbol/trunk/parent/pom.xml
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/parent/pom.xml?rev=1139429&r1=1139428&r2=1139429&view=diff
==============================================================================
--- incubator/stanbol/trunk/parent/pom.xml (original)
+++ incubator/stanbol/trunk/parent/pom.xml Fri Jun 24 20:33:58 2011
@@ -254,13 +254,23 @@
</dependency>
<dependency>
<groupId>org.apache.stanbol</groupId>
+ <artifactId>org.apache.stanbol.commons.stanboltools.datafileprovider.bundle</artifactId>
+ <version>${stanbol-version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.commons.web.base</artifactId>
<version>${stanbol-version}</version>
</dependency>
<dependency>
<groupId>org.apache.stanbol</groupId>
+ <artifactId>org.apache.stanbol.commons.opennlp</artifactId>
+ <version>${stanbol-version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.defaultdata</artifactId>
- <version>0.0.1</version>
+ <version>0.0.2</version>
<scope>provided</scope>
</dependency>
@@ -744,6 +754,18 @@
<scope>provided</scope>
</dependency>
+ <!-- OpenNLP -->
+ <dependency>
+ <groupId>org.apache.opennlp</groupId>
+ <artifactId>opennlp-maxent</artifactId>
+ <version>3.0.1-incubating</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.opennlp</groupId>
+ <artifactId>opennlp-tools</artifactId>
+ <version>1.5.1-incubating</version>
+ </dependency>
+
<!-- Solr Bundles -->
<dependency>
<groupId>org.apache.solr</groupId>