Modified: incubator/stanbol/trunk/enhancer/ldpath/src/test/java/org/apache/stanbol/enhancer/ldpath/ContentItemBackendTest.java URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/enhancer/ldpath/src/test/java/org/apache/stanbol/enhancer/ldpath/ContentItemBackendTest.java?rev=1311019&r1=1311018&r2=1311019&view=diff ============================================================================== --- incubator/stanbol/trunk/enhancer/ldpath/src/test/java/org/apache/stanbol/enhancer/ldpath/ContentItemBackendTest.java (original) +++ incubator/stanbol/trunk/enhancer/ldpath/src/test/java/org/apache/stanbol/enhancer/ldpath/ContentItemBackendTest.java Sun Apr 8 15:12:40 2012 @@ -35,7 +35,6 @@ import java.util.zip.ZipEntry; import java.util.zip.ZipInputStream; import org.apache.clerezza.rdf.core.Literal; -import org.apache.clerezza.rdf.core.LiteralFactory; import org.apache.clerezza.rdf.core.MGraph; import org.apache.clerezza.rdf.core.Resource; import org.apache.clerezza.rdf.core.Triple; @@ -45,10 +44,11 @@ import org.apache.clerezza.rdf.core.seri import org.apache.clerezza.rdf.jena.parser.JenaParserProvider; import org.apache.commons.io.IOUtils; import org.apache.stanbol.commons.indexedgraph.IndexedMGraph; +import org.apache.stanbol.enhancer.contentitem.inmemory.InMemoryContentItemFactory; import org.apache.stanbol.enhancer.ldpath.backend.ContentItemBackend; import org.apache.stanbol.enhancer.servicesapi.ContentItem; -import org.apache.stanbol.enhancer.servicesapi.helper.InMemoryBlob; -import org.apache.stanbol.enhancer.servicesapi.helper.InMemoryContentItem; +import org.apache.stanbol.enhancer.servicesapi.ContentItemFactory; +import org.apache.stanbol.enhancer.servicesapi.impl.ByteArraySource; import org.apache.stanbol.enhancer.servicesapi.rdf.Properties; import org.junit.Before; import org.junit.BeforeClass; @@ -76,7 +76,8 @@ public class ContentItemBackendTest { private Logger log = LoggerFactory.getLogger(ContentItemBackendTest.class); private static final Charset UTF8 = Charset.forName("UTF-8"); - private static LiteralFactory lf = LiteralFactory.getInstance(); + //private static LiteralFactory lf = LiteralFactory.getInstance(); + private static ContentItemFactory ciFactory = InMemoryContentItemFactory.getInstance(); private static String textContent; private static String htmlContent; @@ -109,16 +110,16 @@ public class ContentItemBackendTest { assertNotNull("HTML content not found",in); byte[] htmlData = IOUtils.toByteArray(in); IOUtils.closeQuietly(in); - ci = new InMemoryContentItem(contentItemId.getUnicodeString(), - htmlData, "text/html; charset=UTF-8"); + ci = ciFactory.createContentItem(contentItemId, + new ByteArraySource(htmlData, "text/html; charset=UTF-8")); htmlContent = new String(htmlData, UTF8); //create a Blob with the text content in = getTestResource("content.txt"); byte[] textData = IOUtils.toByteArray(in); IOUtils.closeQuietly(in); assertNotNull("Plain text content not found",in); - ci.addPart(new UriRef(ci.getUri().getUnicodeString()+"_text"), - new InMemoryBlob(textData, "text/plain; charset=UTF-8")); + ci.addPart(new UriRef(ci.getUri().getUnicodeString()+"_text"), + ciFactory.createBlob(new ByteArraySource(textData, "text/plain; charset=UTF-8"))); textContent = new String(textData, UTF8); //add the metadata ci.getMetadata().addAll(rdfData); @@ -186,7 +187,7 @@ public class ContentItemBackendTest { } @Test public void testTextAnnotationFunction() throws LDPathParseException { - String path = "fn:textAnnotation(.)/fise:selected-text"; + String path = "fn:textAnnotation()/fise:selected-text"; Collection<Resource> result = ldpath.pathQuery(ci.getUri(), path, null); assertNotNull(result); assertFalse(result.isEmpty()); @@ -202,7 +203,7 @@ public class ContentItemBackendTest { //test with a filter for the type //same as the 1st example bat rather using an ld-path construct for //filtering for TextAnnotations representing persons - path = "fn:textAnnotation(.)[dc:type is dbpedia-ont:Person]/fise:selected-text"; + path = "fn:textAnnotation()[dc:type is dbpedia-ont:Person]/fise:selected-text"; result = ldpath.pathQuery(ci.getUri(), path, null); assertNotNull(result); assertFalse(result.isEmpty()); @@ -214,7 +215,7 @@ public class ContentItemBackendTest { } @Test public void testEntityAnnotation() throws LDPathParseException { - String path = "fn:entityAnnotation(.)/fise:entity-reference"; + String path = "fn:entityAnnotation()/fise:entity-reference"; Collection<Resource> result = ldpath.pathQuery(ci.getUri(), path, null); assertNotNull(result); assertFalse(result.isEmpty()); @@ -232,7 +233,7 @@ public class ContentItemBackendTest { } assertTrue(expectedValues.isEmpty()); //and with a filter - path = "fn:entityAnnotation(.)[fise:entity-type is dbpedia-ont:Person]/fise:entity-reference"; + path = "fn:entityAnnotation()[fise:entity-type is dbpedia-ont:Person]/fise:entity-reference"; result = ldpath.pathQuery(ci.getUri(), path, null); assertNotNull(result); assertFalse(result.isEmpty()); @@ -241,7 +242,7 @@ public class ContentItemBackendTest { } @Test public void testEnhancements() throws LDPathParseException { - String path = "fn:enhancement(.)"; + String path = "fn:enhancement()"; Collection<Resource> result = ldpath.pathQuery(ci.getUri(), path, null); assertNotNull(result); assertFalse(result.isEmpty()); @@ -251,13 +252,13 @@ public class ContentItemBackendTest { log.info("Entity: {}",r); } //and with a filter - path = "fn:enhancement(.)[rdf:type is fise:TextAnnotation]"; + path = "fn:enhancement()[rdf:type is fise:TextAnnotation]"; result = ldpath.pathQuery(ci.getUri(), path, null); assertNotNull(result); assertFalse(result.isEmpty()); assertTrue(result.size() == 3); // assertTrue(result.contains(new UriRef("http://dbpedia.org/resource/Bob_Marley";))); - path = "fn:enhancement(.)/dc:language"; + path = "fn:enhancement()/dc:language"; result = ldpath.pathQuery(ci.getUri(), path, null); assertNotNull(result); assertFalse(result.isEmpty()); @@ -275,7 +276,7 @@ public class ContentItemBackendTest { // Because this test checks first that all three suggestions for Paris // are returned and later that a limit of 2 only returns the two top // most. - String path = "fn:textAnnotation(.)[dc:type is dbpedia-ont:Place]/fn:suggestion(.)"; + String path = "fn:textAnnotation()[dc:type is dbpedia-ont:Place]/fn:suggestion()"; Collection<Resource> result = ldpath.pathQuery(ci.getUri(), path, null); assertNotNull(result); assertFalse(result.isEmpty()); @@ -295,7 +296,7 @@ public class ContentItemBackendTest { } } assertNotNull(lowestConfidenceSuggestion); - path = "fn:textAnnotation(.)[dc:type is dbpedia-ont:Place]/fn:suggestion(.,\"2\")"; + path = "fn:textAnnotation()[dc:type is dbpedia-ont:Place]/fn:suggestion(\"2\")"; Collection<Resource> result2 = ldpath.pathQuery(ci.getUri(), path, null); assertNotNull(result2); assertFalse(result2.isEmpty()); @@ -311,7 +312,7 @@ public class ContentItemBackendTest { //(1) get the {limit} top rated linked Entities per parsed context // In this example we parse all TextAnnotations //NOTE: '.' MUST BE used as first argument in this case - String path = "fn:textAnnotation(.)/fn:suggestedEntity(.,\"1\")"; + String path = "fn:textAnnotation()/fn:suggestedEntity(\"1\")"; Collection<Resource> result = ldpath.pathQuery(ci.getUri(), path, null); assertNotNull(result); assertFalse(result.isEmpty()); @@ -331,7 +332,7 @@ public class ContentItemBackendTest { // as the first argument //NOTE: the selector parsing all Annotations MUST BE used as first // argument - path = "fn:suggestedEntity(fn:textAnnotation(.),\"1\")"; + path = "fn:suggestedEntity(fn:textAnnotation(),\"1\")"; result = ldpath.pathQuery(ci.getUri(), path, null); assertNotNull(result); assertFalse(result.isEmpty());
Modified: incubator/stanbol/trunk/enhancer/ldpath/src/test/java/org/apache/stanbol/enhancer/ldpath/UsageExamples.java URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/enhancer/ldpath/src/test/java/org/apache/stanbol/enhancer/ldpath/UsageExamples.java?rev=1311019&r1=1311018&r2=1311019&view=diff ============================================================================== --- incubator/stanbol/trunk/enhancer/ldpath/src/test/java/org/apache/stanbol/enhancer/ldpath/UsageExamples.java (original) +++ incubator/stanbol/trunk/enhancer/ldpath/src/test/java/org/apache/stanbol/enhancer/ldpath/UsageExamples.java Sun Apr 8 15:12:40 2012 @@ -37,9 +37,11 @@ import org.apache.clerezza.rdf.core.UriR import org.apache.clerezza.rdf.core.serializedform.ParsingProvider; import org.apache.clerezza.rdf.jena.parser.JenaParserProvider; import org.apache.commons.io.IOUtils; +import org.apache.stanbol.enhancer.contentitem.inmemory.InMemoryContentItemFactory; import org.apache.stanbol.enhancer.ldpath.backend.ContentItemBackend; import org.apache.stanbol.enhancer.servicesapi.ContentItem; -import org.apache.stanbol.enhancer.servicesapi.helper.InMemoryContentItem; +import org.apache.stanbol.enhancer.servicesapi.ContentItemFactory; +import org.apache.stanbol.enhancer.servicesapi.impl.ByteArraySource; import org.apache.stanbol.enhancer.servicesapi.rdf.Properties; import org.junit.AfterClass; import org.junit.Before; @@ -68,6 +70,8 @@ public class UsageExamples { private static final Logger log = LoggerFactory.getLogger(UsageExamples.class); + private static ContentItemFactory ciFactory = InMemoryContentItemFactory.getInstance(); + private static int ITERATIONS = 10; private static ContentItem ci; @@ -101,8 +105,8 @@ public class UsageExamples { assertNotNull("Example Plain text content not found",in); byte[] textData = IOUtils.toByteArray(in); IOUtils.closeQuietly(in); - ci = new InMemoryContentItem(contentItemId.getUnicodeString(), - textData, "text/html; charset=UTF-8"); + ci = ciFactory.createContentItem(contentItemId, + new ByteArraySource(textData, "text/html; charset=UTF-8")); ci.getMetadata().addAll(rdfData); } @Before @@ -123,17 +127,17 @@ public class UsageExamples { @Test public void exampleExtractedPersons() throws LDPathParseException { StringBuilder program = new StringBuilder(); - program.append("personMentions = fn:textAnnotation(.)" + + program.append("personMentions = fn:textAnnotation()" + "[dc:type is dbpedia-ont:Person]/fise:selected-text :: xsd:string;"); //this uses the labels of suggested person with the highest confidence //but also the selected-text as fallback if no entity is suggested. - program.append("personNames = fn:textAnnotation(.)" + - "[dc:type is dbpedia-ont:Person]/fn:first(fn:suggestion(.,\"1\")/fise:entity-label,fise:selected-text) :: xsd:string;"); - program.append("linkedPersons = fn:textAnnotation(.)" + - "[dc:type is dbpedia-ont:Person]/fn:suggestedEntity(.,\"1\") :: xsd:anyURI;"); + program.append("personNames = fn:textAnnotation()" + + "[dc:type is dbpedia-ont:Person]/fn:first(fn:suggestion(\"1\")/fise:entity-label,fise:selected-text) :: xsd:string;"); + program.append("linkedPersons = fn:textAnnotation()" + + "[dc:type is dbpedia-ont:Person]/fn:suggestedEntity(\"1\") :: xsd:anyURI;"); //this selects only linked Artists - program.append("linkedArtists = fn:textAnnotation(.)" + - "[dc:type is dbpedia-ont:Person]/fn:suggestion(.)" + + program.append("linkedArtists = fn:textAnnotation()" + + "[dc:type is dbpedia-ont:Person]/fn:suggestion()" + "[fise:entity-type is dbpedia-ont:Artist]/fise:entity-reference :: xsd:anyURI;"); Program<Resource> personProgram = ldpath.parseProgram(new StringReader(program.toString())); log.info("- - - - - - - - - - - - - "); @@ -168,17 +172,17 @@ public class UsageExamples { @Test public void exampleExtractedPlaces() throws LDPathParseException { StringBuilder program = new StringBuilder(); - program.append("locationMentions = fn:textAnnotation(.)" + + program.append("locationMentions = fn:textAnnotation()" + "[dc:type is dbpedia-ont:Place]/fise:selected-text :: xsd:string;"); //this uses the labels of suggested places with the highest confidence //but also the selected-text as fallback if no entity is suggested. - program.append("locationNames = fn:textAnnotation(.)" + - "[dc:type is dbpedia-ont:Place]/fn:first(fn:suggestion(.,\"1\")/fise:entity-label,fise:selected-text) :: xsd:string;"); - program.append("linkedPlaces = fn:textAnnotation(.)" + - "[dc:type is dbpedia-ont:Place]/fn:suggestedEntity(.,\"1\") :: xsd:anyURI;"); + program.append("locationNames = fn:textAnnotation()" + + "[dc:type is dbpedia-ont:Place]/fn:first(fn:suggestion(\"1\")/fise:entity-label,fise:selected-text) :: xsd:string;"); + program.append("linkedPlaces = fn:textAnnotation()" + + "[dc:type is dbpedia-ont:Place]/fn:suggestedEntity(\"1\") :: xsd:anyURI;"); //this selects only linked Artists - program.append("linkedCountries = fn:textAnnotation(.)" + - "[dc:type is dbpedia-ont:Place]/fn:suggestion(.)" + + program.append("linkedCountries = fn:textAnnotation()" + + "[dc:type is dbpedia-ont:Place]/fn:suggestion()" + "[fise:entity-type is dbpedia-ont:Country]/fise:entity-reference :: xsd:anyURI;"); Program<Resource> personProgram = ldpath.parseProgram(new StringReader(program.toString())); log.info("- - - - - - - - - - - - -"); @@ -196,18 +200,18 @@ public class UsageExamples { @Test public void exampleExtractedOrganization() throws LDPathParseException { StringBuilder program = new StringBuilder(); - program.append("orgMentions = fn:textAnnotation(.)" + + program.append("orgMentions = fn:textAnnotation()" + "[dc:type is dbpedia-ont:Organisation]/fise:selected-text :: xsd:string;"); //this uses the labels of suggested organisations with the highest confidence //but also the selected-text as fallback if no entity is suggested. - program.append("orgNames = fn:textAnnotation(.)" + - "[dc:type is dbpedia-ont:Organisation]/fn:first(fn:suggestion(.,\"1\")/fise:entity-label,fise:selected-text) :: xsd:string;"); - program.append("linkedOrgs = fn:textAnnotation(.)" + - "[dc:type is dbpedia-ont:Organisation]/fn:suggestedEntity(.,\"1\") :: xsd:anyURI;"); + program.append("orgNames = fn:textAnnotation()" + + "[dc:type is dbpedia-ont:Organisation]/fn:first(fn:suggestion(\"1\")/fise:entity-label,fise:selected-text) :: xsd:string;"); + program.append("linkedOrgs = fn:textAnnotation()" + + "[dc:type is dbpedia-ont:Organisation]/fn:suggestedEntity(\"1\") :: xsd:anyURI;"); //this selects only linked education organisations - //NOTE: this does not use a limit on suggestion(.)! - program.append("linkedEducationOrg = fn:textAnnotation(.)" + - "[dc:type is dbpedia-ont:Organisation]/fn:suggestion(.)" + + //NOTE: this does not use a limit on suggestion()! + program.append("linkedEducationOrg = fn:textAnnotation()" + + "[dc:type is dbpedia-ont:Organisation]/fn:suggestion()" + "[fise:entity-type is dbpedia-ont:EducationalInstitution]/fise:entity-reference :: xsd:anyURI;"); Program<Resource> personProgram = ldpath.parseProgram(new StringReader(program.toString())); log.info("- - - - - - - - - - - - -"); @@ -225,11 +229,11 @@ public class UsageExamples { @Test public void exampleExtractedConcepts() throws LDPathParseException { StringBuilder program = new StringBuilder(); - program.append("conceptNames = fn:entityAnnotation(.)" + + program.append("conceptNames = fn:entityAnnotation()" + "[fise:entity-type is skos:Concept]/fise:entity-label :: xsd:anyURI;"); //this uses the labels of suggested person with the highest confidence //but also the selected-text as fallback if no entity is suggested. - program.append("linkedConcepts = fn:entityAnnotation(.)" + + program.append("linkedConcepts = fn:entityAnnotation()" + "[fise:entity-type is skos:Concept]/fise:entity-reference :: xsd:anyURI;"); Program<Resource> personProgram = ldpath.parseProgram(new StringReader(program.toString())); log.info("- - - - - - - - - - - - -"); Modified: incubator/stanbol/trunk/enhancer/pom.xml URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/enhancer/pom.xml?rev=1311019&r1=1311018&r2=1311019&view=diff ============================================================================== --- incubator/stanbol/trunk/enhancer/pom.xml (original) +++ incubator/stanbol/trunk/enhancer/pom.xml Sun Apr 8 15:12:40 2012 @@ -44,8 +44,9 @@ <modules> <module>parent</module> <module>generic/servicesapi</module> - <module>generic/enginemanager</module> - <module>generic/chainmanager</module> + <module>generic/core</module> + <module>generic/test</module> + <module>generic/rdfentities</module> <module>jobmanager</module> <module>jersey</module> <module>ldpath</module> Modified: incubator/stanbol/trunk/launchers/framework/pom.xml URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/launchers/framework/pom.xml?rev=1311019&r1=1311018&r2=1311019&view=diff ============================================================================== --- incubator/stanbol/trunk/launchers/framework/pom.xml (original) +++ incubator/stanbol/trunk/launchers/framework/pom.xml Sun Apr 8 15:12:40 2012 @@ -96,22 +96,52 @@ <manifest> <!-- make the generated jar runnable --> <addClasspath>true</addClasspath> - <mainClass>org.apache.sling.launchpad.app.Main</mainClass> + <mainClass>org.apache.stanbol.launchpad.Main</mainClass> <addDefaultImplementationEntries>true</addDefaultImplementationEntries> </manifest> </archive> </configuration> </plugin> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-shade-plugin</artifactId> + <version>1.2</version> + <executions> + <execution> + <phase>package</phase> + <goals> + <goal>shade</goal> + </goals> + <configuration> + <artifactSet> + <!-- Use this to in/exclude only specific dependencies --> + <includes> + <include>org.apache.stanbol:org.apache.stanbol.launchpad</include> + </includes> + </artifactSet> + <transformers> + <transformer implementation="org.apache.maven.plugins.shade.resource.ComponentsXmlResourceTransformer" /> + </transformers> + </configuration> + </execution> + </executions> + </plugin> </plugins> </build> <dependencies> <dependency> + <!-- The Apache Stanbol lauchpad --> + <groupId>org.apache.stanbol</groupId> + <artifactId>org.apache.stanbol.launchpad</artifactId> + </dependency> + <dependency> <!-- maven-launchpad-plugin builds on the launchpad.base app --> <groupId>org.apache.sling</groupId> <artifactId>org.apache.sling.launchpad.base</artifactId> <classifier>app</classifier> </dependency> + <dependency> <groupId>org.apache.stanbol</groupId> <artifactId>org.apache.stanbol.launchers.bundlelists.osgiframework</artifactId> @@ -129,6 +159,11 @@ </dependency> <dependency> <groupId>org.apache.stanbol</groupId> + <artifactId>org.apache.stanbol.contenthub.bundlelist</artifactId> + <type>partialbundlelist</type> + </dependency> + <dependency> + <groupId>org.apache.stanbol</groupId> <artifactId>org.apache.stanbol.ontologymanager.bundlelist</artifactId> <type>partialbundlelist</type> </dependency> Modified: incubator/stanbol/trunk/launchers/framework/src/main/bundles/list.xml URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/launchers/framework/src/main/bundles/list.xml?rev=1311019&r1=1311018&r2=1311019&view=diff ============================================================================== --- incubator/stanbol/trunk/launchers/framework/src/main/bundles/list.xml (original) +++ incubator/stanbol/trunk/launchers/framework/src/main/bundles/list.xml Sun Apr 8 15:12:40 2012 @@ -71,20 +71,37 @@ </bundle> <bundle> <groupId>org.apache.stanbol</groupId> - <artifactId>org.apache.stanbol.enhancer.weightedjobmanager</artifactId> + <artifactId>org.apache.stanbol.enhancer.core</artifactId> <version>0.9.0-incubating-SNAPSHOT</version> </bundle> - </startLevel> - - <!-- FactStore --> - <startLevel level="20"> + <!-- EnhancementJobManager implementations --> <bundle> <groupId>org.apache.stanbol</groupId> - <artifactId>org.apache.stanbol.factstore</artifactId> + <artifactId>org.apache.stanbol.enhancer.eventjobmanager</artifactId> + <version>0.9.0-incubating-SNAPSHOT</version> + </bundle> + <!-- Enhancement Chain implementations --> + <bundle> + <groupId>org.apache.stanbol</groupId> + <artifactId>org.apache.stanbol.enhancer.chain.allactive</artifactId> + <version>0.9.0-incubating-SNAPSHOT</version> + </bundle> + <bundle> + <groupId>org.apache.stanbol</groupId> + <artifactId>org.apache.stanbol.enhancer.chain.graph</artifactId> + <version>0.9.0-incubating-SNAPSHOT</version> + </bundle> + <bundle> + <groupId>org.apache.stanbol</groupId> + <artifactId>org.apache.stanbol.enhancer.chain.weighted</artifactId> + <version>0.9.0-incubating-SNAPSHOT</version> + </bundle> + <bundle> + <groupId>org.apache.stanbol</groupId> + <artifactId>org.apache.stanbol.enhancer.chain.list</artifactId> <version>0.9.0-incubating-SNAPSHOT</version> </bundle> </startLevel> - <!-- Stanbol Web Fragments --> <startLevel level="21"> <bundle> @@ -92,21 +109,28 @@ <artifactId>org.apache.stanbol.enhancer.jersey</artifactId> <version>0.9.0-incubating-SNAPSHOT</version> </bundle> - </startLevel> - <!-- Benchmarks for the Stanbol Enhancer --> - <startLevel level="21"> + <!-- Benchmarks for the Stanbol Enhancer --> <bundle> <groupId>org.apache.stanbol</groupId> <artifactId>org.apache.stanbol.enhancer.benchmark</artifactId> <version>0.9.0-incubating-SNAPSHOT</version> </bundle> </startLevel> + + <!-- FactStore --> + <startLevel level="20"> + <bundle> + <groupId>org.apache.stanbol</groupId> + <artifactId>org.apache.stanbol.factstore</artifactId> + <version>0.9.0-incubating-SNAPSHOT</version> + </bundle> + </startLevel> <!-- KReS --> <startLevel level="22"> <bundle> <groupId>org.apache.stanbol</groupId> - <artifactId>org.apache.stanbol.owl</artifactId> + <artifactId>org.apache.stanbol.commons.owl</artifactId> <version>0.9.0-incubating-SNAPSHOT</version> </bundle> </startLevel> Added: incubator/stanbol/trunk/launchers/framework/src/main/sling/common.properties URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/launchers/framework/src/main/sling/common.properties?rev=1311019&view=auto ============================================================================== --- incubator/stanbol/trunk/launchers/framework/src/main/sling/common.properties (added) +++ incubator/stanbol/trunk/launchers/framework/src/main/sling/common.properties Sun Apr 8 15:12:40 2012 @@ -0,0 +1,23 @@ +# 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 file is loaded by Apache Sling during startup. Properties defined +# in this file are copied over to the sling.properties file in the {sling.home} +# directory. + +# The stanbol home directory +# by default this is set to the same value as sling.home +stanbol.home=${sling.home} Propchange: incubator/stanbol/trunk/launchers/framework/src/main/sling/common.properties ------------------------------------------------------------------------------ svn:mime-type = text/plain Modified: incubator/stanbol/trunk/launchers/full-war/src/main/bundles/list.xml URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/launchers/full-war/src/main/bundles/list.xml?rev=1311019&r1=1311018&r2=1311019&view=diff ============================================================================== --- incubator/stanbol/trunk/launchers/full-war/src/main/bundles/list.xml (original) +++ incubator/stanbol/trunk/launchers/full-war/src/main/bundles/list.xml Sun Apr 8 15:12:40 2012 @@ -43,7 +43,7 @@ <bundle> <groupId>com.sun.jersey</groupId> <artifactId>jersey-client</artifactId> - <version>1.7</version> + <version>1.12</version> </bundle> </startLevel> Modified: incubator/stanbol/trunk/launchers/full-war/src/main/webapp/WEB-INF/web.xml URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/launchers/full-war/src/main/webapp/WEB-INF/web.xml?rev=1311019&r1=1311018&r2=1311019&view=diff ============================================================================== --- incubator/stanbol/trunk/launchers/full-war/src/main/webapp/WEB-INF/web.xml (original) +++ incubator/stanbol/trunk/launchers/full-war/src/main/webapp/WEB-INF/web.xml Sun Apr 8 15:12:40 2012 @@ -27,8 +27,16 @@ <display-name>Sling Servlet</display-name> <servlet-name>sling</servlet-name> <servlet-class>org.apache.sling.launchpad.webapp.SlingServlet</servlet-class> + <init-param> <!-- the default sling.home is set to stanbol --> + <param-name>sling.home</param-name> + <param-value>stanbol/</param-value> + </init-param> + <init-param> <!-- set the stanbol.home to the sling.home --> + <param-name>stanbol.home</param-name> + <param-value>${sling.home}</param-value> + </init-param> <load-on-startup>100</load-on-startup> - </servlet> + </servlet> <!-- Default Mapping for the Context --> <servlet-mapping> Modified: incubator/stanbol/trunk/launchers/full/pom.xml URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/launchers/full/pom.xml?rev=1311019&r1=1311018&r2=1311019&view=diff ============================================================================== --- incubator/stanbol/trunk/launchers/full/pom.xml (original) +++ incubator/stanbol/trunk/launchers/full/pom.xml Sun Apr 8 15:12:40 2012 @@ -92,15 +92,38 @@ <configuration> <archive> <manifest> - <!-- make the generated jar runnable --> <addClasspath>true</addClasspath> - <mainClass>org.apache.sling.launchpad.app.Main</mainClass> + <mainClass>org.apache.stanbol.launchpad.Main</mainClass> <addDefaultImplementationEntries>true</addDefaultImplementationEntries> </manifest> </archive> </configuration> </plugin> <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-shade-plugin</artifactId> + <version>1.2</version> + <executions> + <execution> + <phase>package</phase> + <goals> + <goal>shade</goal> + </goals> + <configuration> + <artifactSet> + <!-- Use this to in/exclude only specific dependencies --> + <includes> + <include>org.apache.stanbol:org.apache.stanbol.launchpad</include> + </includes> + </artifactSet> + <transformers> + <transformer implementation="org.apache.maven.plugins.shade.resource.ComponentsXmlResourceTransformer" /> + </transformers> + </configuration> + </execution> + </executions> + </plugin> + <plugin> <groupId>org.apache.rat</groupId> <artifactId>apache-rat-plugin</artifactId> <configuration> @@ -112,6 +135,11 @@ <dependencies> <dependency> + <!-- The Apache Stanbol lauchpad --> + <groupId>org.apache.stanbol</groupId> + <artifactId>org.apache.stanbol.launchpad</artifactId> + </dependency> + <dependency> <!-- maven-launchpad-plugin builds on the launchpad.base app --> <groupId>org.apache.sling</groupId> <artifactId>org.apache.sling.launchpad.base</artifactId> Modified: incubator/stanbol/trunk/launchers/full/src/main/bundles/list.xml URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/launchers/full/src/main/bundles/list.xml?rev=1311019&r1=1311018&r2=1311019&view=diff ============================================================================== --- incubator/stanbol/trunk/launchers/full/src/main/bundles/list.xml (original) +++ incubator/stanbol/trunk/launchers/full/src/main/bundles/list.xml Sun Apr 8 15:12:40 2012 @@ -38,7 +38,7 @@ <bundle> <groupId>com.sun.jersey</groupId> <artifactId>jersey-client</artifactId> - <version>1.7</version> + <version>1.12</version> </bundle> </startLevel> Added: incubator/stanbol/trunk/launchers/full/src/main/sling/common.properties URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/launchers/full/src/main/sling/common.properties?rev=1311019&view=auto ============================================================================== --- incubator/stanbol/trunk/launchers/full/src/main/sling/common.properties (added) +++ incubator/stanbol/trunk/launchers/full/src/main/sling/common.properties Sun Apr 8 15:12:40 2012 @@ -0,0 +1,23 @@ +# 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 file is loaded by Apache Sling during startup. Properties defined +# in this file are copied over to the sling.properties file in the {sling.home} +# directory. + +# The stanbol home directory +# by default this is set to the same value as sling.home +stanbol.home=${sling.home} Propchange: incubator/stanbol/trunk/launchers/full/src/main/sling/common.properties ------------------------------------------------------------------------------ svn:mime-type = text/plain Modified: incubator/stanbol/trunk/launchers/stable/pom.xml URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/launchers/stable/pom.xml?rev=1311019&r1=1311018&r2=1311019&view=diff ============================================================================== --- incubator/stanbol/trunk/launchers/stable/pom.xml (original) +++ incubator/stanbol/trunk/launchers/stable/pom.xml Sun Apr 8 15:12:40 2012 @@ -93,13 +93,37 @@ <manifest> <!-- make the generated jar runnable --> <addClasspath>true</addClasspath> - <mainClass>org.apache.sling.launchpad.app.Main</mainClass> + <mainClass>org.apache.stanbol.launchpad.Main</mainClass> <addDefaultImplementationEntries>true</addDefaultImplementationEntries> </manifest> </archive> </configuration> </plugin> <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-shade-plugin</artifactId> + <version>1.2</version> + <executions> + <execution> + <phase>package</phase> + <goals> + <goal>shade</goal> + </goals> + <configuration> + <artifactSet> + <!-- Use this to in/exclude only specific dependencies --> + <includes> + <include>org.apache.stanbol:org.apache.stanbol.launchpad</include> + </includes> + </artifactSet> + <transformers> + <transformer implementation="org.apache.maven.plugins.shade.resource.ComponentsXmlResourceTransformer" /> + </transformers> + </configuration> + </execution> + </executions> + </plugin> + <plugin> <groupId>org.apache.rat</groupId> <artifactId>apache-rat-plugin</artifactId> <configuration> @@ -112,6 +136,11 @@ <dependencies> <dependency> + <!-- The Apache Stanbol lauchpad --> + <groupId>org.apache.stanbol</groupId> + <artifactId>org.apache.stanbol.launchpad</artifactId> + </dependency> + <dependency> <!-- maven-launchpad-plugin builds on the launchpad.base app --> <groupId>org.apache.sling</groupId> <artifactId>org.apache.sling.launchpad.base</artifactId> Added: incubator/stanbol/trunk/launchers/stable/src/main/sling/common.properties URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/launchers/stable/src/main/sling/common.properties?rev=1311019&view=auto ============================================================================== --- incubator/stanbol/trunk/launchers/stable/src/main/sling/common.properties (added) +++ incubator/stanbol/trunk/launchers/stable/src/main/sling/common.properties Sun Apr 8 15:12:40 2012 @@ -0,0 +1,23 @@ +# 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 file is loaded by Apache Sling during startup. Properties defined +# in this file are copied over to the sling.properties file in the {sling.home} +# directory. + +# The stanbol home directory +# by default this is set to the same value as sling.home +stanbol.home=${sling.home} Propchange: incubator/stanbol/trunk/launchers/stable/src/main/sling/common.properties ------------------------------------------------------------------------------ svn:mime-type = text/plain Modified: incubator/stanbol/trunk/parent/pom.xml URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/parent/pom.xml?rev=1311019&r1=1311018&r2=1311019&view=diff ============================================================================== --- incubator/stanbol/trunk/parent/pom.xml (original) +++ incubator/stanbol/trunk/parent/pom.xml Sun Apr 8 15:12:40 2012 @@ -343,7 +343,7 @@ <pluginExecutionFilter> <groupId>org.apache.sling</groupId> <artifactId>maven-launchpad-plugin</artifactId> - <versionRange>[2.0.10,)</versionRange> + <versionRange>[2.1.0,)</versionRange> <goals> <goal>prepare-package</goal> </goals> @@ -444,6 +444,11 @@ <!-- Stanbol Deps --> <dependency> <groupId>org.apache.stanbol</groupId> + <artifactId>org.apache.stanbol.launchpad</artifactId> + <version>0.9.0-incubating-SNAPSHOT</version> + </dependency> + <dependency> + <groupId>org.apache.stanbol</groupId> <artifactId>org.apache.stanbol.commons.jsonld</artifactId> <version>0.9.0-incubating-SNAPSHOT</version> </dependency> @@ -542,12 +547,18 @@ </dependency> <dependency> <groupId>org.apache.stanbol</groupId> - <artifactId>org.apache.stanbol.enhancer.chainmanager</artifactId> + <artifactId>org.apache.stanbol.enhancer.core</artifactId> + <version>0.9.0-incubating-SNAPSHOT</version> + </dependency> + <dependency> + <groupId>org.apache.stanbol</groupId> + <artifactId>org.apache.stanbol.enhancer.test</artifactId> <version>0.9.0-incubating-SNAPSHOT</version> + <scope>test</scope> </dependency> <dependency> <groupId>org.apache.stanbol</groupId> - <artifactId>org.apache.stanbol.enhancer.enginemanager</artifactId> + <artifactId>org.apache.stanbol.enhancer.rdfentities</artifactId> <version>0.9.0-incubating-SNAPSHOT</version> </dependency> <dependency> @@ -602,6 +613,7 @@ <groupId>org.apache.stanbol</groupId> <artifactId>org.apache.stanbol.entityhub.test</artifactId> <version>0.9.0-incubating-SNAPSHOT</version> + <scope>test</scope> </dependency> <dependency> <groupId>org.apache.stanbol</groupId> @@ -728,6 +740,7 @@ <groupId>org.apache.stanbol</groupId> <artifactId>org.apache.stanbol.reasoners.test</artifactId> <version>0.9.0-incubating-SNAPSHOT</version> + <scope>test</scope> </dependency> <dependency> <groupId>org.apache.stanbol</groupId> @@ -1086,6 +1099,7 @@ <groupId>org.apache.clerezza</groupId> <artifactId>rdf.core.test</artifactId> <version>0.13-incubating</version> + <scope>test</scope> </dependency> Modified: incubator/stanbol/trunk/pom.xml URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/pom.xml?rev=1311019&r1=1311018&r2=1311019&view=diff ============================================================================== --- incubator/stanbol/trunk/pom.xml (original) +++ incubator/stanbol/trunk/pom.xml Sun Apr 8 15:12:40 2012 @@ -57,8 +57,9 @@ <module>enhancer/parent</module> <module>enhancer/generic/servicesapi</module> - <module>enhancer/generic/chainmanager</module> - <module>enhancer/generic/enginemanager</module> + <module>enhancer/generic/core</module> + <module>enhancer/generic/test</module> + <module>enhancer/generic/rdfentities</module> <module>enhancer/jobmanager</module> <module>enhancer/chain/allactive</module> <module>enhancer/chain/graph</module>
