Author: anuzzolese
Date: Sat Apr 16 16:53:35 2011
New Revision: 1094015
URL: http://svn.apache.org/viewvc?rev=1094015&view=rev
Log:
STANBOL-166 Added unit tests to OWLAPIToClerezzaConverter and to
JenaToClerezzaConverter in org.apache.stanbol.transformation.
STANBOL-167 Renamed org.apache.stanbol.trasformation to
org.apache.stanbol.transformation. The name refactoring has been propagated to
all importing packages.
Added:
incubator/stanbol/trunk/owl/src/main/java/org/apache/stanbol/owl/transformation/
- copied from r1089045,
incubator/stanbol/trunk/owl/src/main/java/org/apache/stanbol/owl/trasformation/
incubator/stanbol/trunk/owl/src/test/java/org/apache/stanbol/owl/transformation/
- copied from r1089045,
incubator/stanbol/trunk/owl/src/test/java/org/apache/stanbol/owl/trasformation/
incubator/stanbol/trunk/owl/src/test/java/org/apache/stanbol/owl/transformation/JenaToClerezzaConverterTest.java
incubator/stanbol/trunk/owl/src/test/java/org/apache/stanbol/owl/transformation/OWLAPIToClerezzaConverterTest.java
Removed:
incubator/stanbol/trunk/owl/src/main/java/org/apache/stanbol/owl/trasformation/
incubator/stanbol/trunk/owl/src/test/java/org/apache/stanbol/owl/trasformation/
Modified:
incubator/stanbol/trunk/enhancer/engines/refactor/src/main/java/org/apache/stanbol/enhancer/engines/refactor/RefactorEnhancementEngine.java
incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/impl/io/ClerezzaOntologyStorage.java
incubator/stanbol/trunk/owl/src/main/java/org/apache/stanbol/owl/RunSingleSPARQL.java
incubator/stanbol/trunk/owl/src/main/java/org/apache/stanbol/owl/transformation/JenaToClerezzaConverter.java
incubator/stanbol/trunk/owl/src/main/java/org/apache/stanbol/owl/transformation/JenaToOwlConvert.java
incubator/stanbol/trunk/owl/src/main/java/org/apache/stanbol/owl/transformation/OWLAPIToClerezzaConverter.java
incubator/stanbol/trunk/owl/src/main/java/org/apache/stanbol/owl/web/OWLOntologyWriter.java
incubator/stanbol/trunk/owl/src/test/java/org/apache/stanbol/owl/transformation/ConversionTester.java
incubator/stanbol/trunk/reasoners/base/src/main/java/org/apache/stanbol/reasoners/base/commands/RunRules.java
incubator/stanbol/trunk/reasoners/base/src/main/java/org/apache/stanbol/reasoners/base/impl/ConsistentRefactorerImpl.java
incubator/stanbol/trunk/reengineer/base/src/main/java/org/apache/stanbol/reengineer/base/impl/OntologyStorage.java
incubator/stanbol/trunk/reengineer/db/src/main/java/org/apache/stanbol/reengineer/db/DBDataTransformer.java
incubator/stanbol/trunk/reengineer/db/src/main/java/org/apache/stanbol/reengineer/db/connection/DatabaseConnection.java
incubator/stanbol/trunk/rules/base/src/main/java/org/apache/stanbol/rules/base/api/util/RuleList.java
incubator/stanbol/trunk/rules/manager/src/main/java/org/apache/stanbol/rules/manager/KB.java
incubator/stanbol/trunk/rules/refactor/src/main/java/org/apache/stanbol/rules/refactor/impl/RefactorerImpl.java
Modified:
incubator/stanbol/trunk/enhancer/engines/refactor/src/main/java/org/apache/stanbol/enhancer/engines/refactor/RefactorEnhancementEngine.java
URL:
http://svn.apache.org/viewvc/incubator/stanbol/trunk/enhancer/engines/refactor/src/main/java/org/apache/stanbol/enhancer/engines/refactor/RefactorEnhancementEngine.java?rev=1094015&r1=1094014&r2=1094015&view=diff
==============================================================================
---
incubator/stanbol/trunk/enhancer/engines/refactor/src/main/java/org/apache/stanbol/enhancer/engines/refactor/RefactorEnhancementEngine.java
(original)
+++
incubator/stanbol/trunk/enhancer/engines/refactor/src/main/java/org/apache/stanbol/enhancer/engines/refactor/RefactorEnhancementEngine.java
Sat Apr 16 16:53:35 2011
@@ -43,7 +43,7 @@ import org.apache.stanbol.ontologymanage
import
org.apache.stanbol.ontologymanager.ontonet.api.ontology.UnmodifiableOntologySpaceException;
import org.apache.stanbol.ontologymanager.ontonet.api.session.Session;
import org.apache.stanbol.ontologymanager.ontonet.api.session.SessionManager;
-import org.apache.stanbol.owl.trasformation.OWLAPIToClerezzaConverter;
+import org.apache.stanbol.owl.transformation.OWLAPIToClerezzaConverter;
import org.apache.stanbol.reasoners.base.api.Reasoner;
import org.apache.stanbol.rules.base.api.NoSuchRecipeException;
import org.apache.stanbol.rules.base.api.Recipe;
Modified:
incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/impl/io/ClerezzaOntologyStorage.java
URL:
http://svn.apache.org/viewvc/incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/impl/io/ClerezzaOntologyStorage.java?rev=1094015&r1=1094014&r2=1094015&view=diff
==============================================================================
---
incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/impl/io/ClerezzaOntologyStorage.java
(original)
+++
incubator/stanbol/trunk/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/impl/io/ClerezzaOntologyStorage.java
Sat Apr 16 16:53:35 2011
@@ -28,8 +28,8 @@ import com.hp.hpl.jena.rdf.model.ModelFa
import com.hp.hpl.jena.util.FileManager;
import
org.apache.stanbol.ontologymanager.ontonet.impl.ontology.NoSuchStoreException;
-import org.apache.stanbol.owl.trasformation.JenaToClerezzaConverter;
-import org.apache.stanbol.owl.trasformation.JenaToOwlConvert;
+import org.apache.stanbol.owl.transformation.JenaToClerezzaConverter;
+import org.apache.stanbol.owl.transformation.JenaToOwlConvert;
public class ClerezzaOntologyStorage {
Modified:
incubator/stanbol/trunk/owl/src/main/java/org/apache/stanbol/owl/RunSingleSPARQL.java
URL:
http://svn.apache.org/viewvc/incubator/stanbol/trunk/owl/src/main/java/org/apache/stanbol/owl/RunSingleSPARQL.java?rev=1094015&r1=1094014&r2=1094015&view=diff
==============================================================================
---
incubator/stanbol/trunk/owl/src/main/java/org/apache/stanbol/owl/RunSingleSPARQL.java
(original)
+++
incubator/stanbol/trunk/owl/src/main/java/org/apache/stanbol/owl/RunSingleSPARQL.java
Sat Apr 16 16:53:35 2011
@@ -16,7 +16,7 @@ import com.hp.hpl.jena.query.QueryExecut
import com.hp.hpl.jena.query.QueryExecutionFactory;
import com.hp.hpl.jena.query.ResultSet;
-import org.apache.stanbol.owl.trasformation.JenaToOwlConvert;
+import org.apache.stanbol.owl.transformation.JenaToOwlConvert;
/**
*
Modified:
incubator/stanbol/trunk/owl/src/main/java/org/apache/stanbol/owl/transformation/JenaToClerezzaConverter.java
URL:
http://svn.apache.org/viewvc/incubator/stanbol/trunk/owl/src/main/java/org/apache/stanbol/owl/transformation/JenaToClerezzaConverter.java?rev=1094015&r1=1089045&r2=1094015&view=diff
==============================================================================
---
incubator/stanbol/trunk/owl/src/main/java/org/apache/stanbol/owl/transformation/JenaToClerezzaConverter.java
(original)
+++
incubator/stanbol/trunk/owl/src/main/java/org/apache/stanbol/owl/transformation/JenaToClerezzaConverter.java
Sat Apr 16 16:53:35 2011
@@ -1,4 +1,4 @@
-package org.apache.stanbol.owl.trasformation;
+package org.apache.stanbol.owl.transformation;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
Modified:
incubator/stanbol/trunk/owl/src/main/java/org/apache/stanbol/owl/transformation/JenaToOwlConvert.java
URL:
http://svn.apache.org/viewvc/incubator/stanbol/trunk/owl/src/main/java/org/apache/stanbol/owl/transformation/JenaToOwlConvert.java?rev=1094015&r1=1089045&r2=1094015&view=diff
==============================================================================
---
incubator/stanbol/trunk/owl/src/main/java/org/apache/stanbol/owl/transformation/JenaToOwlConvert.java
(original)
+++
incubator/stanbol/trunk/owl/src/main/java/org/apache/stanbol/owl/transformation/JenaToOwlConvert.java
Sat Apr 16 16:53:35 2011
@@ -3,7 +3,7 @@
* and open the template in the editor.
*/
-package org.apache.stanbol.owl.trasformation;
+package org.apache.stanbol.owl.transformation;
import com.hp.hpl.jena.ontology.AnnotationProperty;
Modified:
incubator/stanbol/trunk/owl/src/main/java/org/apache/stanbol/owl/transformation/OWLAPIToClerezzaConverter.java
URL:
http://svn.apache.org/viewvc/incubator/stanbol/trunk/owl/src/main/java/org/apache/stanbol/owl/transformation/OWLAPIToClerezzaConverter.java?rev=1094015&r1=1089045&r2=1094015&view=diff
==============================================================================
---
incubator/stanbol/trunk/owl/src/main/java/org/apache/stanbol/owl/transformation/OWLAPIToClerezzaConverter.java
(original)
+++
incubator/stanbol/trunk/owl/src/main/java/org/apache/stanbol/owl/transformation/OWLAPIToClerezzaConverter.java
Sat Apr 16 16:53:35 2011
@@ -1,4 +1,4 @@
-package org.apache.stanbol.owl.trasformation;
+package org.apache.stanbol.owl.transformation;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
Modified:
incubator/stanbol/trunk/owl/src/main/java/org/apache/stanbol/owl/web/OWLOntologyWriter.java
URL:
http://svn.apache.org/viewvc/incubator/stanbol/trunk/owl/src/main/java/org/apache/stanbol/owl/web/OWLOntologyWriter.java?rev=1094015&r1=1094014&r2=1094015&view=diff
==============================================================================
---
incubator/stanbol/trunk/owl/src/main/java/org/apache/stanbol/owl/web/OWLOntologyWriter.java
(original)
+++
incubator/stanbol/trunk/owl/src/main/java/org/apache/stanbol/owl/web/OWLOntologyWriter.java
Sat Apr 16 16:53:35 2011
@@ -30,7 +30,7 @@ import org.semanticweb.owlapi.model.OWLO
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.apache.stanbol.owl.trasformation.OWLAPIToClerezzaConverter;
+import org.apache.stanbol.owl.transformation.OWLAPIToClerezzaConverter;
@Provider
@Produces( { KRFormat.RDF_XML, KRFormat.OWL_XML, KRFormat.MANCHESTER_OWL,
Modified:
incubator/stanbol/trunk/owl/src/test/java/org/apache/stanbol/owl/transformation/ConversionTester.java
URL:
http://svn.apache.org/viewvc/incubator/stanbol/trunk/owl/src/test/java/org/apache/stanbol/owl/transformation/ConversionTester.java?rev=1094015&r1=1089045&r2=1094015&view=diff
==============================================================================
---
incubator/stanbol/trunk/owl/src/test/java/org/apache/stanbol/owl/transformation/ConversionTester.java
(original)
+++
incubator/stanbol/trunk/owl/src/test/java/org/apache/stanbol/owl/transformation/ConversionTester.java
Sat Apr 16 16:53:35 2011
@@ -3,7 +3,7 @@
* and open the template in the editor.
*/
-package org.apache.stanbol.owl.trasformation;
+package org.apache.stanbol.owl.transformation;
/**
*
@@ -16,6 +16,7 @@ import java.util.Set;
import junit.framework.TestCase;
+import org.apache.stanbol.owl.transformation.JenaToOwlConvert;
import org.semanticweb.owlapi.apibinding.OWLManager;
import org.semanticweb.owlapi.model.IRI;
import org.semanticweb.owlapi.model.OWLAnnotationAssertionAxiom;
@@ -62,9 +63,9 @@ public class ConversionTester extends Te
private static final URI DP = URI.create(_BASE + "#" + "hasAge");
- private static final URI label =
URI.create("http://www.w3.org/2000/01/rdf-schema#label";);
+ private static final URI label =
URI.create("http://www.w3.org/2000/01/rdf-schema#label";);
- private static final String clazzlabel = "Peanut";
+ private static final String clazzlabel = "Peanut";
private static final String VALUE = "8";
Added:
incubator/stanbol/trunk/owl/src/test/java/org/apache/stanbol/owl/transformation/JenaToClerezzaConverterTest.java
URL:
http://svn.apache.org/viewvc/incubator/stanbol/trunk/owl/src/test/java/org/apache/stanbol/owl/transformation/JenaToClerezzaConverterTest.java?rev=1094015&view=auto
==============================================================================
---
incubator/stanbol/trunk/owl/src/test/java/org/apache/stanbol/owl/transformation/JenaToClerezzaConverterTest.java
(added)
+++
incubator/stanbol/trunk/owl/src/test/java/org/apache/stanbol/owl/transformation/JenaToClerezzaConverterTest.java
Sat Apr 16 16:53:35 2011
@@ -0,0 +1,156 @@
+package org.apache.stanbol.owl.transformation;
+
+import java.util.Collection;
+import java.util.Iterator;
+
+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.UriRef;
+import org.apache.clerezza.rdf.core.impl.SimpleMGraph;
+import org.apache.clerezza.rdf.core.impl.TripleImpl;
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.hp.hpl.jena.graph.Graph;
+import com.hp.hpl.jena.rdf.model.Model;
+import com.hp.hpl.jena.rdf.model.ModelFactory;
+import com.hp.hpl.jena.rdf.model.Property;
+import com.hp.hpl.jena.rdf.model.Resource;
+import com.hp.hpl.jena.rdf.model.Statement;
+import com.hp.hpl.jena.rdf.model.StmtIterator;
+import com.hp.hpl.jena.util.iterator.ExtendedIterator;
+import com.hp.hpl.jena.vocabulary.RDF;
+
+/**
+ * It is a JUnit test class.<br>
+ * It tests the methods of the class {@link JenaToClerezzaConverter}.
+ *
+ * @author andrea.nuzzolese
+ *
+ */
+
+public class JenaToClerezzaConverterTest {
+
+ private static Model model;
+ private static MGraph mGraph;
+ private static String ns = "http://incubator.apache.org/stanbol/owl#";;
+ private static String foaf = "http://xmlns.com/foaf/0.1/";;
+
+ private Logger log = LoggerFactory.getLogger(getClass());
+
+ @BeforeClass
+ public static void setupClass(){
+
+ /*
+ * Set-up the Jena model for the test.
+ * Simply add the triples:
+ * AndreaNuzzolese isA Person
+ * EnricoDaga isA Person
+ * AndreaNuzzolese knows EnricoDaga
+ */
+ model = ModelFactory.createDefaultModel();
+ Resource foafPersonInJena = model.createResource(foaf+"Person");
+
+ Property knowsInJena = model.createProperty(foaf+"knows");
+ Resource andreaNuzzoleseInJena =
model.createResource(ns+"AndreaNuzzolese", foafPersonInJena);
+ Resource enricoDagaInJena =
model.createResource(ns+"EnricoDaga", foafPersonInJena);
+
+ andreaNuzzoleseInJena.addProperty(knowsInJena,
enricoDagaInJena);
+
+
+ /*
+ * Set-up the Clerezza model for the test.
+ * As before simply add the triples:
+ * AndreaNuzzolese isA Person
+ * EnricoDaga isA Person
+ * AndreaNuzzolese knows EnricoDaga
+ */
+ mGraph = new SimpleMGraph();
+
+ UriRef knowsInClerezza = new UriRef(ns+"knows");
+ UriRef rdfType = new UriRef(RDF.getURI()+"type");
+ UriRef foafPersonInClerezza = new UriRef(foaf+"Person");
+
+ NonLiteral andreaNuzzoleseInClerezza = new
UriRef(ns+"AndreaNuzzolese");
+ NonLiteral enricoDagaInClerezza = new UriRef(ns+"EnricoDaga");
+
+ Triple triple = new TripleImpl(andreaNuzzoleseInClerezza,
rdfType, foafPersonInClerezza);
+ mGraph.add(triple);
+ triple = new TripleImpl(enricoDagaInClerezza, rdfType,
foafPersonInClerezza);
+ mGraph.add(triple);
+ triple = new TripleImpl(andreaNuzzoleseInClerezza,
knowsInClerezza, enricoDagaInClerezza);
+ mGraph.add(triple);
+
+
+ }
+
+ @Test
+ public void testMGraphToJenaGraph(){
+ /*
+ * Convert the MGraph to a Jena Graph.
+ */
+ Graph jGraph =
JenaToClerezzaConverter.clerezzaMGraphToJenaGraph(mGraph);
+
+ /*
+ * Print all the triples contained in the Jena Graph.
+ */
+ ExtendedIterator<com.hp.hpl.jena.graph.Triple> tripleIt =
jGraph.find(null, null, null);
+ while(tripleIt.hasNext()){
+ com.hp.hpl.jena.graph.Triple triple = tripleIt.next();
+ log.info(triple.toString());
+ }
+ }
+
+ @Test
+ public void testMGraphToJenaModel(){
+ /*
+ * Convert the MGraph to a Jena Model.
+ */
+ Model model =
JenaToClerezzaConverter.clerezzaMGraphToJenaModel(mGraph);
+
+ /*
+ * Print all the triples contained in the Jena Model.
+ */
+ StmtIterator stmtIt = model.listStatements();
+ while(stmtIt.hasNext()){
+ Statement statement = stmtIt.next();
+ log.info(statement.toString());
+ }
+
+ }
+
+ @Test
+ public void testModelToMGraph(){
+ /*
+ * Convert the Jena Model to a Clerezza MGraph.
+ */
+ MGraph mGraph =
JenaToClerezzaConverter.jenaModelToClerezzaMGraph(model);
+
+ /*
+ * Print all the triples contained in the Clerezza MGraph.
+ */
+ Iterator<Triple> tripleIt = mGraph.iterator();
+ while(tripleIt.hasNext()){
+ Triple triple = tripleIt.next();
+ log.info(triple.toString());
+ }
+ }
+
+ @Test
+ public void testModelToClerezzaTriples(){
+ /*
+ * Convert the Jena Model into a collection of Clerezza triples.
+ */
+ Collection<Triple> triples =
JenaToClerezzaConverter.jenaModelToClerezzaTriples(model);
+
+ /*
+ * Print the collection of Clerezza triples.
+ */
+ for(Triple triple : triples){
+ log.info(triple.toString());
+ }
+ }
+}
Added:
incubator/stanbol/trunk/owl/src/test/java/org/apache/stanbol/owl/transformation/OWLAPIToClerezzaConverterTest.java
URL:
http://svn.apache.org/viewvc/incubator/stanbol/trunk/owl/src/test/java/org/apache/stanbol/owl/transformation/OWLAPIToClerezzaConverterTest.java?rev=1094015&view=auto
==============================================================================
---
incubator/stanbol/trunk/owl/src/test/java/org/apache/stanbol/owl/transformation/OWLAPIToClerezzaConverterTest.java
(added)
+++
incubator/stanbol/trunk/owl/src/test/java/org/apache/stanbol/owl/transformation/OWLAPIToClerezzaConverterTest.java
Sat Apr 16 16:53:35 2011
@@ -0,0 +1,161 @@
+package org.apache.stanbol.owl.transformation;
+
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.Set;
+
+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.UriRef;
+import org.apache.clerezza.rdf.core.impl.SimpleMGraph;
+import org.apache.clerezza.rdf.core.impl.TripleImpl;
+import org.junit.BeforeClass;
+import org.junit.Test;
+import org.semanticweb.owlapi.apibinding.OWLManager;
+import org.semanticweb.owlapi.model.IRI;
+import org.semanticweb.owlapi.model.OWLAxiom;
+import org.semanticweb.owlapi.model.OWLClass;
+import org.semanticweb.owlapi.model.OWLDataFactory;
+import org.semanticweb.owlapi.model.OWLNamedIndividual;
+import org.semanticweb.owlapi.model.OWLObjectProperty;
+import org.semanticweb.owlapi.model.OWLOntology;
+import org.semanticweb.owlapi.model.OWLOntologyCreationException;
+import org.semanticweb.owlapi.model.OWLOntologyManager;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.hp.hpl.jena.vocabulary.RDF;
+
+/**
+ * It is a JUnit test class.<br>
+ * It tests the methods of the class {@link OWLAPIToClerezzaConverter}.
+ *
+ * @author andrea.nuzzolese
+ *
+ */
+
+public class OWLAPIToClerezzaConverterTest {
+
+
+ private static OWLOntology ontology;
+ private static MGraph mGraph;
+ private static String ns = "http://incubator.apache.org/stanbol/owl#";;
+ private static String foaf = "http://xmlns.com/foaf/0.1/";;
+
+ private static Logger log =
LoggerFactory.getLogger(OWLAPIToClerezzaConverterTest.class);
+
+ @BeforeClass
+ public static void setupClass(){
+
+ /*
+ * Set-up the OWL ontology for the test.
+ * Simply add the axioms:
+ * AndreaNuzzolese isA Person -> class assertion axiom
+ * EnricoDaga isA Person -> class assertion axiom
+ * AndreaNuzzolese knows EnricoDaga -> object property
assertion axiom
+ */
+ OWLOntologyManager manager =
OWLManager.createOWLOntologyManager();
+ OWLDataFactory factory = manager.getOWLDataFactory();
+ try {
+ ontology =
manager.createOntology(IRI.create(ns+"testOntology"));
+ } catch (OWLOntologyCreationException e) {
+ log.error(e.getMessage());
+ }
+
+ if(ontology != null){
+ OWLClass personClass =
factory.getOWLClass(IRI.create(foaf+"Person"));
+ OWLNamedIndividual andreaNuzzoleseOWL =
factory.getOWLNamedIndividual(IRI.create(ns+"AndreaNuzzolese"));
+ OWLNamedIndividual enricoDagaOWL =
factory.getOWLNamedIndividual(IRI.create(ns+"EnricoDaga"));
+ OWLObjectProperty knowsOWL =
factory.getOWLObjectProperty(IRI.create(foaf+"knows"));
+
+ OWLAxiom axiom =
factory.getOWLClassAssertionAxiom(personClass, andreaNuzzoleseOWL);
+ manager.addAxiom(ontology, axiom);
+
+ axiom = factory.getOWLClassAssertionAxiom(personClass,
enricoDagaOWL);
+ manager.addAxiom(ontology, axiom);
+
+ axiom =
factory.getOWLObjectPropertyAssertionAxiom(knowsOWL, andreaNuzzoleseOWL,
enricoDagaOWL);
+ manager.addAxiom(ontology, axiom);
+ }
+
+ /*
+ * Set-up the Clerezza model for the test.
+ * As before simply add the triples:
+ * AndreaNuzzolese isA Person
+ * EnricoDaga isA Person
+ * AndreaNuzzolese knows EnricoDaga
+ */
+ mGraph = new SimpleMGraph();
+
+ UriRef knowsInClerezza = new UriRef(ns+"knows");
+ UriRef rdfType = new UriRef(RDF.getURI()+"type");
+ UriRef foafPersonInClerezza = new UriRef(foaf+"Person");
+
+ NonLiteral andreaNuzzoleseInClerezza = new
UriRef(ns+"AndreaNuzzolese");
+ NonLiteral enricoDagaInClerezza = new UriRef(ns+"EnricoDaga");
+
+ Triple triple = new TripleImpl(andreaNuzzoleseInClerezza,
rdfType, foafPersonInClerezza);
+ mGraph.add(triple);
+ triple = new TripleImpl(enricoDagaInClerezza, rdfType,
foafPersonInClerezza);
+ mGraph.add(triple);
+ triple = new TripleImpl(andreaNuzzoleseInClerezza,
knowsInClerezza, enricoDagaInClerezza);
+ mGraph.add(triple);
+ }
+
+ @Test
+ public void testMGraphToOWLOntology(){
+ /*
+ * Transform the Clerezza MGraph to an OWLOntology.
+ */
+ OWLOntology ontology =
OWLAPIToClerezzaConverter.clerezzaMGraphToOWLOntology(mGraph);
+
+ /*
+ * Print the number of axioms contained in the OWLOntology.
+ */
+ int axiomCount = ontology.getAxiomCount();
+ log.info("The ontology contatins " + axiomCount + " axioms: ");
+
+ /*
+ * Print the axioms contained in the OWLOntology.
+ */
+ Set<OWLAxiom> axioms = ontology.getAxioms();
+ for(OWLAxiom axiom : axioms){
+ log.info(" " + axiom.toString());
+ }
+ }
+
+ @Test
+ public void testOWLOntologyToMGraph(){
+
+ /*
+ * Transform the OWLOntology into a Clerezza MGraph.
+ */
+ MGraph mGraph =
OWLAPIToClerezzaConverter.owlOntologyToClerezzaMGraph(ontology);
+
+ /*
+ * Print all the triples contained in the Clerezza MGraph.
+ */
+ Iterator<Triple> tripleIt = mGraph.iterator();
+ while(tripleIt.hasNext()){
+ Triple triple = tripleIt.next();
+ log.info(triple.toString());
+ }
+ }
+
+ @Test
+ public void testOWLOntologyToTriples(){
+
+ /*
+ * Transform the OWLOntology into a collection of Clerezza
triples.
+ */
+ Collection<Triple> triples =
OWLAPIToClerezzaConverter.owlOntologyToClerezzaTriples(ontology);
+
+ /*
+ * Print the collection of Clerezza triples.
+ */
+ for(Triple triple : triples){
+ log.info(triple.toString());
+ }
+ }
+}
Modified:
incubator/stanbol/trunk/reasoners/base/src/main/java/org/apache/stanbol/reasoners/base/commands/RunRules.java
URL:
http://svn.apache.org/viewvc/incubator/stanbol/trunk/reasoners/base/src/main/java/org/apache/stanbol/reasoners/base/commands/RunRules.java?rev=1094015&r1=1094014&r2=1094015&view=diff
==============================================================================
---
incubator/stanbol/trunk/reasoners/base/src/main/java/org/apache/stanbol/reasoners/base/commands/RunRules.java
(original)
+++
incubator/stanbol/trunk/reasoners/base/src/main/java/org/apache/stanbol/reasoners/base/commands/RunRules.java
Sat Apr 16 16:53:35 2011
@@ -29,7 +29,7 @@ import com.hp.hpl.jena.ontology.OntModel
import com.hp.hpl.jena.rdf.model.Model;
import com.hp.hpl.jena.rdf.model.ModelFactory;
-import org.apache.stanbol.owl.trasformation.JenaToOwlConvert;
+import org.apache.stanbol.owl.transformation.JenaToOwlConvert;
/**
*
Modified:
incubator/stanbol/trunk/reasoners/base/src/main/java/org/apache/stanbol/reasoners/base/impl/ConsistentRefactorerImpl.java
URL:
http://svn.apache.org/viewvc/incubator/stanbol/trunk/reasoners/base/src/main/java/org/apache/stanbol/reasoners/base/impl/ConsistentRefactorerImpl.java?rev=1094015&r1=1094014&r2=1094015&view=diff
==============================================================================
---
incubator/stanbol/trunk/reasoners/base/src/main/java/org/apache/stanbol/reasoners/base/impl/ConsistentRefactorerImpl.java
(original)
+++
incubator/stanbol/trunk/reasoners/base/src/main/java/org/apache/stanbol/reasoners/base/impl/ConsistentRefactorerImpl.java
Sat Apr 16 16:53:35 2011
@@ -15,7 +15,7 @@ import org.apache.felix.scr.annotations.
import org.apache.felix.scr.annotations.Service;
import org.apache.stanbol.ontologymanager.ontonet.api.ONManager;
import
org.apache.stanbol.ontologymanager.ontonet.impl.io.ClerezzaOntologyStorage;
-import org.apache.stanbol.owl.trasformation.JenaToOwlConvert;
+import org.apache.stanbol.owl.transformation.JenaToOwlConvert;
import org.apache.stanbol.reasoners.base.api.ConsistentRefactorer;
import org.apache.stanbol.reasoners.base.api.InconcistencyException;
import org.apache.stanbol.reasoners.base.api.Reasoner;
Modified:
incubator/stanbol/trunk/reengineer/base/src/main/java/org/apache/stanbol/reengineer/base/impl/OntologyStorage.java
URL:
http://svn.apache.org/viewvc/incubator/stanbol/trunk/reengineer/base/src/main/java/org/apache/stanbol/reengineer/base/impl/OntologyStorage.java?rev=1094015&r1=1094014&r2=1094015&view=diff
==============================================================================
---
incubator/stanbol/trunk/reengineer/base/src/main/java/org/apache/stanbol/reengineer/base/impl/OntologyStorage.java
(original)
+++
incubator/stanbol/trunk/reengineer/base/src/main/java/org/apache/stanbol/reengineer/base/impl/OntologyStorage.java
Sat Apr 16 16:53:35 2011
@@ -27,8 +27,8 @@ import com.hp.hpl.jena.rdf.model.Model;
import com.hp.hpl.jena.rdf.model.ModelFactory;
import com.hp.hpl.jena.util.FileManager;
-import org.apache.stanbol.owl.trasformation.JenaToClerezzaConverter;
-import org.apache.stanbol.owl.trasformation.JenaToOwlConvert;
+import org.apache.stanbol.owl.transformation.JenaToClerezzaConverter;
+import org.apache.stanbol.owl.transformation.JenaToOwlConvert;
/**
* Copied to avoid cross-dependencies
Modified:
incubator/stanbol/trunk/reengineer/db/src/main/java/org/apache/stanbol/reengineer/db/DBDataTransformer.java
URL:
http://svn.apache.org/viewvc/incubator/stanbol/trunk/reengineer/db/src/main/java/org/apache/stanbol/reengineer/db/DBDataTransformer.java?rev=1094015&r1=1094014&r2=1094015&view=diff
==============================================================================
---
incubator/stanbol/trunk/reengineer/db/src/main/java/org/apache/stanbol/reengineer/db/DBDataTransformer.java
(original)
+++
incubator/stanbol/trunk/reengineer/db/src/main/java/org/apache/stanbol/reengineer/db/DBDataTransformer.java
Sat Apr 16 16:53:35 2011
@@ -34,7 +34,7 @@ import com.hp.hpl.jena.query.QueryFactor
import com.hp.hpl.jena.query.QuerySolution;
import com.hp.hpl.jena.rdf.model.Resource;
-import org.apache.stanbol.owl.trasformation.JenaToOwlConvert;
+import org.apache.stanbol.owl.transformation.JenaToOwlConvert;
public class DBDataTransformer extends ReengineerUriRefGenerator {
Modified:
incubator/stanbol/trunk/reengineer/db/src/main/java/org/apache/stanbol/reengineer/db/connection/DatabaseConnection.java
URL:
http://svn.apache.org/viewvc/incubator/stanbol/trunk/reengineer/db/src/main/java/org/apache/stanbol/reengineer/db/connection/DatabaseConnection.java?rev=1094015&r1=1094014&r2=1094015&view=diff
==============================================================================
---
incubator/stanbol/trunk/reengineer/db/src/main/java/org/apache/stanbol/reengineer/db/connection/DatabaseConnection.java
(original)
+++
incubator/stanbol/trunk/reengineer/db/src/main/java/org/apache/stanbol/reengineer/db/connection/DatabaseConnection.java
Sat Apr 16 16:53:35 2011
@@ -5,13 +5,10 @@ import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.sql.SQLException;
-import org.apache.clerezza.rdf.core.Literal;
-import org.apache.clerezza.rdf.core.MGraph;
-import org.apache.clerezza.rdf.core.access.TcManager;
-
+import org.apache.stanbol.owl.transformation.JenaToOwlConvert;
+import org.apache.stanbol.reengineer.db.vocab.DBS_L1;
import org.semanticweb.owlapi.model.OWLOntology;
-
import com.hp.hpl.jena.ontology.OntModel;
import com.hp.hpl.jena.query.Query;
import com.hp.hpl.jena.query.QueryExecution;
@@ -20,11 +17,6 @@ import com.hp.hpl.jena.query.QueryFactor
import com.hp.hpl.jena.query.QuerySolution;
import com.hp.hpl.jena.vocabulary.RDF;
-
-import org.apache.stanbol.reengineer.db.vocab.DBS_L1;
-
-import org.apache.stanbol.owl.trasformation.JenaToOwlConvert;
-
public class DatabaseConnection {
Modified:
incubator/stanbol/trunk/rules/base/src/main/java/org/apache/stanbol/rules/base/api/util/RuleList.java
URL:
http://svn.apache.org/viewvc/incubator/stanbol/trunk/rules/base/src/main/java/org/apache/stanbol/rules/base/api/util/RuleList.java?rev=1094015&r1=1094014&r2=1094015&view=diff
==============================================================================
---
incubator/stanbol/trunk/rules/base/src/main/java/org/apache/stanbol/rules/base/api/util/RuleList.java
(original)
+++
incubator/stanbol/trunk/rules/base/src/main/java/org/apache/stanbol/rules/base/api/util/RuleList.java
Sat Apr 16 16:53:35 2011
@@ -32,8 +32,6 @@ public class RuleList implements Collect
semionRulesCopy[semionRulesCopy.length - 1] =
semionRule;
kReSRules = semionRulesCopy;
}
- log.debug("Added rule " + semionRule, this);
- System.out.println("Added rule " + semionRule);
return true;
}
@@ -49,8 +47,6 @@ public class RuleList implements Collect
semionRulesCopy[0] = semionRule;
kReSRules = semionRulesCopy;
}
- log.debug("Added to HEAD rule " + semionRule, this);
- System.out.println("Added to HEAD rule " + semionRule);
return true;
}
@@ -72,7 +68,6 @@ public class RuleList implements Collect
kReSRules = semionRulesCopy;
}
- log.debug("Added all rules : " + c, this);
return true;
}
Modified:
incubator/stanbol/trunk/rules/manager/src/main/java/org/apache/stanbol/rules/manager/KB.java
URL:
http://svn.apache.org/viewvc/incubator/stanbol/trunk/rules/manager/src/main/java/org/apache/stanbol/rules/manager/KB.java?rev=1094015&r1=1094014&r2=1094015&view=diff
==============================================================================
---
incubator/stanbol/trunk/rules/manager/src/main/java/org/apache/stanbol/rules/manager/KB.java
(original)
+++
incubator/stanbol/trunk/rules/manager/src/main/java/org/apache/stanbol/rules/manager/KB.java
Sat Apr 16 16:53:35 2011
@@ -49,7 +49,6 @@ public class KB {
}
public void addRule(Rule kReSRule){
- System.out.println("Adding rule to Head");
kReSRuleList.add(kReSRule);
}
Modified:
incubator/stanbol/trunk/rules/refactor/src/main/java/org/apache/stanbol/rules/refactor/impl/RefactorerImpl.java
URL:
http://svn.apache.org/viewvc/incubator/stanbol/trunk/rules/refactor/src/main/java/org/apache/stanbol/rules/refactor/impl/RefactorerImpl.java?rev=1094015&r1=1094014&r2=1094015&view=diff
==============================================================================
---
incubator/stanbol/trunk/rules/refactor/src/main/java/org/apache/stanbol/rules/refactor/impl/RefactorerImpl.java
(original)
+++
incubator/stanbol/trunk/rules/refactor/src/main/java/org/apache/stanbol/rules/refactor/impl/RefactorerImpl.java
Sat Apr 16 16:53:35 2011
@@ -28,8 +28,8 @@ import org.apache.stanbol.ontologymanage
import org.apache.stanbol.ontologymanager.ontonet.api.session.Session;
import org.apache.stanbol.ontologymanager.ontonet.api.session.SessionManager;
import
org.apache.stanbol.ontologymanager.ontonet.impl.io.ClerezzaOntologyStorage;
-import org.apache.stanbol.owl.trasformation.JenaToClerezzaConverter;
-import org.apache.stanbol.owl.trasformation.OWLAPIToClerezzaConverter;
+import org.apache.stanbol.owl.transformation.JenaToClerezzaConverter;
+import org.apache.stanbol.owl.transformation.OWLAPIToClerezzaConverter;
import org.apache.stanbol.rules.base.api.NoSuchRecipeException;
import org.apache.stanbol.rules.base.api.Recipe;
import org.apache.stanbol.rules.base.api.Rule;
@@ -346,7 +346,6 @@ public class RefactorerImpl implements R
// OntModel ontModel =
// jenaToOwlConvert.ModelOwlToJenaConvert(inputOntology, "RDF/XML");
- OWLOntologyManager manager = OWLManager.createOWLOntologyManager();
Recipe recipe;
try {
@@ -355,9 +354,6 @@ public class RefactorerImpl implements R
RuleList kReSRuleList = recipe.getkReSRuleList();
log.info("RULE LIST SIZE : " + kReSRuleList.size());
- OWLOntologyManager ontologyManager =
OWLManager.createOWLOntologyManager();
- OWLOntologyManager ontologyManager2 =
OWLManager.createOWLOntologyManager();
-
MGraph unionMGraph = new SimpleMGraph();
MGraph mGraph =
OWLAPIToClerezzaConverter.owlOntologyToClerezzaMGraph(inputOntology);
