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 [5/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/entityhub/indexing/dbpedia/src/main/resources/indexing/config/indexing.properties
URL: http://svn.apache.org/viewvc/stanbol/branches/commons-ng/entityhub/indexing/dbpedia/src/main/resources/indexing/config/indexing.properties?rev=1533571&r1=1533570&r2=1533571&view=diff
==============================================================================
--- stanbol/branches/commons-ng/entityhub/indexing/dbpedia/src/main/resources/indexing/config/indexing.properties (original)
+++ stanbol/branches/commons-ng/entityhub/indexing/dbpedia/src/main/resources/indexing/config/indexing.properties Fri Oct 18 17:58:24 2013
@@ -47,8 +47,10 @@ entityProcessor=org.apache.stanbol.entit
 fieldConfiguration=mappings.txt
 
 # Finally we need a destination to store the data
-# Note also the configured fieldboosts.properties
-indexingDestination=org.apache.stanbol.entityhub.indexing.destination.solryard.SolrYardIndexingDestination,solrConf,boosts:fieldboosts
+# Note also 
+# * the configured fieldboosts.properties
+# * the configured fst.config
+indexingDestination=org.apache.stanbol.entityhub.indexing.destination.solryard.SolrYardIndexingDestination,solrConf,boosts:fieldboosts,fstConf:fst.config
 
 
 # Additional Properties directly added to the configuration of the

Modified: stanbol/branches/commons-ng/entityhub/indexing/dbpedia/src/main/resources/log4j.properties
URL: http://svn.apache.org/viewvc/stanbol/branches/commons-ng/entityhub/indexing/dbpedia/src/main/resources/log4j.properties?rev=1533571&r1=1533570&r2=1533571&view=diff
==============================================================================
--- stanbol/branches/commons-ng/entityhub/indexing/dbpedia/src/main/resources/log4j.properties (original)
+++ stanbol/branches/commons-ng/entityhub/indexing/dbpedia/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/destination/solryard/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/branches/commons-ng/entityhub/indexing/destination/solryard/pom.xml?rev=1533571&r1=1533570&r2=1533571&view=diff
==============================================================================
--- stanbol/branches/commons-ng/entityhub/indexing/destination/solryard/pom.xml (original)
+++ stanbol/branches/commons-ng/entityhub/indexing/destination/solryard/pom.xml Fri Oct 18 17:58:24 2013
@@ -114,6 +114,12 @@
       <artifactId>org.apache.stanbol.entityhub.yard.solr</artifactId>
       <version>1.0.0-SNAPSHOT</version>
     </dependency>
+    <!-- FST model generation -->
+    <dependency>
+      <groupId>org.opensextant</groupId>
+      <artifactId>solr-text-tagger</artifactId>
+      <version>1.2</version>
+    </dependency>
 
     <dependency>
       <groupId>commons-io</groupId>

Modified: stanbol/branches/commons-ng/entityhub/indexing/destination/solryard/src/license/THIRD-PARTY.properties
URL: http://svn.apache.org/viewvc/stanbol/branches/commons-ng/entityhub/indexing/destination/solryard/src/license/THIRD-PARTY.properties?rev=1533571&r1=1533570&r2=1533571&view=diff
==============================================================================
--- stanbol/branches/commons-ng/entityhub/indexing/destination/solryard/src/license/THIRD-PARTY.properties (original)
+++ stanbol/branches/commons-ng/entityhub/indexing/destination/solryard/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,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 :
 #
 #
-#Tue Jan 22 15:45:22 CET 2013
+#Tue Sep 24 20:58:05 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/entityhub/indexing/destination/solryard/src/main/java/org/apache/stanbol/entityhub/indexing/destination/solryard/SolrYardIndexingDestination.java
URL: http://svn.apache.org/viewvc/stanbol/branches/commons-ng/entityhub/indexing/destination/solryard/src/main/java/org/apache/stanbol/entityhub/indexing/destination/solryard/SolrYardIndexingDestination.java?rev=1533571&r1=1533570&r2=1533571&view=diff
==============================================================================
--- stanbol/branches/commons-ng/entityhub/indexing/destination/solryard/src/main/java/org/apache/stanbol/entityhub/indexing/destination/solryard/SolrYardIndexingDestination.java (original)
+++ stanbol/branches/commons-ng/entityhub/indexing/destination/solryard/src/main/java/org/apache/stanbol/entityhub/indexing/destination/solryard/SolrYardIndexingDestination.java Fri Oct 18 17:58:24 2013
@@ -24,25 +24,45 @@ import static org.apache.stanbol.entityh
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileOutputStream;
+import java.io.FileReader;
 import java.io.IOException;
+import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Dictionary;
 import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
 import java.util.Map;
 import java.util.Properties;
 import java.util.Map.Entry;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.Future;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipOutputStream;
 
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.io.FilenameUtils;
 import org.apache.commons.io.IOUtils;
+import org.apache.commons.lang.StringUtils;
+import org.apache.lucene.index.IndexReader;
+import org.apache.lucene.search.IndexSearcher;
 import org.apache.solr.client.solrj.SolrServer;
+import org.apache.solr.client.solrj.embedded.EmbeddedSolrServer;
+import org.apache.solr.core.SolrCore;
+import org.apache.solr.handler.dataimport.SolrWriter;
+import org.apache.solr.schema.IndexSchema;
+import org.apache.solr.search.SolrIndexSearcher;
+import org.apache.solr.util.RefCounted;
 import org.apache.stanbol.entityhub.core.mapping.FieldMappingUtils;
 import org.apache.stanbol.entityhub.core.site.CacheUtils;
 import org.apache.stanbol.entityhub.indexing.core.IndexingDestination;
 import org.apache.stanbol.entityhub.indexing.core.config.IndexingConfig;
 import org.apache.stanbol.entityhub.indexing.core.destination.OsgiConfigurationUtil;
+import org.apache.stanbol.entityhub.indexing.destination.solryard.fst.CorpusCreationInfo;
+import org.apache.stanbol.entityhub.indexing.destination.solryard.fst.CorpusCreationTask;
+import org.apache.stanbol.entityhub.indexing.destination.solryard.fst.FstConfig;
 import org.apache.stanbol.entityhub.servicesapi.mapping.FieldMapper;
 import org.apache.stanbol.entityhub.servicesapi.mapping.FieldMapping;
 import org.apache.stanbol.entityhub.servicesapi.model.rdf.RdfResourceEnum;
@@ -63,6 +83,15 @@ public class SolrYardIndexingDestination
     private static final Logger log = LoggerFactory.getLogger(SolrYardIndexingDestination.class);
 
     /**
+     * The relative path to the Solr 'write.lock' file (relative to the Solr
+     * instance dir). This file is excluded from the
+     * Solr Index archive built by {@link #writeSolrIndexArchive()} (see
+     * <a href="https://issues.apache.org/jira/browse/STANBOL-1176">STANBOL-1176</a>
+     * for more details).
+     */
+    private static final String SOLR_WRITE_LOCK = FilenameUtils.separatorsToSystem("data/index/write.lock");
+    
+    /**
      * Parameter used to refer to the name of the properties file containing the
      * field names as key and the {@link Float} boost factors as values. As
      * default no boosts will be used for indexing.
@@ -140,6 +169,18 @@ public class SolrYardIndexingDestination
     public static final boolean DEFAULT_SYNCHRONIZED_STATE = true;
     
     /**
+     * The name of the properties file containing the FST configuration.<p>
+     * If not present no FST models will be created in the {@link #finalise()}
+     * state.
+     */
+    public static final String FST_CONF = "fstConf";
+    /**
+     * The number of Threads used to concurrently build FST models
+     */
+    public static final String FST_THREADS = "fstThreads";
+    
+    private static final int DEFAULT_FST_THREADS = 4;
+    /**
      * The location of the SolrIndex. This MUST BE an absolute Path in case it 
      * refers to a directory of the local file system and <code>null</code> in
      * case an external SolrServer is used.
@@ -179,6 +220,25 @@ public class SolrYardIndexingDestination
     private Collection<FieldMapping> indexFieldConfiguration;
 
     private IndexingConfig indexingConfig;
+
+    /*
+     * Fields required for the FST model creation 
+     */
+    /**
+     * The SolrCore used by the {@link #solrYard}
+     */
+    private SolrCore core;
+    /**
+     * The FST configurations. Parsed in the {@link #setConfiguration(Map)}
+     * and initialised during {@link #initialise()}. <code>null</code> if no
+     * {@link #FST_CONF} is set.
+     */
+    private List<FstConfig> fstConfigs;
+    /**
+     * The number of threads used to build FST models. 
+     * Set in {@link #setConfiguration(Map)}
+     */
+    private int fstThreads;
     
     /**
      * This Constructor relays on a subsequent call to 
@@ -427,12 +487,69 @@ public class SolrYardIndexingDestination
                 } catch (Exception e) {
                     //throw exception for any invalid entry!
                     throw new IllegalArgumentException(String.format(
-                        "Unable to parse Field Boost entry from field {} and boost {}",
+                        "Unable to parse Field Boost entry from field %s and boost %s",
                         entry.getKey(),entry.getValue()),e);
                 }
             }
             solrYardConfig.setFieldBoosts(fieldBoosts);
         }
+        //read the FST config
+        value = config.get(FST_CONF);
+        if(value != null && !StringUtils.isBlank(value.toString())){
+            File fstConfigFile = indexingConfig.getConfigFile(value.toString());
+            if(!fstConfigFile.isFile()){
+                throw new IllegalArgumentException(String.format(
+                    "Unable to find configured FST configuration file %s",
+                    fstConfigFile));
+            }
+            Collection<String> lines;
+            try {
+                lines = FileUtils.readLines(fstConfigFile, "UTF-8");
+            } catch (IOException e) {
+                throw new IllegalArgumentException(String.format(
+                    "Unable to read FST configuration file %s",
+                    fstConfigFile),e);
+            }
+            fstConfigs = new ArrayList<FstConfig>();
+            for(String line : lines){
+                line = line.trim();
+                if(!line.isEmpty() && line.charAt(0) != '#'){
+                    String[] fields = new String[] {null,null};
+                    int index = -1;
+                    for(String part : line.split("=|;")){
+                        if(index >= 0){
+                            fields[index] = part;
+                            index = -1;
+                        } else if("index".equalsIgnoreCase(part)){
+                            index = 0;
+                        } else if("store".equalsIgnoreCase(part)){
+                            index = 1;
+                        }
+                    }
+                    if(fields[0] == null){
+                        throw new IllegalArgumentException("Invalid FST configuration "
+                            + "line: "+line +". Param 'index={field}' is required "
+                            + "(syntax: 'index={field};store={field}', 'store is optional'')!");
+                    }
+                    fstConfigs.add(new FstConfig(fields[0], fields[1]));
+                }
+            }
+        }
+        value = config.get(FST_THREADS);
+        if(value instanceof Number){
+            fstThreads = ((Number)value).intValue();
+        } else if(value != null){
+            try {
+                fstThreads = Integer.parseInt(value.toString());
+            }catch (NumberFormatException e) {
+                throw new IllegalArgumentException("Unable to parse the FST thread number from "
+                    +value.toString(), e);
+            }
+        }
+        if(fstThreads <= 0){
+            fstThreads = DEFAULT_FST_THREADS;
+        }
+        
     }
     /**
      * Creates a {@link SolrYardConfig} and initialised it to used single Yard
@@ -461,7 +578,7 @@ public class SolrYardIndexingDestination
         //parameters and initialise the member variables. This method performs 
         //the the actual initialisation of the SolrYard!
         //copy a custom configuration (if present)
-        SolrServer server;
+        EmbeddedSolrServer server;
         IndexReference solrServerRef = IndexReference.parse(solrYardConfig.getSolrServerLocation());
         if(solrIndexConfig != null){ //can only be != null if also solrIndexLocation
             //copy the configuration
@@ -485,6 +602,7 @@ public class SolrYardIndexingDestination
         }
         log.info("   ... create SolrYard");
         this.solrYard = new SolrYard(server,solrYardConfig,indexingConfig.getNamespacePrefixService());
+        this.core = server.getCoreContainer().getCore(solrServerRef.getIndex());
     }
 
     @Override
@@ -505,13 +623,81 @@ public class SolrYardIndexingDestination
         } catch (YardException e) {
             log.error("Unable to store FieldMapperConfiguration to the Store!",e);
         }
+        log.info(" ... optimize SolrCore");
         try {
             solrYard.optimize();
         } catch (YardException e) {
             log.error("Unable to optimize SolrIndex after indexing! IndexArchive will not be optimized ...",e);
         }
+        //build the FST models
+        if(fstConfigs != null){
+            //(1) FST config initialisation
+            log.info(" ... init FST configuration(s)");
+            IndexSchema schema = core.getLatestSchema();
+            File fstDir = new File(new File(core.getDataDir()),"fst");
+            if(!fstDir.isDirectory()){
+                try {
+                    FileUtils.forceMkdir(fstDir);
+                } catch (IOException e) {
+                    throw new IllegalStateException("Unable to create Directory "
+                        + fstDir.getAbsolutePath() + "for storing the FST models "
+                        + "of SolrCore "+core.getName());
+                }
+            }
+            RefCounted<SolrIndexSearcher> searcherRef = core.getSearcher();
+            try {
+                for(FstConfig fstConfig : fstConfigs){
+                    fstConfig.setFstDirectory(fstDir); //set the FST directory
+                    log.info("> FST config {}", fstConfig);
+                    fstConfig.buildConfig(schema, searcherRef.get().getAtomicReader());
+                    for(CorpusCreationInfo corpus : fstConfig.getCorpusCreationInfos()){
+                        log.info("  - {}",corpus);
+                    }
+                }
+            } finally {
+                searcherRef.decref();
+            }
+
+            List<Future<?>> fstCreationTasks = new ArrayList<Future<?>>();
+            ExecutorService es = Executors.newFixedThreadPool(fstThreads);
+            log.info(" ... build FST models ");
+            for(FstConfig config : fstConfigs){
+                for(final CorpusCreationInfo corpus : config.getCorpusCreationInfos()){
+                    fstCreationTasks.add(es.submit(new CorpusCreationTask(core, corpus)));
+                }
+            }
+            //now wait for the completion of the tasks
+            Iterator<Future<?>> taskIt = fstCreationTasks.iterator();
+            while(taskIt.hasNext()){
+                Future<?> task = taskIt.next();
+                try {
+                    task.get(); //wait until ready
+                    taskIt.remove();
+                } catch (ExecutionException e) {
+                    log.error("Exception while building FST models for SolrCore "
+                            + core.getName(),e);
+                } catch (InterruptedException e) {
+                    log.error("Interupped while building FST models for SolrCore "
+                            + core.getName(),e);
+                    Thread.currentThread().interrupt();
+                    
+                }
+            }
+            if(!fstCreationTasks.isEmpty()){
+                log.warn("Unable to build {} FST models for SolrCore {}",
+                    fstCreationTasks.size(), core.getName());
+            } else {
+                log.info("All FST modles for SolrCore {} build successfully!",
+                    core.getName());
+            }
+        } //no FST modles to build
+        
+        //all Solr specific stuff is now ready
+        log.info(" ... close SolrCore");
         solrYard.close();
+        
         //zip the index and copy it over to distribution
+        log.info(" ... build Solr index archive");
         if(solrArchive != null){
             try {
                 writeSolrIndexArchive();
@@ -591,8 +777,8 @@ public class SolrYardIndexingDestination
         File solrArchiveFile = new File(indexingConfig.getDistributionFolder(),solrArchive.getName());
         ZipOutputStream out = new ZipOutputStream(new FileOutputStream(solrArchiveFile));
         for(File file : (Collection<File>)FileUtils.listFiles(solrIndexLocation, null, true)){
-            if(!file.isHidden()){
-                String name = file.getAbsolutePath().substring(parentPathLength);
+            String name = file.getAbsolutePath().substring(parentPathLength);
+            if(!file.isHidden() && !name.endsWith(SOLR_WRITE_LOCK)){
                 log.info("add "+name);
                 out.putNextEntry(new ZipEntry(name));
                 if(!file.isDirectory()){
@@ -601,6 +787,8 @@ public class SolrYardIndexingDestination
                     out.closeEntry();
                     IOUtils.closeQuietly(fileIn);
                 }
+            } else {
+                log.info("exclude "+name);
             }
         }
         out.finish();

Modified: stanbol/branches/commons-ng/entityhub/indexing/destination/solryard/src/test/java/org/apache/stanbol/entityhub/indexing/destination/solryard/SolrYardIndexingDestinationTest.java
URL: http://svn.apache.org/viewvc/stanbol/branches/commons-ng/entityhub/indexing/destination/solryard/src/test/java/org/apache/stanbol/entityhub/indexing/destination/solryard/SolrYardIndexingDestinationTest.java?rev=1533571&r1=1533570&r2=1533571&view=diff
==============================================================================
--- stanbol/branches/commons-ng/entityhub/indexing/destination/solryard/src/test/java/org/apache/stanbol/entityhub/indexing/destination/solryard/SolrYardIndexingDestinationTest.java (original)
+++ stanbol/branches/commons-ng/entityhub/indexing/destination/solryard/src/test/java/org/apache/stanbol/entityhub/indexing/destination/solryard/SolrYardIndexingDestinationTest.java Fri Oct 18 17:58:24 2013
@@ -47,6 +47,7 @@ import org.apache.stanbol.entityhub.serv
 import org.apache.stanbol.entityhub.yard.solr.impl.SolrYard;
 import org.junit.After;
 import org.junit.AfterClass;
+import org.junit.Assert;
 import org.junit.BeforeClass;
 import org.junit.Test;
 import org.slf4j.Logger;
@@ -76,6 +77,9 @@ public class SolrYardIndexingDestination
             "solrconfig.xml",
             "segments.gen");
     
+    public static final Collection<String> UNEXPECTED_INDEX_ARCHIVE_FILE_NAMES =
+            Arrays.asList("write.lock"); //excluded with STANBOL1176
+    
     private static final Logger log = LoggerFactory.getLogger(SolrYardIndexingDestinationTest.class);
     private static final String CONFIG_ROOT = "testConfigs";
     /**
@@ -211,9 +215,12 @@ public class SolrYardIndexingDestination
             ZipEntry entry = entries.nextElement();
             //the name of the index MUST be the root folder within the Archive!
             assertTrue(entry.getName().startsWith(config.getName()));
-            if(expected.remove(FilenameUtils.getName(entry.getName()))){
+            String name = FilenameUtils.getName(entry.getName());
+            if(expected.remove(name)){
                 log.info("found expected Entry '{}'",entry.getName());
             }
+            Assert.assertFalse("found unexpected Entry '"+entry.getName()+"' in "
+                + "SolrIndexArchive", UNEXPECTED_INDEX_ARCHIVE_FILE_NAMES.contains(name));
         }
         assertTrue("missing Files in index archive: "+expected,expected.isEmpty());
         

Modified: stanbol/branches/commons-ng/entityhub/indexing/freebase/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/branches/commons-ng/entityhub/indexing/freebase/pom.xml?rev=1533571&r1=1533570&r2=1533571&view=diff
==============================================================================
--- stanbol/branches/commons-ng/entityhub/indexing/freebase/pom.xml (original)
+++ stanbol/branches/commons-ng/entityhub/indexing/freebase/pom.xml Fri Oct 18 17:58:24 2013
@@ -102,6 +102,12 @@
             <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/**/*.ldpath</exclude>
+            <exclude>src/main/resources/indexing/config/**/*.mappings</exclude>
+            <exclude>src/main/resources/indexing/config/**/*.txt</exclude>
+            <exclude>src/main/resources/indexing/config/**/*.config</exclude>
           </excludes>
         </configuration>
       </plugin>

Modified: stanbol/branches/commons-ng/entityhub/indexing/freebase/src/main/java/org/apache/stanbol/entityhub/indexing/freebase/processor/FreebaseAbbrevationProcessor.java
URL: http://svn.apache.org/viewvc/stanbol/branches/commons-ng/entityhub/indexing/freebase/src/main/java/org/apache/stanbol/entityhub/indexing/freebase/processor/FreebaseAbbrevationProcessor.java?rev=1533571&r1=1533570&r2=1533571&view=diff
==============================================================================
--- stanbol/branches/commons-ng/entityhub/indexing/freebase/src/main/java/org/apache/stanbol/entityhub/indexing/freebase/processor/FreebaseAbbrevationProcessor.java (original)
+++ stanbol/branches/commons-ng/entityhub/indexing/freebase/src/main/java/org/apache/stanbol/entityhub/indexing/freebase/processor/FreebaseAbbrevationProcessor.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.entityhub.indexing.freebase.processor;
 
 import java.util.Iterator;

Modified: stanbol/branches/commons-ng/entityhub/indexing/freebase/src/main/java/org/apache/stanbol/entityhub/indexing/freebase/processor/FreebaseImageProcessor.java
URL: http://svn.apache.org/viewvc/stanbol/branches/commons-ng/entityhub/indexing/freebase/src/main/java/org/apache/stanbol/entityhub/indexing/freebase/processor/FreebaseImageProcessor.java?rev=1533571&r1=1533570&r2=1533571&view=diff
==============================================================================
--- stanbol/branches/commons-ng/entityhub/indexing/freebase/src/main/java/org/apache/stanbol/entityhub/indexing/freebase/processor/FreebaseImageProcessor.java (original)
+++ stanbol/branches/commons-ng/entityhub/indexing/freebase/src/main/java/org/apache/stanbol/entityhub/indexing/freebase/processor/FreebaseImageProcessor.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.entityhub.indexing.freebase.processor;
 
 import java.util.Arrays;

Modified: stanbol/branches/commons-ng/entityhub/indexing/freebase/src/main/java/org/apache/stanbol/entityhub/indexing/freebase/processor/FreebaseKeyProcessor.java
URL: http://svn.apache.org/viewvc/stanbol/branches/commons-ng/entityhub/indexing/freebase/src/main/java/org/apache/stanbol/entityhub/indexing/freebase/processor/FreebaseKeyProcessor.java?rev=1533571&r1=1533570&r2=1533571&view=diff
==============================================================================
--- stanbol/branches/commons-ng/entityhub/indexing/freebase/src/main/java/org/apache/stanbol/entityhub/indexing/freebase/processor/FreebaseKeyProcessor.java (original)
+++ stanbol/branches/commons-ng/entityhub/indexing/freebase/src/main/java/org/apache/stanbol/entityhub/indexing/freebase/processor/FreebaseKeyProcessor.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.entityhub.indexing.freebase.processor;
 
 import java.util.ArrayList;

Modified: stanbol/branches/commons-ng/entityhub/indexing/freebase/src/main/resources/indexing/config/freebase/conf/admin-extra.menu-bottom.html
URL: http://svn.apache.org/viewvc/stanbol/branches/commons-ng/entityhub/indexing/freebase/src/main/resources/indexing/config/freebase/conf/admin-extra.menu-bottom.html?rev=1533571&r1=1533570&r2=1533571&view=diff
==============================================================================
--- stanbol/branches/commons-ng/entityhub/indexing/freebase/src/main/resources/indexing/config/freebase/conf/admin-extra.menu-bottom.html (original)
+++ stanbol/branches/commons-ng/entityhub/indexing/freebase/src/main/resources/indexing/config/freebase/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/freebase/src/main/resources/indexing/config/freebase/conf/admin-extra.menu-top.html
URL: http://svn.apache.org/viewvc/stanbol/branches/commons-ng/entityhub/indexing/freebase/src/main/resources/indexing/config/freebase/conf/admin-extra.menu-top.html?rev=1533571&r1=1533570&r2=1533571&view=diff
==============================================================================
--- stanbol/branches/commons-ng/entityhub/indexing/freebase/src/main/resources/indexing/config/freebase/conf/admin-extra.menu-top.html (original)
+++ stanbol/branches/commons-ng/entityhub/indexing/freebase/src/main/resources/indexing/config/freebase/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/freebase/src/main/resources/indexing/config/freebase/conf/update-script.js
URL: http://svn.apache.org/viewvc/stanbol/branches/commons-ng/entityhub/indexing/freebase/src/main/resources/indexing/config/freebase/conf/update-script.js?rev=1533571&r1=1533570&r2=1533571&view=diff
==============================================================================
--- stanbol/branches/commons-ng/entityhub/indexing/freebase/src/main/resources/indexing/config/freebase/conf/update-script.js (original)
+++ stanbol/branches/commons-ng/entityhub/indexing/freebase/src/main/resources/indexing/config/freebase/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.
 

Modified: stanbol/branches/commons-ng/entityhub/indexing/freebase/src/main/resources/indexing/config/indexing.properties
URL: http://svn.apache.org/viewvc/stanbol/branches/commons-ng/entityhub/indexing/freebase/src/main/resources/indexing/config/indexing.properties?rev=1533571&r1=1533570&r2=1533571&view=diff
==============================================================================
--- stanbol/branches/commons-ng/entityhub/indexing/freebase/src/main/resources/indexing/config/indexing.properties (original)
+++ stanbol/branches/commons-ng/entityhub/indexing/freebase/src/main/resources/indexing/config/indexing.properties Fri Oct 18 17:58:24 2013
@@ -52,7 +52,7 @@ fieldConfiguration=mappings.txt
 
 # Finally we need a destination to store the data
 # Note also the configured fieldboosts.properties
-indexingDestination=org.apache.stanbol.entityhub.indexing.destination.solryard.SolrYardIndexingDestination,solrConf,boosts:fieldboosts
+indexingDestination=org.apache.stanbol.entityhub.indexing.destination.solryard.SolrYardIndexingDestination,solrConf,boosts:fieldboosts,fstConf:fst.config
 
 
 # Additional Properties directly added to the configuration of the

Modified: stanbol/branches/commons-ng/entityhub/indexing/freebase/src/main/resources/indexing/config/indexingsource.properties
URL: http://svn.apache.org/viewvc/stanbol/branches/commons-ng/entityhub/indexing/freebase/src/main/resources/indexing/config/indexingsource.properties?rev=1533571&r1=1533570&r2=1533571&view=diff
==============================================================================
--- stanbol/branches/commons-ng/entityhub/indexing/freebase/src/main/resources/indexing/config/indexingsource.properties (original)
+++ stanbol/branches/commons-ng/entityhub/indexing/freebase/src/main/resources/indexing/config/indexingsource.properties Fri Oct 18 17:58:24 2013
@@ -1,3 +1,18 @@
+# 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.
+
 # The source folder
 source=rdfdata
 

Modified: stanbol/branches/commons-ng/entityhub/indexing/freebase/src/main/resources/log4j.properties
URL: http://svn.apache.org/viewvc/stanbol/branches/commons-ng/entityhub/indexing/freebase/src/main/resources/log4j.properties?rev=1533571&r1=1533570&r2=1533571&view=diff
==============================================================================
--- stanbol/branches/commons-ng/entityhub/indexing/freebase/src/main/resources/log4j.properties (original)
+++ stanbol/branches/commons-ng/entityhub/indexing/freebase/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/genericrdf/README.md
URL: http://svn.apache.org/viewvc/stanbol/branches/commons-ng/entityhub/indexing/genericrdf/README.md?rev=1533571&r1=1533570&r2=1533571&view=diff
==============================================================================
--- stanbol/branches/commons-ng/entityhub/indexing/genericrdf/README.md (original)
+++ stanbol/branches/commons-ng/entityhub/indexing/genericrdf/README.md Fri Oct 18 17:58:24 2013
@@ -229,6 +229,20 @@ the Bundle described above. To install t
 {name} denotes to the value you configured for the "name" property within the
 "indexing.properties" file.
 
+### A note about blank nodes
 
+If your input data sets contain large numbers of blank nodes, you may find that
+you have problems running out of heap space during indexing. This is because Jena
+(like many semantic stores) keeps a store of blank nodes in core memory while 
+importing. Keeping in mind that EntityHub does not support the use of blank nodes,
+there is a means of indexing such data sets nonetheless. You can convert them to
+named nodes and then index. There is a convenient tool packaged with Stanbol for
+this purpose, called "Urify" (org.apache.stanbol.entityhub.indexing.Urify).
+It is available in the runnable JAR file built by this indexer. To use it, put that
+JAR on your classpath, and you can execute Urify, giving it a list of files to process.
+Use the "-h" or "--help" flag to see options for Urify:
 
-
+    java -Xmx1024m -cp org.apache.stanbol.entityhub.indexing.genericrdf-*.jar \
+    org.apache.stanbol.entityhub.indexing.Urify --help
+    
+    
\ No newline at end of file

Modified: stanbol/branches/commons-ng/entityhub/indexing/genericrdf/src/license/THIRD-PARTY.properties
URL: http://svn.apache.org/viewvc/stanbol/branches/commons-ng/entityhub/indexing/genericrdf/src/license/THIRD-PARTY.properties?rev=1533571&r1=1533570&r2=1533571&view=diff
==============================================================================
--- stanbol/branches/commons-ng/entityhub/indexing/genericrdf/src/license/THIRD-PARTY.properties (original)
+++ stanbol/branches/commons-ng/entityhub/indexing/genericrdf/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,6 +17,8 @@
 # - 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
 # - iCal4j - License
@@ -21,15 +26,18 @@
 # Please fill the missing licenses for dependencies :
 #
 #
-#Tue Jan 22 15:45:32 CET 2013
+#Tue Sep 24 20:58:20 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/entityhub/indexing/genericrdf/src/main/resources/indexing/config/indexing.properties
URL: http://svn.apache.org/viewvc/stanbol/branches/commons-ng/entityhub/indexing/genericrdf/src/main/resources/indexing/config/indexing.properties?rev=1533571&r1=1533570&r2=1533571&view=diff
==============================================================================
--- stanbol/branches/commons-ng/entityhub/indexing/genericrdf/src/main/resources/indexing/config/indexing.properties (original)
+++ stanbol/branches/commons-ng/entityhub/indexing/genericrdf/src/main/resources/indexing/config/indexing.properties Fri Oct 18 17:58:24 2013
@@ -233,7 +233,8 @@ fieldConfiguration=mappings.txt
 # A SolrYard is used as destination for indexing
 # To boost some fields (typically labels) one can use the fieldboosts.properties
 # A default field boost configuration is provided.
-indexingDestination=org.apache.stanbol.entityhub.indexing.destination.solryard.SolrYardIndexingDestination,boosts:fieldboosts
+# A default fst.config is also provided (see STANBOL-1167)
+indexingDestination=org.apache.stanbol.entityhub.indexing.destination.solryard.SolrYardIndexingDestination,boosts:fieldboosts,fstConf:fst.config
 
 
 # ------------
@@ -289,3 +290,10 @@ org.apache.stanbol.entityhub.site.fieldM
 #org.apache.stanbol.entityhub.site.attributionUrl=http://example.org/About.html
 #org.apache.stanbol.entityhub.site.attribution=To the universe
 
+
+# Fail on Error loading Resource Files 
+# The indexing tool can be configured to fail on error loading resource files.
+# By default, a resource file will be ignored when an error occurs while trying to load it
+failOnErrorLoadingResource=false
+
+

Modified: stanbol/branches/commons-ng/entityhub/indexing/geonames/src/license/THIRD-PARTY.properties
URL: http://svn.apache.org/viewvc/stanbol/branches/commons-ng/entityhub/indexing/geonames/src/license/THIRD-PARTY.properties?rev=1533571&r1=1533570&r2=1533571&view=diff
==============================================================================
--- stanbol/branches/commons-ng/entityhub/indexing/geonames/src/license/THIRD-PARTY.properties (original)
+++ stanbol/branches/commons-ng/entityhub/indexing/geonames/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,18 +18,23 @@
 # - 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:45:33 CET 2013
+#Tue Sep 24 20:58:48 CEST 2013
 antlr--antlr--2.7.2=Public Domain
 commons-beanutils--commons-beanutils--1.7.0=Apache Software License, Version 2.0
 dom4j--dom4j--1.1=BSD-style
 jakarta-regexp--jakarta-regexp--1.4=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.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

Modified: stanbol/branches/commons-ng/entityhub/indexing/geonames/src/main/java/org/apache/stanbol/entityhub/indexing/geonames/GeonamesEntityScoreProvider.java
URL: http://svn.apache.org/viewvc/stanbol/branches/commons-ng/entityhub/indexing/geonames/src/main/java/org/apache/stanbol/entityhub/indexing/geonames/GeonamesEntityScoreProvider.java?rev=1533571&r1=1533570&r2=1533571&view=diff
==============================================================================
--- stanbol/branches/commons-ng/entityhub/indexing/geonames/src/main/java/org/apache/stanbol/entityhub/indexing/geonames/GeonamesEntityScoreProvider.java (original)
+++ stanbol/branches/commons-ng/entityhub/indexing/geonames/src/main/java/org/apache/stanbol/entityhub/indexing/geonames/GeonamesEntityScoreProvider.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.entityhub.indexing.geonames;
 
 import static org.apache.stanbol.entityhub.indexing.geonames.GeonamesConstants.GEONAMES_ONTOLOGY_NS;

Modified: stanbol/branches/commons-ng/entityhub/indexing/geonames/src/main/resources/indexing/config/indexing.properties
URL: http://svn.apache.org/viewvc/stanbol/branches/commons-ng/entityhub/indexing/geonames/src/main/resources/indexing/config/indexing.properties?rev=1533571&r1=1533570&r2=1533571&view=diff
==============================================================================
--- stanbol/branches/commons-ng/entityhub/indexing/geonames/src/main/resources/indexing/config/indexing.properties (original)
+++ stanbol/branches/commons-ng/entityhub/indexing/geonames/src/main/resources/indexing/config/indexing.properties Fri Oct 18 17:58:24 2013
@@ -107,7 +107,7 @@ fieldConfiguration=mappings.txt
 # A SolrYard is used as destination for indexing
 # To boost some fields (typically labels) one can use the fieldboosts.properties
 # A default field boost configuration is provided.
-indexingDestination=org.apache.stanbol.entityhub.indexing.destination.solryard.SolrYardIndexingDestination,boosts:fieldboosts
+indexingDestination=org.apache.stanbol.entityhub.indexing.destination.solryard.SolrYardIndexingDestination,boosts:fieldboosts,fstConf:fst.config
 
 
 # ------------

Modified: stanbol/branches/commons-ng/entityhub/indexing/source/jenatdb/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/branches/commons-ng/entityhub/indexing/source/jenatdb/pom.xml?rev=1533571&r1=1533570&r2=1533571&view=diff
==============================================================================
--- stanbol/branches/commons-ng/entityhub/indexing/source/jenatdb/pom.xml (original)
+++ stanbol/branches/commons-ng/entityhub/indexing/source/jenatdb/pom.xml Fri Oct 18 17:58:24 2013
@@ -83,6 +83,7 @@
             <exclude>src/test/**/*.txt</exclude>
             <exclude>src/test/**/*.nq</exclude>
             <exclude>src/test/**/*.nt</exclude>
+            <exclude>src/test/**/*.config</exclude>
           </excludes>
         </configuration>
       </plugin>      

Modified: stanbol/branches/commons-ng/entityhub/indexing/source/jenatdb/src/main/java/org/apache/stanbol/entityhub/indexing/source/jenatdb/DestinationTripleGraph.java
URL: http://svn.apache.org/viewvc/stanbol/branches/commons-ng/entityhub/indexing/source/jenatdb/src/main/java/org/apache/stanbol/entityhub/indexing/source/jenatdb/DestinationTripleGraph.java?rev=1533571&r1=1533570&r2=1533571&view=diff
==============================================================================
--- stanbol/branches/commons-ng/entityhub/indexing/source/jenatdb/src/main/java/org/apache/stanbol/entityhub/indexing/source/jenatdb/DestinationTripleGraph.java (original)
+++ stanbol/branches/commons-ng/entityhub/indexing/source/jenatdb/src/main/java/org/apache/stanbol/entityhub/indexing/source/jenatdb/DestinationTripleGraph.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.entityhub.indexing.source.jenatdb;
 
 import java.util.Map;

Modified: stanbol/branches/commons-ng/entityhub/indexing/source/jenatdb/src/main/java/org/apache/stanbol/entityhub/indexing/source/jenatdb/LiteralLanguageFilter.java
URL: http://svn.apache.org/viewvc/stanbol/branches/commons-ng/entityhub/indexing/source/jenatdb/src/main/java/org/apache/stanbol/entityhub/indexing/source/jenatdb/LiteralLanguageFilter.java?rev=1533571&r1=1533570&r2=1533571&view=diff
==============================================================================
--- stanbol/branches/commons-ng/entityhub/indexing/source/jenatdb/src/main/java/org/apache/stanbol/entityhub/indexing/source/jenatdb/LiteralLanguageFilter.java (original)
+++ stanbol/branches/commons-ng/entityhub/indexing/source/jenatdb/src/main/java/org/apache/stanbol/entityhub/indexing/source/jenatdb/LiteralLanguageFilter.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.entityhub.indexing.source.jenatdb;
 
 import java.util.Arrays;

Modified: stanbol/branches/commons-ng/entityhub/indexing/source/jenatdb/src/main/java/org/apache/stanbol/entityhub/indexing/source/jenatdb/PropertyPrefixFilter.java
URL: http://svn.apache.org/viewvc/stanbol/branches/commons-ng/entityhub/indexing/source/jenatdb/src/main/java/org/apache/stanbol/entityhub/indexing/source/jenatdb/PropertyPrefixFilter.java?rev=1533571&r1=1533570&r2=1533571&view=diff
==============================================================================
--- stanbol/branches/commons-ng/entityhub/indexing/source/jenatdb/src/main/java/org/apache/stanbol/entityhub/indexing/source/jenatdb/PropertyPrefixFilter.java (original)
+++ stanbol/branches/commons-ng/entityhub/indexing/source/jenatdb/src/main/java/org/apache/stanbol/entityhub/indexing/source/jenatdb/PropertyPrefixFilter.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.entityhub.indexing.source.jenatdb;
 
 import java.io.File;

Modified: stanbol/branches/commons-ng/entityhub/indexing/source/jenatdb/src/main/java/org/apache/stanbol/entityhub/indexing/source/jenatdb/RdfImportFilter.java
URL: http://svn.apache.org/viewvc/stanbol/branches/commons-ng/entityhub/indexing/source/jenatdb/src/main/java/org/apache/stanbol/entityhub/indexing/source/jenatdb/RdfImportFilter.java?rev=1533571&r1=1533570&r2=1533571&view=diff
==============================================================================
--- stanbol/branches/commons-ng/entityhub/indexing/source/jenatdb/src/main/java/org/apache/stanbol/entityhub/indexing/source/jenatdb/RdfImportFilter.java (original)
+++ stanbol/branches/commons-ng/entityhub/indexing/source/jenatdb/src/main/java/org/apache/stanbol/entityhub/indexing/source/jenatdb/RdfImportFilter.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.entityhub.indexing.source.jenatdb;
 
 import org.apache.stanbol.entityhub.indexing.core.IndexingComponent;

Modified: stanbol/branches/commons-ng/entityhub/indexing/source/jenatdb/src/main/java/org/apache/stanbol/entityhub/indexing/source/jenatdb/RdfIndexingSource.java
URL: http://svn.apache.org/viewvc/stanbol/branches/commons-ng/entityhub/indexing/source/jenatdb/src/main/java/org/apache/stanbol/entityhub/indexing/source/jenatdb/RdfIndexingSource.java?rev=1533571&r1=1533570&r2=1533571&view=diff
==============================================================================
--- stanbol/branches/commons-ng/entityhub/indexing/source/jenatdb/src/main/java/org/apache/stanbol/entityhub/indexing/source/jenatdb/RdfIndexingSource.java (original)
+++ stanbol/branches/commons-ng/entityhub/indexing/source/jenatdb/src/main/java/org/apache/stanbol/entityhub/indexing/source/jenatdb/RdfIndexingSource.java Fri Oct 18 17:58:24 2013
@@ -16,8 +16,6 @@
 */
 package org.apache.stanbol.entityhub.indexing.source.jenatdb;
 
-import static org.apache.stanbol.entityhub.indexing.source.jenatdb.Constants.DEFAULT_MODEL_DIRECTORY;
-import static org.apache.stanbol.entityhub.indexing.source.jenatdb.Constants.PARAM_MODEL_DIRECTORY;
 import static org.apache.stanbol.entityhub.indexing.source.jenatdb.Utils.initTDBDataset;
 
 import java.io.File;
@@ -44,7 +42,6 @@ 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.util.ModelUtils;
-import org.joda.time.field.ImpreciseDateTimeField;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -68,8 +65,6 @@ import com.hp.hpl.jena.rdf.model.AnonId;
 import com.hp.hpl.jena.rdf.model.RDFNode;
 import com.hp.hpl.jena.sparql.core.Var;
 import com.hp.hpl.jena.sparql.engine.binding.Binding;
-import com.hp.hpl.jena.tdb.TDBFactory;
-import com.hp.hpl.jena.tdb.base.file.Location;
 import com.hp.hpl.jena.tdb.store.DatasetGraphTDB;
 import com.hp.hpl.jena.util.iterator.ExtendedIterator;
 /**
@@ -126,7 +121,7 @@ public class RdfIndexingSource extends A
      */
     public static final String DEFAULT_SOURCE_FOLDER_NAME = "rdfdata";
     
-    public static final String DEFAULT_IMPORTED_FOLDER_NAME = "imported";
+    public static final String DEFAULT_IMPORTED_FOLDER_NAME = "imported";    
     //protected to allow internal classes direct access (without hidden getter/
     //setter added by the compiler that decrease performance)
     protected final static Logger log = LoggerFactory.getLogger(RdfIndexingSource.class);
@@ -237,8 +232,10 @@ public class RdfIndexingSource extends A
                     new RdfImportFilter[filters.size()]));
             }
         }
