Modified: stanbol/branches/release-0.12/entityhub/indexing/core/src/main/java/org/apache/stanbol/entityhub/indexing/core/processor/LdpathSourceProcessor.java URL: http://svn.apache.org/viewvc/stanbol/branches/release-0.12/entityhub/indexing/core/src/main/java/org/apache/stanbol/entityhub/indexing/core/processor/LdpathSourceProcessor.java?rev=1572588&r1=1572587&r2=1572588&view=diff ============================================================================== --- stanbol/branches/release-0.12/entityhub/indexing/core/src/main/java/org/apache/stanbol/entityhub/indexing/core/processor/LdpathSourceProcessor.java (original) +++ stanbol/branches/release-0.12/entityhub/indexing/core/src/main/java/org/apache/stanbol/entityhub/indexing/core/processor/LdpathSourceProcessor.java Thu Feb 27 14:17:47 2014 @@ -24,6 +24,7 @@ import java.io.Reader; import java.net.URI; import java.nio.charset.Charset; import java.util.Collection; +import java.util.Collections; import java.util.Locale; import java.util.Map; import java.util.Map.Entry; @@ -37,14 +38,13 @@ import org.apache.stanbol.entityhub.serv import org.apache.stanbol.entityhub.servicesapi.model.ValueFactory; import org.slf4j.Logger; import org.slf4j.LoggerFactory; - -import at.newmedialab.ldpath.LDPath; -import at.newmedialab.ldpath.api.backend.RDFBackend; -import at.newmedialab.ldpath.api.transformers.NodeTransformer; -import at.newmedialab.ldpath.exception.LDPathParseException; -import at.newmedialab.ldpath.model.programs.Program; -import at.newmedialab.ldpath.model.transformers.IdentityTransformer; -import at.newmedialab.ldpath.parser.Configuration; +import org.apache.marmotta.ldpath.LDPath; +import org.apache.marmotta.ldpath.api.backend.RDFBackend; +import org.apache.marmotta.ldpath.api.transformers.NodeTransformer; +import org.apache.marmotta.ldpath.exception.LDPathParseException; +import org.apache.marmotta.ldpath.model.programs.Program; +import org.apache.marmotta.ldpath.model.transformers.IdentityTransformer; +import org.apache.marmotta.ldpath.parser.Configuration; /** * LDpath based processor that tries to cast the @@ -234,7 +234,8 @@ public class LdpathSourceProcessor imple NodeTransformer nt = transformer.get(type.toString()); if(nt != null){ //add typed literal try { - result.add(entry.getKey(), nt.transform(backend, value)); + result.add(entry.getKey(), nt.transform(backend, value, + Collections.<String,String>emptyMap())); } catch (RuntimeException e) { log.info("Unable to transform {} to dataType {} -> will use lexical form",value,type); result.add(entry.getKey(),backend.stringValue(value));
Modified: stanbol/branches/release-0.12/entityhub/indexing/source/jenatdb/pom.xml URL: http://svn.apache.org/viewvc/stanbol/branches/release-0.12/entityhub/indexing/source/jenatdb/pom.xml?rev=1572588&r1=1572587&r2=1572588&view=diff ============================================================================== --- stanbol/branches/release-0.12/entityhub/indexing/source/jenatdb/pom.xml (original) +++ stanbol/branches/release-0.12/entityhub/indexing/source/jenatdb/pom.xml Thu Feb 27 14:17:47 2014 @@ -104,7 +104,7 @@ <dependency> <groupId>org.apache.stanbol</groupId> <artifactId>org.apache.stanbol.entityhub.ldpath</artifactId> - <version>0.11.0</version> + <version>0.12.1-SNAPSHOT</version> </dependency> <dependency> @@ -136,6 +136,11 @@ <artifactId>jena-arq</artifactId> <version>2.10.0</version> </dependency> + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-api</artifactId> + </dependency> + <!-- dependencies for testing --> <dependency> <!-- used for debug level logging during tests --> <groupId>org.slf4j</groupId> @@ -143,10 +148,11 @@ <scope>test</scope> </dependency> <dependency> - <groupId>log4j</groupId> - <artifactId>log4j</artifactId> + <groupId>org.slf4j</groupId> + <artifactId>log4j-over-slf4j</artifactId> <scope>test</scope> </dependency> + <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> Modified: stanbol/branches/release-0.12/entityhub/indexing/source/jenatdb/src/main/java/org/apache/stanbol/entityhub/indexing/source/jenatdb/AbstractTdbBackend.java URL: http://svn.apache.org/viewvc/stanbol/branches/release-0.12/entityhub/indexing/source/jenatdb/src/main/java/org/apache/stanbol/entityhub/indexing/source/jenatdb/AbstractTdbBackend.java?rev=1572588&r1=1572587&r2=1572588&view=diff ============================================================================== --- stanbol/branches/release-0.12/entityhub/indexing/source/jenatdb/src/main/java/org/apache/stanbol/entityhub/indexing/source/jenatdb/AbstractTdbBackend.java (original) +++ stanbol/branches/release-0.12/entityhub/indexing/source/jenatdb/src/main/java/org/apache/stanbol/entityhub/indexing/source/jenatdb/AbstractTdbBackend.java Thu Feb 27 14:17:47 2014 @@ -26,13 +26,13 @@ import java.util.Map; import java.util.TreeMap; import java.util.concurrent.ThreadPoolExecutor; +import org.apache.marmotta.ldpath.api.backend.RDFBackend; +import org.apache.marmotta.ldpath.model.backend.AbstractBackend; + import com.hp.hpl.jena.datatypes.TypeMapper; import com.hp.hpl.jena.datatypes.xsd.XSDDateTime; import com.hp.hpl.jena.graph.Node; -import at.newmedialab.ldpath.api.backend.RDFBackend; -import at.newmedialab.ldpath.model.backend.AbstractBackend; - /** * Implements all the value converter methods of {@link RDFBackend}. * @author Rupert Westenthaler Modified: stanbol/branches/release-0.12/entityhub/indexing/source/jenatdb/src/main/java/org/apache/stanbol/entityhub/indexing/source/jenatdb/RdfIndexingSource.java URL: http://svn.apache.org/viewvc/stanbol/branches/release-0.12/entityhub/indexing/source/jenatdb/src/main/java/org/apache/stanbol/entityhub/indexing/source/jenatdb/RdfIndexingSource.java?rev=1572588&r1=1572587&r2=1572588&view=diff ============================================================================== --- stanbol/branches/release-0.12/entityhub/indexing/source/jenatdb/src/main/java/org/apache/stanbol/entityhub/indexing/source/jenatdb/RdfIndexingSource.java (original) +++ stanbol/branches/release-0.12/entityhub/indexing/source/jenatdb/src/main/java/org/apache/stanbol/entityhub/indexing/source/jenatdb/RdfIndexingSource.java Thu Feb 27 14:17:47 2014 @@ -29,6 +29,7 @@ import java.util.Map; import java.util.NoSuchElementException; import org.apache.commons.io.FilenameUtils; +import org.apache.marmotta.ldpath.api.backend.RDFBackend; import org.apache.stanbol.entityhub.core.model.InMemoryValueFactory; import org.apache.stanbol.entityhub.indexing.core.EntityDataIterable; import org.apache.stanbol.entityhub.indexing.core.EntityDataIterator; @@ -45,8 +46,6 @@ import org.apache.stanbol.entityhub.serv import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import at.newmedialab.ldpath.api.backend.RDFBackend; - import com.hp.hpl.jena.datatypes.BaseDatatype; import com.hp.hpl.jena.datatypes.DatatypeFormatException; import com.hp.hpl.jena.datatypes.RDFDatatype; Modified: stanbol/branches/release-0.12/entityhub/jersey/pom.xml URL: http://svn.apache.org/viewvc/stanbol/branches/release-0.12/entityhub/jersey/pom.xml?rev=1572588&r1=1572587&r2=1572588&view=diff ============================================================================== --- stanbol/branches/release-0.12/entityhub/jersey/pom.xml (original) +++ stanbol/branches/release-0.12/entityhub/jersey/pom.xml Thu Feb 27 14:17:47 2014 @@ -130,20 +130,9 @@ <dependency> <groupId>org.apache.stanbol</groupId> <artifactId>org.apache.stanbol.entityhub.ldpath</artifactId> - <version>0.11.0</version> + <version>0.12.1-SNAPSHOT</version> </dependency> - <!-- LD Path --> - <!-- imported via entityhub.ldpath - <dependency> - <groupId>at.newmedialab.ldpath</groupId> - <artifactId>ldpath-api</artifactId> - </dependency> - <dependency> - <groupId>at.newmedialab.ldpath</groupId> - <artifactId>ldpath-core-bundle</artifactId> - </dependency> --> - <dependency> <groupId>commons-io</groupId> <artifactId>commons-io</artifactId> Modified: stanbol/branches/release-0.12/entityhub/jersey/src/main/java/org/apache/stanbol/entityhub/jersey/resource/EntityhubRootResource.java URL: http://svn.apache.org/viewvc/stanbol/branches/release-0.12/entityhub/jersey/src/main/java/org/apache/stanbol/entityhub/jersey/resource/EntityhubRootResource.java?rev=1572588&r1=1572587&r2=1572588&view=diff ============================================================================== --- stanbol/branches/release-0.12/entityhub/jersey/src/main/java/org/apache/stanbol/entityhub/jersey/resource/EntityhubRootResource.java (original) +++ stanbol/branches/release-0.12/entityhub/jersey/src/main/java/org/apache/stanbol/entityhub/jersey/resource/EntityhubRootResource.java Thu Feb 27 14:17:47 2014 @@ -74,6 +74,8 @@ import javax.ws.rs.core.Response; import javax.ws.rs.core.Response.ResponseBuilder; import javax.ws.rs.core.Response.Status; +import org.apache.marmotta.ldpath.exception.LDPathParseException; +import org.apache.marmotta.ldpath.model.programs.Program; import org.apache.stanbol.commons.indexedgraph.IndexedMGraph; import org.apache.stanbol.commons.namespaceprefix.NamespaceMappingUtils; import org.apache.stanbol.commons.namespaceprefix.NamespacePrefixService; @@ -98,10 +100,6 @@ import org.apache.stanbol.entityhub.serv import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import at.newmedialab.ldpath.exception.LDPathParseException; -import at.newmedialab.ldpath.model.programs.Program; - - @Path("/entityhub") public class EntityhubRootResource extends BaseStanbolResource { Modified: stanbol/branches/release-0.12/entityhub/jersey/src/main/java/org/apache/stanbol/entityhub/jersey/resource/ReferencedSiteRootResource.java URL: http://svn.apache.org/viewvc/stanbol/branches/release-0.12/entityhub/jersey/src/main/java/org/apache/stanbol/entityhub/jersey/resource/ReferencedSiteRootResource.java?rev=1572588&r1=1572587&r2=1572588&view=diff ============================================================================== --- stanbol/branches/release-0.12/entityhub/jersey/src/main/java/org/apache/stanbol/entityhub/jersey/resource/ReferencedSiteRootResource.java (original) +++ stanbol/branches/release-0.12/entityhub/jersey/src/main/java/org/apache/stanbol/entityhub/jersey/resource/ReferencedSiteRootResource.java Thu Feb 27 14:17:47 2014 @@ -78,6 +78,8 @@ import javax.ws.rs.core.UriInfo; import org.apache.clerezza.rdf.core.serializedform.SupportedFormat; import org.apache.clerezza.rdf.ontologies.RDFS; +import org.apache.marmotta.ldpath.exception.LDPathParseException; +import org.apache.marmotta.ldpath.model.programs.Program; import org.apache.stanbol.commons.indexedgraph.IndexedMGraph; import org.apache.stanbol.commons.namespaceprefix.NamespaceMappingUtils; import org.apache.stanbol.commons.namespaceprefix.NamespacePrefixService; @@ -110,9 +112,6 @@ import org.apache.stanbol.entityhub.serv import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import at.newmedialab.ldpath.exception.LDPathParseException; -import at.newmedialab.ldpath.model.programs.Program; - /** * Resource to provide a REST API for the {@link SiteManager} * <p/> Modified: stanbol/branches/release-0.12/entityhub/jersey/src/main/java/org/apache/stanbol/entityhub/jersey/resource/SiteManagerRootResource.java URL: http://svn.apache.org/viewvc/stanbol/branches/release-0.12/entityhub/jersey/src/main/java/org/apache/stanbol/entityhub/jersey/resource/SiteManagerRootResource.java?rev=1572588&r1=1572587&r2=1572588&view=diff ============================================================================== --- stanbol/branches/release-0.12/entityhub/jersey/src/main/java/org/apache/stanbol/entityhub/jersey/resource/SiteManagerRootResource.java (original) +++ stanbol/branches/release-0.12/entityhub/jersey/src/main/java/org/apache/stanbol/entityhub/jersey/resource/SiteManagerRootResource.java Thu Feb 27 14:17:47 2014 @@ -62,6 +62,8 @@ import javax.ws.rs.core.Response.Status; import javax.ws.rs.core.UriInfo; import org.apache.clerezza.rdf.ontologies.RDFS; +import org.apache.marmotta.ldpath.exception.LDPathParseException; +import org.apache.marmotta.ldpath.model.programs.Program; import org.apache.stanbol.commons.indexedgraph.IndexedMGraph; import org.apache.stanbol.commons.namespaceprefix.NamespaceMappingUtils; import org.apache.stanbol.commons.namespaceprefix.NamespacePrefixService; @@ -85,9 +87,6 @@ import org.codehaus.jettison.json.JSONAr import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import at.newmedialab.ldpath.exception.LDPathParseException; -import at.newmedialab.ldpath.model.programs.Program; - /** * Resource to provide a REST API for the {@link SiteManager}. Modified: stanbol/branches/release-0.12/entityhub/jersey/src/main/java/org/apache/stanbol/entityhub/jersey/utils/LDPathHelper.java URL: http://svn.apache.org/viewvc/stanbol/branches/release-0.12/entityhub/jersey/src/main/java/org/apache/stanbol/entityhub/jersey/utils/LDPathHelper.java?rev=1572588&r1=1572587&r2=1572588&view=diff ============================================================================== --- stanbol/branches/release-0.12/entityhub/jersey/src/main/java/org/apache/stanbol/entityhub/jersey/utils/LDPathHelper.java (original) +++ stanbol/branches/release-0.12/entityhub/jersey/src/main/java/org/apache/stanbol/entityhub/jersey/utils/LDPathHelper.java Thu Feb 27 14:17:47 2014 @@ -22,6 +22,7 @@ import static org.apache.stanbol.commons import static org.apache.stanbol.commons.web.base.utils.MediaTypeUtil.getAcceptableMediaType; import static org.apache.stanbol.entityhub.ldpath.LDPathUtils.getReader; +import java.net.URI; import java.util.Collection; import java.util.HashSet; import java.util.Iterator; @@ -38,6 +39,12 @@ import javax.ws.rs.core.Response.Respons import javax.ws.rs.core.Response.Status; import org.apache.clerezza.rdf.core.MGraph; +import org.apache.marmotta.ldpath.api.backend.RDFBackend; +import org.apache.marmotta.ldpath.exception.LDPathParseException; +import org.apache.marmotta.ldpath.model.fields.FieldMapping; +import org.apache.marmotta.ldpath.model.programs.Program; +import org.apache.marmotta.ldpath.model.selectors.PropertySelector; +import org.apache.marmotta.ldpath.model.transformers.DoubleTransformer; import org.apache.stanbol.commons.indexedgraph.IndexedMGraph; import org.apache.stanbol.commons.viewable.Viewable; import org.apache.stanbol.commons.web.base.resource.BaseStanbolResource; @@ -55,15 +62,6 @@ import org.apache.stanbol.entityhub.serv import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import at.newmedialab.ldpath.LDPath; -import at.newmedialab.ldpath.api.backend.RDFBackend; -import at.newmedialab.ldpath.exception.LDPathParseException; -import at.newmedialab.ldpath.model.fields.FieldMapping; -import at.newmedialab.ldpath.model.programs.Program; -import at.newmedialab.ldpath.model.selectors.PropertySelector; -import at.newmedialab.ldpath.model.transformers.DoubleTransformer; - - public class LDPathHelper { private static final Logger log = LoggerFactory.getLogger(LDPathHelper.class); @@ -73,7 +71,8 @@ public class LDPathHelper { */ public static final FieldMapping<Double,Object> RESULT_SCORE_MAPPING = new FieldMapping<Double,Object>(RdfResourceEnum.resultScore.getUri(), - "http://www.w3.org/2001/XMLSchema#double";, new PropertySelector<Object>( + URI.create("http://www.w3.org/2001/XMLSchema#double";), + new PropertySelector<Object>( InMemoryValueFactory.getInstance().createReference( RdfResourceEnum.resultScore.getUri())), new DoubleTransformer<Object>(), null); Modified: stanbol/branches/release-0.12/entityhub/ldpath/pom.xml URL: http://svn.apache.org/viewvc/stanbol/branches/release-0.12/entityhub/ldpath/pom.xml?rev=1572588&r1=1572587&r2=1572588&view=diff ============================================================================== --- stanbol/branches/release-0.12/entityhub/ldpath/pom.xml (original) +++ stanbol/branches/release-0.12/entityhub/ldpath/pom.xml Thu Feb 27 14:17:47 2014 @@ -55,9 +55,9 @@ <configuration> <instructions> <Import-Package> - at.newmedialab.ldpath; provide:=true, - at.newmedialab.ldpath.api.backend; provide:=true, - at.newmedialab.ldpath.api.transformers; provide:=true, + org.apache.marmotta.ldpath; provide:=true, + org.apache.marmotta.ldpath.api.backend; provide:=true, + org.apache.marmotta.ldpath.api.transformers; provide:=true, org.apache.stanbol.entityhub.servicesapi.query; provide:=true; version="[0.11,0.13)", org.apache.stanbol.entityhub.ldpath, org.apache.stanbol.entityhub.ldpath.backend, @@ -100,12 +100,12 @@ <!-- LD Path --> <dependency> - <groupId>at.newmedialab.ldpath</groupId> + <groupId>org.apache.marmotta</groupId> <artifactId>ldpath-api</artifactId> </dependency> <dependency> - <groupId>at.newmedialab.ldpath</groupId> - <artifactId>ldpath-core-bundle</artifactId> + <groupId>org.apache.marmotta</groupId> + <artifactId>ldpath-core</artifactId> </dependency> <!-- generic tax --> Modified: stanbol/branches/release-0.12/entityhub/ldpath/src/main/java/org/apache/stanbol/entityhub/ldpath/EntityhubLDPath.java URL: http://svn.apache.org/viewvc/stanbol/branches/release-0.12/entityhub/ldpath/src/main/java/org/apache/stanbol/entityhub/ldpath/EntityhubLDPath.java?rev=1572588&r1=1572587&r2=1572588&view=diff ============================================================================== --- stanbol/branches/release-0.12/entityhub/ldpath/src/main/java/org/apache/stanbol/entityhub/ldpath/EntityhubLDPath.java (original) +++ stanbol/branches/release-0.12/entityhub/ldpath/src/main/java/org/apache/stanbol/entityhub/ldpath/EntityhubLDPath.java Thu Feb 27 14:17:47 2014 @@ -18,6 +18,11 @@ package org.apache.stanbol.entityhub.ldp import java.util.Collection; +import org.apache.marmotta.ldpath.LDPath; +import org.apache.marmotta.ldpath.api.backend.RDFBackend; +import org.apache.marmotta.ldpath.model.fields.FieldMapping; +import org.apache.marmotta.ldpath.model.programs.Program; +import org.apache.marmotta.ldpath.parser.DefaultConfiguration; import org.apache.stanbol.entityhub.core.mapping.ValueConverterFactory.AnyUriConverter; import org.apache.stanbol.entityhub.core.mapping.ValueConverterFactory.ReferenceConverter; import org.apache.stanbol.entityhub.core.mapping.ValueConverterFactory.TextConverter; @@ -31,13 +36,6 @@ import org.apache.stanbol.entityhub.serv import org.apache.stanbol.entityhub.servicesapi.model.Text; import org.apache.stanbol.entityhub.servicesapi.model.ValueFactory; -import at.newmedialab.ldpath.LDPath; -import at.newmedialab.ldpath.api.backend.RDFBackend; -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.DefaultConfiguration; - /** * {@link LDPath} with Entityhub specific configurations. * In detail this registers {@link NodeTransformer} for:<ul> Modified: stanbol/branches/release-0.12/entityhub/ldpath/src/main/java/org/apache/stanbol/entityhub/ldpath/LDPathUtils.java URL: http://svn.apache.org/viewvc/stanbol/branches/release-0.12/entityhub/ldpath/src/main/java/org/apache/stanbol/entityhub/ldpath/LDPathUtils.java?rev=1572588&r1=1572587&r2=1572588&view=diff ============================================================================== --- stanbol/branches/release-0.12/entityhub/ldpath/src/main/java/org/apache/stanbol/entityhub/ldpath/LDPathUtils.java (original) +++ stanbol/branches/release-0.12/entityhub/ldpath/src/main/java/org/apache/stanbol/entityhub/ldpath/LDPathUtils.java Thu Feb 27 14:17:47 2014 @@ -22,8 +22,6 @@ import java.io.InputStreamReader; import java.io.Reader; import java.io.UnsupportedEncodingException; -import at.newmedialab.ldpath.model.programs.Program; - public class LDPathUtils { /** * Utility method that creates a reader over the parsed String using UTF-8 Modified: stanbol/branches/release-0.12/entityhub/ldpath/src/main/java/org/apache/stanbol/entityhub/ldpath/backend/AbstractBackend.java URL: http://svn.apache.org/viewvc/stanbol/branches/release-0.12/entityhub/ldpath/src/main/java/org/apache/stanbol/entityhub/ldpath/backend/AbstractBackend.java?rev=1572588&r1=1572587&r2=1572588&view=diff ============================================================================== --- stanbol/branches/release-0.12/entityhub/ldpath/src/main/java/org/apache/stanbol/entityhub/ldpath/backend/AbstractBackend.java (original) +++ stanbol/branches/release-0.12/entityhub/ldpath/src/main/java/org/apache/stanbol/entityhub/ldpath/backend/AbstractBackend.java Thu Feb 27 14:17:47 2014 @@ -34,6 +34,7 @@ import java.util.Set; import java.util.TreeMap; import java.util.concurrent.ThreadPoolExecutor; +import org.apache.marmotta.ldpath.api.backend.RDFBackend; import org.apache.stanbol.entityhub.core.mapping.ValueConverterFactory; import org.apache.stanbol.entityhub.servicesapi.EntityhubException; import org.apache.stanbol.entityhub.servicesapi.defaults.DataTypeEnum; @@ -51,7 +52,6 @@ import org.apache.stanbol.entityhub.serv import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import at.newmedialab.ldpath.api.backend.RDFBackend; /** * Abstract super class for all Entityhub related {@link RDFBackend} * implementations. This implements the whole {@link RDFBackend} interface by Modified: stanbol/branches/release-0.12/entityhub/ldpath/src/main/java/org/apache/stanbol/entityhub/ldpath/transformer/ValueConverterTransformerAdapter.java URL: http://svn.apache.org/viewvc/stanbol/branches/release-0.12/entityhub/ldpath/src/main/java/org/apache/stanbol/entityhub/ldpath/transformer/ValueConverterTransformerAdapter.java?rev=1572588&r1=1572587&r2=1572588&view=diff ============================================================================== --- stanbol/branches/release-0.12/entityhub/ldpath/src/main/java/org/apache/stanbol/entityhub/ldpath/transformer/ValueConverterTransformerAdapter.java (original) +++ stanbol/branches/release-0.12/entityhub/ldpath/src/main/java/org/apache/stanbol/entityhub/ldpath/transformer/ValueConverterTransformerAdapter.java Thu Feb 27 14:17:47 2014 @@ -16,16 +16,16 @@ */ package org.apache.stanbol.entityhub.ldpath.transformer; +import java.util.Map; + +import org.apache.marmotta.ldpath.api.backend.RDFBackend; +import org.apache.marmotta.ldpath.api.transformers.NodeTransformer; import org.apache.stanbol.entityhub.core.mapping.ValueConverterFactory.ValueConverter; import org.apache.stanbol.entityhub.core.model.InMemoryValueFactory; import org.apache.stanbol.entityhub.servicesapi.model.Reference; import org.apache.stanbol.entityhub.servicesapi.model.Text; import org.apache.stanbol.entityhub.servicesapi.model.ValueFactory; -import at.newmedialab.ldpath.LDPath; -import at.newmedialab.ldpath.api.backend.RDFBackend; -import at.newmedialab.ldpath.api.transformers.NodeTransformer; - /** * LDPath {@link NodeTransformer} internally using the Entityhub * {@link ValueConverter}. <p> @@ -49,7 +49,7 @@ public class ValueConverterTransformerAd this.vc = vc; } @Override - public T transform(RDFBackend<Object> backend, Object node) throws IllegalArgumentException { + public T transform(RDFBackend<Object> backend, Object node, Map<String, String> configuration) throws IllegalArgumentException { T value = vc.convert(node, vf); if(value == null){ value = vc.convert(backend.stringValue(node), vf); Modified: stanbol/branches/release-0.12/entityhub/ldpath/src/test/java/org/apache/stanbol/entityhub/ldpath/EntityhubLDPathTest.java URL: http://svn.apache.org/viewvc/stanbol/branches/release-0.12/entityhub/ldpath/src/test/java/org/apache/stanbol/entityhub/ldpath/EntityhubLDPathTest.java?rev=1572588&r1=1572587&r2=1572588&view=diff ============================================================================== --- stanbol/branches/release-0.12/entityhub/ldpath/src/test/java/org/apache/stanbol/entityhub/ldpath/EntityhubLDPathTest.java (original) +++ stanbol/branches/release-0.12/entityhub/ldpath/src/test/java/org/apache/stanbol/entityhub/ldpath/EntityhubLDPathTest.java Thu Feb 27 14:17:47 2014 @@ -18,6 +18,7 @@ package org.apache.stanbol.entityhub.ldp import static org.apache.stanbol.entityhub.ldpath.LDPathUtils.getReader; import static org.junit.Assert.*; + import java.util.Arrays; import java.util.Collection; import java.util.Collections; @@ -27,6 +28,7 @@ import java.util.Iterator; import java.util.Map; import java.util.Map.Entry; +import org.apache.marmotta.ldpath.model.programs.Program; import org.apache.stanbol.entityhub.core.model.InMemoryValueFactory; import org.apache.stanbol.entityhub.ldpath.impl.LDPathTestBase; import org.apache.stanbol.entityhub.ldpath.transformer.ValueConverterTransformerAdapter; @@ -40,9 +42,6 @@ import org.junit.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import at.newmedialab.ldpath.api.backend.RDFBackend; -import at.newmedialab.ldpath.model.programs.Program; - public class EntityhubLDPathTest extends LDPathTestBase { private static final Logger log = LoggerFactory.getLogger(EntityhubLDPathTest.class); Modified: stanbol/branches/release-0.12/entityhub/ldpath/src/test/java/org/apache/stanbol/entityhub/ldpath/backend/BackendTest.java URL: http://svn.apache.org/viewvc/stanbol/branches/release-0.12/entityhub/ldpath/src/test/java/org/apache/stanbol/entityhub/ldpath/backend/BackendTest.java?rev=1572588&r1=1572587&r2=1572588&view=diff ============================================================================== --- stanbol/branches/release-0.12/entityhub/ldpath/src/test/java/org/apache/stanbol/entityhub/ldpath/backend/BackendTest.java (original) +++ stanbol/branches/release-0.12/entityhub/ldpath/src/test/java/org/apache/stanbol/entityhub/ldpath/backend/BackendTest.java Thu Feb 27 14:17:47 2014 @@ -26,6 +26,9 @@ import java.util.Collections; import java.util.HashMap; import java.util.HashSet; import java.util.Map; + +import org.apache.marmotta.ldpath.LDPath; +import org.apache.marmotta.ldpath.model.programs.Program; import org.apache.stanbol.entityhub.ldpath.impl.LDPathTestBase; import org.apache.stanbol.entityhub.servicesapi.model.Representation; import org.junit.Assert; @@ -33,10 +36,6 @@ import org.junit.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import at.newmedialab.ldpath.LDPath; -import at.newmedialab.ldpath.api.backend.RDFBackend; -import at.newmedialab.ldpath.model.programs.Program; - public class BackendTest extends LDPathTestBase { private static final Logger log = LoggerFactory.getLogger(BackendTest.class); Modified: stanbol/branches/release-0.12/launchers/bundlelists/stanbolcommons/src/main/bundles/list.xml URL: http://svn.apache.org/viewvc/stanbol/branches/release-0.12/launchers/bundlelists/stanbolcommons/src/main/bundles/list.xml?rev=1572588&r1=1572587&r2=1572588&view=diff ============================================================================== --- stanbol/branches/release-0.12/launchers/bundlelists/stanbolcommons/src/main/bundles/list.xml (original) +++ stanbol/branches/release-0.12/launchers/bundlelists/stanbolcommons/src/main/bundles/list.xml Thu Feb 27 14:17:47 2014 @@ -99,6 +99,11 @@ <version>2.6</version> </bundle> <bundle> + <groupId>org.apache.commons</groupId> + <artifactId>commons-lang3</artifactId> + <version>3.2.1</version> + </bundle> + <bundle> <groupId>commons-collections</groupId> <artifactId>commons-collections</artifactId> <version>3.2.1</version> @@ -515,14 +520,19 @@ <!-- LD Path --> <startLevel level="27"> <bundle> <!-- LD Path --> - <groupId>at.newmedialab.ldpath</groupId> + <groupId>org.apache.marmotta</groupId> <artifactId>ldpath-api</artifactId> - <version>0.9.5</version> + <version>3.2.0-SNAPSHOT</version> </bundle> <bundle> - <groupId>at.newmedialab.ldpath</groupId> + <groupId>org.apache.marmotta</groupId> <artifactId>ldpath-core-bundle</artifactId> - <version>0.9.5</version> + <version>3.2.0-SNAPSHOT</version> + </bundle> + <bundle> + <groupId>org.apache.marmotta</groupId> + <artifactId>ldpath-template</artifactId> + <version>3.2.0-SNAPSHOT</version> </bundle> <bundle> <groupId>org.apache.stanbol</groupId> Modified: stanbol/branches/release-0.12/launchers/full-war/pom.xml URL: http://svn.apache.org/viewvc/stanbol/branches/release-0.12/launchers/full-war/pom.xml?rev=1572588&r1=1572587&r2=1572588&view=diff ============================================================================== --- stanbol/branches/release-0.12/launchers/full-war/pom.xml (original) +++ stanbol/branches/release-0.12/launchers/full-war/pom.xml Thu Feb 27 14:17:47 2014 @@ -135,7 +135,7 @@ <dependency> <groupId>org.apache.stanbol</groupId> <artifactId>org.apache.stanbol.launchers.bundlelists.osgiframework</artifactId> - <version>0.12.0</version> + <version>0.12.1-SNAPSHOT</version> <type>partialbundlelist</type> </dependency> @@ -143,14 +143,14 @@ <dependency> <groupId>org.apache.stanbol</groupId> <artifactId>org.apache.stanbol.launchers.bundlelists.stanbolcommons</artifactId> - <version>0.12.0</version> + <version>0.12.1-SNAPSHOT</version> <type>partialbundlelist</type> </dependency> <!-- Security Support--> <dependency> <groupId>org.apache.stanbol</groupId> <artifactId>org.apache.stanbol.launchers.bundlelists.security</artifactId> - <version>0.12.0</version> + <version>0.12.1-SNAPSHOT</version> <type>partialbundlelist</type> <scope>provided</scope> </dependency> @@ -159,7 +159,7 @@ <dependency> <groupId>org.apache.stanbol</groupId> <artifactId>org.apache.stanbol.launchers.bundlelists.cmsadapter</artifactId> - <version>0.12.0</version> + <version>0.12.1-SNAPSHOT</version> <type>partialbundlelist</type> </dependency> @@ -167,7 +167,7 @@ <dependency> <groupId>org.apache.stanbol</groupId> <artifactId>org.apache.stanbol.launchers.bundlelists.contenthub</artifactId> - <version>0.12.0</version> + <version>0.12.1-SNAPSHOT</version> <type>partialbundlelist</type> </dependency> @@ -175,13 +175,13 @@ <dependency> <groupId>org.apache.stanbol</groupId> <artifactId>org.apache.stanbol.launchers.bundlelists.defaultdata</artifactId> - <version>0.12.0</version> + <version>0.12.1-SNAPSHOT</version> <type>partialbundlelist</type> </dependency> <dependency> <!-- include all OpenNLP models in the full launcher --> <groupId>org.apache.stanbol</groupId> <artifactId>org.apache.stanbol.launchers.bundlelists.opennlp</artifactId> - <version>0.12.0</version> + <version>0.12.1-SNAPSHOT</version> <type>partialbundlelist</type> <scope>provided</scope> </dependency> @@ -190,7 +190,7 @@ <dependency> <groupId>org.apache.stanbol</groupId> <artifactId>org.apache.stanbol.launchers.bundlelists.enhancer</artifactId> - <version>0.12.0</version> + <version>0.12.1-SNAPSHOT</version> <type>partialbundlelist</type> </dependency> @@ -198,7 +198,7 @@ <dependency> <groupId>org.apache.stanbol</groupId> <artifactId>org.apache.stanbol.launchers.bundlelists.entityhub</artifactId> - <version>0.12.0</version> + <version>0.12.1-SNAPSHOT</version> <type>partialbundlelist</type> </dependency> @@ -206,7 +206,7 @@ <dependency> <groupId>org.apache.stanbol</groupId> <artifactId>org.apache.stanbol.launchers.bundlelists.ontologymanager</artifactId> - <version>0.12.0</version> + <version>0.12.1-SNAPSHOT</version> <type>partialbundlelist</type> </dependency> @@ -214,7 +214,7 @@ <dependency> <groupId>org.apache.stanbol</groupId> <artifactId>org.apache.stanbol.launchers.bundlelists.rules</artifactId> - <version>0.12.0</version> + <version>0.12.1-SNAPSHOT</version> <type>partialbundlelist</type> </dependency> @@ -222,7 +222,7 @@ <dependency> <groupId>org.apache.stanbol</groupId> <artifactId>org.apache.stanbol.launchers.bundlelists.reasoners</artifactId> - <version>0.12.0</version> + <version>0.12.1-SNAPSHOT</version> <type>partialbundlelist</type> <scope>provided</scope> </dependency> Modified: stanbol/branches/release-0.12/launchers/full/pom.xml URL: http://svn.apache.org/viewvc/stanbol/branches/release-0.12/launchers/full/pom.xml?rev=1572588&r1=1572587&r2=1572588&view=diff ============================================================================== --- stanbol/branches/release-0.12/launchers/full/pom.xml (original) +++ stanbol/branches/release-0.12/launchers/full/pom.xml Thu Feb 27 14:17:47 2014 @@ -167,7 +167,7 @@ <!-- The Apache Stanbol lauchpad --> <groupId>org.apache.stanbol</groupId> <artifactId>org.apache.stanbol.commons.launchpad</artifactId> - <version>0.12.0</version> + <version>0.12.1-SNAPSHOT</version> </dependency> <dependency> <!-- maven-launchpad-plugin builds on the launchpad.base app --> @@ -180,7 +180,7 @@ <dependency> <groupId>org.apache.stanbol</groupId> <artifactId>org.apache.stanbol.launchers.bundlelists.osgiframework</artifactId> - <version>0.12.0</version> + <version>0.12.1-SNAPSHOT</version> <type>partialbundlelist</type> <scope>provided</scope> </dependency> @@ -189,7 +189,7 @@ <dependency> <groupId>org.apache.stanbol</groupId> <artifactId>org.apache.stanbol.launchers.bundlelists.stanbolcommons</artifactId> - <version>0.12.0</version> + <version>0.12.1-SNAPSHOT</version> <type>partialbundlelist</type> <scope>provided</scope> </dependency> @@ -198,7 +198,7 @@ <dependency> <groupId>org.apache.stanbol</groupId> <artifactId>org.apache.stanbol.launchers.bundlelists.security</artifactId> - <version>0.12.0</version> + <version>0.12.1-SNAPSHOT</version> <type>partialbundlelist</type> <scope>provided</scope> </dependency> @@ -207,7 +207,7 @@ <dependency> <groupId>org.apache.stanbol</groupId> <artifactId>org.apache.stanbol.launchers.bundlelists.zzshell</artifactId> - <version>0.12.0</version> + <version>0.12.1-SNAPSHOT</version> <type>partialbundlelist</type> <scope>provided</scope> </dependency> @@ -216,7 +216,7 @@ <dependency> <groupId>org.apache.stanbol</groupId> <artifactId>org.apache.stanbol.launchers.bundlelists.cmsadapter</artifactId> - <version>0.12.0</version> + <version>0.12.1-SNAPSHOT</version> <type>partialbundlelist</type> <scope>provided</scope> </dependency> @@ -225,7 +225,7 @@ <dependency> <groupId>org.apache.stanbol</groupId> <artifactId>org.apache.stanbol.launchers.bundlelists.contenthub</artifactId> - <version>0.12.0</version> + <version>0.12.1-SNAPSHOT</version> <type>partialbundlelist</type> <scope>provided</scope> </dependency> @@ -234,14 +234,14 @@ <dependency> <groupId>org.apache.stanbol</groupId> <artifactId>org.apache.stanbol.launchers.bundlelists.defaultdata</artifactId> - <version>0.12.0</version> + <version>0.12.1-SNAPSHOT</version> <type>partialbundlelist</type> <scope>provided</scope> </dependency> <dependency> <!-- include all OpenNLP models in the full launcher --> <groupId>org.apache.stanbol</groupId> <artifactId>org.apache.stanbol.launchers.bundlelists.opennlp</artifactId> - <version>0.12.0</version> + <version>0.12.1-SNAPSHOT</version> <type>partialbundlelist</type> <scope>provided</scope> </dependency> @@ -250,7 +250,7 @@ <dependency> <groupId>org.apache.stanbol</groupId> <artifactId>org.apache.stanbol.launchers.bundlelists.enhancer</artifactId> - <version>0.12.0</version> + <version>0.12.1-SNAPSHOT</version> <type>partialbundlelist</type> <scope>provided</scope> </dependency> @@ -259,7 +259,7 @@ <dependency> <groupId>org.apache.stanbol</groupId> <artifactId>org.apache.stanbol.launchers.bundlelists.entityhub</artifactId> - <version>0.12.0</version> + <version>0.12.1-SNAPSHOT</version> <type>partialbundlelist</type> <scope>provided</scope> </dependency> @@ -268,7 +268,7 @@ <dependency> <groupId>org.apache.stanbol</groupId> <artifactId>org.apache.stanbol.launchers.bundlelists.ontologymanager</artifactId> - <version>0.12.0</version> + <version>0.12.1-SNAPSHOT</version> <type>partialbundlelist</type> <scope>provided</scope> </dependency> @@ -277,7 +277,7 @@ <dependency> <groupId>org.apache.stanbol</groupId> <artifactId>org.apache.stanbol.launchers.bundlelists.rules</artifactId> - <version>0.12.0</version> + <version>0.12.1-SNAPSHOT</version> <type>partialbundlelist</type> <scope>provided</scope> </dependency> @@ -286,7 +286,7 @@ <dependency> <groupId>org.apache.stanbol</groupId> <artifactId>org.apache.stanbol.launchers.bundlelists.reasoners</artifactId> - <version>0.12.0</version> + <version>0.12.1-SNAPSHOT</version> <type>partialbundlelist</type> <scope>provided</scope> </dependency> @@ -296,23 +296,15 @@ <dependency> <groupId>org.apache.stanbol</groupId> <artifactId>org.apache.stanbol.launchers.bundlelists.languageextras.smartcn</artifactId> - <version>0.12.0</version> + <version>0.12.1-SNAPSHOT</version> <type>partialbundlelist</type> <scope>provided</scope> </dependency> - <!-- TODO Paoding does not yet support Solr 4 --> - <!-- dependency> - <groupId>org.apache.stanbol</groupId> - <artifactId>org.apache.stanbol.launchers.bundlelists.languageextras.paoding</artifactId> - <version>0.12.0</version> - <type>partialbundlelist</type> - <scope>provided</scope> - </dependency --> <!-- Japanese Language Support --> <dependency> <groupId>org.apache.stanbol</groupId> <artifactId>org.apache.stanbol.launchers.bundlelists.languageextras.kuromoji</artifactId> - <version>0.12.0</version> + <version>0.12.1-SNAPSHOT</version> <type>partialbundlelist</type> <scope>provided</scope> </dependency> Modified: stanbol/branches/release-0.12/launchers/stable/pom.xml URL: http://svn.apache.org/viewvc/stanbol/branches/release-0.12/launchers/stable/pom.xml?rev=1572588&r1=1572587&r2=1572588&view=diff ============================================================================== --- stanbol/branches/release-0.12/launchers/stable/pom.xml (original) +++ stanbol/branches/release-0.12/launchers/stable/pom.xml Thu Feb 27 14:17:47 2014 @@ -152,7 +152,7 @@ <!-- The Apache Stanbol lauchpad --> <groupId>org.apache.stanbol</groupId> <artifactId>org.apache.stanbol.commons.launchpad</artifactId> - <version>0.12.0</version> + <version>0.12.1-SNAPSHOT</version> </dependency> <dependency> <!-- maven-launchpad-plugin builds on the launchpad.base app --> @@ -165,7 +165,7 @@ <dependency> <groupId>org.apache.stanbol</groupId> <artifactId>org.apache.stanbol.launchers.bundlelists.osgiframework</artifactId> - <version>0.12.0</version> + <version>0.12.1-SNAPSHOT</version> <type>partialbundlelist</type> <scope>provided</scope> </dependency> @@ -174,7 +174,7 @@ <dependency> <groupId>org.apache.stanbol</groupId> <artifactId>org.apache.stanbol.launchers.bundlelists.stanbolcommons</artifactId> - <version>0.12.0</version> + <version>0.12.1-SNAPSHOT</version> <type>partialbundlelist</type> <scope>provided</scope> </dependency> @@ -183,7 +183,7 @@ <dependency> <groupId>org.apache.stanbol</groupId> <artifactId>org.apache.stanbol.launchers.bundlelists.enhancer</artifactId> - <version>0.12.0</version> + <version>0.12.1-SNAPSHOT</version> <type>partialbundlelist</type> <scope>provided</scope> </dependency> @@ -192,7 +192,7 @@ <dependency> <groupId>org.apache.stanbol</groupId> <artifactId>org.apache.stanbol.launchers.bundlelists.defaultdata</artifactId> - <version>0.12.0</version> + <version>0.12.1-SNAPSHOT</version> <type>partialbundlelist</type> <scope>provided</scope> </dependency> @@ -201,7 +201,7 @@ <dependency> <groupId>org.apache.stanbol</groupId> <artifactId>org.apache.stanbol.launchers.bundlelists.entityhub</artifactId> - <version>0.12.0</version> + <version>0.12.1-SNAPSHOT</version> <type>partialbundlelist</type> <scope>provided</scope> </dependency> Modified: stanbol/branches/release-0.12/parent/pom.xml URL: http://svn.apache.org/viewvc/stanbol/branches/release-0.12/parent/pom.xml?rev=1572588&r1=1572587&r2=1572588&view=diff ============================================================================== --- stanbol/branches/release-0.12/parent/pom.xml (original) +++ stanbol/branches/release-0.12/parent/pom.xml Thu Feb 27 14:17:47 2014 @@ -63,6 +63,8 @@ <solr-version>4.4.0</solr-version> <pax-exam-version>2.3.0.M1</pax-exam-version> <sesame-version>2.7.7</sesame-version> + <marmotta-version>3.2.0-SNAPSHOT</marmotta-version> + <ldpath-version>${marmotta-version}</ldpath-version> <sourceReleaseAssemblyDescriptor>stanbol-source-release-zip-tar</sourceReleaseAssemblyDescriptor> </properties> @@ -827,6 +829,11 @@ </dependency> <dependency> <groupId>org.slf4j</groupId> + <artifactId>log4j-over-slf4j</artifactId> + <version>1.6.1</version> + </dependency> + <dependency> + <groupId>org.slf4j</groupId> <artifactId>slf4j-jdk14</artifactId> <version>1.6.1</version> </dependency> @@ -1251,16 +1258,71 @@ <type>jar</type> </dependency> - <!-- LD Path --> + <!-- Marmotta LD Path --> <dependency> - <groupId>at.newmedialab.ldpath</groupId> + <groupId>org.apache.marmotta</groupId> <artifactId>ldpath-api</artifactId> - <version>0.9.5</version> + <version>${ldpath-version}</version> + </dependency> + <dependency> + <groupId>org.apache.marmotta</groupId> + <artifactId>ldpath-core</artifactId> + <version>${ldpath-version}</version> + </dependency> + <dependency> + <groupId>org.apache.marmotta</groupId> + <artifactId>ldpath-functions-collections</artifactId> + <version>${ldpath-version}</version> + </dependency> + <dependency> + <groupId>org.apache.marmotta</groupId> + <artifactId>ldpath-functions-date</artifactId> + <version>${ldpath-version}</version> + </dependency> + <dependency> + <groupId>org.apache.marmotta</groupId> + <artifactId>ldpath-functions-html</artifactId> + <version>${ldpath-version}</version> + </dependency> + <dependency> + <groupId>org.apache.marmotta</groupId> + <artifactId>ldpath-functions-math</artifactId> + <version>${ldpath-version}</version> + </dependency> + <dependency> + <groupId>org.apache.marmotta</groupId> + <artifactId>ldpath-functions-text</artifactId> + <version>${ldpath-version}</version> + </dependency> + <dependency> + <groupId>org.apache.marmotta</groupId> + <artifactId>ldpath-functions-xml</artifactId> + <version>${ldpath-version}</version> + </dependency> + <dependency> + <groupId>org.apache.marmotta</groupId> + <artifactId>ldpath-backend-jena</artifactId> + <version>${ldpath-version}</version> + </dependency> + <dependency> + <groupId>org.apache.marmotta</groupId> + <artifactId>ldpath-backend-sesame</artifactId> + <version>${ldpath-version}</version> + </dependency> + <dependency> + <groupId>org.apache.marmotta</groupId> + <artifactId>ldpath-backend-linkeddata</artifactId> + <version>${ldpath-version}</version> + </dependency> + <dependency> + <groupId>org.apache.marmotta</groupId> + <artifactId>ldpath-backend-file</artifactId> + <version>${ldpath-version}</version> </dependency> <dependency> - <groupId>at.newmedialab.ldpath</groupId> - <artifactId>ldpath-core-bundle</artifactId> - <version>0.9.5</version> + <groupId>org.apache.marmotta</groupId> + <artifactId>ldpath-template</artifactId> + <version>${ldpath-version}</version> </dependency> <!-- Apache Tika -->
