You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stanbol.apache.org by rw...@apache.org on 2012/02/06 10:18:47 UTC
svn commit: r1240944 - in /incubator/stanbol/trunk: commons/ commons/ldpath/
commons/ldpath/clerezza/ commons/ldpath/clerezza/src/
commons/ldpath/clerezza/src/main/ commons/ldpath/clerezza/src/main/java/
commons/ldpath/clerezza/src/main/java/org/ commo...
Author: rwesten
Date: Mon Feb 6 09:18:45 2012
New Revision: 1240944
URL: http://svn.apache.org/viewvc?rev=1240944&view=rev
Log:
### STANBOL-483
* Moved Clerezza LDPath repository to an own module
* Added Unit Tests
* removed some unnecessary type conversions for TypedLiterals
* Added support for BigDecimal
* changed contenthub/ldpath to use this new module
* added this module to the commons bundle list
Also the LDPath dependencies are now part of the commons bundle list. This avoids in that Entityhub and Contenthub need to include them twice.
### CLEREZZA-683
* Changed the used in-memory MGraph implementation from SimpleMGraph to IndexedMGraph for most of the components
* Added "org.apache.stanbol.commons.indexedgraph" to the commons bundle list. This ensures that IndexedGraph is available to all stanbol launchers.
### Other Changes
* Corrected a Bug in the UnitTest of the EntityMentionEngine. Now all created TextAnnotations use different URIs and do no longer override each other
Added:
incubator/stanbol/trunk/commons/ldpath/
incubator/stanbol/trunk/commons/ldpath/clerezza/ (with props)
incubator/stanbol/trunk/commons/ldpath/clerezza/pom.xml (with props)
incubator/stanbol/trunk/commons/ldpath/clerezza/src/
incubator/stanbol/trunk/commons/ldpath/clerezza/src/main/
incubator/stanbol/trunk/commons/ldpath/clerezza/src/main/java/
incubator/stanbol/trunk/commons/ldpath/clerezza/src/main/java/org/
incubator/stanbol/trunk/commons/ldpath/clerezza/src/main/java/org/apache/
incubator/stanbol/trunk/commons/ldpath/clerezza/src/main/java/org/apache/stanbol/
incubator/stanbol/trunk/commons/ldpath/clerezza/src/main/java/org/apache/stanbol/commons/
incubator/stanbol/trunk/commons/ldpath/clerezza/src/main/java/org/apache/stanbol/commons/ldpath/
incubator/stanbol/trunk/commons/ldpath/clerezza/src/main/java/org/apache/stanbol/commons/ldpath/clerezza/
incubator/stanbol/trunk/commons/ldpath/clerezza/src/test/
incubator/stanbol/trunk/commons/ldpath/clerezza/src/test/java/
incubator/stanbol/trunk/commons/ldpath/clerezza/src/test/java/org/
incubator/stanbol/trunk/commons/ldpath/clerezza/src/test/java/org/apache/
incubator/stanbol/trunk/commons/ldpath/clerezza/src/test/java/org/apache/stanbol/
incubator/stanbol/trunk/commons/ldpath/clerezza/src/test/java/org/apache/stanbol/commons/
incubator/stanbol/trunk/commons/ldpath/clerezza/src/test/java/org/apache/stanbol/commons/ldpath/
incubator/stanbol/trunk/commons/ldpath/clerezza/src/test/java/org/apache/stanbol/commons/ldpath/clerezza/
incubator/stanbol/trunk/commons/ldpath/clerezza/src/test/resources/
incubator/stanbol/trunk/commons/ldpath/clerezza/src/test/resources/testdata.rdf.zip (with props)
Removed:
incubator/stanbol/trunk/contenthub/ldpath/src/main/java/org/apache/stanbol/contenthub/ldpath/backend/clerezza/ClerezzaBackend.java
Modified:
incubator/stanbol/trunk/commons/pom.xml
incubator/stanbol/trunk/contenthub/ldpath/pom.xml
incubator/stanbol/trunk/contenthub/ldpath/src/main/java/org/apache/stanbol/contenthub/ldpath/backend/clerezza/ClerezzaQuery.java
incubator/stanbol/trunk/contenthub/ldpath/src/main/java/org/apache/stanbol/contenthub/ldpath/solr/LDPathUtils.java
incubator/stanbol/trunk/contenthub/ldpath/src/main/java/org/apache/stanbol/contenthub/ldpath/solr/LDProgramManagerImpl.java
incubator/stanbol/trunk/enhancer/engines/autotagging/src/test/java/org/apache/stanbol/enhancer/engines/autotagging/impl/TestEntityMentionEnhancementEngine.java
incubator/stanbol/trunk/enhancer/generic/servicesapi/pom.xml
incubator/stanbol/trunk/enhancer/generic/servicesapi/src/main/java/org/apache/stanbol/enhancer/servicesapi/helper/ExecutionMetadataHelper.java
incubator/stanbol/trunk/enhancer/generic/servicesapi/src/main/java/org/apache/stanbol/enhancer/servicesapi/helper/ExecutionPlanHelper.java
incubator/stanbol/trunk/enhancer/generic/servicesapi/src/main/java/org/apache/stanbol/enhancer/servicesapi/helper/InMemoryContentItem.java
incubator/stanbol/trunk/enhancer/generic/servicesapi/src/main/java/org/apache/stanbol/enhancer/servicesapi/helper/SingleEngineChain.java
incubator/stanbol/trunk/enhancer/generic/servicesapi/src/main/java/org/apache/stanbol/enhancer/servicesapi/helper/WebContentItem.java
incubator/stanbol/trunk/enhancer/jersey/pom.xml
incubator/stanbol/trunk/enhancer/jersey/src/main/java/org/apache/stanbol/enhancer/jersey/resource/ContentItemResource.java
incubator/stanbol/trunk/enhancer/jobmanager/event/src/main/java/org/apache/stanbol/enhancer/jobmanager/event/impl/EnhancementJob.java
incubator/stanbol/trunk/enhancer/jobmanager/event/src/main/java/org/apache/stanbol/enhancer/jobmanager/event/impl/EnhancementJobHandler.java
incubator/stanbol/trunk/enhancer/jobmanager/event/src/main/java/org/apache/stanbol/enhancer/jobmanager/event/impl/EventJobManagerImpl.java
incubator/stanbol/trunk/entityhub/bundlelist/src/main/bundles/list.xml
incubator/stanbol/trunk/entityhub/jersey/pom.xml
incubator/stanbol/trunk/entityhub/jersey/src/main/java/org/apache/stanbol/entityhub/jersey/parsers/RepresentationReader.java
incubator/stanbol/trunk/entityhub/jersey/src/main/java/org/apache/stanbol/entityhub/jersey/resource/EntityhubRootResource.java
incubator/stanbol/trunk/entityhub/jersey/src/main/java/org/apache/stanbol/entityhub/jersey/resource/ReferencedSiteRootResource.java
incubator/stanbol/trunk/entityhub/jersey/src/main/java/org/apache/stanbol/entityhub/jersey/resource/SiteManagerRootResource.java
incubator/stanbol/trunk/entityhub/jersey/src/main/java/org/apache/stanbol/entityhub/jersey/utils/LDPathHelper.java
incubator/stanbol/trunk/entityhub/jersey/src/main/java/org/apache/stanbol/entityhub/jersey/writers/EntityToRDF.java
incubator/stanbol/trunk/entityhub/jersey/src/main/java/org/apache/stanbol/entityhub/jersey/writers/QueryResultsToRDF.java
incubator/stanbol/trunk/entityhub/model/clerezza/pom.xml
incubator/stanbol/trunk/entityhub/model/clerezza/src/main/java/org/apache/stanbol/entityhub/model/clerezza/RdfValueFactory.java
incubator/stanbol/trunk/entityhub/model/clerezza/src/test/java/org/apache/stanbol/entityhub/model/clerezza/RdfValueFactoryTest.java
incubator/stanbol/trunk/entityhub/query/clerezza/pom.xml
incubator/stanbol/trunk/entityhub/query/clerezza/src/test/java/org/apache/stanbol/entityhub/query/clerezza/RdfResultListTest.java
incubator/stanbol/trunk/entityhub/site/linkeddata/pom.xml
incubator/stanbol/trunk/entityhub/site/linkeddata/src/main/java/org/apache/stanbol/entityhub/site/linkeddata/impl/CoolUriDereferencer.java
incubator/stanbol/trunk/entityhub/site/linkeddata/src/main/java/org/apache/stanbol/entityhub/site/linkeddata/impl/LarqSearcher.java
incubator/stanbol/trunk/entityhub/site/linkeddata/src/main/java/org/apache/stanbol/entityhub/site/linkeddata/impl/SparqlDereferencer.java
incubator/stanbol/trunk/entityhub/site/linkeddata/src/main/java/org/apache/stanbol/entityhub/site/linkeddata/impl/SparqlSearcher.java
incubator/stanbol/trunk/entityhub/site/linkeddata/src/main/java/org/apache/stanbol/entityhub/site/linkeddata/impl/VirtuosoSearcher.java
incubator/stanbol/trunk/entityhub/yard/clerezza/pom.xml
incubator/stanbol/trunk/entityhub/yard/clerezza/src/main/java/org/apache/stanbol/entityhub/yard/clerezza/impl/ClerezzaYard.java
incubator/stanbol/trunk/launchers/bundlelists/stanbolcommons/src/main/bundles/list.xml
incubator/stanbol/trunk/parent/pom.xml
Propchange: incubator/stanbol/trunk/commons/ldpath/clerezza/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Mon Feb 6 09:18:45 2012
@@ -0,0 +1,7 @@
+.settings
+
+.classpath
+
+.project
+
+target
Added: incubator/stanbol/trunk/commons/ldpath/clerezza/pom.xml
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/commons/ldpath/clerezza/pom.xml?rev=1240944&view=auto
==============================================================================
--- incubator/stanbol/trunk/commons/ldpath/clerezza/pom.xml (added)
+++ incubator/stanbol/trunk/commons/ldpath/clerezza/pom.xml Mon Feb 6 09:18:45 2012
@@ -0,0 +1,124 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ 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.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.stanbol</groupId>
+ <artifactId>stanbol-parent</artifactId>
+ <version>0.9.0-incubating-SNAPSHOT</version>
+ <relativePath>../../../parent</relativePath>
+ </parent>
+
+ <groupId>org.apache.stanbol</groupId>
+ <artifactId>org.apache.stanbol.commons.ldpath.clerezza</artifactId>
+ <packaging>bundle</packaging>
+
+ <name>Apache Stanbol Commons Clerezza LDPath Repository</name>
+ <description>Provides an LDPath Repository implementation for
+ RDF graphs managed by Clerezza.
+ </description>
+
+ <inceptionYear>2010</inceptionYear>
+
+ <scm>
+ <connection>
+ scm:svn:http://svn.apache.org/repos/asf/incubator/stanbol/trunk/commons/ldpath/clerezza
+ </connection>
+ <developerConnection>
+ scm:svn:https://svn.apache.org/repos/asf/incubator/stanbol/trunk/commons/ldpath/clerezza
+ </developerConnection>
+ <url>http://incubator.apache.org/stanbol/</url>
+ </scm>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <extensions>true</extensions>
+ <configuration>
+ <instructions>
+ <Export-Package>
+ org.apache.stanbol.commons.ldpath.clerezza.*;version=${project.version}
+ </Export-Package>
+ </instructions>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+
+ <dependencies>
+ <!-- Clerezza -->
+ <dependency>
+ <groupId>org.apache.clerezza</groupId>
+ <artifactId>rdf.core</artifactId>
+ </dependency>
+ <!-- LD-Path -->
+ <dependency>
+ <groupId>at.newmedialab.ldpath</groupId>
+ <artifactId>ldpath-api</artifactId>
+ </dependency>
+ <!-- Commons -->
+ <dependency>
+ <groupId>commons-collections</groupId>
+ <artifactId>commons-collections</artifactId>
+ </dependency>
+
+ <!-- Logging -->
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.clerezza</groupId>
+ <artifactId>rdf.ontologies</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-simple</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>at.newmedialab.ldpath</groupId>
+ <artifactId>ldpath-core-bundle</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.stanbol</groupId>
+ <artifactId>org.apache.stanbol.commons.indexedgraph</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.clerezza</groupId>
+ <artifactId>rdf.jena.parser</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ </dependencies>
+
+</project>
Propchange: incubator/stanbol/trunk/commons/ldpath/clerezza/pom.xml
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: incubator/stanbol/trunk/commons/ldpath/clerezza/src/test/resources/testdata.rdf.zip
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/commons/ldpath/clerezza/src/test/resources/testdata.rdf.zip?rev=1240944&view=auto
==============================================================================
Binary file - no diff available.
Propchange: incubator/stanbol/trunk/commons/ldpath/clerezza/src/test/resources/testdata.rdf.zip
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Modified: incubator/stanbol/trunk/commons/pom.xml
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/commons/pom.xml?rev=1240944&r1=1240943&r2=1240944&view=diff
==============================================================================
--- incubator/stanbol/trunk/commons/pom.xml (original)
+++ incubator/stanbol/trunk/commons/pom.xml Mon Feb 6 09:18:45 2012
@@ -55,6 +55,7 @@
<module>solr/web</module>
<module>solr/install</module>
<module>indexedgraph</module>
+ <module>ldpath/clerezza</module>
<!-- not in a stable state right now
<module>installer/jarprovider</module>
-->
Modified: incubator/stanbol/trunk/contenthub/ldpath/pom.xml
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/contenthub/ldpath/pom.xml?rev=1240944&r1=1240943&r2=1240944&view=diff
==============================================================================
--- incubator/stanbol/trunk/contenthub/ldpath/pom.xml (original)
+++ incubator/stanbol/trunk/contenthub/ldpath/pom.xml Mon Feb 6 09:18:45 2012
@@ -67,7 +67,10 @@
<groupId>at.newmedialab.ldpath</groupId>
<artifactId>ldpath-core-bundle</artifactId>
</dependency>
-
+ <dependency>
+ <groupId>org.apache.stanbol</groupId>
+ <artifactId>org.apache.stanbol.commons.ldpath.clerezza</artifactId>
+ </dependency>
<dependency>
<groupId>org.apache.clerezza</groupId>
<artifactId>rdf.core</artifactId>
Modified: incubator/stanbol/trunk/contenthub/ldpath/src/main/java/org/apache/stanbol/contenthub/ldpath/backend/clerezza/ClerezzaQuery.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/contenthub/ldpath/src/main/java/org/apache/stanbol/contenthub/ldpath/backend/clerezza/ClerezzaQuery.java?rev=1240944&r1=1240943&r2=1240944&view=diff
==============================================================================
--- incubator/stanbol/trunk/contenthub/ldpath/src/main/java/org/apache/stanbol/contenthub/ldpath/backend/clerezza/ClerezzaQuery.java (original)
+++ incubator/stanbol/trunk/contenthub/ldpath/src/main/java/org/apache/stanbol/contenthub/ldpath/backend/clerezza/ClerezzaQuery.java Mon Feb 6 09:18:45 2012
@@ -39,6 +39,7 @@ import org.apache.commons.cli.OptionGrou
import org.apache.commons.cli.Options;
import org.apache.commons.cli.ParseException;
import org.apache.commons.cli.PosixParser;
+import org.apache.stanbol.commons.ldpath.clerezza.ClerezzaBackend;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Modified: incubator/stanbol/trunk/contenthub/ldpath/src/main/java/org/apache/stanbol/contenthub/ldpath/solr/LDPathUtils.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/contenthub/ldpath/src/main/java/org/apache/stanbol/contenthub/ldpath/solr/LDPathUtils.java?rev=1240944&r1=1240943&r2=1240944&view=diff
==============================================================================
--- incubator/stanbol/trunk/contenthub/ldpath/src/main/java/org/apache/stanbol/contenthub/ldpath/solr/LDPathUtils.java (original)
+++ incubator/stanbol/trunk/contenthub/ldpath/src/main/java/org/apache/stanbol/contenthub/ldpath/solr/LDPathUtils.java Mon Feb 6 09:18:45 2012
@@ -51,7 +51,7 @@ import org.apache.commons.compress.archi
import org.apache.commons.compress.archivers.zip.ZipArchiveEntry;
import org.apache.commons.compress.archivers.zip.ZipArchiveInputStream;
import org.apache.commons.io.IOUtils;
-import org.apache.stanbol.contenthub.ldpath.backend.clerezza.ClerezzaBackend;
+import org.apache.stanbol.commons.ldpath.clerezza.ClerezzaBackend;
import org.apache.stanbol.contenthub.servicesapi.Constants;
import org.apache.stanbol.contenthub.servicesapi.ldpath.LDPathException;
import org.osgi.framework.Bundle;
Modified: incubator/stanbol/trunk/contenthub/ldpath/src/main/java/org/apache/stanbol/contenthub/ldpath/solr/LDProgramManagerImpl.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/contenthub/ldpath/src/main/java/org/apache/stanbol/contenthub/ldpath/solr/LDProgramManagerImpl.java?rev=1240944&r1=1240943&r2=1240944&view=diff
==============================================================================
--- incubator/stanbol/trunk/contenthub/ldpath/src/main/java/org/apache/stanbol/contenthub/ldpath/solr/LDProgramManagerImpl.java (original)
+++ incubator/stanbol/trunk/contenthub/ldpath/src/main/java/org/apache/stanbol/contenthub/ldpath/solr/LDProgramManagerImpl.java Mon Feb 6 09:18:45 2012
@@ -35,8 +35,8 @@ import org.apache.felix.scr.annotations.
import org.apache.felix.scr.annotations.Component;
import org.apache.felix.scr.annotations.Reference;
import org.apache.felix.scr.annotations.Service;
+import org.apache.stanbol.commons.ldpath.clerezza.ClerezzaBackend;
import org.apache.stanbol.commons.solr.managed.ManagedSolrServer;
-import org.apache.stanbol.contenthub.ldpath.backend.clerezza.ClerezzaBackend;
import org.apache.stanbol.contenthub.servicesapi.ldpath.LDPathException;
import org.apache.stanbol.contenthub.servicesapi.ldpath.LDProgramCollection;
import org.apache.stanbol.contenthub.servicesapi.ldpath.LDProgramManager;
Modified: incubator/stanbol/trunk/enhancer/engines/autotagging/src/test/java/org/apache/stanbol/enhancer/engines/autotagging/impl/TestEntityMentionEnhancementEngine.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/enhancer/engines/autotagging/src/test/java/org/apache/stanbol/enhancer/engines/autotagging/impl/TestEntityMentionEnhancementEngine.java?rev=1240944&r1=1240943&r2=1240944&view=diff
==============================================================================
--- incubator/stanbol/trunk/enhancer/engines/autotagging/src/test/java/org/apache/stanbol/enhancer/engines/autotagging/impl/TestEntityMentionEnhancementEngine.java (original)
+++ incubator/stanbol/trunk/enhancer/engines/autotagging/src/test/java/org/apache/stanbol/enhancer/engines/autotagging/impl/TestEntityMentionEnhancementEngine.java Mon Feb 6 09:18:45 2012
@@ -111,7 +111,7 @@ public class TestEntityMentionEnhancemen
}
RdfEntityFactory factory = RdfEntityFactory.createInstance(ci.getMetadata());
TextAnnotation testAnnotation = factory.getProxy(
- new UriRef("urn:org.apache:stanbol.ehnacer:test:text-annotation:person"), TextAnnotation.class);
+ new UriRef("urn:org.apache:stanbol.ehnacer:test:text-annotation:"+name.replace(' ', '_')), TextAnnotation.class);
testAnnotation.setCreator(new UriRef("urn:org.apache:stanbol.ehnacer:test:dummyEngine"));
testAnnotation.setCreated(new Date());
testAnnotation.setSelectedText(name);
Modified: incubator/stanbol/trunk/enhancer/generic/servicesapi/pom.xml
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/enhancer/generic/servicesapi/pom.xml?rev=1240944&r1=1240943&r2=1240944&view=diff
==============================================================================
--- incubator/stanbol/trunk/enhancer/generic/servicesapi/pom.xml (original)
+++ incubator/stanbol/trunk/enhancer/generic/servicesapi/pom.xml Mon Feb 6 09:18:45 2012
@@ -81,6 +81,10 @@
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.apache.stanbol</groupId>
+ <artifactId>org.apache.stanbol.commons.indexedgraph</artifactId>
+ </dependency>
<!-- for tests -->
<dependency>
<groupId>junit</groupId>
Modified: incubator/stanbol/trunk/enhancer/generic/servicesapi/src/main/java/org/apache/stanbol/enhancer/servicesapi/helper/ExecutionMetadataHelper.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/enhancer/generic/servicesapi/src/main/java/org/apache/stanbol/enhancer/servicesapi/helper/ExecutionMetadataHelper.java?rev=1240944&r1=1240943&r2=1240944&view=diff
==============================================================================
--- incubator/stanbol/trunk/enhancer/generic/servicesapi/src/main/java/org/apache/stanbol/enhancer/servicesapi/helper/ExecutionMetadataHelper.java (original)
+++ incubator/stanbol/trunk/enhancer/generic/servicesapi/src/main/java/org/apache/stanbol/enhancer/servicesapi/helper/ExecutionMetadataHelper.java Mon Feb 6 09:18:45 2012
@@ -27,6 +27,7 @@ import org.apache.clerezza.rdf.core.UriR
import org.apache.clerezza.rdf.core.impl.PlainLiteralImpl;
import org.apache.clerezza.rdf.core.impl.SimpleMGraph;
import org.apache.clerezza.rdf.core.impl.TripleImpl;
+import org.apache.stanbol.commons.indexedgraph.IndexedMGraph;
import org.apache.stanbol.enhancer.servicesapi.Chain;
import org.apache.stanbol.enhancer.servicesapi.ContentItem;
import org.apache.stanbol.enhancer.servicesapi.EnhancementJobManager;
@@ -239,7 +240,7 @@ public class ExecutionMetadataHelper {
try {
executionMetadata = contentItem.getPart(CHAIN_EXECUTION, MGraph.class);
} catch (NoSuchPartException e) {
- executionMetadata = new SimpleMGraph();
+ executionMetadata = new IndexedMGraph();
contentItem.addPart(CHAIN_EXECUTION, executionMetadata);
}
} finally {
Modified: incubator/stanbol/trunk/enhancer/generic/servicesapi/src/main/java/org/apache/stanbol/enhancer/servicesapi/helper/ExecutionPlanHelper.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/enhancer/generic/servicesapi/src/main/java/org/apache/stanbol/enhancer/servicesapi/helper/ExecutionPlanHelper.java?rev=1240944&r1=1240943&r2=1240944&view=diff
==============================================================================
--- incubator/stanbol/trunk/enhancer/generic/servicesapi/src/main/java/org/apache/stanbol/enhancer/servicesapi/helper/ExecutionPlanHelper.java (original)
+++ incubator/stanbol/trunk/enhancer/generic/servicesapi/src/main/java/org/apache/stanbol/enhancer/servicesapi/helper/ExecutionPlanHelper.java Mon Feb 6 09:18:45 2012
@@ -55,6 +55,7 @@ import org.apache.clerezza.rdf.core.UriR
import org.apache.clerezza.rdf.core.impl.PlainLiteralImpl;
import org.apache.clerezza.rdf.core.impl.SimpleMGraph;
import org.apache.clerezza.rdf.core.impl.TripleImpl;
+import org.apache.stanbol.commons.indexedgraph.IndexedMGraph;
import org.apache.stanbol.enhancer.servicesapi.ChainException;
import org.apache.stanbol.enhancer.servicesapi.EnhancementEngine;
import org.apache.stanbol.enhancer.servicesapi.EnhancementEngineManager;
@@ -167,7 +168,7 @@ public final class ExecutionPlanHelper {
Collections.sort(availableEngines,EXECUTION_ORDER_COMPARATOR);
//now we have all required and possible also optional engines
// -> build the execution plan
- MGraph ep = new SimpleMGraph();
+ MGraph ep = new IndexedMGraph();
NonLiteral epNode = createExecutionPlan(ep, chainName);
Integer prevOrder = null;
Set<NonLiteral> prev = null;
Modified: incubator/stanbol/trunk/enhancer/generic/servicesapi/src/main/java/org/apache/stanbol/enhancer/servicesapi/helper/InMemoryContentItem.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/enhancer/generic/servicesapi/src/main/java/org/apache/stanbol/enhancer/servicesapi/helper/InMemoryContentItem.java?rev=1240944&r1=1240943&r2=1240944&view=diff
==============================================================================
--- incubator/stanbol/trunk/enhancer/generic/servicesapi/src/main/java/org/apache/stanbol/enhancer/servicesapi/helper/InMemoryContentItem.java (original)
+++ incubator/stanbol/trunk/enhancer/generic/servicesapi/src/main/java/org/apache/stanbol/enhancer/servicesapi/helper/InMemoryContentItem.java Mon Feb 6 09:18:45 2012
@@ -20,6 +20,7 @@ package org.apache.stanbol.enhancer.serv
import org.apache.clerezza.rdf.core.MGraph;
import org.apache.clerezza.rdf.core.UriRef;
import org.apache.clerezza.rdf.core.impl.SimpleMGraph;
+import org.apache.stanbol.commons.indexedgraph.IndexedMGraph;
import org.apache.stanbol.enhancer.servicesapi.Blob;
@@ -67,7 +68,7 @@ public class InMemoryContentItem extends
}
protected InMemoryContentItem(UriRef uri, Blob blob, MGraph metadata) {
super(uri == null ? ContentItemHelper.makeDefaultUrn(blob): uri,blob,
- metadata == null ? new SimpleMGraph() : metadata);
+ metadata == null ? new IndexedMGraph() : metadata);
}
protected static final InMemoryContentItem fromString(String content) {
Modified: incubator/stanbol/trunk/enhancer/generic/servicesapi/src/main/java/org/apache/stanbol/enhancer/servicesapi/helper/SingleEngineChain.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/enhancer/generic/servicesapi/src/main/java/org/apache/stanbol/enhancer/servicesapi/helper/SingleEngineChain.java?rev=1240944&r1=1240943&r2=1240944&view=diff
==============================================================================
--- incubator/stanbol/trunk/enhancer/generic/servicesapi/src/main/java/org/apache/stanbol/enhancer/servicesapi/helper/SingleEngineChain.java (original)
+++ incubator/stanbol/trunk/enhancer/generic/servicesapi/src/main/java/org/apache/stanbol/enhancer/servicesapi/helper/SingleEngineChain.java Mon Feb 6 09:18:45 2012
@@ -25,6 +25,7 @@ import java.util.Set;
import org.apache.clerezza.rdf.core.Graph;
import org.apache.clerezza.rdf.core.MGraph;
import org.apache.clerezza.rdf.core.impl.SimpleMGraph;
+import org.apache.stanbol.commons.indexedgraph.IndexedMGraph;
import org.apache.stanbol.enhancer.servicesapi.Chain;
import org.apache.stanbol.enhancer.servicesapi.ChainException;
import org.apache.stanbol.enhancer.servicesapi.EnhancementEngine;
@@ -55,7 +56,7 @@ public class SingleEngineChain implement
}
this.engine = engine;
this.name = engine.getName()+"Chain";
- MGraph graph = new SimpleMGraph();
+ MGraph graph = new IndexedMGraph();
writeExecutionNode(graph, createExecutionPlan(graph, name),
engine.getName(), false, null);
executionPlan = graph.getGraph();
Modified: incubator/stanbol/trunk/enhancer/generic/servicesapi/src/main/java/org/apache/stanbol/enhancer/servicesapi/helper/WebContentItem.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/enhancer/generic/servicesapi/src/main/java/org/apache/stanbol/enhancer/servicesapi/helper/WebContentItem.java?rev=1240944&r1=1240943&r2=1240944&view=diff
==============================================================================
--- incubator/stanbol/trunk/enhancer/generic/servicesapi/src/main/java/org/apache/stanbol/enhancer/servicesapi/helper/WebContentItem.java (original)
+++ incubator/stanbol/trunk/enhancer/generic/servicesapi/src/main/java/org/apache/stanbol/enhancer/servicesapi/helper/WebContentItem.java Mon Feb 6 09:18:45 2012
@@ -26,6 +26,7 @@ import java.util.Map;
import org.apache.clerezza.rdf.core.MGraph;
import org.apache.clerezza.rdf.core.UriRef;
import org.apache.clerezza.rdf.core.impl.SimpleMGraph;
+import org.apache.stanbol.commons.indexedgraph.IndexedMGraph;
import org.apache.stanbol.enhancer.servicesapi.Blob;
/**
@@ -59,7 +60,7 @@ public class WebContentItem extends Cont
*/
public WebContentItem(URL url, MGraph metadata) {
super(new UriRef(url.toString()), new UrlBlob(url),
- metadata == null ? new SimpleMGraph() : metadata);
+ metadata == null ? new IndexedMGraph() : metadata);
}
/**
Modified: incubator/stanbol/trunk/enhancer/jersey/pom.xml
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/enhancer/jersey/pom.xml?rev=1240944&r1=1240943&r2=1240944&view=diff
==============================================================================
--- incubator/stanbol/trunk/enhancer/jersey/pom.xml (original)
+++ incubator/stanbol/trunk/enhancer/jersey/pom.xml Mon Feb 6 09:18:45 2012
@@ -84,7 +84,7 @@
<dependencies>
- <!-- dependencies on other IKS modules -->
+ <!-- dependencies on other Stanbol modules -->
<dependency>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.enhancer.servicesapi</artifactId>
@@ -97,6 +97,10 @@
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.commons.web.base</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.apache.stanbol</groupId>
+ <artifactId>org.apache.stanbol.commons.indexedgraph</artifactId>
+ </dependency>
<!-- Clerezza dependencies -->
<dependency>
<groupId>org.apache.clerezza</groupId>
Modified: incubator/stanbol/trunk/enhancer/jersey/src/main/java/org/apache/stanbol/enhancer/jersey/resource/ContentItemResource.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/enhancer/jersey/src/main/java/org/apache/stanbol/enhancer/jersey/resource/ContentItemResource.java?rev=1240944&r1=1240943&r2=1240944&view=diff
==============================================================================
--- incubator/stanbol/trunk/enhancer/jersey/src/main/java/org/apache/stanbol/enhancer/jersey/resource/ContentItemResource.java (original)
+++ incubator/stanbol/trunk/enhancer/jersey/src/main/java/org/apache/stanbol/enhancer/jersey/resource/ContentItemResource.java Mon Feb 6 09:18:45 2012
@@ -80,6 +80,7 @@ import org.apache.clerezza.rdf.core.seri
import org.apache.clerezza.rdf.core.sparql.ParseException;
import org.apache.clerezza.rdf.ontologies.RDF;
import org.apache.commons.io.IOUtils;
+import org.apache.stanbol.commons.indexedgraph.IndexedMGraph;
import org.apache.stanbol.commons.web.base.resource.BaseStanbolResource;
import org.apache.stanbol.enhancer.servicesapi.Blob;
import org.apache.stanbol.enhancer.servicesapi.ContentItem;
@@ -564,7 +565,7 @@ public class ContentItemResource extends
* @return an RDF/JSON descriptions of places for the word map widget
*/
public String getPlacesAsJSON() throws ParseException, UnsupportedEncodingException {
- MGraph g = new SimpleMGraph();
+ MGraph g = new IndexedMGraph();
LiteralFactory lf = LiteralFactory.getInstance();
MGraph metadata = contentItem.getMetadata();
for (EntityExtractionSummary p : getPlaceOccurrences()) {
Modified: incubator/stanbol/trunk/enhancer/jobmanager/event/src/main/java/org/apache/stanbol/enhancer/jobmanager/event/impl/EnhancementJob.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/enhancer/jobmanager/event/src/main/java/org/apache/stanbol/enhancer/jobmanager/event/impl/EnhancementJob.java?rev=1240944&r1=1240943&r2=1240944&view=diff
==============================================================================
--- incubator/stanbol/trunk/enhancer/jobmanager/event/src/main/java/org/apache/stanbol/enhancer/jobmanager/event/impl/EnhancementJob.java (original)
+++ incubator/stanbol/trunk/enhancer/jobmanager/event/src/main/java/org/apache/stanbol/enhancer/jobmanager/event/impl/EnhancementJob.java Mon Feb 6 09:18:45 2012
@@ -2,7 +2,6 @@ package org.apache.stanbol.enhancer.jobm
import static org.apache.stanbol.enhancer.servicesapi.helper.EnhancementEngineHelper.getReference;
import static org.apache.stanbol.enhancer.servicesapi.helper.EnhancementEngineHelper.getString;
-import static org.apache.stanbol.enhancer.servicesapi.helper.ExecutionMetadataHelper.createChainExecutionNode;
import static org.apache.stanbol.enhancer.servicesapi.helper.ExecutionMetadataHelper.getChainExecution;
import static org.apache.stanbol.enhancer.servicesapi.helper.ExecutionMetadataHelper.getExecutionPlanNode;
import static org.apache.stanbol.enhancer.servicesapi.helper.ExecutionMetadataHelper.initExecutionMetadata;
@@ -14,9 +13,6 @@ import static org.apache.stanbol.enhance
import static org.apache.stanbol.enhancer.servicesapi.helper.ExecutionPlanHelper.getDependend;
import static org.apache.stanbol.enhancer.servicesapi.helper.ExecutionPlanHelper.getEngine;
import static org.apache.stanbol.enhancer.servicesapi.helper.ExecutionPlanHelper.isOptional;
-import static org.apache.stanbol.enhancer.servicesapi.rdf.ExecutionMetadata.CHAIN_EXECUTION;
-import static org.apache.stanbol.enhancer.servicesapi.rdf.ExecutionMetadata.ENHANCED_BY;
-import static org.apache.stanbol.enhancer.servicesapi.rdf.ExecutionMetadata.ENHANCES;
import static org.apache.stanbol.enhancer.servicesapi.rdf.ExecutionMetadata.STATUS;
import static org.apache.stanbol.enhancer.servicesapi.rdf.ExecutionMetadata.STATUS_IN_PROGRESS;
import static org.apache.stanbol.enhancer.servicesapi.rdf.ExecutionPlan.CHAIN;
@@ -25,8 +21,6 @@ import java.util.ArrayList;
import java.util.Collection;
import java.util.Collections;
import java.util.HashSet;
-import java.util.Iterator;
-import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
import java.util.Set;
@@ -36,13 +30,7 @@ import java.util.concurrent.locks.ReadWr
import org.apache.clerezza.rdf.core.Graph;
import org.apache.clerezza.rdf.core.MGraph;
import org.apache.clerezza.rdf.core.NonLiteral;
-import org.apache.clerezza.rdf.core.Triple;
-import org.apache.clerezza.rdf.core.TripleCollection;
import org.apache.clerezza.rdf.core.UriRef;
-import org.apache.clerezza.rdf.core.access.LockableMGraph;
-import org.apache.clerezza.rdf.core.access.LockableMGraphWrapper;
-import org.apache.clerezza.rdf.core.impl.PlainLiteralImpl;
-import org.apache.clerezza.rdf.core.impl.SimpleMGraph;
import org.apache.commons.collections.BidiMap;
import org.apache.commons.collections.bidimap.DualHashBidiMap;
import org.apache.stanbol.enhancer.servicesapi.Chain;
@@ -50,11 +38,9 @@ import org.apache.stanbol.enhancer.servi
import org.apache.stanbol.enhancer.servicesapi.EnhancementEngine;
import org.apache.stanbol.enhancer.servicesapi.EnhancementJobManager;
import org.apache.stanbol.enhancer.servicesapi.NoSuchPartException;
-import org.apache.stanbol.enhancer.servicesapi.helper.EnhancementEngineHelper;
import org.apache.stanbol.enhancer.servicesapi.helper.ExecutionMetadataHelper;
import org.apache.stanbol.enhancer.servicesapi.helper.ExecutionPlanHelper;
import org.apache.stanbol.enhancer.servicesapi.rdf.ExecutionMetadata;
-import org.apache.stanbol.enhancer.servicesapi.rdf.ExecutionPlan;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Modified: incubator/stanbol/trunk/enhancer/jobmanager/event/src/main/java/org/apache/stanbol/enhancer/jobmanager/event/impl/EnhancementJobHandler.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/enhancer/jobmanager/event/src/main/java/org/apache/stanbol/enhancer/jobmanager/event/impl/EnhancementJobHandler.java?rev=1240944&r1=1240943&r2=1240944&view=diff
==============================================================================
--- incubator/stanbol/trunk/enhancer/jobmanager/event/src/main/java/org/apache/stanbol/enhancer/jobmanager/event/impl/EnhancementJobHandler.java (original)
+++ incubator/stanbol/trunk/enhancer/jobmanager/event/src/main/java/org/apache/stanbol/enhancer/jobmanager/event/impl/EnhancementJobHandler.java Mon Feb 6 09:18:45 2012
@@ -1,7 +1,7 @@
package org.apache.stanbol.enhancer.jobmanager.event.impl;
-import static org.apache.stanbol.enhancer.jobmanager.event.Constants.PROPERTY_JOB_MANAGER;
import static org.apache.stanbol.enhancer.jobmanager.event.Constants.PROPERTY_EXECUTION;
+import static org.apache.stanbol.enhancer.jobmanager.event.Constants.PROPERTY_JOB_MANAGER;
import static org.apache.stanbol.enhancer.jobmanager.event.Constants.TOPIC_JOB_MANAGER;
import static org.apache.stanbol.enhancer.servicesapi.helper.ExecutionPlanHelper.getEngine;
@@ -11,7 +11,6 @@ import java.util.Dictionary;
import java.util.HashMap;
import java.util.Hashtable;
import java.util.Map;
-import java.util.concurrent.locks.Lock;
import java.util.concurrent.locks.ReadWriteLock;
import java.util.concurrent.locks.ReentrantReadWriteLock;
Modified: incubator/stanbol/trunk/enhancer/jobmanager/event/src/main/java/org/apache/stanbol/enhancer/jobmanager/event/impl/EventJobManagerImpl.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/enhancer/jobmanager/event/src/main/java/org/apache/stanbol/enhancer/jobmanager/event/impl/EventJobManagerImpl.java?rev=1240944&r1=1240943&r2=1240944&view=diff
==============================================================================
--- incubator/stanbol/trunk/enhancer/jobmanager/event/src/main/java/org/apache/stanbol/enhancer/jobmanager/event/impl/EventJobManagerImpl.java (original)
+++ incubator/stanbol/trunk/enhancer/jobmanager/event/src/main/java/org/apache/stanbol/enhancer/jobmanager/event/impl/EventJobManagerImpl.java Mon Feb 6 09:18:45 2012
@@ -1,19 +1,12 @@
package org.apache.stanbol.enhancer.jobmanager.event.impl;
import static org.apache.stanbol.enhancer.jobmanager.event.Constants.TOPIC_JOB_MANAGER;
-import static org.apache.stanbol.enhancer.servicesapi.helper.EnhancementEngineHelper.getString;
-import static org.apache.stanbol.enhancer.servicesapi.helper.ExecutionPlanHelper.getExecutable;
-import static org.apache.stanbol.enhancer.servicesapi.rdf.ExecutionPlan.ENGINE;
-import java.util.ArrayList;
import java.util.Dictionary;
-import java.util.HashSet;
import java.util.Hashtable;
import java.util.List;
-import java.util.Set;
import org.apache.clerezza.rdf.core.Graph;
-import org.apache.clerezza.rdf.core.NonLiteral;
import org.apache.felix.scr.annotations.Activate;
import org.apache.felix.scr.annotations.Component;
import org.apache.felix.scr.annotations.Deactivate;
@@ -29,7 +22,6 @@ import org.apache.stanbol.enhancer.servi
import org.apache.stanbol.enhancer.servicesapi.EnhancementEngine;
import org.apache.stanbol.enhancer.servicesapi.EnhancementEngineManager;
import org.apache.stanbol.enhancer.servicesapi.EnhancementJobManager;
-import org.apache.stanbol.enhancer.servicesapi.helper.EnginesTracker;
import org.apache.stanbol.enhancer.servicesapi.helper.ExecutionPlanHelper;
import org.osgi.framework.Constants;
import org.osgi.framework.ServiceRegistration;
Modified: incubator/stanbol/trunk/entityhub/bundlelist/src/main/bundles/list.xml
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/entityhub/bundlelist/src/main/bundles/list.xml?rev=1240944&r1=1240943&r2=1240944&view=diff
==============================================================================
--- incubator/stanbol/trunk/entityhub/bundlelist/src/main/bundles/list.xml (original)
+++ incubator/stanbol/trunk/entityhub/bundlelist/src/main/bundles/list.xml Mon Feb 6 09:18:45 2012
@@ -59,16 +59,6 @@
<artifactId>org.apache.stanbol.entityhub.ldpath</artifactId>
<version>0.9.0-incubating-SNAPSHOT</version>
</bundle>
- <bundle> <!-- LD Path -->
- <groupId>at.newmedialab.ldpath</groupId>
- <artifactId>ldpath-api</artifactId>
- <version>0.9.4-SNAPSHOT</version>
- </bundle>
- <bundle>
- <groupId>at.newmedialab.ldpath</groupId>
- <artifactId>ldpath-core-bundle</artifactId>
- <version>0.9.4-SNAPSHOT</version>
- </bundle>
<bundle> <!-- LDPath requires jdom for xPath -->
<groupId>org.jdom</groupId>
<artifactId>com.springsource.org.jdom</artifactId>
Modified: incubator/stanbol/trunk/entityhub/jersey/pom.xml
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/entityhub/jersey/pom.xml?rev=1240944&r1=1240943&r2=1240944&view=diff
==============================================================================
--- incubator/stanbol/trunk/entityhub/jersey/pom.xml (original)
+++ incubator/stanbol/trunk/entityhub/jersey/pom.xml Mon Feb 6 09:18:45 2012
@@ -94,6 +94,10 @@
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.entityhub.ldpath</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.apache.stanbol</groupId>
+ <artifactId>org.apache.stanbol.commons.indexedgraph</artifactId>
+ </dependency>
<!-- LD Path -->
<dependency>
<groupId>at.newmedialab.ldpath</groupId>
Modified: incubator/stanbol/trunk/entityhub/jersey/src/main/java/org/apache/stanbol/entityhub/jersey/parsers/RepresentationReader.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/entityhub/jersey/src/main/java/org/apache/stanbol/entityhub/jersey/parsers/RepresentationReader.java?rev=1240944&r1=1240943&r2=1240944&view=diff
==============================================================================
--- incubator/stanbol/trunk/entityhub/jersey/src/main/java/org/apache/stanbol/entityhub/jersey/parsers/RepresentationReader.java (original)
+++ incubator/stanbol/trunk/entityhub/jersey/src/main/java/org/apache/stanbol/entityhub/jersey/parsers/RepresentationReader.java Mon Feb 6 09:18:45 2012
@@ -48,6 +48,7 @@ import org.apache.clerezza.rdf.core.impl
import org.apache.clerezza.rdf.core.serializedform.Parser;
import org.apache.clerezza.rdf.core.serializedform.SupportedFormat;
import org.apache.clerezza.rdf.core.serializedform.UnsupportedParsingFormatException;
+import org.apache.stanbol.commons.indexedgraph.IndexedMGraph;
import org.apache.stanbol.commons.web.base.ContextHelper;
import org.apache.stanbol.entityhub.jersey.utils.JerseyUtils;
import org.apache.stanbol.entityhub.jersey.utils.MessageBodyReaderUtils;
@@ -245,7 +246,7 @@ public class RepresentationReader implem
Set<Representation> representations = new HashSet<Representation>();
Set<NonLiteral> processed = new HashSet<NonLiteral>();
Parser parser = ContextHelper.getServiceFromContext(Parser.class, servletContext);
- MGraph graph = new SimpleMGraph();
+ MGraph graph = new IndexedMGraph();
try {
parser.parse(graph,content.getEntityStream(), content.getMediaType().toString());
} catch (UnsupportedParsingFormatException e) {
Modified: incubator/stanbol/trunk/entityhub/jersey/src/main/java/org/apache/stanbol/entityhub/jersey/resource/EntityhubRootResource.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/entityhub/jersey/src/main/java/org/apache/stanbol/entityhub/jersey/resource/EntityhubRootResource.java?rev=1240944&r1=1240943&r2=1240944&view=diff
==============================================================================
--- incubator/stanbol/trunk/entityhub/jersey/src/main/java/org/apache/stanbol/entityhub/jersey/resource/EntityhubRootResource.java (original)
+++ incubator/stanbol/trunk/entityhub/jersey/src/main/java/org/apache/stanbol/entityhub/jersey/resource/EntityhubRootResource.java Mon Feb 6 09:18:45 2012
@@ -73,6 +73,7 @@ import javax.ws.rs.core.Response.Respons
import javax.ws.rs.core.Response.Status;
import org.apache.clerezza.rdf.core.impl.SimpleMGraph;
+import org.apache.stanbol.commons.indexedgraph.IndexedMGraph;
import org.apache.stanbol.commons.web.base.ContextHelper;
import org.apache.stanbol.commons.web.base.resource.BaseStanbolResource;
import org.apache.stanbol.commons.web.base.utils.MediaTypeUtil;
@@ -585,7 +586,7 @@ public class EntityhubRootResource exten
*/
private Response executeLDPathQuery(Entityhub entityhub,FieldQuery query, String ldpathProgramString, MediaType mediaType, HttpHeaders headers) {
QueryResultList<Representation> result;
- ValueFactory vf = new RdfValueFactory(new SimpleMGraph());
+ ValueFactory vf = new RdfValueFactory(new IndexedMGraph());
EntityhubBackend backend = new EntityhubBackend(entityhub);
EntityhubLDPath ldPath = new EntityhubLDPath(backend,vf);
//copy the selected fields, because we might need to delete some during
Modified: incubator/stanbol/trunk/entityhub/jersey/src/main/java/org/apache/stanbol/entityhub/jersey/resource/ReferencedSiteRootResource.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/entityhub/jersey/src/main/java/org/apache/stanbol/entityhub/jersey/resource/ReferencedSiteRootResource.java?rev=1240944&r1=1240943&r2=1240944&view=diff
==============================================================================
--- incubator/stanbol/trunk/entityhub/jersey/src/main/java/org/apache/stanbol/entityhub/jersey/resource/ReferencedSiteRootResource.java (original)
+++ incubator/stanbol/trunk/entityhub/jersey/src/main/java/org/apache/stanbol/entityhub/jersey/resource/ReferencedSiteRootResource.java Mon Feb 6 09:18:45 2012
@@ -70,6 +70,7 @@ import javax.ws.rs.core.UriInfo;
import org.apache.clerezza.rdf.core.impl.SimpleMGraph;
import org.apache.clerezza.rdf.core.serializedform.SupportedFormat;
import org.apache.clerezza.rdf.ontologies.RDFS;
+import org.apache.stanbol.commons.indexedgraph.IndexedMGraph;
import org.apache.stanbol.commons.web.base.ContextHelper;
import org.apache.stanbol.commons.web.base.resource.BaseStanbolResource;
import org.apache.stanbol.commons.web.base.utils.MediaTypeUtil;
@@ -439,7 +440,7 @@ public class ReferencedSiteRootResource
*/
private Response executeLDPathQuery(FieldQuery query, String ldpathProgramString, MediaType mediaType, HttpHeaders headers) {
QueryResultList<Representation> result;
- ValueFactory vf = new RdfValueFactory(new SimpleMGraph());
+ ValueFactory vf = new RdfValueFactory(new IndexedMGraph());
SiteBackend backend = new SiteBackend(site,vf);
EntityhubLDPath ldPath = new EntityhubLDPath(backend,vf);
//copy the selected fields, because we might need to delete some during
Modified: incubator/stanbol/trunk/entityhub/jersey/src/main/java/org/apache/stanbol/entityhub/jersey/resource/SiteManagerRootResource.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/entityhub/jersey/src/main/java/org/apache/stanbol/entityhub/jersey/resource/SiteManagerRootResource.java?rev=1240944&r1=1240943&r2=1240944&view=diff
==============================================================================
--- incubator/stanbol/trunk/entityhub/jersey/src/main/java/org/apache/stanbol/entityhub/jersey/resource/SiteManagerRootResource.java (original)
+++ incubator/stanbol/trunk/entityhub/jersey/src/main/java/org/apache/stanbol/entityhub/jersey/resource/SiteManagerRootResource.java Mon Feb 6 09:18:45 2012
@@ -62,6 +62,7 @@ import javax.ws.rs.core.UriInfo;
import org.apache.clerezza.rdf.core.impl.SimpleMGraph;
import org.apache.clerezza.rdf.ontologies.RDFS;
+import org.apache.stanbol.commons.indexedgraph.IndexedMGraph;
import org.apache.stanbol.commons.web.base.ContextHelper;
import org.apache.stanbol.commons.web.base.resource.BaseStanbolResource;
import org.apache.stanbol.commons.web.base.utils.MediaTypeUtil;
@@ -416,7 +417,7 @@ public class SiteManagerRootResource ext
*/
private Response executeLDPathQuery(ReferencedSiteManager manager,FieldQuery query, String ldpathProgramString, MediaType mediaType, HttpHeaders headers) {
QueryResultList<Representation> result;
- ValueFactory vf = new RdfValueFactory(new SimpleMGraph());
+ ValueFactory vf = new RdfValueFactory(new IndexedMGraph());
SiteManagerBackend backend = new SiteManagerBackend(manager);
EntityhubLDPath ldPath = new EntityhubLDPath(backend,vf);
//copy the selected fields, because we might need to delete some during
Modified: incubator/stanbol/trunk/entityhub/jersey/src/main/java/org/apache/stanbol/entityhub/jersey/utils/LDPathHelper.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/entityhub/jersey/src/main/java/org/apache/stanbol/entityhub/jersey/utils/LDPathHelper.java?rev=1240944&r1=1240943&r2=1240944&view=diff
==============================================================================
--- incubator/stanbol/trunk/entityhub/jersey/src/main/java/org/apache/stanbol/entityhub/jersey/utils/LDPathHelper.java (original)
+++ incubator/stanbol/trunk/entityhub/jersey/src/main/java/org/apache/stanbol/entityhub/jersey/utils/LDPathHelper.java Mon Feb 6 09:18:45 2012
@@ -39,6 +39,7 @@ import javax.ws.rs.core.Response.Status;
import org.apache.clerezza.rdf.core.MGraph;
import org.apache.clerezza.rdf.core.impl.SimpleMGraph;
+import org.apache.stanbol.commons.indexedgraph.IndexedMGraph;
import org.apache.stanbol.commons.web.base.resource.BaseStanbolResource;
import org.apache.stanbol.commons.web.base.utils.MediaTypeUtil;
import org.apache.stanbol.entityhub.core.model.InMemoryValueFactory;
@@ -92,7 +93,7 @@ public class LDPathHelper {
private static MGraph executeLDPath(RDFBackend<Object> backend,
String ldpath,
Set<String> contexts ) throws LDPathParseException {
- MGraph data = new SimpleMGraph();
+ MGraph data = new IndexedMGraph();
RdfValueFactory vf = new RdfValueFactory(data);
EntityhubLDPath ldPath = new EntityhubLDPath(backend,vf);
Program<Object> program = ldPath.parseProgram(getReader(ldpath));
Modified: incubator/stanbol/trunk/entityhub/jersey/src/main/java/org/apache/stanbol/entityhub/jersey/writers/EntityToRDF.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/entityhub/jersey/src/main/java/org/apache/stanbol/entityhub/jersey/writers/EntityToRDF.java?rev=1240944&r1=1240943&r2=1240944&view=diff
==============================================================================
--- incubator/stanbol/trunk/entityhub/jersey/src/main/java/org/apache/stanbol/entityhub/jersey/writers/EntityToRDF.java (original)
+++ incubator/stanbol/trunk/entityhub/jersey/src/main/java/org/apache/stanbol/entityhub/jersey/writers/EntityToRDF.java Mon Feb 6 09:18:45 2012
@@ -25,6 +25,7 @@ import org.apache.clerezza.rdf.core.impl
import org.apache.clerezza.rdf.core.impl.TripleImpl;
import org.apache.clerezza.rdf.ontologies.FOAF;
import org.apache.clerezza.rdf.ontologies.RDF;
+import org.apache.stanbol.commons.indexedgraph.IndexedMGraph;
import org.apache.stanbol.entityhub.model.clerezza.RdfValueFactory;
import org.apache.stanbol.entityhub.servicesapi.model.Entity;
import org.apache.stanbol.entityhub.servicesapi.model.Representation;
@@ -58,7 +59,7 @@ final class EntityToRDF {
static final LiteralFactory literalFactory = LiteralFactory.getInstance();
static MGraph toRDF(Representation representation) {
- MGraph graph = new SimpleMGraph();
+ MGraph graph = new IndexedMGraph();
addRDFTo(graph, representation);
return graph;
}
@@ -68,7 +69,7 @@ final class EntityToRDF {
}
static TripleCollection toRDF(Entity entity) {
- MGraph graph = new SimpleMGraph();
+ MGraph graph = new IndexedMGraph();
addRDFTo(graph, entity);
return graph;
}
Modified: incubator/stanbol/trunk/entityhub/jersey/src/main/java/org/apache/stanbol/entityhub/jersey/writers/QueryResultsToRDF.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/entityhub/jersey/src/main/java/org/apache/stanbol/entityhub/jersey/writers/QueryResultsToRDF.java?rev=1240944&r1=1240943&r2=1240944&view=diff
==============================================================================
--- incubator/stanbol/trunk/entityhub/jersey/src/main/java/org/apache/stanbol/entityhub/jersey/writers/QueryResultsToRDF.java (original)
+++ incubator/stanbol/trunk/entityhub/jersey/src/main/java/org/apache/stanbol/entityhub/jersey/writers/QueryResultsToRDF.java Mon Feb 6 09:18:45 2012
@@ -24,6 +24,7 @@ import org.apache.clerezza.rdf.core.Trip
import org.apache.clerezza.rdf.core.UriRef;
import org.apache.clerezza.rdf.core.impl.SimpleMGraph;
import org.apache.clerezza.rdf.core.impl.TripleImpl;
+import org.apache.stanbol.commons.indexedgraph.IndexedMGraph;
import org.apache.stanbol.entityhub.query.clerezza.RdfQueryResultList;
import org.apache.stanbol.entityhub.servicesapi.model.Entity;
import org.apache.stanbol.entityhub.servicesapi.model.Representation;
@@ -57,7 +58,7 @@ final class QueryResultsToRDF {
final MGraph resultGraph;
Class<?> type = resultList.getType();
if (String.class.isAssignableFrom(type)) {
- resultGraph = new SimpleMGraph(); //create a new Graph
+ resultGraph = new IndexedMGraph(); //create a new Graph
for (Object result : resultList) {
//add a triple to each reference in the result set
resultGraph.add(new TripleImpl(QUERY_RESULT_LIST, QUERY_RESULT, new UriRef(result.toString())));
@@ -92,7 +93,7 @@ final class QueryResultsToRDF {
}
}
} else { //any other implementation of the QueryResultList interface
- resultGraph = new SimpleMGraph(); //create a new graph
+ resultGraph = new IndexedMGraph(); //create a new graph
if (Representation.class.isAssignableFrom(type)) {
for (Object result : resultList) {
UriRef resultId;
Modified: incubator/stanbol/trunk/entityhub/model/clerezza/pom.xml
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/entityhub/model/clerezza/pom.xml?rev=1240944&r1=1240943&r2=1240944&view=diff
==============================================================================
--- incubator/stanbol/trunk/entityhub/model/clerezza/pom.xml (original)
+++ incubator/stanbol/trunk/entityhub/model/clerezza/pom.xml Mon Feb 6 09:18:45 2012
@@ -82,6 +82,10 @@
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.entityhub.core</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.apache.stanbol</groupId>
+ <artifactId>org.apache.stanbol.commons.indexedgraph</artifactId>
+ </dependency>
<dependency>
<groupId>org.apache.clerezza</groupId>
Modified: incubator/stanbol/trunk/entityhub/model/clerezza/src/main/java/org/apache/stanbol/entityhub/model/clerezza/RdfValueFactory.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/entityhub/model/clerezza/src/main/java/org/apache/stanbol/entityhub/model/clerezza/RdfValueFactory.java?rev=1240944&r1=1240943&r2=1240944&view=diff
==============================================================================
--- incubator/stanbol/trunk/entityhub/model/clerezza/src/main/java/org/apache/stanbol/entityhub/model/clerezza/RdfValueFactory.java (original)
+++ incubator/stanbol/trunk/entityhub/model/clerezza/src/main/java/org/apache/stanbol/entityhub/model/clerezza/RdfValueFactory.java Mon Feb 6 09:18:45 2012
@@ -24,6 +24,7 @@ import org.apache.clerezza.rdf.core.MGra
import org.apache.clerezza.rdf.core.TripleCollection;
import org.apache.clerezza.rdf.core.UriRef;
import org.apache.clerezza.rdf.core.impl.SimpleMGraph;
+import org.apache.stanbol.commons.indexedgraph.IndexedMGraph;
import org.apache.stanbol.entityhub.servicesapi.model.Representation;
import org.apache.stanbol.entityhub.servicesapi.model.ValueFactory;
/**
@@ -103,7 +104,7 @@ public final class RdfValueFactory imple
throw new IllegalArgumentException("The parsed id MUST NOT be empty!");
} else {
return createRdfRepresentation(new UriRef(id),
- graph == null ? new SimpleMGraph() : graph);
+ graph == null ? new IndexedMGraph() : graph);
}
}
Modified: incubator/stanbol/trunk/entityhub/model/clerezza/src/test/java/org/apache/stanbol/entityhub/model/clerezza/RdfValueFactoryTest.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/entityhub/model/clerezza/src/test/java/org/apache/stanbol/entityhub/model/clerezza/RdfValueFactoryTest.java?rev=1240944&r1=1240943&r2=1240944&view=diff
==============================================================================
--- incubator/stanbol/trunk/entityhub/model/clerezza/src/test/java/org/apache/stanbol/entityhub/model/clerezza/RdfValueFactoryTest.java (original)
+++ incubator/stanbol/trunk/entityhub/model/clerezza/src/test/java/org/apache/stanbol/entityhub/model/clerezza/RdfValueFactoryTest.java Mon Feb 6 09:18:45 2012
@@ -16,8 +16,10 @@
*/
package org.apache.stanbol.entityhub.model.clerezza;
+import org.apache.clerezza.rdf.core.MGraph;
import org.apache.clerezza.rdf.core.UriRef;
import org.apache.clerezza.rdf.core.impl.SimpleMGraph;
+import org.apache.stanbol.commons.indexedgraph.IndexedMGraph;
import org.apache.stanbol.entityhub.servicesapi.model.ValueFactory;
import org.apache.stanbol.entityhub.test.model.ValueFactoryTest;
import org.junit.Before;
@@ -49,7 +51,7 @@ public class RdfValueFactoryTest extends
}
@Test(expected=IllegalArgumentException.class)
public void testNullNodeRepresentation() {
- SimpleMGraph graph = new SimpleMGraph();
+ MGraph graph = new IndexedMGraph();
valueFactory.createRdfRepresentation(null, graph);
}
@Test(expected=IllegalArgumentException.class)
Modified: incubator/stanbol/trunk/entityhub/query/clerezza/pom.xml
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/entityhub/query/clerezza/pom.xml?rev=1240944&r1=1240943&r2=1240944&view=diff
==============================================================================
--- incubator/stanbol/trunk/entityhub/query/clerezza/pom.xml (original)
+++ incubator/stanbol/trunk/entityhub/query/clerezza/pom.xml Mon Feb 6 09:18:45 2012
@@ -85,6 +85,10 @@
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.entityhub.model.clerezza</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.apache.stanbol</groupId>
+ <artifactId>org.apache.stanbol.commons.indexedgraph</artifactId>
+ </dependency>
<dependency>
<groupId>org.apache.clerezza</groupId>
Modified: incubator/stanbol/trunk/entityhub/query/clerezza/src/test/java/org/apache/stanbol/entityhub/query/clerezza/RdfResultListTest.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/entityhub/query/clerezza/src/test/java/org/apache/stanbol/entityhub/query/clerezza/RdfResultListTest.java?rev=1240944&r1=1240943&r2=1240944&view=diff
==============================================================================
--- incubator/stanbol/trunk/entityhub/query/clerezza/src/test/java/org/apache/stanbol/entityhub/query/clerezza/RdfResultListTest.java (original)
+++ incubator/stanbol/trunk/entityhub/query/clerezza/src/test/java/org/apache/stanbol/entityhub/query/clerezza/RdfResultListTest.java Mon Feb 6 09:18:45 2012
@@ -24,6 +24,7 @@ import org.apache.clerezza.rdf.core.MGra
import org.apache.clerezza.rdf.core.UriRef;
import org.apache.clerezza.rdf.core.impl.SimpleMGraph;
import org.apache.clerezza.rdf.core.impl.TripleImpl;
+import org.apache.stanbol.commons.indexedgraph.IndexedMGraph;
import org.apache.stanbol.entityhub.core.query.FieldQueryImpl;
import org.apache.stanbol.entityhub.model.clerezza.RdfRepresentation;
import org.apache.stanbol.entityhub.model.clerezza.RdfValueFactory;
@@ -43,7 +44,7 @@ public class RdfResultListTest {
@Test
public void testRdfResultSorting(){
SortedMap<Double,RdfRepresentation> sorted = new TreeMap<Double,RdfRepresentation>();
- MGraph resultGraph = new SimpleMGraph();
+ MGraph resultGraph = new IndexedMGraph();
RdfValueFactory vf = new RdfValueFactory(resultGraph);
UriRef resultListNode = new UriRef(RdfResourceEnum.QueryResultSet.getUri());
UriRef resultProperty = new UriRef(RdfResourceEnum.queryResult.getUri());
Modified: incubator/stanbol/trunk/entityhub/site/linkeddata/pom.xml
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/entityhub/site/linkeddata/pom.xml?rev=1240944&r1=1240943&r2=1240944&view=diff
==============================================================================
--- incubator/stanbol/trunk/entityhub/site/linkeddata/pom.xml (original)
+++ incubator/stanbol/trunk/entityhub/site/linkeddata/pom.xml Mon Feb 6 09:18:45 2012
@@ -94,6 +94,10 @@
<scope>provided</scope>
</dependency>
<dependency>
+ <groupId>org.apache.stanbol</groupId>
+ <artifactId>org.apache.stanbol.commons.indexedgraph</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.apache.clerezza</groupId>
<artifactId>rdf.core</artifactId>
<scope>provided</scope>
Modified: incubator/stanbol/trunk/entityhub/site/linkeddata/src/main/java/org/apache/stanbol/entityhub/site/linkeddata/impl/CoolUriDereferencer.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/entityhub/site/linkeddata/src/main/java/org/apache/stanbol/entityhub/site/linkeddata/impl/CoolUriDereferencer.java?rev=1240944&r1=1240943&r2=1240944&view=diff
==============================================================================
--- incubator/stanbol/trunk/entityhub/site/linkeddata/src/main/java/org/apache/stanbol/entityhub/site/linkeddata/impl/CoolUriDereferencer.java (original)
+++ incubator/stanbol/trunk/entityhub/site/linkeddata/src/main/java/org/apache/stanbol/entityhub/site/linkeddata/impl/CoolUriDereferencer.java Mon Feb 6 09:18:45 2012
@@ -29,6 +29,7 @@ import org.apache.clerezza.rdf.core.seri
import org.apache.felix.scr.annotations.Component;
import org.apache.felix.scr.annotations.ConfigurationPolicy;
import org.apache.felix.scr.annotations.Reference;
+import org.apache.stanbol.commons.indexedgraph.IndexedMGraph;
import org.apache.stanbol.entityhub.core.site.AbstractEntityDereferencer;
import org.apache.stanbol.entityhub.model.clerezza.RdfValueFactory;
import org.apache.stanbol.entityhub.servicesapi.model.Representation;
@@ -74,7 +75,7 @@ public class CoolUriDereferencer extends
long queryEnd = System.currentTimeMillis();
log.info(" > DereferenceTime: "+(queryEnd-start));
if(in != null){
- MGraph rdfData = new SimpleMGraph(parser.parse(in, format));
+ MGraph rdfData = new IndexedMGraph(parser.parse(in, format));
long parseEnd = System.currentTimeMillis();
log.info(" > ParseTime: "+(parseEnd-queryEnd));
return valueFactory.createRdfRepresentation(new UriRef(uri), rdfData);
Modified: incubator/stanbol/trunk/entityhub/site/linkeddata/src/main/java/org/apache/stanbol/entityhub/site/linkeddata/impl/LarqSearcher.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/entityhub/site/linkeddata/src/main/java/org/apache/stanbol/entityhub/site/linkeddata/impl/LarqSearcher.java?rev=1240944&r1=1240943&r2=1240944&view=diff
==============================================================================
--- incubator/stanbol/trunk/entityhub/site/linkeddata/src/main/java/org/apache/stanbol/entityhub/site/linkeddata/impl/LarqSearcher.java (original)
+++ incubator/stanbol/trunk/entityhub/site/linkeddata/src/main/java/org/apache/stanbol/entityhub/site/linkeddata/impl/LarqSearcher.java Mon Feb 6 09:18:45 2012
@@ -27,6 +27,7 @@ import org.apache.clerezza.rdf.core.seri
import org.apache.felix.scr.annotations.Component;
import org.apache.felix.scr.annotations.ConfigurationPolicy;
import org.apache.felix.scr.annotations.Reference;
+import org.apache.stanbol.commons.indexedgraph.IndexedMGraph;
import org.apache.stanbol.entityhub.core.query.QueryResultListImpl;
import org.apache.stanbol.entityhub.core.site.AbstractEntitySearcher;
import org.apache.stanbol.entityhub.query.clerezza.RdfQueryResultList;
@@ -72,7 +73,7 @@ public class LarqSearcher extends Abstra
if(rdfData instanceof MGraph){
graph = (MGraph) rdfData;
} else {
- graph = new SimpleMGraph(rdfData);
+ graph = new IndexedMGraph(rdfData);
}
long parseEnd = System.currentTimeMillis();
log.info(" > ParseTime: "+(parseEnd-queryEnd));
Modified: incubator/stanbol/trunk/entityhub/site/linkeddata/src/main/java/org/apache/stanbol/entityhub/site/linkeddata/impl/SparqlDereferencer.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/entityhub/site/linkeddata/src/main/java/org/apache/stanbol/entityhub/site/linkeddata/impl/SparqlDereferencer.java?rev=1240944&r1=1240943&r2=1240944&view=diff
==============================================================================
--- incubator/stanbol/trunk/entityhub/site/linkeddata/src/main/java/org/apache/stanbol/entityhub/site/linkeddata/impl/SparqlDereferencer.java (original)
+++ incubator/stanbol/trunk/entityhub/site/linkeddata/src/main/java/org/apache/stanbol/entityhub/site/linkeddata/impl/SparqlDereferencer.java Mon Feb 6 09:18:45 2012
@@ -28,6 +28,7 @@ import org.apache.felix.scr.annotations.
import org.apache.felix.scr.annotations.ConfigurationPolicy;
import org.apache.felix.scr.annotations.Reference;
import org.apache.felix.scr.annotations.Service;
+import org.apache.stanbol.commons.indexedgraph.IndexedMGraph;
import org.apache.stanbol.entityhub.core.site.AbstractEntityDereferencer;
import org.apache.stanbol.entityhub.model.clerezza.RdfValueFactory;
import org.apache.stanbol.entityhub.servicesapi.model.Representation;
@@ -88,7 +89,7 @@ public class SparqlDereferencer extends
long queryEnd = System.currentTimeMillis();
log.info(" > DereferenceTime: "+(queryEnd-start));
if(in != null){
- MGraph rdfData = new SimpleMGraph(parser.parse(in, format));
+ MGraph rdfData = new IndexedMGraph(parser.parse(in, format));
long parseEnd = System.currentTimeMillis();
log.info(" > ParseTime: "+(parseEnd-queryEnd));
return valueFactory.createRdfRepresentation(new UriRef(uri), rdfData);
Modified: incubator/stanbol/trunk/entityhub/site/linkeddata/src/main/java/org/apache/stanbol/entityhub/site/linkeddata/impl/SparqlSearcher.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/entityhub/site/linkeddata/src/main/java/org/apache/stanbol/entityhub/site/linkeddata/impl/SparqlSearcher.java?rev=1240944&r1=1240943&r2=1240944&view=diff
==============================================================================
--- incubator/stanbol/trunk/entityhub/site/linkeddata/src/main/java/org/apache/stanbol/entityhub/site/linkeddata/impl/SparqlSearcher.java (original)
+++ incubator/stanbol/trunk/entityhub/site/linkeddata/src/main/java/org/apache/stanbol/entityhub/site/linkeddata/impl/SparqlSearcher.java Mon Feb 6 09:18:45 2012
@@ -31,6 +31,7 @@ import org.apache.commons.io.IOUtils;
import org.apache.felix.scr.annotations.Component;
import org.apache.felix.scr.annotations.ConfigurationPolicy;
import org.apache.felix.scr.annotations.Reference;
+import org.apache.stanbol.commons.indexedgraph.IndexedMGraph;
import org.apache.stanbol.entityhub.core.query.QueryResultListImpl;
import org.apache.stanbol.entityhub.core.site.AbstractEntitySearcher;
import org.apache.stanbol.entityhub.query.clerezza.RdfQueryResultList;
@@ -132,7 +133,7 @@ public class SparqlSearcher extends Abst
if(rdfData instanceof MGraph){
graph = (MGraph) rdfData;
} else {
- graph = new SimpleMGraph(rdfData);
+ graph = new IndexedMGraph(rdfData);
}
long parseEnd = System.currentTimeMillis();
log.info(" > ParseTime: "+(parseEnd-queryEnd));
Modified: incubator/stanbol/trunk/entityhub/site/linkeddata/src/main/java/org/apache/stanbol/entityhub/site/linkeddata/impl/VirtuosoSearcher.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/entityhub/site/linkeddata/src/main/java/org/apache/stanbol/entityhub/site/linkeddata/impl/VirtuosoSearcher.java?rev=1240944&r1=1240943&r2=1240944&view=diff
==============================================================================
--- incubator/stanbol/trunk/entityhub/site/linkeddata/src/main/java/org/apache/stanbol/entityhub/site/linkeddata/impl/VirtuosoSearcher.java (original)
+++ incubator/stanbol/trunk/entityhub/site/linkeddata/src/main/java/org/apache/stanbol/entityhub/site/linkeddata/impl/VirtuosoSearcher.java Mon Feb 6 09:18:45 2012
@@ -27,6 +27,7 @@ import org.apache.clerezza.rdf.core.seri
import org.apache.felix.scr.annotations.Component;
import org.apache.felix.scr.annotations.ConfigurationPolicy;
import org.apache.felix.scr.annotations.Reference;
+import org.apache.stanbol.commons.indexedgraph.IndexedMGraph;
import org.apache.stanbol.entityhub.core.query.QueryResultListImpl;
import org.apache.stanbol.entityhub.core.site.AbstractEntitySearcher;
import org.apache.stanbol.entityhub.query.clerezza.RdfQueryResultList;
@@ -72,7 +73,7 @@ public class VirtuosoSearcher extends Ab
if(rdfData instanceof MGraph){
graph = (MGraph) rdfData;
} else {
- graph = new SimpleMGraph(rdfData);
+ graph = new IndexedMGraph(rdfData);
}
long parseEnd = System.currentTimeMillis();
log.info(" > ParseTime: "+(parseEnd-queryEnd));
Modified: incubator/stanbol/trunk/entityhub/yard/clerezza/pom.xml
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/entityhub/yard/clerezza/pom.xml?rev=1240944&r1=1240943&r2=1240944&view=diff
==============================================================================
--- incubator/stanbol/trunk/entityhub/yard/clerezza/pom.xml (original)
+++ incubator/stanbol/trunk/entityhub/yard/clerezza/pom.xml Mon Feb 6 09:18:45 2012
@@ -91,6 +91,10 @@
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.entityhub.query.clerezza</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.apache.stanbol</groupId>
+ <artifactId>org.apache.stanbol.commons.indexedgraph</artifactId>
+ </dependency>
<dependency>
<groupId>org.apache.clerezza</groupId>
Modified: incubator/stanbol/trunk/entityhub/yard/clerezza/src/main/java/org/apache/stanbol/entityhub/yard/clerezza/impl/ClerezzaYard.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/entityhub/yard/clerezza/src/main/java/org/apache/stanbol/entityhub/yard/clerezza/impl/ClerezzaYard.java?rev=1240944&r1=1240943&r2=1240944&view=diff
==============================================================================
--- incubator/stanbol/trunk/entityhub/yard/clerezza/src/main/java/org/apache/stanbol/entityhub/yard/clerezza/impl/ClerezzaYard.java (original)
+++ incubator/stanbol/trunk/entityhub/yard/clerezza/src/main/java/org/apache/stanbol/entityhub/yard/clerezza/impl/ClerezzaYard.java Mon Feb 6 09:18:45 2012
@@ -49,6 +49,7 @@ import org.apache.felix.scr.annotations.
import org.apache.felix.scr.annotations.Deactivate;
import org.apache.felix.scr.annotations.Reference;
import org.apache.felix.scr.annotations.Service;
+import org.apache.stanbol.commons.indexedgraph.IndexedMGraph;
import org.apache.stanbol.entityhub.core.query.QueryResultListImpl;
import org.apache.stanbol.entityhub.core.query.QueryUtils;
import org.apache.stanbol.entityhub.core.utils.AdaptingIterator;
@@ -224,7 +225,7 @@ public class ClerezzaYard extends Abstra
* @return the extracted graph.
*/
protected MGraph createRepresentationGraph(UriRef id, TripleCollection graph){
- return extractRepresentation(graph, new SimpleMGraph(), id, new HashSet<BNode>());
+ return extractRepresentation(graph, new IndexedMGraph(), id, new HashSet<BNode>());
}
/**
* Recursive Method internally doing all the work for
@@ -495,7 +496,7 @@ public class ClerezzaYard extends Abstra
if(resultObject instanceof MGraph){
resultGraph = (MGraph)resultObject;
} else if(resultObject instanceof Graph){
- resultGraph = new SimpleMGraph();
+ resultGraph = new IndexedMGraph();
resultGraph.addAll((Graph)resultObject);
} else {
log.error("Unable to create "+MGraph.class+" instance for query reults of type "+resultObject.getClass()+" (this indicates that the used SPARQL Query was not of type CONSTRUCT)");
Modified: incubator/stanbol/trunk/launchers/bundlelists/stanbolcommons/src/main/bundles/list.xml
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/launchers/bundlelists/stanbolcommons/src/main/bundles/list.xml?rev=1240944&r1=1240943&r2=1240944&view=diff
==============================================================================
--- incubator/stanbol/trunk/launchers/bundlelists/stanbolcommons/src/main/bundles/list.xml (original)
+++ incubator/stanbol/trunk/launchers/bundlelists/stanbolcommons/src/main/bundles/list.xml Mon Feb 6 09:18:45 2012
@@ -266,6 +266,14 @@
<artifactId>org.json.simple</artifactId>
<version>0.3-incubating-SNAPSHOT</version>
</bundle>
+ <!--
+ Add support for fast index based in-memory models
+ -->
+ <bundle>
+ <groupId>org.apache.stanbol</groupId>
+ <artifactId>org.apache.stanbol.commons.indexedgraph</artifactId>
+ <version>0.9.0-incubating-SNAPSHOT</version>
+ </bundle>
</startLevel>
<!-- Stanbol Commons -->
@@ -334,6 +342,7 @@
<artifactId>org.apache.stanbol.commons.jobs.web</artifactId>
<version>0.9.0-incubating-SNAPSHOT</version>
</bundle>
+
<!-- The common web interface -->
<bundle>
<groupId>org.apache.stanbol</groupId>
@@ -346,4 +355,25 @@
<version>0.9.0-incubating-SNAPSHOT</version>
</bundle>
</startLevel>
+
+ <!-- LD Path -->
+ <startLevel level="17">
+ <bundle> <!-- LD Path -->
+ <groupId>at.newmedialab.ldpath</groupId>
+ <artifactId>ldpath-api</artifactId>
+ <version>0.9.4-SNAPSHOT</version>
+ </bundle>
+ <bundle>
+ <groupId>at.newmedialab.ldpath</groupId>
+ <artifactId>ldpath-core-bundle</artifactId>
+ <version>0.9.4-SNAPSHOT</version>
+ </bundle>
+ <bundle>
+ <groupId>org.apache.stanbol</groupId>
+ <artifactId>org.apache.stanbol.commons.ldpath.clerezza</artifactId>
+ <version>0.9.0-incubating-SNAPSHOT</version>
+ </bundle>
+ </startLevel>
+
+
</bundles>
\ No newline at end of file
Modified: incubator/stanbol/trunk/parent/pom.xml
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/parent/pom.xml?rev=1240944&r1=1240943&r2=1240944&view=diff
==============================================================================
--- incubator/stanbol/trunk/parent/pom.xml (original)
+++ incubator/stanbol/trunk/parent/pom.xml Mon Feb 6 09:18:45 2012
@@ -415,6 +415,11 @@
</dependency>
<dependency>
<groupId>org.apache.stanbol</groupId>
+ <artifactId>org.apache.stanbol.commons.clerezza.ldpath</artifactId>
+ <version>0.9.0-incubating-SNAPSHOT</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.commons.opennlp</artifactId>
<version>0.9.0-incubating-SNAPSHOT</version>
</dependency>
@@ -1436,6 +1441,11 @@
<artifactId>ldpath-core-bundle</artifactId>
<version>0.9.4-SNAPSHOT</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.stanbol</groupId>
+ <artifactId>org.apache.stanbol.commons.ldpath.clerezza</artifactId>
+ <version>0.9.0-incubating-SNAPSHOT</version>
+ </dependency>
<!-- Apache Tika core -->