+        
+        boolean failOnError = indexingConfig.isFailOnError();
         //create the ResourceLoader
-        this.loader =  new ResourceLoader(new RdfResourceImporter(indexingDataset, importFilter), true);
+        this.loader =  new ResourceLoader(new RdfResourceImporter(indexingDataset, importFilter), failOnError);
         
         value = config.get(PARAM_IMPORTED_FOLDER);
         String importedFolderName;

Modified: stanbol/branches/commons-ng/entityhub/indexing/source/jenatdb/src/test/java/org/apache/stanbol/entityhub/indexing/source/jenatdb/LanguageLiteralFilterTest.java
URL: http://svn.apache.org/viewvc/stanbol/branches/commons-ng/entityhub/indexing/source/jenatdb/src/test/java/org/apache/stanbol/entityhub/indexing/source/jenatdb/LanguageLiteralFilterTest.java?rev=1533571&r1=1533570&r2=1533571&view=diff
==============================================================================
--- stanbol/branches/commons-ng/entityhub/indexing/source/jenatdb/src/test/java/org/apache/stanbol/entityhub/indexing/source/jenatdb/LanguageLiteralFilterTest.java (original)
+++ stanbol/branches/commons-ng/entityhub/indexing/source/jenatdb/src/test/java/org/apache/stanbol/entityhub/indexing/source/jenatdb/LanguageLiteralFilterTest.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.entityhub.indexing.source.jenatdb;
 
 import org.junit.Assert;

