Modified: stanbol/trunk/rules/adapters/jena/src/main/java/org/apache/stanbol/rules/adapters/jena/atoms/IsBlankAtom.java URL: http://svn.apache.org/viewvc/stanbol/trunk/rules/adapters/jena/src/main/java/org/apache/stanbol/rules/adapters/jena/atoms/IsBlankAtom.java?rev=1744328&r1=1744327&r2=1744328&view=diff ============================================================================== --- stanbol/trunk/rules/adapters/jena/src/main/java/org/apache/stanbol/rules/adapters/jena/atoms/IsBlankAtom.java (original) +++ stanbol/trunk/rules/adapters/jena/src/main/java/org/apache/stanbol/rules/adapters/jena/atoms/IsBlankAtom.java Tue May 17 22:20:49 2016 @@ -34,7 +34,7 @@ import com.hp.hpl.jena.reasoner.rulesys. /** * - * It adapts a IsBlankAtom to the isBNode functor of Jena. + * It adapts a IsBlankAtom to the isBlankNode functor of Jena. * * @author anuzzolese * @@ -65,7 +65,7 @@ public class IsBlankAtom extends Abstrac nodes.add(argNode); - return (T) new Functor("isBNode", nodes, BuiltinRegistry.theRegistry); + return (T) new Functor("isBlankNode", nodes, BuiltinRegistry.theRegistry); }
Modified: stanbol/trunk/rules/adapters/jena/src/test/java/org/apache/stanbol/rules/adapters/jena/JenaAdpterTest.java URL: http://svn.apache.org/viewvc/stanbol/trunk/rules/adapters/jena/src/test/java/org/apache/stanbol/rules/adapters/jena/JenaAdpterTest.java?rev=1744328&r1=1744327&r2=1744328&view=diff ============================================================================== --- stanbol/trunk/rules/adapters/jena/src/test/java/org/apache/stanbol/rules/adapters/jena/JenaAdpterTest.java (original) +++ stanbol/trunk/rules/adapters/jena/src/test/java/org/apache/stanbol/rules/adapters/jena/JenaAdpterTest.java Tue May 17 22:20:49 2016 @@ -19,7 +19,7 @@ package org.apache.stanbol.rules.adapter 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.stanbol.rules.base.api.Recipe; import org.apache.stanbol.rules.base.api.RuleAdapter; @@ -79,7 +79,7 @@ public class JenaAdpterTest { 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#> . " @@ -92,7 +92,7 @@ public class JenaAdpterTest { 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/sparql/src/test/java/org/apache/stanbol/rules/adapters/sparql/SPARQLAdpterTest.java URL: http://svn.apache.org/viewvc/stanbol/trunk/rules/adapters/sparql/src/test/java/org/apache/stanbol/rules/adapters/sparql/SPARQLAdpterTest.java?rev=1744328&r1=1744327&r2=1744328&view=diff ============================================================================== --- stanbol/trunk/rules/adapters/sparql/src/test/java/org/apache/stanbol/rules/adapters/sparql/SPARQLAdpterTest.java (original) +++ stanbol/trunk/rules/adapters/sparql/src/test/java/org/apache/stanbol/rules/adapters/sparql/SPARQLAdpterTest.java Tue May 17 22:20:49 2016 @@ -21,7 +21,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.stanbol.rules.base.api.Recipe; import org.apache.stanbol.rules.base.api.RuleAdapter; import org.apache.stanbol.rules.base.api.RuleAtomCallExeption; @@ -76,7 +76,7 @@ public class SPARQLAdpterTest { 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#> . " @@ -89,7 +89,7 @@ public class SPARQLAdpterTest { 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/swrl/src/test/java/org/apache/stanbol/rules/adapters/swrl/SWRLAdpterTest.java URL: http://svn.apache.org/viewvc/stanbol/trunk/rules/adapters/swrl/src/test/java/org/apache/stanbol/rules/adapters/swrl/SWRLAdpterTest.java?rev=1744328&r1=1744327&r2=1744328&view=diff ============================================================================== --- stanbol/trunk/rules/adapters/swrl/src/test/java/org/apache/stanbol/rules/adapters/swrl/SWRLAdpterTest.java (original) +++ stanbol/trunk/rules/adapters/swrl/src/test/java/org/apache/stanbol/rules/adapters/swrl/SWRLAdpterTest.java Tue May 17 22:20:49 2016 @@ -19,7 +19,7 @@ package org.apache.stanbol.rules.adapter 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.stanbol.rules.base.api.Recipe; import org.apache.stanbol.rules.base.api.RuleAdapter; @@ -78,7 +78,7 @@ public class SWRLAdpterTest { 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#> . " @@ -91,7 +91,7 @@ public class SWRLAdpterTest { 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/base/src/main/java/org/apache/stanbol/rules/base/api/Recipe.java URL: http://svn.apache.org/viewvc/stanbol/trunk/rules/base/src/main/java/org/apache/stanbol/rules/base/api/Recipe.java?rev=1744328&r1=1744327&r2=1744328&view=diff ============================================================================== --- stanbol/trunk/rules/base/src/main/java/org/apache/stanbol/rules/base/api/Recipe.java (original) +++ stanbol/trunk/rules/base/src/main/java/org/apache/stanbol/rules/base/api/Recipe.java Tue May 17 22:20:49 2016 @@ -18,9 +18,8 @@ package org.apache.stanbol.rules.base.ap import java.util.List; -import org.apache.clerezza.rdf.core.UriRef; +import org.apache.clerezza.commons.rdf.IRI; import org.apache.stanbol.rules.base.api.util.RuleList; -import org.semanticweb.owlapi.model.IRI; /** * It represents a Recipe object.<br/> @@ -44,10 +43,10 @@ public interface Recipe extends Adaptabl * Get the rule of the recipe identified by the rule ID. The rule is returned as a {@link Rule} object. * * @param ruleID - * {@link UriRef} + * {@link IRI} * @return the object that represents a {@link Rule} */ - Rule getRule(UriRef ruleID) throws NoSuchRuleInRecipeException; + Rule getRule(IRI ruleID) throws NoSuchRuleInRecipeException; /** * Get the list of the {@link Rule} contained in the recipe. @@ -59,23 +58,23 @@ public interface Recipe extends Adaptabl /** * Get the list of rule IDs contained in the recipe. * - * @return the List of {@link UriRef}. + * @return the List of {@link IRI}. */ - List<UriRef> listRuleIDs(); + List<IRI> listRuleIDs(); /** * Get the list of rule names contained in the recipe. * - * @return the List of {@link UriRef}. + * @return the List of {@link IRI}. */ List<String> listRuleNames(); /** * Get the ID of the recipe in the {@link RuleStore}. * - * @return the {@link UriRef} expressing the recipe's ID. + * @return the {@link IRI} expressing the recipe's ID. */ - UriRef getRecipeID(); + IRI getRecipeID(); /** * Get the description about the recipe. Modified: stanbol/trunk/rules/base/src/main/java/org/apache/stanbol/rules/base/api/Rule.java URL: http://svn.apache.org/viewvc/stanbol/trunk/rules/base/src/main/java/org/apache/stanbol/rules/base/api/Rule.java?rev=1744328&r1=1744327&r2=1744328&view=diff ============================================================================== --- stanbol/trunk/rules/base/src/main/java/org/apache/stanbol/rules/base/api/Rule.java (original) +++ stanbol/trunk/rules/base/src/main/java/org/apache/stanbol/rules/base/api/Rule.java Tue May 17 22:20:49 2016 @@ -16,7 +16,7 @@ */ package org.apache.stanbol.rules.base.api; -import org.apache.clerezza.rdf.core.UriRef; +import org.apache.clerezza.commons.rdf.IRI; import org.apache.stanbol.rules.base.api.util.AtomList; /** @@ -30,9 +30,9 @@ public interface Rule extends Adaptable /** * Gets the ID of the rule. * - * @return the {@link UriRef} representing the name of the rule. + * @return the {@link IRI} representing the name of the rule. */ - UriRef getRuleID(); + IRI getRuleID(); /** * Gets the name of the rule. Modified: stanbol/trunk/rules/base/src/main/java/org/apache/stanbol/rules/base/api/RuleStore.java URL: http://svn.apache.org/viewvc/stanbol/trunk/rules/base/src/main/java/org/apache/stanbol/rules/base/api/RuleStore.java?rev=1744328&r1=1744327&r2=1744328&view=diff ============================================================================== --- stanbol/trunk/rules/base/src/main/java/org/apache/stanbol/rules/base/api/RuleStore.java (original) +++ stanbol/trunk/rules/base/src/main/java/org/apache/stanbol/rules/base/api/RuleStore.java Tue May 17 22:20:49 2016 @@ -19,8 +19,8 @@ package org.apache.stanbol.rules.base.ap import java.io.InputStream; import java.util.List; -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.stanbol.rules.base.api.util.RecipeList; import org.apache.stanbol.rules.base.api.util.RuleList; @@ -54,13 +54,13 @@ public interface RuleStore { * If some error occurs during the creation of the recipe a {@link RecipeConstructionException} is thrown. * * @param recipeID - * {@link UriRef} + * {@link IRI} * @param recipeDescription * {@link String} * @return a {@link Recipe} * @throws AlreadyExistingRecipeException */ - Recipe createRecipe(UriRef recipeID, String recipeDescription) throws AlreadyExistingRecipeException; + Recipe createRecipe(IRI recipeID, String recipeDescription) throws AlreadyExistingRecipeException; /** * The method adds a new rule passed as second parameter to a recipe passed as first parameter. <br/> @@ -134,11 +134,11 @@ public interface RuleStore { * @param recipe * {@link Recipe} * @param ruleID - * {@link UriRef} + * {@link IRI} * @return {@link Rule} * @throws NoSuchRuleInRecipeException */ - Rule getRule(Recipe recipe, UriRef ruleID) throws NoSuchRuleInRecipeException; + Rule getRule(Recipe recipe, IRI ruleID) throws NoSuchRuleInRecipeException; /** * It returns the set of rules that realize the recipe passed as parameter. @@ -150,13 +150,13 @@ public interface RuleStore { RuleList listRules(Recipe recipe); /** - * It returns the {@link List} or rules' identifiers ({@link UriRef}). + * It returns the {@link List} or rules' identifiers ({@link IRI}). * * @param recipe * {@link Recipe} - * @return {@link List} of {@link UriRef} + * @return {@link List} of {@link IRI} */ - List<UriRef> listRuleIDs(Recipe recipe); + List<IRI> listRuleIDs(Recipe recipe); /** * It returns the {@link List} of rules' names. @@ -175,19 +175,19 @@ public interface RuleStore { * thrown. * * @param recipeID - * {@link UriRef} + * {@link IRI} * @return {@link Recipe} * @throws NoSuchRecipeException * @throws RecipeConstructionException */ - Recipe getRecipe(UriRef recipeID) throws NoSuchRecipeException, RecipeConstructionException; + Recipe getRecipe(IRI recipeID) throws NoSuchRecipeException, RecipeConstructionException; /** * It returns a list of existing recipes' IDs in the store.<br/> * - * @return {@link List} of {@link UriRef} + * @return {@link List} of {@link IRI} */ - List<UriRef> listRecipeIDs(); + List<IRI> listRecipeIDs(); /** * It returns the list of exisitng recipes in the RuleStore.<br/> @@ -202,11 +202,11 @@ public interface RuleStore { * {@link RecipeEliminationException} is thrown. * * @param recipeID - * {@link UriRef} + * {@link IRI} * @return <code>true</code> if the recipe has been removed, false otherwise. * @throws RecipeEliminationException */ - boolean removeRecipe(UriRef recipeID) throws RecipeEliminationException; + boolean removeRecipe(IRI recipeID) throws RecipeEliminationException; /** * It removes the recipe passed as parameter.<br/> @@ -232,13 +232,13 @@ public interface RuleStore { Recipe removeRule(Recipe recipe, Rule rule); /** - * It allows to export recipes as Clerezza's {@link TripleCollection} objects. + * It allows to export recipes as Clerezza's {@link Graph} objects. * * @param recipe * @return * @throws NoSuchRecipeException */ - TripleCollection exportRecipe(Recipe recipe) throws NoSuchRecipeException; + Graph exportRecipe(Recipe recipe) throws NoSuchRecipeException; /** * Find the set of recipes in the rule store whose description matches the <code>term</code> Modified: stanbol/trunk/rules/base/src/main/java/org/apache/stanbol/rules/base/api/Symbols.java URL: http://svn.apache.org/viewvc/stanbol/trunk/rules/base/src/main/java/org/apache/stanbol/rules/base/api/Symbols.java?rev=1744328&r1=1744327&r2=1744328&view=diff ============================================================================== --- stanbol/trunk/rules/base/src/main/java/org/apache/stanbol/rules/base/api/Symbols.java (original) +++ stanbol/trunk/rules/base/src/main/java/org/apache/stanbol/rules/base/api/Symbols.java Tue May 17 22:20:49 2016 @@ -17,7 +17,7 @@ package org.apache.stanbol.rules.base.api; -import org.apache.clerezza.rdf.core.UriRef; +import org.apache.clerezza.commons.rdf.IRI; /** * It provides static methods in order to represent properties, classes and the namespace used in order to @@ -37,18 +37,18 @@ public final class Symbols { public static String variablesPrefix = "http://incubator.apache.org/stanbol/rules/variables/";; - public static UriRef description = new UriRef("http://incubator.apache.org/stanbol/rules/description";); + public static IRI description = new IRI("http://incubator.apache.org/stanbol/rules/description";); - public static UriRef hasRule = new UriRef("http://incubator.apache.org/stanbol/rules/hasRule";); + public static IRI hasRule = new IRI("http://incubator.apache.org/stanbol/rules/hasRule";); - public static UriRef ruleName = new UriRef("http://incubator.apache.org/stanbol/rules/ruleName";); + public static IRI ruleName = new IRI("http://incubator.apache.org/stanbol/rules/ruleName";); - public static UriRef ruleBody = new UriRef("http://incubator.apache.org/stanbol/rules/ruleBody";); + public static IRI ruleBody = new IRI("http://incubator.apache.org/stanbol/rules/ruleBody";); - public static UriRef ruleHead = new UriRef("http://incubator.apache.org/stanbol/rules/ruleHead";); + public static IRI ruleHead = new IRI("http://incubator.apache.org/stanbol/rules/ruleHead";); - public static UriRef Recipe = new UriRef("http://incubator.apache.org/stanbol/rules/Recipe";); + public static IRI Recipe = new IRI("http://incubator.apache.org/stanbol/rules/Recipe";); - public static UriRef Rule = new UriRef("http://incubator.apache.org/stanbol/rules/Rule";); + public static IRI Rule = new IRI("http://incubator.apache.org/stanbol/rules/Rule";); } Modified: stanbol/trunk/rules/manager/pom.xml URL: http://svn.apache.org/viewvc/stanbol/trunk/rules/manager/pom.xml?rev=1744328&r1=1744327&r2=1744328&view=diff ============================================================================== --- stanbol/trunk/rules/manager/pom.xml (original) +++ stanbol/trunk/rules/manager/pom.xml Tue May 17 22:20:49 2016 @@ -129,14 +129,17 @@ <dependency> <groupId>org.apache.clerezza</groupId> <artifactId>rdf.jena.serializer</artifactId> + <scope>test</scope> </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> <dependency> <groupId>org.apache.clerezza</groupId> Modified: stanbol/trunk/rules/manager/src/main/java/org/apache/stanbol/rules/manager/ClerezzaRuleStore.java URL: http://svn.apache.org/viewvc/stanbol/trunk/rules/manager/src/main/java/org/apache/stanbol/rules/manager/ClerezzaRuleStore.java?rev=1744328&r1=1744327&r2=1744328&view=diff ============================================================================== --- stanbol/trunk/rules/manager/src/main/java/org/apache/stanbol/rules/manager/ClerezzaRuleStore.java (original) +++ stanbol/trunk/rules/manager/src/main/java/org/apache/stanbol/rules/manager/ClerezzaRuleStore.java Tue May 17 22:20:49 2016 @@ -31,16 +31,16 @@ import java.util.Dictionary; import java.util.Iterator; import java.util.List; -import org.apache.clerezza.rdf.core.Literal; -import org.apache.clerezza.rdf.core.Resource; -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.commons.rdf.Literal; +import org.apache.clerezza.commons.rdf.RDFTerm; +import org.apache.clerezza.commons.rdf.Triple; +import org.apache.clerezza.commons.rdf.Graph; +import org.apache.clerezza.commons.rdf.IRI; import org.apache.clerezza.rdf.core.access.EntityAlreadyExistsException; import org.apache.clerezza.rdf.core.access.NoSuchEntityException; import org.apache.clerezza.rdf.core.access.TcManager; -import org.apache.clerezza.rdf.core.impl.PlainLiteralImpl; -import org.apache.clerezza.rdf.core.impl.TripleImpl; +import org.apache.clerezza.commons.rdf.impl.utils.PlainLiteralImpl; +import org.apache.clerezza.commons.rdf.impl.utils.TripleImpl; import org.apache.clerezza.rdf.core.sparql.ParseException; import org.apache.clerezza.rdf.core.sparql.QueryParser; import org.apache.clerezza.rdf.core.sparql.ResultSet; @@ -48,7 +48,7 @@ import org.apache.clerezza.rdf.core.spar import org.apache.clerezza.rdf.core.sparql.query.Query; import org.apache.clerezza.rdf.core.sparql.query.SelectQuery; import org.apache.clerezza.rdf.ontologies.RDF; -import org.apache.clerezza.rdf.utils.UnionMGraph; +import org.apache.clerezza.rdf.utils.UnionGraph; import org.apache.felix.scr.annotations.Activate; import org.apache.felix.scr.annotations.Component; import org.apache.felix.scr.annotations.Deactivate; @@ -73,7 +73,7 @@ import org.slf4j.LoggerFactory; /** * This class provides an implementation of the {@link RuleStore} based on Clerezza.<br/> - * Recipe are managed as {@link TripleCollection} graphs. <br/> + * Recipe are managed as {@link Graph} graphs. <br/> * The vocabulary used in these graphs is provided by {@link Symbols}. * * @author elvio @@ -94,7 +94,7 @@ public class ClerezzaRuleStore implement @Property(name = RuleStore.RECIPE_INDEX_LOCATION, value = _RECIPE_INDEX_LOCATION_DEFAULT) private String recipeIndexLocation; - private List<UriRef> recipes; + private List<IRI> recipes; /** * This construct returns RuleStoreImpl object with inside an ontology where to store the rules. @@ -163,17 +163,17 @@ public class ClerezzaRuleStore implement else recipeIndexLocation = _RECIPE_INDEX_LOCATION_DEFAULT; } - recipes = new ArrayList<UriRef>(); + recipes = new ArrayList<IRI>(); - TripleCollection tripleCollection = null; + Graph tripleCollection = null; try { - tripleCollection = tcManager.getMGraph(new UriRef(recipeIndexLocation)); + tripleCollection = tcManager.getGraph(new IRI(recipeIndexLocation)); } catch (NoSuchEntityException e) { - tripleCollection = tcManager.createMGraph(new UriRef(recipeIndexLocation)); + tripleCollection = tcManager.createGraph(new IRI(recipeIndexLocation)); } for (Triple triple : tripleCollection) { - UriRef recipeID = (UriRef) triple.getSubject(); + IRI recipeID = (IRI) triple.getSubject(); recipes.add(recipeID); } @@ -184,27 +184,27 @@ public class ClerezzaRuleStore implement * Moved form AddRecipe class. The AddRecipe should not be used anymore. */ @Override - public Recipe createRecipe(UriRef recipeID, String recipeDescription) throws AlreadyExistingRecipeException { + public Recipe createRecipe(IRI recipeID, String recipeDescription) throws AlreadyExistingRecipeException { - TripleCollection tripleCollection; + Graph tripleCollection; try { - // create the MGraph in the TcManager - tripleCollection = tcManager.createMGraph(recipeID); + // create the Graph in the TcManager + tripleCollection = tcManager.createGraph(recipeID); } catch (EntityAlreadyExistsException e) { throw new AlreadyExistingRecipeException(e.getMessage()); } Triple recipeTriple = new TripleImpl(recipeID, RDF.type, Symbols.Recipe); - TripleCollection recipeIndexTripleCollection = tcManager.getMGraph(new UriRef(recipeIndexLocation)); - recipeIndexTripleCollection.add(recipeTriple); + Graph recipeIndexGraph = tcManager.getGraph(new IRI(recipeIndexLocation)); + recipeIndexGraph.add(recipeTriple); if (recipeDescription != null && !recipeDescription.isEmpty()) { Triple descriptionTriple = new TripleImpl(recipeID, Symbols.description, new PlainLiteralImpl( recipeDescription)); tripleCollection.add(descriptionTriple); - recipeIndexTripleCollection.add(descriptionTriple); + recipeIndexGraph.add(descriptionTriple); } // add the recpe ID to the list of known recipes @@ -227,9 +227,9 @@ public class ClerezzaRuleStore implement log.debug("Adding rule to recipe " + recipe); log.info("Rule : " + rule.toString()); - UriRef recipeID = recipe.getRecipeID(); + IRI recipeID = recipe.getRecipeID(); - TripleCollection tripleCollection = tcManager.getMGraph(recipeID); + Graph tripleCollection = tcManager.getGraph(recipeID); // add the rule object to the graph representation of the recipe by the TcManager tripleCollection.add(new TripleImpl(recipeID, Symbols.hasRule, rule.getRuleID())); @@ -270,7 +270,7 @@ public class ClerezzaRuleStore implement * * Parse the set of rules provided by the rulesStream parameter as Stanbol syntax rules and add them to * the Recipe in the store.<br/> - * The recipe is a {@link TripleCollection} managed by the {@link TcManager}. + * The recipe is a {@link Graph} managed by the {@link TcManager}. * * * @param recipe @@ -284,7 +284,7 @@ public class ClerezzaRuleStore implement public Recipe addRulesToRecipe(Recipe recipe, InputStream rulesStream, String description) { log.debug("Adding rule to recipe " + recipe); - UriRef recipeID = recipe.getRecipeID(); + IRI recipeID = recipe.getRecipeID(); String namespace = recipeID.toString().substring(1, recipeID.toString().length() - 1) + "/"; log.info("Rule Namespace is " + namespace); @@ -307,7 +307,7 @@ public class ClerezzaRuleStore implement @Override public Recipe addRulesToRecipe(Recipe recipe, String stanbolRule, String description) { - UriRef recipeID = recipe.getRecipeID(); + IRI recipeID = recipe.getRecipeID(); String namespace = recipeID.toString().substring(1, recipeID.toString().length() - 1) + "/"; RuleList ruleList = RuleParserImpl.parse(namespace, stanbolRule).getRuleList(); @@ -326,18 +326,18 @@ public class ClerezzaRuleStore implement } @Override - public Recipe getRecipe(UriRef recipeID) throws NoSuchRecipeException, RecipeConstructionException { + public Recipe getRecipe(IRI recipeID) throws NoSuchRecipeException, RecipeConstructionException { log.info("Called get recipe for id: " + recipeID); - TripleCollection recipeGraph = null; + Graph recipeGraph = null; /** * Throw a NoSuchRecipeException in case of the TcManager throws a NoSuchEntityException with respect - * to UriRef representing the recipe. + * to IRI representing the recipe. */ try { - recipeGraph = tcManager.getMGraph(recipeID); + recipeGraph = tcManager.getGraph(recipeID); } catch (NoSuchEntityException e) { throw new NoSuchRecipeException(recipeID.toString()); } @@ -365,9 +365,9 @@ public class ClerezzaRuleStore implement boolean firstIteration = true; while (resultSet.hasNext()) { SolutionMapping solutionMapping = resultSet.next(); - Resource nameResource = solutionMapping.get("ruleName"); - Resource bodyResource = solutionMapping.get("ruleBody"); - Resource headResource = solutionMapping.get("ruleHead"); + RDFTerm nameResource = solutionMapping.get("ruleName"); + RDFTerm bodyResource = solutionMapping.get("ruleBody"); + RDFTerm headResource = solutionMapping.get("ruleHead"); StringBuilder stanbolRuleBuilder = new StringBuilder(); stanbolRuleBuilder.append(((Literal) nameResource).getLexicalForm()); @@ -406,7 +406,7 @@ public class ClerezzaRuleStore implement } @Override - public List<UriRef> listRecipeIDs() { + public List<IRI> listRecipeIDs() { return recipes; } @@ -415,7 +415,7 @@ public class ClerezzaRuleStore implement public RecipeList listRecipes() throws NoSuchRecipeException, RecipeConstructionException { RecipeList recipeList = new RecipeList(); - for (UriRef recipeID : recipes) { + for (IRI recipeID : recipes) { Recipe recipe; try { recipe = getRecipe(recipeID); @@ -434,18 +434,18 @@ public class ClerezzaRuleStore implement } @Override - public boolean removeRecipe(UriRef recipeID) throws RecipeEliminationException { + public boolean removeRecipe(IRI recipeID) throws RecipeEliminationException { // remove the recipe from the TcManager try { - tcManager.deleteTripleCollection(recipeID); + tcManager.deleteGraph(recipeID); } catch (NoSuchEntityException e) { throw new RecipeEliminationException(e); } - TripleCollection recipeIndexTripleCollection = tcManager.getTriples(new UriRef(recipeIndexLocation)); + Graph recipeIndexGraph = tcManager.getGraph(new IRI(recipeIndexLocation)); Triple triple = new TripleImpl(recipeID, RDF.type, Symbols.Recipe); - recipeIndexTripleCollection.remove(triple); + recipeIndexGraph.remove(triple); // System.out.println("Recipes: " +recipes.size()); // remove the recipe ID from in-memory list @@ -464,7 +464,7 @@ public class ClerezzaRuleStore implement @Override public Recipe removeRule(Recipe recipe, Rule rule) { - TripleCollection tripleCollection = tcManager.getMGraph(recipe.getRecipeID()); + Graph tripleCollection = tcManager.getGraph(recipe.getRecipeID()); // remove from the graph recipe all the triples having the ruleID as subject. Iterator<Triple> triplesIterator = tripleCollection.filter(rule.getRuleID(), null, null); @@ -487,13 +487,13 @@ public class ClerezzaRuleStore implement } @Override - public Rule getRule(Recipe recipe, UriRef ruleID) throws NoSuchRuleInRecipeException { + public Rule getRule(Recipe recipe, IRI ruleID) throws NoSuchRuleInRecipeException { return recipe.getRule(ruleID); } @Override - public List<UriRef> listRuleIDs(Recipe recipe) { + public List<IRI> listRuleIDs(Recipe recipe) { return recipe.listRuleIDs(); } @@ -508,10 +508,10 @@ public class ClerezzaRuleStore implement } @Override - public TripleCollection exportRecipe(Recipe recipe) throws NoSuchRecipeException { + public Graph exportRecipe(Recipe recipe) throws NoSuchRecipeException { try { - return tcManager.getMGraph(recipe.getRecipeID()); + return tcManager.getGraph(recipe.getRecipeID()); } catch (NoSuchEntityException e) { throw new NoSuchRecipeException(recipe.toString()); } @@ -524,7 +524,7 @@ public class ClerezzaRuleStore implement + "?recipe " + Symbols.description + " ?description . " + "FILTER (regex(?description, \"" + term + "\", \"i\"))" + "}"; - TripleCollection tripleCollection = tcManager.getMGraph(new UriRef(recipeIndexLocation)); + Graph tripleCollection = tcManager.getGraph(new IRI(recipeIndexLocation)); RecipeList matchingRecipes = new RecipeList(); @@ -536,7 +536,7 @@ public class ClerezzaRuleStore implement while (resultSet.hasNext()) { SolutionMapping solutionMapping = resultSet.next(); - UriRef recipeID = (UriRef) solutionMapping.get("recipe"); + IRI recipeID = (IRI) solutionMapping.get("recipe"); try { Recipe recipe = getRecipe(recipeID); @@ -565,15 +565,15 @@ public class ClerezzaRuleStore implement + Symbols.description + " ?description . " + "FILTER (regex(?name, \"" + term + "\", \"i\"))" + "}"; - List<UriRef> recipeIDs = listRecipeIDs(); + List<IRI> recipeIDs = listRecipeIDs(); - TripleCollection[] tripleCollections = new TripleCollection[recipeIDs.size()]; + Graph[] tripleCollections = new Graph[recipeIDs.size()]; for (int i = 0; i < tripleCollections.length; i++) { - tripleCollections[i] = tcManager.getMGraph(recipeIDs.get(i)); + tripleCollections[i] = tcManager.getGraph(recipeIDs.get(i)); } - UnionMGraph unionMGraph = new UnionMGraph(tripleCollections); + UnionGraph unionGraph = new UnionGraph(tripleCollections); RuleList matchingRules = new RuleList(); @@ -581,12 +581,12 @@ public class ClerezzaRuleStore implement SelectQuery query = (SelectQuery) QueryParser.getInstance().parse(sparql); - ResultSet resultSet = tcManager.executeSparqlQuery(query, unionMGraph); + ResultSet resultSet = tcManager.executeSparqlQuery(query, unionGraph); while (resultSet.hasNext()) { SolutionMapping solutionMapping = resultSet.next(); - UriRef recipeID = (UriRef) solutionMapping.get("recipe"); - UriRef ruleID = (UriRef) solutionMapping.get("rule"); + IRI recipeID = (IRI) solutionMapping.get("recipe"); + IRI ruleID = (IRI) solutionMapping.get("rule"); Literal description = (Literal) solutionMapping.get("description"); try { @@ -619,15 +619,15 @@ public class ClerezzaRuleStore implement + " ?rule . " + "?rule " + Symbols.description + " ?description . " + "FILTER (regex(?description, \"" + term + "\", \"i\"))" + "}"; - List<UriRef> recipeIDs = listRecipeIDs(); + List<IRI> recipeIDs = listRecipeIDs(); - TripleCollection[] tripleCollections = new TripleCollection[recipeIDs.size()]; + Graph[] tripleCollections = new Graph[recipeIDs.size()]; for (int i = 0; i < tripleCollections.length; i++) { - tripleCollections[i] = tcManager.getMGraph(recipeIDs.get(i)); + tripleCollections[i] = tcManager.getGraph(recipeIDs.get(i)); } - UnionMGraph unionMGraph = new UnionMGraph(tripleCollections); + UnionGraph unionGraph = new UnionGraph(tripleCollections); RuleList matchingRules = new RuleList(); @@ -635,12 +635,12 @@ public class ClerezzaRuleStore implement SelectQuery query = (SelectQuery) QueryParser.getInstance().parse(sparql); - ResultSet resultSet = tcManager.executeSparqlQuery(query, unionMGraph); + ResultSet resultSet = tcManager.executeSparqlQuery(query, unionGraph); while (resultSet.hasNext()) { SolutionMapping solutionMapping = resultSet.next(); - UriRef recipeID = (UriRef) solutionMapping.get("recipe"); - UriRef ruleID = (UriRef) solutionMapping.get("rule"); + IRI recipeID = (IRI) solutionMapping.get("recipe"); + IRI ruleID = (IRI) solutionMapping.get("rule"); Literal description = (Literal) solutionMapping.get("description"); try { Modified: stanbol/trunk/rules/manager/src/main/java/org/apache/stanbol/rules/manager/RecipeImpl.java URL: http://svn.apache.org/viewvc/stanbol/trunk/rules/manager/src/main/java/org/apache/stanbol/rules/manager/RecipeImpl.java?rev=1744328&r1=1744327&r2=1744328&view=diff ============================================================================== --- stanbol/trunk/rules/manager/src/main/java/org/apache/stanbol/rules/manager/RecipeImpl.java (original) +++ stanbol/trunk/rules/manager/src/main/java/org/apache/stanbol/rules/manager/RecipeImpl.java Tue May 17 22:20:49 2016 @@ -19,7 +19,7 @@ package org.apache.stanbol.rules.manager 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.stanbol.rules.base.api.NoSuchRuleInRecipeException; import org.apache.stanbol.rules.base.api.Recipe; import org.apache.stanbol.rules.base.api.Rule; @@ -37,7 +37,7 @@ import com.hp.hpl.jena.rdf.model.Model; */ public class RecipeImpl implements Recipe { - private UriRef recipeID; + private IRI recipeID; private String recipeDescription; private RuleList ruleList = new RuleList(); @@ -48,7 +48,7 @@ public class RecipeImpl implements Recip * @param recipeDescription * @param ruleList */ - public RecipeImpl(UriRef recipeID, String recipeDescription, RuleList ruleList) { + public RecipeImpl(IRI recipeID, String recipeDescription, RuleList ruleList) { this.recipeID = recipeID; this.recipeDescription = recipeDescription; if ( ruleList != null ) { @@ -60,7 +60,7 @@ public class RecipeImpl implements Recip return ruleList; } - public UriRef getRecipeID() { + public IRI getRecipeID() { return recipeID; } @@ -137,7 +137,7 @@ public class RecipeImpl implements Recip } @Override - public Rule getRule(UriRef ruleID) throws NoSuchRuleInRecipeException { + public Rule getRule(IRI ruleID) throws NoSuchRuleInRecipeException { for (Rule rule : ruleList) { if (rule.getRuleID().toString().equals(ruleID.toString())) { return rule; @@ -155,8 +155,8 @@ public class RecipeImpl implements Recip } @Override - public List<UriRef> listRuleIDs() { - List<UriRef> ruleIDs = new ArrayList<UriRef>(); + public List<IRI> listRuleIDs() { + List<IRI> ruleIDs = new ArrayList<IRI>(); for (Rule rule : ruleList) { ruleIDs.add(rule.getRuleID()); Modified: stanbol/trunk/rules/manager/src/main/java/org/apache/stanbol/rules/manager/RecipeRule.java URL: http://svn.apache.org/viewvc/stanbol/trunk/rules/manager/src/main/java/org/apache/stanbol/rules/manager/RecipeRule.java?rev=1744328&r1=1744327&r2=1744328&view=diff ============================================================================== --- stanbol/trunk/rules/manager/src/main/java/org/apache/stanbol/rules/manager/RecipeRule.java (original) +++ stanbol/trunk/rules/manager/src/main/java/org/apache/stanbol/rules/manager/RecipeRule.java Tue May 17 22:20:49 2016 @@ -16,7 +16,7 @@ */ package org.apache.stanbol.rules.manager; -import org.apache.clerezza.rdf.core.UriRef; +import org.apache.clerezza.commons.rdf.IRI; import org.apache.stanbol.rules.base.api.Recipe; import org.apache.stanbol.rules.base.api.Rule; import org.apache.stanbol.rules.base.api.util.AtomList; @@ -30,7 +30,7 @@ import org.apache.stanbol.rules.base.api */ public class RecipeRule extends RuleImpl { - public RecipeRule(Recipe recipe, UriRef ruleID, String ruleName, AtomList body, AtomList head) { + public RecipeRule(Recipe recipe, IRI ruleID, String ruleName, AtomList body, AtomList head) { super(ruleID, ruleName, body, head); bindToRecipe(recipe); Modified: stanbol/trunk/rules/manager/src/main/java/org/apache/stanbol/rules/manager/RuleImpl.java URL: http://svn.apache.org/viewvc/stanbol/trunk/rules/manager/src/main/java/org/apache/stanbol/rules/manager/RuleImpl.java?rev=1744328&r1=1744327&r2=1744328&view=diff ============================================================================== --- stanbol/trunk/rules/manager/src/main/java/org/apache/stanbol/rules/manager/RuleImpl.java (original) +++ stanbol/trunk/rules/manager/src/main/java/org/apache/stanbol/rules/manager/RuleImpl.java Tue May 17 22:20:49 2016 @@ -16,7 +16,7 @@ */ package org.apache.stanbol.rules.manager; -import org.apache.clerezza.rdf.core.UriRef; +import org.apache.clerezza.commons.rdf.IRI; import org.apache.stanbol.rules.base.api.Recipe; import org.apache.stanbol.rules.base.api.Rule; import org.apache.stanbol.rules.base.api.RuleAtom; @@ -31,7 +31,7 @@ import org.apache.stanbol.rules.base.api */ public class RuleImpl implements Rule { - private UriRef ruleID; + private IRI ruleID; private String ruleName; private String rule; @@ -42,7 +42,7 @@ public class RuleImpl implements Rule { protected Recipe recipe; protected String description; - public RuleImpl(UriRef ruleID, String ruleName, AtomList body, AtomList head) { + public RuleImpl(IRI ruleID, String ruleName, AtomList body, AtomList head) { this.ruleID = ruleID; this.ruleName = ruleName; this.head = head; @@ -154,7 +154,7 @@ public class RuleImpl implements Rule { } @Override - public UriRef getRuleID() { + public IRI getRuleID() { return ruleID; } Modified: stanbol/trunk/rules/manager/src/main/java/org/apache/stanbol/rules/manager/parse/RuleGrammar.jj URL: http://svn.apache.org/viewvc/stanbol/trunk/rules/manager/src/main/java/org/apache/stanbol/rules/manager/parse/RuleGrammar.jj?rev=1744328&r1=1744327&r2=1744328&view=diff ============================================================================== --- stanbol/trunk/rules/manager/src/main/java/org/apache/stanbol/rules/manager/parse/RuleGrammar.jj (original) +++ stanbol/trunk/rules/manager/src/main/java/org/apache/stanbol/rules/manager/parse/RuleGrammar.jj Tue May 17 22:20:49 2016 @@ -30,7 +30,7 @@ import java.io.StringReader; import java.net.URI; import java.net.URISyntaxException; -import org.apache.clerezza.rdf.core.UriRef; +import org.apache.clerezza.commons.rdf.IRI; import org.apache.stanbol.rules.base.api.Rule; import org.apache.stanbol.rules.base.api.RuleAtom; import org.apache.stanbol.rules.base.api.util.AtomList; @@ -82,7 +82,7 @@ import org.apache.stanbol.rules.manager. import org.apache.stanbol.rules.manager.atoms.VariableAtom; import com.hp.hpl.jena.rdf.model.ModelFactory; -import com.hp.hpl.jena.rdf.model.Resource; +import com.hp.hpl.jena.rdf.model.RDFTerm; /** * @@ -130,7 +130,7 @@ public class RuleParserImpl private static URI getSWRLArgument(String argument){ - Resource rdfNode = null; + RDFTerm rdfNode = null; String[] argumentComposition = argument.split(":"); if(argumentComposition.length == 2){ String prefix = argumentComposition[0]; @@ -151,7 +151,7 @@ public class RuleParserImpl } private static URI getSWRLVariable(String argument){ - Resource variableResource = null; + RDFTerm variableResource = null; String variableString = argument.substring(1); @@ -288,7 +288,7 @@ void prefix() : } else{ - rule = new RuleImpl(new UriRef(ruleStorePrefix+nsPrefix), nsPrefix, atoms[0], atoms[1]); + rule = new RuleImpl(new IRI(ruleStorePrefix+nsPrefix), nsPrefix, atoms[0], atoms[1]); kb.addRule(rule); } } Modified: stanbol/trunk/rules/manager/src/main/java/org/apache/stanbol/rules/manager/parse/RuleParserImpl.java URL: http://svn.apache.org/viewvc/stanbol/trunk/rules/manager/src/main/java/org/apache/stanbol/rules/manager/parse/RuleParserImpl.java?rev=1744328&r1=1744327&r2=1744328&view=diff ============================================================================== --- stanbol/trunk/rules/manager/src/main/java/org/apache/stanbol/rules/manager/parse/RuleParserImpl.java (original) +++ stanbol/trunk/rules/manager/src/main/java/org/apache/stanbol/rules/manager/parse/RuleParserImpl.java Tue May 17 22:20:49 2016 @@ -8,7 +8,7 @@ import java.io.StringReader; import java.net.URI; import java.net.URISyntaxException; -import org.apache.clerezza.rdf.core.UriRef; +import org.apache.clerezza.commons.rdf.IRI; import org.apache.stanbol.rules.base.api.Rule; import org.apache.stanbol.rules.base.api.RuleAtom; import org.apache.stanbol.rules.base.api.util.AtomList; @@ -192,7 +192,7 @@ public class RuleParserImpl implements R } else{ - rule = new RuleImpl(new UriRef(ruleStorePrefix+nsPrefix), nsPrefix, atoms[0], atoms[1]); + rule = new RuleImpl(new IRI(ruleStorePrefix+nsPrefix), nsPrefix, atoms[0], atoms[1]); kb.addRule(rule); } break; Modified: stanbol/trunk/rules/manager/src/main/java/org/apache/stanbol/rules/manager/parse/RuleParserImplTokenManager.java URL: http://svn.apache.org/viewvc/stanbol/trunk/rules/manager/src/main/java/org/apache/stanbol/rules/manager/parse/RuleParserImplTokenManager.java?rev=1744328&r1=1744327&r2=1744328&view=diff ============================================================================== --- stanbol/trunk/rules/manager/src/main/java/org/apache/stanbol/rules/manager/parse/RuleParserImplTokenManager.java (original) +++ stanbol/trunk/rules/manager/src/main/java/org/apache/stanbol/rules/manager/parse/RuleParserImplTokenManager.java Tue May 17 22:20:49 2016 @@ -6,7 +6,7 @@ import java.io.Reader; import java.io.StringReader; import java.net.URI; import java.net.URISyntaxException; -import org.apache.clerezza.rdf.core.UriRef; +import org.apache.clerezza.commons.rdf.IRI; import org.apache.stanbol.rules.base.api.Rule; import org.apache.stanbol.rules.base.api.RuleAtom; import org.apache.stanbol.rules.base.api.util.AtomList; Modified: stanbol/trunk/rules/manager/src/test/java/org/apache/stanbol/rules/manager/RuleStoreTest.java URL: http://svn.apache.org/viewvc/stanbol/trunk/rules/manager/src/test/java/org/apache/stanbol/rules/manager/RuleStoreTest.java?rev=1744328&r1=1744327&r2=1744328&view=diff ============================================================================== --- stanbol/trunk/rules/manager/src/test/java/org/apache/stanbol/rules/manager/RuleStoreTest.java (original) +++ stanbol/trunk/rules/manager/src/test/java/org/apache/stanbol/rules/manager/RuleStoreTest.java Tue May 17 22:20:49 2016 @@ -25,7 +25,7 @@ import java.util.Dictionary; import java.util.Hashtable; import java.util.List; -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.QueryEngine; @@ -59,7 +59,7 @@ public class RuleStoreTest { @BeforeClass public static void setUpClass() throws Exception { - class SpecialTcManager extends TcManager { + /*class SpecialTcManager extends TcManager { public SpecialTcManager(QueryEngine qe, WeightedTcProvider wtcp) { super(); bindQueryEngine(qe); @@ -68,8 +68,8 @@ public class RuleStoreTest { } QueryEngine qe = new JenaSparqlEngine(); - WeightedTcProvider wtcp = new SimpleTcProvider(); - TcManager tcm = new SpecialTcManager(qe, wtcp); + WeightedTcProvider wtcp = new SimpleTcProvider();*/ + TcManager tcm = TcManager.getInstance();//new SpecialTcManager(qe, wtcp); Dictionary<String,Object> configuration = new Hashtable<String,Object>(); store = new ClerezzaRuleStore(configuration, tcm); @@ -114,7 +114,7 @@ public class RuleStoreTest { } private void createRecipeTest() throws Exception { - Recipe recipe = store.createRecipe(new UriRef( + Recipe recipe = store.createRecipe(new IRI( "http://incubator.apache.com/stanbol/rules/test/recipeA";), "The text recipe named A."); if (recipe == null) { @@ -126,7 +126,7 @@ public class RuleStoreTest { } private void addRuleToRecipeTest() throws Exception { - Recipe recipe = store.getRecipe(new UriRef("http://incubator.apache.com/stanbol/rules/test/recipeA";)); + Recipe recipe = store.getRecipe(new IRI("http://incubator.apache.com/stanbol/rules/test/recipeA";)); String separator = System.getProperty("line.separator"); String rule = "rule1[" + separator + " is(<http://dbpedia.org/ontology/Person>, ?x) . " + separator @@ -149,7 +149,7 @@ public class RuleStoreTest { } private void getRecipeTest() throws Exception { - Recipe recipe = store.getRecipe(new UriRef("http://incubator.apache.com/stanbol/rules/test/recipeA";)); + Recipe recipe = store.getRecipe(new IRI("http://incubator.apache.com/stanbol/rules/test/recipeA";)); if (recipe == null) { Assert.fail(); @@ -162,7 +162,7 @@ public class RuleStoreTest { } private void getNotExistingRuleByNameInRecipeTest() throws Exception { - Recipe recipe = store.getRecipe(new UriRef("http://incubator.apache.com/stanbol/rules/test/recipeA";)); + Recipe recipe = store.getRecipe(new IRI("http://incubator.apache.com/stanbol/rules/test/recipeA";)); try { recipe.getRule("ruleX"); @@ -174,10 +174,10 @@ public class RuleStoreTest { } private void getNotExistingRuleByIdInRecipeTest() throws Exception { - Recipe recipe = store.getRecipe(new UriRef("http://incubator.apache.com/stanbol/rules/test/recipeA";)); + Recipe recipe = store.getRecipe(new IRI("http://incubator.apache.com/stanbol/rules/test/recipeA";)); try { - recipe.getRule(new UriRef("http://foo.org/ruleX";)); + recipe.getRule(new IRI("http://foo.org/ruleX";)); Assert.fail(); } catch (NoSuchRuleInRecipeException e) { Assert.assertTrue(true); @@ -186,7 +186,7 @@ public class RuleStoreTest { } private void getExistingRuleByIdInRecipeTest() throws Exception { - Recipe recipe = store.getRecipe(new UriRef("http://incubator.apache.com/stanbol/rules/test/recipeA";)); + Recipe recipe = store.getRecipe(new IRI("http://incubator.apache.com/stanbol/rules/test/recipeA";)); try { Rule rule = recipe.getRule(recipe.listRuleIDs().get(0)); @@ -198,7 +198,7 @@ public class RuleStoreTest { } private void getExistingRuleByNameInRecipeTest() throws Exception { - Recipe recipe = store.getRecipe(new UriRef("http://incubator.apache.com/stanbol/rules/test/recipeA";)); + Recipe recipe = store.getRecipe(new IRI("http://incubator.apache.com/stanbol/rules/test/recipeA";)); try { Rule rule = recipe.getRule(recipe.listRuleNames().get(0)); @@ -239,7 +239,7 @@ public class RuleStoreTest { } private void removeRuleInRecipeTest() throws Exception { - Recipe recipe = store.getRecipe(new UriRef("http://incubator.apache.com/stanbol/rules/test/recipeA";)); + Recipe recipe = store.getRecipe(new IRI("http://incubator.apache.com/stanbol/rules/test/recipeA";)); String tmp = recipe.toString(); Rule rule = recipe.getRule(recipe.listRuleNames().get(0)); @@ -247,7 +247,7 @@ public class RuleStoreTest { store.removeRule(recipe, rule); Recipe recipe2 = store - .getRecipe(new UriRef("http://incubator.apache.com/stanbol/rules/test/recipeA";)); + .getRecipe(new IRI("http://incubator.apache.com/stanbol/rules/test/recipeA";)); String tmp2 = recipe2.toString(); @@ -261,7 +261,7 @@ public class RuleStoreTest { Recipe[] initialRecipes = new Recipe[recipeListInitial.size()]; initialRecipes = recipeListInitial.toArray(initialRecipes); - Recipe recipe = store.getRecipe(new UriRef("http://incubator.apache.com/stanbol/rules/test/recipeA";)); + Recipe recipe = store.getRecipe(new IRI("http://incubator.apache.com/stanbol/rules/test/recipeA";)); store.removeRecipe(recipe); RecipeList recipeListFinal = store.listRecipes(); Modified: stanbol/trunk/rules/refactor/src/main/java/org/apache/stanbol/rules/refactor/api/Refactorer.java URL: http://svn.apache.org/viewvc/stanbol/trunk/rules/refactor/src/main/java/org/apache/stanbol/rules/refactor/api/Refactorer.java?rev=1744328&r1=1744327&r2=1744328&view=diff ============================================================================== --- stanbol/trunk/rules/refactor/src/main/java/org/apache/stanbol/rules/refactor/api/Refactorer.java (original) +++ stanbol/trunk/rules/refactor/src/main/java/org/apache/stanbol/rules/refactor/api/Refactorer.java Tue May 17 22:20:49 2016 @@ -16,9 +16,9 @@ */ package org.apache.stanbol.rules.refactor.api; -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.Graph; +import org.apache.clerezza.commons.rdf.Graph; +import org.apache.clerezza.commons.rdf.IRI; import org.apache.stanbol.rules.base.api.NoSuchRecipeException; import org.apache.stanbol.rules.base.api.Recipe; import org.apache.stanbol.rules.base.api.RuleStore; @@ -36,10 +36,10 @@ public interface Refactorer { * Fetch the mgraph with the selected uri from the storage. * * @param uriRef - * {@link UriRef} - * @return the {@link MGraph}. + * {@link IRI} + * @return the {@link Graph}. */ - MGraph getRefactoredDataSet(UriRef uriRef); + Graph getRefactoredDataSet(IRI uriRef); /** * The refactoring is perfomed by the {@code Refactorer} by invoking this method. The {@code datasetID} @@ -48,13 +48,13 @@ public interface Refactorer { * {@link RuleStore}, * * @param refactoredDataSetID - * {@link UriRef} + * {@link IRI} * @param datasetID - * {@link UriRef} + * {@link IRI} * @param recipeIRI - * {@link UriRef} + * {@link IRI} */ - void graphRefactoring(UriRef refactoredOntologyID, UriRef datasetID, UriRef recipeID) throws RefactoringException, + void graphRefactoring(IRI refactoredOntologyID, IRI datasetID, IRI recipeID) throws RefactoringException, NoSuchRecipeException; /** @@ -63,14 +63,14 @@ public interface Refactorer { * graph in order to obtain the refactoring. * * @param datasetURI - * {@link UriRef} + * {@link IRI} * @param recipe - * {@link UriRef} - * @return the refactored {@link MGraph} + * {@link IRI} + * @return the refactored {@link Graph} * @throws RefactoringException * @throws NoSuchRecipeException */ - TripleCollection graphRefactoring(UriRef datasetID, UriRef recipeID) throws RefactoringException, + Graph graphRefactoring(IRI datasetID, IRI recipeID) throws RefactoringException, NoSuchRecipeException; /** @@ -79,13 +79,13 @@ public interface Refactorer { * graph in order to obtain the refactoring. * * @param datasetID - * {@link TripleCollection} + * {@link Graph} * @param recipe * {@link Recipe} - * @return the refactored {@link TripleCollection} + * @return the refactored {@link Graph} * @throws SemionRefactoringException * @throws NoSuchRecipeException */ - TripleCollection graphRefactoring(TripleCollection dataset, Recipe recipe) throws RefactoringException; + Graph graphRefactoring(Graph dataset, Recipe recipe) throws RefactoringException; } Modified: stanbol/trunk/rules/refactor/src/main/java/org/apache/stanbol/rules/refactor/impl/RefactorerImpl.java URL: http://svn.apache.org/viewvc/stanbol/trunk/rules/refactor/src/main/java/org/apache/stanbol/rules/refactor/impl/RefactorerImpl.java?rev=1744328&r1=1744327&r2=1744328&view=diff ============================================================================== --- stanbol/trunk/rules/refactor/src/main/java/org/apache/stanbol/rules/refactor/impl/RefactorerImpl.java (original) +++ stanbol/trunk/rules/refactor/src/main/java/org/apache/stanbol/rules/refactor/impl/RefactorerImpl.java Tue May 17 22:20:49 2016 @@ -20,13 +20,13 @@ import java.io.IOException; import java.util.Dictionary; import java.util.List; -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.WeightedTcProvider; -import org.apache.clerezza.rdf.core.impl.SimpleMGraph; +import org.apache.clerezza.commons.rdf.impl.utils.simple.SimpleGraph; import org.apache.clerezza.rdf.core.sparql.query.ConstructQuery; import org.apache.felix.scr.annotations.Activate; import org.apache.felix.scr.annotations.Component; @@ -154,9 +154,9 @@ public class RefactorerImpl implements R } @Override - public MGraph getRefactoredDataSet(UriRef uriRef) { + public Graph getRefactoredDataSet(IRI uriRef) { - return weightedTcProvider.getMGraph(uriRef); + return weightedTcProvider.getGraph(uriRef); } /** @@ -166,14 +166,14 @@ public class RefactorerImpl implements R * @param datasetID * @return */ - private Graph sparqlConstruct(ConstructQuery constructQuery, UriRef datasetID) { + private ImmutableGraph sparqlConstruct(ConstructQuery constructQuery, IRI datasetID) { - MGraph graph = weightedTcProvider.getMGraph(datasetID); + Graph graph = weightedTcProvider.getGraph(datasetID); return sparqlConstruct(constructQuery, graph); } - private Graph sparqlConstruct(ConstructQuery constructQuery, TripleCollection tripleCollection) { + private ImmutableGraph sparqlConstruct(ConstructQuery constructQuery, Graph tripleCollection) { return tcManager.executeSparqlQuery(constructQuery, tripleCollection); @@ -181,7 +181,7 @@ public class RefactorerImpl implements R @SuppressWarnings("unchecked") @Override - public void graphRefactoring(UriRef refactoredOntologyID, UriRef datasetID, UriRef recipeID) throws RefactoringException, + public void graphRefactoring(IRI refactoredOntologyID, IRI datasetID, IRI recipeID) throws RefactoringException, NoSuchRecipeException { Recipe recipe; @@ -193,7 +193,7 @@ public class RefactorerImpl implements R List<ConstructQuery> constructQueries = (List<ConstructQuery>) ruleAdapter.adaptTo(recipe, ConstructQuery.class); - MGraph mGraph = tcManager.createMGraph(refactoredOntologyID); + Graph mGraph = tcManager.createGraph(refactoredOntologyID); for (ConstructQuery constructQuery : constructQueries) { mGraph.addAll(this.sparqlConstruct(constructQuery, datasetID)); } @@ -219,9 +219,9 @@ public class RefactorerImpl implements R @SuppressWarnings("unchecked") @Override - public TripleCollection graphRefactoring(UriRef graphID, UriRef recipeID) throws RefactoringException, + public Graph graphRefactoring(IRI graphID, IRI recipeID) throws RefactoringException, NoSuchRecipeException { - MGraph unionMGraph = null; + Graph unionGraph = null; // JenaToOwlConvert jenaToOwlConvert = new JenaToOwlConvert(); @@ -237,10 +237,10 @@ public class RefactorerImpl implements R List<ConstructQuery> constructQueries = (List<ConstructQuery>) ruleAdapter.adaptTo(recipe, ConstructQuery.class); - unionMGraph = new SimpleMGraph(); + unionGraph = new SimpleGraph(); for (ConstructQuery constructQuery : constructQueries) { - unionMGraph.addAll(this.sparqlConstruct(constructQuery, graphID)); + unionGraph.addAll(this.sparqlConstruct(constructQuery, graphID)); } } catch (NoSuchRecipeException e1) { @@ -256,13 +256,13 @@ public class RefactorerImpl implements R throw new RefactoringException("The cause of the refactoring excpetion is: " + e.getMessage(), e); } - return unionMGraph.getGraph(); + return unionGraph.getImmutableGraph(); } @SuppressWarnings("unchecked") @Override - public TripleCollection graphRefactoring(TripleCollection inputGraph, Recipe recipe) throws RefactoringException { + public Graph graphRefactoring(Graph inputGraph, Recipe recipe) throws RefactoringException { RuleAdapter ruleAdapter; try { @@ -274,12 +274,12 @@ public class RefactorerImpl implements R System.out.println(constructQuery.toString()); } - MGraph unionMGraph = new SimpleMGraph(); + Graph unionGraph = new SimpleGraph(); for (ConstructQuery constructQuery : constructQueries) { - unionMGraph.addAll(sparqlConstruct(constructQuery, inputGraph)); + unionGraph.addAll(sparqlConstruct(constructQuery, inputGraph)); } - return unionMGraph; + return unionGraph; } catch (UnavailableRuleObjectException e) { throw new RefactoringException("The cause of the refactoring excpetion is: " + e.getMessage(), e); } catch (UnsupportedTypeForExportException e) { Modified: stanbol/trunk/rules/refactor/src/test/java/org/apache/stanbol/rules/refactor/RefactoringTest.java URL: http://svn.apache.org/viewvc/stanbol/trunk/rules/refactor/src/test/java/org/apache/stanbol/rules/refactor/RefactoringTest.java?rev=1744328&r1=1744327&r2=1744328&view=diff ============================================================================== --- stanbol/trunk/rules/refactor/src/test/java/org/apache/stanbol/rules/refactor/RefactoringTest.java (original) +++ stanbol/trunk/rules/refactor/src/test/java/org/apache/stanbol/rules/refactor/RefactoringTest.java Tue May 17 22:20:49 2016 @@ -25,9 +25,9 @@ import java.util.Hashtable; import junit.framework.Assert; -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.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.WeightedTcProvider; import org.apache.clerezza.rdf.core.sparql.QueryEngine; @@ -69,7 +69,7 @@ public class RefactoringTest { private static Refactorer refactorer; private static TcManager tcm; private static RuleStore store; - private TripleCollection tripleCollection; + private Graph tripleCollection; private String rule; @BeforeClass @@ -125,15 +125,15 @@ public class RefactoringTest { Model jenaModel = ModelFactory.createDefaultModel(); jenaModel = jenaModel.read(inputStream, null); - tripleCollection = JenaToClerezzaConverter.jenaModelToClerezzaMGraph(jenaModel); + tripleCollection = JenaToClerezzaConverter.jenaModelToClerezzaGraph(jenaModel); - MGraph mGraph = tcm.createMGraph(new UriRef( + Graph mGraph = tcm.createGraph(new IRI( "http://incubator.apache.com/stanbol/rules/refactor/test/graph";)); mGraph.addAll(tripleCollection); Recipe recipe; try { - recipe = store.createRecipe(new UriRef( + recipe = store.createRecipe(new IRI( "http://incubator.apache.com/stanbol/rules/refactor/test/recipeA";), "Recipe for testing the Refactor."); recipe = store.addRulesToRecipe(recipe, rule, "Test"); @@ -145,10 +145,10 @@ public class RefactoringTest { @After public void tearDown() { - tcm.deleteTripleCollection(new UriRef("http://incubator.apache.com/stanbol/rules/refactor/test/graph";)); + tcm.deleteGraph(new IRI("http://incubator.apache.com/stanbol/rules/refactor/test/graph";)); try { - store.removeRecipe(new UriRef("http://incubator.apache.com/stanbol/rules/refactor/test/recipeA";)); + store.removeRecipe(new IRI("http://incubator.apache.com/stanbol/rules/refactor/test/recipeA";)); } catch (RecipeEliminationException e) { Assert.fail(e.getMessage()); } @@ -157,10 +157,10 @@ public class RefactoringTest { @Test public void refactoringTest() throws Exception { - Recipe recipe = store.getRecipe(new UriRef( + Recipe recipe = store.getRecipe(new IRI( "http://incubator.apache.com/stanbol/rules/refactor/test/recipeA";)); - TripleCollection tc = refactorer.graphRefactoring(new UriRef( + Graph tc = refactorer.graphRefactoring(new IRI( "http://incubator.apache.com/stanbol/rules/refactor/test/graph";), recipe.getRecipeID()); Assert.assertNotNull(tc); @@ -170,11 +170,11 @@ public class RefactoringTest { @Test public void easyRefactoringTest() throws Exception { - Recipe recipe = store.getRecipe(new UriRef( + Recipe recipe = store.getRecipe(new IRI( "http://incubator.apache.com/stanbol/rules/refactor/test/recipeA";)); try { - TripleCollection tc = refactorer.graphRefactoring(tripleCollection, recipe); + Graph tc = refactorer.graphRefactoring(tripleCollection, recipe); Assert.assertNotNull(tc); @@ -188,9 +188,9 @@ public class RefactoringTest { try { - refactorer.graphRefactoring(new UriRef( - "http://incubator.apache.com/stanbol/rules/refactor/test/refactoredGraph";), new UriRef( - "http://incubator.apache.com/stanbol/rules/refactor/test/graph";), new UriRef( + refactorer.graphRefactoring(new IRI( + "http://incubator.apache.com/stanbol/rules/refactor/test/refactoredGraph";), new IRI( + "http://incubator.apache.com/stanbol/rules/refactor/test/graph";), new IRI( "http://incubator.apache.com/stanbol/rules/refactor/test/recipeB";)); Assert.fail(); @@ -210,14 +210,14 @@ public class RefactoringTest { + "rule2[ is(kres:Person, ?x) . same(localname(?y), \"text\") -> is(foaf:Person, ?x) ]"; try { - Recipe recipe = store.getRecipe(new UriRef( + Recipe recipe = store.getRecipe(new IRI( "http://incubator.apache.com/stanbol/rules/refactor/test/recipeA";)); recipe = store.addRulesToRecipe(recipe, rule, "Test"); - refactorer.graphRefactoring(new UriRef( - "http://incubator.apache.com/stanbol/rules/refactor/test/refactoredGraph";), new UriRef( - "http://incubator.apache.com/stanbol/rules/refactor/test/graph";), new UriRef( + refactorer.graphRefactoring(new IRI( + "http://incubator.apache.com/stanbol/rules/refactor/test/refactoredGraph";), new IRI( + "http://incubator.apache.com/stanbol/rules/refactor/test/graph";), new IRI( "http://incubator.apache.com/stanbol/rules/refactor/test/recipeA";)); } catch (NoSuchRecipeException e) { @@ -235,12 +235,12 @@ public class RefactoringTest { try { - refactorer.graphRefactoring(new UriRef( - "http://incubator.apache.com/stanbol/rules/refactor/test/refactoredGraph";), new UriRef( - "http://incubator.apache.com/stanbol/rules/refactor/test/graph";), new UriRef( + refactorer.graphRefactoring(new IRI( + "http://incubator.apache.com/stanbol/rules/refactor/test/refactoredGraph";), new IRI( + "http://incubator.apache.com/stanbol/rules/refactor/test/graph";), new IRI( "http://incubator.apache.com/stanbol/rules/refactor/test/recipeA";)); - TripleCollection tc = tcm.getMGraph(new UriRef( + Graph tc = tcm.getGraph(new IRI( "http://incubator.apache.com/stanbol/rules/refactor/test/refactoredGraph";)); Assert.assertNotNull(tc); Modified: stanbol/trunk/rules/web/src/main/java/org/apache/stanbol/rules/web/resources/RefactorResource.java URL: http://svn.apache.org/viewvc/stanbol/trunk/rules/web/src/main/java/org/apache/stanbol/rules/web/resources/RefactorResource.java?rev=1744328&r1=1744327&r2=1744328&view=diff ============================================================================== --- stanbol/trunk/rules/web/src/main/java/org/apache/stanbol/rules/web/resources/RefactorResource.java (original) +++ stanbol/trunk/rules/web/src/main/java/org/apache/stanbol/rules/web/resources/RefactorResource.java Tue May 17 22:20:49 2016 @@ -54,8 +54,8 @@ import javax.ws.rs.core.Response.Respons //import javax.ws.rs.core.Response.Status; import org.apache.clerezza.jaxrs.utils.form.MultiPartBody; -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.felix.scr.annotations.Component; import org.apache.felix.scr.annotations.Property; import org.apache.felix.scr.annotations.Reference; @@ -231,8 +231,8 @@ public class RefactorResource extends Ba OWLOntologyManager manager = OWLManager.createOWLOntologyManager(); OWLOntology inputOntology = manager.loadOntologyFromOntologyDocument(input); - TripleCollection tripleCollection = refactorer.graphRefactoring( - OWLAPIToClerezzaConverter.owlOntologyToClerezzaMGraph(inputOntology), actualRecipe); + Graph tripleCollection = refactorer.graphRefactoring( + OWLAPIToClerezzaConverter.owlOntologyToClerezzaGraph(inputOntology), actualRecipe); // Refactor return OWLAPIToClerezzaConverter.clerezzaGraphToOWLOntology(tripleCollection); } @@ -291,14 +291,14 @@ public class RefactorResource extends Ba log.info("The recipe ID is a URI without scheme. The ID is set to " + recipe); } - UriRef recipeID = new UriRef(recipe); + IRI recipeID = new IRI(recipe); rcp = ruleStore.getRecipe(recipeID); OWLOntologyManager manager = OWLManager.createOWLOntologyManager(); OWLOntology inputOntology = manager.loadOntologyFromOntologyDocument(input); - TripleCollection tripleCollection = refactorer.graphRefactoring( - OWLAPIToClerezzaConverter.owlOntologyToClerezzaMGraph(inputOntology), rcp); + Graph tripleCollection = refactorer.graphRefactoring( + OWLAPIToClerezzaConverter.owlOntologyToClerezzaGraph(inputOntology), rcp); OWLOntology outputOntology = OWLAPIToClerezzaConverter .clerezzaGraphToOWLOntology(tripleCollection); rb = Response.ok(outputOntology); @@ -334,9 +334,9 @@ public class RefactorResource extends Ba log.info("recipe: {}", recipe); log.info("input-graph: {}", inputGraph); log.info("output-graph: {}", outputGraph); - UriRef recipeID = new UriRef(recipe); - UriRef inputGraphID = new UriRef(inputGraph); - UriRef outputGraphID = new UriRef(outputGraph); + IRI recipeID = new IRI(recipe); + IRI inputGraphID = new IRI(inputGraph); + IRI outputGraphID = new IRI(outputGraph); // Refactorer semionRefactorer = semionManager.getRegisteredRefactorer(); Modified: stanbol/trunk/rules/web/src/main/java/org/apache/stanbol/rules/web/resources/RulesResource.java URL: http://svn.apache.org/viewvc/stanbol/trunk/rules/web/src/main/java/org/apache/stanbol/rules/web/resources/RulesResource.java?rev=1744328&r1=1744327&r2=1744328&view=diff ============================================================================== --- stanbol/trunk/rules/web/src/main/java/org/apache/stanbol/rules/web/resources/RulesResource.java (original) +++ stanbol/trunk/rules/web/src/main/java/org/apache/stanbol/rules/web/resources/RulesResource.java Tue May 17 22:20:49 2016 @@ -52,7 +52,7 @@ import javax.ws.rs.core.Response.Respons import javax.ws.rs.core.Response.Status; import org.apache.clerezza.jaxrs.utils.form.MultiPartBody; -import org.apache.clerezza.rdf.core.UriRef; +import org.apache.clerezza.commons.rdf.IRI; import org.apache.felix.scr.annotations.Component; import org.apache.felix.scr.annotations.Property; import org.apache.felix.scr.annotations.Reference; @@ -232,10 +232,10 @@ public class RulesResource extends BaseS log.info("The recipe ID is a URI without scheme. The ID is set to " + recipeID); } - recipe = ruleStore.getRecipe(new UriRef(recipeID)); + recipe = ruleStore.getRecipe(new IRI(recipeID)); if (ruleID != null && !ruleID.isEmpty()) { - rule = ruleStore.getRule(recipe, new UriRef(ruleID)); + rule = ruleStore.getRule(recipe, new IRI(ruleID)); RuleList ruleList = new RuleList(); ruleList.add(rule); @@ -281,10 +281,10 @@ public class RulesResource extends BaseS log.info("The recipe ID is a URI without scheme. The ID is set to " + recipeID); } - recipe = ruleStore.getRecipe(new UriRef(recipeID)); + recipe = ruleStore.getRecipe(new IRI(recipeID)); if (ruleID != null && !ruleID.isEmpty()) { - rule = ruleStore.getRule(recipe, new UriRef(ruleID)); + rule = ruleStore.getRule(recipe, new IRI(ruleID)); RuleList ruleList = new RuleList(); ruleList.add(rule); @@ -343,7 +343,7 @@ public class RulesResource extends BaseS recipeID = "urn:" + recipeID; log.info("The recipe ID is a URI without scheme. The ID is set to " + recipeID); } - ruleStore.createRecipe(new UriRef(recipeID), description); + ruleStore.createRecipe(new IRI(recipeID), description); responseBuilder = Response.ok(); } catch (AlreadyExistingRecipeException e) { @@ -435,8 +435,8 @@ public class RulesResource extends BaseS Recipe rcp; try { - rcp = ruleStore.getRecipe(new UriRef(recipe)); - Rule rl = ruleStore.getRule(rcp, new UriRef(rule)); + rcp = ruleStore.getRecipe(new IRI(recipe)); + Rule rl = ruleStore.getRule(rcp, new IRI(rule)); ruleStore.removeRule(rcp, rl); } catch (NoSuchRecipeException e) { log.error(e.getMessage(), e); @@ -451,7 +451,7 @@ public class RulesResource extends BaseS } else { try { - ruleStore.removeRecipe(new UriRef(recipe)); + ruleStore.removeRecipe(new IRI(recipe)); } catch (RecipeEliminationException e) { log.error(e.getMessage(), e); responseBuilder = Response.status(Status.INTERNAL_SERVER_ERROR); @@ -515,7 +515,7 @@ public class RulesResource extends BaseS log.info("The recipe ID is a URI without scheme. The ID is set to " + recipe); } - rcp = ruleStore.getRecipe(new UriRef(recipe)); + rcp = ruleStore.getRecipe(new IRI(recipe)); ruleStore.addRulesToRecipe(rcp, rules, description); responseBuilder = Response.ok(); @@ -576,7 +576,7 @@ public class RulesResource extends BaseS log.info("The recipe ID is a URI without scheme. The ID is set to " + recipe); } - Recipe rcp = ruleStore.getRecipe(new UriRef(recipe)); + Recipe rcp = ruleStore.getRecipe(new IRI(recipe)); RuleAdapter adapter = adapterManager.getAdapter(rcp, classToLoad); Object adaptedRecipe = adapter.adaptTo(rcp, classToLoad); Modified: stanbol/trunk/rules/web/src/main/java/org/apache/stanbol/rules/web/writers/RecipeListWriter.java URL: http://svn.apache.org/viewvc/stanbol/trunk/rules/web/src/main/java/org/apache/stanbol/rules/web/writers/RecipeListWriter.java?rev=1744328&r1=1744327&r2=1744328&view=diff ============================================================================== --- stanbol/trunk/rules/web/src/main/java/org/apache/stanbol/rules/web/writers/RecipeListWriter.java (original) +++ stanbol/trunk/rules/web/src/main/java/org/apache/stanbol/rules/web/writers/RecipeListWriter.java Tue May 17 22:20:49 2016 @@ -31,7 +31,7 @@ import javax.ws.rs.core.MultivaluedMap; import javax.ws.rs.ext.MessageBodyWriter; import javax.ws.rs.ext.Provider; -import org.apache.clerezza.rdf.core.TripleCollection; +import org.apache.clerezza.commons.rdf.Graph; import org.apache.clerezza.rdf.core.serializedform.Serializer; import org.apache.clerezza.rdf.core.serializedform.SupportedFormat; import org.apache.clerezza.rdf.rdfjson.serializer.RdfJsonSerializingProvider; @@ -197,7 +197,7 @@ public class RecipeListWriter implements } } else if (mediaType.toString().equals(KRFormat.RDF_JSON)) { - TripleCollection mGraph = OWLAPIToClerezzaConverter.owlOntologyToClerezzaMGraph(ontology); + Graph mGraph = OWLAPIToClerezzaConverter.owlOntologyToClerezzaGraph(ontology); RdfJsonSerializingProvider provider = new RdfJsonSerializingProvider(); provider.serialize(out, mGraph, SupportedFormat.RDF_JSON); Modified: stanbol/trunk/rules/web/src/main/java/org/apache/stanbol/rules/web/writers/RecipeWriter.java URL: http://svn.apache.org/viewvc/stanbol/trunk/rules/web/src/main/java/org/apache/stanbol/rules/web/writers/RecipeWriter.java?rev=1744328&r1=1744327&r2=1744328&view=diff ============================================================================== --- stanbol/trunk/rules/web/src/main/java/org/apache/stanbol/rules/web/writers/RecipeWriter.java (original) +++ stanbol/trunk/rules/web/src/main/java/org/apache/stanbol/rules/web/writers/RecipeWriter.java Tue May 17 22:20:49 2016 @@ -31,8 +31,8 @@ import javax.ws.rs.core.MultivaluedMap; import javax.ws.rs.ext.MessageBodyWriter; import javax.ws.rs.ext.Provider; -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.serializedform.Serializer; import org.apache.clerezza.rdf.core.serializedform.SupportedFormat; import org.apache.clerezza.rdf.rdfjson.serializer.RdfJsonSerializingProvider; @@ -53,7 +53,6 @@ import org.semanticweb.owlapi.apibinding import org.semanticweb.owlapi.io.OWLFunctionalSyntaxOntologyFormat; import org.semanticweb.owlapi.io.OWLXMLOntologyFormat; import org.semanticweb.owlapi.io.RDFXMLOntologyFormat; -import org.semanticweb.owlapi.model.IRI; import org.semanticweb.owlapi.model.OWLAxiom; import org.semanticweb.owlapi.model.OWLDataFactory; import org.semanticweb.owlapi.model.OWLDataProperty; @@ -148,14 +147,14 @@ public class RecipeWriter implements Mes RuleList rules = recipe.getRuleList(); - UriRef recipeID = recipe.getRecipeID(); + IRI recipeID = recipe.getRecipeID(); String recipeURI = recipeID.toString().replace("<", "").replace(">", ""); - IRI recipeIRI = IRI.create(recipeURI); + org.semanticweb.owlapi.model.IRI recipeIRI = org.semanticweb.owlapi.model.IRI.create(recipeURI); OWLIndividual recipeIndividual = factory.getOWLNamedIndividual(recipeIRI); String descriptionURI = Symbols.description.toString().replace("<", "").replace(">", ""); - IRI descriptionIRI = IRI.create(descriptionURI); + org.semanticweb.owlapi.model.IRI descriptionIRI = org.semanticweb.owlapi.model.IRI.create(descriptionURI); OWLDataProperty descriptionProperty = factory.getOWLDataProperty(descriptionIRI); OWLAxiom axiom; @@ -169,7 +168,7 @@ public class RecipeWriter implements Mes if(rules != null){ for (Rule rule : rules) { - UriRef ruleID = rule.getRuleID(); + IRI ruleID = rule.getRuleID(); String ruleName = rule.getRuleName(); String ruleDescription = rule.getDescription(); @@ -185,12 +184,12 @@ public class RecipeWriter implements Mes String[] ruleParts = ruleContent.split("\\->"); - IRI ruleIRI = IRI.create(ruleURI); + org.semanticweb.owlapi.model.IRI ruleIRI = org.semanticweb.owlapi.model.IRI.create(ruleURI); - IRI ruleNameIRI = IRI.create(ruleNameURI); - IRI ruleBodyIRI = IRI.create(ruleBodyURI); - IRI ruleHeadIRI = IRI.create(ruleHeadURI); - IRI hasRuleIRI = IRI.create(hasRuleURI); + org.semanticweb.owlapi.model.IRI ruleNameIRI = org.semanticweb.owlapi.model.IRI.create(ruleNameURI); + org.semanticweb.owlapi.model.IRI ruleBodyIRI = org.semanticweb.owlapi.model.IRI.create(ruleBodyURI); + org.semanticweb.owlapi.model.IRI ruleHeadIRI = org.semanticweb.owlapi.model.IRI.create(ruleHeadURI); + org.semanticweb.owlapi.model.IRI hasRuleIRI = org.semanticweb.owlapi.model.IRI.create(hasRuleURI); OWLIndividual ruleIndividual = factory.getOWLNamedIndividual(ruleIRI); @@ -264,7 +263,7 @@ public class RecipeWriter implements Mes } } else if (mediaType.toString().equals(KRFormat.RDF_JSON)) { - TripleCollection mGraph = OWLAPIToClerezzaConverter.owlOntologyToClerezzaMGraph(ontology); + Graph mGraph = OWLAPIToClerezzaConverter.owlOntologyToClerezzaGraph(ontology); RdfJsonSerializingProvider provider = new RdfJsonSerializingProvider(); provider.serialize(out, mGraph, SupportedFormat.RDF_JSON); Modified: stanbol/trunk/rules/web/src/main/java/org/apache/stanbol/rules/web/writers/RuleListWriter.java URL: http://svn.apache.org/viewvc/stanbol/trunk/rules/web/src/main/java/org/apache/stanbol/rules/web/writers/RuleListWriter.java?rev=1744328&r1=1744327&r2=1744328&view=diff ============================================================================== --- stanbol/trunk/rules/web/src/main/java/org/apache/stanbol/rules/web/writers/RuleListWriter.java (original) +++ stanbol/trunk/rules/web/src/main/java/org/apache/stanbol/rules/web/writers/RuleListWriter.java Tue May 17 22:20:49 2016 @@ -31,7 +31,7 @@ import javax.ws.rs.core.MultivaluedMap; import javax.ws.rs.ext.MessageBodyWriter; import javax.ws.rs.ext.Provider; -import org.apache.clerezza.rdf.core.TripleCollection; +import org.apache.clerezza.commons.rdf.Graph; import org.apache.clerezza.rdf.core.serializedform.Serializer; import org.apache.clerezza.rdf.core.serializedform.SupportedFormat; import org.apache.clerezza.rdf.rdfjson.serializer.RdfJsonSerializingProvider; @@ -239,7 +239,7 @@ public class RuleListWriter implements M } } else if (mediaType.toString().equals(KRFormat.RDF_JSON)) { - TripleCollection mGraph = OWLAPIToClerezzaConverter.owlOntologyToClerezzaMGraph(ontology); + Graph mGraph = OWLAPIToClerezzaConverter.owlOntologyToClerezzaGraph(ontology); RdfJsonSerializingProvider provider = new RdfJsonSerializingProvider(); provider.serialize(out, mGraph, SupportedFormat.RDF_JSON);
