You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stanbol.apache.org by re...@apache.org on 2016/05/17 22:20:55 UTC
svn commit: r1744328 [23/24] - in /stanbol/trunk: ./
commons/indexedgraph/src/main/java/org/apache/stanbol/commons/indexedgraph/
commons/indexedgraph/src/test/java/org/apache/stanbol/commons/indexedgraph/
commons/installer/bundleprovider/src/main/java/...
Modified: stanbol/trunk/ontologymanager/multiplexer/clerezza/src/test/java/org/apache/stanbol/ontologymanager/multiplexer/clerezza/scope/TestClerezzaSpaces.java
URL: http://svn.apache.org/viewvc/stanbol/trunk/ontologymanager/multiplexer/clerezza/src/test/java/org/apache/stanbol/ontologymanager/multiplexer/clerezza/scope/TestClerezzaSpaces.java?rev=1744328&r1=1744327&r2=1744328&view=diff
==============================================================================
--- stanbol/trunk/ontologymanager/multiplexer/clerezza/src/test/java/org/apache/stanbol/ontologymanager/multiplexer/clerezza/scope/TestClerezzaSpaces.java (original)
+++ stanbol/trunk/ontologymanager/multiplexer/clerezza/src/test/java/org/apache/stanbol/ontologymanager/multiplexer/clerezza/scope/TestClerezzaSpaces.java Tue May 17 22:20:49 2016
@@ -30,8 +30,8 @@ import java.io.File;
import java.io.InputStream;
import java.util.Hashtable;
-import org.apache.clerezza.rdf.core.MGraph;
-import org.apache.clerezza.rdf.core.TripleCollection;
+import org.apache.clerezza.commons.rdf.Graph;
+import org.apache.clerezza.commons.rdf.Graph;
import org.apache.clerezza.rdf.core.serializedform.SupportedFormat;
import org.apache.stanbol.commons.owl.util.OWLUtils;
import org.apache.stanbol.ontologymanager.core.OfflineConfigurationImpl;
@@ -70,13 +70,13 @@ public class TestClerezzaSpaces {
private static OntologySpaceFactory factory;
- private static OntologyInputSource<TripleCollection> minorSrc, dropSrc, nonexSrc;
+ private static OntologyInputSource<Graph> minorSrc, dropSrc, nonexSrc;
private static OntologyInputSource<OWLOntology> inMemorySrc;
private static OfflineConfiguration offline;
- private static OntologyInputSource<TripleCollection> getLocalSource(String resourcePath) {
+ private static OntologyInputSource<Graph> getLocalSource(String resourcePath) {
InputStream is = TestOntologySpaces.class.getResourceAsStream(resourcePath);
return new GraphSource(parser.parse(is, SupportedFormat.RDF_XML));
}
@@ -87,8 +87,8 @@ public class TestClerezzaSpaces {
ScopeRegistry reg = new ScopeRegistryImpl();
// This one is created from scratch
- MGraph ont2 = ClerezzaOWLUtils.createOntology(baseIri2.toString());
- minorSrc = new GraphSource(ont2.getGraph());
+ Graph ont2 = ClerezzaOWLUtils.createOntology(baseIri2.toString());
+ minorSrc = new GraphSource(ont2.getImmutableGraph());
dropSrc = getLocalSource("/ontologies/droppedcharacters.owl");
nonexSrc = getLocalSource("/ontologies/nonexistentcharacters.owl");
inMemorySrc = new ParentPathInputSource(new File(TestClerezzaSpaces.class.getResource(
@@ -145,7 +145,7 @@ public class TestClerezzaSpaces {
OntologySpace space = factory.createCustomOntologySpace(scopeId, dropSrc);
OWLOntologyID logicalId = null;
Object o = dropSrc.getRootOntology();
- if (o instanceof TripleCollection) logicalId = OWLUtils.extractOntologyID((TripleCollection) o);
+ if (o instanceof Graph) logicalId = OWLUtils.extractOntologyID((Graph) o);
else if (o instanceof OWLOntology) logicalId = OWLUtils.extractOntologyID((OWLOntology) o);
assertNotNull(logicalId);
assertTrue(space.hasOntology(logicalId));
Modified: stanbol/trunk/ontologymanager/registry/src/main/java/org/apache/stanbol/ontologymanager/registry/xd/vocabulary/Vocabulary.java
URL: http://svn.apache.org/viewvc/stanbol/trunk/ontologymanager/registry/src/main/java/org/apache/stanbol/ontologymanager/registry/xd/vocabulary/Vocabulary.java?rev=1744328&r1=1744327&r2=1744328&view=diff
==============================================================================
--- stanbol/trunk/ontologymanager/registry/src/main/java/org/apache/stanbol/ontologymanager/registry/xd/vocabulary/Vocabulary.java (original)
+++ stanbol/trunk/ontologymanager/registry/src/main/java/org/apache/stanbol/ontologymanager/registry/xd/vocabulary/Vocabulary.java Tue May 17 22:20:49 2016
@@ -62,7 +62,7 @@ public enum Vocabulary {
*/
XSD("xsd", "http://www.w3.org/2001/XMLSchema", ""),
/**
- * Resource Description Framework
+ * RDFTerm Description Framework
*/
RDF("rdf", "http://www.w3.org/1999/02/22-rdf-syntax-ns", ""),
/**
Modified: stanbol/trunk/ontologymanager/sources/clerezza/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/io/GraphContentInputSource.java
URL: http://svn.apache.org/viewvc/stanbol/trunk/ontologymanager/sources/clerezza/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/io/GraphContentInputSource.java?rev=1744328&r1=1744327&r2=1744328&view=diff
==============================================================================
--- stanbol/trunk/ontologymanager/sources/clerezza/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/io/GraphContentInputSource.java (original)
+++ stanbol/trunk/ontologymanager/sources/clerezza/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/io/GraphContentInputSource.java Tue May 17 22:20:49 2016
@@ -18,14 +18,14 @@ package org.apache.stanbol.ontologymanag
import java.io.InputStream;
-import org.apache.clerezza.rdf.core.TripleCollection;
+import org.apache.clerezza.commons.rdf.Graph;
import org.apache.clerezza.rdf.core.access.TcProvider;
import org.apache.clerezza.rdf.core.serializedform.Parser;
import org.apache.stanbol.ontologymanager.servicesapi.io.OntologyInputSource;
public class GraphContentInputSource extends
org.apache.stanbol.ontologymanager.sources.clerezza.GraphContentInputSource implements
- OntologyInputSource<TripleCollection> {
+ OntologyInputSource<Graph> {
public GraphContentInputSource(InputStream content) {
super(content);
Modified: stanbol/trunk/ontologymanager/sources/clerezza/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/io/GraphSource.java
URL: http://svn.apache.org/viewvc/stanbol/trunk/ontologymanager/sources/clerezza/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/io/GraphSource.java?rev=1744328&r1=1744327&r2=1744328&view=diff
==============================================================================
--- stanbol/trunk/ontologymanager/sources/clerezza/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/io/GraphSource.java (original)
+++ stanbol/trunk/ontologymanager/sources/clerezza/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/io/GraphSource.java Tue May 17 22:20:49 2016
@@ -16,8 +16,8 @@
*/
package org.apache.stanbol.ontologymanager.ontonet.api.io;
-import org.apache.clerezza.rdf.core.TripleCollection;
-import org.apache.clerezza.rdf.core.UriRef;
+import org.apache.clerezza.commons.rdf.Graph;
+import org.apache.clerezza.commons.rdf.IRI;
import org.apache.clerezza.rdf.core.access.TcProvider;
@Deprecated
@@ -27,15 +27,15 @@ public class GraphSource extends org.apa
super(graphId);
}
- public GraphSource(TripleCollection graph) {
+ public GraphSource(Graph graph) {
super(graph);
}
- public GraphSource(UriRef graphId) {
+ public GraphSource(IRI graphId) {
super(graphId);
}
- public GraphSource(UriRef graphId, TcProvider tcProvider) {
+ public GraphSource(IRI graphId, TcProvider tcProvider) {
super(graphId, tcProvider);
}
Modified: stanbol/trunk/ontologymanager/sources/clerezza/src/main/java/org/apache/stanbol/ontologymanager/sources/clerezza/AbstractClerezzaGraphInputSource.java
URL: http://svn.apache.org/viewvc/stanbol/trunk/ontologymanager/sources/clerezza/src/main/java/org/apache/stanbol/ontologymanager/sources/clerezza/AbstractClerezzaGraphInputSource.java?rev=1744328&r1=1744327&r2=1744328&view=diff
==============================================================================
--- stanbol/trunk/ontologymanager/sources/clerezza/src/main/java/org/apache/stanbol/ontologymanager/sources/clerezza/AbstractClerezzaGraphInputSource.java (original)
+++ stanbol/trunk/ontologymanager/sources/clerezza/src/main/java/org/apache/stanbol/ontologymanager/sources/clerezza/AbstractClerezzaGraphInputSource.java Tue May 17 22:20:49 2016
@@ -16,7 +16,7 @@
*/
package org.apache.stanbol.ontologymanager.sources.clerezza;
-import org.apache.clerezza.rdf.core.TripleCollection;
+import org.apache.clerezza.commons.rdf.Graph;
import org.apache.clerezza.rdf.core.access.TcManager;
import org.apache.stanbol.ontologymanager.servicesapi.io.AbstractGenericInputSource;
import org.apache.stanbol.ontologymanager.servicesapi.io.OntologyInputSource;
@@ -24,7 +24,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/**
- * Default implementation of an {@link OntologyInputSource} that returns {@link TripleCollection} objects as
+ * Default implementation of an {@link OntologyInputSource} that returns {@link Graph} objects as
* ontologies.
*
* Subclasses must implement the {@link #getImports(boolean)} method, as the availability of imported
@@ -34,12 +34,12 @@ import org.slf4j.LoggerFactory;
* @author alexdma
*
*/
-public abstract class AbstractClerezzaGraphInputSource extends AbstractGenericInputSource<TripleCollection> {
+public abstract class AbstractClerezzaGraphInputSource extends AbstractGenericInputSource<Graph> {
protected Logger log = LoggerFactory.getLogger(getClass());
@Override
- protected void bindRootOntology(TripleCollection ontology) {
+ protected void bindRootOntology(Graph ontology) {
super.bindRootOntology(ontology);
}
Modified: stanbol/trunk/ontologymanager/sources/clerezza/src/main/java/org/apache/stanbol/ontologymanager/sources/clerezza/GraphContentInputSource.java
URL: http://svn.apache.org/viewvc/stanbol/trunk/ontologymanager/sources/clerezza/src/main/java/org/apache/stanbol/ontologymanager/sources/clerezza/GraphContentInputSource.java?rev=1744328&r1=1744327&r2=1744328&view=diff
==============================================================================
--- stanbol/trunk/ontologymanager/sources/clerezza/src/main/java/org/apache/stanbol/ontologymanager/sources/clerezza/GraphContentInputSource.java (original)
+++ stanbol/trunk/ontologymanager/sources/clerezza/src/main/java/org/apache/stanbol/ontologymanager/sources/clerezza/GraphContentInputSource.java Tue May 17 22:20:49 2016
@@ -22,14 +22,14 @@ import java.util.Collection;
import java.util.Collections;
import java.util.Iterator;
-import org.apache.clerezza.rdf.core.Graph;
-import org.apache.clerezza.rdf.core.MGraph;
-import org.apache.clerezza.rdf.core.TripleCollection;
-import org.apache.clerezza.rdf.core.UriRef;
+import org.apache.clerezza.commons.rdf.ImmutableGraph;
+import org.apache.clerezza.commons.rdf.Graph;
+import org.apache.clerezza.commons.rdf.Graph;
+import org.apache.clerezza.commons.rdf.IRI;
import org.apache.clerezza.rdf.core.access.TcProvider;
import org.apache.clerezza.rdf.core.serializedform.Parser;
import org.apache.clerezza.rdf.core.serializedform.UnsupportedFormatException;
-import org.apache.stanbol.commons.indexedgraph.IndexedMGraph;
+import org.apache.stanbol.commons.indexedgraph.IndexedGraph;
import org.apache.stanbol.ontologymanager.servicesapi.io.Origin;
import org.apache.stanbol.ontologymanager.servicesapi.ontology.OntologyLoadingException;
import org.apache.stanbol.ontologymanager.servicesapi.util.OntologyUtils;
@@ -37,7 +37,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/**
- * An ontology input source that returns a Clerezza {@link TripleCollection} ({@link Graph} or {@link MGraph})
+ * An ontology input source that returns a Clerezza {@link Graph} ({@link ImmutableGraph} or {@link Graph})
* after parsing its serialized content from an input stream.
*
* @author alexdma
@@ -128,18 +128,18 @@ public class GraphContentInputSource ext
else formats = Collections.singleton(formatIdentifier);
// TODO guess/lookahead the ontology ID and use it in the graph name.
- UriRef name = new UriRef( /* "ontonet" + "::" + */
+ IRI name = new IRI( /* "ontonet" + "::" + */
getClass().getCanonicalName() + "-time:" + System.currentTimeMillis());
- TripleCollection graph = null;
+ Graph graph = null;
if (tcProvider != null && tcProvider != null) {
- // Graph directly stored in the TcProvider prior to using the source
- graph = tcProvider.createMGraph(name);
+ // ImmutableGraph directly stored in the TcProvider prior to using the source
+ graph = tcProvider.createGraph(name);
bindPhysicalOrigin(Origin.create(name));
// XXX if addition fails, should rollback procedures also delete the graph?
} else {
// In memory graph, will most likely have to be copied afterwards.
- graph = new IndexedMGraph();
+ graph = new IndexedGraph();
bindPhysicalOrigin(null);
}
@@ -149,9 +149,9 @@ public class GraphContentInputSource ext
String f = itf.next();
log.debug("Parsing with format {}", f);
try {
- parser.parse((MGraph) graph, content, f);
+ parser.parse((Graph) graph, content, f);
loaded = true;
- log.info("Graph parsed, has {} triples", graph.size());
+ log.info("ImmutableGraph parsed, has {} triples", graph.size());
} catch (UnsupportedFormatException e) {
log.debug("Parsing format {} failed.", f);
} catch (Exception e) {
@@ -173,7 +173,7 @@ public class GraphContentInputSource ext
} else {
// Rollback graph creation, if any
if (tcProvider != null && tcProvider != null) {
- tcProvider.deleteTripleCollection(name);
+ tcProvider.deleteGraph(name);
log.error("Parsing failed. Deleting triple collection {}", name);
}
throw new OntologyLoadingException("Parsing failed. Giving up.");
Modified: stanbol/trunk/ontologymanager/sources/clerezza/src/main/java/org/apache/stanbol/ontologymanager/sources/clerezza/GraphSource.java
URL: http://svn.apache.org/viewvc/stanbol/trunk/ontologymanager/sources/clerezza/src/main/java/org/apache/stanbol/ontologymanager/sources/clerezza/GraphSource.java?rev=1744328&r1=1744327&r2=1744328&view=diff
==============================================================================
--- stanbol/trunk/ontologymanager/sources/clerezza/src/main/java/org/apache/stanbol/ontologymanager/sources/clerezza/GraphSource.java (original)
+++ stanbol/trunk/ontologymanager/sources/clerezza/src/main/java/org/apache/stanbol/ontologymanager/sources/clerezza/GraphSource.java Tue May 17 22:20:49 2016
@@ -16,17 +16,17 @@
*/
package org.apache.stanbol.ontologymanager.sources.clerezza;
-import org.apache.clerezza.rdf.core.Graph;
-import org.apache.clerezza.rdf.core.MGraph;
-import org.apache.clerezza.rdf.core.TripleCollection;
-import org.apache.clerezza.rdf.core.UriRef;
+import org.apache.clerezza.commons.rdf.ImmutableGraph;
+import org.apache.clerezza.commons.rdf.Graph;
+import org.apache.clerezza.commons.rdf.Graph;
+import org.apache.clerezza.commons.rdf.IRI;
import org.apache.clerezza.rdf.core.access.TcManager;
import org.apache.clerezza.rdf.core.access.TcProvider;
import org.apache.stanbol.ontologymanager.servicesapi.io.OntologyInputSource;
import org.apache.stanbol.ontologymanager.servicesapi.io.Origin;
/**
- * An {@link OntologyInputSource} that gets ontologies from either a stored {@link TripleCollection}, or its
+ * An {@link OntologyInputSource} that gets ontologies from either a stored {@link Graph}, or its
* identifier and an optionally supplied triple collection manager.
*
* @author alexdma
@@ -36,7 +36,7 @@ public class GraphSource extends Abstrac
/**
* Creates a new input source by querying the default triple collection manager for a graph named with the
- * supplied <code>graphId</code>. A {@link UriRef} that represents the graph name will also be set as the
+ * supplied <code>graphId</code>. A {@link IRI} that represents the graph name will also be set as the
* graph origin.
*
* @param graphId
@@ -47,7 +47,7 @@ public class GraphSource extends Abstrac
* if no such graph can be found.
*/
public GraphSource(String graphId) {
- this(new UriRef(graphId));
+ this(new IRI(graphId));
}
/**
@@ -56,12 +56,12 @@ public class GraphSource extends Abstrac
* @param graph
* the RDF graph
* @throws IllegalArgumentException
- * if <code>graph</code> is neither a {@link Graph} nor a {@link MGraph}.
+ * if <code>graph</code> is neither a {@link ImmutableGraph} nor a {@link Graph}.
*/
- public GraphSource(TripleCollection graph) {
- if (graph instanceof Graph) bindRootOntology(graph);
- else if (graph instanceof MGraph) bindRootOntology(((MGraph) graph).getGraph());
- else throw new IllegalArgumentException("GraphSource supports only Graph and MGraph types. "
+ public GraphSource(Graph graph) {
+ if (graph instanceof ImmutableGraph) bindRootOntology(graph);
+ else if (graph instanceof Graph) bindRootOntology(((Graph) graph).getImmutableGraph());
+ else throw new IllegalArgumentException("GraphSource supports only ImmutableGraph and Graph types. "
+ graph.getClass() + " is not supported.");
bindPhysicalOrigin(null);
}
@@ -77,7 +77,7 @@ public class GraphSource extends Abstrac
* @throws org.apache.clerezza.rdf.core.access.NoSuchEntityException
* if no such graph can be found.
*/
- public GraphSource(UriRef graphId) {
+ public GraphSource(IRI graphId) {
this(graphId, TcManager.getInstance());
}
@@ -92,8 +92,8 @@ public class GraphSource extends Abstrac
* @throws org.apache.clerezza.rdf.core.access.NoSuchEntityException
* if no such graph can be found in <code>tcProvider</code>.
*/
- public GraphSource(UriRef graphId, TcProvider tcProvider) {
- this(tcProvider.getTriples(graphId));
+ public GraphSource(IRI graphId, TcProvider tcProvider) {
+ this(tcProvider.getGraph(graphId));
bindPhysicalOrigin(Origin.create(graphId));
}
Modified: stanbol/trunk/ontologymanager/sources/clerezza/src/test/java/org/apache/stanbol/ontologymanager/sources/clerezza/TestClerezzaInputSources.java
URL: http://svn.apache.org/viewvc/stanbol/trunk/ontologymanager/sources/clerezza/src/test/java/org/apache/stanbol/ontologymanager/sources/clerezza/TestClerezzaInputSources.java?rev=1744328&r1=1744327&r2=1744328&view=diff
==============================================================================
--- stanbol/trunk/ontologymanager/sources/clerezza/src/test/java/org/apache/stanbol/ontologymanager/sources/clerezza/TestClerezzaInputSources.java (original)
+++ stanbol/trunk/ontologymanager/sources/clerezza/src/test/java/org/apache/stanbol/ontologymanager/sources/clerezza/TestClerezzaInputSources.java Tue May 17 22:20:49 2016
@@ -24,8 +24,8 @@ import static org.junit.Assert.assertSam
import java.io.InputStream;
-import org.apache.clerezza.rdf.core.TripleCollection;
-import org.apache.clerezza.rdf.core.UriRef;
+import org.apache.clerezza.commons.rdf.Graph;
+import org.apache.clerezza.commons.rdf.IRI;
import org.apache.clerezza.rdf.core.access.TcProvider;
import org.apache.clerezza.rdf.core.serializedform.SupportedFormat;
import org.apache.clerezza.rdf.simple.storage.SimpleTcProvider;
@@ -57,7 +57,7 @@ public class TestClerezzaInputSources {
private Logger log = LoggerFactory.getLogger(getClass());
- private OntologyInputSource<TripleCollection> src;
+ private OntologyInputSource<Graph> src;
@Before
public void bind() throws Exception {
@@ -68,7 +68,7 @@ public class TestClerezzaInputSources {
assertNotNull(src);
if (usesTcProvider) assertNotNull(src.getOrigin());
else assertNull(src.getOrigin());
- TripleCollection o = src.getRootOntology();
+ Graph o = src.getRootOntology();
assertNotNull(o);
log.info("Ontology loaded, is a {}", o.getClass().getCanonicalName());
assertSame(5, o.size()); // The owl:Ontology declaration and versionInfo also count as triples.
@@ -97,11 +97,11 @@ public class TestClerezzaInputSources {
public void fromInputStreamInSimpleTcProvider() throws Exception {
InputStream in = getClass().getResourceAsStream(dummy_RdfXml);
TcProvider tcp = new SimpleTcProvider();
- assertSame(0, tcp.listTripleCollections().size());
- int before = tcp.listTripleCollections().size();
+ assertSame(0, tcp.listGraphs().size());
+ int before = tcp.listGraphs().size();
src = new GraphContentInputSource(in, tcp);
checkOntology(true);
- assertSame(before + 1, tcp.listTripleCollections().size());
+ assertSame(before + 1, tcp.listGraphs().size());
}
/*
@@ -111,10 +111,10 @@ public class TestClerezzaInputSources {
@Test
public void fromInputStreamInTcManager() throws Exception {
InputStream in = getClass().getResourceAsStream(dummy_RdfXml);
- int before = tcManager.listTripleCollections().size();
+ int before = tcManager.listGraphs().size();
src = new GraphContentInputSource(in, tcManager);
checkOntology(true);
- assertSame(before + 1, tcManager.listTripleCollections().size());
+ assertSame(before + 1, tcManager.listGraphs().size());
}
/*
@@ -145,54 +145,54 @@ public class TestClerezzaInputSources {
// @Test
// public void testGraphContentSource() throws Exception {
// // Make sure the tc manager has been reset
- // assertEquals(1, tcManager.listTripleCollections().size());
+ // assertEquals(1, tcManager.listGraphs().size());
//
// OntologyProvider<TcProvider> provider = new ClerezzaOntologyProvider(tcManager,
// new OfflineConfigurationImpl(new Hashtable<String,Object>()), parser);
- // int tcs = tcManager.listTripleCollections().size();
+ // int tcs = tcManager.listGraphs().size();
// InputStream content = TestClerezzaInputSources.class
// .getResourceAsStream("/ontologies/droppedcharacters.owl");
// OntologyInputSource<?> src = new GraphContentInputSource(content, SupportedFormat.RDF_XML,
// ontologyProvider.getStore(), parser);
//
- // log.info("After input source creation, TcManager has {} graphs. ", tcManager.listTripleCollections()
+ // log.info("After input source creation, TcManager has {} graphs. ", tcManager.listGraphs()
// .size());
- // for (UriRef name : tcManager.listTripleCollections())
+ // for (IRI name : tcManager.listGraphs())
// log.info("-- {} (a {})", name, tcManager.getTriples(name).getClass().getSimpleName());
- // assertEquals(tcs + 1, tcManager.listTripleCollections().size());
+ // assertEquals(tcs + 1, tcManager.listGraphs().size());
// Space spc = new CoreSpaceImpl(TestClerezzaInputSources.class.getSimpleName(),
// IRI.create("http://stanbol.apache.org/ontologies/"), provider);
// spc.addOntology(src);
- // log.info("After addition to space, TcManager has {} graphs. ", tcManager.listTripleCollections()
+ // log.info("After addition to space, TcManager has {} graphs. ", tcManager.listGraphs()
// .size());
//
- // for (UriRef name : tcManager.listTripleCollections())
+ // for (IRI name : tcManager.listGraphs())
// log.info("-- {} (a {})", name, tcManager.getTriples(name).getClass().getSimpleName());
// // Adding the ontology from the same storage should not create new graphs
- // assertEquals(tcs + 1, tcManager.listTripleCollections().size());
+ // assertEquals(tcs + 1, tcManager.listGraphs().size());
//
// }
@Test
public void testGraphSource() throws Exception {
- UriRef uri = new UriRef(Locations.CHAR_ACTIVE.toString());
+ IRI uri = new IRI(Locations.CHAR_ACTIVE.toString());
InputStream inputStream = TestClerezzaInputSources.class
.getResourceAsStream("/ontologies/characters_all.owl");
- parser.parse(tcManager.createMGraph(uri), inputStream, SupportedFormat.RDF_XML, uri);
- uri = new UriRef(Locations.CHAR_MAIN.toString());
+ parser.parse(tcManager.createGraph(uri), inputStream, SupportedFormat.RDF_XML, uri);
+ uri = new IRI(Locations.CHAR_MAIN.toString());
inputStream = TestClerezzaInputSources.class.getResourceAsStream("/ontologies/maincharacters.owl");
- parser.parse(tcManager.createMGraph(uri), inputStream, SupportedFormat.RDF_XML, uri);
- uri = new UriRef(Locations.CHAR_MINOR.toString());
+ parser.parse(tcManager.createGraph(uri), inputStream, SupportedFormat.RDF_XML, uri);
+ uri = new IRI(Locations.CHAR_MINOR.toString());
inputStream = TestClerezzaInputSources.class.getResourceAsStream("/ontologies/minorcharacters.owl");
- parser.parse(tcManager.createMGraph(uri), inputStream, SupportedFormat.RDF_XML, uri);
+ parser.parse(tcManager.createGraph(uri), inputStream, SupportedFormat.RDF_XML, uri);
- src = new GraphSource(new UriRef(Locations.CHAR_ACTIVE.toString()));
+ src = new GraphSource(new IRI(Locations.CHAR_ACTIVE.toString()));
assertNotNull(src);
assertNotNull(src.getRootOntology());
- // Set<TripleCollection> imported = gis.getImports(false);
+ // Set<Graph> imported = gis.getImports(false);
// // Number of stored graphs minus the importing one minus the reserved graph = imported graphs
- // assertEquals(tcManager.listTripleCollections().size() - 2, imported.size());
- // for (TripleCollection g : imported)
+ // assertEquals(tcManager.listGraphs().size() - 2, imported.size());
+ // for (Graph g : imported)
// assertNotNull(g);
}
Modified: stanbol/trunk/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/resources/RootResource.java
URL: http://svn.apache.org/viewvc/stanbol/trunk/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/resources/RootResource.java?rev=1744328&r1=1744327&r2=1744328&view=diff
==============================================================================
--- stanbol/trunk/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/resources/RootResource.java (original)
+++ stanbol/trunk/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/resources/RootResource.java Tue May 17 22:20:49 2016
@@ -88,15 +88,13 @@ import javax.ws.rs.core.Response;
import javax.ws.rs.core.Response.ResponseBuilder;
import javax.ws.rs.core.Response.Status;
import javax.ws.rs.core.UriInfo;
+import org.apache.clerezza.commons.rdf.Graph;
+import org.apache.clerezza.commons.rdf.ImmutableGraph;
+import org.apache.clerezza.commons.rdf.Triple;
+import org.apache.clerezza.commons.rdf.impl.utils.TripleImpl;
+import org.apache.clerezza.commons.rdf.impl.utils.simple.SimpleGraph;
import org.apache.clerezza.jaxrs.utils.form.MultiPartBody;
-import org.apache.clerezza.rdf.core.Graph;
-import org.apache.clerezza.rdf.core.MGraph;
-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.impl.SimpleMGraph;
-import org.apache.clerezza.rdf.core.impl.TripleImpl;
import org.apache.clerezza.rdf.core.serializedform.Parser;
import org.apache.clerezza.rdf.core.serializedform.UnsupportedFormatException;
import org.apache.clerezza.rdf.ontologies.OWL;
@@ -109,7 +107,7 @@ import org.apache.stanbol.commons.owl.ut
import org.apache.stanbol.commons.owl.util.URIUtils;
import org.apache.stanbol.commons.web.viewable.Viewable;
//import org.apache.stanbol.commons.web.base.ContextHelper;
-import org.apache.stanbol.ontologymanager.multiplexer.clerezza.collector.MGraphMultiplexer;
+import org.apache.stanbol.ontologymanager.multiplexer.clerezza.collector.GraphMultiplexer;
import org.apache.stanbol.ontologymanager.registry.api.RegistryContentException;
import org.apache.stanbol.ontologymanager.registry.api.RegistryManager;
import org.apache.stanbol.ontologymanager.registry.api.model.Library;
@@ -161,7 +159,7 @@ public class RootResource extends Abstra
if (descriptor == null) {
if (ontologyProvider == null) throw new IllegalStateException(
"Tried to obtain a multiplexer before an ontology provider was ready. This shouldn't happen.");
- descriptor = new MGraphMultiplexer(ontologyProvider.getMetaGraph(MGraph.class));
+ descriptor = new GraphMultiplexer(ontologyProvider.getMetaGraph(Graph.class));
}
return descriptor;
}
@@ -330,23 +328,23 @@ public class RootResource extends Abstra
});
}
- private MGraph getGraph(String ontologyId, boolean merged, URI requestUri) {
+ private Graph getGraph(String ontologyId, boolean merged, URI requestUri) {
long before = System.currentTimeMillis();
OWLOntologyID key = OntologyUtils.decode(ontologyId);
log.debug("Will try to retrieve ontology {} from provider.", key);
/*
- * Export directly to MGraph since the OWLOntologyWriter uses (de-)serializing converters for the
+ * Export directly to Graph since the OWLOntologyWriter uses (de-)serializing converters for the
* other formats.
*
* Use oTemp for the "real" graph and o for the graph that will be exported. This is due to the fact
* that in o we want to change import statements, but we do not want these changes to be stored
* permanently.
*/
- MGraph o = null, oTemp = null;
+ Graph o = null, oTemp = null;
try {
- oTemp = ontologyProvider.getStoredOntology(key, MGraph.class, merged);
+ oTemp = ontologyProvider.getStoredOntology(key, Graph.class, merged);
} catch (Exception ex) {
log.warn("Retrieval of ontology with ID " + key + " failed.", ex);
}
@@ -368,7 +366,7 @@ public class RootResource extends Abstra
if (smallest != null) {
log.debug("Selected library for ontology {} is {} .", iri, smallest);
try {
- oTemp = registryManager.getLibrary(smallest).getOntology(iri, MGraph.class);
+ oTemp = registryManager.getLibrary(smallest).getOntology(iri, Graph.class);
} catch (RegistryContentException e) {
log.warn("The content of library " + smallest + " could not be accessed.", e);
}
@@ -376,9 +374,9 @@ public class RootResource extends Abstra
}
// This is needed because we need to change import statements. No need to use a more efficient but
- // resource-intensive IndexedMGraph, since both o and oTemp will be GC'ed after serialization.
+ // resource-intensive IndexedGraph, since both o and oTemp will be GC'ed after serialization.
if (oTemp != null) {
- o = new SimpleMGraph(oTemp);
+ o = new SimpleGraph(oTemp);
}
if (o == null) {
@@ -404,11 +402,11 @@ public class RootResource extends Abstra
}
for (Triple t : oldImports) {
// construct new statement
- String s = ((UriRef) t.getObject()).getUnicodeString();
+ String s = ((org.apache.clerezza.commons.rdf.IRI) t.getObject()).getUnicodeString();
if (s.contains("::")) {
s = s.substring(s.indexOf("::") + 2, s.length());
}
- UriRef target = new UriRef(base + "/" + s);
+ org.apache.clerezza.commons.rdf.IRI target = new org.apache.clerezza.commons.rdf.IRI(base + "/" + s);
o.add(new TripleImpl(t.getSubject(), OWL.imports, target));
// remove old statement
o.remove(t);
@@ -417,13 +415,13 @@ public class RootResource extends Abstra
// Versioning.
OWLOntologyID id = OWLUtils.extractOntologyID(o);
if (id != null && !id.isAnonymous() && id.getVersionIRI() == null) {
- UriRef viri = new UriRef(requestUri.toString());
+ org.apache.clerezza.commons.rdf.IRI viri = new org.apache.clerezza.commons.rdf.IRI(requestUri.toString());
log.debug("Setting version IRI for export : {}", viri);
- o.add(new TripleImpl(new UriRef(id.getOntologyIRI().toString()), new UriRef(
+ o.add(new TripleImpl(new org.apache.clerezza.commons.rdf.IRI(id.getOntologyIRI().toString()), new org.apache.clerezza.commons.rdf.IRI(
OWL2Constants.OWL_VERSION_IRI), viri));
}
- log.debug("Exported as Clerezza Graph in {} ms. Handing over to writer.", System.currentTimeMillis()
+ log.debug("Exported as Clerezza ImmutableGraph in {} ms. Handing over to writer.", System.currentTimeMillis()
- before);
return o;
}
@@ -469,12 +467,12 @@ public class RootResource extends Abstra
@Context UriInfo uriInfo,
@Context HttpHeaders headers) {
ResponseBuilder rb;
- UriRef me = new UriRef(getPublicBaseUri() + "ontonet/" + ontologyId);
- MGraph mGraph = new SimpleMGraph();
+ org.apache.clerezza.commons.rdf.IRI me = new org.apache.clerezza.commons.rdf.IRI(getPublicBaseUri() + "ontonet/" + ontologyId);
+ Graph mImmutableGraph = new SimpleGraph();
for (String alias : getAliases(OntologyUtils.decode(ontologyId))) {
- mGraph.add(new TripleImpl(new UriRef(getPublicBaseUri() + "ontonet/" + alias), OWL.sameAs, me));
+ mImmutableGraph.add(new TripleImpl(new org.apache.clerezza.commons.rdf.IRI(getPublicBaseUri() + "ontonet/" + alias), OWL.sameAs, me));
}
- rb = Response.ok(mGraph);
+ rb = Response.ok(mImmutableGraph);
// addCORSOrigin(servletContext, rb, headers);
return rb.build();
}
@@ -482,7 +480,7 @@ public class RootResource extends Abstra
@GET
@Produces({RDF_XML, TURTLE, X_TURTLE, APPLICATION_JSON, RDF_JSON})
public Response getMetaGraph(@Context HttpHeaders headers) {
- ResponseBuilder rb = Response.ok(ontologyProvider.getMetaGraph(Graph.class));
+ ResponseBuilder rb = Response.ok(ontologyProvider.getMetaGraph(ImmutableGraph.class));
// addCORSOrigin(servletContext, rb, headers);
return rb.build();
}
@@ -526,7 +524,7 @@ public class RootResource extends Abstra
long before = System.currentTimeMillis();
IRI iri = URIUtils.sanitize(IRI.create(ontologyId));
log.debug("Will try to retrieve ontology {} from provider.", iri);
- // TODO be selective: if the ontology is small enough, use OWLOntology otherwise export to Graph.
+ // TODO be selective: if the ontology is small enough, use OWLOntology otherwise export to ImmutableGraph.
OWLOntology o = null;
try {
// XXX Guarantee that there MUST always be an entry for any decoded ontology ID submitted.
@@ -589,7 +587,7 @@ public class RootResource extends Abstra
}
o.getOWLOntologyManager().applyChanges(changes);
- log.debug("Exported as Clerezza Graph in {} ms. Handing over to writer.", System.currentTimeMillis()
+ log.debug("Exported as Clerezza ImmutableGraph in {} ms. Handing over to writer.", System.currentTimeMillis()
- before);
return o;
}
@@ -627,7 +625,7 @@ public class RootResource extends Abstra
if (ontologyProvider.listOrphans().contains(key)) {
rb = Response.status(NO_CONTENT);
} else {
- TripleCollection o = getGraph(ontologyId, merged, uriInfo.getRequestUri());
+ Graph o = getGraph(ontologyId, merged, uriInfo.getRequestUri());
rb = o == null ? Response.status(NOT_FOUND) : Response.ok(o);
}
// addCORSOrigin(servletContext, rb, headers);
Modified: stanbol/trunk/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/resources/ScopeResource.java
URL: http://svn.apache.org/viewvc/stanbol/trunk/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/resources/ScopeResource.java?rev=1744328&r1=1744327&r2=1744328&view=diff
==============================================================================
--- stanbol/trunk/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/resources/ScopeResource.java (original)
+++ stanbol/trunk/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/resources/ScopeResource.java Tue May 17 22:20:49 2016
@@ -73,8 +73,8 @@ import javax.ws.rs.core.UriInfo;
import org.apache.clerezza.jaxrs.utils.form.FormFile;
import org.apache.clerezza.jaxrs.utils.form.MultiPartBody;
-import org.apache.clerezza.rdf.core.Graph;
-import org.apache.clerezza.rdf.core.TripleCollection;
+import org.apache.clerezza.commons.rdf.ImmutableGraph;
+import org.apache.clerezza.commons.rdf.Graph;
import org.apache.clerezza.rdf.core.access.TcProvider;
import org.apache.clerezza.rdf.core.serializedform.Parser;
import org.apache.clerezza.rdf.core.serializedform.UnsupportedFormatException;
@@ -178,8 +178,8 @@ public class ScopeResource extends Abstr
if (scope == null) return Response.status(NOT_FOUND).build();
IRI prefix = IRI.create(getPublicBaseUri() + "ontonet/ontology/");
- // Export to Clerezza Graph, which can be rendered as JSON-LD.
- ResponseBuilder rb = Response.ok(scope.export(Graph.class, merge, prefix));
+ // Export to Clerezza ImmutableGraph, which can be rendered as JSON-LD.
+ ResponseBuilder rb = Response.ok(scope.export(ImmutableGraph.class, merge, prefix));
// addCORSOrigin(servletContext, rb, headers);
return rb.build();
}
@@ -195,7 +195,7 @@ public class ScopeResource extends Abstr
// Export smaller graphs to OWLOntology due to the more human-readable rendering.
ResponseBuilder rb;
IRI prefix = IRI.create(getPublicBaseUri() + "ontonet/ontology/");
- if (merge) rb = Response.ok(scope.export(Graph.class, merge, prefix));
+ if (merge) rb = Response.ok(scope.export(ImmutableGraph.class, merge, prefix));
else rb = Response.ok(scope.export(OWLOntology.class, merge, prefix));
// addCORSOrigin(servletContext, rb, headers);
return rb.build();
@@ -248,7 +248,7 @@ public class ScopeResource extends Abstr
OntologySpace space = scope.getCoreSpace();
IRI prefix = IRI.create(getPublicBaseUri() + "ontonet/ontology/");
- Graph o = space.export(Graph.class, merge, prefix);
+ ImmutableGraph o = space.export(ImmutableGraph.class, merge, prefix);
ResponseBuilder rb = Response.ok(o);
// addCORSOrigin(servletContext, rb, headers);
return rb.build();
@@ -293,7 +293,7 @@ public class ScopeResource extends Abstr
OntologySpace space = scope.getCustomSpace();
IRI prefix = IRI.create(getPublicBaseUri() + "ontonet/ontology/");
- Graph o = space.export(Graph.class, merge, prefix);
+ ImmutableGraph o = space.export(ImmutableGraph.class, merge, prefix);
ResponseBuilder rb = Response.ok(o);
// addCORSOrigin(servletContext, rb, headers);
return rb.build();
@@ -414,14 +414,14 @@ public class ScopeResource extends Abstr
if (scope == null) rb = Response.status(NOT_FOUND);
else {
IRI prefix = IRI.create(getPublicBaseUri() + "ontonet/ontology/");
- Graph o = null;
+ ImmutableGraph o = null;
OWLOntologyID id = OntologyUtils.decode(ontologyId);
OntologySpace spc = scope.getCustomSpace();
if (spc != null && spc.hasOntology(id)) {
- o = spc.getOntology(id, Graph.class, merge, prefix);
+ o = spc.getOntology(id, ImmutableGraph.class, merge, prefix);
} else {
spc = scope.getCoreSpace();
- if (spc != null && spc.hasOntology(id)) o = spc.getOntology(id, Graph.class, merge, prefix);
+ if (spc != null && spc.hasOntology(id)) o = spc.getOntology(id, ImmutableGraph.class, merge, prefix);
}
if (o == null) rb = Response.status(NOT_FOUND);
else rb = Response.ok(o);
@@ -876,8 +876,8 @@ public class ScopeResource extends Abstr
for (Object o : ((SetInputSource<?>) coreSrc).getOntologies()) {
OntologyInputSource<?> src = null;
if (o instanceof OWLOntology) src = new RootOntologySource((OWLOntology) o);
- else if (o instanceof TripleCollection) src = new GraphSource(
- (TripleCollection) o);
+ else if (o instanceof Graph) src = new GraphSource(
+ (Graph) o);
if (src != null) expanded.add(src);
}
} else expanded.add(coreSrc); // Must be denoting a single ontology
Modified: stanbol/trunk/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/resources/SessionResource.java
URL: http://svn.apache.org/viewvc/stanbol/trunk/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/resources/SessionResource.java?rev=1744328&r1=1744327&r2=1744328&view=diff
==============================================================================
--- stanbol/trunk/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/resources/SessionResource.java (original)
+++ stanbol/trunk/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/resources/SessionResource.java Tue May 17 22:20:49 2016
@@ -70,7 +70,7 @@ import javax.ws.rs.core.Response.Status;
import org.apache.clerezza.jaxrs.utils.form.FormFile;
import org.apache.clerezza.jaxrs.utils.form.MultiPartBody;
-import org.apache.clerezza.rdf.core.Graph;
+import org.apache.clerezza.commons.rdf.ImmutableGraph;
import org.apache.clerezza.rdf.core.access.TcProvider;
import org.apache.clerezza.rdf.core.serializedform.Parser;
import org.apache.felix.scr.annotations.Component;
@@ -165,8 +165,8 @@ public class SessionResource extends Abs
session = sesMgr.getSession(sessionId);
if (session == null) return Response.status(NOT_FOUND).build();
IRI prefix = IRI.create(getPublicBaseUri() + "ontonet/session/");
- // Export to Clerezza Graph, which can be rendered as JSON-LD.
- ResponseBuilder rb = Response.ok(session.export(Graph.class, merge, prefix));
+ // Export to Clerezza ImmutableGraph, which can be rendered as JSON-LD.
+ ResponseBuilder rb = Response.ok(session.export(ImmutableGraph.class, merge, prefix));
// addCORSOrigin(servletContext, rb, headers);
return rb.build();
}
@@ -182,7 +182,7 @@ public class SessionResource extends Abs
ResponseBuilder rb;
IRI prefix = IRI.create(getPublicBaseUri() + "ontonet/session/");
// Export smaller graphs to OWLOntology due to the more human-readable rendering.
- if (merge) rb = Response.ok(session.export(Graph.class, merge, prefix));
+ if (merge) rb = Response.ok(session.export(ImmutableGraph.class, merge, prefix));
else rb = Response.ok(session.export(OWLOntology.class, merge, prefix));
// addCORSOrigin(servletContext, rb, headers);
return rb.build();
@@ -375,7 +375,7 @@ public class SessionResource extends Abs
session = sesMgr.getSession(sessionId);
if (session == null) return Response.status(NOT_FOUND).build();
IRI prefix = IRI.create(getPublicBaseUri() + "ontonet/session/");
- Graph o = session.getOntology(OntologyUtils.decode(ontologyId), Graph.class, merge, prefix);
+ ImmutableGraph o = session.getOntology(OntologyUtils.decode(ontologyId), ImmutableGraph.class, merge, prefix);
ResponseBuilder rb = (o != null) ? Response.ok(o) : Response.status(NOT_FOUND);
// addCORSOrigin(servletContext, rb, headers);
return rb.build();
@@ -409,7 +409,7 @@ public class SessionResource extends Abs
IRI prefix = IRI.create(getPublicBaseUri() + "ontonet/session/");
OWLOntologyID id = OntologyUtils.decode(ontologyId);
if (merge) {
- Graph g = session.getOntology(id, Graph.class, merge, prefix);
+ ImmutableGraph g = session.getOntology(id, ImmutableGraph.class, merge, prefix);
rb = (g != null) ? Response.ok(g) : Response.status(NOT_FOUND);
} else {
OWLOntology o = session.getOntology(id, OWLOntology.class, merge, prefix);
Modified: stanbol/trunk/parent/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/trunk/parent/pom.xml?rev=1744328&r1=1744327&r2=1744328&view=diff
==============================================================================
--- stanbol/trunk/parent/pom.xml (original)
+++ stanbol/trunk/parent/pom.xml Tue May 17 22:20:49 2016
@@ -96,7 +96,7 @@
<build>
<plugins>
- <!-- requires Java 6 -->
+ <!-- requires Java 8 -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-enforcer-plugin</artifactId>
@@ -109,8 +109,8 @@
<configuration>
<rules>
<requireJavaVersion>
- <message>Java 6 or higher is required to compile this module</message>
- <version>1.6</version>
+ <message>Java 8 or higher is required to compile this module</message>
+ <version>1.8</version>
</requireJavaVersion>
</rules>
</configuration>
@@ -646,12 +646,12 @@
<dependency>
<groupId>org.apache.clerezza</groupId>
<artifactId>rdf.core</artifactId>
- <version>0.14</version>
+ <version>1.0.1</version>
</dependency>
<dependency>
<groupId>org.apache.clerezza</groupId>
<artifactId>rdf.utils</artifactId>
- <version>0.14</version>
+ <version>1.0.0</version>
</dependency>
<dependency>
<groupId>org.apache.clerezza</groupId>
@@ -661,72 +661,72 @@
<dependency>
<groupId>org.apache.clerezza</groupId>
<artifactId>rdf.metadata</artifactId>
- <version>0.2</version>
+ <version>1.0.0</version>
</dependency>
<dependency>
<groupId>org.apache.clerezza</groupId>
<artifactId>rdf.ontologies</artifactId>
- <version>0.12</version>
+ <version>1.0.0</version>
</dependency>
<dependency>
<groupId>org.apache.clerezza</groupId>
<artifactId>rdf.jena.serializer</artifactId>
- <version>0.11</version>
+ <version>1.1.1</version>
</dependency>
<dependency>
<groupId>org.apache.clerezza</groupId>
<artifactId>rdf.jena.parser</artifactId>
- <version>0.12</version>
+ <version>1.1.1</version>
</dependency>
<dependency>
<groupId>org.apache.clerezza</groupId>
<artifactId>rdf.jena.sparql</artifactId>
- <version>0.7</version>
+ <version>1.1.1</version>
</dependency>
<dependency>
<groupId>org.apache.clerezza</groupId>
<artifactId>rdf.rdfjson</artifactId>
- <version>0.4</version>
+ <version>1.0.1</version>
</dependency>
<dependency>
<groupId>org.apache.clerezza</groupId>
<artifactId>platform.content</artifactId>
- <version>0.14</version>
+ <version>1.0.0</version>
</dependency>
<dependency>
<groupId>org.apache.clerezza</groupId>
<artifactId>platform.graphprovider.content</artifactId>
- <version>0.7</version>
+ <version>1.0.0</version>
</dependency>
<dependency>
<groupId>org.apache.clerezza</groupId>
<artifactId>platform.typerendering.scalaserverpages</artifactId>
- <version>0.4</version>
+ <version>1.0.0</version>
</dependency>
<dependency>
<groupId>org.apache.clerezza</groupId>
<artifactId>jaxrs.rdf.providers</artifactId>
- <version>0.15</version>
+ <version>1.0.0</version>
</dependency>
<dependency>
<groupId>org.apache.clerezza</groupId>
<artifactId>rdf.simple.storage</artifactId>
- <version>0.8</version>
+ <version>1.0.0</version>
</dependency>
<dependency>
<groupId>org.apache.clerezza</groupId>
<artifactId>rdf.jena.facade</artifactId>
- <version>0.14</version>
+ <version>1.1.1</version>
</dependency>
<dependency>
<groupId>org.apache.clerezza</groupId>
<artifactId>platform.config</artifactId>
- <version>0.4</version>
+ <version>1.0.0</version>
</dependency>
<dependency>
<groupId>org.apache.clerezza</groupId>
<artifactId>rdf.core.test</artifactId>
- <version>0.15</version>
+ <version>1.0.0</version>
<scope>test</scope>
</dependency>
Modified: stanbol/trunk/reasoners/web/src/main/java/org/apache/stanbol/reasoners/web/input/provider/impl/RecipeInputProvider.java
URL: http://svn.apache.org/viewvc/stanbol/trunk/reasoners/web/src/main/java/org/apache/stanbol/reasoners/web/input/provider/impl/RecipeInputProvider.java?rev=1744328&r1=1744327&r2=1744328&view=diff
==============================================================================
--- stanbol/trunk/reasoners/web/src/main/java/org/apache/stanbol/reasoners/web/input/provider/impl/RecipeInputProvider.java (original)
+++ stanbol/trunk/reasoners/web/src/main/java/org/apache/stanbol/reasoners/web/input/provider/impl/RecipeInputProvider.java Tue May 17 22:20:49 2016
@@ -22,7 +22,7 @@ import java.util.Collections;
import java.util.Iterator;
import java.util.List;
-import org.apache.clerezza.rdf.core.UriRef;
+import org.apache.clerezza.commons.rdf.IRI;
import org.apache.stanbol.reasoners.servicesapi.ReasoningServiceInputProvider;
import org.apache.stanbol.rules.base.api.NoSuchRecipeException;
import org.apache.stanbol.rules.base.api.Recipe;
@@ -95,7 +95,7 @@ public class RecipeInputProvider impleme
Recipe recipe = null;
synchronized (store) {
try {
- recipe = store.getRecipe(new UriRef(recipeId));
+ recipe = store.getRecipe(new IRI(recipeId));
} catch (RecipeConstructionException e) {
log.error("An error occurred while generating the recipe.", e);
}
@@ -170,7 +170,7 @@ public class RecipeInputProvider impleme
Recipe recipe = null;
synchronized (store) {
try {
- recipe = store.getRecipe(new UriRef(recipeId));
+ recipe = store.getRecipe(new IRI(recipeId));
} catch (RecipeConstructionException e) {
log.error("An error occurred while generating the recipe.", e);
}
Modified: stanbol/trunk/reasoners/web/src/main/java/org/apache/stanbol/reasoners/web/utils/ReasoningServiceExecutor.java
URL: http://svn.apache.org/viewvc/stanbol/trunk/reasoners/web/src/main/java/org/apache/stanbol/reasoners/web/utils/ReasoningServiceExecutor.java?rev=1744328&r1=1744327&r2=1744328&view=diff
==============================================================================
--- stanbol/trunk/reasoners/web/src/main/java/org/apache/stanbol/reasoners/web/utils/ReasoningServiceExecutor.java (original)
+++ stanbol/trunk/reasoners/web/src/main/java/org/apache/stanbol/reasoners/web/utils/ReasoningServiceExecutor.java Tue May 17 22:20:49 2016
@@ -25,9 +25,8 @@ import java.util.Map.Entry;
import java.util.Set;
import java.util.concurrent.locks.Lock;
-import org.apache.clerezza.rdf.core.MGraph;
-import org.apache.clerezza.rdf.core.UriRef;
-import org.apache.clerezza.rdf.core.access.LockableMGraph;
+import org.apache.clerezza.commons.rdf.Graph;
+import org.apache.clerezza.commons.rdf.IRI;
import org.apache.clerezza.rdf.core.access.NoSuchEntityException;
import org.apache.clerezza.rdf.core.access.TcManager;
import org.apache.stanbol.commons.jobs.api.Job;
@@ -234,16 +233,16 @@ public class ReasoningServiceExecutor im
log.debug("Attempt saving in target graph {}", targetGraphID);
final long startSave = System.currentTimeMillis();
- LockableMGraph mGraph;
- UriRef graphUriRef = new UriRef(targetGraphID);
+ Graph mGraph;
+ IRI graphIRI = new IRI(targetGraphID);
// tcManager must be synchronized
synchronized (tcManager) {
try {
// Check whether the graph already exists
- mGraph = tcManager.getMGraph(graphUriRef);
+ mGraph = tcManager.getGraph(graphIRI);
} catch (NoSuchEntityException e) {
- mGraph = tcManager.createMGraph(graphUriRef);
+ mGraph = tcManager.createGraph(graphIRI);
}
}
@@ -251,12 +250,12 @@ public class ReasoningServiceExecutor im
Lock writeLock = mGraph.getLock().writeLock();
boolean saved = false;
if (data instanceof Model) {
- MGraph m = JenaToClerezzaConverter.jenaModelToClerezzaMGraph((Model) data);
+ Graph m = JenaToClerezzaConverter.jenaModelToClerezzaGraph((Model) data);
writeLock.lock();
saved = mGraph.addAll(m);
writeLock.unlock();
} else if (data instanceof OWLOntology) {
- MGraph m = (MGraph) OWLAPIToClerezzaConverter.owlOntologyToClerezzaMGraph((OWLOntology) data);
+ Graph m = (Graph) OWLAPIToClerezzaConverter.owlOntologyToClerezzaGraph((OWLOntology) data);
writeLock.lock();
saved = mGraph.addAll(m);
writeLock.unlock();
Modified: stanbol/trunk/rules/adapters/clerezza/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/trunk/rules/adapters/clerezza/pom.xml?rev=1744328&r1=1744327&r2=1744328&view=diff
==============================================================================
--- stanbol/trunk/rules/adapters/clerezza/pom.xml (original)
+++ stanbol/trunk/rules/adapters/clerezza/pom.xml Tue May 17 22:20:49 2016
@@ -108,7 +108,16 @@
<groupId>junit</groupId>
<artifactId>junit</artifactId>
</dependency>
-
+ <dependency>
+ <groupId>org.apache.clerezza</groupId>
+ <artifactId>rdf.jena.sparql</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.clerezza</groupId>
+ <artifactId>rdf.simple.storage</artifactId>
+ <scope>test</scope>
+ </dependency>
</dependencies>
</project>
Modified: stanbol/trunk/rules/adapters/clerezza/src/main/java/org/apache/stanbol/rules/adapters/clerezza/ClerezzaAdapter.java
URL: http://svn.apache.org/viewvc/stanbol/trunk/rules/adapters/clerezza/src/main/java/org/apache/stanbol/rules/adapters/clerezza/ClerezzaAdapter.java?rev=1744328&r1=1744327&r2=1744328&view=diff
==============================================================================
--- stanbol/trunk/rules/adapters/clerezza/src/main/java/org/apache/stanbol/rules/adapters/clerezza/ClerezzaAdapter.java (original)
+++ stanbol/trunk/rules/adapters/clerezza/src/main/java/org/apache/stanbol/rules/adapters/clerezza/ClerezzaAdapter.java Tue May 17 22:20:49 2016
@@ -28,7 +28,7 @@ import java.util.Iterator;
import java.util.List;
import java.util.Set;
-import org.apache.clerezza.rdf.core.UriRef;
+import org.apache.clerezza.commons.rdf.IRI;
import org.apache.clerezza.rdf.core.sparql.query.ConstructQuery;
import org.apache.clerezza.rdf.core.sparql.query.Expression;
import org.apache.clerezza.rdf.core.sparql.query.TriplePattern;
@@ -308,7 +308,7 @@ public class ClerezzaAdapter extends Abs
try {
KB kb = RuleParserImpl.parse("http://sssw.org/2012/rules/", new FileInputStream("/Users/mac/Documents/CNR/SSSW2012/construct/exercise3"));
System.out.println("Rules: " + kb.getRuleList().size());
- Recipe recipe = new RecipeImpl(new UriRef("http://sssw.org/2012/rules/"), "Recipe", kb.getRuleList());
+ Recipe recipe = new RecipeImpl(new IRI("http://sssw.org/2012/rules/"), "Recipe", kb.getRuleList());
//List<ConstructQuery> jenaRules = (List<ConstructQuery>) ruleAdapter.adaptTo(recipe, ConstructQuery.class);
Modified: stanbol/trunk/rules/adapters/clerezza/src/main/java/org/apache/stanbol/rules/adapters/clerezza/ClerezzaSparqlObject.java
URL: http://svn.apache.org/viewvc/stanbol/trunk/rules/adapters/clerezza/src/main/java/org/apache/stanbol/rules/adapters/clerezza/ClerezzaSparqlObject.java?rev=1744328&r1=1744327&r2=1744328&view=diff
==============================================================================
--- stanbol/trunk/rules/adapters/clerezza/src/main/java/org/apache/stanbol/rules/adapters/clerezza/ClerezzaSparqlObject.java (original)
+++ stanbol/trunk/rules/adapters/clerezza/src/main/java/org/apache/stanbol/rules/adapters/clerezza/ClerezzaSparqlObject.java Tue May 17 22:20:49 2016
@@ -17,13 +17,13 @@
package org.apache.stanbol.rules.adapters.clerezza;
-import org.apache.clerezza.rdf.core.UriRef;
+import org.apache.clerezza.commons.rdf.IRI;
import org.apache.clerezza.rdf.core.sparql.query.Expression;
import org.apache.clerezza.rdf.core.sparql.query.TriplePattern;
/**
*
- * This object represents either a {@link TriplePattern} or an {@link Expression} or a {@link UriRef}
+ * This object represents either a {@link TriplePattern} or an {@link Expression} or a {@link IRI}
* internally to the Clerezza adpter.
*
* @author anuzzolese
@@ -33,7 +33,7 @@ public class ClerezzaSparqlObject {
private TriplePattern triplePattern;
private Expression expression;
- private UriRef uriRef;
+ private IRI uriRef;
public ClerezzaSparqlObject(TriplePattern triplePattern) {
this.triplePattern = triplePattern;
@@ -43,7 +43,7 @@ public class ClerezzaSparqlObject {
this.expression = expression;
}
- public ClerezzaSparqlObject(UriRef uriRef) {
+ public ClerezzaSparqlObject(IRI uriRef) {
this.uriRef = uriRef;
}
@@ -54,10 +54,10 @@ public class ClerezzaSparqlObject {
* <ul>
* <li>a {@link TriplePattern}
* <li>an {@link Expression}
- * <li>a {@link UriRef}
+ * <li>a {@link IRI}
*
* @return the object that can be in turn a {@link TriplePattern}, an {@link Expression}, and a
- * {@link UriRef}
+ * {@link IRI}
*/
public Object getClerezzaObject() {
if (triplePattern != null) {
Modified: stanbol/trunk/rules/adapters/clerezza/src/main/java/org/apache/stanbol/rules/adapters/clerezza/atoms/BlankNodeAtom.java
URL: http://svn.apache.org/viewvc/stanbol/trunk/rules/adapters/clerezza/src/main/java/org/apache/stanbol/rules/adapters/clerezza/atoms/BlankNodeAtom.java?rev=1744328&r1=1744327&r2=1744328&view=diff
==============================================================================
--- stanbol/trunk/rules/adapters/clerezza/src/main/java/org/apache/stanbol/rules/adapters/clerezza/atoms/BlankNodeAtom.java (original)
+++ stanbol/trunk/rules/adapters/clerezza/src/main/java/org/apache/stanbol/rules/adapters/clerezza/atoms/BlankNodeAtom.java Tue May 17 22:20:49 2016
@@ -16,8 +16,8 @@
*/
package org.apache.stanbol.rules.adapters.clerezza.atoms;
-import org.apache.clerezza.rdf.core.BNode;
-import org.apache.clerezza.rdf.core.UriRef;
+import org.apache.clerezza.commons.rdf.BlankNode;
+import org.apache.clerezza.commons.rdf.IRI;
import org.apache.clerezza.rdf.core.sparql.query.ConstructQuery;
import org.apache.clerezza.rdf.core.sparql.query.ResourceOrVariable;
import org.apache.clerezza.rdf.core.sparql.query.UriRefOrVariable;
@@ -58,9 +58,9 @@ public class BlankNodeAtom extends Abstr
ClerezzaSparqlObject predicateCSO = (ClerezzaSparqlObject) adapter.adaptTo(argument1UriResource,
ConstructQuery.class);
- subject = new UriRefOrVariable((UriRef) subjectCSO.getClerezzaObject());
- predicate = new UriRefOrVariable((UriRef) predicateCSO.getClerezzaObject());
- object = new ResourceOrVariable(new BNode());
+ subject = new UriRefOrVariable((IRI) subjectCSO.getClerezzaObject());
+ predicate = new UriRefOrVariable((IRI) predicateCSO.getClerezzaObject());
+ object = new ResourceOrVariable(new BlankNode());
return (T) new ClerezzaSparqlObject(new SimpleTriplePattern(subject, predicate, object));
Modified: stanbol/trunk/rules/adapters/clerezza/src/main/java/org/apache/stanbol/rules/adapters/clerezza/atoms/ClassAtom.java
URL: http://svn.apache.org/viewvc/stanbol/trunk/rules/adapters/clerezza/src/main/java/org/apache/stanbol/rules/adapters/clerezza/atoms/ClassAtom.java?rev=1744328&r1=1744327&r2=1744328&view=diff
==============================================================================
--- stanbol/trunk/rules/adapters/clerezza/src/main/java/org/apache/stanbol/rules/adapters/clerezza/atoms/ClassAtom.java (original)
+++ stanbol/trunk/rules/adapters/clerezza/src/main/java/org/apache/stanbol/rules/adapters/clerezza/atoms/ClassAtom.java Tue May 17 22:20:49 2016
@@ -16,7 +16,7 @@
*/
package org.apache.stanbol.rules.adapters.clerezza.atoms;
-import org.apache.clerezza.rdf.core.UriRef;
+import org.apache.clerezza.commons.rdf.IRI;
import org.apache.clerezza.rdf.core.sparql.query.ConstructQuery;
import org.apache.clerezza.rdf.core.sparql.query.ResourceOrVariable;
import org.apache.clerezza.rdf.core.sparql.query.UriRefOrVariable;
@@ -64,16 +64,16 @@ public class ClassAtom extends AbstractA
if (arg instanceof Variable) {
subject = new UriRefOrVariable((Variable) arg);
- } else if (arg instanceof UriRef) {
- subject = new UriRefOrVariable((UriRef) arg);
+ } else if (arg instanceof IRI) {
+ subject = new UriRefOrVariable((IRI) arg);
} else {
throw new RuleAtomCallExeption(getClass());
}
if (cl instanceof Variable) {
object = new ResourceOrVariable((Variable) cl);
- } else if (cl instanceof UriRef) {
- object = new ResourceOrVariable((UriRef) cl);
+ } else if (cl instanceof IRI) {
+ object = new ResourceOrVariable((IRI) cl);
} else {
throw new RuleAtomCallExeption(getClass());
}
Modified: stanbol/trunk/rules/adapters/clerezza/src/main/java/org/apache/stanbol/rules/adapters/clerezza/atoms/ConcatAtom.java
URL: http://svn.apache.org/viewvc/stanbol/trunk/rules/adapters/clerezza/src/main/java/org/apache/stanbol/rules/adapters/clerezza/atoms/ConcatAtom.java?rev=1744328&r1=1744327&r2=1744328&view=diff
==============================================================================
--- stanbol/trunk/rules/adapters/clerezza/src/main/java/org/apache/stanbol/rules/adapters/clerezza/atoms/ConcatAtom.java (original)
+++ stanbol/trunk/rules/adapters/clerezza/src/main/java/org/apache/stanbol/rules/adapters/clerezza/atoms/ConcatAtom.java Tue May 17 22:20:49 2016
@@ -19,7 +19,7 @@ package org.apache.stanbol.rules.adapter
import java.util.ArrayList;
import java.util.List;
-import org.apache.clerezza.rdf.core.UriRef;
+import org.apache.clerezza.commons.rdf.IRI;
import org.apache.clerezza.rdf.core.sparql.query.ConstructQuery;
import org.apache.clerezza.rdf.core.sparql.query.Expression;
import org.apache.clerezza.rdf.core.sparql.query.FunctionCall;
@@ -59,7 +59,7 @@ public class ConcatAtom extends Abstract
argumentExpressions.add((Expression) argument1.getClerezzaObject());
argumentExpressions.add((Expression) argument2.getClerezzaObject());
- FunctionCall functionCall = new FunctionCall(new UriRef(
+ FunctionCall functionCall = new FunctionCall(new IRI(
"<http://www.w3.org/2005/xpath-functions#concat>"), argumentExpressions);
return (T) new ClerezzaSparqlObject(functionCall);
Modified: stanbol/trunk/rules/adapters/clerezza/src/main/java/org/apache/stanbol/rules/adapters/clerezza/atoms/DatavaluedPropertyAtom.java
URL: http://svn.apache.org/viewvc/stanbol/trunk/rules/adapters/clerezza/src/main/java/org/apache/stanbol/rules/adapters/clerezza/atoms/DatavaluedPropertyAtom.java?rev=1744328&r1=1744327&r2=1744328&view=diff
==============================================================================
--- stanbol/trunk/rules/adapters/clerezza/src/main/java/org/apache/stanbol/rules/adapters/clerezza/atoms/DatavaluedPropertyAtom.java (original)
+++ stanbol/trunk/rules/adapters/clerezza/src/main/java/org/apache/stanbol/rules/adapters/clerezza/atoms/DatavaluedPropertyAtom.java Tue May 17 22:20:49 2016
@@ -16,8 +16,8 @@
*/
package org.apache.stanbol.rules.adapters.clerezza.atoms;
-import org.apache.clerezza.rdf.core.Literal;
-import org.apache.clerezza.rdf.core.UriRef;
+import org.apache.clerezza.commons.rdf.Literal;
+import org.apache.clerezza.commons.rdf.IRI;
import org.apache.clerezza.rdf.core.sparql.query.ConstructQuery;
import org.apache.clerezza.rdf.core.sparql.query.LiteralExpression;
import org.apache.clerezza.rdf.core.sparql.query.ResourceOrVariable;
@@ -69,16 +69,16 @@ public class DatavaluedPropertyAtom exte
if (arg1 instanceof Variable) {
subject = new UriRefOrVariable((Variable) arg1);
- } else if (arg1 instanceof UriRef) {
- subject = new UriRefOrVariable((UriRef) arg1);
+ } else if (arg1 instanceof IRI) {
+ subject = new UriRefOrVariable((IRI) arg1);
} else {
throw new RuleAtomCallExeption(getClass());
}
if (dt instanceof Variable) {
predicate = new UriRefOrVariable((Variable) dt);
- } else if (dt instanceof UriRef) {
- predicate = new UriRefOrVariable((UriRef) dt);
+ } else if (dt instanceof IRI) {
+ predicate = new UriRefOrVariable((IRI) dt);
} else {
throw new RuleAtomCallExeption(getClass());
}
Modified: stanbol/trunk/rules/adapters/clerezza/src/main/java/org/apache/stanbol/rules/adapters/clerezza/atoms/EndsWithAtom.java
URL: http://svn.apache.org/viewvc/stanbol/trunk/rules/adapters/clerezza/src/main/java/org/apache/stanbol/rules/adapters/clerezza/atoms/EndsWithAtom.java?rev=1744328&r1=1744327&r2=1744328&view=diff
==============================================================================
--- stanbol/trunk/rules/adapters/clerezza/src/main/java/org/apache/stanbol/rules/adapters/clerezza/atoms/EndsWithAtom.java (original)
+++ stanbol/trunk/rules/adapters/clerezza/src/main/java/org/apache/stanbol/rules/adapters/clerezza/atoms/EndsWithAtom.java Tue May 17 22:20:49 2016
@@ -19,7 +19,7 @@ package org.apache.stanbol.rules.adapter
import java.util.ArrayList;
import java.util.List;
-import org.apache.clerezza.rdf.core.UriRef;
+import org.apache.clerezza.commons.rdf.IRI;
import org.apache.clerezza.rdf.core.sparql.query.ConstructQuery;
import org.apache.clerezza.rdf.core.sparql.query.Expression;
import org.apache.clerezza.rdf.core.sparql.query.FunctionCall;
@@ -59,7 +59,7 @@ public class EndsWithAtom extends Abstra
argumentExpressions.add((Expression) argument1.getClerezzaObject());
argumentExpressions.add((Expression) argument2.getClerezzaObject());
- FunctionCall functionCall = new FunctionCall(new UriRef(
+ FunctionCall functionCall = new FunctionCall(new IRI(
"<http://www.w3.org/2005/xpath-functions#ends-with>"), argumentExpressions);
return (T) new ClerezzaSparqlObject(functionCall);
Modified: stanbol/trunk/rules/adapters/clerezza/src/main/java/org/apache/stanbol/rules/adapters/clerezza/atoms/IndividualPropertyAtom.java
URL: http://svn.apache.org/viewvc/stanbol/trunk/rules/adapters/clerezza/src/main/java/org/apache/stanbol/rules/adapters/clerezza/atoms/IndividualPropertyAtom.java?rev=1744328&r1=1744327&r2=1744328&view=diff
==============================================================================
--- stanbol/trunk/rules/adapters/clerezza/src/main/java/org/apache/stanbol/rules/adapters/clerezza/atoms/IndividualPropertyAtom.java (original)
+++ stanbol/trunk/rules/adapters/clerezza/src/main/java/org/apache/stanbol/rules/adapters/clerezza/atoms/IndividualPropertyAtom.java Tue May 17 22:20:49 2016
@@ -16,7 +16,7 @@
*/
package org.apache.stanbol.rules.adapters.clerezza.atoms;
-import org.apache.clerezza.rdf.core.UriRef;
+import org.apache.clerezza.commons.rdf.IRI;
import org.apache.clerezza.rdf.core.sparql.query.ConstructQuery;
import org.apache.clerezza.rdf.core.sparql.query.ResourceOrVariable;
import org.apache.clerezza.rdf.core.sparql.query.UriRefOrVariable;
@@ -67,24 +67,24 @@ public class IndividualPropertyAtom exte
if (arg1 instanceof Variable) {
subject = new UriRefOrVariable((Variable) arg1);
- } else if (arg1 instanceof UriRef) {
- subject = new UriRefOrVariable((UriRef) arg1);
+ } else if (arg1 instanceof IRI) {
+ subject = new UriRefOrVariable((IRI) arg1);
} else {
throw new RuleAtomCallExeption(getClass());
}
if (dt instanceof Variable) {
predicate = new UriRefOrVariable((Variable) dt);
- } else if (dt instanceof UriRef) {
- predicate = new UriRefOrVariable((UriRef) dt);
+ } else if (dt instanceof IRI) {
+ predicate = new UriRefOrVariable((IRI) dt);
} else {
throw new RuleAtomCallExeption(getClass());
}
if (arg2 instanceof Variable) {
object = new UriRefOrVariable((Variable) arg2);
- } else if (dt instanceof UriRef) {
- object = new UriRefOrVariable((UriRef) arg2);
+ } else if (dt instanceof IRI) {
+ object = new UriRefOrVariable((IRI) arg2);
} else {
throw new RuleAtomCallExeption(getClass());
}
Modified: stanbol/trunk/rules/adapters/clerezza/src/main/java/org/apache/stanbol/rules/adapters/clerezza/atoms/IsBlankAtom.java
URL: http://svn.apache.org/viewvc/stanbol/trunk/rules/adapters/clerezza/src/main/java/org/apache/stanbol/rules/adapters/clerezza/atoms/IsBlankAtom.java?rev=1744328&r1=1744327&r2=1744328&view=diff
==============================================================================
--- stanbol/trunk/rules/adapters/clerezza/src/main/java/org/apache/stanbol/rules/adapters/clerezza/atoms/IsBlankAtom.java (original)
+++ stanbol/trunk/rules/adapters/clerezza/src/main/java/org/apache/stanbol/rules/adapters/clerezza/atoms/IsBlankAtom.java Tue May 17 22:20:49 2016
@@ -19,7 +19,7 @@ package org.apache.stanbol.rules.adapter
import java.util.ArrayList;
import java.util.List;
-import org.apache.clerezza.rdf.core.UriRef;
+import org.apache.clerezza.commons.rdf.IRI;
import org.apache.clerezza.rdf.core.sparql.query.BuiltInCall;
import org.apache.clerezza.rdf.core.sparql.query.ConstructQuery;
import org.apache.clerezza.rdf.core.sparql.query.Expression;
@@ -60,8 +60,8 @@ public class IsBlankAtom extends Abstrac
Expression argumentExpression;
if (arg instanceof Variable) {
argumentExpression = (Variable) arg;
- } else if (arg instanceof UriRef) {
- argumentExpression = new UriRefExpression((UriRef) arg);
+ } else if (arg instanceof IRI) {
+ argumentExpression = new UriRefExpression((IRI) arg);
} else {
throw new RuleAtomCallExeption(getClass());
}
Modified: stanbol/trunk/rules/adapters/clerezza/src/main/java/org/apache/stanbol/rules/adapters/clerezza/atoms/LengthAtom.java
URL: http://svn.apache.org/viewvc/stanbol/trunk/rules/adapters/clerezza/src/main/java/org/apache/stanbol/rules/adapters/clerezza/atoms/LengthAtom.java?rev=1744328&r1=1744327&r2=1744328&view=diff
==============================================================================
--- stanbol/trunk/rules/adapters/clerezza/src/main/java/org/apache/stanbol/rules/adapters/clerezza/atoms/LengthAtom.java (original)
+++ stanbol/trunk/rules/adapters/clerezza/src/main/java/org/apache/stanbol/rules/adapters/clerezza/atoms/LengthAtom.java Tue May 17 22:20:49 2016
@@ -19,7 +19,7 @@ package org.apache.stanbol.rules.adapter
import java.util.ArrayList;
import java.util.List;
-import org.apache.clerezza.rdf.core.UriRef;
+import org.apache.clerezza.commons.rdf.IRI;
import org.apache.clerezza.rdf.core.sparql.query.ConstructQuery;
import org.apache.clerezza.rdf.core.sparql.query.Expression;
import org.apache.clerezza.rdf.core.sparql.query.FunctionCall;
@@ -56,7 +56,7 @@ public class LengthAtom extends Abstract
List<Expression> argumentExpressions = new ArrayList<Expression>();
argumentExpressions.add((Expression) argument1.getClerezzaObject());
- FunctionCall functionCall = new FunctionCall(new UriRef(
+ FunctionCall functionCall = new FunctionCall(new IRI(
"<http://www.w3.org/2005/xpath-functions#string-length>"), argumentExpressions);
return (T) new ClerezzaSparqlObject(functionCall);
Modified: stanbol/trunk/rules/adapters/clerezza/src/main/java/org/apache/stanbol/rules/adapters/clerezza/atoms/LowerCaseAtom.java
URL: http://svn.apache.org/viewvc/stanbol/trunk/rules/adapters/clerezza/src/main/java/org/apache/stanbol/rules/adapters/clerezza/atoms/LowerCaseAtom.java?rev=1744328&r1=1744327&r2=1744328&view=diff
==============================================================================
--- stanbol/trunk/rules/adapters/clerezza/src/main/java/org/apache/stanbol/rules/adapters/clerezza/atoms/LowerCaseAtom.java (original)
+++ stanbol/trunk/rules/adapters/clerezza/src/main/java/org/apache/stanbol/rules/adapters/clerezza/atoms/LowerCaseAtom.java Tue May 17 22:20:49 2016
@@ -19,7 +19,7 @@ package org.apache.stanbol.rules.adapter
import java.util.ArrayList;
import java.util.List;
-import org.apache.clerezza.rdf.core.UriRef;
+import org.apache.clerezza.commons.rdf.IRI;
import org.apache.clerezza.rdf.core.sparql.query.ConstructQuery;
import org.apache.clerezza.rdf.core.sparql.query.Expression;
import org.apache.clerezza.rdf.core.sparql.query.FunctionCall;
@@ -56,7 +56,7 @@ public class LowerCaseAtom extends Abstr
List<Expression> argumentExpressions = new ArrayList<Expression>();
argumentExpressions.add((Expression) argument1.getClerezzaObject());
- FunctionCall functionCall = new FunctionCall(new UriRef(
+ FunctionCall functionCall = new FunctionCall(new IRI(
"<http://www.w3.org/2005/xpath-functions#lower-case>"), argumentExpressions);
return (T) new ClerezzaSparqlObject(functionCall);
Modified: stanbol/trunk/rules/adapters/clerezza/src/main/java/org/apache/stanbol/rules/adapters/clerezza/atoms/NewIRIAtom.java
URL: http://svn.apache.org/viewvc/stanbol/trunk/rules/adapters/clerezza/src/main/java/org/apache/stanbol/rules/adapters/clerezza/atoms/NewIRIAtom.java?rev=1744328&r1=1744327&r2=1744328&view=diff
==============================================================================
--- stanbol/trunk/rules/adapters/clerezza/src/main/java/org/apache/stanbol/rules/adapters/clerezza/atoms/NewIRIAtom.java (original)
+++ stanbol/trunk/rules/adapters/clerezza/src/main/java/org/apache/stanbol/rules/adapters/clerezza/atoms/NewIRIAtom.java Tue May 17 22:20:49 2016
@@ -32,7 +32,7 @@ import org.apache.stanbol.rules.manager.
import org.apache.stanbol.rules.manager.atoms.StringFunctionAtom;
/**
- * It adapts any NewIRIAtom to the BIND built in call in Clerezza for creating new UriRef resources binding
+ * It adapts any NewIRIAtom to the BIND built in call in Clerezza for creating new IRI resources binding
* the value to a variable.
*
* @author anuzzolese
Modified: stanbol/trunk/rules/adapters/clerezza/src/main/java/org/apache/stanbol/rules/adapters/clerezza/atoms/ResourceAtom.java
URL: http://svn.apache.org/viewvc/stanbol/trunk/rules/adapters/clerezza/src/main/java/org/apache/stanbol/rules/adapters/clerezza/atoms/ResourceAtom.java?rev=1744328&r1=1744327&r2=1744328&view=diff
==============================================================================
--- stanbol/trunk/rules/adapters/clerezza/src/main/java/org/apache/stanbol/rules/adapters/clerezza/atoms/ResourceAtom.java (original)
+++ stanbol/trunk/rules/adapters/clerezza/src/main/java/org/apache/stanbol/rules/adapters/clerezza/atoms/ResourceAtom.java Tue May 17 22:20:49 2016
@@ -17,14 +17,14 @@
package org.apache.stanbol.rules.adapters.clerezza.atoms;
-import org.apache.clerezza.rdf.core.UriRef;
+import org.apache.clerezza.commons.rdf.IRI;
import org.apache.stanbol.rules.adapters.AbstractAdaptableAtom;
import org.apache.stanbol.rules.adapters.clerezza.ClerezzaSparqlObject;
import org.apache.stanbol.rules.base.api.RuleAtom;
import org.apache.stanbol.rules.base.api.RuleAtomCallExeption;
/**
- * It adapts any ResourceAtom to UriRef resource in Clerezza.
+ * It adapts any ResourceAtom to IRI resource in Clerezza.
*
* @author anuzzolese
*
@@ -38,7 +38,7 @@ public class ResourceAtom extends Abstra
org.apache.stanbol.rules.manager.atoms.ResourceAtom tmp = (org.apache.stanbol.rules.manager.atoms.ResourceAtom) ruleAtom;
String unquotedURI = tmp.toUnquotedString();
- UriRef uriRef = new UriRef(unquotedURI);
+ IRI uriRef = new IRI(unquotedURI);
return (T) new ClerezzaSparqlObject(uriRef);
}
Modified: stanbol/trunk/rules/adapters/clerezza/src/main/java/org/apache/stanbol/rules/adapters/clerezza/atoms/StartsWithAtom.java
URL: http://svn.apache.org/viewvc/stanbol/trunk/rules/adapters/clerezza/src/main/java/org/apache/stanbol/rules/adapters/clerezza/atoms/StartsWithAtom.java?rev=1744328&r1=1744327&r2=1744328&view=diff
==============================================================================
--- stanbol/trunk/rules/adapters/clerezza/src/main/java/org/apache/stanbol/rules/adapters/clerezza/atoms/StartsWithAtom.java (original)
+++ stanbol/trunk/rules/adapters/clerezza/src/main/java/org/apache/stanbol/rules/adapters/clerezza/atoms/StartsWithAtom.java Tue May 17 22:20:49 2016
@@ -19,7 +19,7 @@ package org.apache.stanbol.rules.adapter
import java.util.ArrayList;
import java.util.List;
-import org.apache.clerezza.rdf.core.UriRef;
+import org.apache.clerezza.commons.rdf.IRI;
import org.apache.clerezza.rdf.core.sparql.query.ConstructQuery;
import org.apache.clerezza.rdf.core.sparql.query.Expression;
import org.apache.clerezza.rdf.core.sparql.query.FunctionCall;
@@ -59,7 +59,7 @@ public class StartsWithAtom extends Abst
argumentExpressions.add((Expression) argument1.getClerezzaObject());
argumentExpressions.add((Expression) argument2.getClerezzaObject());
- FunctionCall functionCall = new FunctionCall(new UriRef(
+ FunctionCall functionCall = new FunctionCall(new IRI(
"<http://www.w3.org/2005/xpath-functions#starts-with>"), argumentExpressions);
return (T) new ClerezzaSparqlObject(functionCall);
Modified: stanbol/trunk/rules/adapters/clerezza/src/main/java/org/apache/stanbol/rules/adapters/clerezza/atoms/StringAtom.java
URL: http://svn.apache.org/viewvc/stanbol/trunk/rules/adapters/clerezza/src/main/java/org/apache/stanbol/rules/adapters/clerezza/atoms/StringAtom.java?rev=1744328&r1=1744327&r2=1744328&view=diff
==============================================================================
--- stanbol/trunk/rules/adapters/clerezza/src/main/java/org/apache/stanbol/rules/adapters/clerezza/atoms/StringAtom.java (original)
+++ stanbol/trunk/rules/adapters/clerezza/src/main/java/org/apache/stanbol/rules/adapters/clerezza/atoms/StringAtom.java Tue May 17 22:20:49 2016
@@ -16,7 +16,7 @@
*/
package org.apache.stanbol.rules.adapters.clerezza.atoms;
-import org.apache.clerezza.rdf.core.impl.PlainLiteralImpl;
+import org.apache.clerezza.commons.rdf.impl.utils.PlainLiteralImpl;
import org.apache.clerezza.rdf.core.sparql.query.Expression;
import org.apache.clerezza.rdf.core.sparql.query.LiteralExpression;
import org.apache.clerezza.rdf.core.sparql.query.Variable;
Modified: stanbol/trunk/rules/adapters/clerezza/src/main/java/org/apache/stanbol/rules/adapters/clerezza/atoms/SubstringAtom.java
URL: http://svn.apache.org/viewvc/stanbol/trunk/rules/adapters/clerezza/src/main/java/org/apache/stanbol/rules/adapters/clerezza/atoms/SubstringAtom.java?rev=1744328&r1=1744327&r2=1744328&view=diff
==============================================================================
--- stanbol/trunk/rules/adapters/clerezza/src/main/java/org/apache/stanbol/rules/adapters/clerezza/atoms/SubstringAtom.java (original)
+++ stanbol/trunk/rules/adapters/clerezza/src/main/java/org/apache/stanbol/rules/adapters/clerezza/atoms/SubstringAtom.java Tue May 17 22:20:49 2016
@@ -19,7 +19,7 @@ package org.apache.stanbol.rules.adapter
import java.util.ArrayList;
import java.util.List;
-import org.apache.clerezza.rdf.core.UriRef;
+import org.apache.clerezza.commons.rdf.IRI;
import org.apache.clerezza.rdf.core.sparql.query.ConstructQuery;
import org.apache.clerezza.rdf.core.sparql.query.Expression;
import org.apache.clerezza.rdf.core.sparql.query.FunctionCall;
@@ -65,7 +65,7 @@ public class SubstringAtom extends Abstr
argumentExpressions.add((Expression) clerezzaStart.getClerezzaObject());
argumentExpressions.add((Expression) clerezzaLength.getClerezzaObject());
- FunctionCall functionCall = new FunctionCall(new UriRef(
+ FunctionCall functionCall = new FunctionCall(new IRI(
"<http://www.w3.org/2005/xpath-functions#substring>"), argumentExpressions);
return (T) new ClerezzaSparqlObject(functionCall);
Modified: stanbol/trunk/rules/adapters/clerezza/src/main/java/org/apache/stanbol/rules/adapters/clerezza/atoms/TypedLiteralAtom.java
URL: http://svn.apache.org/viewvc/stanbol/trunk/rules/adapters/clerezza/src/main/java/org/apache/stanbol/rules/adapters/clerezza/atoms/TypedLiteralAtom.java?rev=1744328&r1=1744327&r2=1744328&view=diff
==============================================================================
--- stanbol/trunk/rules/adapters/clerezza/src/main/java/org/apache/stanbol/rules/adapters/clerezza/atoms/TypedLiteralAtom.java (original)
+++ stanbol/trunk/rules/adapters/clerezza/src/main/java/org/apache/stanbol/rules/adapters/clerezza/atoms/TypedLiteralAtom.java Tue May 17 22:20:49 2016
@@ -16,7 +16,7 @@
*/
package org.apache.stanbol.rules.adapters.clerezza.atoms;
-import org.apache.clerezza.rdf.core.Literal;
+import org.apache.clerezza.commons.rdf.Literal;
import org.apache.clerezza.rdf.core.LiteralFactory;
import org.apache.clerezza.rdf.core.sparql.query.LiteralExpression;
import org.apache.stanbol.rules.adapters.AbstractAdaptableAtom;
Modified: stanbol/trunk/rules/adapters/clerezza/src/main/java/org/apache/stanbol/rules/adapters/clerezza/atoms/UpperCaseAtom.java
URL: http://svn.apache.org/viewvc/stanbol/trunk/rules/adapters/clerezza/src/main/java/org/apache/stanbol/rules/adapters/clerezza/atoms/UpperCaseAtom.java?rev=1744328&r1=1744327&r2=1744328&view=diff
==============================================================================
--- stanbol/trunk/rules/adapters/clerezza/src/main/java/org/apache/stanbol/rules/adapters/clerezza/atoms/UpperCaseAtom.java (original)
+++ stanbol/trunk/rules/adapters/clerezza/src/main/java/org/apache/stanbol/rules/adapters/clerezza/atoms/UpperCaseAtom.java Tue May 17 22:20:49 2016
@@ -19,7 +19,7 @@ package org.apache.stanbol.rules.adapter
import java.util.ArrayList;
import java.util.List;
-import org.apache.clerezza.rdf.core.UriRef;
+import org.apache.clerezza.commons.rdf.IRI;
import org.apache.clerezza.rdf.core.sparql.query.ConstructQuery;
import org.apache.clerezza.rdf.core.sparql.query.Expression;
import org.apache.clerezza.rdf.core.sparql.query.FunctionCall;
@@ -56,7 +56,7 @@ public class UpperCaseAtom extends Abstr
List<Expression> argumentExpressions = new ArrayList<Expression>();
argumentExpressions.add((Expression) argument1.getClerezzaObject());
- FunctionCall functionCall = new FunctionCall(new UriRef(
+ FunctionCall functionCall = new FunctionCall(new IRI(
"<http://www.w3.org/2005/xpath-functions#upper-case>"), argumentExpressions);
return (T) new ClerezzaSparqlObject(functionCall);
Modified: stanbol/trunk/rules/adapters/clerezza/src/test/java/org/apache/stanbol/rules/adapters/clerezza/ClerezzaAdpterTest.java
URL: http://svn.apache.org/viewvc/stanbol/trunk/rules/adapters/clerezza/src/test/java/org/apache/stanbol/rules/adapters/clerezza/ClerezzaAdpterTest.java?rev=1744328&r1=1744327&r2=1744328&view=diff
==============================================================================
--- stanbol/trunk/rules/adapters/clerezza/src/test/java/org/apache/stanbol/rules/adapters/clerezza/ClerezzaAdpterTest.java (original)
+++ stanbol/trunk/rules/adapters/clerezza/src/test/java/org/apache/stanbol/rules/adapters/clerezza/ClerezzaAdpterTest.java Tue May 17 22:20:49 2016
@@ -23,7 +23,7 @@ import java.util.List;
import junit.framework.Assert;
-import org.apache.clerezza.rdf.core.UriRef;
+import org.apache.clerezza.commons.rdf.IRI;
import org.apache.clerezza.rdf.core.access.TcManager;
import org.apache.clerezza.rdf.core.access.WeightedTcProvider;
import org.apache.clerezza.rdf.core.sparql.ParseException;
@@ -109,7 +109,7 @@ public class ClerezzaAdpterTest {
recipeString);
recipeGood = new RecipeImpl(
- new UriRef("http://incubator.apache.com/stanbol/rules/adapters/jena/test"), "A recipe.",
+ new IRI("http://incubator.apache.com/stanbol/rules/adapters/jena/test"), "A recipe.",
kb.getRuleList());
recipeString = "kres = <http://kres.iks-project.eu/ontology.owl#> . "
@@ -122,7 +122,7 @@ public class ClerezzaAdpterTest {
kb = RuleParserImpl.parse("http://incubator.apache.com/stanbol/rules/adapters/jena/test/",
recipeString);
- recipeWrong = new RecipeImpl(new UriRef(
+ recipeWrong = new RecipeImpl(new IRI(
"http://incubator.apache.com/stanbol/rules/adapters/jena/test"), "A recipe.",
kb.getRuleList());
}
Modified: stanbol/trunk/rules/adapters/jena/src/main/java/org/apache/stanbol/rules/adapters/jena/JenaAdapter.java
URL: http://svn.apache.org/viewvc/stanbol/trunk/rules/adapters/jena/src/main/java/org/apache/stanbol/rules/adapters/jena/JenaAdapter.java?rev=1744328&r1=1744327&r2=1744328&view=diff
==============================================================================
--- stanbol/trunk/rules/adapters/jena/src/main/java/org/apache/stanbol/rules/adapters/jena/JenaAdapter.java (original)
+++ stanbol/trunk/rules/adapters/jena/src/main/java/org/apache/stanbol/rules/adapters/jena/JenaAdapter.java Tue May 17 22:20:49 2016
@@ -28,7 +28,7 @@ import java.util.Iterator;
import java.util.List;
import java.util.Map;
-import org.apache.clerezza.rdf.core.UriRef;
+import org.apache.clerezza.commons.rdf.IRI;
import org.apache.clerezza.rdf.core.sparql.ResultSet;
import org.apache.felix.scr.annotations.Activate;
import org.apache.felix.scr.annotations.Component;
@@ -306,7 +306,7 @@ public class JenaAdapter extends Abstrac
try {
KB kb = RuleParserImpl.parse("http://sssw.org/2012/rules/", new FileInputStream("/Users/mac/Documents/CNR/SSSW2012/rules/exercise1"));
System.out.println("Rules: " + kb.getRuleList().size());
- Recipe recipe = new RecipeImpl(new UriRef("http://sssw.org/2012/rules/"), "Recipe", kb.getRuleList());
+ Recipe recipe = new RecipeImpl(new IRI("http://sssw.org/2012/rules/"), "Recipe", kb.getRuleList());
List<com.hp.hpl.jena.reasoner.rulesys.Rule> jenaRules = (List<com.hp.hpl.jena.reasoner.rulesys.Rule>) ruleAdapter.adaptTo(recipe, com.hp.hpl.jena.reasoner.rulesys.Rule.class);