Modified: stanbol/branches/commons-ng/entityhub/indexing/source/jenatdb/src/test/java/org/apache/stanbol/entityhub/indexing/source/jenatdb/PropertyPrefixFilterTest.java
URL: http://svn.apache.org/viewvc/stanbol/branches/commons-ng/entityhub/indexing/source/jenatdb/src/test/java/org/apache/stanbol/entityhub/indexing/source/jenatdb/PropertyPrefixFilterTest.java?rev=1533571&r1=1533570&r2=1533571&view=diff
==============================================================================
--- stanbol/branches/commons-ng/entityhub/indexing/source/jenatdb/src/test/java/org/apache/stanbol/entityhub/indexing/source/jenatdb/PropertyPrefixFilterTest.java (original)
+++ stanbol/branches/commons-ng/entityhub/indexing/source/jenatdb/src/test/java/org/apache/stanbol/entityhub/indexing/source/jenatdb/PropertyPrefixFilterTest.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.entityhub.indexing.source.jenatdb;
 
 import java.io.IOException;

Modified: stanbol/branches/commons-ng/entityhub/ldpath/src/license/THIRD-PARTY.properties
URL: http://svn.apache.org/viewvc/stanbol/branches/commons-ng/entityhub/ldpath/src/license/THIRD-PARTY.properties?rev=1533571&r1=1533570&r2=1533571&view=diff
==============================================================================
--- stanbol/branches/commons-ng/entityhub/ldpath/src/license/THIRD-PARTY.properties (original)
+++ stanbol/branches/commons-ng/entityhub/ldpath/src/license/THIRD-PARTY.properties Fri Oct 18 17:58:24 2013
@@ -15,19 +15,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:36:26 CET 2013
+#Tue Sep 24 20:56:57 CEST 2013
 antlr--antlr--2.7.2=Public Domain
 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

