Author: rwesten
Date: Tue Feb 26 08:27:46 2013
New Revision: 1450067
URL: http://svn.apache.org/r1450067
Log:
STANBOL-957: Changed IndexingConfig to use '/' when loading resources from jar
files (even on Windows); Slighly refactored the unit tests initialization for
JenaTDB source and SolrYard destionation; improved logging (and included DEBUG
level logging) during Unit tests of the indexing.source.jenadbp and
indexing.destination.solryard - intended for further debuging of unit test
issues under Windows 8; Also updated indexing dependencies to the current
SNAPSHOT version
Added:
stanbol/trunk/entityhub/indexing/source/jenatdb/src/test/resources/log4j.properties
(with props)
Modified:
stanbol/trunk/entityhub/indexing/core/src/main/java/org/apache/stanbol/entityhub/indexing/core/config/IndexingConfig.java
stanbol/trunk/entityhub/indexing/dblp/pom.xml
stanbol/trunk/entityhub/indexing/dbpedia/pom.xml
stanbol/trunk/entityhub/indexing/destination/solryard/pom.xml
stanbol/trunk/entityhub/indexing/destination/solryard/src/test/java/org/apache/stanbol/entityhub/indexing/destination/solryard/SolrYardIndexingDestinationTest.java
stanbol/trunk/entityhub/indexing/genericrdf/pom.xml
stanbol/trunk/entityhub/indexing/geonames/pom.xml
stanbol/trunk/entityhub/indexing/source/jenatdb/pom.xml
stanbol/trunk/entityhub/indexing/source/jenatdb/src/main/java/org/apache/stanbol/entityhub/indexing/source/jenatdb/RdfIndexingSource.java
stanbol/trunk/entityhub/indexing/source/jenatdb/src/test/java/org/apache/stanbol/entityhub/indexing/source/jenatdb/RdfIndexingSourceTest.java
stanbol/trunk/entityhub/indexing/source/vcard/pom.xml
Modified:
stanbol/trunk/entityhub/indexing/core/src/main/java/org/apache/stanbol/entityhub/indexing/core/config/IndexingConfig.java
URL:
http://svn.apache.org/viewvc/stanbol/trunk/entityhub/indexing/core/src/main/java/org/apache/stanbol/entityhub/indexing/core/config/IndexingConfig.java?rev=1450067&r1=1450066&r2=1450067&view=diff
==============================================================================
---
stanbol/trunk/entityhub/indexing/core/src/main/java/org/apache/stanbol/entityhub/indexing/core/config/IndexingConfig.java
(original)
+++
stanbol/trunk/entityhub/indexing/core/src/main/java/org/apache/stanbol/entityhub/indexing/core/config/IndexingConfig.java
Tue Feb 26 08:27:46 2013
@@ -493,6 +493,8 @@ public class IndexingConfig {
} else { //loaded form a jar file
boolean found = false;
JarFile jar = null;
+ //when loading from a jar file we need Unix style separators
+ String unixResourcePath =
FilenameUtils.separatorsToUnix(resourcePath);
try {
jar = new JarFile(classPathRootDir);
//String resourceName = resource.getPath();
@@ -503,9 +505,10 @@ public class IndexingConfig {
while(entries.hasMoreElements() && !completed){
JarEntry entry = entries.nextElement();
String entryName = entry.getName();
- if(entryName.startsWith(resourcePath)){
+ if(entryName.startsWith(resourcePath) ||
entryName.startsWith(unixResourcePath)){
log.info("found entry :
{}[dir={}]",entryName,entry.isDirectory());
- if(entryName.equals(resourcePath) &&
!entry.isDirectory()){
+ if((entryName.equals(resourcePath) ||
entryName.equals(unixResourcePath))
+ && !entry.isDirectory()){
//found the resource and it is an file -> copy and
return
completed = true;
}
@@ -566,11 +569,12 @@ public class IndexingConfig {
* @return the URL for the resource or <code>null</code> if not found
*/
private static URL loadViaClasspath(String resource) {
+ String unixResource = FilenameUtils.separatorsToUnix(resource);
URL resourceUrl =
Thread.currentThread().getContextClassLoader().getResource(
- resource);
+ unixResource);
if(resourceUrl == null){
resourceUrl = IndexingConfig.class.getClassLoader().getResource(
- resource);
+ unixResource);
}
return resourceUrl;
}
Modified: stanbol/trunk/entityhub/indexing/dblp/pom.xml
URL:
http://svn.apache.org/viewvc/stanbol/trunk/entityhub/indexing/dblp/pom.xml?rev=1450067&r1=1450066&r2=1450067&view=diff
==============================================================================
--- stanbol/trunk/entityhub/indexing/dblp/pom.xml (original)
+++ stanbol/trunk/entityhub/indexing/dblp/pom.xml Tue Feb 26 08:27:46 2013
@@ -85,7 +85,7 @@
<dependency>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.entityhub.indexing.core</artifactId>
- <version>0.11.0</version>
+ <version>0.12.0-SNAPSHOT</version>
<scope>runtime</scope>
</dependency>
<dependency>
@@ -97,14 +97,14 @@
<dependency>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.entityhub.indexing.source.jenatdb</artifactId>
- <version>0.11.0</version>
+ <version>0.12.0-SNAPSHOT</version>
<scope>runtime</scope>
</dependency>
<!-- dependencies of the solr yard destination -->
<dependency>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.entityhub.indexing.destination.solryard</artifactId>
- <version>0.11.0</version>
+ <version>0.12.0-SNAPSHOT</version>
<scope>runtime</scope>
</dependency>
Modified: stanbol/trunk/entityhub/indexing/dbpedia/pom.xml
URL:
http://svn.apache.org/viewvc/stanbol/trunk/entityhub/indexing/dbpedia/pom.xml?rev=1450067&r1=1450066&r2=1450067&view=diff
==============================================================================
--- stanbol/trunk/entityhub/indexing/dbpedia/pom.xml (original)
+++ stanbol/trunk/entityhub/indexing/dbpedia/pom.xml Tue Feb 26 08:27:46 2013
@@ -97,24 +97,25 @@
</build>
<dependencies>
+
<!-- indexing dependencies -->
<dependency>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.entityhub.indexing.core</artifactId>
- <version>0.11.0</version>
+ <version>0.12.0-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.entityhub.indexing.source.jenatdb</artifactId>
- <version>0.11.0</version>
+ <version>0.12.0-SNAPSHOT</version>
<scope>runtime</scope>
</dependency>
<!-- dependencies of the solr yard destination -->
<dependency>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.entityhub.indexing.destination.solryard</artifactId>
- <version>0.11.0</version>
+ <version>0.12.0-SNAPSHOT</version>
<scope>runtime</scope>
</dependency>
@@ -138,7 +139,10 @@
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
- <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>commons-lang</groupId>
+ <artifactId>commons-lang</artifactId>
</dependency>
<dependency>
<groupId>org.apache.commons</groupId>
@@ -150,7 +154,6 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
- <scope>runtime</scope>
</dependency>
<dependency> <!-- we use log4j 1.2 -->
<groupId>org.slf4j</groupId>
Modified: stanbol/trunk/entityhub/indexing/destination/solryard/pom.xml
URL:
http://svn.apache.org/viewvc/stanbol/trunk/entityhub/indexing/destination/solryard/pom.xml?rev=1450067&r1=1450066&r2=1450067&view=diff
==============================================================================
--- stanbol/trunk/entityhub/indexing/destination/solryard/pom.xml (original)
+++ stanbol/trunk/entityhub/indexing/destination/solryard/pom.xml Tue Feb 26
08:27:46 2013
@@ -102,17 +102,17 @@
<dependency>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.commons.solr.core</artifactId>
- <version>0.11.0</version>
+ <version>0.12.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.entityhub.indexing.core</artifactId>
- <version>0.11.0</version>
+ <version>0.12.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.entityhub.yard.solr</artifactId>
- <version>0.11.0</version>
+ <version>0.12.0-SNAPSHOT</version>
</dependency>
<dependency>
Modified:
stanbol/trunk/entityhub/indexing/destination/solryard/src/test/java/org/apache/stanbol/entityhub/indexing/destination/solryard/SolrYardIndexingDestinationTest.java
URL:
http://svn.apache.org/viewvc/stanbol/trunk/entityhub/indexing/destination/solryard/src/test/java/org/apache/stanbol/entityhub/indexing/destination/solryard/SolrYardIndexingDestinationTest.java?rev=1450067&r1=1450066&r2=1450067&view=diff
==============================================================================
---
stanbol/trunk/entityhub/indexing/destination/solryard/src/test/java/org/apache/stanbol/entityhub/indexing/destination/solryard/SolrYardIndexingDestinationTest.java
(original)
+++
stanbol/trunk/entityhub/indexing/destination/solryard/src/test/java/org/apache/stanbol/entityhub/indexing/destination/solryard/SolrYardIndexingDestinationTest.java
Tue Feb 26 08:27:46 2013
@@ -77,8 +77,7 @@ public class SolrYardIndexingDestination
"segments.gen");
private static final Logger log =
LoggerFactory.getLogger(SolrYardIndexingDestinationTest.class);
- private static final String CONFIG_ROOT =
- FilenameUtils.separatorsToSystem("testConfigs/");
+ private static final String CONFIG_ROOT = "testConfigs";
/**
* mvn copies the resources in "src/test/resources" to target/test-classes.
* This folder is than used as classpath.<p>
@@ -86,7 +85,7 @@ public class SolrYardIndexingDestination
* {@link IndexingConfig}.
*/
private static final String TEST_ROOT =
- FilenameUtils.separatorsToSystem("/target/test-files");
+ FilenameUtils.separatorsToSystem("target/test-files");
private static String userDir;
private static String testRoot;
/**
@@ -100,7 +99,7 @@ public class SolrYardIndexingDestination
}
//store the current user.dir
userDir = System.getProperty("user.dir");
- testRoot = baseDir+TEST_ROOT;
+ testRoot = FilenameUtils.concat(baseDir,TEST_ROOT);
log.info("ConfigTest Root : "+testRoot);
//set the user.dir to the testRoot (needed to test loading of missing
//configurations via classpath
@@ -123,12 +122,16 @@ public class SolrYardIndexingDestination
}
@Test(expected=IllegalArgumentException.class)
public void testMissingBoostConfig(){
- IndexingConfig config = new
IndexingConfig(CONFIG_ROOT+"missingBoostConfig",CONFIG_ROOT+"missingBoostConfig"){};
+ String testName = "missingBoostConfig";
+ IndexingConfig config = new
IndexingConfig(CONFIG_ROOT+File.separatorChar+testName,
+ CONFIG_ROOT+'/'+testName){};
config.getIndexingDestination();
}
@Test(expected=IllegalArgumentException.class)
public void testInvalidBoostConfig(){
- IndexingConfig config = new
IndexingConfig(CONFIG_ROOT+"invalidBoostConfig",CONFIG_ROOT+"invalidBoostConfig"){};
+ String testName = "invalidBoostConfig";
+ IndexingConfig config = new
IndexingConfig(CONFIG_ROOT+File.separatorChar+testName,
+ CONFIG_ROOT+'/'+testName){};
config.getIndexingDestination();
}
/**
@@ -137,7 +140,9 @@ public class SolrYardIndexingDestination
*/
@Test(expected=IllegalArgumentException.class)
public void testMissingDefaultSolrSchemaConfig(){
- IndexingConfig config = new
IndexingConfig(CONFIG_ROOT+"missingDefaultSolrConf",CONFIG_ROOT+"missingDefaultSolrConf"){};
+ String testName = "missingDefaultSolrConf";
+ IndexingConfig config = new
IndexingConfig(CONFIG_ROOT+File.separatorChar+testName,
+ CONFIG_ROOT+'/'+testName){};
config.getIndexingDestination();
}
/**
@@ -146,17 +151,23 @@ public class SolrYardIndexingDestination
*/
@Test(expected=IllegalArgumentException.class)
public void testMissingSolrSchemaConfig(){
- IndexingConfig config = new
IndexingConfig(CONFIG_ROOT+"missingSolrConf",CONFIG_ROOT+"missingSolrConf"){};
+ String testName = "missingSolrConf";
+ IndexingConfig config = new
IndexingConfig(CONFIG_ROOT+File.separatorChar+testName,
+ CONFIG_ROOT+'/'+testName){};
config.getIndexingDestination();
}
@Test
public void testSimple() throws YardException, IOException {
- IndexingConfig config = new
IndexingConfig(CONFIG_ROOT+"simple",CONFIG_ROOT+"simple"){};
+ String testName = "simple";
+ IndexingConfig config = new
IndexingConfig(CONFIG_ROOT+File.separatorChar+testName,
+ CONFIG_ROOT+'/'+testName){};
validateSolrDestination(config);
}
@Test
public void testWithSolrConf() throws YardException, IOException {
- IndexingConfig config = new
IndexingConfig(CONFIG_ROOT+"withSolrConf",CONFIG_ROOT+"withSolrConf"){};
+ String testName = "withSolrConf";
+ IndexingConfig config = new
IndexingConfig(CONFIG_ROOT+File.separatorChar+testName,
+ CONFIG_ROOT+'/'+testName){};
validateSolrDestination(config);
}
@@ -198,10 +209,11 @@ public class SolrYardIndexingDestination
Set<String> expected = new
HashSet<String>(EXPECTED_INDEX_ARCHIVE_FILE_NAMES);
for(Enumeration<? extends ZipEntry> entries =
archive.entries();entries.hasMoreElements();){
ZipEntry entry = entries.nextElement();
- log.info("Validate Entry : "+entry.getName());
//the name of the index MUST be the root folder within the Archive!
assertTrue(entry.getName().startsWith(config.getName()));
- expected.remove(FilenameUtils.getName(entry.getName()));
+ if(expected.remove(FilenameUtils.getName(entry.getName()))){
+ log.info("found expected Entry '{}'",entry.getName());
+ }
}
assertTrue("missing Files in index archive:
"+expected,expected.isEmpty());
Modified: stanbol/trunk/entityhub/indexing/genericrdf/pom.xml
URL:
http://svn.apache.org/viewvc/stanbol/trunk/entityhub/indexing/genericrdf/pom.xml?rev=1450067&r1=1450066&r2=1450067&view=diff
==============================================================================
--- stanbol/trunk/entityhub/indexing/genericrdf/pom.xml (original)
+++ stanbol/trunk/entityhub/indexing/genericrdf/pom.xml Tue Feb 26 08:27:46 2013
@@ -87,7 +87,7 @@
<dependency>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.entityhub.indexing.core</artifactId>
- <version>0.11.0</version>
+ <version>0.12.0-SNAPSHOT</version>
<scope>runtime</scope>
</dependency>
@@ -140,7 +140,7 @@
<dependency>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.entityhub.indexing.source.jenatdb</artifactId>
- <version>0.11.0</version>
+ <version>0.12.0-SNAPSHOT</version>
<scope>runtime</scope>
</dependency>
@@ -149,14 +149,14 @@
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.entityhub.indexing.source.vcard</artifactId>
<version>0.11.0</version>
- <scope>runtime</scope>
+ <scope>0.12.0-SNAPSHOT</scope>
</dependency>
<!-- dependencies of the solr yard destination -->
<dependency>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.entityhub.indexing.destination.solryard</artifactId>
- <version>0.11.0</version>
+ <version>0.12.0-SNAPSHOT</version>
<scope>runtime</scope>
</dependency>
</dependencies>
Modified: stanbol/trunk/entityhub/indexing/geonames/pom.xml
URL:
http://svn.apache.org/viewvc/stanbol/trunk/entityhub/indexing/geonames/pom.xml?rev=1450067&r1=1450066&r2=1450067&view=diff
==============================================================================
--- stanbol/trunk/entityhub/indexing/geonames/pom.xml (original)
+++ stanbol/trunk/entityhub/indexing/geonames/pom.xml Tue Feb 26 08:27:46 2013
@@ -101,7 +101,7 @@
<dependency>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.entityhub.indexing.core</artifactId>
- <version>0.11.0</version>
+ <version>0.12.0-SNAPSHOT</version>
</dependency>
<!-- runtime dependencies for the standalone tool -->
@@ -131,7 +131,7 @@
<dependency> <!-- we want to use the SolrYard as target -->
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.entityhub.indexing.destination.solryard</artifactId>
- <version>0.11.0</version>
+ <version>0.12.0-SNAPSHOT</version>
<scope>runtime</scope>
</dependency>
Modified: stanbol/trunk/entityhub/indexing/source/jenatdb/pom.xml
URL:
http://svn.apache.org/viewvc/stanbol/trunk/entityhub/indexing/source/jenatdb/pom.xml?rev=1450067&r1=1450066&r2=1450067&view=diff
==============================================================================
--- stanbol/trunk/entityhub/indexing/source/jenatdb/pom.xml (original)
+++ stanbol/trunk/entityhub/indexing/source/jenatdb/pom.xml Tue Feb 26 08:27:46
2013
@@ -98,7 +98,7 @@
<dependency>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.entityhub.indexing.core</artifactId>
- <version>0.11.0</version>
+ <version>0.12.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.stanbol</groupId>
@@ -133,9 +133,14 @@
<artifactId>arq</artifactId>
</dependency>
<!-- dependencies for testing -->
- <dependency>
+ <dependency> <!-- used for debug level logging during tests -->
<groupId>org.slf4j</groupId>
- <artifactId>slf4j-simple</artifactId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
<scope>test</scope>
</dependency>
<dependency>
Modified:
stanbol/trunk/entityhub/indexing/source/jenatdb/src/main/java/org/apache/stanbol/entityhub/indexing/source/jenatdb/RdfIndexingSource.java
URL:
http://svn.apache.org/viewvc/stanbol/trunk/entityhub/indexing/source/jenatdb/src/main/java/org/apache/stanbol/entityhub/indexing/source/jenatdb/RdfIndexingSource.java?rev=1450067&r1=1450066&r2=1450067&view=diff
==============================================================================
---
stanbol/trunk/entityhub/indexing/source/jenatdb/src/main/java/org/apache/stanbol/entityhub/indexing/source/jenatdb/RdfIndexingSource.java
(original)
+++
stanbol/trunk/entityhub/indexing/source/jenatdb/src/main/java/org/apache/stanbol/entityhub/indexing/source/jenatdb/RdfIndexingSource.java
Tue Feb 26 08:27:46 2013
@@ -312,7 +312,7 @@ public class RdfIndexingSource extends A
Var o = Var.alloc(valueVar);
while (rs.hasNext()){
Binding b = rs.nextBinding();
- log.info("{} {} {}",new Object[]{b.get(s),b.get(p),b.get(o)});
+ log.debug("{} {} {}",new Object[]{b.get(s),b.get(p),b.get(o)});
}
}
Modified:
stanbol/trunk/entityhub/indexing/source/jenatdb/src/test/java/org/apache/stanbol/entityhub/indexing/source/jenatdb/RdfIndexingSourceTest.java
URL:
http://svn.apache.org/viewvc/stanbol/trunk/entityhub/indexing/source/jenatdb/src/test/java/org/apache/stanbol/entityhub/indexing/source/jenatdb/RdfIndexingSourceTest.java?rev=1450067&r1=1450066&r2=1450067&view=diff
==============================================================================
---
stanbol/trunk/entityhub/indexing/source/jenatdb/src/test/java/org/apache/stanbol/entityhub/indexing/source/jenatdb/RdfIndexingSourceTest.java
(original)
+++
stanbol/trunk/entityhub/indexing/source/jenatdb/src/test/java/org/apache/stanbol/entityhub/indexing/source/jenatdb/RdfIndexingSourceTest.java
Tue Feb 26 08:27:46 2013
@@ -46,8 +46,7 @@ public class RdfIndexingSourceTest {
private static final long NUMBER_OF_ENTITIES_EXPECTED = 5;
- private static final String CONFIG_ROOT =
- FilenameUtils.separatorsToSystem("testConfigs/");
+ private static final String CONFIG_ROOT = "testConfigs";
/**
* mvn copies the resources in "src/test/resources" to target/test-classes.
* This folder is than used as classpath.<p>
@@ -55,7 +54,7 @@ public class RdfIndexingSourceTest {
* {@link IndexingConfig}.
*/
private static final String TEST_ROOT =
- FilenameUtils.separatorsToSystem("/target/test-files");
+ FilenameUtils.separatorsToSystem("target/test-files");
private static String userDir;
private static String testRoot;
/**
@@ -69,7 +68,7 @@ public class RdfIndexingSourceTest {
}
//store the current user.dir
userDir = System.getProperty("user.dir");
- testRoot = baseDir+TEST_ROOT;
+ testRoot = FilenameUtils.concat(baseDir, TEST_ROOT);
log.info("ConfigTest Root : "+testRoot);
//set the user.dir to the testRoot (needed to test loading of missing
//configurations via classpath
@@ -77,7 +76,7 @@ public class RdfIndexingSourceTest {
System.setProperty("user.dir", testRoot);
//we need also to delete results of previous runs of the test
- File testConfigs = new File(testRoot,"testConfigs");
+ File testConfigs = new File(testRoot,CONFIG_ROOT);
if(testConfigs.exists()){
log.info(" ... clean old test data");
for(File testConfig : testConfigs.listFiles()){
@@ -120,7 +119,10 @@ public class RdfIndexingSourceTest {
}
@Test
public void testEntityDataIterable(){
- IndexingConfig config = new
IndexingConfig(CONFIG_ROOT+"iterable",CONFIG_ROOT+"iterable"){};
+ log.info(" --- testEntityDataIterable ---");
+ String testName = "iterable";
+ IndexingConfig config = new
IndexingConfig(CONFIG_ROOT+File.separatorChar+testName,
+ CONFIG_ROOT+'/'+testName){};
EntityDataIterable iterable = config.getDataIterable();
assertNotNull(iterable);
assertEquals(iterable.getClass(), RdfIndexingSource.class);
@@ -144,7 +146,10 @@ public class RdfIndexingSourceTest {
}
@Test
public void testEntityDataProvider(){
- IndexingConfig config = new
IndexingConfig(CONFIG_ROOT+"provider",CONFIG_ROOT+"provider"){};
+ log.info(" --- testEntityDataProvider ---");
+ String testName = "provider";
+ IndexingConfig config = new
IndexingConfig(CONFIG_ROOT+File.separatorChar+testName,
+ CONFIG_ROOT+'/'+testName){};
EntityIterator entityIdIterator = config.getEntityIdIterator();
assertNotNull("Unable to perform test whithout
EntityIterator",entityIdIterator);
if(entityIdIterator.needsInitialisation()){
@@ -174,7 +179,10 @@ public class RdfIndexingSourceTest {
*/
@Test
public void testQuadsImport(){
- IndexingConfig config = new
IndexingConfig(CONFIG_ROOT+"quads",CONFIG_ROOT+"quads"){};
+ log.info(" --- testQuadsImport ---");
+ String testName = "quads";
+ IndexingConfig config = new
IndexingConfig(CONFIG_ROOT+File.separatorChar+testName,
+ CONFIG_ROOT+'/'+testName){};
EntityIterator entityIdIterator = config.getEntityIdIterator();
assertNotNull("Unable to perform test whithout
EntityIterator",entityIdIterator);
if(entityIdIterator.needsInitialisation()){
@@ -202,13 +210,16 @@ public class RdfIndexingSourceTest {
}
@Test
public void testBNodeSupport(){
- IndexingConfig config = new
IndexingConfig(CONFIG_ROOT+"bnode",CONFIG_ROOT+"bnode"){};
+ log.info(" --- testBNodeSupport ---");
+ String testName = "bnode";
+ IndexingConfig config = new
IndexingConfig(CONFIG_ROOT+File.separatorChar+testName,
+ CONFIG_ROOT+'/'+testName){};
EntityDataIterable iterable = config.getDataIterable();
assertNotNull(iterable);
assertEquals(iterable.getClass(), RdfIndexingSource.class);
assertTrue(iterable.needsInitialisation());
iterable.initialise();
- ((RdfIndexingSource)iterable).debug();
+ //((RdfIndexingSource)iterable).debug();
EntityDataIterator it = iterable.entityDataIterator();
long count = 0;
while(it.hasNext()){
Added:
stanbol/trunk/entityhub/indexing/source/jenatdb/src/test/resources/log4j.properties
URL:
http://svn.apache.org/viewvc/stanbol/trunk/entityhub/indexing/source/jenatdb/src/test/resources/log4j.properties?rev=1450067&view=auto
==============================================================================
---
stanbol/trunk/entityhub/indexing/source/jenatdb/src/test/resources/log4j.properties
(added)
+++
stanbol/trunk/entityhub/indexing/source/jenatdb/src/test/resources/log4j.properties
Tue Feb 26 08:27:46 2013
@@ -0,0 +1,24 @@
+# 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.
+
+# Root logger option
+log4j.rootLogger=INFO, stdout
+
+# Direct log messages to stdout
+log4j.appender.stdout=org.apache.log4j.ConsoleAppender
+log4j.appender.stdout.Target=System.out
+log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
+log4j.appender.stdout.layout.ConversionPattern=%d{ABSOLUTE} %5p %c{1}:%L - %m%n
+log4j.logger.org.apache.stanbol.entityhub.indexing=DEBUG
\ No newline at end of file
Propchange:
stanbol/trunk/entityhub/indexing/source/jenatdb/src/test/resources/log4j.properties
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: stanbol/trunk/entityhub/indexing/source/vcard/pom.xml
URL:
http://svn.apache.org/viewvc/stanbol/trunk/entityhub/indexing/source/vcard/pom.xml?rev=1450067&r1=1450066&r2=1450067&view=diff
==============================================================================
--- stanbol/trunk/entityhub/indexing/source/vcard/pom.xml (original)
+++ stanbol/trunk/entityhub/indexing/source/vcard/pom.xml Tue Feb 26 08:27:46
2013
@@ -75,7 +75,7 @@
<dependency>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.entityhub.indexing.core</artifactId>
- <version>0.11.0</version>
+ <version>0.12.0-SNAPSHOT</version>
</dependency>
<dependency>
