Modified: incubator/stanbol/trunk/entityhub/ldpath/pom.xml URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/entityhub/ldpath/pom.xml?rev=1235206&r1=1235205&r2=1235206&view=diff ============================================================================== --- incubator/stanbol/trunk/entityhub/ldpath/pom.xml (original) +++ incubator/stanbol/trunk/entityhub/ldpath/pom.xml Tue Jan 24 11:25:34 2012 @@ -35,9 +35,6 @@ </developerConnection> <url>http://incubator.apache.org/stanbol</url> </scm> - <properties> - <ldpath.version>0.9.3-SNAPSHOT</ldpath.version> - </properties> <build> <!-- make it an OSGi bundle --> @@ -52,48 +49,11 @@ org.apache.stanbol.entityhub.ldpath;version=${project.version}, org.apache.stanbol.entityhub.ldpath.backend;version=${project.version}, org.apache.stanbol.entityhub.ldpath.query;version=${project.version}, - org.apache.stanbol.entityhub.ldpath.transformer;version=${project.version}, - at.newmedialab.ldpath;version=${ldpath.version}, - at.newmedialab.ldpath.api;version=${ldpath.version}, - at.newmedialab.ldpath.api.backend;version=${ldpath.version}, - at.newmedialab.ldpath.api.functions;version=${ldpath.version}, - at.newmedialab.ldpath.api.selectors;version=${ldpath.version}, - at.newmedialab.ldpath.api.transformers;version=${ldpath.version}, - at.newmedialab.ldpath.model;version=${ldpath.version}, - at.newmedialab.ldpath.model.backend;version=${ldpath.version}, - at.newmedialab.ldpath.model.fields;version=${ldpath.version}, - at.newmedialab.ldpath.model.functions;version=${ldpath.version}, - at.newmedialab.ldpath.model.programs;version=${ldpath.version}, - at.newmedialab.ldpath.model.selectors;version=${ldpath.version}, - at.newmedialab.ldpath.model.transformers;version=${ldpath.version}, - at.newmedialab.ldpath.util;version=${ldpath.version}, - at.newmedialab.ldpath.exception;version=${ldpath.version} + org.apache.stanbol.entityhub.ldpath.transformer;version=${project.version} </Export-Package> <Private-Package> org.apache.stanbol.entityhub.ldpath.impl;version=${project.version} </Private-Package> - <!-- - excludes - * ANT for htmlcleaner - * some sun.** private APIs referenced by guava - --> - <Import-Package> - !sun.misc, - !org.apache.tools.ant.*, - !org.apache.tools.bzip2, - !org.apache.tools.mail, - !org.apache.tools.tar, - !org.apache.tools.zip, - * - </Import-Package> - <!-- - Embeds ldPath, guava and htmlcleaner - JDOM is an own Bundle - --> - <Embed-Dependency> - ldpath-api, ldpath-core, - guava, htmlcleaner, - </Embed-Dependency> </instructions> </configuration> </plugin> @@ -104,33 +64,18 @@ </plugins> </build> - <repositories> - <repository> - <id>kiwi-project_SNAPSHOTS</id> <!-- Hosts LDPath SNAPSHOT bundles for now --> - <name>Kiwi Project SNAPSHOTS Repository</name> - <url>http://devel.kiwi-project.eu:8080/nexus/content/repositories/snapshots/</url> - </repository> - <repository> - <id>kiwi-project</id> <!-- Hosts LDPath releases bundles for now --> - <name>Kiwi Project Repository</name> - <url>http://devel.kiwi-project.eu:8080/nexus/content/repositories/releases/</url> - </repository> - </repositories> - <dependencies> <!-- LD Path --> <dependency> <groupId>at.newmedialab.ldpath</groupId> <artifactId>ldpath-api</artifactId> - <version>${ldpath.version}</version> </dependency> <dependency> <groupId>at.newmedialab.ldpath</groupId> - <artifactId>ldpath-core</artifactId> - <version>${ldpath.version}</version> + <artifactId>ldpath-core-bundle</artifactId> </dependency> <!-- additional LD Path dependencies --> - <dependency> +<!-- <dependency> <groupId>com.google.guava</groupId> <artifactId>guava</artifactId> <version>10.0.1</version> @@ -143,7 +88,7 @@ <dependency> <groupId>org.jdom</groupId> <artifactId>com.springsource.org.jdom</artifactId> - </dependency> + </dependency> --> <!-- dependencies on other Entityhub modules --> <dependency> <groupId>org.apache.stanbol</groupId>
Modified: incubator/stanbol/trunk/entityhub/ldpath/src/main/java/org/apache/stanbol/entityhub/ldpath/EntityhubLDPath.java URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/entityhub/ldpath/src/main/java/org/apache/stanbol/entityhub/ldpath/EntityhubLDPath.java?rev=1235206&r1=1235205&r2=1235206&view=diff ============================================================================== --- incubator/stanbol/trunk/entityhub/ldpath/src/main/java/org/apache/stanbol/entityhub/ldpath/EntityhubLDPath.java (original) +++ incubator/stanbol/trunk/entityhub/ldpath/src/main/java/org/apache/stanbol/entityhub/ldpath/EntityhubLDPath.java Tue Jan 24 11:25:34 2012 @@ -34,7 +34,6 @@ import at.newmedialab.ldpath.api.backend import at.newmedialab.ldpath.api.transformers.NodeTransformer; import at.newmedialab.ldpath.model.fields.FieldMapping; import at.newmedialab.ldpath.model.programs.Program; -import at.newmedialab.ldpath.parser.Configuration; import at.newmedialab.ldpath.parser.DefaultConfiguration; /** Modified: incubator/stanbol/trunk/integration-tests/pom.xml URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/integration-tests/pom.xml?rev=1235206&r1=1235205&r2=1235206&view=diff ============================================================================== --- incubator/stanbol/trunk/integration-tests/pom.xml (original) +++ incubator/stanbol/trunk/integration-tests/pom.xml Tue Jan 24 11:25:34 2012 @@ -49,7 +49,7 @@ <test.server.url></test.server.url> <!-- Options for the VM that executes our runnable jar --> - <jar.executor.vm.options>-Xmx512m -Dorg.apache.stanbol.offline.mode=true</jar.executor.vm.options> + <jar.executor.vm.options>-Xmx512m -Dorg.apache.stanbol.offline.mode=true -Dorg.apache.sling.commons.log.level=DEBUG</jar.executor.vm.options> <!-- Set this to true to keep the runnable jar running - useful to debug tests --> <keepJarRunning>false</keepJarRunning> @@ -164,7 +164,7 @@ </systemPropertyVariables> <excludes> <!-- TODO: remove before commit --> - <exclude>**/enhancer/it/*.java</exclude> + <!-- <exclude>**/enhancer/it/*.java</exclude> --> <exclude>**/ontologymanager/web/it/*.java</exclude> </excludes> </configuration> Modified: incubator/stanbol/trunk/integration-tests/src/test/java/org/apache/stanbol/commons/httpqueryheaders/it/HttpQueryHeaderPostTest.java URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/integration-tests/src/test/java/org/apache/stanbol/commons/httpqueryheaders/it/HttpQueryHeaderPostTest.java?rev=1235206&r1=1235205&r2=1235206&view=diff ============================================================================== --- incubator/stanbol/trunk/integration-tests/src/test/java/org/apache/stanbol/commons/httpqueryheaders/it/HttpQueryHeaderPostTest.java (original) +++ incubator/stanbol/trunk/integration-tests/src/test/java/org/apache/stanbol/commons/httpqueryheaders/it/HttpQueryHeaderPostTest.java Tue Jan 24 11:25:34 2012 @@ -16,7 +16,7 @@ */ package org.apache.stanbol.commons.httpqueryheaders.it; -import static org.apache.stanbol.enhancer.it.StatelessEngineTest.ACCEPT_FORMAT_TEST_DATA; +import static org.apache.stanbol.enhancer.it.DefaultChainTest.ACCEPT_FORMAT_TEST_DATA; import org.apache.http.client.methods.HttpPost; import org.apache.stanbol.enhancer.it.EnhancerTestBase; @@ -29,7 +29,7 @@ public class HttpQueryHeaderPostTest ext for (int i = 0; i < ACCEPT_FORMAT_TEST_DATA.length; i += 3) { executor.execute( builder.buildOtherRequest(new HttpPost( - builder.buildUrl("/engines", + builder.buildUrl(getEndpoint(), "header_Accept",ACCEPT_FORMAT_TEST_DATA[i]))) .withContent("Nothing") ) @@ -44,7 +44,7 @@ public class HttpQueryHeaderPostTest ext for (int i = 0; i < ACCEPT_FORMAT_TEST_DATA.length; i += 3) { executor.execute( builder.buildOtherRequest(new HttpPost( - builder.buildUrl("/engines", + builder.buildUrl(getEndpoint(), "header_Accept",ACCEPT_FORMAT_TEST_DATA[i]))) //use an other Accept header .withHeader("Accept", ACCEPT_FORMAT_TEST_DATA[(i+3)%ACCEPT_FORMAT_TEST_DATA.length]) @@ -60,7 +60,7 @@ public class HttpQueryHeaderPostTest ext public void testRemoveAccept() throws Exception { executor.execute( builder.buildOtherRequest(new HttpPost( - builder.buildUrl("/engines", + builder.buildUrl(getEndpoint(), "header_Accept",""))) //override the parse Accept Header .withHeader("Accept","text/turtle") //set Accept to turtle (overridden) .withContent("John Smith was born in London. But since ten years he " + Modified: incubator/stanbol/trunk/integration-tests/src/test/java/org/apache/stanbol/enhancer/it/BenchmarkTest.java URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/integration-tests/src/test/java/org/apache/stanbol/enhancer/it/BenchmarkTest.java?rev=1235206&r1=1235205&r2=1235206&view=diff ============================================================================== --- incubator/stanbol/trunk/integration-tests/src/test/java/org/apache/stanbol/enhancer/it/BenchmarkTest.java (original) +++ incubator/stanbol/trunk/integration-tests/src/test/java/org/apache/stanbol/enhancer/it/BenchmarkTest.java Tue Jan 24 11:25:34 2012 @@ -24,12 +24,22 @@ public class BenchmarkTest extends Enhan final String BENCHMARK = "= INPUT = \n" - + "Bob Marley was born in Kingston, Jamaica. \n" + + "Bob Marley was born in Kingston, Jamaica. Marley's music was heavily " + + "influenced by the social issues of his homeland.\n" + "= EXPECT = \n" + "Description: Jamaica must be found \n" - + "http://fise.iks-project.eu/ontology/entity-reference URI http://dbpedia.org/resource/Jamaica"; + + "http://fise.iks-project.eu/ontology/entity-reference URI http://dbpedia.org/resource/Jamaica\n"; + + "\n" + + "Description: Bob Marley must be found as a musical artist\n" + + "http://fise.iks-project.eu/ontology/entity-type URI http://dbpedia.org/ontology/MusicalArtist\n"; + + "http://fise.iks-project.eu/ontology/entity-reference URI http://dbpedia.org/resource/Bob_Marley\n"; + + "\n" + + "= COMPLAIN =\n" + + "Description: Miles Davis must not be found\n" + + "http://fise.iks-project.eu/ontology/entity-type URI http://dbpedia.org/ontology/MusicalArtist\n"; + + "http://fise.iks-project.eu/ontology/entity-reference URI http://dbpedia.org/resource/Miles_Davis\n"; ; - + @Test public void testBenchmark() throws Exception { executor.execute( Copied: incubator/stanbol/trunk/integration-tests/src/test/java/org/apache/stanbol/enhancer/it/DefaultChainTest.java (from r1229152, incubator/stanbol/trunk/integration-tests/src/test/java/org/apache/stanbol/enhancer/it/StatelessEngineTest.java) URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/integration-tests/src/test/java/org/apache/stanbol/enhancer/it/DefaultChainTest.java?p2=incubator/stanbol/trunk/integration-tests/src/test/java/org/apache/stanbol/enhancer/it/DefaultChainTest.java&p1=incubator/stanbol/trunk/integration-tests/src/test/java/org/apache/stanbol/enhancer/it/StatelessEngineTest.java&r1=1229152&r2=1235206&rev=1235206&view=diff ============================================================================== --- incubator/stanbol/trunk/integration-tests/src/test/java/org/apache/stanbol/enhancer/it/StatelessEngineTest.java (original) +++ incubator/stanbol/trunk/integration-tests/src/test/java/org/apache/stanbol/enhancer/it/DefaultChainTest.java Tue Jan 24 11:25:34 2012 @@ -19,8 +19,9 @@ package org.apache.stanbol.enhancer.it; import org.apache.stanbol.commons.testing.http.RequestDocumentor; import org.junit.Test; -/** Test the stateless text enhancement engines */ -public class StatelessEngineTest extends EnhancerTestBase { +/** Test that the default chain is called by requesting the "/enhancer" endpoint. */ +public class DefaultChainTest extends EnhancerTestBase { + private final RequestDocumentor documentor = new RequestDocumentor(getClass().getName()); /** @@ -49,10 +50,20 @@ public class StatelessEngineTest extends "<urn:enhancement.*www.w3.org/1999/02/22-rdf-syntax-ns#type.*ontology/TextAnnotation>", }; + public DefaultChainTest(){ + super(); + } + protected DefaultChainTest(String endpoint){ + super(endpoint); + } + protected DefaultChainTest(String endpoint,String...assertEngines){ + super(endpoint,assertEngines); + } + @Test public void testSimpleEnhancement() throws Exception { executor.execute( - builder.buildPostRequest("/engines") + builder.buildPostRequest(getEndpoint()) .withHeader("Accept","text/rdf+nt") .withContent("The Stanbol enhancer can detect famous cities such as Paris and people such as Bob Marley.") ) @@ -79,7 +90,7 @@ public class StatelessEngineTest extends public void testOutputFormats() throws Exception { for (int i = 0; i < ACCEPT_FORMAT_TEST_DATA.length; i += 3) { executor.execute( - builder.buildPostRequest("/engines") + builder.buildPostRequest(getEndpoint()) .withHeader("Accept", ACCEPT_FORMAT_TEST_DATA[i]) .withContent("Nothing") ) @@ -96,7 +107,7 @@ public class StatelessEngineTest extends @Test public void testInvalidFormat() throws Exception { executor.execute( - builder.buildPostRequest("/engines") + builder.buildPostRequest(getEndpoint()) .withHeader("Accept", "INVALID_FORMAT") .withContent("Nothing") ) Propchange: incubator/stanbol/trunk/integration-tests/src/test/java/org/apache/stanbol/enhancer/it/DefaultChainTest.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: incubator/stanbol/trunk/integration-tests/src/test/java/org/apache/stanbol/enhancer/it/DefaultChainTest.java ------------------------------------------------------------------------------ svn:keywords = Author Date Id Revision Rev URL Modified: incubator/stanbol/trunk/integration-tests/src/test/java/org/apache/stanbol/enhancer/it/EnhancerTestBase.java URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/integration-tests/src/test/java/org/apache/stanbol/enhancer/it/EnhancerTestBase.java?rev=1235206&r1=1235205&r2=1235206&view=diff ============================================================================== --- incubator/stanbol/trunk/integration-tests/src/test/java/org/apache/stanbol/enhancer/it/EnhancerTestBase.java (original) +++ incubator/stanbol/trunk/integration-tests/src/test/java/org/apache/stanbol/enhancer/it/EnhancerTestBase.java Tue Jan 24 11:25:34 2012 @@ -30,15 +30,97 @@ import org.junit.Before; */ public class EnhancerTestBase extends StanbolTestBase { + + private final Logger log = LoggerFactory.getLogger(getClass()); // TODO configurable via system properties?? public static final int ENGINES_TIMEOUT_SECONDS = 60; public static final int WAIT_BETWEEN_TRIES_MSEC = 1000; - static boolean enginesReady; - static boolean timedOut; + boolean enginesReady; + boolean timedOut; + + protected final String endpoint; + /* List of expected engines could be made configurable via system + * properties, but we don't expect it to change often. + */ + protected final String[] assertEngines; + + /** + * The "/enhancer" endpoint" + */ + public static final String ENHANCER_ENDPOINT = "/enhancer"; + /** + * The default endpoint + * @see #ENHANCER_ENDPOINT + */ + public static final String DEFAULT_ENDPOINT = ENHANCER_ENDPOINT; + /** + * The "/engines" endpoint the only endpoint supported to enhance + * content items before STANBOL-431. This endpoint is still supported + */ + public static final String ENGINES_ENDPOINT = "/engines"; + /** + * The root for the endpoints of specific enhancement chains + * @see #getChainEndpoint(String) + */ + private static final String CHAINS_ROOT = "/enhancer/chain/"; + + private static final String[] DEFAULT_ASSERT_ENGINES = + new String[]{ + "metaxa","MetaxaEngine", + "langid","LangIdEnhancementEngine", + "ner","NamedEntityExtractionEnhancementEngine", + "entityhubLinking","NamedEntityTaggingEngine", + "dbpediaLinking","NamedEntityTaggingEngine" + }; + /** + * Getter for the Endpoint for a specific enhancement chain + * @param chainName the name of the chain + * @return the endpoint + * @throws IllegalArgumentException if the parsed chain is <code>null</code> + * or invalid + */ + public static final String getChainEndpoint(String chainName){ + if(chainName == null || chainName.isEmpty()){ + throw new IllegalArgumentException("The parsed Chain name MUST NOT BE NULL nor empty!"); + } + if(chainName.charAt(0) == '/'){ + if(chainName.length()<2){ + throw new IllegalArgumentException("The parsed Chain name '/' is invalid!"); + } + return CHAINS_ROOT+chainName.substring(1); + } else { + return CHAINS_ROOT+chainName; + } + } + public EnhancerTestBase(){ + this(null, (String[])null); + } + public EnhancerTestBase(String endpoint){ + this(endpoint,(String[])null); + } + public EnhancerTestBase(String endpoint,String...assertEngines){ + super(); + if(endpoint == null){ + endpoint = DEFAULT_ENDPOINT; + } + if(endpoint.charAt(0) != '/') + this.endpoint = "/"+endpoint; + else{ + this.endpoint = endpoint; + } + if(assertEngines == null){ + this.assertEngines = DEFAULT_ASSERT_ENGINES; + } else { + this.assertEngines = assertEngines; + } + } + public String getEndpoint(){ + return endpoint; + } @Before public void checkEnginesReady() throws Exception { @@ -58,21 +140,13 @@ public class EnhancerTestBase extends St @Override public boolean isTrue() throws Exception { - /* List of expected engines could be made configurable via system - * properties, but we don't expect it to change often. - */ executor.execute( - builder.buildGetRequest("/engines") - .withHeader("Accept", "text/html") + builder.buildGetRequest(endpoint) + .withHeader("Accept", "text/html") ) .assertStatus(200) .assertContentType("text/html") - .assertContentRegexp( - "org.apache.stanbol.*MetaxaEngine", - "org.apache.stanbol.*LangIdEnhancementEngine", - "org.apache.stanbol.*NamedEntityExtractionEnhancementEngine", - "org.apache.stanbol.*NamedEntityTaggingEngine" - ); + .assertContentRegexp(assertEngines); /* List of expected referencedSites could also be made * configurable via system properties, but we don't expect it @@ -87,13 +161,14 @@ public class EnhancerTestBase extends St .assertContentRegexp( "http:\\\\/\\\\/.*\\\\/entityhub\\\\/site\\\\/dbpedia\\\\/" ); - log.info("Enhancement engines checked, all present"); + log.info("Enhancement engines checked for '{}', all present", endpoint); return true; } @Override public String getDescription() { - return "Checking that all enhancement engines are ready"; + return String.format("Checking that all enhancement engines for " + + "endpoint '%s' are ready",endpoint); } }; Added: incubator/stanbol/trunk/integration-tests/src/test/java/org/apache/stanbol/enhancer/it/LanguageChainTest.java URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/integration-tests/src/test/java/org/apache/stanbol/enhancer/it/LanguageChainTest.java?rev=1235206&view=auto ============================================================================== --- incubator/stanbol/trunk/integration-tests/src/test/java/org/apache/stanbol/enhancer/it/LanguageChainTest.java (added) +++ incubator/stanbol/trunk/integration-tests/src/test/java/org/apache/stanbol/enhancer/it/LanguageChainTest.java Tue Jan 24 11:25:34 2012 @@ -0,0 +1,32 @@ +package org.apache.stanbol.enhancer.it; + +import org.junit.Test; + +public class LanguageChainTest extends EnhancerTestBase { + + public LanguageChainTest() { + super(getChainEndpoint("language"), + "langid","LangIdEnhancementEngine"); + } + + + @Test + public void testSimpleEnhancement() throws Exception { + executor.execute( + builder.buildPostRequest(getEndpoint()) + .withHeader("Accept","text/rdf+nt") + .withContent("This Stanbol chain does not detect detect famous cities " + + "such as Paris and people such as Bob Marley because it only" + + "includes Engines that detect the langauge of the parsed text!") + ) + .assertStatus(200) + .assertContentRegexp( // it MUST detect the language + "http://purl.org/dc/terms/creator.*LangIdEnhancementEngine";, + "http://purl.org/dc/terms/language.*en";) + .assertContentRegexp(false, //MUST NOT contain because NER is not in this chain + "http://fise.iks-project.eu/ontology/entity-label.*Paris";, //No entitylinking + "http://purl.org/dc/terms/creator.*org.apache.stanbol.enhancer.engines.opennlp.*EngineCore";, + "http://fise.iks-project.eu/ontology/entity-label.*Bob Marley"); + + } +} Propchange: incubator/stanbol/trunk/integration-tests/src/test/java/org/apache/stanbol/enhancer/it/LanguageChainTest.java ------------------------------------------------------------------------------ svn:mime-type = text/plain Added: incubator/stanbol/trunk/integration-tests/src/test/java/org/apache/stanbol/enhancer/it/StatelessEngineTest.java URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/integration-tests/src/test/java/org/apache/stanbol/enhancer/it/StatelessEngineTest.java?rev=1235206&view=auto ============================================================================== --- incubator/stanbol/trunk/integration-tests/src/test/java/org/apache/stanbol/enhancer/it/StatelessEngineTest.java (added) +++ incubator/stanbol/trunk/integration-tests/src/test/java/org/apache/stanbol/enhancer/it/StatelessEngineTest.java Tue Jan 24 11:25:34 2012 @@ -0,0 +1,28 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with this + * work for additional information regarding copyright ownership. The ASF + * licenses this file to You under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations under + * the License. + */ +package org.apache.stanbol.enhancer.it; +/** + * Tests of the old "/engines" path is still supported + */ +public class StatelessEngineTest extends DefaultChainTest { + + + public StatelessEngineTest(){ + super(ENGINES_ENDPOINT); + } + +} Propchange: incubator/stanbol/trunk/integration-tests/src/test/java/org/apache/stanbol/enhancer/it/StatelessEngineTest.java ------------------------------------------------------------------------------ svn:mime-type = text/plain Copied: incubator/stanbol/trunk/integration-tests/src/test/java/org/apache/stanbol/it/DefaultConfigTest.java (from r1229152, incubator/stanbol/trunk/integration-tests/src/test/java/org/apache/stanbol/enhancer/it/DefaultConfigTest.java) URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/integration-tests/src/test/java/org/apache/stanbol/it/DefaultConfigTest.java?p2=incubator/stanbol/trunk/integration-tests/src/test/java/org/apache/stanbol/it/DefaultConfigTest.java&p1=incubator/stanbol/trunk/integration-tests/src/test/java/org/apache/stanbol/enhancer/it/DefaultConfigTest.java&r1=1229152&r2=1235206&rev=1235206&view=diff ============================================================================== --- incubator/stanbol/trunk/integration-tests/src/test/java/org/apache/stanbol/enhancer/it/DefaultConfigTest.java (original) +++ incubator/stanbol/trunk/integration-tests/src/test/java/org/apache/stanbol/it/DefaultConfigTest.java Tue Jan 24 11:25:34 2012 @@ -14,12 +14,13 @@ * License for the specific language governing permissions and limitations under * the License. */ -package org.apache.stanbol.enhancer.it; +package org.apache.stanbol.it; +import org.apache.stanbol.commons.testing.stanbol.StanbolTestBase; import org.junit.Test; /** Verify that the example config of STANBOL-110 is present */ -public class DefaultConfigTest extends EnhancerTestBase { +public class DefaultConfigTest extends StanbolTestBase { @Test public void testDefaultConfig() throws Exception { Propchange: incubator/stanbol/trunk/integration-tests/src/test/java/org/apache/stanbol/it/DefaultConfigTest.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: incubator/stanbol/trunk/integration-tests/src/test/java/org/apache/stanbol/it/DefaultConfigTest.java ------------------------------------------------------------------------------ svn:keywords = Author Date Id Revision Rev URL Copied: incubator/stanbol/trunk/integration-tests/src/test/java/org/apache/stanbol/it/HomepageTest.java (from r1229152, incubator/stanbol/trunk/integration-tests/src/test/java/org/apache/stanbol/enhancer/it/HomepageTest.java) URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/integration-tests/src/test/java/org/apache/stanbol/it/HomepageTest.java?p2=incubator/stanbol/trunk/integration-tests/src/test/java/org/apache/stanbol/it/HomepageTest.java&p1=incubator/stanbol/trunk/integration-tests/src/test/java/org/apache/stanbol/enhancer/it/HomepageTest.java&r1=1229152&r2=1235206&rev=1235206&view=diff ============================================================================== --- incubator/stanbol/trunk/integration-tests/src/test/java/org/apache/stanbol/enhancer/it/HomepageTest.java (original) +++ incubator/stanbol/trunk/integration-tests/src/test/java/org/apache/stanbol/it/HomepageTest.java Tue Jan 24 11:25:34 2012 @@ -14,12 +14,12 @@ * License for the specific language governing permissions and limitations under * the License. */ -package org.apache.stanbol.enhancer.it; +package org.apache.stanbol.it; import org.apache.stanbol.commons.testing.stanbol.StanbolTestBase; import org.junit.Test; -/** Test the enhancer homepage and demonstrate the test classes. +/** Test the stanbol homepage and demonstrate the test classes. * Does not inherit from EnhancerTestBase as we don't care * at this stage if engines are ready or not. */ Propchange: incubator/stanbol/trunk/integration-tests/src/test/java/org/apache/stanbol/it/HomepageTest.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: incubator/stanbol/trunk/integration-tests/src/test/java/org/apache/stanbol/it/HomepageTest.java ------------------------------------------------------------------------------ svn:keywords = Author Date Id Revision Rev URL Copied: incubator/stanbol/trunk/integration-tests/src/test/java/org/apache/stanbol/it/OsgiConsoleTest.java (from r1229152, incubator/stanbol/trunk/integration-tests/src/test/java/org/apache/stanbol/enhancer/it/OsgiConsoleTest.java) URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/integration-tests/src/test/java/org/apache/stanbol/it/OsgiConsoleTest.java?p2=incubator/stanbol/trunk/integration-tests/src/test/java/org/apache/stanbol/it/OsgiConsoleTest.java&p1=incubator/stanbol/trunk/integration-tests/src/test/java/org/apache/stanbol/enhancer/it/OsgiConsoleTest.java&r1=1229152&r2=1235206&rev=1235206&view=diff ============================================================================== --- incubator/stanbol/trunk/integration-tests/src/test/java/org/apache/stanbol/enhancer/it/OsgiConsoleTest.java (original) +++ incubator/stanbol/trunk/integration-tests/src/test/java/org/apache/stanbol/it/OsgiConsoleTest.java Tue Jan 24 11:25:34 2012 @@ -14,12 +14,13 @@ * License for the specific language governing permissions and limitations under * the License. */ -package org.apache.stanbol.enhancer.it; +package org.apache.stanbol.it; +import org.apache.stanbol.commons.testing.stanbol.StanbolTestBase; import org.junit.Test; /** Test access to the OSGi console */ -public class OsgiConsoleTest extends EnhancerTestBase { +public class OsgiConsoleTest extends StanbolTestBase { @Test public void testDefaultConsolePaths() throws Exception { @@ -32,7 +33,10 @@ public class OsgiConsoleTest extends Enh "logs", "memoryusage", "services", - "shell" + "shell", + "stanbol_datafileprovider", + "osgi-installer", + "slinglog" }; for(String subpath : subpaths) { Propchange: incubator/stanbol/trunk/integration-tests/src/test/java/org/apache/stanbol/it/OsgiConsoleTest.java ------------------------------------------------------------------------------ svn:eol-style = native Propchange: incubator/stanbol/trunk/integration-tests/src/test/java/org/apache/stanbol/it/OsgiConsoleTest.java ------------------------------------------------------------------------------ svn:keywords = Author Date Id Revision Rev URL Modified: incubator/stanbol/trunk/launchers/bundlelists/osgiframework/src/main/bundles/list.xml URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/launchers/bundlelists/osgiframework/src/main/bundles/list.xml?rev=1235206&r1=1235205&r2=1235206&view=diff ============================================================================== --- incubator/stanbol/trunk/launchers/bundlelists/osgiframework/src/main/bundles/list.xml (original) +++ incubator/stanbol/trunk/launchers/bundlelists/osgiframework/src/main/bundles/list.xml Tue Jan 24 11:25:34 2012 @@ -43,6 +43,11 @@ <artifactId>org.apache.felix.metatype</artifactId> <version>1.0.4</version> </bundle> + <bundle> + <groupId>org.apache.felix</groupId> + <artifactId>org.apache.felix.eventadmin</artifactId> + <version>1.2.14</version> + </bundle> </startLevel> <!-- HTTP service and Http related Utilities --> Modified: incubator/stanbol/trunk/launchers/full-war/pom.xml URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/launchers/full-war/pom.xml?rev=1235206&r1=1235205&r2=1235206&view=diff ============================================================================== --- incubator/stanbol/trunk/launchers/full-war/pom.xml (original) +++ incubator/stanbol/trunk/launchers/full-war/pom.xml Tue Jan 24 11:25:34 2012 @@ -113,6 +113,7 @@ <exclude>src/main/webapp/WEB-INF/resources/config/org.apache.stanbol.entityhub.yard.solr.impl.SolrYard-entityhub.config</exclude> <exclude>src/main/webapp/WEB-INF/resources/config/org.apache.stanbol.examples.ExampleBootstrapConfig.cfg</exclude> <exclude>src/main/webapp/WEB-INF/resources/config/org.apache.stanbol.enhancer.engines.opennlp.impl.NamedEntityExtractionEnhancementEngine-default.config</exclude> + <exclude>src/main/webapp/WEB-INF/resources/config/org.apache.stanbol.enhancer.chain.weighted.impl.WeightedChain-language.config</exclude> </excludes> </configuration> </plugin> Modified: incubator/stanbol/trunk/launchers/full-war/src/main/webapp/WEB-INF/README URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/launchers/full-war/src/main/webapp/WEB-INF/README?rev=1235206&r1=1235205&r2=1235206&view=diff ============================================================================== --- incubator/stanbol/trunk/launchers/full-war/src/main/webapp/WEB-INF/README (original) +++ incubator/stanbol/trunk/launchers/full-war/src/main/webapp/WEB-INF/README Tue Jan 24 11:25:34 2012 @@ -22,4 +22,4 @@ resources/config/org.apache.stanbol.enha resources/config/org.apache.stanbol.entityhub.yard.solr.impl.SolrYard-entityhub.config resources/config/org.apache.stanbol.commons.solr.web.impl.SolrDispatchFilterComponent-default.config resources/config/org.apache.stanbol.enhancer.engines.opennlp.impl.NamedEntityExtractionEnhancementEngine-default.config - +resources/config/org.apache.stanbol.enhancer.chain.weighted.impl.WeightedChain-language.config Added: incubator/stanbol/trunk/launchers/full-war/src/main/webapp/WEB-INF/resources/config/org.apache.stanbol.enhancer.chain.weighted.impl.WeightedChain-language.config URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/launchers/full-war/src/main/webapp/WEB-INF/resources/config/org.apache.stanbol.enhancer.chain.weighted.impl.WeightedChain-language.config?rev=1235206&view=auto ============================================================================== --- incubator/stanbol/trunk/launchers/full-war/src/main/webapp/WEB-INF/resources/config/org.apache.stanbol.enhancer.chain.weighted.impl.WeightedChain-language.config (added) +++ incubator/stanbol/trunk/launchers/full-war/src/main/webapp/WEB-INF/resources/config/org.apache.stanbol.enhancer.chain.weighted.impl.WeightedChain-language.config Tue Jan 24 11:25:34 2012 @@ -0,0 +1,2 @@ +stanbol.enhancer.chain.name="language" +stanbol.enhancer.chain.weighted.chain=["metaxa;optional","langid"] Modified: incubator/stanbol/trunk/launchers/full-war/src/main/webapp/WEB-INF/resources/config/org.apache.stanbol.enhancer.engines.entitytagging.impl.NamedEntityTaggingEngine-local.config URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/launchers/full-war/src/main/webapp/WEB-INF/resources/config/org.apache.stanbol.enhancer.engines.entitytagging.impl.NamedEntityTaggingEngine-local.config?rev=1235206&r1=1235205&r2=1235206&view=diff ============================================================================== --- incubator/stanbol/trunk/launchers/full-war/src/main/webapp/WEB-INF/resources/config/org.apache.stanbol.enhancer.engines.entitytagging.impl.NamedEntityTaggingEngine-local.config (original) +++ incubator/stanbol/trunk/launchers/full-war/src/main/webapp/WEB-INF/resources/config/org.apache.stanbol.enhancer.engines.entitytagging.impl.NamedEntityTaggingEngine-local.config Tue Jan 24 11:25:34 2012 @@ -1,3 +1,4 @@ +stanbol.enhancer.engine.name="entityhubLinking" org.apache.stanbol.enhancer.engines.entitytagging.nameField="name" org.apache.stanbol.enhancer.engines.entitytagging.personType="Person" org.apache.stanbol.enhancer.engines.entitytagging.personState=B"true" Modified: incubator/stanbol/trunk/launchers/full/pom.xml URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/launchers/full/pom.xml?rev=1235206&r1=1235205&r2=1235206&view=diff ============================================================================== --- incubator/stanbol/trunk/launchers/full/pom.xml (original) +++ incubator/stanbol/trunk/launchers/full/pom.xml Tue Jan 24 11:25:34 2012 @@ -114,6 +114,7 @@ <exclude>src/main/resources/resources/config/org.apache.stanbol.entityhub.yard.solr.impl.SolrYard-entityhub.config</exclude> <exclude>src/main/resources/resources/config/org.apache.stanbol.examples.ExampleBootstrapConfig.cfg</exclude> <exclude>src/main/resources/resources/config/org.apache.stanbol.enhancer.engines.opennlp.impl.NamedEntityExtractionEnhancementEngine-default.config</exclude> + <exclude>src/main/resources/resources/config/org.apache.stanbol.enhancer.chain.weighted.impl.WeightedChain-language.config</exclude> </excludes> </configuration> </plugin> Modified: incubator/stanbol/trunk/launchers/full/src/main/resources/README URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/launchers/full/src/main/resources/README?rev=1235206&r1=1235205&r2=1235206&view=diff ============================================================================== --- incubator/stanbol/trunk/launchers/full/src/main/resources/README (original) +++ incubator/stanbol/trunk/launchers/full/src/main/resources/README Tue Jan 24 11:25:34 2012 @@ -23,4 +23,5 @@ resources/config/org.apache.stanbol.enti resources/config/org.apache.stanbol.entityhub.yard.solr.impl.SolrYard-entityhub.config resources/config/org.apache.stanbol.enhancer.engines.opennlp.impl.NamedEntityExtractionEnhancementEngine-default.config resources/config/org.apache.stanbol.examples.ExampleBootstrapConfig.cfg +resources/config/org.apache.stanbol.enhancer.chain.weighted.impl.WeightedChain-language.config Added: incubator/stanbol/trunk/launchers/full/src/main/resources/resources/config/org.apache.stanbol.enhancer.chain.weighted.impl.WeightedChain-language.config URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/launchers/full/src/main/resources/resources/config/org.apache.stanbol.enhancer.chain.weighted.impl.WeightedChain-language.config?rev=1235206&view=auto ============================================================================== --- incubator/stanbol/trunk/launchers/full/src/main/resources/resources/config/org.apache.stanbol.enhancer.chain.weighted.impl.WeightedChain-language.config (added) +++ incubator/stanbol/trunk/launchers/full/src/main/resources/resources/config/org.apache.stanbol.enhancer.chain.weighted.impl.WeightedChain-language.config Tue Jan 24 11:25:34 2012 @@ -0,0 +1,2 @@ +stanbol.enhancer.chain.name="language" +stanbol.enhancer.chain.weighted.chain=["metaxa;optional","langid"] Modified: incubator/stanbol/trunk/launchers/full/src/main/resources/resources/config/org.apache.stanbol.enhancer.engines.entitytagging.impl.NamedEntityTaggingEngine-local.config URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/launchers/full/src/main/resources/resources/config/org.apache.stanbol.enhancer.engines.entitytagging.impl.NamedEntityTaggingEngine-local.config?rev=1235206&r1=1235205&r2=1235206&view=diff ============================================================================== --- incubator/stanbol/trunk/launchers/full/src/main/resources/resources/config/org.apache.stanbol.enhancer.engines.entitytagging.impl.NamedEntityTaggingEngine-local.config (original) +++ incubator/stanbol/trunk/launchers/full/src/main/resources/resources/config/org.apache.stanbol.enhancer.engines.entitytagging.impl.NamedEntityTaggingEngine-local.config Tue Jan 24 11:25:34 2012 @@ -1,3 +1,4 @@ +stanbol.enhancer.engine.name="entityhubLinking" org.apache.stanbol.enhancer.engines.entitytagging.nameField="name" org.apache.stanbol.enhancer.engines.entitytagging.personType="Person" org.apache.stanbol.enhancer.engines.entitytagging.personState=B"true" Modified: incubator/stanbol/trunk/launchers/kres/src/main/resources/resources/config/org.apache.stanbol.enhancer.engines.entitytagging.impl.NamedEntityTaggingEngine-local.config URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/launchers/kres/src/main/resources/resources/config/org.apache.stanbol.enhancer.engines.entitytagging.impl.NamedEntityTaggingEngine-local.config?rev=1235206&r1=1235205&r2=1235206&view=diff ============================================================================== --- incubator/stanbol/trunk/launchers/kres/src/main/resources/resources/config/org.apache.stanbol.enhancer.engines.entitytagging.impl.NamedEntityTaggingEngine-local.config (original) +++ incubator/stanbol/trunk/launchers/kres/src/main/resources/resources/config/org.apache.stanbol.enhancer.engines.entitytagging.impl.NamedEntityTaggingEngine-local.config Tue Jan 24 11:25:34 2012 @@ -1,3 +1,4 @@ +stanbol.enhancer.engine.name="entityhubLinking" org.apache.stanbol.enhancer.engines.entitytagging.nameField="name" org.apache.stanbol.enhancer.engines.entitytagging.personType="Person" org.apache.stanbol.enhancer.engines.entitytagging.personState=B"true" Modified: incubator/stanbol/trunk/launchers/stable/pom.xml URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/launchers/stable/pom.xml?rev=1235206&r1=1235205&r2=1235206&view=diff ============================================================================== --- incubator/stanbol/trunk/launchers/stable/pom.xml (original) +++ incubator/stanbol/trunk/launchers/stable/pom.xml Tue Jan 24 11:25:34 2012 @@ -112,6 +112,7 @@ <exclude>src/main/resources/resources/config/org.apache.stanbol.entityhub.yard.solr.impl.SolrYard-entityhub.config</exclude> <exclude>src/main/resources/resources/config/org.apache.stanbol.examples.ExampleBootstrapConfig.cfg</exclude> <exclude>src/main/resources/resources/config/org.apache.stanbol.enhancer.engines.opennlp.impl.NamedEntityExtractionEnhancementEngine-default.config</exclude> + <exclude>src/main/resources/resources/config/org.apache.stanbol.enhancer.chain.weighted.impl.WeightedChain-language.config</exclude> </excludes> </configuration> </plugin> Modified: incubator/stanbol/trunk/launchers/stable/src/main/resources/README URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/launchers/stable/src/main/resources/README?rev=1235206&r1=1235205&r2=1235206&view=diff ============================================================================== --- incubator/stanbol/trunk/launchers/stable/src/main/resources/README (original) +++ incubator/stanbol/trunk/launchers/stable/src/main/resources/README Tue Jan 24 11:25:34 2012 @@ -22,3 +22,4 @@ resources/config/org.apache.stanbol.enha resources/config/org.apache.stanbol.entityhub.yard.solr.impl.SolrYard-entityhub.config resources/config/org.apache.stanbol.commons.solr.web.impl.SolrDispatchFilterComponent-default.config resources/config/org.apache.stanbol.enhancer.engines.opennlp.impl.NamedEntityExtractionEnhancementEngine-default.config +resources/config/org.apache.stanbol.enhancer.chain.weighted.impl.WeightedChain-languageconfig \ No newline at end of file Added: incubator/stanbol/trunk/launchers/stable/src/main/resources/resources/config/org.apache.stanbol.enhancer.chain.weighted.impl.WeightedChain-language.config URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/launchers/stable/src/main/resources/resources/config/org.apache.stanbol.enhancer.chain.weighted.impl.WeightedChain-language.config?rev=1235206&view=auto ============================================================================== --- incubator/stanbol/trunk/launchers/stable/src/main/resources/resources/config/org.apache.stanbol.enhancer.chain.weighted.impl.WeightedChain-language.config (added) +++ incubator/stanbol/trunk/launchers/stable/src/main/resources/resources/config/org.apache.stanbol.enhancer.chain.weighted.impl.WeightedChain-language.config Tue Jan 24 11:25:34 2012 @@ -0,0 +1,2 @@ +stanbol.enhancer.chain.name="language" +stanbol.enhancer.chain.weighted.chain=["metaxa;optional","langid"] Modified: incubator/stanbol/trunk/launchers/stable/src/main/resources/resources/config/org.apache.stanbol.enhancer.engines.entitytagging.impl.NamedEntityTaggingEngine-local.config URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/launchers/stable/src/main/resources/resources/config/org.apache.stanbol.enhancer.engines.entitytagging.impl.NamedEntityTaggingEngine-local.config?rev=1235206&r1=1235205&r2=1235206&view=diff ============================================================================== --- incubator/stanbol/trunk/launchers/stable/src/main/resources/resources/config/org.apache.stanbol.enhancer.engines.entitytagging.impl.NamedEntityTaggingEngine-local.config (original) +++ incubator/stanbol/trunk/launchers/stable/src/main/resources/resources/config/org.apache.stanbol.enhancer.engines.entitytagging.impl.NamedEntityTaggingEngine-local.config Tue Jan 24 11:25:34 2012 @@ -13,6 +13,7 @@ # See the License for the specific language governing permissions and # limitations under the License. +stanbol.enhancer.engine.name="entityhubLinking" org.apache.stanbol.enhancer.engines.entitytagging.nameField="name" org.apache.stanbol.enhancer.engines.entitytagging.personType="Person" org.apache.stanbol.enhancer.engines.entitytagging.personState=B"true" Modified: incubator/stanbol/trunk/parent/pom.xml URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/parent/pom.xml?rev=1235206&r1=1235205&r2=1235206&view=diff ============================================================================== --- incubator/stanbol/trunk/parent/pom.xml (original) +++ incubator/stanbol/trunk/parent/pom.xml Tue Jan 24 11:25:34 2012 @@ -468,6 +468,21 @@ </dependency> <dependency> <groupId>org.apache.stanbol</groupId> + <artifactId>org.apache.stanbol.enhancer.chainmanager</artifactId> + <version>0.9.0-incubating-SNAPSHOT</version> + </dependency> + <dependency> + <groupId>org.apache.stanbol</groupId> + <artifactId>org.apache.stanbol.enhancer.enginemanager</artifactId> + <version>0.9.0-incubating-SNAPSHOT</version> + </dependency> + <dependency> + <groupId>org.apache.stanbol</groupId> + <artifactId>org.apache.stanbol.enhancer.eventjobmanager</artifactId> + <version>0.9.0-incubating-SNAPSHOT</version> + </dependency> + <dependency> + <groupId>org.apache.stanbol</groupId> <artifactId>org.apache.stanbol.enhancer.weightedjobmanager</artifactId> <version>0.9.0-incubating-SNAPSHOT</version> </dependency> @@ -1340,6 +1355,19 @@ <version>2.7.1</version> <type>jar</type> </dependency> + + <!-- LD Path --> + <dependency> + <groupId>at.newmedialab.ldpath</groupId> + <artifactId>ldpath-api</artifactId> + <version>0.9.4-SNAPSHOT</version> + </dependency> + <dependency> + <groupId>at.newmedialab.ldpath</groupId> + <artifactId>ldpath-core-bundle</artifactId> + <version>0.9.4-SNAPSHOT</version> + </dependency> + <!-- Apache Tika core --> <dependency> @@ -1748,6 +1776,18 @@ <url>http://repository.springsource.com/maven/bundles/external</url> </repository> + <repository> + <id>kiwi-project_SNAPSHOTS</id> <!-- Hosts LDPath SNAPSHOT bundles for now --> + <name>Kiwi Project SNAPSHOTS Repository</name> + <url>http://devel.kiwi-project.eu:8080/nexus/content/repositories/snapshots/</url> + </repository> + + <repository> + <id>kiwi-project</id> <!-- Hosts LDPath releases bundles for now --> + <name>Kiwi Project Repository</name> + <url>http://devel.kiwi-project.eu:8080/nexus/content/repositories/releases/</url> + </repository> + </repositories> </project> Modified: incubator/stanbol/trunk/pom.xml URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/pom.xml?rev=1235206&r1=1235205&r2=1235206&view=diff ============================================================================== --- incubator/stanbol/trunk/pom.xml (original) +++ incubator/stanbol/trunk/pom.xml Tue Jan 24 11:25:34 2012 @@ -57,7 +57,12 @@ <module>enhancer/parent</module> <module>enhancer/generic/servicesapi</module> + <module>enhancer/generic/chainmanager</module> + <module>enhancer/generic/enginemanager</module> <module>enhancer/jobmanager</module> + <module>enhancer/chain/allactive</module> + <module>enhancer/chain/graph</module> + <module>enhancer/chain/weighted</module> <module>enhancer/jersey</module> <module>enhancer/benchmark</module> <module>enhancer/bundlelist</module>
