Revert "Copy Kgram codebase into next package"

This reverts commit b4449bc.

Author: abdessamad-abdoun

src/main/java/fr/inria/corese/core/Context.java

@@ -1,8 +1,8 @@
 package fr.inria.corese.core;
 
-import fr.inria.corese.core.next.kgram.api.core.Node;
-import fr.inria.corese.core.next.kgram.api.query.Graphable;
-import fr.inria.corese.core.next.kgram.core.Query;
+import fr.inria.corese.core.kgram.api.core.Node;
+import fr.inria.corese.core.kgram.api.query.Graphable;
+import fr.inria.corese.core.kgram.core.Query;
 import fr.inria.corese.core.load.QueryLoad;
 import fr.inria.corese.core.query.RDFizer;
 import fr.inria.corese.core.rule.RuleEngine;

src/main/java/fr/inria/corese/core/DataStore.java

@@ -1,6 +1,6 @@
 package fr.inria.corese.core;
 
-import fr.inria.corese.core.next.kgram.api.core.Node;
+import fr.inria.corese.core.kgram.api.core.Node;
 import fr.inria.corese.core.producer.DataProducer;
 
 import java.util.ArrayList;

src/main/java/fr/inria/corese/core/EdgeFactory.java

@@ -10,8 +10,8 @@
 import fr.inria.corese.core.edge.rule.EdgeRuleGraph;
 import fr.inria.corese.core.edge.rule.EdgeRuleSubclass;
 import fr.inria.corese.core.edge.rule.EdgeRuleType;
-import fr.inria.corese.core.next.kgram.api.core.Edge;
-import fr.inria.corese.core.next.kgram.api.core.Node;
+import fr.inria.corese.core.kgram.api.core.Edge;
+import fr.inria.corese.core.kgram.api.core.Node;
 import fr.inria.corese.core.logic.Entailment;
 import fr.inria.corese.core.query.QueryProcess;
 import fr.inria.corese.core.sparql.api.IDatatype;

src/main/java/fr/inria/corese/core/EventHandler.java

@@ -1,6 +1,6 @@
 package fr.inria.corese.core;
 
-import fr.inria.corese.core.next.kgram.api.core.Edge;
+import fr.inria.corese.core.kgram.api.core.Edge;
 
 /**
  *

src/main/java/fr/inria/corese/core/EventLogger.java

@@ -2,8 +2,8 @@
 
 import fr.inria.corese.core.compiler.eval.QuerySolverVisitor;
 import fr.inria.corese.core.index.NodeManager;
-import fr.inria.corese.core.next.kgram.api.core.DatatypeValue;
-import fr.inria.corese.core.next.kgram.api.core.Edge;
+import fr.inria.corese.core.kgram.api.core.DatatypeValue;
+import fr.inria.corese.core.kgram.api.core.Edge;
 import fr.inria.corese.core.query.QueryProcess;
 import fr.inria.corese.core.sparql.datatype.DatatypeMap;
 import fr.inria.corese.core.sparql.exceptions.EngineException;

src/main/java/fr/inria/corese/core/EventManager.java

@@ -2,7 +2,7 @@
 
 import fr.inria.corese.core.api.Engine;
 import fr.inria.corese.core.compiler.parser.Transformer;
-import fr.inria.corese.core.next.kgram.api.core.Edge;
+import fr.inria.corese.core.kgram.api.core.Edge;
 import fr.inria.corese.core.logic.Entailment;
 import fr.inria.corese.core.sparql.triple.parser.ASTExtension;
 import fr.inria.corese.core.util.Property;

src/main/java/fr/inria/corese/core/Graph.java

@@ -6,12 +6,12 @@
 import fr.inria.corese.core.elasticsearch.EdgeChangeListener;
 import fr.inria.corese.core.index.EdgeManagerIndexer;
 import fr.inria.corese.core.index.NodeManager;
-import fr.inria.corese.core.next.kgram.api.core.*;
-import fr.inria.corese.core.next.kgram.api.query.Graphable;
-import fr.inria.corese.core.next.kgram.core.Distinct;
-import fr.inria.corese.core.next.kgram.core.Mappings;
-import fr.inria.corese.core.next.kgram.core.Query;
-import fr.inria.corese.core.next.kgram.tool.MetaIterator;
+import fr.inria.corese.core.kgram.api.core.*;
+import fr.inria.corese.core.kgram.api.query.Graphable;
+import fr.inria.corese.core.kgram.core.Distinct;
+import fr.inria.corese.core.kgram.core.Mappings;
+import fr.inria.corese.core.kgram.core.Query;
+import fr.inria.corese.core.kgram.tool.MetaIterator;
 import fr.inria.corese.core.logic.*;
 import fr.inria.corese.core.producer.DataProducer;
 import fr.inria.corese.core.query.QueryCheck;
@@ -35,7 +35,7 @@
 import java.util.concurrent.locks.Lock;
 import java.util.concurrent.locks.ReentrantReadWriteLock;
 
-import static fr.inria.corese.core.next.kgram.api.core.PointerType.GRAPH;
+import static fr.inria.corese.core.kgram.api.core.PointerType.GRAPH;
 
 /**
  * Graph Manager Edges are stored in an index An index is a table: predicate ->

src/main/java/fr/inria/corese/core/GraphCompare.java

@@ -1,7 +1,7 @@
 package fr.inria.corese.core;
 
-import fr.inria.corese.core.next.kgram.api.core.Edge;
-import fr.inria.corese.core.next.kgram.api.core.Node;
+import fr.inria.corese.core.kgram.api.core.Edge;
+import fr.inria.corese.core.kgram.api.core.Node;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

src/main/java/fr/inria/corese/core/GraphDistance.java

@@ -1,6 +1,6 @@
 package fr.inria.corese.core;
 
-import fr.inria.corese.core.next.kgram.api.core.Node;
+import fr.inria.corese.core.kgram.api.core.Node;
 import fr.inria.corese.core.sparql.api.IDatatype;
 import fr.inria.corese.core.sparql.triple.parser.ASTQuery;
 import fr.inria.corese.core.sparql.triple.parser.Constant;

src/main/java/fr/inria/corese/core/GraphObject.java

@@ -5,7 +5,7 @@
 
 package fr.inria.corese.core;
 
-import fr.inria.corese.core.next.kgram.core.PointerObject;
+import fr.inria.corese.core.kgram.core.PointerObject;
 
 /**
  * @author Olivier Corby, Wimmics INRIA I3S, 2015