Author: rwesten
Date: Tue Dec 3 09:05:31 2013
New Revision: 1547321
URL: http://svn.apache.org/r1547321
Log:
STANBOL-1229: merged changes to the 0.12 releasing branch
Modified:
stanbol/branches/release-0.12/enhancement-engines/opennlp/opennlp-sentence/
(props changed)
stanbol/branches/release-0.12/enhancement-engines/opennlp/opennlp-sentence/src/main/java/org/apache/stanbol/enhancer/engines/opennlp/sentence/impl/OpenNlpSentenceDetectionEngine.java
stanbol/branches/release-0.12/enhancement-engines/opennlp/opennlp-token/
(props changed)
stanbol/branches/release-0.12/enhancement-engines/opennlp/opennlp-token/src/main/java/org/apache/stanbol/enhancer/engines/opennlp/token/impl/OpenNlpTokenizerEngine.java
Propchange:
stanbol/branches/release-0.12/enhancement-engines/opennlp/opennlp-sentence/
------------------------------------------------------------------------------
Merged /stanbol/trunk/enhancement-engines/opennlp/opennlp-sentence:r1547313
Modified:
stanbol/branches/release-0.12/enhancement-engines/opennlp/opennlp-sentence/src/main/java/org/apache/stanbol/enhancer/engines/opennlp/sentence/impl/OpenNlpSentenceDetectionEngine.java
URL:
http://svn.apache.org/viewvc/stanbol/branches/release-0.12/enhancement-engines/opennlp/opennlp-sentence/src/main/java/org/apache/stanbol/enhancer/engines/opennlp/sentence/impl/OpenNlpSentenceDetectionEngine.java?rev=1547321&r1=1547320&r2=1547321&view=diff
==============================================================================
---
stanbol/branches/release-0.12/enhancement-engines/opennlp/opennlp-sentence/src/main/java/org/apache/stanbol/enhancer/engines/opennlp/sentence/impl/OpenNlpSentenceDetectionEngine.java
(original)
+++
stanbol/branches/release-0.12/enhancement-engines/opennlp/opennlp-sentence/src/main/java/org/apache/stanbol/enhancer/engines/opennlp/sentence/impl/OpenNlpSentenceDetectionEngine.java
Tue Dec 3 09:05:31 2013
@@ -71,6 +71,7 @@ import org.slf4j.LoggerFactory;
* </pre></code>
*/
@Component(immediate = true, metatype = true,
+ configurationFactory = true, //allow multiple instances
policy = ConfigurationPolicy.OPTIONAL) //create a default instance with
the default configuration
@Service
@Properties(value={
Propchange:
stanbol/branches/release-0.12/enhancement-engines/opennlp/opennlp-token/
------------------------------------------------------------------------------
Merged /stanbol/trunk/enhancement-engines/opennlp/opennlp-token:r1547313
Modified:
stanbol/branches/release-0.12/enhancement-engines/opennlp/opennlp-token/src/main/java/org/apache/stanbol/enhancer/engines/opennlp/token/impl/OpenNlpTokenizerEngine.java
URL:
http://svn.apache.org/viewvc/stanbol/branches/release-0.12/enhancement-engines/opennlp/opennlp-token/src/main/java/org/apache/stanbol/enhancer/engines/opennlp/token/impl/OpenNlpTokenizerEngine.java?rev=1547321&r1=1547320&r2=1547321&view=diff
==============================================================================
---
stanbol/branches/release-0.12/enhancement-engines/opennlp/opennlp-token/src/main/java/org/apache/stanbol/enhancer/engines/opennlp/token/impl/OpenNlpTokenizerEngine.java
(original)
+++
stanbol/branches/release-0.12/enhancement-engines/opennlp/opennlp-token/src/main/java/org/apache/stanbol/enhancer/engines/opennlp/token/impl/OpenNlpTokenizerEngine.java
Tue Dec 3 09:05:31 2013
@@ -69,10 +69,11 @@ import org.slf4j.LoggerFactory;
*/
@Component(immediate = true, metatype = true,
+ configurationFactory = true, //allow multiple instances
policy = ConfigurationPolicy.OPTIONAL) //create a default instance with
the default configuration
@Service
@Properties(value={
- @Property(name= EnhancementEngine.PROPERTY_NAME,value="opennlp-token"),
+ @Property(name=EnhancementEngine.PROPERTY_NAME,value="opennlp-token"),
@Property(name=OpenNlpTokenizerEngine.CONFIG_LANGUAGES, value =
{"*"},cardinality=Integer.MAX_VALUE),
@Property(name=Constants.SERVICE_RANKING,intValue=-100) //give the
default instance a ranking < 0
})
