svn commit: r1305111 - in /incubator/stanbol/trunk/enhancer/engines/topic/src/main/java/org/apache/stanbol/enhancer: engine/topic/TopicClassificationEngine.java topic/ConfiguredSolrCoreTracker.java topic/training/SolrTrainingSet.java

[ogrisel]

Author: ogrisel
Date: Sun Mar 25 20:04:40 2012
New Revision: 1305111

URL: http://svn.apache.org/viewvc?rev=1305111&view=rev
Log:
STANBOL-197: make it possible to omit the solr core id in the configuration

Modified:
    
incubator/stanbol/trunk/enhancer/engines/topic/src/main/java/org/apache/stanbol/enhancer/engine/topic/TopicClassificationEngine.java
    
incubator/stanbol/trunk/enhancer/engines/topic/src/main/java/org/apache/stanbol/enhancer/topic/ConfiguredSolrCoreTracker.java
    
incubator/stanbol/trunk/enhancer/engines/topic/src/main/java/org/apache/stanbol/enhancer/topic/training/SolrTrainingSet.java

Modified: 
incubator/stanbol/trunk/enhancer/engines/topic/src/main/java/org/apache/stanbol/enhancer/engine/topic/TopicClassificationEngine.java
URL: 
http://svn.apache.org/viewvc/incubator/stanbol/trunk/enhancer/engines/topic/src/main/java/org/apache/stanbol/enhancer/engine/topic/TopicClassificationEngine.java?rev=1305111&r1=1305110&r2=1305111&view=diff
==============================================================================
--- 
incubator/stanbol/trunk/enhancer/engines/topic/src/main/java/org/apache/stanbol/enhancer/engine/topic/TopicClassificationEngine.java
 (original)
+++ 
incubator/stanbol/trunk/enhancer/engines/topic/src/main/java/org/apache/stanbol/enhancer/engine/topic/TopicClassificationEngine.java
 Sun Mar 25 20:04:40 2012
@@ -287,7 +287,7 @@ public class TopicClassificationEngine e
         falseNegativesField = getRequiredStringParam(config, 
FALSE_NEGATIVES_FIELD);
         positiveSupportField = getRequiredStringParam(config, 
POSITIVE_SUPPORT_FIELD);
         negativeSupportField = getRequiredStringParam(config, 
NEGATIVE_SUPPORT_FIELD);
-        configureSolrCore(config, SOLR_CORE);
+        configureSolrCore(config, SOLR_CORE, engineId + "-model");
 
         // optional fields, can be null
         broaderField = (String) config.get(BROADER_FIELD);

Modified: 
incubator/stanbol/trunk/enhancer/engines/topic/src/main/java/org/apache/stanbol/enhancer/topic/ConfiguredSolrCoreTracker.java
URL: 
http://svn.apache.org/viewvc/incubator/stanbol/trunk/enhancer/engines/topic/src/main/java/org/apache/stanbol/enhancer/topic/ConfiguredSolrCoreTracker.java?rev=1305111&r1=1305110&r2=1305111&view=diff
==============================================================================
--- 
incubator/stanbol/trunk/enhancer/engines/topic/src/main/java/org/apache/stanbol/enhancer/topic/ConfiguredSolrCoreTracker.java
 (original)
+++ 
incubator/stanbol/trunk/enhancer/engines/topic/src/main/java/org/apache/stanbol/enhancer/topic/ConfiguredSolrCoreTracker.java
 Sun Mar 25 20:04:40 2012
@@ -96,13 +96,20 @@ public abstract class ConfiguredSolrCore
         return solrServer != null ? solrServer : indexTracker.getService();
     }
 
-    protected void configureSolrCore(Dictionary<String,Object> config, String 
solrCoreProperty) throws ConfigurationException {
-        if (config.get(solrCoreProperty) instanceof SolrServer) {
+    protected void configureSolrCore(Dictionary<String,Object> config,
+                                     String solrCoreProperty,
+                                     String defaultCoreId) throws 
ConfigurationException {
+        Object solrCoreInfo = config.get(solrCoreProperty);
+        if (solrCoreInfo instanceof SolrServer) {
             // Bind a fixed Solr server client instead of doing dynamic OSGi 
lookup using the service tracker.
             // This can be useful both for unit-testing .
             solrServer = (SolrServer) config.get(solrCoreProperty);
         } else {
-            this.solrCoreId = getRequiredStringParam(config, solrCoreProperty);
+            if (solrCoreInfo != null && 
!solrCoreInfo.toString().trim().isEmpty()) {
+                this.solrCoreId = solrCoreInfo.toString();
+            } else {
+                this.solrCoreId = defaultCoreId;
+            }
             if (context == null) {
                 throw new ConfigurationException(solrCoreProperty,
                         solrCoreProperty + " should be a SolrServer instance 
for using"

Modified: 
incubator/stanbol/trunk/enhancer/engines/topic/src/main/java/org/apache/stanbol/enhancer/topic/training/SolrTrainingSet.java
URL: 
http://svn.apache.org/viewvc/incubator/stanbol/trunk/enhancer/engines/topic/src/main/java/org/apache/stanbol/enhancer/topic/training/SolrTrainingSet.java?rev=1305111&r1=1305110&r2=1305111&view=diff
==============================================================================
--- 
incubator/stanbol/trunk/enhancer/engines/topic/src/main/java/org/apache/stanbol/enhancer/topic/training/SolrTrainingSet.java
 (original)
+++ 
incubator/stanbol/trunk/enhancer/engines/topic/src/main/java/org/apache/stanbol/enhancer/topic/training/SolrTrainingSet.java
 Sun Mar 25 20:04:40 2012
@@ -94,7 +94,7 @@ public class SolrTrainingSet extends Con
     // TODO: make me configurable using an OSGi property
     protected int batchSize = 100;
 
-    protected String indexName = "default-topic-classifier-trainingset";
+    protected String indexName = "default-topic-trainingset";
 
     @Reference(cardinality = ReferenceCardinality.OPTIONAL_UNARY, bind = 
"bindManagedSolrServer", unbind = "unbindManagedSolrServer", strategy = 
ReferenceStrategy.EVENT, policy = ReferencePolicy.DYNAMIC)
     protected ManagedSolrServer managedSolrServer;
@@ -121,7 +121,7 @@ public class SolrTrainingSet extends Con
         exampleTextField = getRequiredStringParam(config, EXAMPLE_TEXT_FIELD);
         topicUrisField = getRequiredStringParam(config, TOPICS_URI_FIELD);
         modificationDateField = getRequiredStringParam(config, 
MODIFICATION_DATE_FIELD);
-        configureSolrCore(config, SOLR_CORE);
+        configureSolrCore(config, SOLR_CORE, trainingSetId);
     }
 
     public static ConfiguredSolrCoreTracker 
fromParameters(Dictionary<String,Object> config) throws ConfigurationException {