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/11/25 10:11:47 UTC
svn commit: r1413303 [3/3] - in /stanbol/branches/stanbol-nlp-processing:
data/opennlp/ data/opennlp/lang/da/ data/opennlp/lang/da/src/
data/opennlp/lang/de/ data/opennlp/lang/de/src/ data/opennlp/lang/en/
data/opennlp/lang/es/ data/opennlp/lang/es/src...
Modified: stanbol/branches/stanbol-nlp-processing/enhancer/generic/rdfentities/src/license/THIRD-PARTY.properties
URL: http://svn.apache.org/viewvc/stanbol/branches/stanbol-nlp-processing/enhancer/generic/rdfentities/src/license/THIRD-PARTY.properties?rev=1413303&r1=1413302&r2=1413303&view=diff
==============================================================================
--- stanbol/branches/stanbol-nlp-processing/enhancer/generic/rdfentities/src/license/THIRD-PARTY.properties (original)
+++ stanbol/branches/stanbol-nlp-processing/enhancer/generic/rdfentities/src/license/THIRD-PARTY.properties Sun Nov 25 09:11:39 2012
@@ -18,7 +18,7 @@
# Please fill the missing licenses for dependencies :
#
#
-#Mon Apr 09 10:45:52 CEST 2012
-javax.servlet--servlet-api--2.4=Common Development And Distribution License (CDDL), Version 1.0
+#Sun Oct 07 16:03:57 CEST 2012
+javax.servlet--servlet-api--2.5=Common Development And Distribution License (CDDL), Version 1.0
org.osgi--org.osgi.compendium--4.1.0=Apache Software License, Version 2.0
org.osgi--org.osgi.core--4.1.0=Apache Software License, Version 2.0
Propchange: stanbol/branches/stanbol-nlp-processing/enhancer/generic/servicesapi/
------------------------------------------------------------------------------
Merged /stanbol/trunk/enhancer/generic/servicesapi:r1408755-1413168
Propchange: stanbol/branches/stanbol-nlp-processing/enhancer/generic/test/
('svn:mergeinfo' removed)
Propchange: stanbol/branches/stanbol-nlp-processing/enhancer/jersey/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Sun Nov 25 09:11:39 2012
@@ -0,0 +1,3 @@
+/incubator/stanbol/branches/dbpedia-spotlight-engines/jersey:1374978-1386535
+/incubator/stanbol/trunk/enhancer/jersey:1339554,1339557-1339558,1386989-1388016
+/stanbol/trunk/enhancer/jersey:1388017-1413199
Modified: stanbol/branches/stanbol-nlp-processing/enhancer/jersey/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/branches/stanbol-nlp-processing/enhancer/jersey/pom.xml?rev=1413303&r1=1413302&r2=1413303&view=diff
==============================================================================
--- stanbol/branches/stanbol-nlp-processing/enhancer/jersey/pom.xml (original)
+++ stanbol/branches/stanbol-nlp-processing/enhancer/jersey/pom.xml Sun Nov 25 09:11:39 2012
@@ -36,12 +36,12 @@
<scm>
<connection>
- scm:svn:http://svn.apache.org/repos/asf/incubator/stanbol/trunk/enhancer/jersey/
+ scm:svn:http://svn.apache.org/repos/asf/stanbol/trunk/enhancer/jersey/
</connection>
<developerConnection>
- scm:svn:https://svn.apache.org/repos/asf/incubator/stanbol/trunk/enhancer/jersey/
+ scm:svn:https://svn.apache.org/repos/asf/stanbol/trunk/enhancer/jersey/
</developerConnection>
- <url>http://incubator.apache.org/stanbol/</url>
+ <url>http://stanbol.apache.org/</url>
</scm>
<build>
@@ -60,11 +60,13 @@
<Export-Package>
org.apache.stanbol.enhancer.jersey.*
</Export-Package>
- <Embed-Dependency>*;scope=compile|runtime;inline=false;artifactId=jersey-json|jettison|jackson-core-asl|httpmime
+ <Embed-Dependency>
+ *;scope=compile|runtime;inline=false;artifactId=jersey-json|jettison|jackson-core-asl|httpmime
</Embed-Dependency>
<Embed-Transitive>true</Embed-Transitive>
<Import-Package>
javax.ws.rs.*; version="[0,2)",
+ org.apache.stanbol.commons.web.base; provide:=true,
*
</Import-Package>
</instructions>
@@ -101,7 +103,7 @@
<dependency>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.commons.web.base</artifactId>
- <version>0.9.0-incubating</version>
+ <version>0.10.1-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.stanbol</groupId>
@@ -125,6 +127,10 @@
<!-- Jersey -->
<dependency>
+ <groupId>org.apache.stanbol</groupId>
+ <artifactId>org.apache.stanbol.commons.ldviewable</artifactId>
+ </dependency>
+<dependency>
<groupId>com.sun.jersey</groupId>
<artifactId>jersey-server</artifactId>
</dependency>
Modified: stanbol/branches/stanbol-nlp-processing/enhancer/jersey/src/license/THIRD-PARTY.properties
URL: http://svn.apache.org/viewvc/stanbol/branches/stanbol-nlp-processing/enhancer/jersey/src/license/THIRD-PARTY.properties?rev=1413303&r1=1413302&r2=1413303&view=diff
==============================================================================
--- stanbol/branches/stanbol-nlp-processing/enhancer/jersey/src/license/THIRD-PARTY.properties (original)
+++ stanbol/branches/stanbol-nlp-processing/enhancer/jersey/src/license/THIRD-PARTY.properties Sun Nov 25 09:11:39 2012
@@ -1,27 +1,26 @@
# Generated by org.codehaus.mojo.license.AddThirdPartyMojo
#-------------------------------------------------------------------------------
# Already used licenses in project :
-# - Apache License
-# - Apache License Version 2.0
-# - Apache Software License - Version 2.0
-# - BSD
-# - BSD-style license
-# - CDDL 1.1
-# - CDDL License
-# - Common Development and Distribution License (CDDL) v1.0
-# - Common Public License Version 1.0
-# - Eclipse Public License - Version 1.0
-# - GPL2 w/ CPE
+# - Apache Software License
+# - Apache Software License, Version 2.0
+# - BSD License
+# - Common Development And Distribution License (CDDL), Version 1.0
+# - Common Development And Distribution License (CDDL), Version 1.1
+# - Common Public License, Version 1.0
+# - Eclipse Public License, Version 1.0
+# - GNU General Public License (GPL), Version 2 with classpath exception
+# - GNU Lesser General Public License (LGPL)
+# - GNU Lesser General Public License (LGPL), Version 2.1
# - ICU License
# - MIT License
-# - The Apache Software License, Version 2.0
+# - Public Domain License
#-------------------------------------------------------------------------------
# Please fill the missing licenses for dependencies :
#
#
-#Wed Feb 15 19:02:09 CET 2012
+#Sun Oct 07 16:08:09 CEST 2012
asm--asm--3.1=BSD License
-javax.servlet--servlet-api--2.4=Common Development And Distribution License (CDDL), Version 1.0
+javax.servlet--servlet-api--2.5=Common Development And Distribution License (CDDL), Version 1.0
org.codehaus.jettison--jettison--1.3=The Apache Software License, Version 2.0
org.osgi--org.osgi.compendium--4.1.0=The Apache Software License, Version 2.0
org.osgi--org.osgi.core--4.1.0=The Apache Software License, Version 2.0
Modified: stanbol/branches/stanbol-nlp-processing/enhancer/jersey/src/main/java/org/apache/stanbol/enhancer/jersey/fragment/EnhancerWebFragment.java
URL: http://svn.apache.org/viewvc/stanbol/branches/stanbol-nlp-processing/enhancer/jersey/src/main/java/org/apache/stanbol/enhancer/jersey/fragment/EnhancerWebFragment.java?rev=1413303&r1=1413302&r2=1413303&view=diff
==============================================================================
--- stanbol/branches/stanbol-nlp-processing/enhancer/jersey/src/main/java/org/apache/stanbol/enhancer/jersey/fragment/EnhancerWebFragment.java (original)
+++ stanbol/branches/stanbol-nlp-processing/enhancer/jersey/src/main/java/org/apache/stanbol/enhancer/jersey/fragment/EnhancerWebFragment.java Sun Nov 25 09:11:39 2012
@@ -60,7 +60,6 @@ public class EnhancerWebFragment impleme
private static final String STATIC_RESOURCE_PATH = "/org/apache/stanbol/enhancer/jersey/static";
- private static final String TEMPLATE_PATH = "/org/apache/stanbol/enhancer/jersey/templates";
private BundleContext bundleContext;
@@ -111,10 +110,6 @@ public class EnhancerWebFragment impleme
return STATIC_RESOURCE_PATH;
}
- @Override
- public TemplateLoader getTemplateLoader() {
- return new ClassTemplateLoader(getClass(), TEMPLATE_PATH);
- }
@Override
public List<LinkResource> getLinkResources() {
Modified: stanbol/branches/stanbol-nlp-processing/enhancer/jersey/src/main/java/org/apache/stanbol/enhancer/jersey/resource/AbstractEnhancerUiResource.java
URL: http://svn.apache.org/viewvc/stanbol/branches/stanbol-nlp-processing/enhancer/jersey/src/main/java/org/apache/stanbol/enhancer/jersey/resource/AbstractEnhancerUiResource.java?rev=1413303&r1=1413302&r2=1413303&view=diff
==============================================================================
--- stanbol/branches/stanbol-nlp-processing/enhancer/jersey/src/main/java/org/apache/stanbol/enhancer/jersey/resource/AbstractEnhancerUiResource.java (original)
+++ stanbol/branches/stanbol-nlp-processing/enhancer/jersey/src/main/java/org/apache/stanbol/enhancer/jersey/resource/AbstractEnhancerUiResource.java Sun Nov 25 09:11:39 2012
@@ -54,7 +54,7 @@ import org.apache.stanbol.enhancer.servi
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import com.sun.jersey.api.view.Viewable;
+import org.apache.stanbol.commons.ldviewable.Viewable;
/**
* Abstract super class for all Enhancer endpoint that do also provide the
@@ -93,7 +93,7 @@ public abstract class AbstractEnhancerUi
@GET
@Produces(TEXT_HTML)
public Response get(@Context HttpHeaders headers) {
- ResponseBuilder res = Response.ok(new Viewable("index", this), TEXT_HTML);
+ ResponseBuilder res = Response.ok(new Viewable("index", this, AbstractEnhancerUiResource.class), TEXT_HTML);
addCORSOrigin(servletContext, res, headers);
return res.build();
}
Modified: stanbol/branches/stanbol-nlp-processing/enhancer/jersey/src/main/java/org/apache/stanbol/enhancer/jersey/resource/ChainsRootResource.java
URL: http://svn.apache.org/viewvc/stanbol/branches/stanbol-nlp-processing/enhancer/jersey/src/main/java/org/apache/stanbol/enhancer/jersey/resource/ChainsRootResource.java?rev=1413303&r1=1413302&r2=1413303&view=diff
==============================================================================
--- stanbol/branches/stanbol-nlp-processing/enhancer/jersey/src/main/java/org/apache/stanbol/enhancer/jersey/resource/ChainsRootResource.java (original)
+++ stanbol/branches/stanbol-nlp-processing/enhancer/jersey/src/main/java/org/apache/stanbol/enhancer/jersey/resource/ChainsRootResource.java Sun Nov 25 09:11:39 2012
@@ -55,7 +55,7 @@ import org.apache.stanbol.enhancer.servi
import org.osgi.framework.Constants;
import org.osgi.framework.ServiceReference;
-import com.sun.jersey.api.view.Viewable;
+import org.apache.stanbol.commons.ldviewable.Viewable;
@Path("/enhancer/chain")
public class ChainsRootResource extends BaseStanbolResource {
Modified: stanbol/branches/stanbol-nlp-processing/enhancer/jersey/src/main/java/org/apache/stanbol/enhancer/jersey/resource/ContentItemResource.java
URL: http://svn.apache.org/viewvc/stanbol/branches/stanbol-nlp-processing/enhancer/jersey/src/main/java/org/apache/stanbol/enhancer/jersey/resource/ContentItemResource.java?rev=1413303&r1=1413302&r2=1413303&view=diff
==============================================================================
--- stanbol/branches/stanbol-nlp-processing/enhancer/jersey/src/main/java/org/apache/stanbol/enhancer/jersey/resource/ContentItemResource.java (original)
+++ stanbol/branches/stanbol-nlp-processing/enhancer/jersey/src/main/java/org/apache/stanbol/enhancer/jersey/resource/ContentItemResource.java Sun Nov 25 09:11:39 2012
@@ -96,7 +96,7 @@ import org.apache.stanbol.enhancer.servi
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import com.sun.jersey.api.view.Viewable;
+import org.apache.stanbol.commons.ldviewable.Viewable;
public class ContentItemResource extends BaseStanbolResource {
Modified: stanbol/branches/stanbol-nlp-processing/enhancer/jersey/src/main/java/org/apache/stanbol/enhancer/jersey/resource/EnhancementEngineResource.java
URL: http://svn.apache.org/viewvc/stanbol/branches/stanbol-nlp-processing/enhancer/jersey/src/main/java/org/apache/stanbol/enhancer/jersey/resource/EnhancementEngineResource.java?rev=1413303&r1=1413302&r2=1413303&view=diff
==============================================================================
--- stanbol/branches/stanbol-nlp-processing/enhancer/jersey/src/main/java/org/apache/stanbol/enhancer/jersey/resource/EnhancementEngineResource.java (original)
+++ stanbol/branches/stanbol-nlp-processing/enhancer/jersey/src/main/java/org/apache/stanbol/enhancer/jersey/resource/EnhancementEngineResource.java Sun Nov 25 09:11:39 2012
@@ -43,7 +43,7 @@ import org.apache.stanbol.enhancer.servi
import org.osgi.framework.Constants;
import org.osgi.framework.ServiceReference;
-import com.sun.jersey.api.view.Viewable;
+import org.apache.stanbol.commons.ldviewable.Viewable;
@Path("/enhancer/engine/{engineName}")
public class EnhancementEngineResource extends AbstractEnhancerResource {
Modified: stanbol/branches/stanbol-nlp-processing/enhancer/jersey/src/main/java/org/apache/stanbol/enhancer/jersey/resource/EnhancementEnginesRootResource.java
URL: http://svn.apache.org/viewvc/stanbol/branches/stanbol-nlp-processing/enhancer/jersey/src/main/java/org/apache/stanbol/enhancer/jersey/resource/EnhancementEnginesRootResource.java?rev=1413303&r1=1413302&r2=1413303&view=diff
==============================================================================
--- stanbol/branches/stanbol-nlp-processing/enhancer/jersey/src/main/java/org/apache/stanbol/enhancer/jersey/resource/EnhancementEnginesRootResource.java (original)
+++ stanbol/branches/stanbol-nlp-processing/enhancer/jersey/src/main/java/org/apache/stanbol/enhancer/jersey/resource/EnhancementEnginesRootResource.java Sun Nov 25 09:11:39 2012
@@ -55,7 +55,7 @@ import org.apache.stanbol.enhancer.servi
import org.osgi.framework.Constants;
import org.osgi.framework.ServiceReference;
-import com.sun.jersey.api.view.Viewable;
+import org.apache.stanbol.commons.ldviewable.Viewable;
@Path("/enhancer/engine")
public class EnhancementEnginesRootResource extends BaseStanbolResource {
Modified: stanbol/branches/stanbol-nlp-processing/enhancer/jersey/src/main/java/org/apache/stanbol/enhancer/jersey/resource/EnhancerRootResource.java
URL: http://svn.apache.org/viewvc/stanbol/branches/stanbol-nlp-processing/enhancer/jersey/src/main/java/org/apache/stanbol/enhancer/jersey/resource/EnhancerRootResource.java?rev=1413303&r1=1413302&r2=1413303&view=diff
==============================================================================
--- stanbol/branches/stanbol-nlp-processing/enhancer/jersey/src/main/java/org/apache/stanbol/enhancer/jersey/resource/EnhancerRootResource.java (original)
+++ stanbol/branches/stanbol-nlp-processing/enhancer/jersey/src/main/java/org/apache/stanbol/enhancer/jersey/resource/EnhancerRootResource.java Sun Nov 25 09:11:39 2012
@@ -56,7 +56,7 @@ import org.apache.clerezza.rdf.core.spar
import org.apache.clerezza.rdf.ontologies.RDF;
import org.apache.stanbol.enhancer.servicesapi.rdf.Enhancer;
-import com.sun.jersey.api.view.Viewable;
+import org.apache.stanbol.commons.ldviewable.Viewable;
/**
Propchange: stanbol/branches/stanbol-nlp-processing/enhancer/jobmanager/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Sun Nov 25 09:11:39 2012
@@ -0,0 +1,3 @@
+/incubator/stanbol/branches/dbpedia-spotlight-engines/jobmanager:1374978-1386535
+/incubator/stanbol/trunk/enhancer/jobmanager:1339554,1339557-1339558,1386989-1388016
+/stanbol/trunk/enhancer/jobmanager:1388017-1413169
Modified: stanbol/branches/stanbol-nlp-processing/enhancer/jobmanager/event/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/branches/stanbol-nlp-processing/enhancer/jobmanager/event/pom.xml?rev=1413303&r1=1413302&r2=1413303&view=diff
==============================================================================
--- stanbol/branches/stanbol-nlp-processing/enhancer/jobmanager/event/pom.xml (original)
+++ stanbol/branches/stanbol-nlp-processing/enhancer/jobmanager/event/pom.xml Sun Nov 25 09:11:39 2012
@@ -43,12 +43,12 @@
<scm>
<connection>
- scm:svn:http://svn.apache.org/repos/asf/incubator/stanbol/trunk/enhancer/jobmanager/event/
+ scm:svn:http://svn.apache.org/repos/asf/stanbol/trunk/enhancer/jobmanager/event/
</connection>
<developerConnection>
- scm:svn:https://svn.apache.org/repos/asf/incubator/stanbol/trunk/enhancer/jobmanager/event/
+ scm:svn:https://svn.apache.org/repos/asf/stanbol/trunk/enhancer/jobmanager/event/
</developerConnection>
- <url>http://incubator.apache.org/stanbol/</url>
+ <url>http://stanbol.apache.org/</url>
</scm>
<build>
@@ -59,6 +59,10 @@
<extensions>true</extensions>
<configuration>
<instructions>
+ <Import-Package>
+ org.apache.stanbol.enhancer.servicesapi; provide:=true; version="[0.9.0,0.11)",
+ *
+ </Import-Package>
<Export-Package>
org.apache.stanbol.enhancer.jobmanager.event;version=${project.version}
</Export-Package>
Modified: stanbol/branches/stanbol-nlp-processing/enhancer/jobmanager/event/src/license/THIRD-PARTY.properties
URL: http://svn.apache.org/viewvc/stanbol/branches/stanbol-nlp-processing/enhancer/jobmanager/event/src/license/THIRD-PARTY.properties?rev=1413303&r1=1413302&r2=1413303&view=diff
==============================================================================
--- stanbol/branches/stanbol-nlp-processing/enhancer/jobmanager/event/src/license/THIRD-PARTY.properties (original)
+++ stanbol/branches/stanbol-nlp-processing/enhancer/jobmanager/event/src/license/THIRD-PARTY.properties Sun Nov 25 09:11:39 2012
@@ -1,17 +1,24 @@
# Generated by org.codehaus.mojo.license.AddThirdPartyMojo
#-------------------------------------------------------------------------------
# Already used licenses in project :
-# - Apache License
-# - Common Development and Distribution License (CDDL) v1.0
-# - Common Public License Version 1.0
+# - Apache Software License
+# - Apache Software License, Version 2.0
+# - BSD License
+# - Common Development And Distribution License (CDDL), Version 1.0
+# - Common Development And Distribution License (CDDL), Version 1.1
+# - Common Public License, Version 1.0
+# - Eclipse Public License, Version 1.0
+# - GNU General Public License (GPL), Version 2 with classpath exception
+# - GNU Lesser General Public License (LGPL)
+# - GNU Lesser General Public License (LGPL), Version 2.1
# - ICU License
# - MIT License
-# - The Apache Software License, Version 2.0
+# - Public Domain License
#-------------------------------------------------------------------------------
# Please fill the missing licenses for dependencies :
#
#
-#Wed Feb 15 19:01:55 CET 2012
-javax.servlet--servlet-api--2.4=Common Development And Distribution License (CDDL), Version 1.0
+#Sun Oct 07 16:06:06 CEST 2012
+javax.servlet--servlet-api--2.5=Common Development And Distribution License (CDDL), Version 1.0
org.osgi--org.osgi.compendium--4.1.0=The Apache Software License, Version 2.0
org.osgi--org.osgi.core--4.1.0=The Apache Software License, Version 2.0
Modified: stanbol/branches/stanbol-nlp-processing/enhancer/jobmanager/event/src/main/java/org/apache/stanbol/enhancer/jobmanager/event/impl/EnhancementJobHandler.java
URL: http://svn.apache.org/viewvc/stanbol/branches/stanbol-nlp-processing/enhancer/jobmanager/event/src/main/java/org/apache/stanbol/enhancer/jobmanager/event/impl/EnhancementJobHandler.java?rev=1413303&r1=1413302&r2=1413303&view=diff
==============================================================================
--- stanbol/branches/stanbol-nlp-processing/enhancer/jobmanager/event/src/main/java/org/apache/stanbol/enhancer/jobmanager/event/impl/EnhancementJobHandler.java (original)
+++ stanbol/branches/stanbol-nlp-processing/enhancer/jobmanager/event/src/main/java/org/apache/stanbol/enhancer/jobmanager/event/impl/EnhancementJobHandler.java Sun Nov 25 09:11:39 2012
@@ -25,13 +25,11 @@ import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
import java.util.Dictionary;
-import java.util.HashMap;
import java.util.Hashtable;
import java.util.LinkedHashMap;
-import java.util.LinkedHashSet;
import java.util.Map;
-import java.util.Map.Entry;
-import java.util.Set;
+import java.util.concurrent.Semaphore;
+import java.util.concurrent.TimeUnit;
import java.util.concurrent.locks.Lock;
import java.util.concurrent.locks.ReadWriteLock;
import java.util.concurrent.locks.ReentrantReadWriteLock;
@@ -40,13 +38,14 @@ import org.apache.clerezza.rdf.core.NonL
import org.apache.stanbol.enhancer.servicesapi.EngineException;
import org.apache.stanbol.enhancer.servicesapi.EnhancementEngine;
import org.apache.stanbol.enhancer.servicesapi.EnhancementEngineManager;
-import org.apache.stanbol.enhancer.servicesapi.helper.ExecutionPlanHelper;
import org.osgi.service.event.Event;
import org.osgi.service.event.EventAdmin;
import org.osgi.service.event.EventHandler;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import com.ibm.icu.lang.UCharacter.SentenceBreak;
+
public class EnhancementJobHandler implements EventHandler {
private EnhancementEngineManager engineManager;
@@ -69,7 +68,7 @@ public class EnhancementJobHandler imple
* contentItems and the values are the objects used to interrupt the
* requesting thread as soon as the enhancement process has finished.
*/
- private Map<EnhancementJob,Object> processingJobs;
+ private Map<EnhancementJob,EnhancementJobObserver> processingJobs;
private final ReadWriteLock processingLock = new ReentrantReadWriteLock();
private Thread observerDaemon;
@@ -85,11 +84,11 @@ public class EnhancementJobHandler imple
this.engineManager = engineManager;
processingLock.writeLock().lock();
try {
- processingJobs = new LinkedHashMap<EnhancementJob,Object>();
+ processingJobs = new LinkedHashMap<EnhancementJob,EnhancementJobObserver>();
} finally{
processingLock.writeLock().unlock();
}
- observerDaemon = new Thread(new EnhancementJobObserver());
+ observerDaemon = new Thread(new EnhancementJobObserverDaemon());
observerDaemon.setName("Event Job Manager Observer Daemon");
observerDaemon.setDaemon(true);
observerDaemon.start();
@@ -134,19 +133,19 @@ public class EnhancementJobHandler imple
* @return An object that will get {@link Object#notifyAll()} as soon as
* {@link EnhancementJob#isFinished()} or this instance is deactivated
*/
- public Object register(EnhancementJob enhancementJob){
+ public EnhancementJobObserver register(EnhancementJob enhancementJob){
final boolean init;
- Object o;
+ EnhancementJobObserver observer;
processingLock.writeLock().lock();
try {
if(enhancementJob == null || processingJobs == null){
return null;
}
- o = processingJobs.get(enhancementJob);
- if(o == null){
- o = new Object();
- logJobInfo(enhancementJob, "Add EnhancementJob:");
- processingJobs.put(enhancementJob, o);
+ observer = processingJobs.get(enhancementJob);
+ if(observer == null){
+ observer = new EnhancementJobObserver(enhancementJob);
+ logJobInfo(log, enhancementJob, "Add EnhancementJob:",false);
+ processingJobs.put(enhancementJob, observer);
init = true;
} else {
init = false;
@@ -155,6 +154,7 @@ public class EnhancementJobHandler imple
processingLock.writeLock().unlock();
}
if(init){
+ observer.acquire();
enhancementJob.startProcessing();
log.debug("++ w: {}","init execution");
enhancementJob.getLock().writeLock().lock();
@@ -166,7 +166,7 @@ public class EnhancementJobHandler imple
enhancementJob.getLock().writeLock().unlock();
}
}
- return o;
+ return observer;
}
@Override
@@ -283,18 +283,21 @@ public class EnhancementJobHandler imple
*/
private void finish(EnhancementJob job){
processingLock.writeLock().lock();
- Object o;
+ EnhancementJobObserver observer;
try {
- o = processingJobs.remove(job);
+ observer = processingJobs.remove(job);
} finally {
processingLock.writeLock().unlock();
}
- if(o != null) {
- synchronized (o) {
- logJobInfo(job, "Finished EnhancementJob:");
+ if(observer != null) {
+ try {
+ logJobInfo(log, job, "Finished EnhancementJob:",false);
log.debug("++ n: finished processing ContentItem {} with Chain {}",
job.getContentItem().getUri(),job.getChainName());
- o.notifyAll();
+ } finally {
+ //release the semaphore to send signal to the EventJobManager waiting
+ //for the results
+ observer.release();
}
} else {
log.warn("EnhancementJob for ContentItem {} is not " +
@@ -335,15 +338,16 @@ public class EnhancementJobHandler imple
* Logs basic infos about the Job as INFO and detailed infos as DEBUG
* @param job
*/
- protected void logJobInfo(EnhancementJob job, String header) {
+ protected static void logJobInfo(Logger log, EnhancementJob job, String header, boolean logExecutions) {
if(header != null){
log.info(header);
}
- log.info(" state: {}",job.isFinished()?"finished":job.isFailed()?"failed":"processing");
- log.info(" chain: {}",job.getChainName());
+ log.info(" finished: {}",job.isFinished());
+ log.info(" state: {}",job.isFailed()?"failed":"processing");
+ log.info(" chain: {}",job.getChainName());
log.info(" content-item: {}", job.getContentItem().getUri());
- log.debug(" executions:");
- if(log.isDebugEnabled()){
+ if(logExecutions){
+ log.info(" executions:");
for(NonLiteral completedExec : job.getCompleted()){
log.info(" - {} completed",getEngine(job.getExecutionMetadata(),
job.getExecutionNode(completedExec)));
@@ -354,16 +358,87 @@ public class EnhancementJobHandler imple
}
}
}
+ public class EnhancementJobObserver{
+
+ private static final int MIN_WAIT_TIME = 500;
+ private final EnhancementJob enhancementJob;
+ private final Semaphore semaphore;
+
+ private EnhancementJobObserver(EnhancementJob job){
+ if(job == null){
+ throw new IllegalArgumentException("The parsed EnhancementJob MUST NOT be NULL!");
+ }
+ this.enhancementJob = job;
+ this.semaphore = new Semaphore(1);
+ }
+
+ protected void acquire() {
+ try {
+ semaphore.acquire();
+ } catch (InterruptedException e) {
+ log.warn("Interrupted while acquireing Semaphore for EnhancementJob "
+ + enhancementJob + "!",e);
+ }
+ }
+
+ protected void release() {
+ semaphore.release();
+ }
+
+ public boolean hasCompleted() {
+ enhancementJob.getLock().readLock().lock();
+ try {
+ return enhancementJob.isFinished();
+ } finally {
+ enhancementJob.getLock().readLock().unlock();
+ }
+ }
+
+ public void waitForCompletion(int maxEnhancementJobWaitTime) {
+ if(semaphore.availablePermits() < 1){
+ // The only permit is taken by the EnhancementJobHander
+ try {
+ semaphore.tryAcquire(1,
+ Math.max(MIN_WAIT_TIME, maxEnhancementJobWaitTime),TimeUnit.MILLISECONDS);
+ } catch (InterruptedException e) {
+ //interupted
+ }
+ } else if(!hasCompleted()){
+ int wait = Math.max(100, maxEnhancementJobWaitTime/10);
+ log.warn("Unexpected permit available for Semaphore of "
+ + "EnhancementJob of ContentItem {}. Fallback to wait({})"
+ + "for detecting if Job has finished. While the fallback "
+ + "should ensure correct Enhancement results this indicates a "
+ + "Bug in the EventHobManager. Please feel free to report "
+ + "This on dev@stanbol.apache.org or the Apache Stanbol "
+ + "Issue Tracker.",enhancementJob.getContentItem().getUri(),wait);
+ try {
+ Thread.currentThread().wait(wait);
+ } catch (InterruptedException e) {
+ //interupted
+ }
+ }// else completed
+ }
+
+ }
+
+
/**
* Currently only used to debug the number of currently registered
* Enhancements Jobs (if there are some)
* @author Rupert Westenthaler
*/
- private class EnhancementJobObserver implements Runnable {
+ private class EnhancementJobObserverDaemon implements Runnable {
+ /**
+ * The logger of the Observer. Can be used to configure Loglevel specificly
+ *
+ */
+ private Logger observerLog = LoggerFactory.getLogger(EnhancementJobObserverDaemon.class);
+
@Override
public void run() {
- log.debug(" ... init EnhancementJobObserver");
+ observerLog.debug(" ... init EnhancementJobObserver");
while(processingJobs != null){
try {
Thread.sleep(10000);
@@ -382,13 +457,13 @@ public class EnhancementJobHandler imple
readLock.unlock();
}
if(!jobs.isEmpty()){
- log.info(" -- {} active Enhancement Jobs",jobs.size());
- if(log.isDebugEnabled()){
+ observerLog.info(" -- {} active Enhancement Jobs",jobs.size());
+ if(observerLog.isDebugEnabled()){
for(EnhancementJob job : jobs){
Lock jobLock = job.getLock().readLock();
jobLock.lock();
try {
- logJobInfo(job,null);
+ logJobInfo(observerLog,job,null,true);
} finally {
jobLock.unlock();
}
Modified: stanbol/branches/stanbol-nlp-processing/enhancer/jobmanager/event/src/main/java/org/apache/stanbol/enhancer/jobmanager/event/impl/EventJobManagerImpl.java
URL: http://svn.apache.org/viewvc/stanbol/branches/stanbol-nlp-processing/enhancer/jobmanager/event/src/main/java/org/apache/stanbol/enhancer/jobmanager/event/impl/EventJobManagerImpl.java?rev=1413303&r1=1413302&r2=1413303&view=diff
==============================================================================
--- stanbol/branches/stanbol-nlp-processing/enhancer/jobmanager/event/src/main/java/org/apache/stanbol/enhancer/jobmanager/event/impl/EventJobManagerImpl.java (original)
+++ stanbol/branches/stanbol-nlp-processing/enhancer/jobmanager/event/src/main/java/org/apache/stanbol/enhancer/jobmanager/event/impl/EventJobManagerImpl.java Sun Nov 25 09:11:39 2012
@@ -21,6 +21,7 @@ import static org.apache.stanbol.enhance
import java.util.Dictionary;
import java.util.Hashtable;
import java.util.List;
+import java.util.concurrent.Semaphore;
import org.apache.clerezza.rdf.core.Graph;
import org.apache.felix.scr.annotations.Activate;
@@ -30,6 +31,7 @@ import org.apache.felix.scr.annotations.
import org.apache.felix.scr.annotations.Property;
import org.apache.felix.scr.annotations.Reference;
import org.apache.felix.scr.annotations.Service;
+import org.apache.stanbol.enhancer.jobmanager.event.impl.EnhancementJobHandler.EnhancementJobObserver;
import org.apache.stanbol.enhancer.servicesapi.Chain;
import org.apache.stanbol.enhancer.servicesapi.ChainException;
import org.apache.stanbol.enhancer.servicesapi.ChainManager;
@@ -51,13 +53,18 @@ import org.slf4j.LoggerFactory;
@Service
@Properties(value={
//register with a ranking lower than 0 to allow easy overriding by specific
- @Property(name=Constants.SERVICE_RANKING,intValue=EventJobManagerImpl.DEFAULT_SERVICE_RANKING)
+ @Property(name=Constants.SERVICE_RANKING,intValue=EventJobManagerImpl.DEFAULT_SERVICE_RANKING),
+ @Property(name=EventJobManagerImpl.MAX_ENHANCEMENT_JOB_WAIT_TIME,intValue=EventJobManagerImpl.DEFAULT_MAX_ENHANCEMENT_JOB_WAIT_TIME)
})
public class EventJobManagerImpl implements EnhancementJobManager {
private final Logger log = LoggerFactory.getLogger(EventJobManagerImpl.class);
public static final int DEFAULT_SERVICE_RANKING = 0;
+
+ public static final String MAX_ENHANCEMENT_JOB_WAIT_TIME = "stanbol.maxEnhancementJobWaitTime";
+
+ public static final int DEFAULT_MAX_ENHANCEMENT_JOB_WAIT_TIME = 10 * 1000;
@Reference
protected ChainManager chainManager;
@@ -68,6 +75,7 @@ public class EventJobManagerImpl impleme
private ServiceRegistration jobHandlerRegistration;
private EnhancementJobHandler jobHandler;
+ private int maxEnhancementJobWaitTime = DEFAULT_MAX_ENHANCEMENT_JOB_WAIT_TIME;
/**
@@ -84,6 +92,11 @@ public class EventJobManagerImpl impleme
properties.put(org.osgi.service.event.EventConstants.EVENT_TOPIC, TOPIC_JOB_MANAGER);
jobHandlerRegistration = ctx.getBundleContext().registerService(
EventHandler.class.getName(), jobHandler, properties);
+
+ Object maxWaitTime = ctx.getProperties().get(MAX_ENHANCEMENT_JOB_WAIT_TIME);
+ if (maxWaitTime instanceof Integer) {
+ this.maxEnhancementJobWaitTime = (Integer) maxWaitTime;
+ }
}
/**
* Unregisters the {@link EnhancementJobHandler}
@@ -120,23 +133,17 @@ public class EventJobManagerImpl impleme
}
if(chain == null){
throw new IllegalArgumentException("Unable to enhance ContentItem '"+ci.getUri()+
- "' because NULL was parsed as enhancement chain");
+ "' because NULL was passed as enhancement chain");
}
long start = System.currentTimeMillis();
boolean isDefaultChain = chain.equals(chainManager.getDefault());
EnhancementJob job = new EnhancementJob(ci, chain.getName(), chain.getExecutionPlan(),isDefaultChain);
//start the execution
//wait for the results
- Object object = jobHandler.register(job);
- while(!job.isFinished() & jobHandler != null){
- synchronized (object) {
- try {
- object.wait();
- } catch (InterruptedException e) {
- log.debug("Interupped for EnhancementJob if ContentItem {}",
- job.getContentItem().getUri());
- }
- }
+ EnhancementJobObserver observer = jobHandler.register(job);
+ //TODO: allow configuring a max completion time (e.g. 1min)
+ while(!observer.hasCompleted() & jobHandler != null){
+ observer.waitForCompletion(maxEnhancementJobWaitTime);
}
log.info("{} EnhancementJob for ContentItem {} after {}ms",
new Object[]{ job.isFailed() ? "Failed" : "Finished",
@@ -157,8 +164,8 @@ public class EventJobManagerImpl impleme
}
if(!job.isFinished()){
throw new ChainException("EnhancementJobManager was deactivated while" +
- "enhancing the parsed ContentItem "+job.getContentItem()+
- "(EnhancementJobManager type: "+getClass()+")!");
+ " enhancing the passed ContentItem "+job.getContentItem()+
+ " (EnhancementJobManager type: "+getClass()+")");
}
}
Modified: stanbol/branches/stanbol-nlp-processing/enhancer/jobmanager/event/src/main/resources/OSGI-INF/metatype/metatype.properties
URL: http://svn.apache.org/viewvc/stanbol/branches/stanbol-nlp-processing/enhancer/jobmanager/event/src/main/resources/OSGI-INF/metatype/metatype.properties?rev=1413303&r1=1413302&r2=1413303&view=diff
==============================================================================
--- stanbol/branches/stanbol-nlp-processing/enhancer/jobmanager/event/src/main/resources/OSGI-INF/metatype/metatype.properties (original)
+++ stanbol/branches/stanbol-nlp-processing/enhancer/jobmanager/event/src/main/resources/OSGI-INF/metatype/metatype.properties Sun Nov 25 09:11:39 2012
@@ -21,8 +21,12 @@ org.apache.stanbol.enhancer.jobmanager.e
org.apache.stanbol.enhancer.jobmanager.event.impl.EventJobManagerImpl.description=EnhancementJobManager \
implementation that used the org.osgi.service.event framework for asynchronously enhancing \
content items.
+stanbol.maxEnhancementJobWaitTime.name=Job timeout (ms)
+stanbol.maxEnhancementJobWaitTime.description=Maximum time in milliseconds to wait for job completion \
+before aborting.
service.ranking.name=Ranking
service.ranking.description=The service.ranking for this EnhancementJobManager implementation. \
If different enhancement job manager are active the one with the highest rank will be used to \
enhance content parsed to the Stanbol Enhancer RESTful interface.
+
Modified: stanbol/branches/stanbol-nlp-processing/enhancer/jobmanager/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/branches/stanbol-nlp-processing/enhancer/jobmanager/pom.xml?rev=1413303&r1=1413302&r2=1413303&view=diff
==============================================================================
--- stanbol/branches/stanbol-nlp-processing/enhancer/jobmanager/pom.xml (original)
+++ stanbol/branches/stanbol-nlp-processing/enhancer/jobmanager/pom.xml Sun Nov 25 09:11:39 2012
@@ -33,12 +33,12 @@
<scm>
<connection>
- scm:svn:http://svn.apache.org/repos/asf/incubator/stanbol/trunk/enhancer/jobmanager
+ scm:svn:http://svn.apache.org/repos/asf/stanbol/trunk/enhancer/jobmanager
</connection>
<developerConnection>
- scm:svn:https://svn.apache.org/repos/asf/incubator/stanbol/trunk/enhancer/jobmanager
+ scm:svn:https://svn.apache.org/repos/asf/stanbol/trunk/enhancer/jobmanager
</developerConnection>
- <url>http://incubator.apache.org/stanbol/</url>
+ <url>http://stanbol.apache.org/</url>
</scm>
<modules>
Modified: stanbol/branches/stanbol-nlp-processing/enhancer/jobmanager/weightedjobmanager/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/branches/stanbol-nlp-processing/enhancer/jobmanager/weightedjobmanager/pom.xml?rev=1413303&r1=1413302&r2=1413303&view=diff
==============================================================================
--- stanbol/branches/stanbol-nlp-processing/enhancer/jobmanager/weightedjobmanager/pom.xml (original)
+++ stanbol/branches/stanbol-nlp-processing/enhancer/jobmanager/weightedjobmanager/pom.xml Sun Nov 25 09:11:39 2012
@@ -42,12 +42,12 @@
<scm>
<connection>
- scm:svn:http://svn.apache.org/repos/asf/incubator/stanbol/trunk/enhancer/jobmanager/weightedjobmanager/
+ scm:svn:http://svn.apache.org/repos/asf/stanbol/trunk/enhancer/jobmanager/weightedjobmanager/
</connection>
<developerConnection>
- scm:svn:https://svn.apache.org/repos/asf/incubator/stanbol/trunk/enhancer/jobmanager/weightedjobmanager/
+ scm:svn:https://svn.apache.org/repos/asf/stanbol/trunk/enhancer/jobmanager/weightedjobmanager/
</developerConnection>
- <url>http://incubator.apache.org/stanbol/</url>
+ <url>http://stanbol.apache.org/</url>
</scm>
<build>
@@ -58,6 +58,10 @@
<extensions>true</extensions>
<configuration>
<instructions>
+ <Import-Package>
+ org.apache.stanbol.enhancer.servicesapi; provide:=true; version="[0.9.0,0.11)",
+ *
+ </Import-Package>
<Private-Package>
org.apache.stanbol.enhancer.jobmanager.impl.*;version=${project.version}
</Private-Package>
Modified: stanbol/branches/stanbol-nlp-processing/enhancer/jobmanager/weightedjobmanager/src/license/THIRD-PARTY.properties
URL: http://svn.apache.org/viewvc/stanbol/branches/stanbol-nlp-processing/enhancer/jobmanager/weightedjobmanager/src/license/THIRD-PARTY.properties?rev=1413303&r1=1413302&r2=1413303&view=diff
==============================================================================
--- stanbol/branches/stanbol-nlp-processing/enhancer/jobmanager/weightedjobmanager/src/license/THIRD-PARTY.properties (original)
+++ stanbol/branches/stanbol-nlp-processing/enhancer/jobmanager/weightedjobmanager/src/license/THIRD-PARTY.properties Sun Nov 25 09:11:39 2012
@@ -1,16 +1,24 @@
# Generated by org.codehaus.mojo.license.AddThirdPartyMojo
#-------------------------------------------------------------------------------
# Already used licenses in project :
-# - Apache License
-# - Common Development and Distribution License (CDDL) v1.0
+# - Apache Software License
+# - Apache Software License, Version 2.0
+# - BSD License
+# - Common Development And Distribution License (CDDL), Version 1.0
+# - Common Development And Distribution License (CDDL), Version 1.1
+# - Common Public License, Version 1.0
+# - Eclipse Public License, Version 1.0
+# - GNU General Public License (GPL), Version 2 with classpath exception
+# - GNU Lesser General Public License (LGPL)
+# - GNU Lesser General Public License (LGPL), Version 2.1
# - ICU License
# - MIT License
-# - The Apache Software License, Version 2.0
+# - Public Domain License
#-------------------------------------------------------------------------------
# Please fill the missing licenses for dependencies :
#
#
-#Wed Feb 15 19:01:54 CET 2012
-javax.servlet--servlet-api--2.4=Common Development And Distribution License (CDDL), Version 1.0
+#Sun Oct 07 16:04:02 CEST 2012
+javax.servlet--servlet-api--2.5=Common Development And Distribution License (CDDL), Version 1.0
org.osgi--org.osgi.compendium--4.1.0=The Apache Software License, Version 2.0
org.osgi--org.osgi.core--4.1.0=The Apache Software License, Version 2.0
Propchange: stanbol/branches/stanbol-nlp-processing/enhancer/ldpath/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Sun Nov 25 09:11:39 2012
@@ -0,0 +1,3 @@
+/incubator/stanbol/branches/dbpedia-spotlight-engines/ldpath:1374978-1386535
+/incubator/stanbol/trunk/enhancer/ldpath:1339554,1339557-1339558,1386989-1388016
+/stanbol/trunk/enhancer/ldpath:1388017-1413169
Modified: stanbol/branches/stanbol-nlp-processing/enhancer/ldpath/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/branches/stanbol-nlp-processing/enhancer/ldpath/pom.xml?rev=1413303&r1=1413302&r2=1413303&view=diff
==============================================================================
--- stanbol/branches/stanbol-nlp-processing/enhancer/ldpath/pom.xml (original)
+++ stanbol/branches/stanbol-nlp-processing/enhancer/ldpath/pom.xml Sun Nov 25 09:11:39 2012
@@ -36,12 +36,12 @@
<scm>
<connection>
- scm:svn:http://svn.apache.org/repos/asf/incubator/stanbol/trunk/enhancer/ldpath/
+ scm:svn:http://svn.apache.org/repos/asf/stanbol/trunk/enhancer/ldpath/
</connection>
<developerConnection>
- scm:svn:https://svn.apache.org/repos/asf/incubator/stanbol/trunk/enhancer/ldpath/
+ scm:svn:https://svn.apache.org/repos/asf/stanbol/trunk/enhancer/ldpath/
</developerConnection>
- <url>http://incubator.apache.org/stanbol/</url>
+ <url>http://stanbol.apache.org/</url>
</scm>
<build>
@@ -57,6 +57,11 @@
<extensions>true</extensions>
<configuration>
<instructions>
+ <Import-Package>
+ at.newmedialab.ldpath.api.backend; provide:=true,
+ at.newmedialab.ldpath.api.functions; provide:=true,
+ *
+ </Import-Package>
<Export-Package>
org.apache.stanbol.enhancer.ldpath.*
</Export-Package>
Modified: stanbol/branches/stanbol-nlp-processing/enhancer/ldpath/src/license/THIRD-PARTY.properties
URL: http://svn.apache.org/viewvc/stanbol/branches/stanbol-nlp-processing/enhancer/ldpath/src/license/THIRD-PARTY.properties?rev=1413303&r1=1413302&r2=1413303&view=diff
==============================================================================
--- stanbol/branches/stanbol-nlp-processing/enhancer/ldpath/src/license/THIRD-PARTY.properties (original)
+++ stanbol/branches/stanbol-nlp-processing/enhancer/ldpath/src/license/THIRD-PARTY.properties Sun Nov 25 09:11:39 2012
@@ -19,8 +19,8 @@
# Please fill the missing licenses for dependencies :
#
#
-#Thu Mar 15 13:33:42 CET 2012
-javax.servlet--servlet-api--2.4=Common Development And Distribution License (CDDL), Version 1.0
+#Sun Oct 07 16:08:19 CEST 2012
+javax.servlet--servlet-api--2.5=Common Development And Distribution License (CDDL), Version 1.0
org.osgi--org.osgi.compendium--4.1.0=The Apache Software License, Version 2.0
org.osgi--org.osgi.core--4.1.0=The Apache Software License, Version 2.0
xerces--xercesImpl--2.7.1=The Apache Software License, Version 2.0
Propchange: stanbol/branches/stanbol-nlp-processing/enhancer/parent/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Sun Nov 25 09:11:39 2012
@@ -0,0 +1,3 @@
+/incubator/stanbol/branches/dbpedia-spotlight-engines/parent:1374978-1386535
+/incubator/stanbol/trunk/enhancer/parent:1339554,1339557-1339558,1386989-1388016
+/stanbol/trunk/enhancer/parent:1388017-1413169
Modified: stanbol/branches/stanbol-nlp-processing/enhancer/parent/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/branches/stanbol-nlp-processing/enhancer/parent/pom.xml?rev=1413303&r1=1413302&r2=1413303&view=diff
==============================================================================
--- stanbol/branches/stanbol-nlp-processing/enhancer/parent/pom.xml (original)
+++ stanbol/branches/stanbol-nlp-processing/enhancer/parent/pom.xml Sun Nov 25 09:11:39 2012
@@ -38,12 +38,12 @@
<scm>
<connection>
- scm:svn:http://svn.apache.org/repos/asf/incubator/stanbol/trunk/enhancer/parent/
+ scm:svn:http://svn.apache.org/repos/asf/stanbol/trunk/enhancer/parent/
</connection>
<developerConnection>
- scm:svn:https://svn.apache.org/repos/asf/incubator/stanbol/trunk/enhancer/parent/
+ scm:svn:https://svn.apache.org/repos/asf/stanbol/trunk/enhancer/parent/
</developerConnection>
- <url>http://incubator.apache.org/stanbol/</url>
+ <url>http://stanbol.apache.org/</url>
</scm>
<build>
Modified: stanbol/branches/stanbol-nlp-processing/enhancer/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/branches/stanbol-nlp-processing/enhancer/pom.xml?rev=1413303&r1=1413302&r2=1413303&view=diff
==============================================================================
--- stanbol/branches/stanbol-nlp-processing/enhancer/pom.xml (original)
+++ stanbol/branches/stanbol-nlp-processing/enhancer/pom.xml Sun Nov 25 09:11:39 2012
@@ -21,31 +21,40 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>org.apache</groupId>
- <artifactId>apache</artifactId>
- <version>10</version>
- <relativePath />
+ <groupId>org.apache.stanbol</groupId>
+ <artifactId>stanbol-parent</artifactId>
+ <version>2-SNAPSHOT</version>
+ <relativePath>../parent</relativePath>
</parent>
<groupId>org.apache.stanbol</groupId>
- <artifactId>org.apache.stanbol.enhancer.reactor</artifactId>
+ <artifactId>apache-stanbol-enhancer</artifactId>
<version>0.10.0-SNAPSHOT</version>
<packaging>pom</packaging>
- <name>Apache Stanbol Enhancer Reactor</name>
+ <name>Apache Stanbol Enhancer</name>
<description>
Pseudo project to build the complete Stanbol Enhancer component
</description>
+
<inceptionYear>2010</inceptionYear>
+ <licenses>
+ <license>
+ <name>Apache Software License, Version 2.0</name>
+ <url>http://www.apache.org/licenses/LICENSE-2.0.txt</url>
+ <distribution>repo</distribution>
+ <comments>A business-friendly OSS license</comments>
+ </license>
+ </licenses>
<scm>
<connection>
- scm:svn:http://svn.apache.org/repos/asf/incubator/stanbol/trunk/enhancer/
+ scm:svn:http://svn.apache.org/repos/asf/stanbol/trunk/enhancer/
</connection>
<developerConnection>
- scm:svn:https://svn.apache.org/repos/asf/incubator/stanbol/trunk/enhancer/
+ scm:svn:https://svn.apache.org/repos/asf/stanbol/trunk/enhancer/
</developerConnection>
- <url>http://incubator.apache.org/stanbol/</url>
+ <url>http://stanbol.apache.org/</url>
</scm>
<modules>
@@ -69,5 +78,82 @@
<module>benchmark</module>
<module>defaults</module>
<module>bundlelist</module>
+
</modules>
+
+ <profiles>
+ <profile>
+ <id>apache-release</id>
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.rat</groupId>
+ <artifactId>apache-rat-plugin</artifactId>
+ <configuration>
+ <excludeSubProjects>false</excludeSubProjects>
+ <excludes>
+ <!--
+ All license headers are also checked per
+ artifact. These excludes are necessary
+ to make the reactor build suceed. Consider
+ the excluded files here as already checked
+ in the artifacts.
+ -->
+
+ <!-- exclude hidden files -->
+ <exclude>**/.*</exclude>
+ <exclude>**/.*/*</exclude>
+ <exclude>**/.*/**/*</exclude>
+
+ <!-- exclude build files -->
+ <exclude>**/target/**</exclude>
+ <exclude>**/*.log</exclude>
+
+ <!-- exclude generated files listing the licenses of deps -->
+ <exclude>DEPENDENCIES</exclude>
+ <exclude>DEPENDENCIES-BY-LICENSE</exclude>
+ <exclude>RAT-REPORT</exclude>
+ <exclude>**/src/license/THIRD-PARTY.properties</exclude>
+
+ <!-- exclude certain file types -->
+ <exclude>**/*.config</exclude>
+ <exclude>**/*.cfg</exclude>
+ <exclude>**/*.ref</exclude>
+ <exclude>**/*.txt</exclude>
+ <exclude>**/*.tsv</exclude>
+ <exclude>**/*.sem</exclude>
+ <exclude>**/*.svg</exclude>
+ <exclude>**/*.css</exclude>
+
+ <!-- exclude test files -->
+ <exclude>**/test/**/*.eml</exclude>
+ <exclude>**/test/**/*.nt</exclude>
+ <exclude>**/test/**/*.html</exclude>
+ <exclude>**/test/**/*.xhtml</exclude>
+ <exclude>**/test/**/*.rdf</exclude>
+ <exclude>**/test/**/*.rtf</exclude>
+ <exclude>**/test/**/*.rules</exclude>
+ <exclude>**/test/**/*.odt</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>license-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>aggregate-add-third-party</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
+
</project>
Propchange: stanbol/branches/stanbol-nlp-processing/enhancer/pom.xml
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Sun Nov 25 09:11:39 2012
@@ -0,0 +1,3 @@
+/incubator/stanbol/branches/dbpedia-spotlight-engines/pom.xml:1374978-1386535
+/incubator/stanbol/trunk/enhancer/pom.xml:1339554,1339557-1339558,1386989-1388016
+/stanbol/trunk/enhancer/pom.xml:1388017-1413169
Propchange: stanbol/branches/stanbol-nlp-processing/enhancer/tools/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Sun Nov 25 09:11:39 2012
@@ -0,0 +1,3 @@
+/incubator/stanbol/branches/dbpedia-spotlight-engines/tools:1374978-1386535
+/incubator/stanbol/trunk/enhancer/tools:1339554,1339557-1339558,1386989-1388016
+/stanbol/trunk/enhancer/tools:1388017-1413169
Propchange: stanbol/branches/stanbol-nlp-processing/enhancer/topic-web/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Sun Nov 25 09:11:39 2012
@@ -0,0 +1,3 @@
+/incubator/stanbol/branches/dbpedia-spotlight-engines/topic-web:1374978-1386535
+/incubator/stanbol/trunk/enhancer/topic-web:1339554,1339557-1339558,1386989-1388016
+/stanbol/trunk/enhancer/topic-web:1388017-1413169
Modified: stanbol/branches/stanbol-nlp-processing/enhancer/topic-web/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/branches/stanbol-nlp-processing/enhancer/topic-web/pom.xml?rev=1413303&r1=1413302&r2=1413303&view=diff
==============================================================================
--- stanbol/branches/stanbol-nlp-processing/enhancer/topic-web/pom.xml (original)
+++ stanbol/branches/stanbol-nlp-processing/enhancer/topic-web/pom.xml Sun Nov 25 09:11:39 2012
@@ -36,12 +36,12 @@
<scm>
<connection>
- scm:svn:http://svn.apache.org/repos/asf/incubator/stanbol/trunk/enhancer/topic-web/
+ scm:svn:http://svn.apache.org/repos/asf/stanbol/trunk/enhancer/topic-web/
</connection>
<developerConnection>
- scm:svn:https://svn.apache.org/repos/asf/incubator/stanbol/trunk/enhancer/topic-web/
+ scm:svn:https://svn.apache.org/repos/asf/stanbol/trunk/enhancer/topic-web/
</developerConnection>
- <url>http://incubator.apache.org/stanbol/</url>
+ <url>http://stanbol.apache.org/</url>
</scm>
<build>
@@ -64,6 +64,7 @@
</Embed-Dependency>
<Import-Package>
javax.ws.rs.*; version="[0,2)",
+ org.apache.stanbol.commons.web.base; provide:=true,
*
</Import-Package>
</instructions>
@@ -114,6 +115,10 @@
<!-- Jersey -->
<dependency>
+ <groupId>org.apache.stanbol</groupId>
+ <artifactId>org.apache.stanbol.commons.ldviewable</artifactId>
+ </dependency>
+<dependency>
<groupId>com.sun.jersey</groupId>
<artifactId>jersey-server</artifactId>
</dependency>
Modified: stanbol/branches/stanbol-nlp-processing/enhancer/topic-web/src/main/java/org/apache/stanbol/enhancer/web/topic/fragment/TopicClassifierFragment.java
URL: http://svn.apache.org/viewvc/stanbol/branches/stanbol-nlp-processing/enhancer/topic-web/src/main/java/org/apache/stanbol/enhancer/web/topic/fragment/TopicClassifierFragment.java?rev=1413303&r1=1413302&r2=1413303&view=diff
==============================================================================
--- stanbol/branches/stanbol-nlp-processing/enhancer/topic-web/src/main/java/org/apache/stanbol/enhancer/web/topic/fragment/TopicClassifierFragment.java (original)
+++ stanbol/branches/stanbol-nlp-processing/enhancer/topic-web/src/main/java/org/apache/stanbol/enhancer/web/topic/fragment/TopicClassifierFragment.java Sun Nov 25 09:11:39 2012
@@ -75,11 +75,6 @@ public class TopicClassifierFragment imp
}
@Override
- public TemplateLoader getTemplateLoader() {
- return new ClassTemplateLoader(getClass(), TEMPLATE_PATH);
- }
-
- @Override
public List<LinkResource> getLinkResources() {
return Collections.emptyList();
}
Modified: stanbol/branches/stanbol-nlp-processing/enhancer/topic-web/src/main/java/org/apache/stanbol/enhancer/web/topic/resource/TopicClassifierRootResource.java
URL: http://svn.apache.org/viewvc/stanbol/branches/stanbol-nlp-processing/enhancer/topic-web/src/main/java/org/apache/stanbol/enhancer/web/topic/resource/TopicClassifierRootResource.java?rev=1413303&r1=1413302&r2=1413303&view=diff
==============================================================================
--- stanbol/branches/stanbol-nlp-processing/enhancer/topic-web/src/main/java/org/apache/stanbol/enhancer/web/topic/resource/TopicClassifierRootResource.java (original)
+++ stanbol/branches/stanbol-nlp-processing/enhancer/topic-web/src/main/java/org/apache/stanbol/enhancer/web/topic/resource/TopicClassifierRootResource.java Sun Nov 25 09:11:39 2012
@@ -41,7 +41,7 @@ import org.osgi.framework.ServiceReferen
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import com.sun.jersey.api.view.Viewable;
+import org.apache.stanbol.commons.ldviewable.Viewable;
@Path("/topic")
public class TopicClassifierRootResource extends BaseStanbolResource {
Modified: stanbol/branches/stanbol-nlp-processing/enhancer/topic-web/src/main/java/org/apache/stanbol/enhancer/web/topic/resource/TopicModelResource.java
URL: http://svn.apache.org/viewvc/stanbol/branches/stanbol-nlp-processing/enhancer/topic-web/src/main/java/org/apache/stanbol/enhancer/web/topic/resource/TopicModelResource.java?rev=1413303&r1=1413302&r2=1413303&view=diff
==============================================================================
--- stanbol/branches/stanbol-nlp-processing/enhancer/topic-web/src/main/java/org/apache/stanbol/enhancer/web/topic/resource/TopicModelResource.java (original)
+++ stanbol/branches/stanbol-nlp-processing/enhancer/topic-web/src/main/java/org/apache/stanbol/enhancer/web/topic/resource/TopicModelResource.java Sun Nov 25 09:11:39 2012
@@ -55,7 +55,7 @@ import org.osgi.framework.BundleContext;
import org.osgi.framework.InvalidSyntaxException;
import org.osgi.framework.ServiceReference;
-import com.sun.jersey.api.view.Viewable;
+import org.apache.stanbol.commons.ldviewable.Viewable;
/**
* RESTful interface for classification models: register concept hierarchies, introspect model state and