Modified: stanbol/branches/commons-ng/entityhub/ldpath/src/test/java/org/apache/stanbol/entityhub/ldpath/EntityhubLDPathTest.java
URL: http://svn.apache.org/viewvc/stanbol/branches/commons-ng/entityhub/ldpath/src/test/java/org/apache/stanbol/entityhub/ldpath/EntityhubLDPathTest.java?rev=1533571&r1=1533570&r2=1533571&view=diff
==============================================================================
--- stanbol/branches/commons-ng/entityhub/ldpath/src/test/java/org/apache/stanbol/entityhub/ldpath/EntityhubLDPathTest.java (original)
+++ stanbol/branches/commons-ng/entityhub/ldpath/src/test/java/org/apache/stanbol/entityhub/ldpath/EntityhubLDPathTest.java Fri Oct 18 17:58:24 2013
@@ -87,24 +87,27 @@ public class EntityhubLDPathTest extends
             vf.createText("伦敦","zh")
             )));
         expected.put("comment", new HashSet<Text>(Arrays.asList(
-            vf.createText("London is the capital of England and the United Kingdom, " +
-            		"the largest metropolitan area in the United Kingdom and the " +
-            		"largest urban zone in the European Union by most measures. " +
-            		"London has been a major settlement for two millennia, its " +
-            		"history going back to its founding by the Romans, who called " +
-            		"it Londinium. London's core, the ancient City of London, " +
-            		"largely retains its square-mile mediaeval boundaries.","en"))));
+            vf.createText("London Listen/ˈlʌndən/ is the capital city of England" +
+            		" and the United Kingdom, the largest metropolitan area in the" +
+            		" United Kingdom, and the largest urban zone in the European " +
+            		"Union by most measures. Located on the River Thames, London " +
+            		"has been a major settlement for two millennia, its history " +
+            		"going back to its founding by the Romans, who named it " +
+            		"Londinium. London's ancient core, the City of London, largely " +
+            		"retains its square-mile mediaeval boundaries.","en"))));
         // NOTE: LDPath uses String to represent anyUri
         expected.put("categories", new HashSet<Reference>(Arrays.asList(
             vf.createReference("http://dbpedia.org/resource/Category:London"),
             vf.createReference("http://dbpedia.org/resource/Category:British_capitals"),
             vf.createReference("http://dbpedia.org/resource/Category:Populated_places_established_in_the_1st_century"),
             vf.createReference("http://dbpedia.org/resource/Category:Staple_ports"),
-            vf.createReference("http://dbpedia.org/resource/Category:Articles_including_recorded_pronunciations_%28UK_English%29"),
+            vf.createReference("http://dbpedia.org/resource/Category:Articles_including_recorded_pronunciations_(UK_English)"),
             vf.createReference("http://dbpedia.org/resource/Category:Capitals_in_Europe"),
             vf.createReference("http://dbpedia.org/resource/Category:Host_cities_of_the_Commonwealth_Games"),
             vf.createReference("http://dbpedia.org/resource/Category:Host_cities_of_the_Summer_Olympic_Games"),
-            vf.createReference("http://dbpedia.org/resource/Category:Port_cities_and_towns_in_the_United_Kingdom")
+            vf.createReference("http://dbpedia.org/resource/Category:Port_cities_and_towns_in_the_United_Kingdom"),
+            vf.createReference("http://dbpedia.org/resource/Category:Arthurian_locations"),
+            vf.createReference("http://dbpedia.org/resource/Category:Robin_Hood_locations")
             )));
         expected.put("type", new HashSet<Reference>(Arrays.asList(
             vf.createReference("http://www.w3.org/2002/07/owl#Thing"),

Modified: stanbol/branches/commons-ng/entityhub/ldpath/src/test/java/org/apache/stanbol/entityhub/ldpath/backend/BackendTest.java
URL: http://svn.apache.org/viewvc/stanbol/branches/commons-ng/entityhub/ldpath/src/test/java/org/apache/stanbol/entityhub/ldpath/backend/BackendTest.java?rev=1533571&r1=1533570&r2=1533571&view=diff
==============================================================================
--- stanbol/branches/commons-ng/entityhub/ldpath/src/test/java/org/apache/stanbol/entityhub/ldpath/backend/BackendTest.java (original)
+++ stanbol/branches/commons-ng/entityhub/ldpath/src/test/java/org/apache/stanbol/entityhub/ldpath/backend/BackendTest.java Fri Oct 18 17:58:24 2013
@@ -60,7 +60,7 @@ public class BackendTest extends LDPathT
         Map<String,Collection<?>> expected = new HashMap<String,Collection<?>>();
         expected.put("title_en", new HashSet<String>(Arrays.asList("Paris")));
         expected.put("title", new HashSet<String>(
-                Arrays.asList("Paris","Parijs","Parigi","Pariisi","巴黎","Париж")));
+                Arrays.asList("Paris","París","Parigi","巴黎","باريس")));
         // NOTE: LDPath uses String to represent anyUri
         expected.put("type", new HashSet<String>(Arrays.asList(
             "http://www.w3.org/2002/07/owl#Thing",
@@ -78,9 +78,10 @@ public class BackendTest extends LDPathT
         allValues.addAll(Arrays.asList(
             "http://dbpedia.org/resource/Category:Capitals_in_Europe",
             "http://dbpedia.org/resource/Category:Host_cities_of_the_Summer_Olympic_Games",
-            "2.350833","0.81884754","2193031"));
+            "48.8567","2.3508",
+            "http://upload.wikimedia.org/wikipedia/commons/6/6e/Paris_-_Eiffelturm_und_Marsfeld2.jpg"));
         expected.put("all", allValues);
-        expected.put("lat", Collections.emptySet());
+        expected.put("lat", Collections.singleton(48.8567));
         EXPECTED_RESULTS_PARIS = Collections.unmodifiableMap(expected);
     }
     
@@ -89,7 +90,7 @@ public class BackendTest extends LDPathT
     static {
         StringBuilder builder = new StringBuilder();
         //TODO:write LDPath test statement (or load it from test resources
-        builder.append("name = rdfs:label :: xsd:string;");
+        builder.append("name = skos:prefLabel :: xsd:string;");
         builder.append("parent = skos:broader :: xsd:anyURI;");
         builder.append("childs = ^skos:broader :: xsd:anyURI;");
         builder.append("members = ^<http://purl.org/dc/terms/subject> :: xsd:anyURI;");
@@ -104,32 +105,49 @@ public class BackendTest extends LDPathT
                 ));
         expected.put("parent", new HashSet<String>(Arrays.asList(
             "http://dbpedia.org/resource/Category:Harvard_University_people",
-            "http://dbpedia.org/resource/Category:Alumni_by_university_or_college_in_Massachusetts",
-            "http://dbpedia.org/resource/Category:Ivy_League_alumni")
+            "http://dbpedia.org/resource/Category:Alumni_by_university_or_college_in_Massachusetts")
             ));
         expected.put("childs", new HashSet<String>(Arrays.asList(
-            "http://dbpedia.org/resource/Category:John_F._Kennedy_School_of_Government_alumni",
             "http://dbpedia.org/resource/Category:Harvard_Law_School_alumni",
-            "http://dbpedia.org/resource/Category:Harvard_Medical_School_alumni",
             "http://dbpedia.org/resource/Category:Harvard_Business_School_alumni")
             ));
         expected.put("members", new HashSet<String>(Arrays.asList(
-            "http://dbpedia.org/resource/Edward_Said",
-            "http://dbpedia.org/resource/Cole_Porter", 
-            "http://dbpedia.org/resource/Theodore_Roosevelt",
-            "http://dbpedia.org/resource/Al_Gore",
-            "http://dbpedia.org/resource/T._S._Eliot",
-            "http://dbpedia.org/resource/Henry_Kissinger",
-            "http://dbpedia.org/resource/Robert_F._Kennedy",
-            "http://dbpedia.org/resource/Benjamin_Netanyahu",
-            "http://dbpedia.org/resource/Natalie_Portman",
+            "http://dbpedia.org/resource/Jacques_Derrida",
+            "http://dbpedia.org/resource/Pete_Seeger",
             "http://dbpedia.org/resource/John_F._Kennedy",
-            "http://dbpedia.org/resource/Michelle_Obama",
+            "http://dbpedia.org/resource/William_S._Burroughs",
+            "http://dbpedia.org/resource/Norman_Mailer",
+            "http://dbpedia.org/resource/John_Quincy_Adams",
+            "http://dbpedia.org/resource/John_Lithgow",
+            "http://dbpedia.org/resource/Ban_Ki-moon",
+            "http://dbpedia.org/resource/W._E._B._Du_Bois",
+            "http://dbpedia.org/resource/John_Adams",
             "http://dbpedia.org/resource/Jacques_Chirac",
-            "http://dbpedia.org/resource/Pierre_Trudeau",
+            "http://dbpedia.org/resource/William_Lyon_Mackenzie_King",
+            "http://dbpedia.org/resource/Chuck_Schumer",
+            "http://dbpedia.org/resource/Carl_H._Eigenmann",
             "http://dbpedia.org/resource/Jack_Lemmon",
-            "http://dbpedia.org/resource/Franklin_D._Roosevelt",
-            "http://dbpedia.org/resource/John_Adams") // and manny more
+            "http://dbpedia.org/resource/Michael_Dukakis",
+            "http://dbpedia.org/resource/William_Rehnquist",
+            "http://dbpedia.org/resource/Robert_Frost",
+            "http://dbpedia.org/resource/T._S._Eliot",
+            "http://dbpedia.org/resource/Cole_Porter",
+            "http://dbpedia.org/resource/Henry_Kissinger",
+            "http://dbpedia.org/resource/Theodore_Roosevelt",
+            "http://dbpedia.org/resource/Benazir_Bhutto",
+            "http://dbpedia.org/resource/Pierre_Trudeau",
+            "http://dbpedia.org/resource/Henry_David_Thoreau",
+            "http://dbpedia.org/resource/Aga_Khan_IV",
+            "http://dbpedia.org/resource/Leonard_Bernstein",
+            "http://dbpedia.org/resource/William_Randolph_Hearst",
+            "http://dbpedia.org/resource/Natalie_Portman",
+            "http://dbpedia.org/resource/Al_Gore",
+            "http://dbpedia.org/resource/Al_Jean",
+            "http://dbpedia.org/resource/William_Healey_Dall",
+            "http://dbpedia.org/resource/Charles_Sanders_Peirce",
+            "http://dbpedia.org/resource/Conan_O'Brien",
+            "http://dbpedia.org/resource/Yo-Yo_Ma",
+            "http://dbpedia.org/resource/Robert_F._Kennedy")
             ));
         EXPECTED_HARVARD_ALUMNI = Collections.unmodifiableMap(expected);
     }    

