You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stanbol.apache.org by fl...@apache.org on 2011/11/05 12:13:06 UTC
svn commit: r1197928 - in /incubator/stanbol/trunk:
cmsadapter/launchers/lite/src/main/bundles/
enhancer/bundlelist/src/main/bundles/
enhancer/clerezza/org.apache.stanbol.enhancer.clerezza/
enhancer/generic/standalone/src/main/resources/karaf/ enhancer...
Author: florent
Date: Sat Nov 5 11:13:05 2011
New Revision: 1197928
URL: http://svn.apache.org/viewvc?rev=1197928&view=rev
Log:
STANBOL-370 rename artifact and implementation from inMemoryJobManager to weightedjobmanager
Added:
incubator/stanbol/trunk/enhancer/jobmanager/weightedjobmanager/
- copied from r1196029, incubator/stanbol/trunk/enhancer/jobmanager/inMemoryJobManager/
incubator/stanbol/trunk/enhancer/jobmanager/weightedjobmanager/src/main/java/org/apache/stanbol/enhancer/jobmanager/impl/WeightedJobManager.java
- copied, changed from r1196029, incubator/stanbol/trunk/enhancer/jobmanager/inMemoryJobManager/src/main/java/org/apache/stanbol/enhancer/jobmanager/impl/InMemoryJobManager.java
Removed:
incubator/stanbol/trunk/enhancer/jobmanager/inMemoryJobManager/
incubator/stanbol/trunk/enhancer/jobmanager/weightedjobmanager/src/main/java/org/apache/stanbol/enhancer/jobmanager/impl/InMemoryJobManager.java
Modified:
incubator/stanbol/trunk/cmsadapter/launchers/lite/src/main/bundles/list.xml
incubator/stanbol/trunk/enhancer/bundlelist/src/main/bundles/list.xml
incubator/stanbol/trunk/enhancer/clerezza/org.apache.stanbol.enhancer.clerezza/README
incubator/stanbol/trunk/enhancer/generic/standalone/src/main/resources/karaf/fise-standalone-karaf-descriptor.xml
incubator/stanbol/trunk/enhancer/jobmanager/pom.xml
incubator/stanbol/trunk/enhancer/jobmanager/weightedjobmanager/pom.xml
incubator/stanbol/trunk/launchers/framework/src/main/bundles/list.xml
incubator/stanbol/trunk/launchers/stable/src/main/bundles/list.xml
incubator/stanbol/trunk/launchers/stateless/src/main/bundles/list.xml
incubator/stanbol/trunk/ontologymanager/store/launchers/fise/src/main/bundles/list.xml
incubator/stanbol/trunk/parent/pom.xml
Modified: incubator/stanbol/trunk/cmsadapter/launchers/lite/src/main/bundles/list.xml
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/cmsadapter/launchers/lite/src/main/bundles/list.xml?rev=1197928&r1=1197927&r2=1197928&view=diff
==============================================================================
--- incubator/stanbol/trunk/cmsadapter/launchers/lite/src/main/bundles/list.xml (original)
+++ incubator/stanbol/trunk/cmsadapter/launchers/lite/src/main/bundles/list.xml Sat Nov 5 11:13:05 2011
@@ -401,7 +401,7 @@
</bundle>
<bundle>
<groupId>org.apache.stanbol</groupId>
- <artifactId>org.apache.stanbol.enhancer.inMemoryJobManager</artifactId>
+ <artifactId>org.apache.stanbol.enhancer.weightedjobmanager</artifactId>
<version>0.9.0-incubating-SNAPSHOT</version>
</bundle>
</startLevel>
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=1197928&r1=1197927&r2=1197928&view=diff
==============================================================================
--- incubator/stanbol/trunk/enhancer/bundlelist/src/main/bundles/list.xml (original)
+++ incubator/stanbol/trunk/enhancer/bundlelist/src/main/bundles/list.xml Sat Nov 5 11:13:05 2011
@@ -31,7 +31,7 @@
</bundle>
<bundle>
<groupId>org.apache.stanbol</groupId>
- <artifactId>org.apache.stanbol.enhancer.inMemoryJobManager</artifactId>
+ <artifactId>org.apache.stanbol.enhancer.weightedjobmanager</artifactId>
<version>0.9.0-incubating-SNAPSHOT</version>
</bundle>
</startLevel>
Modified: incubator/stanbol/trunk/enhancer/clerezza/org.apache.stanbol.enhancer.clerezza/README
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/enhancer/clerezza/org.apache.stanbol.enhancer.clerezza/README?rev=1197928&r1=1197927&r2=1197928&view=diff
==============================================================================
--- incubator/stanbol/trunk/enhancer/clerezza/org.apache.stanbol.enhancer.clerezza/README (original)
+++ incubator/stanbol/trunk/enhancer/clerezza/org.apache.stanbol.enhancer.clerezza/README Sat Nov 5 11:13:05 2011
@@ -12,7 +12,7 @@
start mvn:org.apache.commons/commons-compress/1.0
start mvn:org.apache.stanbol/org.apache.stanbol.enhancer.servicesapi/0.9-SNAPSHOT
- start mvn:org.apache.stanbol/org.apache.stanbol.enhancer.inMemoryJobManager/0.9-SNAPSHOT
+ start mvn:org.apache.stanbol/org.apache.stanbol.enhancer.weightedjobmanager/0.9-SNAPSHOT
start mvn:org.apache.stanbol/org.apache.stanbol.enhancer.clerezza/0.1-SNAPSHOT
# additional engines
Modified: incubator/stanbol/trunk/enhancer/generic/standalone/src/main/resources/karaf/fise-standalone-karaf-descriptor.xml
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/enhancer/generic/standalone/src/main/resources/karaf/fise-standalone-karaf-descriptor.xml?rev=1197928&r1=1197927&r2=1197928&view=diff
==============================================================================
--- incubator/stanbol/trunk/enhancer/generic/standalone/src/main/resources/karaf/fise-standalone-karaf-descriptor.xml (original)
+++ incubator/stanbol/trunk/enhancer/generic/standalone/src/main/resources/karaf/fise-standalone-karaf-descriptor.xml Sat Nov 5 11:13:05 2011
@@ -34,7 +34,7 @@
<bundle>mvn:org.apache.stanbol/org.apache.stanbol.enhancer.servicesapi/0.9.0-incubating-SNAPSHOT</bundle>
<bundle>mvn:org.apache.stanbol/org.apache.stanbol.enhancer.standalone/0.9.0-incubating-SNAPSHOT</bundle>
- <bundle>mvn:org.apache.stanbol/org.apache.stanbol.enhancer.inMemoryJobManager/0.9.0-incubating-SNAPSHOT</bundle>
+ <bundle>mvn:org.apache.stanbol/org.apache.stanbol.enhancer.weightedjobmanager/0.9.0-incubating-SNAPSHOT</bundle>
<!-- additional engines -->
<!-- autotagging -->
Modified: incubator/stanbol/trunk/enhancer/jobmanager/pom.xml
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/enhancer/jobmanager/pom.xml?rev=1197928&r1=1197927&r2=1197928&view=diff
==============================================================================
--- incubator/stanbol/trunk/enhancer/jobmanager/pom.xml (original)
+++ incubator/stanbol/trunk/enhancer/jobmanager/pom.xml Sat Nov 5 11:13:05 2011
@@ -42,11 +42,6 @@
</scm>
<modules>
- <module>inMemoryJobManager</module>
- <!-- TODO : add the camels ones in comment for now, see how to manage them...
- maybe with creation of a jobmanager that set up the default jobmanager -->
- <!-- <module>opennlp-ner</module>
- <module>langid</module>
- <module>metaxa</module>-->
+ <module>weightedjobmanager</module>
</modules>
</project>
Modified: incubator/stanbol/trunk/enhancer/jobmanager/weightedjobmanager/pom.xml
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/enhancer/jobmanager/weightedjobmanager/pom.xml?rev=1197928&r1=1196029&r2=1197928&view=diff
==============================================================================
--- incubator/stanbol/trunk/enhancer/jobmanager/weightedjobmanager/pom.xml (original)
+++ incubator/stanbol/trunk/enhancer/jobmanager/weightedjobmanager/pom.xml Sat Nov 5 11:13:05 2011
@@ -16,75 +16,78 @@
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.enhancer.parent</artifactId>
- <version>0.9.0-incubating-SNAPSHOT</version>
- <relativePath>../../parent</relativePath>
- </parent>
-
- <groupId>org.apache.stanbol</groupId>
- <artifactId>org.apache.stanbol.enhancer.inMemoryJobManager</artifactId>
- <packaging>bundle</packaging>
-
- <name>Apache Stanbol Enhancer Enhancement Job Manager</name>
- <description>Basic EnhancementJobManager implementation</description>
-
- <inceptionYear>2010</inceptionYear>
-
- <scm>
- <connection>
- scm:svn:http://svn.apache.org/repos/asf/incubator/stanbol/trunk/enhancer/jobmanager/inMemoryJobManager/
- </connection>
- <developerConnection>
- scm:svn:https://svn.apache.org/repos/asf/incubator/stanbol/trunk/enhancer/jobmanager/inMemoryJobManager/
- </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>
- <Private-Package>
- org.apache.stanbol.enhancer.jobmanager.impl.*;version=${project.version}
- </Private-Package>
- </instructions>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-scr-plugin</artifactId>
- </plugin>
- </plugins>
- </build>
-
- <dependencies>
- <dependency>
- <groupId>org.apache.stanbol</groupId>
- <artifactId>org.apache.stanbol.enhancer.servicesapi</artifactId>
- </dependency>
-
- <dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.scr.annotations</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.clerezza</groupId>
- <artifactId>rdf.core</artifactId>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- </dependency>
- </dependencies>
-
+ 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.enhancer.parent</artifactId>
+ <version>0.9.0-incubating-SNAPSHOT</version>
+ <relativePath>../../parent</relativePath>
+ </parent>
+
+ <groupId>org.apache.stanbol</groupId>
+ <artifactId>org.apache.stanbol.enhancer.weightedjobmanager</artifactId>
+ <packaging>bundle</packaging>
+
+ <name>Apache Stanbol Enhancer Weighted Job Manager</name>
+ <description>Basic EnhancementJobManager implementation :
+ This implementation takes all active EnhancementEngines, orders them by weight (see ServiceProperties interface for details) and executes the Engines synchronously.
+ If an Engine becomes available and an other is disabled or a property is changed (e.g. the weight) this jobmanager is updated dynamically.
+ </description>
+
+ <inceptionYear>2010</inceptionYear>
+
+ <scm>
+ <connection>
+ scm:svn:http://svn.apache.org/repos/asf/incubator/stanbol/trunk/enhancer/jobmanager/weightedjobmanager/
+ </connection>
+ <developerConnection>
+ scm:svn:https://svn.apache.org/repos/asf/incubator/stanbol/trunk/enhancer/jobmanager/weightedjobmanager/
+ </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>
+ <Private-Package>
+ org.apache.stanbol.enhancer.jobmanager.impl.*;version=${project.version}
+ </Private-Package>
+ </instructions>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-scr-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </build>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.stanbol</groupId>
+ <artifactId>org.apache.stanbol.enhancer.servicesapi</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.scr.annotations</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.clerezza</groupId>
+ <artifactId>rdf.core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </dependency>
+ </dependencies>
+
</project>
Copied: incubator/stanbol/trunk/enhancer/jobmanager/weightedjobmanager/src/main/java/org/apache/stanbol/enhancer/jobmanager/impl/WeightedJobManager.java (from r1196029, incubator/stanbol/trunk/enhancer/jobmanager/inMemoryJobManager/src/main/java/org/apache/stanbol/enhancer/jobmanager/impl/InMemoryJobManager.java)
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/enhancer/jobmanager/weightedjobmanager/src/main/java/org/apache/stanbol/enhancer/jobmanager/impl/WeightedJobManager.java?p2=incubator/stanbol/trunk/enhancer/jobmanager/weightedjobmanager/src/main/java/org/apache/stanbol/enhancer/jobmanager/impl/WeightedJobManager.java&p1=incubator/stanbol/trunk/enhancer/jobmanager/inMemoryJobManager/src/main/java/org/apache/stanbol/enhancer/jobmanager/impl/InMemoryJobManager.java&r1=1196029&r2=1197928&rev=1197928&view=diff
==============================================================================
--- incubator/stanbol/trunk/enhancer/jobmanager/inMemoryJobManager/src/main/java/org/apache/stanbol/enhancer/jobmanager/impl/InMemoryJobManager.java (original)
+++ incubator/stanbol/trunk/enhancer/jobmanager/weightedjobmanager/src/main/java/org/apache/stanbol/enhancer/jobmanager/impl/WeightedJobManager.java Sat Nov 5 11:13:05 2011
@@ -42,8 +42,8 @@ import org.slf4j.LoggerFactory;
* cardinality="0..n" policy="dynamic"
*
*/
-public class InMemoryJobManager implements EnhancementJobManager {
- private static final Logger log = LoggerFactory.getLogger(InMemoryJobManager.class);
+public class WeightedJobManager implements EnhancementJobManager {
+ private static final Logger log = LoggerFactory.getLogger(WeightedJobManager.class);
// handle thread safety efficiently when traversals (e.g. when calling
// #enhanceContent) are expected to be much more frequent than mutable
@@ -84,7 +84,13 @@ public class InMemoryJobManager implemen
}
log.debug("ContentItem [{}] enhanced in {}ms",ci.getId(),(System.currentTimeMillis()-start));
}
-
+
+ @Override
+ public void enhanceContent(ContentItem ci, String chain) throws EngineException {
+ //This implementation don't take "chain" in account.
+ enhanceContent(ci);
+ }
+
public void bindEnhancementEngine(EnhancementEngine e) {
synchronized (sortedEngineList) {
List<EnhancementEngine> newList = new ArrayList<EnhancementEngine>(sortedEngineList);
@@ -131,4 +137,5 @@ public class InMemoryJobManager implemen
return ServiceProperties.ORDERING_DEFAULT;
}
}
+
}
Modified: incubator/stanbol/trunk/launchers/framework/src/main/bundles/list.xml
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/launchers/framework/src/main/bundles/list.xml?rev=1197928&r1=1197927&r2=1197928&view=diff
==============================================================================
--- incubator/stanbol/trunk/launchers/framework/src/main/bundles/list.xml (original)
+++ incubator/stanbol/trunk/launchers/framework/src/main/bundles/list.xml Sat Nov 5 11:13:05 2011
@@ -76,7 +76,7 @@
</bundle>
<bundle>
<groupId>org.apache.stanbol</groupId>
- <artifactId>org.apache.stanbol.enhancer.inMemoryJobManager</artifactId>
+ <artifactId>org.apache.stanbol.enhancer.weightedjobmanager</artifactId>
<version>0.9.0-incubating-SNAPSHOT</version>
</bundle>
</startLevel>
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=1197928&r1=1197927&r2=1197928&view=diff
==============================================================================
--- incubator/stanbol/trunk/launchers/stable/src/main/bundles/list.xml (original)
+++ incubator/stanbol/trunk/launchers/stable/src/main/bundles/list.xml Sat Nov 5 11:13:05 2011
@@ -39,7 +39,7 @@
</bundle>
<bundle>
<groupId>org.apache.stanbol</groupId>
- <artifactId>org.apache.stanbol.enhancer.inMemoryJobManager</artifactId>
+ <artifactId>org.apache.stanbol.enhancer.weightedjobmanager</artifactId>
<version>0.9.0-incubating-SNAPSHOT</version>
</bundle>
</startLevel>
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=1197928&r1=1197927&r2=1197928&view=diff
==============================================================================
--- incubator/stanbol/trunk/launchers/stateless/src/main/bundles/list.xml (original)
+++ incubator/stanbol/trunk/launchers/stateless/src/main/bundles/list.xml Sat Nov 5 11:13:05 2011
@@ -88,7 +88,7 @@
</bundle>
<bundle>
<groupId>org.apache.stanbol</groupId>
- <artifactId>org.apache.stanbol.enhancer.inMemoryJobManager</artifactId>
+ <artifactId>org.apache.stanbol.enhancer.weightedjobmanager</artifactId>
<version>0.9.0-incubating-SNAPSHOT</version>
</bundle>
<bundle>
Modified: incubator/stanbol/trunk/ontologymanager/store/launchers/fise/src/main/bundles/list.xml
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/ontologymanager/store/launchers/fise/src/main/bundles/list.xml?rev=1197928&r1=1197927&r2=1197928&view=diff
==============================================================================
--- incubator/stanbol/trunk/ontologymanager/store/launchers/fise/src/main/bundles/list.xml (original)
+++ incubator/stanbol/trunk/ontologymanager/store/launchers/fise/src/main/bundles/list.xml Sat Nov 5 11:13:05 2011
@@ -180,7 +180,7 @@
</bundle>
<bundle>
<groupId>org.apache.stanbol</groupId>
- <artifactId>org.apache.stanbol.enhancer.inMemoryJobManager</artifactId>
+ <artifactId>org.apache.stanbol.enhancer.weightedjobmanager</artifactId>
<version>0.9.0-incubating-SNAPSHOT</version>
</bundle>
</startLevel>
Modified: incubator/stanbol/trunk/parent/pom.xml
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/parent/pom.xml?rev=1197928&r1=1197927&r2=1197928&view=diff
==============================================================================
--- incubator/stanbol/trunk/parent/pom.xml (original)
+++ incubator/stanbol/trunk/parent/pom.xml Sat Nov 5 11:13:05 2011
@@ -341,7 +341,7 @@
</dependency>
<dependency>
<groupId>org.apache.stanbol</groupId>
- <artifactId>org.apache.stanbol.enhancer.inMemoryJobManager</artifactId>
+ <artifactId>org.apache.stanbol.enhancer.weightedjobmanager</artifactId>
<version>0.9.0-incubating-SNAPSHOT</version>
<scope>provided</scope>
</dependency>