Author: anuzzolese
Date: Mon Jan 9 16:29:42 2012
New Revision: 1229239
URL: http://svn.apache.org/viewvc?rev=1229239&view=rev
Log:
[STANBOL-394] Removed the existing ontonet dependency in RefactorerImpl.
Modified:
incubator/stanbol/trunk/rules/refactor/pom.xml
incubator/stanbol/trunk/rules/refactor/src/main/java/org/apache/stanbol/rules/refactor/impl/RefactorerImpl.java
incubator/stanbol/trunk/rules/refactor/src/test/java/org/apache/stanbol/rules/refactor/RefactoringTest.java
Modified: incubator/stanbol/trunk/rules/refactor/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/stanbol/trunk/rules/refactor/pom.xml?rev=1229239&r1=1229238&r2=1229239&view=diff
==============================================================================
--- incubator/stanbol/trunk/rules/refactor/pom.xml (original)
+++ incubator/stanbol/trunk/rules/refactor/pom.xml Mon Jan 9 16:29:42 2012
@@ -114,10 +114,6 @@
</dependency>
<dependency>
<groupId>org.apache.stanbol</groupId>
-
<artifactId>org.apache.stanbol.ontologymanager.ontonet</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.rules.base</artifactId>
</dependency>
<dependency>
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=1229239&r1=1229238&r2=1229239&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
Mon Jan 9 16:29:42 2012
@@ -36,18 +36,10 @@ import org.apache.clerezza.rdf.core.spar
import org.apache.felix.scr.annotations.Activate;
import org.apache.felix.scr.annotations.Component;
import org.apache.felix.scr.annotations.Deactivate;
-import org.apache.felix.scr.annotations.Property;
import org.apache.felix.scr.annotations.Reference;
import org.apache.felix.scr.annotations.Service;
-import org.apache.stanbol.ontologymanager.ontonet.api.DuplicateIDException;
import org.apache.stanbol.ontologymanager.ontonet.api.ONManager;
import org.apache.stanbol.ontologymanager.ontonet.api.ontology.OntologyScope;
-import
org.apache.stanbol.ontologymanager.ontonet.api.ontology.OntologyScopeFactory;
-import org.apache.stanbol.ontologymanager.ontonet.api.ontology.ScopeRegistry;
-import
org.apache.stanbol.ontologymanager.ontonet.api.session.DuplicateSessionIDException;
-import org.apache.stanbol.ontologymanager.ontonet.api.session.Session;
-import
org.apache.stanbol.ontologymanager.ontonet.api.session.SessionLimitException;
-import org.apache.stanbol.ontologymanager.ontonet.api.session.SessionManager;
import org.apache.stanbol.owl.transformation.JenaToClerezzaConverter;
import org.apache.stanbol.owl.transformation.JenaToOwlConvert;
import org.apache.stanbol.owl.transformation.OWLAPIToClerezzaConverter;
@@ -118,48 +110,12 @@ class ForwardChainingRefactoringGraph {
@Service(Refactorer.class)
public class RefactorerImpl implements Refactorer {
- public static final String _AUTO_GENERATED_ONTOLOGY_IRI_DEFAULT =
"http://kres.iksproject.eu/semion/autoGeneratedOntology";;
- public static final String _HOST_NAME_AND_PORT_DEFAULT = "localhost:8080";
- public static final String _REFACTORING_SCOPE_DEFAULT = "refactoring";
- public static final String _REFACTORING_SESSION_ID_DEFAULT = /*
"http://kres.iksproject.eu/session/refactoring"; */"refactoring";
- // public static final String _REFACTORING_SPACE_DEFAULT =
"http://kres.iksproject.eu/space/refactoring";;
+ private final Logger log = LoggerFactory.getLogger(getClass());
- @Property(value = _AUTO_GENERATED_ONTOLOGY_IRI_DEFAULT)
- public static final String AUTO_GENERATED_ONTOLOGY_IRI =
"org.apache.stanbol.reengineer.default";
-
- @Property(value = _HOST_NAME_AND_PORT_DEFAULT)
- public static final String HOST_NAME_AND_PORT = "host.name.port";
-
- @Property(_REFACTORING_SCOPE_DEFAULT)
- public static final String REFACTORING_SCOPE =
"org.apache.stanbol.ontologymanager.scope.refactoring";
-
- @Property(value = _REFACTORING_SESSION_ID_DEFAULT)
- public static final String REFACTORING_SESSION_ID =
"org.apache.stanbol.ontlogymanager.session.refactoring";
-
- // @Property(value = _REFACTORING_SPACE_DEFAULT)
- // public static final String REFACTORING_SPACE =
"org.apache.stanbol.reengineer.space.refactoring";
-
- private IRI defaultRefactoringIRI;
-
- private String sessionId;
-
- private final Logger log = LoggerFactory.getLogger(getClass());
-
- @Reference
- protected ONManager onManager;
-
- @Reference
- protected SessionManager sessionManager;
-
- private String refactoringScopeID;
-
- // private IRI refactoringSpaceIRI;
-
- @Reference
+ @Reference
protected RuleStore ruleStore;
- private OntologyScope scope;
-
+
@Reference
protected Serializer serializer;
@@ -198,17 +154,12 @@ public class RefactorerImpl implements R
public RefactorerImpl(WeightedTcProvider weightedTcProvider,
Serializer serializer,
TcManager tcManager,
- ONManager onManager, /* SemionManager semionManager,
*/
- SessionManager sessionManager,
RuleStore ruleStore,
Dictionary<String,Object> configuration) {
this();
this.weightedTcProvider = weightedTcProvider;
this.serializer = serializer;
this.tcManager = tcManager;
- this.onManager = onManager;
- this.sessionManager = sessionManager;
- // this.semionManager = semionManager;
this.ruleStore = ruleStore;
activate(configuration);
}
@@ -229,67 +180,6 @@ public class RefactorerImpl implements R
}
protected void activate(Dictionary<String,Object> configuration) {
- String refactoringSessionID = (String)
configuration.get(REFACTORING_SESSION_ID);
- if (refactoringSessionID == null) refactoringSessionID =
_REFACTORING_SESSION_ID_DEFAULT;
- String refactoringScopeID = (String)
configuration.get(REFACTORING_SCOPE);
- if (refactoringScopeID == null) refactoringScopeID =
_REFACTORING_SCOPE_DEFAULT;
- // String refactoringSpaceID = (String)
configuration.get(REFACTORING_SPACE);
- // if (refactoringSpaceID == null) refactoringSpaceID =
_REFACTORING_SPACE_DEFAULT;
- String defaultRefactoringID = (String)
configuration.get(AUTO_GENERATED_ONTOLOGY_IRI);
- if (defaultRefactoringID == null) defaultRefactoringID =
_AUTO_GENERATED_ONTOLOGY_IRI_DEFAULT;
- String hostPort = (String) configuration.get(HOST_NAME_AND_PORT);
- if (hostPort == null) hostPort = _HOST_NAME_AND_PORT_DEFAULT;
-
- sessionId = refactoringSessionID;
- // refactoringScopeID = IRI.create("http://"; + hostPort +
"/kres/ontology/" + refactoringScopeID);
- // refactoringSpaceIRI = IRI.create(refactoringSpaceID);
- defaultRefactoringIRI = IRI.create(defaultRefactoringID);
-
- // SessionManager kReSSessionManager = onManager.getSessionManager();
-
- Session session = sessionManager.getSession(sessionId);
-
- if (session == null) {
- try {
- session = sessionManager.createSession(sessionId);
- } catch (DuplicateSessionIDException e) {
- log.warn("Session {} already active, will use that one for
refactoring.", sessionId);
- session = sessionManager.getSession(sessionId);
- } catch (SessionLimitException e) {
- log.error("Cannot create session {}. Limit of {} already
reached.", sessionId,
- e.getSessionLimit());
- }
- }
-
- sessionId = session.getID();
-
- OntologyScopeFactory ontologyScopeFactory =
onManager.getOntologyScopeFactory();
-
- ScopeRegistry scopeRegistry = onManager.getScopeRegistry();
-
- // OntologySpaceFactory ontologySpaceFactory =
onManager.getOntologySpaceFactory();
-
- scope = null;
- try {
- scope =
ontologyScopeFactory.createOntologyScope(refactoringScopeID);
- log.info("Created scope with IRI " + REFACTORING_SCOPE);
- scopeRegistry.registerScope(scope);
- } catch (DuplicateIDException e) {
- log.info("Reusing already existing scope for IRI " +
REFACTORING_SCOPE);
- scope = onManager.getScopeRegistry().getScope(refactoringScopeID);
- }
- //
- // try {
- //
scope.addSessionSpace(ontologySpaceFactory.createSessionOntologySpace(refactoringScopeID),
- // kReSSession.getID());
- // } catch (UnmodifiableOntologySpaceException e) {
- // log.error("Failed to create session space", e);
- // }
-
- scopeRegistry.setScopeActive(refactoringScopeID, true);
-
- // semionManager.registerRefactorer(this);
-
PropertyFunctionRegistry.get().put("http://www.stlab.istc.cnr.it/semion/function#createURI";,
CreateURI.class);
FunctionRegistry.get().put("http://www.stlab.istc.cnr.it/semion/function#createLabel";,
@@ -304,14 +194,9 @@ public class RefactorerImpl implements R
protected void deactivate(ComponentContext context) {
log.info("in " + getClass() + " deactivate with context " + context);
- // SessionManager kReSSessionManager = onManager.getSessionManager();
- sessionManager.destroySession(sessionId);
- // semionManager.unregisterRefactorer();
this.weightedTcProvider = null;
this.serializer = null;
this.tcManager = null;
- this.onManager = null;
- this.sessionManager = null;
this.ruleStore = null;
}
Modified:
incubator/stanbol/trunk/rules/refactor/src/test/java/org/apache/stanbol/rules/refactor/RefactoringTest.java
URL:
http://svn.apache.org/viewvc/incubator/stanbol/trunk/rules/refactor/src/test/java/org/apache/stanbol/rules/refactor/RefactoringTest.java?rev=1229239&r1=1229238&r2=1229239&view=diff
==============================================================================
---
incubator/stanbol/trunk/rules/refactor/src/test/java/org/apache/stanbol/rules/refactor/RefactoringTest.java
(original)
+++
incubator/stanbol/trunk/rules/refactor/src/test/java/org/apache/stanbol/rules/refactor/RefactoringTest.java
Mon Jan 9 16:29:42 2012
@@ -27,17 +27,10 @@ import java.util.Set;
import org.apache.clerezza.rdf.core.access.TcManager;
import org.apache.clerezza.rdf.core.access.WeightedTcProvider;
-import org.apache.clerezza.rdf.core.serializedform.Parser;
import org.apache.clerezza.rdf.core.serializedform.Serializer;
import org.apache.clerezza.rdf.core.sparql.QueryEngine;
import org.apache.clerezza.rdf.jena.sparql.JenaSparqlEngine;
import org.apache.clerezza.rdf.simple.storage.SimpleTcProvider;
-import org.apache.stanbol.ontologymanager.ontonet.api.ONManager;
-import org.apache.stanbol.ontologymanager.ontonet.api.session.SessionManager;
-import org.apache.stanbol.ontologymanager.ontonet.impl.ONManagerImpl;
-import
org.apache.stanbol.ontologymanager.ontonet.impl.OfflineConfigurationImpl;
-import
org.apache.stanbol.ontologymanager.ontonet.impl.clerezza.ClerezzaOntologyProvider;
-import
org.apache.stanbol.ontologymanager.ontonet.impl.session.SessionManagerImpl;
import org.apache.stanbol.rules.base.api.NoSuchRecipeException;
import org.apache.stanbol.rules.base.api.Recipe;
import org.apache.stanbol.rules.base.api.Rule;
@@ -273,11 +266,8 @@ public class RefactoringTest {
WeightedTcProvider wtcp = new SimpleTcProvider();
TcManager tcm = new SpecialTcManager(qe, wtcp);
- ONManager onm = new ONManagerImpl(tcm, wtcp, emptyConfig);
- SessionManager sesMgr = new SessionManagerImpl(new
ClerezzaOntologyProvider(wtcp,
- new OfflineConfigurationImpl(emptyConfig), new Parser()),
emptyConfig);
- Refactorer refactorer = new RefactorerImpl(null, new Serializer(),
tcm, onm, sesMgr, ruleStore,
+ Refactorer refactorer = new RefactorerImpl(null, new Serializer(),
tcm, ruleStore,
emptyConfig);
try {
refactorer.ontologyRefactoring(ontology, recipeIRI);
@@ -310,10 +300,7 @@ public class RefactoringTest {
RuleList ruleList = kb.getkReSRuleList();
Recipe actualRecipe = new RecipeImpl(null, null, ruleList);
- ONManager onm = new ONManagerImpl(tcm, wtcp, emptyConfig);
- SessionManager sesMgr = new SessionManagerImpl(new
ClerezzaOntologyProvider(wtcp,
- new OfflineConfigurationImpl(emptyConfig), new Parser()),
emptyConfig);
- Refactorer refactorer = new RefactorerImpl(null, new Serializer(),
tcm, onm, sesMgr, ruleStore,
+ Refactorer refactorer = new RefactorerImpl(null, new Serializer(),
tcm, ruleStore,
emptyConfig);
try {
refactorer.ontologyRefactoring(ontology, actualRecipe);