Modified: stanbol/branches/commons-ng/entityhub/ldpath/src/test/java/org/apache/stanbol/entityhub/ldpath/impl/LDPathTestBase.java
URL: http://svn.apache.org/viewvc/stanbol/branches/commons-ng/entityhub/ldpath/src/test/java/org/apache/stanbol/entityhub/ldpath/impl/LDPathTestBase.java?rev=1533571&r1=1533570&r2=1533571&view=diff
==============================================================================
--- stanbol/branches/commons-ng/entityhub/ldpath/src/test/java/org/apache/stanbol/entityhub/ldpath/impl/LDPathTestBase.java (original)
+++ stanbol/branches/commons-ng/entityhub/ldpath/src/test/java/org/apache/stanbol/entityhub/ldpath/impl/LDPathTestBase.java Fri Oct 18 17:58:24 2013
@@ -57,7 +57,7 @@ public abstract class LDPathTestBase {
      */
     public static final String TEST_YARD_ID = "dbpedia";
     public static final String TEST_SOLR_CORE_NAME = "dbpedia";
-    public static final String TEST_SOLR_CORE_CONFIGURATION = "dbpedia_43k";
+    public static final String TEST_SOLR_CORE_CONFIGURATION = "dbpedia_26k.solrindex.bz2";
     protected static final String TEST_INDEX_REL_PATH = File.separatorChar + "target" + File.separatorChar
                                                         + ManagedSolrServer.DEFAULT_SOLR_DATA_DIR;
 

Propchange: stanbol/branches/commons-ng/entityhub/model/sesame/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Fri Oct 18 17:58:24 2013
@@ -0,0 +1,7 @@
+target
+
+.settings
+
+.project
+
+.classpath

Modified: stanbol/branches/commons-ng/entityhub/model/sesame/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/branches/commons-ng/entityhub/model/sesame/pom.xml?rev=1533571&r1=1533392&r2=1533571&view=diff
==============================================================================
--- stanbol/branches/commons-ng/entityhub/model/sesame/pom.xml (original)
+++ stanbol/branches/commons-ng/entityhub/model/sesame/pom.xml Fri Oct 18 17:58:24 2013
@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.stanbol</groupId>
     <artifactId>apache-stanbol-entityhub</artifactId>
-    <version>0.12.0-SNAPSHOT</version>
+    <version>1.0.0-SNAPSHOT</version>
     <relativePath>../..</relativePath>
   </parent>
 
@@ -63,8 +63,8 @@
         <configuration>
           <instructions>
             <Import-Package>
-              org.apache.stanbol.entityhub.servicesapi.model; provide:=true; version="[0.11,0.13)",
-              org.apache.stanbol.entityhub.servicesapi.util; provide:=true; version="[0.11,0.13)",
+              org.apache.stanbol.entityhub.servicesapi.model; provide:=true; version="[0.11,1.1)",
+              org.apache.stanbol.entityhub.servicesapi.util; provide:=true; version="[0.11,1.1)",
               *
             </Import-Package>
             <Export-Package>
@@ -73,10 +73,6 @@
           </instructions>
         </configuration>
       </plugin>
-      <plugin>
-        <groupId>org.apache.felix</groupId>
-        <artifactId>maven-scr-plugin</artifactId>
-      </plugin>
     </plugins>
   </build>
 
@@ -84,7 +80,7 @@
     <dependency>
       <groupId>org.apache.stanbol</groupId>
       <artifactId>org.apache.stanbol.entityhub.servicesapi</artifactId>
-      <version>0.11.0</version>
+      <version>1.0.0-SNAPSHOT</version>
     </dependency>
     <dependency> <!-- the sesame repository API -->
       <groupId>org.openrdf.sesame</groupId>
@@ -99,7 +95,7 @@
     <dependency>
       <groupId>org.apache.stanbol</groupId>
       <artifactId>org.apache.stanbol.entityhub.test</artifactId>
-      <version>0.12.0-SNAPSHOT</version>
+      <version>1.0.0-SNAPSHOT</version>
       <scope>test</scope>
     </dependency>
     <!-- TODO: will need a sesame repository for testing -->

Modified: stanbol/branches/commons-ng/entityhub/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/branches/commons-ng/entityhub/pom.xml?rev=1533571&r1=1533570&r2=1533571&view=diff
==============================================================================
--- stanbol/branches/commons-ng/entityhub/pom.xml (original)
+++ stanbol/branches/commons-ng/entityhub/pom.xml Fri Oct 18 17:58:24 2013
@@ -61,11 +61,14 @@
     <module>generic/test</module>
     <module>generic/core</module>
     <module>model/clerezza</module>
+    <module>model/sesame</module>
+    <module>query/sparql</module>
     <module>query/clerezza</module>
     <module>site/linkeddata</module>
     <module>site/managed</module>
     <module>yard/clerezza</module>
     <module>yard/solr</module>
+    <module>yard/sesame</module>
     <module>jersey</module>
     <module>ldpath</module>
 
@@ -136,6 +139,7 @@
                 <exclude>**/*.tsv</exclude>
                 <exclude>**/*.sem</exclude>
                 <exclude>**/*.ldpath</exclude>
+                <exclude>**/*.mappings</exclude>
 
                 <!-- exclude test files --> 
                 <exclude>**/test/**/*.eml</exclude>
@@ -147,6 +151,7 @@
                 <exclude>**/test/**/*.rtf</exclude>
                 <exclude>**/test/**/*.rules</exclude>
                 <exclude>**/test/**/*.odt</exclude>
+                <exclude>**/test/**/*.config</exclude>
               </excludes>
             </configuration>
           </plugin>

Modified: stanbol/branches/commons-ng/entityhub/query/clerezza/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/branches/commons-ng/entityhub/query/clerezza/pom.xml?rev=1533571&r1=1533570&r2=1533571&view=diff
==============================================================================
--- stanbol/branches/commons-ng/entityhub/query/clerezza/pom.xml (original)
+++ stanbol/branches/commons-ng/entityhub/query/clerezza/pom.xml Fri Oct 18 17:58:24 2013
@@ -86,6 +86,11 @@
       <artifactId>org.apache.stanbol.entityhub.core</artifactId>
       <version>1.0.0-SNAPSHOT</version>
     </dependency>
+    <dependency> <!-- generic SPARQL classes are now in this module-->
+      <groupId>org.apache.stanbol</groupId>
+      <artifactId>org.apache.stanbol.entityhub.query.sparql</artifactId>
+      <version>0.12.0-SNAPSHOT</version>
+    </dependency>
     <dependency>
       <groupId>org.apache.stanbol</groupId>
       <artifactId>org.apache.stanbol.entityhub.model.clerezza</artifactId>

Modified: stanbol/branches/commons-ng/entityhub/query/clerezza/src/main/java/org/apache/stanbol/entityhub/query/clerezza/RdfQueryResultList.java
URL: http://svn.apache.org/viewvc/stanbol/branches/commons-ng/entityhub/query/clerezza/src/main/java/org/apache/stanbol/entityhub/query/clerezza/RdfQueryResultList.java?rev=1533571&r1=1533570&r2=1533571&view=diff
==============================================================================
--- stanbol/branches/commons-ng/entityhub/query/clerezza/src/main/java/org/apache/stanbol/entityhub/query/clerezza/RdfQueryResultList.java (original)
+++ stanbol/branches/commons-ng/entityhub/query/clerezza/src/main/java/org/apache/stanbol/entityhub/query/clerezza/RdfQueryResultList.java Fri Oct 18 17:58:24 2013
@@ -22,7 +22,6 @@ import java.util.ArrayList;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.Iterator;
-import java.util.LinkedHashSet;
 import java.util.List;
 import java.util.Set;
 
@@ -50,7 +49,7 @@ public class RdfQueryResultList implemen
         this.query = query;
         this.resultGraph = resultGraph;
         List<RdfRepresentation> results = (List<RdfRepresentation>)ModelUtils.addToCollection(
-            SparqlQueryUtils.parseQueryResultsFromMGraph(resultGraph),
+            ClerezzaQueryUtils.parseQueryResultsFromMGraph(resultGraph),
             new ArrayList<RdfRepresentation>());
         //sort the list based on the score
         Collections.sort(results,RESULT_SCORE_COMPARATOR);