Author: rwesten
Date: Mon Sep 17 09:57:48 2012
New Revision: 1386533
URL: http://svn.apache.org/viewvc?rev=1386533&view=rev
Log:
STANBOL-706: merged changed of the trunk into this branch to prepaire the
reintegration of this engine into the branch
Removed:
incubator/stanbol/branches/dbpedia-spotlight-engines/engines/entitydisambiguation/
Modified:
incubator/stanbol/branches/dbpedia-spotlight-engines/ (props changed)
incubator/stanbol/branches/dbpedia-spotlight-engines/engines/entitytagging/src/main/java/org/apache/stanbol/enhancer/engines/entitytagging/impl/NamedEntityTaggingEngine.java
incubator/stanbol/branches/dbpedia-spotlight-engines/engines/keywordextraction/src/main/java/org/apache/stanbol/enhancer/engines/keywordextraction/engine/KeywordLinkingEngine.java
incubator/stanbol/branches/dbpedia-spotlight-engines/engines/langdetect/
(props changed)
incubator/stanbol/branches/dbpedia-spotlight-engines/engines/opennlp-ner/src/main/java/org/apache/stanbol/enhancer/engines/opennlp/impl/NEREngineCore.java
incubator/stanbol/branches/dbpedia-spotlight-engines/jobmanager/event/src/main/java/org/apache/stanbol/enhancer/jobmanager/event/impl/EventJobManagerImpl.java
Propchange: incubator/stanbol/branches/dbpedia-spotlight-engines/
------------------------------------------------------------------------------
Merged
/incubator/stanbol/trunk/enhancer:r1374979-1376045,1376047-1376384,1376386-1386528
Modified:
incubator/stanbol/branches/dbpedia-spotlight-engines/engines/entitytagging/src/main/java/org/apache/stanbol/enhancer/engines/entitytagging/impl/NamedEntityTaggingEngine.java
URL:
http://svn.apache.org/viewvc/incubator/stanbol/branches/dbpedia-spotlight-engines/engines/entitytagging/src/main/java/org/apache/stanbol/enhancer/engines/entitytagging/impl/NamedEntityTaggingEngine.java?rev=1386533&r1=1386532&r2=1386533&view=diff
==============================================================================
---
incubator/stanbol/branches/dbpedia-spotlight-engines/engines/entitytagging/src/main/java/org/apache/stanbol/enhancer/engines/entitytagging/impl/NamedEntityTaggingEngine.java
(original)
+++
incubator/stanbol/branches/dbpedia-spotlight-engines/engines/entitytagging/src/main/java/org/apache/stanbol/enhancer/engines/entitytagging/impl/NamedEntityTaggingEngine.java
Mon Sep 17 09:57:48 2012
@@ -533,7 +533,7 @@ public class NamedEntityTaggingEngine ex
// and labels in the same language as the content
(language != null &&
label.getLanguage().startsWith(language))) {
double actMatch = levenshtein(
- casesensitive ? label.getText().toLowerCase() :
label.getText(), namedEntityLabel);
+ casesensitive ? label.getText() :
label.getText().toLowerCase(), namedEntityLabel);
if (actMatch > match.getLevenshtein()) {
match.setLevenshtein(actMatch);
match.setMatchedLabel(label);
Modified:
incubator/stanbol/branches/dbpedia-spotlight-engines/engines/keywordextraction/src/main/java/org/apache/stanbol/enhancer/engines/keywordextraction/engine/KeywordLinkingEngine.java
URL:
http://svn.apache.org/viewvc/incubator/stanbol/branches/dbpedia-spotlight-engines/engines/keywordextraction/src/main/java/org/apache/stanbol/enhancer/engines/keywordextraction/engine/KeywordLinkingEngine.java?rev=1386533&r1=1386532&r2=1386533&view=diff
==============================================================================
---
incubator/stanbol/branches/dbpedia-spotlight-engines/engines/keywordextraction/src/main/java/org/apache/stanbol/enhancer/engines/keywordextraction/engine/KeywordLinkingEngine.java
(original)
+++
incubator/stanbol/branches/dbpedia-spotlight-engines/engines/keywordextraction/src/main/java/org/apache/stanbol/enhancer/engines/keywordextraction/engine/KeywordLinkingEngine.java
Mon Sep 17 09:57:48 2012
@@ -741,7 +741,7 @@ public class KeywordLinkingEngine
if(minSearchTokenLength < 1){
throw new ConfigurationException(MIN_SEARCH_TOKEN_LENGTH,
"Values MUST be valid Integer values > 0");
}
- linkerConfig.setMaxSuggestions(minSearchTokenLength);
+ linkerConfig.setMinSearchTokenLength(minSearchTokenLength);
}
//init the REDIRECT_PROCESSING_MODE
value = configuration.get(REDIRECT_PROCESSING_MODE);
Propchange:
incubator/stanbol/branches/dbpedia-spotlight-engines/engines/langdetect/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Mon Sep 17 09:57:48 2012
@@ -1,7 +1,7 @@
target
-.project
-
.classpath
+.project
+
.settings
Modified:
incubator/stanbol/branches/dbpedia-spotlight-engines/engines/opennlp-ner/src/main/java/org/apache/stanbol/enhancer/engines/opennlp/impl/NEREngineCore.java
URL:
http://svn.apache.org/viewvc/incubator/stanbol/branches/dbpedia-spotlight-engines/engines/opennlp-ner/src/main/java/org/apache/stanbol/enhancer/engines/opennlp/impl/NEREngineCore.java?rev=1386533&r1=1386532&r2=1386533&view=diff
==============================================================================
---
incubator/stanbol/branches/dbpedia-spotlight-engines/engines/opennlp-ner/src/main/java/org/apache/stanbol/enhancer/engines/opennlp/impl/NEREngineCore.java
(original)
+++
incubator/stanbol/branches/dbpedia-spotlight-engines/engines/opennlp-ner/src/main/java/org/apache/stanbol/enhancer/engines/opennlp/impl/NEREngineCore.java
Mon Sep 17 09:57:48 2012
@@ -178,7 +178,11 @@ public class NEREngineCore implements En
}
}
} catch (Exception e) {
- throw new EngineException(this, ci, e);
+ if (e instanceof RuntimeException) {
+ throw (RuntimeException)e;
+ } else {
+ throw new EngineException(this, ci, e);
+ }
}
}
Modified:
incubator/stanbol/branches/dbpedia-spotlight-engines/jobmanager/event/src/main/java/org/apache/stanbol/enhancer/jobmanager/event/impl/EventJobManagerImpl.java
URL:
http://svn.apache.org/viewvc/incubator/stanbol/branches/dbpedia-spotlight-engines/jobmanager/event/src/main/java/org/apache/stanbol/enhancer/jobmanager/event/impl/EventJobManagerImpl.java?rev=1386533&r1=1386532&r2=1386533&view=diff
==============================================================================
---
incubator/stanbol/branches/dbpedia-spotlight-engines/jobmanager/event/src/main/java/org/apache/stanbol/enhancer/jobmanager/event/impl/EventJobManagerImpl.java
(original)
+++
incubator/stanbol/branches/dbpedia-spotlight-engines/jobmanager/event/src/main/java/org/apache/stanbol/enhancer/jobmanager/event/impl/EventJobManagerImpl.java
Mon Sep 17 09:57:48 2012
@@ -148,7 +148,12 @@ public class EventJobManagerImpl impleme
// RESTful interface of the Enhancer!
//ci.getMetadata().addAll(job.getExecutionMetadata());
if(job.isFailed()){
- throw new ChainException(job.getErrorMessage(), job.getError());
+ Exception e = job.getError();
+ if (e instanceof SecurityException) {
+ throw (SecurityException)e;
+ } else {
+ throw new ChainException(job.getErrorMessage(), e);
+ }
}
if(!job.isFinished()){
throw new ChainException("EnhancementJobManager was deactivated
while" +
