You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stanbol.apache.org by re...@apache.org on 2013/10/18 19:58:28 UTC
svn commit: r1533571 [4/7] - in /stanbol/branches/commons-ng: ./
commons/solr/ commons/solr/core/ commons/solr/core/src/license/
commons/solr/core/src/main/java/org/apache/stanbol/commons/solr/
commons/solr/core/src/main/java/org/apache/stanbol/commons...
Modified: stanbol/branches/commons-ng/enhancement-engines/textannotationnewmodel/src/test/java/org/apache/stanbol/enhancer/engines/textannotationnewmodel/impl/TextAnnotationNewModelEngineTest.java
URL: http://svn.apache.org/viewvc/stanbol/branches/commons-ng/enhancement-engines/textannotationnewmodel/src/test/java/org/apache/stanbol/enhancer/engines/textannotationnewmodel/impl/TextAnnotationNewModelEngineTest.java?rev=1533571&r1=1533570&r2=1533571&view=diff
==============================================================================
--- stanbol/branches/commons-ng/enhancement-engines/textannotationnewmodel/src/test/java/org/apache/stanbol/enhancer/engines/textannotationnewmodel/impl/TextAnnotationNewModelEngineTest.java (original)
+++ stanbol/branches/commons-ng/enhancement-engines/textannotationnewmodel/src/test/java/org/apache/stanbol/enhancer/engines/textannotationnewmodel/impl/TextAnnotationNewModelEngineTest.java Fri Oct 18 17:58:24 2013
@@ -1,3 +1,19 @@
+/*
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements. See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The ASF licenses this file to You under the Apache License, Version 2.0
+* (the "License"); you may not use this file except in compliance with
+* the License. You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
package org.apache.stanbol.enhancer.engines.textannotationnewmodel.impl;
import static org.apache.stanbol.enhancer.servicesapi.rdf.Properties.RDF_TYPE;
Modified: stanbol/branches/commons-ng/enhancement-engines/tika/src/test/resources/test.html
URL: http://svn.apache.org/viewvc/stanbol/branches/commons-ng/enhancement-engines/tika/src/test/resources/test.html?rev=1533571&r1=1533570&r2=1533571&view=diff
==============================================================================
--- stanbol/branches/commons-ng/enhancement-engines/tika/src/test/resources/test.html (original)
+++ stanbol/branches/commons-ng/enhancement-engines/tika/src/test/resources/test.html Fri Oct 18 17:58:24 2013
@@ -1,3 +1,19 @@
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
Modified: stanbol/branches/commons-ng/enhancement-engines/tika/src/test/resources/test2.html
URL: http://svn.apache.org/viewvc/stanbol/branches/commons-ng/enhancement-engines/tika/src/test/resources/test2.html?rev=1533571&r1=1533570&r2=1533571&view=diff
==============================================================================
--- stanbol/branches/commons-ng/enhancement-engines/tika/src/test/resources/test2.html (original)
+++ stanbol/branches/commons-ng/enhancement-engines/tika/src/test/resources/test2.html Fri Oct 18 17:58:24 2013
@@ -1,3 +1,19 @@
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE html
PUBLIC "-//W3C//DTD XHTML 1.1 plus MathML 2.0//EN" "http://www.w3.org/TR/MathML2/dtd/xhtml-math11-f.dtd">
Propchange: stanbol/branches/commons-ng/enhancement-engines/topic/api/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri Oct 18 17:58:24 2013
@@ -0,0 +1,7 @@
+target
+
+.project
+
+.classpath
+
+.settings
Modified: stanbol/branches/commons-ng/enhancement-engines/topic/api/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/branches/commons-ng/enhancement-engines/topic/api/pom.xml?rev=1533571&r1=1533530&r2=1533571&view=diff
==============================================================================
--- stanbol/branches/commons-ng/enhancement-engines/topic/api/pom.xml (original)
+++ stanbol/branches/commons-ng/enhancement-engines/topic/api/pom.xml Fri Oct 18 17:58:24 2013
@@ -23,13 +23,13 @@
<parent>
<groupId>org.apache.stanbol</groupId>
<artifactId>apache-stanbol-enhancement-engines</artifactId>
- <version>0.10.1-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
<relativePath>../..</relativePath>
</parent>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.enhancer.engine.topic.api</artifactId>
- <version>0.10.1-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
<packaging>bundle</packaging>
<name>Apache Stanbol Enhancement Engine : Topic Classification (API)</name>
Modified: stanbol/branches/commons-ng/enhancement-engines/topic/engine/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/branches/commons-ng/enhancement-engines/topic/engine/pom.xml?rev=1533571&r1=1533570&r2=1533571&view=diff
==============================================================================
--- stanbol/branches/commons-ng/enhancement-engines/topic/engine/pom.xml (original)
+++ stanbol/branches/commons-ng/enhancement-engines/topic/engine/pom.xml Fri Oct 18 17:58:24 2013
@@ -63,14 +63,10 @@
<Import-Package>
org.apache.stanbol.enhancer.servicesapi; provide:=true; version="[0.11,1.1)",
org.apache.stanbol.enhancer.servicesapi.impl; provide:=true; version="[0.11,1.1)",
- org.apache.stanbol.enhancer.topic,
- org.apache.stanbol.enhancer.topic.training,
+ org.apache.stanbol.enhancer.topic.api.*,
*
</Import-Package>
- <Export-Package>
- org.apache.stanbol.enhancer.topic;version=${project.version},
- org.apache.stanbol.enhancer.topic.training;version=${project.version}
- </Export-Package>
+ <Export-Package></Export-Package>
<Private-Package>
org.apache.stanbol.enhancer.engine.topic
</Private-Package>
@@ -303,7 +299,14 @@
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.commons.solr.managed</artifactId>
<version>1.0.0-SNAPSHOT</version>
- </dependency>
+ </dependency>
+
+ <!-- API dependency -->
+ <dependency>
+ <groupId>org.apache.stanbol</groupId>
+ <artifactId>org.apache.stanbol.enhancer.engine.topic.api</artifactId>
+ <version>0.10.1-SNAPSHOT</version>
+ </dependency>
</dependencies>
</project>
Modified: stanbol/branches/commons-ng/enhancement-engines/topic/engine/src/license/THIRD-PARTY.properties
URL: http://svn.apache.org/viewvc/stanbol/branches/commons-ng/enhancement-engines/topic/engine/src/license/THIRD-PARTY.properties?rev=1533571&r1=1533570&r2=1533571&view=diff
==============================================================================
--- stanbol/branches/commons-ng/enhancement-engines/topic/engine/src/license/THIRD-PARTY.properties (original)
+++ stanbol/branches/commons-ng/enhancement-engines/topic/engine/src/license/THIRD-PARTY.properties Fri Oct 18 17:58:24 2013
@@ -1,6 +1,9 @@
# Generated by org.codehaus.mojo.license.AddThirdPartyMojo
#-------------------------------------------------------------------------------
# Already used licenses in project :
+# - All files contained in this JAR are licensed under the Apache
+# 2.0 license, unless noted differently in their source (see
+# swing2swt).
# - Apache Software License
# - Apache Software License, Version 2.0
# - BSD License
@@ -15,12 +18,13 @@
# - ICU License
# - MIT License
# - New BSD License
+# - New BSD license
# - Public Domain License
#-------------------------------------------------------------------------------
# Please fill the missing licenses for dependencies :
#
#
-#Thu Feb 07 14:30:25 CET 2013
+#Tue Sep 24 21:11:37 CEST 2013
antlr--antlr--2.7.2=Public Domain
asm--asm--3.0=BSD License
asm--asm--3.1=BSD License
@@ -28,8 +32,12 @@ commons-beanutils--commons-beanutils--1.
dom4j--dom4j--1.1=BSD-style
jakarta-regexp--jakarta-regexp--1.4=The Apache Software License, Version 2.0
javax.servlet--servlet-api--2.5=Common Development And Distribution License (CDDL), Version 1.0
+javax.servlet.jsp--jsp-api--2.1=Common Development And Distribution License (CDDL), Version 1.0
+org.apache.zookeeper--zookeeper--3.4.5=The Apache Software License, Version 2.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
+org.restlet.jee--org.restlet--2.1.1=The Apache Software License, Version 2.0
+org.restlet.jee--org.restlet.ext.servlet--2.1.1=The Apache Software License, Version 2.0
oro--oro--2.0.8=The Apache Software License, Version 2.0
xerces--xercesImpl--2.7.1=The Apache Software License, Version 2.0
Modified: stanbol/branches/commons-ng/enhancement-engines/topic/engine/src/main/java/org/apache/stanbol/enhancer/engine/topic/TopicClassificationEngine.java
URL: http://svn.apache.org/viewvc/stanbol/branches/commons-ng/enhancement-engines/topic/engine/src/main/java/org/apache/stanbol/enhancer/engine/topic/TopicClassificationEngine.java?rev=1533571&r1=1533570&r2=1533571&view=diff
==============================================================================
--- stanbol/branches/commons-ng/enhancement-engines/topic/engine/src/main/java/org/apache/stanbol/enhancer/engine/topic/TopicClassificationEngine.java (original)
+++ stanbol/branches/commons-ng/enhancement-engines/topic/engine/src/main/java/org/apache/stanbol/enhancer/engine/topic/TopicClassificationEngine.java Fri Oct 18 17:58:24 2013
@@ -84,19 +84,19 @@ import org.apache.stanbol.enhancer.servi
import org.apache.stanbol.enhancer.servicesapi.rdf.NamespaceEnum;
import org.apache.stanbol.enhancer.servicesapi.rdf.OntologicalClasses;
import org.apache.stanbol.enhancer.servicesapi.rdf.TechnicalClasses;
-import org.apache.stanbol.enhancer.topic.Batch;
-import org.apache.stanbol.enhancer.topic.BatchProcessor;
-import org.apache.stanbol.enhancer.topic.ClassificationReport;
-import org.apache.stanbol.enhancer.topic.ClassifierException;
import org.apache.stanbol.enhancer.topic.ConfiguredSolrCoreTracker;
import org.apache.stanbol.enhancer.topic.EmbeddedSolrHelper;
-import org.apache.stanbol.enhancer.topic.TopicClassifier;
-import org.apache.stanbol.enhancer.topic.TopicSuggestion;
import org.apache.stanbol.enhancer.topic.UTCTimeStamper;
-import org.apache.stanbol.enhancer.topic.training.Example;
+import org.apache.stanbol.enhancer.topic.api.Batch;
+import org.apache.stanbol.enhancer.topic.api.BatchProcessor;
+import org.apache.stanbol.enhancer.topic.api.ClassificationReport;
+import org.apache.stanbol.enhancer.topic.api.ClassifierException;
+import org.apache.stanbol.enhancer.topic.api.TopicClassifier;
+import org.apache.stanbol.enhancer.topic.api.TopicSuggestion;
+import org.apache.stanbol.enhancer.topic.api.training.Example;
+import org.apache.stanbol.enhancer.topic.api.training.TrainingSet;
+import org.apache.stanbol.enhancer.topic.api.training.TrainingSetException;
import org.apache.stanbol.enhancer.topic.training.SolrTrainingSet;
-import org.apache.stanbol.enhancer.topic.training.TrainingSet;
-import org.apache.stanbol.enhancer.topic.training.TrainingSetException;
import org.apache.stanbol.entityhub.servicesapi.Entityhub;
import org.apache.stanbol.entityhub.servicesapi.EntityhubException;
import org.apache.stanbol.entityhub.servicesapi.model.Entity;
@@ -148,26 +148,27 @@ import org.slf4j.LoggerFactory;
@Property(name = TopicClassificationEngine.SOLR_CORE_CONFIG,
value = TopicClassificationEngine.DEFAULT_SOLR_CORE_CONFIG),
@Property(name = TopicClassificationEngine.LANGUAGES),
-// those properties can still be set via a configuration file, but as most users
-// will not use them exclude those from the configuration form
-// @Property(name = TopicClassificationEngine.SIMILARTITY_FIELD, value = TopicClassificationEngine.DEFAULT_SIMILARTITY_FIELD),
-// @Property(name = TopicClassificationEngine.CONCEPT_URI_FIELD, value = TopicClassificationEngine.DEFAULT_CONCEPT_URI_FIELD),
-// @Property(name = TopicClassificationEngine.PRIMARY_TOPIC_URI_FIELD, value = TopicClassificationEngine.DEFAULT_PRIMARY_TOPIC_URI_FIELD),
-// @Property(name = TopicClassificationEngine.BROADER_FIELD, value = TopicClassificationEngine.DEFAULT_BROADER_FIELD),
-// @Property(name = TopicClassificationEngine.MODEL_UPDATE_DATE_FIELD, value = TopicClassificationEngine.DEFAULT_MODEL_UPDATE_DATE_FIELD),
-// @Property(name = TopicClassificationEngine.PRECISION_FIELD, value = TopicClassificationEngine.DEFAULT_PRECISION_FIELD),
-// @Property(name = TopicClassificationEngine.RECALL_FIELD, value = TopicClassificationEngine.DEFAULT_RECALL_FIELD),
-// @Property(name = TopicClassificationEngine.ENTRY_ID_FIELD, value = TopicClassificationEngine.DEFAULT_ENTRY_ID_FIELD),
-// @Property(name = TopicClassificationEngine.MODEL_ENTRY_ID_FIELD, value = TopicClassificationEngine.DEFAULT_MODEL_ENTRY_ID_FIELD),
-// @Property(name = TopicClassificationEngine.ENTRY_TYPE_FIELD, value = TopicClassificationEngine.DEFAULT_ENTRY_TYPE_FIELD),
-// @Property(name = TopicClassificationEngine.MODEL_EVALUATION_DATE_FIELD, value = TopicClassificationEngine.DEFAULT_MODEL_EVALUATION_DATE_FIELD),
-// @Property(name = TopicClassificationEngine.FALSE_NEGATIVES_FIELD, value = TopicClassificationEngine.DEFAULT_FALSE_NEGATIVES_FIELD),
-// @Property(name = TopicClassificationEngine.FALSE_POSITIVES_FIELD, value = TopicClassificationEngine.DEFAULT_FALSE_POSITIVES_FIELD),
-// @Property(name = TopicClassificationEngine.POSITIVE_SUPPORT_FIELD, value = TopicClassificationEngine.DEFAULT_POSITIVE_SUPPORT_FIELD),
-// @Property(name = TopicClassificationEngine.NEGATIVE_SUPPORT_FIELD, value = TopicClassificationEngine.DEFAULT_NEGATIVE_SUPPORT_FIELD),
-// @Property(name = TopicClassificationEngine.ORDER, intValue = TopicClassificationEngine.DEFAULT_ENGINE_ORDER),
+ // those properties can still be set via a configuration file, but as most users
+ // will not use them exclude those from the configuration form
+// @Property(name = TopicClassificationEngine.SIMILARTITY_FIELD, value = TopicClassificationEngine.DEFAULT_SIMILARTITY_FIELD),
+// @Property(name = TopicClassificationEngine.CONCEPT_URI_FIELD, value = TopicClassificationEngine.DEFAULT_CONCEPT_URI_FIELD),
+// @Property(name = TopicClassificationEngine.PRIMARY_TOPIC_URI_FIELD, value = TopicClassificationEngine.DEFAULT_PRIMARY_TOPIC_URI_FIELD),
+// @Property(name = TopicClassificationEngine.BROADER_FIELD, value = TopicClassificationEngine.DEFAULT_BROADER_FIELD),
+// @Property(name = TopicClassificationEngine.MODEL_UPDATE_DATE_FIELD, value = TopicClassificationEngine.DEFAULT_MODEL_UPDATE_DATE_FIELD),
+// @Property(name = TopicClassificationEngine.PRECISION_FIELD, value = TopicClassificationEngine.DEFAULT_PRECISION_FIELD),
+// @Property(name = TopicClassificationEngine.RECALL_FIELD, value = TopicClassificationEngine.DEFAULT_RECALL_FIELD),
+// @Property(name = TopicClassificationEngine.ENTRY_ID_FIELD, value = TopicClassificationEngine.DEFAULT_ENTRY_ID_FIELD),
+// @Property(name = TopicClassificationEngine.MODEL_ENTRY_ID_FIELD, value = TopicClassificationEngine.DEFAULT_MODEL_ENTRY_ID_FIELD),
+// @Property(name = TopicClassificationEngine.ENTRY_TYPE_FIELD, value = TopicClassificationEngine.DEFAULT_ENTRY_TYPE_FIELD),
+// @Property(name = TopicClassificationEngine.MODEL_EVALUATION_DATE_FIELD, value = TopicClassificationEngine.DEFAULT_MODEL_EVALUATION_DATE_FIELD),
+// @Property(name = TopicClassificationEngine.FALSE_NEGATIVES_FIELD, value = TopicClassificationEngine.DEFAULT_FALSE_NEGATIVES_FIELD),
+// @Property(name = TopicClassificationEngine.FALSE_POSITIVES_FIELD, value = TopicClassificationEngine.DEFAULT_FALSE_POSITIVES_FIELD),
+// @Property(name = TopicClassificationEngine.POSITIVE_SUPPORT_FIELD, value = TopicClassificationEngine.DEFAULT_POSITIVE_SUPPORT_FIELD),
+// @Property(name = TopicClassificationEngine.NEGATIVE_SUPPORT_FIELD, value = TopicClassificationEngine.DEFAULT_NEGATIVE_SUPPORT_FIELD),
+// @Property(name = TopicClassificationEngine.ORDER, intValue = TopicClassificationEngine.DEFAULT_ENGINE_ORDER),
@Property(name = TopicClassificationEngine.TRAINING_SET_ID),
- @Property(name = Constants.SERVICE_RANKING, intValue = 0)})
+ @Property(name = Constants.SERVICE_RANKING, intValue = 0)
+})
public class TopicClassificationEngine extends ConfiguredSolrCoreTracker implements EnhancementEngine,
ServiceProperties, TopicClassifier {
@@ -1488,15 +1489,19 @@ public class TopicClassificationEngine e
}
@Override
- public List<String> getChainNames() throws InvalidSyntaxException, ChainException {
+ public List<String> getChainNames() throws InvalidSyntaxException {
List<String> chainNames = new ArrayList<String>();
BundleContext bundleContext = context.getBundleContext();
ServiceReference[] references = bundleContext.getServiceReferences(Chain.class.getName(), null);
if (references != null) {
for (ServiceReference ref : references) {
Chain chain = (Chain) bundleContext.getService(ref);
- if (chain.getEngines().contains(getName())) {
- chainNames.add(chain.getName());
+ try {
+ if (chain.getEngines().contains(getName())) {
+ chainNames.add(chain.getName());
+ }
+ } catch (ChainException e) {
+ // This chain is currently not active ... ignore
}
}
}
Modified: stanbol/branches/commons-ng/enhancement-engines/topic/engine/src/main/java/org/apache/stanbol/enhancer/topic/EmbeddedSolrHelper.java
URL: http://svn.apache.org/viewvc/stanbol/branches/commons-ng/enhancement-engines/topic/engine/src/main/java/org/apache/stanbol/enhancer/topic/EmbeddedSolrHelper.java?rev=1533571&r1=1533570&r2=1533571&view=diff
==============================================================================
--- stanbol/branches/commons-ng/enhancement-engines/topic/engine/src/main/java/org/apache/stanbol/enhancer/topic/EmbeddedSolrHelper.java (original)
+++ stanbol/branches/commons-ng/enhancement-engines/topic/engine/src/main/java/org/apache/stanbol/enhancer/topic/EmbeddedSolrHelper.java Fri Oct 18 17:58:24 2013
@@ -29,6 +29,7 @@ import org.apache.solr.client.solrj.embe
import org.apache.solr.core.CoreContainer;
import org.apache.solr.core.CoreDescriptor;
import org.apache.solr.core.SolrCore;
+import org.apache.solr.core.SolrResourceLoader;
import org.xml.sax.SAXException;
/**
@@ -78,10 +79,19 @@ public class EmbeddedSolrHelper {
IOUtils.copy(is, new FileOutputStream(solrConfigFile));
// create the embedded server
- CoreContainer coreContainer = new CoreContainer(solrFolder.getAbsolutePath(), solrFile);
+ SolrResourceLoader loader = new SolrResourceLoader(solrFolder.getAbsolutePath());
+ CoreContainer coreContainer = new CoreContainer(loader);
+ //NOTE: with Solr 4.4 we need to call coreContainer.load() otherwise we
+ //would be affected by the issue stated at
+ //http://mail-archives.apache.org/mod_mbox/lucene-solr-user/201301.mbox/%3CB7B8B36F1A0BE24F842758C318E56E925EB334%40EXCHDB2.na1.ad.group%3E
+ //while this was introduced with 4.1 this only affects this code with 4.4
+ //as with an API change the methods implicitly calling load() where
+ //removed.
+ coreContainer.load();
CoreDescriptor coreDescriptor = new CoreDescriptor(coreContainer, coreId,
solrCoreFolder.getAbsolutePath());
SolrCore core = coreContainer.create(coreDescriptor);
+// coreContainer.createAndLoad(solrHome, configFile)load();
coreContainer.register(coreId, core, true);
return new EmbeddedSolrServer(coreContainer, coreId);
}
Modified: stanbol/branches/commons-ng/enhancement-engines/topic/engine/src/main/java/org/apache/stanbol/enhancer/topic/training/SolrTrainingSet.java
URL: http://svn.apache.org/viewvc/stanbol/branches/commons-ng/enhancement-engines/topic/engine/src/main/java/org/apache/stanbol/enhancer/topic/training/SolrTrainingSet.java?rev=1533571&r1=1533570&r2=1533571&view=diff
==============================================================================
--- stanbol/branches/commons-ng/enhancement-engines/topic/engine/src/main/java/org/apache/stanbol/enhancer/topic/training/SolrTrainingSet.java (original)
+++ stanbol/branches/commons-ng/enhancement-engines/topic/engine/src/main/java/org/apache/stanbol/enhancer/topic/training/SolrTrainingSet.java Fri Oct 18 17:58:24 2013
@@ -43,10 +43,12 @@ import org.apache.solr.client.solrj.util
import org.apache.solr.common.SolrDocument;
import org.apache.solr.common.SolrInputDocument;
import org.apache.stanbol.commons.solr.managed.ManagedSolrServer;
-import org.apache.stanbol.commons.stanboltools.datafileprovider.DataFileProvider;
-import org.apache.stanbol.enhancer.topic.Batch;
import org.apache.stanbol.enhancer.topic.ConfiguredSolrCoreTracker;
import org.apache.stanbol.enhancer.topic.UTCTimeStamper;
+import org.apache.stanbol.enhancer.topic.api.Batch;
+import org.apache.stanbol.enhancer.topic.api.training.Example;
+import org.apache.stanbol.enhancer.topic.api.training.TrainingSet;
+import org.apache.stanbol.enhancer.topic.api.training.TrainingSetException;
import org.osgi.framework.InvalidSyntaxException;
import org.osgi.service.cm.ConfigurationException;
import org.osgi.service.component.ComponentContext;
Modified: stanbol/branches/commons-ng/enhancement-engines/topic/engine/src/test/java/org/apache/stanbol/enhancer/engine/topic/TopicEngineTest.java
URL: http://svn.apache.org/viewvc/stanbol/branches/commons-ng/enhancement-engines/topic/engine/src/test/java/org/apache/stanbol/enhancer/engine/topic/TopicEngineTest.java?rev=1533571&r1=1533570&r2=1533571&view=diff
==============================================================================
--- stanbol/branches/commons-ng/enhancement-engines/topic/engine/src/test/java/org/apache/stanbol/enhancer/engine/topic/TopicEngineTest.java (original)
+++ stanbol/branches/commons-ng/enhancement-engines/topic/engine/src/test/java/org/apache/stanbol/enhancer/engine/topic/TopicEngineTest.java Fri Oct 18 17:58:24 2013
@@ -51,12 +51,12 @@ import org.apache.stanbol.commons.solr.u
import org.apache.stanbol.enhancer.servicesapi.EnhancementEngine;
import org.apache.stanbol.enhancer.servicesapi.rdf.OntologicalClasses;
import org.apache.stanbol.enhancer.servicesapi.rdf.Properties;
-import org.apache.stanbol.enhancer.topic.ClassificationReport;
-import org.apache.stanbol.enhancer.topic.ClassifierException;
import org.apache.stanbol.enhancer.topic.EmbeddedSolrHelper;
-import org.apache.stanbol.enhancer.topic.TopicSuggestion;
+import org.apache.stanbol.enhancer.topic.api.ClassificationReport;
+import org.apache.stanbol.enhancer.topic.api.ClassifierException;
+import org.apache.stanbol.enhancer.topic.api.TopicSuggestion;
+import org.apache.stanbol.enhancer.topic.api.training.TrainingSetException;
import org.apache.stanbol.enhancer.topic.training.SolrTrainingSet;
-import org.apache.stanbol.enhancer.topic.training.TrainingSetException;
import org.junit.After;
import org.junit.AfterClass;
import org.junit.Before;
Modified: stanbol/branches/commons-ng/enhancement-engines/topic/engine/src/test/java/org/apache/stanbol/enhancer/engine/topic/TrainingSetTest.java
URL: http://svn.apache.org/viewvc/stanbol/branches/commons-ng/enhancement-engines/topic/engine/src/test/java/org/apache/stanbol/enhancer/engine/topic/TrainingSetTest.java?rev=1533571&r1=1533570&r2=1533571&view=diff
==============================================================================
--- stanbol/branches/commons-ng/enhancement-engines/topic/engine/src/test/java/org/apache/stanbol/enhancer/engine/topic/TrainingSetTest.java (original)
+++ stanbol/branches/commons-ng/enhancement-engines/topic/engine/src/test/java/org/apache/stanbol/enhancer/engine/topic/TrainingSetTest.java Fri Oct 18 17:58:24 2013
@@ -37,12 +37,12 @@ import javax.xml.parsers.ParserConfigura
import org.apache.commons.io.FileUtils;
import org.apache.commons.io.FilenameUtils;
import org.apache.solr.client.solrj.embedded.EmbeddedSolrServer;
-import org.apache.stanbol.enhancer.topic.Batch;
import org.apache.stanbol.enhancer.topic.EmbeddedSolrHelper;
import org.apache.stanbol.enhancer.topic.UTCTimeStamper;
-import org.apache.stanbol.enhancer.topic.training.Example;
+import org.apache.stanbol.enhancer.topic.api.Batch;
+import org.apache.stanbol.enhancer.topic.api.training.Example;
+import org.apache.stanbol.enhancer.topic.api.training.TrainingSetException;
import org.apache.stanbol.enhancer.topic.training.SolrTrainingSet;
-import org.apache.stanbol.enhancer.topic.training.TrainingSetException;
import org.junit.After;
import org.junit.AfterClass;
import org.junit.Before;
Modified: stanbol/branches/commons-ng/enhancement-engines/topic/web/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/branches/commons-ng/enhancement-engines/topic/web/pom.xml?rev=1533571&r1=1533570&r2=1533571&view=diff
==============================================================================
--- stanbol/branches/commons-ng/enhancement-engines/topic/web/pom.xml (original)
+++ stanbol/branches/commons-ng/enhancement-engines/topic/web/pom.xml Fri Oct 18 17:58:24 2013
@@ -110,6 +110,11 @@
<artifactId>org.apache.stanbol.enhancer.servicesapi</artifactId>
<version>1.0.0-SNAPSHOT</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.stanbol</groupId>
+ <artifactId>org.apache.stanbol.enhancer.engine.topic.api</artifactId>
+ <version>0.10.1-SNAPSHOT</version>
+ </dependency>
<dependency>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.enhancer.engine.topic</artifactId>
Modified: stanbol/branches/commons-ng/enhancement-engines/topic/web/src/license/THIRD-PARTY.properties
URL: http://svn.apache.org/viewvc/stanbol/branches/commons-ng/enhancement-engines/topic/web/src/license/THIRD-PARTY.properties?rev=1533571&r1=1533570&r2=1533571&view=diff
==============================================================================
--- stanbol/branches/commons-ng/enhancement-engines/topic/web/src/license/THIRD-PARTY.properties (original)
+++ stanbol/branches/commons-ng/enhancement-engines/topic/web/src/license/THIRD-PARTY.properties Fri Oct 18 17:58:24 2013
@@ -15,21 +15,26 @@
# - ICU License
# - MIT License
# - New BSD License
+# - New BSD license
# - Public Domain License
# - Similar to Apache License but with the acknowledgment clause removed
#-------------------------------------------------------------------------------
# Please fill the missing licenses for dependencies :
#
#
-#Thu Feb 07 14:35:02 CET 2013
+#Tue Sep 24 21:12:56 CEST 2013
antlr--antlr--2.7.2=Public Domain
asm--asm--3.1=BSD License
commons-beanutils--commons-beanutils--1.7.0=The Apache Software License, Version 2.0
dom4j--dom4j--1.1=BSD-style
jakarta-regexp--jakarta-regexp--1.4=The Apache Software License, Version 2.0
javax.servlet--servlet-api--2.5=Common Development And Distribution License (CDDL), Version 1.0
+javax.servlet.jsp--jsp-api--2.1=Common Development And Distribution License (CDDL), Version 1.0
+org.apache.zookeeper--zookeeper--3.4.5=The Apache Software License, Version 2.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
+org.restlet.jee--org.restlet--2.1.1=The Apache Software License, Version 2.0
+org.restlet.jee--org.restlet.ext.servlet--2.1.1=The Apache Software License, Version 2.0
oro--oro--2.0.8=The Apache Software License, Version 2.0
xerces--xercesImpl--2.7.1=The Apache Software License, Version 2.0
Modified: stanbol/branches/commons-ng/enhancement-engines/topic/web/src/main/java/org/apache/stanbol/enhancer/web/topic/resource/TopicClassifierRootResource.java
URL: http://svn.apache.org/viewvc/stanbol/branches/commons-ng/enhancement-engines/topic/web/src/main/java/org/apache/stanbol/enhancer/web/topic/resource/TopicClassifierRootResource.java?rev=1533571&r1=1533570&r2=1533571&view=diff
==============================================================================
--- stanbol/branches/commons-ng/enhancement-engines/topic/web/src/main/java/org/apache/stanbol/enhancer/web/topic/resource/TopicClassifierRootResource.java (original)
+++ stanbol/branches/commons-ng/enhancement-engines/topic/web/src/main/java/org/apache/stanbol/enhancer/web/topic/resource/TopicClassifierRootResource.java Fri Oct 18 17:58:24 2013
@@ -16,10 +16,9 @@
*/
package org.apache.stanbol.enhancer.web.topic.resource;
-import static javax.ws.rs.core.MediaType.TEXT_HTML;
-
import java.util.ArrayList;
import java.util.List;
+import static javax.ws.rs.core.MediaType.TEXT_HTML;
import javax.ws.rs.GET;
import javax.ws.rs.OPTIONS;
@@ -37,7 +36,7 @@ import org.apache.felix.scr.annotations.
import org.apache.stanbol.commons.web.viewable.Viewable;
import org.apache.stanbol.commons.web.base.resource.BaseStanbolResource;
-import org.apache.stanbol.enhancer.topic.TopicClassifier;
+import org.apache.stanbol.enhancer.topic.api.TopicClassifier;
import org.osgi.framework.BundleContext;
import org.osgi.framework.InvalidSyntaxException;
import org.osgi.framework.ServiceReference;
Modified: stanbol/branches/commons-ng/enhancement-engines/topic/web/src/main/java/org/apache/stanbol/enhancer/web/topic/resource/TopicModelResource.java
URL: http://svn.apache.org/viewvc/stanbol/branches/commons-ng/enhancement-engines/topic/web/src/main/java/org/apache/stanbol/enhancer/web/topic/resource/TopicModelResource.java?rev=1533571&r1=1533570&r2=1533571&view=diff
==============================================================================
--- stanbol/branches/commons-ng/enhancement-engines/topic/web/src/main/java/org/apache/stanbol/enhancer/web/topic/resource/TopicModelResource.java (original)
+++ stanbol/branches/commons-ng/enhancement-engines/topic/web/src/main/java/org/apache/stanbol/enhancer/web/topic/resource/TopicModelResource.java Fri Oct 18 17:58:24 2013
@@ -49,10 +49,10 @@ import org.apache.stanbol.commons.web.ba
import org.apache.stanbol.enhancer.servicesapi.EnhancementEngine;
import org.apache.stanbol.enhancer.servicesapi.rdf.OntologicalClasses;
import org.apache.stanbol.enhancer.servicesapi.rdf.Properties;
-import org.apache.stanbol.enhancer.topic.ClassifierException;
-import org.apache.stanbol.enhancer.topic.TopicClassifier;
-import org.apache.stanbol.enhancer.topic.training.TrainingSet;
-import org.apache.stanbol.enhancer.topic.training.TrainingSetException;
+import org.apache.stanbol.enhancer.topic.api.ClassifierException;
+import org.apache.stanbol.enhancer.topic.api.TopicClassifier;
+import org.apache.stanbol.enhancer.topic.api.training.TrainingSet;
+import org.apache.stanbol.enhancer.topic.api.training.TrainingSetException;
import org.osgi.framework.BundleContext;
import org.osgi.framework.InvalidSyntaxException;
import org.osgi.framework.ServiceReference;
Propchange: stanbol/branches/commons-ng/entityhub/
------------------------------------------------------------------------------
Merged /stanbol/trunk/entityhub:r1494993-1533392
Propchange: stanbol/branches/commons-ng/entityhub/generic/core/
------------------------------------------------------------------------------
svn:mergeinfo = /stanbol/trunk/entityhub/generic/core:1494993-1533478
Modified: stanbol/branches/commons-ng/entityhub/generic/test/src/main/java/org/apache/stanbol/entityhub/test/it/AssertEntityhubJson.java
URL: http://svn.apache.org/viewvc/stanbol/branches/commons-ng/entityhub/generic/test/src/main/java/org/apache/stanbol/entityhub/test/it/AssertEntityhubJson.java?rev=1533571&r1=1533570&r2=1533571&view=diff
==============================================================================
--- stanbol/branches/commons-ng/entityhub/generic/test/src/main/java/org/apache/stanbol/entityhub/test/it/AssertEntityhubJson.java (original)
+++ stanbol/branches/commons-ng/entityhub/generic/test/src/main/java/org/apache/stanbol/entityhub/test/it/AssertEntityhubJson.java Fri Oct 18 17:58:24 2013
@@ -22,6 +22,7 @@ import static org.junit.Assert.assertNot
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
+import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
import java.util.Collections;
@@ -61,15 +62,21 @@ public class AssertEntityhubJson {
* @throws JSONException in case the {@link RequestExecutor#getContent()} are
* no valid JSON. NOTE that the contents are only parsed if the
* {@link QueryTestCase#getExpectedStatus()} is a 2xx status code.
+ * @return in case of success the List of result Entity IDs
*/
- public static void assertQueryResults(RequestExecutor re, QueryTestCase test) throws JSONException{
- log.debug("Assert Query Results for test {}",test.getContent());
+ public static List<String> assertQueryResults(RequestExecutor re, QueryTestCase test) throws JSONException{
+ if(log.isDebugEnabled()){
+ log.debug("Assert Query Results for test {}",test.getContent());
+ }
re.assertStatus(test.getExpectedStatus());
re.assertContentType("application/json"); //currently only application/json is supported
if(!test.expectsSuccess()){
- return; //no further checks for tests that expect failure
+ return null; //no further checks for tests that expect failure
}
JSONObject jso = new JSONObject(re.getContent());
+ if(log.isDebugEnabled()){
+ log.debug("Assert Results: {}",jso.toString(2));
+ }
JSONArray results = jso.getJSONArray("results");
if(test.expectesResults()){
assertTrue("Missing Results for Query: \n "+test+
@@ -91,11 +98,13 @@ public class AssertEntityhubJson {
//General NOTE:
// use opt**(..) methods to avoid JSON Exception. We want to parse
// everything and than do asserts!
+ List<String> resultIds = new ArrayList<String>(results.length());
for(int i=0;i<results.length();i++){
JSONObject result = results.getJSONObject(i);
String id = result.optString("id", null);
log.info("({}) {}",i,id);
assertNotNull("ID missing for an Result", id);
+ resultIds.add(id);
if(expectedIds != null){
expectedIds.remove(id); //not all results must be in the list
}
@@ -109,6 +118,7 @@ public class AssertEntityhubJson {
assertTrue("The following expected results where missing in the Response: \n "+expectedIds,
expectedIds.isEmpty());
}
+ return resultIds;
}
/**
Modified: stanbol/branches/commons-ng/entityhub/generic/test/src/main/java/org/apache/stanbol/entityhub/test/model/RepresentationTest.java
URL: http://svn.apache.org/viewvc/stanbol/branches/commons-ng/entityhub/generic/test/src/main/java/org/apache/stanbol/entityhub/test/model/RepresentationTest.java?rev=1533571&r1=1533570&r2=1533571&view=diff
==============================================================================
--- stanbol/branches/commons-ng/entityhub/generic/test/src/main/java/org/apache/stanbol/entityhub/test/model/RepresentationTest.java (original)
+++ stanbol/branches/commons-ng/entityhub/generic/test/src/main/java/org/apache/stanbol/entityhub/test/model/RepresentationTest.java Fri Oct 18 17:58:24 2013
@@ -16,11 +16,11 @@
*/
package org.apache.stanbol.entityhub.test.model;
-import static junit.framework.Assert.assertEquals;
-import static junit.framework.Assert.assertFalse;
-import static junit.framework.Assert.assertNotNull;
-import static junit.framework.Assert.assertNull;
-import static junit.framework.Assert.assertTrue;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
import static org.apache.stanbol.entityhub.test.Utils.asCollection;
import java.net.MalformedURLException;
@@ -840,7 +840,8 @@ public abstract class RepresentationTest
Set<String> textSet = new HashSet<String>(Arrays.asList(NL_TEST_de, NL_TEST_de_AT));
while (allDeTexts.hasNext()) {
Text text = allDeTexts.next();
- assertTrue(text.getLanguage().equals("de") || text.getLanguage().equals("de-AT"));
+ assertTrue(text.getLanguage().equalsIgnoreCase("de") ||
+ text.getLanguage().equalsIgnoreCase("de-AT"));
assertTrue(textSet.remove(text.getText())); // remove the found
}
assertTrue(textSet.isEmpty()); // all texts found
Modified: stanbol/branches/commons-ng/entityhub/generic/test/src/main/java/org/apache/stanbol/entityhub/test/model/ValueFactoryTest.java
URL: http://svn.apache.org/viewvc/stanbol/branches/commons-ng/entityhub/generic/test/src/main/java/org/apache/stanbol/entityhub/test/model/ValueFactoryTest.java?rev=1533571&r1=1533570&r2=1533571&view=diff
==============================================================================
--- stanbol/branches/commons-ng/entityhub/generic/test/src/main/java/org/apache/stanbol/entityhub/test/model/ValueFactoryTest.java (original)
+++ stanbol/branches/commons-ng/entityhub/generic/test/src/main/java/org/apache/stanbol/entityhub/test/model/ValueFactoryTest.java Fri Oct 18 17:58:24 2013
@@ -16,10 +16,10 @@
*/
package org.apache.stanbol.entityhub.test.model;
-import static junit.framework.Assert.assertEquals;
-import static junit.framework.Assert.assertNotNull;
-import static junit.framework.Assert.assertNotSame;
-import static junit.framework.Assert.assertTrue;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNotSame;
+import static org.junit.Assert.assertTrue;
import java.net.MalformedURLException;
import java.net.URI;
Modified: stanbol/branches/commons-ng/entityhub/generic/test/src/main/java/org/apache/stanbol/entityhub/test/yard/YardTest.java
URL: http://svn.apache.org/viewvc/stanbol/branches/commons-ng/entityhub/generic/test/src/main/java/org/apache/stanbol/entityhub/test/yard/YardTest.java?rev=1533571&r1=1533570&r2=1533571&view=diff
==============================================================================
--- stanbol/branches/commons-ng/entityhub/generic/test/src/main/java/org/apache/stanbol/entityhub/test/yard/YardTest.java (original)
+++ stanbol/branches/commons-ng/entityhub/generic/test/src/main/java/org/apache/stanbol/entityhub/test/yard/YardTest.java Fri Oct 18 17:58:24 2013
@@ -16,12 +16,12 @@
*/
package org.apache.stanbol.entityhub.test.yard;
-import static junit.framework.Assert.assertEquals;
-import static junit.framework.Assert.assertFalse;
-import static junit.framework.Assert.assertNotNull;
-import static junit.framework.Assert.assertNotSame;
-import static junit.framework.Assert.assertNull;
-import static junit.framework.Assert.assertTrue;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNotSame;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
import static org.apache.stanbol.entityhub.test.Utils.asCollection;
import java.util.Arrays;
Modified: stanbol/branches/commons-ng/entityhub/indexing/core/src/main/java/org/apache/stanbol/entityhub/indexing/Urify.java
URL: http://svn.apache.org/viewvc/stanbol/branches/commons-ng/entityhub/indexing/core/src/main/java/org/apache/stanbol/entityhub/indexing/Urify.java?rev=1533571&r1=1533570&r2=1533571&view=diff
==============================================================================
--- stanbol/branches/commons-ng/entityhub/indexing/core/src/main/java/org/apache/stanbol/entityhub/indexing/Urify.java (original)
+++ stanbol/branches/commons-ng/entityhub/indexing/core/src/main/java/org/apache/stanbol/entityhub/indexing/Urify.java Fri Oct 18 17:58:24 2013
@@ -16,6 +16,9 @@
*/
package org.apache.stanbol.entityhub.indexing;
+import static java.lang.System.exit;
+import static java.lang.System.out;
+
import java.io.BufferedReader;
import java.io.BufferedWriter;
import java.io.File;
@@ -77,12 +80,14 @@ public class Urify implements Runnable{
private static Logger log = LoggerFactory.getLogger(Urify.class);
private static final Options options;
+
static {
options = new Options();
options.addOption("h", "help", false, "display this help and exit");
options.addOption("p","prefix",true,
"The URI prefix used for wrapping the bNode Id");
options.addOption("e","encoding",true, "the char encodinf (default: UTF-8)");
+ options.addOption("o","outputFilePrefix",true, "The prefix to add to output files, defaults to \"uf_\"");
}
/**
* @param args
@@ -92,39 +97,53 @@ public class Urify implements Runnable{
CommandLineParser parser = new PosixParser();
CommandLine line = parser.parse(options, args);
args = line.getArgs();
+ if (line.hasOption('h')) {
+ out.println("Processes RDF files to translate blank nodes into prefixed URI nodes.");
+ out.println("-h/--help: Print this help and exit.");
+ out.println("-p/--prefix: Required: The prefix to add to blank nodes to make them URIs.");
+ out.println("-e/--encoding: The text encoding to expect in the RDF, defaults to UTF-8.");
+ out.println("-o/--outputFilePrefix: The prefix to add to output files, defaults to \"uf_\".");
+ exit(0);
+ }
if(!line.hasOption('p')){
log.error("Missing parameter 'prefix' ('p)!");
- System.exit(1);
+ exit(1);
}
String prefix = "<"+line.getOptionValue('p');
- log.info("prfix: {} ",line.getOptionValue('p'));
+ log.info("Using prefix: {} ",line.getOptionValue('p'));
Charset charset;
if(line.hasOption('e')){
charset = Charset.forName(line.getOptionValue('e'));
if(charset == null){
log.error("Unsupported encoding '{}'!",line.getOptionValue('e'));
- System.exit(1);
+ exit(1);
}
} else {
charset = Charset.forName("UTF-8");
}
+
log.info("charset: {} ",charset.name());
- Urify urify = new Urify(Arrays.asList(args), charset, prefix);
- urify.run(); //TODO: this could support processing multiple files in parallel
+ Urify urify = new Urify(Arrays.asList(args), charset, prefix,
+ line.hasOption('o') ? line.getOptionValue('o') : "uf_");
+ urify.run(); //TODO: this could support processing multiple files in parallel
}
private final Charset charset;
private final String prefix;
+ private final String outputFilePrefix;
protected long start = System.currentTimeMillis();
protected long uf_count = 0;
private List<String> resources;
- public Urify(List<String> resources, Charset charset, String prefix) throws IOException {
- this.charset = charset;
- this.prefix = prefix;
- this.resources = Collections.synchronizedList(new ArrayList<String>(resources));
- }
+ public Urify(List<String> resources, Charset charset, String prefix,
+ final String outputFilePrefix) throws IOException {
+ this.charset = charset;
+ this.prefix = prefix;
+ this.outputFilePrefix = outputFilePrefix;
+ this.resources = Collections.synchronizedList(new ArrayList<String>(
+ resources));
+ }
public void run() {
String source;
@@ -148,7 +167,7 @@ public class Urify implements Runnable{
if(source.isFile()){
String path = FilenameUtils.getFullPathNoEndSeparator(resource);
String name = FilenameUtils.getName(resource);
- File target = new File(path,"uf_"+name);
+ File target = new File(path, outputFilePrefix + name);
int i=0;
while(target.exists()){
i++;
Modified: stanbol/branches/commons-ng/entityhub/indexing/core/src/main/java/org/apache/stanbol/entityhub/indexing/core/IndexerFactory.java
URL: http://svn.apache.org/viewvc/stanbol/branches/commons-ng/entityhub/indexing/core/src/main/java/org/apache/stanbol/entityhub/indexing/core/IndexerFactory.java?rev=1533571&r1=1533570&r2=1533571&view=diff
==============================================================================
--- stanbol/branches/commons-ng/entityhub/indexing/core/src/main/java/org/apache/stanbol/entityhub/indexing/core/IndexerFactory.java (original)
+++ stanbol/branches/commons-ng/entityhub/indexing/core/src/main/java/org/apache/stanbol/entityhub/indexing/core/IndexerFactory.java Fri Oct 18 17:58:24 2013
@@ -16,8 +16,6 @@
*/
package org.apache.stanbol.entityhub.indexing.core;
-import static org.apache.stanbol.entityhub.indexing.core.config.IndexingConfig.DEFAULT_INDEXED_ENTITIES_ID_FILE_NAME;
-
import java.io.File;
import java.io.IOException;
import java.util.List;
Modified: stanbol/branches/commons-ng/entityhub/indexing/core/src/main/java/org/apache/stanbol/entityhub/indexing/core/config/IndexingConfig.java
URL: http://svn.apache.org/viewvc/stanbol/branches/commons-ng/entityhub/indexing/core/src/main/java/org/apache/stanbol/entityhub/indexing/core/config/IndexingConfig.java?rev=1533571&r1=1533570&r2=1533571&view=diff
==============================================================================
--- stanbol/branches/commons-ng/entityhub/indexing/core/src/main/java/org/apache/stanbol/entityhub/indexing/core/config/IndexingConfig.java (original)
+++ stanbol/branches/commons-ng/entityhub/indexing/core/src/main/java/org/apache/stanbol/entityhub/indexing/core/config/IndexingConfig.java Fri Oct 18 17:58:24 2013
@@ -77,10 +77,8 @@ public class IndexingConfig {
private static final String SOURCE_FOLDER = "resources";
private static final String SOURCE_PATH = DEFAULT_ROOT_PATH+File.separatorChar+SOURCE_FOLDER;
private static final String DESTINATION_FOLDER = "destination";
- private static final String DESTINATION_PATH = DEFAULT_ROOT_PATH+File.separatorChar+DESTINATION_FOLDER;
private static final String DISTRIBUTION_FOLDER = "dist";
- private static final String DISTRIBUTION_PATH = DEFAULT_ROOT_PATH+File.separatorChar+DISTRIBUTION_FOLDER;
- private static final String INDEXING_PROERTIES = "indexing.properties";
+ private static final String INDEXING_PROPERTIES = "indexing.properties";
private static final String CONFIG_PARAM = "config";
public static final String KEY_INDEXING_CONFIG = "indexingConfig";
@@ -135,7 +133,7 @@ public class IndexingConfig {
// private final Map<File,File> canonicalDirs = new HashMap<File,File>();
/**
- * The main indexing configuration as parsed form {@link #INDEXING_PROERTIES}
+ * The main indexing configuration as parsed form {@link #INDEXING_PROPERTIES}
* file within the {@link #configDir}.
*/
private final Map<String,Object> configuration;
@@ -318,16 +316,16 @@ public class IndexingConfig {
}
//check the main configuration
- this.configuration = loadConfig(INDEXING_PROERTIES,true);
+ this.configuration = loadConfig(INDEXING_PROPERTIES,true);
Object value = configuration.get(KEY_NAME);
if(value == null){
throw new IllegalArgumentException("Indexing Configuration '"+
- INDEXING_PROERTIES+"' is missing the required key "+KEY_NAME+"!");
+ INDEXING_PROPERTIES+"' is missing the required key "+KEY_NAME+"!");
}
this.name = value.toString();
if(name.isEmpty()){
throw new IllegalArgumentException("Invalid Indexing Configuration '"+
- INDEXING_PROERTIES+"': The value for the parameter"+KEY_NAME+" MUST NOT be empty!");
+ INDEXING_PROPERTIES+"': The value for the parameter"+KEY_NAME+" MUST NOT be empty!");
}
value = configuration.get(KEY_INDEX_FIELD_CONFIG);
if(value == null || value.toString().isEmpty()){
@@ -360,7 +358,7 @@ public class IndexingConfig {
throw new IllegalArgumentException("Invalid Indexing Configuration: " +
"IndexFieldConfiguration '"+indexFieldConfig+"' not found. " +
"Provide the missing file or use the '"+KEY_INDEX_FIELD_CONFIG+
- "' in the '"+INDEXING_PROERTIES+"' to configure a different one!");
+ "' in the '"+INDEXING_PROPERTIES+"' to configure a different one!");
}
}
@@ -594,9 +592,9 @@ public class IndexingConfig {
String contextResource;
if(classpathResourceOffset != null){
contextResource = FilenameUtils.concat(classpathResourceOffset,
- CONFIG_PATH+File.separatorChar+INDEXING_PROERTIES);
+ CONFIG_PATH+File.separatorChar+INDEXING_PROPERTIES);
} else {
- contextResource = CONFIG_PATH+File.separatorChar+INDEXING_PROERTIES;
+ contextResource = CONFIG_PATH+File.separatorChar+INDEXING_PROPERTIES;
}
URL contextUrl = loadViaClasspath(contextResource);
if(contextUrl == null){// if indexing.properties is not found via classpath
@@ -784,6 +782,20 @@ public class IndexingConfig {
return value != null?value.toString():null;
}
/**
+ * Getter for the failOnError as configured by the {@link IndexingConstants#KEY_FAIL_ON_ERROR_LOADING_RESOURCE}
+ * by the main indexing configuration.
+ * @return the boolean value of the failOnError parameter
+ */
+ public boolean isFailOnError(){
+ //by default failOnError is false to continue execution of the indexing tool
+ boolean failOnError = false;
+ Object value = configuration.get(IndexingConstants.KEY_FAIL_ON_ERROR_LOADING_RESOURCE);
+ if(value != null && !value.toString().isEmpty()){
+ failOnError = Boolean.parseBoolean(value.toString());
+ }
+ return failOnError;
+ }
+ /**
* The {@link ScoreNormaliser} as configured by the {@link IndexingConstants#KEY_SCORE_NORMALIZER}
* by the main indexing configuration.
* @return the configured {@link ScoreNormaliser} or a {@link DefaultNormaliser} if
Modified: stanbol/branches/commons-ng/entityhub/indexing/core/src/main/java/org/apache/stanbol/entityhub/indexing/core/config/IndexingConstants.java
URL: http://svn.apache.org/viewvc/stanbol/branches/commons-ng/entityhub/indexing/core/src/main/java/org/apache/stanbol/entityhub/indexing/core/config/IndexingConstants.java?rev=1533571&r1=1533570&r2=1533571&view=diff
==============================================================================
--- stanbol/branches/commons-ng/entityhub/indexing/core/src/main/java/org/apache/stanbol/entityhub/indexing/core/config/IndexingConstants.java (original)
+++ stanbol/branches/commons-ng/entityhub/indexing/core/src/main/java/org/apache/stanbol/entityhub/indexing/core/config/IndexingConstants.java Fri Oct 18 17:58:24 2013
@@ -16,7 +16,6 @@
*/
package org.apache.stanbol.entityhub.indexing.core.config;
-import java.io.File;
/**
* Constants defines/used for Indexing.
@@ -49,4 +48,6 @@ public interface IndexingConstants {
String KEY_SCORE_NORMALIZER = "scoreNormalizer";
String KEY_ENTITY_PROCESSOR = "entityProcessor";
String KEY_ENTITY_POST_PROCESSOR = "entityPostProcessor";
+ String KEY_FAIL_ON_ERROR_LOADING_RESOURCE = "failOnErrorLoadingResource";
+
}
Modified: stanbol/branches/commons-ng/entityhub/indexing/core/src/main/java/org/apache/stanbol/entityhub/indexing/core/destination/OsgiConfigurationUtil.java
URL: http://svn.apache.org/viewvc/stanbol/branches/commons-ng/entityhub/indexing/core/src/main/java/org/apache/stanbol/entityhub/indexing/core/destination/OsgiConfigurationUtil.java?rev=1533571&r1=1533570&r2=1533571&view=diff
==============================================================================
--- stanbol/branches/commons-ng/entityhub/indexing/core/src/main/java/org/apache/stanbol/entityhub/indexing/core/destination/OsgiConfigurationUtil.java (original)
+++ stanbol/branches/commons-ng/entityhub/indexing/core/src/main/java/org/apache/stanbol/entityhub/indexing/core/destination/OsgiConfigurationUtil.java Fri Oct 18 17:58:24 2013
@@ -256,6 +256,7 @@ public final class OsgiConfigurationUtil
builder.addClasspath(new File(config.getDestinationFolder(),CONFIG_ROOT));
} catch (IOException e) {
log.warn("Unable to build OSGI Bundle for Indexed Referenced Site "+config.getName(),e);
+ builder.close();
return;
}
Jar jar;
@@ -263,8 +264,10 @@ public final class OsgiConfigurationUtil
jar = builder.build();
} catch (Exception e) {
log.warn("Unable to build OSGI Bundle for Indexed Referenced Site "+config.getName(),e);
- return;
- }
+ return;
+ } finally {
+ builder.close();
+ }
try {
jar.write(new File(config.getDistributionFolder(),
CONFIG_PACKAGE+config.getName()+"-1.0.0.jar"));
Modified: stanbol/branches/commons-ng/entityhub/indexing/core/src/main/java/org/apache/stanbol/entityhub/indexing/core/impl/FinishedEntityDaemon.java
URL: http://svn.apache.org/viewvc/stanbol/branches/commons-ng/entityhub/indexing/core/src/main/java/org/apache/stanbol/entityhub/indexing/core/impl/FinishedEntityDaemon.java?rev=1533571&r1=1533570&r2=1533571&view=diff
==============================================================================
--- stanbol/branches/commons-ng/entityhub/indexing/core/src/main/java/org/apache/stanbol/entityhub/indexing/core/impl/FinishedEntityDaemon.java (original)
+++ stanbol/branches/commons-ng/entityhub/indexing/core/src/main/java/org/apache/stanbol/entityhub/indexing/core/impl/FinishedEntityDaemon.java Fri Oct 18 17:58:24 2013
@@ -21,9 +21,7 @@ import static org.apache.stanbol.entityh
import static org.apache.stanbol.entityhub.indexing.core.impl.IndexerConstants.SOURCE_STARTED;
import static org.apache.stanbol.entityhub.indexing.core.impl.IndexerConstants.STORE_DURATION;
-import java.io.BufferedReader;
import java.io.BufferedWriter;
-import java.io.FileOutputStream;
import java.io.OutputStream;
import java.io.OutputStreamWriter;
import java.nio.charset.Charset;
Modified: stanbol/branches/commons-ng/entityhub/indexing/core/src/main/java/org/apache/stanbol/entityhub/indexing/core/impl/IndexerConstants.java
URL: http://svn.apache.org/viewvc/stanbol/branches/commons-ng/entityhub/indexing/core/src/main/java/org/apache/stanbol/entityhub/indexing/core/impl/IndexerConstants.java?rev=1533571&r1=1533570&r2=1533571&view=diff
==============================================================================
--- stanbol/branches/commons-ng/entityhub/indexing/core/src/main/java/org/apache/stanbol/entityhub/indexing/core/impl/IndexerConstants.java (original)
+++ stanbol/branches/commons-ng/entityhub/indexing/core/src/main/java/org/apache/stanbol/entityhub/indexing/core/impl/IndexerConstants.java Fri Oct 18 17:58:24 2013
@@ -81,8 +81,8 @@ public interface IndexerConstants {
*/
//ignore the Type safety because the item is of
//INDEXING_COMPLETED_QUEUE_ITEM is anyway null
- @SuppressWarnings("unchecked")
- QueueItem INDEXING_COMPLETED_QUEUE_ITEM = new QueueItem(null);
+ @SuppressWarnings("rawtypes")
+ QueueItem INDEXING_COMPLETED_QUEUE_ITEM = new QueueItem<Void>(null);
/**
* The sequence number for {@link IndexingDaemon}s that read from the
Modified: stanbol/branches/commons-ng/entityhub/indexing/core/src/main/java/org/apache/stanbol/entityhub/indexing/core/impl/IndexerImpl.java
URL: http://svn.apache.org/viewvc/stanbol/branches/commons-ng/entityhub/indexing/core/src/main/java/org/apache/stanbol/entityhub/indexing/core/impl/IndexerImpl.java?rev=1533571&r1=1533570&r2=1533571&view=diff
==============================================================================
--- stanbol/branches/commons-ng/entityhub/indexing/core/src/main/java/org/apache/stanbol/entityhub/indexing/core/impl/IndexerImpl.java (original)
+++ stanbol/branches/commons-ng/entityhub/indexing/core/src/main/java/org/apache/stanbol/entityhub/indexing/core/impl/IndexerImpl.java Fri Oct 18 17:58:24 2013
@@ -56,7 +56,6 @@ import org.apache.stanbol.entityhub.inde
import org.apache.stanbol.entityhub.indexing.core.Indexer;
import org.apache.stanbol.entityhub.indexing.core.IndexingComponent;
import org.apache.stanbol.entityhub.indexing.core.IndexingDestination;
-import org.apache.stanbol.entityhub.indexing.core.destination.OsgiConfigurationUtil;
import org.apache.stanbol.entityhub.indexing.core.event.IndexingEvent;
import org.apache.stanbol.entityhub.indexing.core.event.IndexingListener;
import org.apache.stanbol.entityhub.indexing.core.impl.IndexingDaemon.IndexingDaemonEventObject;
@@ -309,10 +308,12 @@ public class IndexerImpl implements Inde
//now wait until all IndexingSources are initialised!
while(!toInitialise.isEmpty()){
synchronized (toInitialise) {
- try {
- toInitialise.wait();
- } catch (InterruptedException e) {
- //year looks like all IndexingSources are initialised!
+ if(!toInitialise.isEmpty()){
+ try {
+ toInitialise.wait();
+ } catch (InterruptedException e) {
+ //year looks like all IndexingSources are initialised!
+ }
}
}
}
@@ -380,7 +381,7 @@ public class IndexerImpl implements Inde
if(state == State.POSTPROCESSING){ //if state > INITIALISED
throw new IllegalStateException("Unable to skip post processing if postprocessing is already in progress!");
}
- if(state.ordinal() >= state.POSTPROCESSED.ordinal()){
+ if(state.ordinal() >= State.POSTPROCESSED.ordinal()){
return; //already post processed
}
setState(State.POSTPROCESSED);
@@ -562,7 +563,7 @@ public class IndexerImpl implements Inde
if(state == State.INDEXING){
throw new IllegalStateException("Unable to skip indexing if indexing is already in progress!");
}
- if(state.ordinal() >= state.INDEXED.ordinal()){ //if state > INDEXING
+ if(state.ordinal() >= State.INDEXED.ordinal()){ //if state > INDEXING
return; //already in INDEXED state
}
setState(State.INDEXED);
Modified: stanbol/branches/commons-ng/entityhub/indexing/core/src/main/java/org/apache/stanbol/entityhub/indexing/core/processor/FieldValueFilter.java
URL: http://svn.apache.org/viewvc/stanbol/branches/commons-ng/entityhub/indexing/core/src/main/java/org/apache/stanbol/entityhub/indexing/core/processor/FieldValueFilter.java?rev=1533571&r1=1533570&r2=1533571&view=diff
==============================================================================
--- stanbol/branches/commons-ng/entityhub/indexing/core/src/main/java/org/apache/stanbol/entityhub/indexing/core/processor/FieldValueFilter.java (original)
+++ stanbol/branches/commons-ng/entityhub/indexing/core/src/main/java/org/apache/stanbol/entityhub/indexing/core/processor/FieldValueFilter.java Fri Oct 18 17:58:24 2013
@@ -21,13 +21,10 @@ import java.util.Collection;
import java.util.Collections;
import java.util.HashSet;
import java.util.Iterator;
-import java.util.List;
import java.util.Map;
-import java.util.Set;
import org.apache.stanbol.commons.namespaceprefix.NamespaceMappingUtils;
import org.apache.stanbol.commons.namespaceprefix.NamespacePrefixProvider;
-import org.apache.stanbol.commons.namespaceprefix.NamespacePrefixService;
import org.apache.stanbol.entityhub.indexing.core.EntityProcessor;
import org.apache.stanbol.entityhub.indexing.core.config.IndexingConfig;
import org.apache.stanbol.entityhub.servicesapi.model.Reference;
@@ -127,7 +124,8 @@ public class FieldValueFilter implements
/**
* @param value
*/
- private void parseFilterConfig(Object value) {
+ @SuppressWarnings("unchecked")
+ private void parseFilterConfig(Object value) {
Collection<String> values;
if(value instanceof String){
values = Arrays.asList(value.toString().split(";"));
Modified: stanbol/branches/commons-ng/entityhub/indexing/core/src/main/java/org/apache/stanbol/entityhub/indexing/core/processor/LdpathPostProcessor.java
URL: http://svn.apache.org/viewvc/stanbol/branches/commons-ng/entityhub/indexing/core/src/main/java/org/apache/stanbol/entityhub/indexing/core/processor/LdpathPostProcessor.java?rev=1533571&r1=1533570&r2=1533571&view=diff
==============================================================================
--- stanbol/branches/commons-ng/entityhub/indexing/core/src/main/java/org/apache/stanbol/entityhub/indexing/core/processor/LdpathPostProcessor.java (original)
+++ stanbol/branches/commons-ng/entityhub/indexing/core/src/main/java/org/apache/stanbol/entityhub/indexing/core/processor/LdpathPostProcessor.java Fri Oct 18 17:58:24 2013
@@ -22,7 +22,6 @@ import org.apache.stanbol.entityhub.inde
import org.apache.stanbol.entityhub.indexing.core.IndexingDestination;
import org.apache.stanbol.entityhub.ldpath.EntityhubLDPath;
import org.apache.stanbol.entityhub.ldpath.backend.YardBackend;
-import org.apache.stanbol.entityhub.servicesapi.model.Representation;
import org.apache.stanbol.entityhub.servicesapi.yard.Yard;
import at.newmedialab.ldpath.api.backend.RDFBackend;
Modified: stanbol/branches/commons-ng/entityhub/indexing/core/src/main/java/org/apache/stanbol/entityhub/indexing/core/processor/LdpathSourceProcessor.java
URL: http://svn.apache.org/viewvc/stanbol/branches/commons-ng/entityhub/indexing/core/src/main/java/org/apache/stanbol/entityhub/indexing/core/processor/LdpathSourceProcessor.java?rev=1533571&r1=1533570&r2=1533571&view=diff
==============================================================================
--- stanbol/branches/commons-ng/entityhub/indexing/core/src/main/java/org/apache/stanbol/entityhub/indexing/core/processor/LdpathSourceProcessor.java (original)
+++ stanbol/branches/commons-ng/entityhub/indexing/core/src/main/java/org/apache/stanbol/entityhub/indexing/core/processor/LdpathSourceProcessor.java Fri Oct 18 17:58:24 2013
@@ -21,23 +21,18 @@ import java.io.FileInputStream;
import java.io.IOException;
import java.io.InputStreamReader;
import java.io.Reader;
-import java.math.BigDecimal;
-import java.math.BigInteger;
import java.net.URI;
import java.nio.charset.Charset;
import java.util.Collection;
-import java.util.Date;
import java.util.Locale;
import java.util.Map;
import java.util.Map.Entry;
-import java.util.concurrent.ThreadPoolExecutor;
import org.apache.commons.io.IOUtils;
import org.apache.stanbol.entityhub.core.model.InMemoryValueFactory;
import org.apache.stanbol.entityhub.indexing.core.EntityProcessor;
import org.apache.stanbol.entityhub.indexing.core.config.IndexingConfig;
import org.apache.stanbol.entityhub.ldpath.EntityhubLDPath.EntityhubConfiguration;
-import org.apache.stanbol.entityhub.ldpath.backend.SingleRepresentationBackend;
import org.apache.stanbol.entityhub.servicesapi.model.Representation;
import org.apache.stanbol.entityhub.servicesapi.model.ValueFactory;
import org.slf4j.Logger;
Modified: stanbol/branches/commons-ng/entityhub/indexing/core/src/main/java/org/apache/stanbol/entityhub/indexing/core/source/EntityIneratorToScoreProviderAdapter.java
URL: http://svn.apache.org/viewvc/stanbol/branches/commons-ng/entityhub/indexing/core/src/main/java/org/apache/stanbol/entityhub/indexing/core/source/EntityIneratorToScoreProviderAdapter.java?rev=1533571&r1=1533570&r2=1533571&view=diff
==============================================================================
--- stanbol/branches/commons-ng/entityhub/indexing/core/src/main/java/org/apache/stanbol/entityhub/indexing/core/source/EntityIneratorToScoreProviderAdapter.java (original)
+++ stanbol/branches/commons-ng/entityhub/indexing/core/src/main/java/org/apache/stanbol/entityhub/indexing/core/source/EntityIneratorToScoreProviderAdapter.java Fri Oct 18 17:58:24 2013
@@ -20,8 +20,8 @@ import java.util.HashMap;
import java.util.Map;
import org.apache.stanbol.entityhub.indexing.core.EntityIterator;
-import org.apache.stanbol.entityhub.indexing.core.EntityScoreProvider;
import org.apache.stanbol.entityhub.indexing.core.EntityIterator.EntityScore;
+import org.apache.stanbol.entityhub.indexing.core.EntityScoreProvider;
import org.apache.stanbol.entityhub.indexing.core.config.IndexingConfig;
import org.apache.stanbol.entityhub.servicesapi.model.Representation;
Modified: stanbol/branches/commons-ng/entityhub/indexing/core/src/main/java/org/apache/stanbol/entityhub/indexing/core/source/ResourceLoader.java
URL: http://svn.apache.org/viewvc/stanbol/branches/commons-ng/entityhub/indexing/core/src/main/java/org/apache/stanbol/entityhub/indexing/core/source/ResourceLoader.java?rev=1533571&r1=1533570&r2=1533571&view=diff
==============================================================================
--- stanbol/branches/commons-ng/entityhub/indexing/core/src/main/java/org/apache/stanbol/entityhub/indexing/core/source/ResourceLoader.java (original)
+++ stanbol/branches/commons-ng/entityhub/indexing/core/src/main/java/org/apache/stanbol/entityhub/indexing/core/source/ResourceLoader.java Fri Oct 18 17:58:24 2013
@@ -28,9 +28,9 @@ import java.util.EnumSet;
import java.util.Enumeration;
import java.util.HashSet;
import java.util.Map;
+import java.util.Map.Entry;
import java.util.Set;
import java.util.TreeMap;
-import java.util.Map.Entry;
import org.apache.commons.compress.archivers.zip.ZipArchiveEntry;
import org.apache.commons.compress.archivers.zip.ZipFile;
@@ -293,16 +293,20 @@ public class ResourceLoader {
} else { //this does not use an imported folder or the state is not LOADED
files.put(file, state);
}
- //if failOnError is activated we stop the loading on the first
- //error!
- if(failOnError && ResourceState.ERROR == state){
- String msg = "Error while loading Resource "+file;
- if(e != null){
- throw new IllegalStateException(msg,e);
- } else {
- throw new IllegalStateException(msg);
- }
- }
+ if(ResourceState.ERROR == state){
+ //if failOnError is activated we stop the loading on the first error!
+ if (failOnError){
+ String msg = "Error while loading Resource "+file;
+ if(e != null){
+ throw new IllegalStateException(msg,e);
+ } else {
+ throw new IllegalStateException(msg);
+ }
+ }else {
+ //if failOnError is de-activated ignore the resource loading error and continue..
+ log.info("Ignore Error for File {} and continue", file);
+ }
+ }
} else {
log.info("Ignore Error for File {} because it is no longer registered with this RdfLoader",
file);
Modified: stanbol/branches/commons-ng/entityhub/indexing/core/src/test/java/org/apache/stanbol/entityhub/indexing/core/ConfigTest.java
URL: http://svn.apache.org/viewvc/stanbol/branches/commons-ng/entityhub/indexing/core/src/test/java/org/apache/stanbol/entityhub/indexing/core/ConfigTest.java?rev=1533571&r1=1533570&r2=1533571&view=diff
==============================================================================
--- stanbol/branches/commons-ng/entityhub/indexing/core/src/test/java/org/apache/stanbol/entityhub/indexing/core/ConfigTest.java (original)
+++ stanbol/branches/commons-ng/entityhub/indexing/core/src/test/java/org/apache/stanbol/entityhub/indexing/core/ConfigTest.java Fri Oct 18 17:58:24 2013
@@ -16,6 +16,10 @@
*/
package org.apache.stanbol.entityhub.indexing.core;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
import java.io.File;
import java.io.IOException;
import java.util.HashMap;
@@ -29,9 +33,6 @@ import org.apache.stanbol.entityhub.inde
import org.apache.stanbol.entityhub.indexing.core.normaliser.RangeNormaliser;
import org.apache.stanbol.entityhub.indexing.core.normaliser.ScoreNormaliser;
import org.apache.stanbol.entityhub.indexing.core.source.LineBasedEntityIterator;
-
-import static org.junit.Assert.*;
-
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Test;
Modified: stanbol/branches/commons-ng/entityhub/indexing/core/src/test/java/org/apache/stanbol/entityhub/indexing/core/IndexerTest.java
URL: http://svn.apache.org/viewvc/stanbol/branches/commons-ng/entityhub/indexing/core/src/test/java/org/apache/stanbol/entityhub/indexing/core/IndexerTest.java?rev=1533571&r1=1533570&r2=1533571&view=diff
==============================================================================
--- stanbol/branches/commons-ng/entityhub/indexing/core/src/test/java/org/apache/stanbol/entityhub/indexing/core/IndexerTest.java (original)
+++ stanbol/branches/commons-ng/entityhub/indexing/core/src/test/java/org/apache/stanbol/entityhub/indexing/core/IndexerTest.java Fri Oct 18 17:58:24 2013
@@ -16,6 +16,11 @@
*/
package org.apache.stanbol.entityhub.indexing.core;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
@@ -25,8 +30,8 @@ import java.util.HashMap;
import java.util.HashSet;
import java.util.Iterator;
import java.util.Map;
-import java.util.Set;
import java.util.Map.Entry;
+import java.util.Set;
import org.apache.commons.io.FilenameUtils;
import org.apache.stanbol.entityhub.core.model.InMemoryValueFactory;
@@ -37,13 +42,11 @@ import org.apache.stanbol.entityhub.serv
import org.apache.stanbol.entityhub.servicesapi.model.Text;
import org.apache.stanbol.entityhub.servicesapi.model.ValueFactory;
import org.apache.stanbol.entityhub.servicesapi.model.rdf.RdfResourceEnum;
-import org.junit.After;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import static org.junit.Assert.*;
public class IndexerTest {
Modified: stanbol/branches/commons-ng/entityhub/indexing/core/src/test/java/org/apache/stanbol/entityhub/indexing/core/ResourceLoaderTest.java
URL: http://svn.apache.org/viewvc/stanbol/branches/commons-ng/entityhub/indexing/core/src/test/java/org/apache/stanbol/entityhub/indexing/core/ResourceLoaderTest.java?rev=1533571&r1=1533570&r2=1533571&view=diff
==============================================================================
--- stanbol/branches/commons-ng/entityhub/indexing/core/src/test/java/org/apache/stanbol/entityhub/indexing/core/ResourceLoaderTest.java (original)
+++ stanbol/branches/commons-ng/entityhub/indexing/core/src/test/java/org/apache/stanbol/entityhub/indexing/core/ResourceLoaderTest.java Fri Oct 18 17:58:24 2013
@@ -16,6 +16,11 @@
*/
package org.apache.stanbol.entityhub.indexing.core;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
import java.io.File;
import java.io.IOException;
import java.io.InputStream;
@@ -32,7 +37,6 @@ import org.junit.BeforeClass;
import org.junit.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import static org.junit.Assert.*;
public class ResourceLoaderTest {
/**
@@ -111,6 +115,13 @@ public class ResourceLoaderTest {
importer.checkAllProcessed();
}
+
+ @Test
+ public void testFailOnError(){
+ assertTrue(isFailedOnError(true));
+ assertFalse(isFailedOnError(false));
+ }
+
@Test
public void testFolderWithoutProcessingArchives(){
String folder = rootDir+TEST_FOLDER_NAME;
@@ -190,4 +201,19 @@ public class ResourceLoaderTest {
folder+"ignoreFileInFolder.txt")),
loader.getResources(ResourceState.IGNORED));
}
+
+ private boolean isFailedOnError(boolean failOnError){
+ String folder = rootDir + TEST_FOLDER_NAME;
+ boolean failed = false;
+ DummyResourceImporter importer = new DummyResourceImporter(
+ Arrays.asList(folder + "errorFileInFolder.txt"));
+ ResourceLoader loader = new ResourceLoader(importer, false, failOnError);
+ loader.addResource(new File(folder, "errorFileInFolder.txt"));
+ try {
+ loader.loadResources();
+ } catch (IllegalStateException ex) {
+ failed = true;
+ }
+ return failed;
+ }
}
Modified: stanbol/branches/commons-ng/entityhub/indexing/core/src/test/java/org/apache/stanbol/entityhub/indexing/core/processor/FieldValueFilterTest.java
URL: http://svn.apache.org/viewvc/stanbol/branches/commons-ng/entityhub/indexing/core/src/test/java/org/apache/stanbol/entityhub/indexing/core/processor/FieldValueFilterTest.java?rev=1533571&r1=1533570&r2=1533571&view=diff
==============================================================================
--- stanbol/branches/commons-ng/entityhub/indexing/core/src/test/java/org/apache/stanbol/entityhub/indexing/core/processor/FieldValueFilterTest.java (original)
+++ stanbol/branches/commons-ng/entityhub/indexing/core/src/test/java/org/apache/stanbol/entityhub/indexing/core/processor/FieldValueFilterTest.java Fri Oct 18 17:58:24 2013
@@ -1,7 +1,22 @@
+/*
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements. See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The ASF licenses this file to You under the Apache License, Version 2.0
+* (the "License"); you may not use this file except in compliance with
+* the License. You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
package org.apache.stanbol.entityhub.indexing.core.processor;
import java.io.IOException;
-import java.io.InputStream;
import java.util.HashMap;
import java.util.Map;
Modified: stanbol/branches/commons-ng/entityhub/indexing/dblp/src/license/THIRD-PARTY.properties
URL: http://svn.apache.org/viewvc/stanbol/branches/commons-ng/entityhub/indexing/dblp/src/license/THIRD-PARTY.properties?rev=1533571&r1=1533570&r2=1533571&view=diff
==============================================================================
--- stanbol/branches/commons-ng/entityhub/indexing/dblp/src/license/THIRD-PARTY.properties (original)
+++ stanbol/branches/commons-ng/entityhub/indexing/dblp/src/license/THIRD-PARTY.properties Fri Oct 18 17:58:24 2013
@@ -1,6 +1,9 @@
# Generated by org.codehaus.mojo.license.AddThirdPartyMojo
#-------------------------------------------------------------------------------
# Already used licenses in project :
+# - All files contained in this JAR are licensed under the Apache
+# 2.0 license, unless noted differently in their source (see
+# swing2swt).
# - Apache Software License
# - Apache Software License, Version 2.0
# - BSD License
@@ -14,21 +17,25 @@
# - GNU Lesser General Public License (LGPL), Version 2.1
# - ICU License
# - MIT License
+# - New BSD License
+# - New BSD license
# - Public Domain License
# - Similar to Apache License but with the acknowledgment clause removed
#-------------------------------------------------------------------------------
# Please fill the missing licenses for dependencies :
#
#
-#Tue Jan 22 15:55:50 CET 2013
+#Tue Sep 24 20:59:42 CEST 2013
antlr--antlr--2.7.2=Public Domain
-asm--asm--3.1=BSD License
commons-beanutils--commons-beanutils--1.7.0=The Apache Software License, Version 2.0
dom4j--dom4j--1.1=BSD-style
jakarta-regexp--jakarta-regexp--1.4=The Apache Software License, Version 2.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
+javax.servlet.jsp--jsp-api--2.1=Common Development And Distribution License (CDDL), Version 1.0
+org.apache.zookeeper--zookeeper--3.4.5=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
+org.restlet.jee--org.restlet--2.1.1=The Apache Software License, Version 2.0
+org.restlet.jee--org.restlet.ext.servlet--2.1.1=The Apache Software License, Version 2.0
oro--oro--2.0.8=The Apache Software License, Version 2.0
xerces--xercesImpl--2.7.1=The Apache Software License, Version 2.0
Modified: stanbol/branches/commons-ng/entityhub/indexing/dblp/src/main/resources/log4j.properties
URL: http://svn.apache.org/viewvc/stanbol/branches/commons-ng/entityhub/indexing/dblp/src/main/resources/log4j.properties?rev=1533571&r1=1533570&r2=1533571&view=diff
==============================================================================
--- stanbol/branches/commons-ng/entityhub/indexing/dblp/src/main/resources/log4j.properties (original)
+++ stanbol/branches/commons-ng/entityhub/indexing/dblp/src/main/resources/log4j.properties Fri Oct 18 17:58:24 2013
@@ -24,4 +24,6 @@ log4j.appender.A1.layout.ConversionPatte
# however log also INFO messages of the indexing components
log4j.logger.org.apache.stanbol.entityhub.indexing=INFO
# for loggings during importing RDF data
-log4j.logger.com.hp.hpl.jena=INFO
\ No newline at end of file
+log4j.logger.com.hp.hpl.jena=INFO
+# do not show warnings for building FST modles
+log4j.logger.org.opensextant.solrtexttagger=ERROR
\ No newline at end of file
Modified: stanbol/branches/commons-ng/entityhub/indexing/dbpedia/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/branches/commons-ng/entityhub/indexing/dbpedia/pom.xml?rev=1533571&r1=1533570&r2=1533571&view=diff
==============================================================================
--- stanbol/branches/commons-ng/entityhub/indexing/dbpedia/pom.xml (original)
+++ stanbol/branches/commons-ng/entityhub/indexing/dbpedia/pom.xml Fri Oct 18 17:58:24 2013
@@ -101,6 +101,9 @@
<exclude>src/test/resources/indexing/resources/incoming_links.txt</exclude>
<exclude>dbpedia-3.8/copy_en_values.ldpath</exclude>
+
+ <!--Configs -->
+ <exclude>src/main/resources/indexing/config/**/*.txt</exclude>
</excludes>
</configuration>
</plugin>
Modified: stanbol/branches/commons-ng/entityhub/indexing/dbpedia/src/license/THIRD-PARTY.properties
URL: http://svn.apache.org/viewvc/stanbol/branches/commons-ng/entityhub/indexing/dbpedia/src/license/THIRD-PARTY.properties?rev=1533571&r1=1533570&r2=1533571&view=diff
==============================================================================
--- stanbol/branches/commons-ng/entityhub/indexing/dbpedia/src/license/THIRD-PARTY.properties (original)
+++ stanbol/branches/commons-ng/entityhub/indexing/dbpedia/src/license/THIRD-PARTY.properties Fri Oct 18 17:58:24 2013
@@ -1,6 +1,9 @@
# Generated by org.codehaus.mojo.license.AddThirdPartyMojo
#-------------------------------------------------------------------------------
# Already used licenses in project :
+# - All files contained in this JAR are licensed under the Apache
+# 2.0 license, unless noted differently in their source (see
+# swing2swt).
# - Apache Software License
# - Apache Software License, Version 2.0
# - BSD License
@@ -15,21 +18,24 @@
# - ICU License
# - MIT License
# - New BSD License
+# - New BSD license
# - Public Domain License
# - Similar to Apache License but with the acknowledgment clause removed
#-------------------------------------------------------------------------------
# Please fill the missing licenses for dependencies :
#
#
-#Tue Jan 22 15:49:49 CET 2013
+#Tue Sep 24 20:59:12 CEST 2013
antlr--antlr--2.7.2=Public Domain
-asm--asm--3.1=BSD License
commons-beanutils--commons-beanutils--1.7.0=The Apache Software License, Version 2.0
dom4j--dom4j--1.1=BSD-style
jakarta-regexp--jakarta-regexp--1.4=The Apache Software License, Version 2.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
+javax.servlet.jsp--jsp-api--2.1=Common Development And Distribution License (CDDL), Version 1.0
+org.apache.zookeeper--zookeeper--3.4.5=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
+org.restlet.jee--org.restlet--2.1.1=The Apache Software License, Version 2.0
+org.restlet.jee--org.restlet.ext.servlet--2.1.1=The Apache Software License, Version 2.0
oro--oro--2.0.8=The Apache Software License, Version 2.0
xerces--xercesImpl--2.7.1=The Apache Software License, Version 2.0
Modified: stanbol/branches/commons-ng/entityhub/indexing/dbpedia/src/main/resources/indexing/config/dbpedia/conf/admin-extra.menu-bottom.html
URL: http://svn.apache.org/viewvc/stanbol/branches/commons-ng/entityhub/indexing/dbpedia/src/main/resources/indexing/config/dbpedia/conf/admin-extra.menu-bottom.html?rev=1533571&r1=1533570&r2=1533571&view=diff
==============================================================================
--- stanbol/branches/commons-ng/entityhub/indexing/dbpedia/src/main/resources/indexing/config/dbpedia/conf/admin-extra.menu-bottom.html (original)
+++ stanbol/branches/commons-ng/entityhub/indexing/dbpedia/src/main/resources/indexing/config/dbpedia/conf/admin-extra.menu-bottom.html Fri Oct 18 17:58:24 2013
@@ -1 +1,17 @@
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
<!-- admin-extra.menu-bottom.html -->
Modified: stanbol/branches/commons-ng/entityhub/indexing/dbpedia/src/main/resources/indexing/config/dbpedia/conf/admin-extra.menu-top.html
URL: http://svn.apache.org/viewvc/stanbol/branches/commons-ng/entityhub/indexing/dbpedia/src/main/resources/indexing/config/dbpedia/conf/admin-extra.menu-top.html?rev=1533571&r1=1533570&r2=1533571&view=diff
==============================================================================
--- stanbol/branches/commons-ng/entityhub/indexing/dbpedia/src/main/resources/indexing/config/dbpedia/conf/admin-extra.menu-top.html (original)
+++ stanbol/branches/commons-ng/entityhub/indexing/dbpedia/src/main/resources/indexing/config/dbpedia/conf/admin-extra.menu-top.html Fri Oct 18 17:58:24 2013
@@ -1 +1,17 @@
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
<!-- admin-extra.menu-top.html -->
Modified: stanbol/branches/commons-ng/entityhub/indexing/dbpedia/src/main/resources/indexing/config/dbpedia/conf/update-script.js
URL: http://svn.apache.org/viewvc/stanbol/branches/commons-ng/entityhub/indexing/dbpedia/src/main/resources/indexing/config/dbpedia/conf/update-script.js?rev=1533571&r1=1533570&r2=1533571&view=diff
==============================================================================
--- stanbol/branches/commons-ng/entityhub/indexing/dbpedia/src/main/resources/indexing/config/dbpedia/conf/update-script.js (original)
+++ stanbol/branches/commons-ng/entityhub/indexing/dbpedia/src/main/resources/indexing/config/dbpedia/conf/update-script.js Fri Oct 18 17:58:24 2013
@@ -1,3 +1,19 @@
+/*
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements. See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The ASF licenses this file to You under the Apache License, Version 2.0
+* (the "License"); you may not use this file except in compliance with
+* the License. You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
/*
This is a basic skeleton JavaScript update processor.