You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stanbol.apache.org by co...@apache.org on 2011/03/25 15:29:44 UTC
svn commit: r1085398 - in /incubator/stanbol/trunk/kres/rules/web: ./
src/main/java/org/apache/stanbol/rules/web/
Author: concelvio
Date: Fri Mar 25 14:29:44 2011
New Revision: 1085398
URL: http://svn.apache.org/viewvc?rev=1085398&view=rev
Log:
STANBOL-39:
- changed parent version in pom.xml to ${stanbol-version}
- removed kres-version from pom.xml
- changed name Rule.java to RestRule.java
- changed name Recipe.java to RestRecipe.java
- changed name SemionRefactorerResource.java to RefactorerResource.java
- change class reference where required
Added:
incubator/stanbol/trunk/kres/rules/web/src/main/java/org/apache/stanbol/rules/web/RefactorerResource.java
- copied, changed from r1085259, incubator/stanbol/trunk/kres/rules/web/src/main/java/org/apache/stanbol/rules/web/SemionRefactorerResource.java
incubator/stanbol/trunk/kres/rules/web/src/main/java/org/apache/stanbol/rules/web/RestRecipe.java
- copied, changed from r1085259, incubator/stanbol/trunk/kres/rules/web/src/main/java/org/apache/stanbol/rules/web/Recipe.java
incubator/stanbol/trunk/kres/rules/web/src/main/java/org/apache/stanbol/rules/web/RestRule.java
- copied, changed from r1085259, incubator/stanbol/trunk/kres/rules/web/src/main/java/org/apache/stanbol/rules/web/Rule.java
Removed:
incubator/stanbol/trunk/kres/rules/web/src/main/java/org/apache/stanbol/rules/web/Recipe.java
incubator/stanbol/trunk/kres/rules/web/src/main/java/org/apache/stanbol/rules/web/Rule.java
incubator/stanbol/trunk/kres/rules/web/src/main/java/org/apache/stanbol/rules/web/SemionRefactorerResource.java
Modified:
incubator/stanbol/trunk/kres/rules/web/pom.xml
incubator/stanbol/trunk/kres/rules/web/src/main/java/org/apache/stanbol/rules/web/JerseyEndpoint.java
incubator/stanbol/trunk/kres/rules/web/src/main/java/org/apache/stanbol/rules/web/JerseyEndpointApplication.java
incubator/stanbol/trunk/kres/rules/web/src/main/java/org/apache/stanbol/rules/web/OntologyStorageResource.java
incubator/stanbol/trunk/kres/rules/web/src/main/java/org/apache/stanbol/rules/web/RuleStoreResource.java
Modified: incubator/stanbol/trunk/kres/rules/web/pom.xml
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/rules/web/pom.xml?rev=1085398&r1=1085397&r2=1085398&view=diff
==============================================================================
--- incubator/stanbol/trunk/kres/rules/web/pom.xml (original)
+++ incubator/stanbol/trunk/kres/rules/web/pom.xml Fri Mar 25 14:29:44 2011
@@ -1,4 +1,20 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
@@ -7,8 +23,8 @@
<parent>
<groupId>org.apache.stanbol</groupId>
<artifactId>stanbol-parent</artifactId>
- <version>0.9-SNAPSHOT</version>
- <relativePath>../../parent</relativePath>
+ <version>${stanbol-version}</version>
+ <relativePath>../../../parent</relativePath>
</parent>
<groupId>org.apache.stanbol</groupId>
@@ -19,10 +35,6 @@
<name>Apache Stanbol Rules Web</name>
<description>Set of rst service to deal with rules and recipes</description>
- <properties>
- <kres-version>0.7</kres-version>
- </properties>
-
<dependencies>
<!-- dependencies on other IKS modules -->
@@ -196,15 +208,7 @@
<version>${pax-exam-version}</version>
<scope>test</scope>
</dependency>
-
-
- <!-- KReS -->
- <!--
- <dependency> <groupId>eu.iksproject</groupId>
- <artifactId>eu.iksproject.kres.api</artifactId>
- <version>${kres-version}</version> <scope>provided</scope>
- </dependency>
- -->
+
<dependency>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.ontologymanager.ontonet</artifactId>
@@ -246,22 +250,6 @@
<version>${stanbol-version}</version>
<scope>provided</scope>
</dependency>
-
- <!--
- <dependency> <groupId>eu.iksproject</groupId>
- <artifactId>eu.iksproject.kres.manager</artifactId>
- <version>${kres-version}</version> <scope>provided</scope>
- </dependency> <dependency> <groupId>eu.iksproject</groupId>
- <artifactId>eu.iksproject.kres.rules</artifactId>
- <version>${kres-version}</version> <scope>provided</scope>
- </dependency> <dependency> <groupId>eu.iksproject</groupId>
- <artifactId>eu.iksproject.kres.semion.manager</artifactId>
- <version>${kres-version}</version> <scope>provided</scope>
- </dependency> <dependency> <groupId>eu.iksproject</groupId>
- <artifactId>eu.iksproject.kres.semion.refactorer</artifactId>
- <version>${kres-version}</version> <scope>provided</scope>
- </dependency>
- -->
<dependency>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.owlapi</artifactId>
@@ -269,15 +257,6 @@
<scope>provided</scope>
</dependency>
- <!--
- <dependency> <groupId>eu.iksproject</groupId>
- <artifactId>eu.iksproject.kres.reasoners</artifactId>
- <version>${kres-version}</version> <scope>provided</scope>
- </dependency> <dependency> <groupId>eu.iksproject</groupId>
- <artifactId>eu.iksproject.kres.storage.provider</artifactId>
- <version>${kres-version}</version> <scope>provided</scope>
- </dependency>
- -->
<dependency>
<groupId>com.hp.hpl.jena</groupId>
<artifactId>jena</artifactId>
Modified: incubator/stanbol/trunk/kres/rules/web/src/main/java/org/apache/stanbol/rules/web/JerseyEndpoint.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/rules/web/src/main/java/org/apache/stanbol/rules/web/JerseyEndpoint.java?rev=1085398&r1=1085397&r2=1085398&view=diff
==============================================================================
--- incubator/stanbol/trunk/kres/rules/web/src/main/java/org/apache/stanbol/rules/web/JerseyEndpoint.java (original)
+++ incubator/stanbol/trunk/kres/rules/web/src/main/java/org/apache/stanbol/rules/web/JerseyEndpoint.java Fri Mar 25 14:29:44 2011
@@ -11,7 +11,7 @@ import org.apache.felix.scr.annotations.
import org.apache.felix.scr.annotations.Property;
import org.apache.felix.scr.annotations.Reference;
import org.apache.stanbol.rules.base.api.RuleStore;
-import org.apache.stanbol.rules.refactor.api.SemionRefactorer;
+import org.apache.stanbol.rules.refactor.api.Refactorer;
import org.osgi.framework.BundleContext;
import org.osgi.service.component.ComponentContext;
import org.osgi.service.http.HttpService;
@@ -53,7 +53,7 @@ public class JerseyEndpoint {
HttpService httpService;
@Reference
- SemionRefactorer semionRefactorer;
+ Refactorer semionRefactorer;
// @Reference
// OntologyStoreProvider ontologyStoreProvider;
@@ -114,7 +114,7 @@ public class JerseyEndpoint {
//servletContext.setAttribute(Serializer.class.getName(), serializer);
//servletContext.setAttribute(SemionReengineer.class.getName(),
// semionReengineer);
- servletContext.setAttribute(SemionRefactorer.class.getName(),
+ servletContext.setAttribute(Refactorer.class.getName(),
semionRefactorer);
// servletContext.setAttribute(LinkDiscovery.class.getName(),
// linkDiscovery);
Modified: incubator/stanbol/trunk/kres/rules/web/src/main/java/org/apache/stanbol/rules/web/JerseyEndpointApplication.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/rules/web/src/main/java/org/apache/stanbol/rules/web/JerseyEndpointApplication.java?rev=1085398&r1=1085397&r2=1085398&view=diff
==============================================================================
--- incubator/stanbol/trunk/kres/rules/web/src/main/java/org/apache/stanbol/rules/web/JerseyEndpointApplication.java (original)
+++ incubator/stanbol/trunk/kres/rules/web/src/main/java/org/apache/stanbol/rules/web/JerseyEndpointApplication.java Fri Mar 25 14:29:44 2011
@@ -30,9 +30,9 @@ public class JerseyEndpointApplication e
// Rules manager
classes.add(RuleStoreResource.class);
- classes.add(Recipe.class);
- classes.add(Rule.class);
- classes.add(SemionRefactorerResource.class);
+ classes.add(RestRecipe.class);
+ classes.add(RestRule.class);
+ classes.add(RefactorerResource.class);
//classes.add(OntologyStorageResource.class);
// message body writers
Modified: incubator/stanbol/trunk/kres/rules/web/src/main/java/org/apache/stanbol/rules/web/OntologyStorageResource.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/rules/web/src/main/java/org/apache/stanbol/rules/web/OntologyStorageResource.java?rev=1085398&r1=1085397&r2=1085398&view=diff
==============================================================================
--- incubator/stanbol/trunk/kres/rules/web/src/main/java/org/apache/stanbol/rules/web/OntologyStorageResource.java (original)
+++ incubator/stanbol/trunk/kres/rules/web/src/main/java/org/apache/stanbol/rules/web/OntologyStorageResource.java Fri Mar 25 14:29:44 2011
@@ -6,7 +6,7 @@ import javax.ws.rs.Path;
import javax.ws.rs.core.Context;
import org.apache.clerezza.rdf.core.access.TcManager;
-import org.apache.stanbol.ontologymanager.ontonet.api.KReSONManager;
+import org.apache.stanbol.ontologymanager.ontonet.api.ONManager;
import org.apache.stanbol.ontologymanager.ontonet.impl.ontology.OntologyStorage;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -16,12 +16,12 @@ public class OntologyStorageResource ext
private final Logger log = LoggerFactory.getLogger(getClass());
private OntologyStorage storage;
- private KReSONManager onManager;
+ private ONManager onManager;
private TcManager tcManager;
public OntologyStorageResource(@Context ServletContext servletContext) {
storage = (OntologyStorage) (servletContext.getAttribute(OntologyStorage.class.getName()));
- onManager = (KReSONManager) (servletContext.getAttribute(KReSONManager.class.getName()));
+ onManager = (ONManager) (servletContext.getAttribute(ONManager.class.getName()));
tcManager = (TcManager) (servletContext.getAttribute(TcManager.class.getName()));
if (storage == null) {
throw new IllegalStateException(
Copied: incubator/stanbol/trunk/kres/rules/web/src/main/java/org/apache/stanbol/rules/web/RefactorerResource.java (from r1085259, incubator/stanbol/trunk/kres/rules/web/src/main/java/org/apache/stanbol/rules/web/SemionRefactorerResource.java)
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/rules/web/src/main/java/org/apache/stanbol/rules/web/RefactorerResource.java?p2=incubator/stanbol/trunk/kres/rules/web/src/main/java/org/apache/stanbol/rules/web/RefactorerResource.java&p1=incubator/stanbol/trunk/kres/rules/web/src/main/java/org/apache/stanbol/rules/web/SemionRefactorerResource.java&r1=1085259&r2=1085398&rev=1085398&view=diff
==============================================================================
--- incubator/stanbol/trunk/kres/rules/web/src/main/java/org/apache/stanbol/rules/web/SemionRefactorerResource.java (original)
+++ incubator/stanbol/trunk/kres/rules/web/src/main/java/org/apache/stanbol/rules/web/RefactorerResource.java Fri Mar 25 14:29:44 2011
@@ -15,11 +15,11 @@ import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Response;
import org.apache.clerezza.rdf.core.access.TcManager;
-import org.apache.stanbol.ontologymanager.ontonet.api.KReSONManager;
+import org.apache.stanbol.ontologymanager.ontonet.api.ONManager;
import org.apache.stanbol.reasoners.base.api.InconcistencyException;
import org.apache.stanbol.rules.base.api.NoSuchRecipeException;
-import org.apache.stanbol.rules.refactor.api.SemionRefactorer;
-import org.apache.stanbol.rules.refactor.api.SemionRefactoringException;
+import org.apache.stanbol.rules.refactor.api.Refactorer;
+import org.apache.stanbol.rules.refactor.api.RefactoringException;
import org.semanticweb.owlapi.apibinding.OWLManager;
import org.semanticweb.owlapi.model.IRI;
import org.semanticweb.owlapi.model.OWLOntology;
@@ -39,17 +39,17 @@ import org.apache.stanbol.kres.jersey.re
@Path("/refactorer")
@ImplicitProduces(MediaType.TEXT_HTML + ";qs=2")
-public class SemionRefactorerResource extends NavigationMixin {
+public class RefactorerResource extends NavigationMixin {
- protected KReSONManager onManager;
+ protected ONManager onManager;
// protected SemionManager semionManager;
protected TcManager tcManager;
- protected SemionRefactorer semionRefactorer;
+ protected Refactorer semionRefactorer;
- public SemionRefactorerResource(@Context ServletContext servletContext) {
- semionRefactorer = (SemionRefactorer) (servletContext.getAttribute(SemionRefactorer.class.getName()));
+ public RefactorerResource(@Context ServletContext servletContext) {
+ semionRefactorer = (Refactorer) (servletContext.getAttribute(Refactorer.class.getName()));
- onManager = (KReSONManager) (servletContext.getAttribute(KReSONManager.class.getName()));
+ onManager = (ONManager) (servletContext.getAttribute(ONManager.class.getName()));
tcManager = (TcManager) (servletContext.getAttribute(TcManager.class.getName()));
if (semionRefactorer == null) {
@@ -71,12 +71,12 @@ public class SemionRefactorerResource ex
IRI inputGraphIRI = IRI.create(inputGraph);
IRI outputGraphIRI = IRI.create(outputGraph);
- // SemionRefactorer semionRefactorer = semionManager.getRegisteredRefactorer();
+ // Refactorer semionRefactorer = semionManager.getRegisteredRefactorer();
try {
semionRefactorer.ontologyRefactoring(outputGraphIRI, inputGraphIRI, recipeIRI);
return Response.ok().build();
- } catch (SemionRefactoringException e) {
+ } catch (RefactoringException e) {
return Response.status(500).build();
} catch (NoSuchRecipeException e) {
return Response.status(204).build();
@@ -92,7 +92,7 @@ public class SemionRefactorerResource ex
public Response performRefactoring(@FormParam("recipe") String recipe,
@FormParam("input") InputStream input) {
- // SemionRefactorer semionRefactorer = semionManager.getRegisteredRefactorer();
+ // Refactorer semionRefactorer = semionManager.getRegisteredRefactorer();
IRI recipeIRI = IRI.create(recipe);
@@ -104,7 +104,7 @@ public class SemionRefactorerResource ex
OWLOntology outputOntology;
try {
outputOntology = semionRefactorer.ontologyRefactoring(inputOntology, recipeIRI);
- } catch (SemionRefactoringException e) {
+ } catch (RefactoringException e) {
e.printStackTrace();
return Response.status(500).build();
} catch (NoSuchRecipeException e) {
@@ -129,12 +129,12 @@ public class SemionRefactorerResource ex
IRI inputGraphIRI = IRI.create(inputGraph);
IRI outputGraphIRI = IRI.create(outputGraph);
- // SemionRefactorer semionRefactorer = semionManager.getRegisteredRefactorer();
+ // Refactorer semionRefactorer = semionManager.getRegisteredRefactorer();
try {
semionRefactorer.consistentOntologyRefactoring(outputGraphIRI, inputGraphIRI, recipeIRI);
return Response.ok().build();
- } catch (SemionRefactoringException e) {
+ } catch (RefactoringException e) {
return Response.status(500).build();
} catch (NoSuchRecipeException e) {
return Response.status(204).build();
@@ -154,7 +154,7 @@ public class SemionRefactorerResource ex
IRI recipeIRI = IRI.create(recipe);
- // SemionRefactorer semionRefactorer = semionManager.getRegisteredRefactorer();
+ // Refactorer semionRefactorer = semionManager.getRegisteredRefactorer();
OWLOntologyManager manager = OWLManager.createOWLOntologyManager();
OWLOntology inputOntology;
@@ -164,7 +164,7 @@ public class SemionRefactorerResource ex
OWLOntology outputOntology;
try {
outputOntology = semionRefactorer.consistentOntologyRefactoring(inputOntology, recipeIRI);
- } catch (SemionRefactoringException e) {
+ } catch (RefactoringException e) {
return Response.status(500).build();
} catch (NoSuchRecipeException e) {
return Response.status(204).build();
Copied: incubator/stanbol/trunk/kres/rules/web/src/main/java/org/apache/stanbol/rules/web/RestRecipe.java (from r1085259, incubator/stanbol/trunk/kres/rules/web/src/main/java/org/apache/stanbol/rules/web/Recipe.java)
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/rules/web/src/main/java/org/apache/stanbol/rules/web/RestRecipe.java?p2=incubator/stanbol/trunk/kres/rules/web/src/main/java/org/apache/stanbol/rules/web/RestRecipe.java&p1=incubator/stanbol/trunk/kres/rules/web/src/main/java/org/apache/stanbol/rules/web/Recipe.java&r1=1085259&r2=1085398&rev=1085398&view=diff
==============================================================================
--- incubator/stanbol/trunk/kres/rules/web/src/main/java/org/apache/stanbol/rules/web/Recipe.java (original)
+++ incubator/stanbol/trunk/kres/rules/web/src/main/java/org/apache/stanbol/rules/web/RestRecipe.java Fri Mar 25 14:29:44 2011
@@ -30,14 +30,14 @@ import javax.ws.rs.core.Response;
import javax.ws.rs.core.Response.Status;
import org.apache.clerezza.rdf.core.access.TcManager;
-import org.apache.stanbol.ontologymanager.ontonet.api.KReSONManager;
-import org.apache.stanbol.ontologymanager.ontonet.impl.ONManager;
+import org.apache.stanbol.ontologymanager.ontonet.api.ONManager;
+import org.apache.stanbol.ontologymanager.ontonet.impl.ONManagerImpl;
import org.apache.stanbol.ontologymanager.ontonet.impl.ontology.OntologyStorage;
import org.apache.stanbol.rules.base.api.RuleStore;
-import org.apache.stanbol.rules.manager.changes.KReSAddRecipe;
-import org.apache.stanbol.rules.manager.changes.KReSGetRecipe;
-import org.apache.stanbol.rules.manager.changes.KReSRemoveRecipe;
-import org.apache.stanbol.rules.manager.changes.KReSRuleStore;
+import org.apache.stanbol.rules.manager.changes.AddRecipe;
+import org.apache.stanbol.rules.manager.changes.GetRecipe;
+import org.apache.stanbol.rules.manager.changes.RemoveRecipe;
+import org.apache.stanbol.rules.manager.changes.RuleStoreImpl;
import org.semanticweb.owlapi.apibinding.OWLManager;
import org.semanticweb.owlapi.model.AddImport;
import org.semanticweb.owlapi.model.IRI;
@@ -61,9 +61,9 @@ import org.apache.stanbol.kres.jersey.re
@Path("/recipe")
// /{uri:.+}")
// @ImplicitProduces(MediaType.TEXT_HTML + ";qs=2")
-public class Recipe extends NavigationMixin {
+public class RestRecipe extends NavigationMixin {
- protected KReSONManager onm;
+ protected ONManager onm;
private Logger log = LoggerFactory.getLogger(getClass());
@@ -71,14 +71,14 @@ public class Recipe extends NavigationMi
private OntologyStorage storage;
/**
- * To get the KReSRuleStore where are stored the rules and the recipes
+ * To get the RuleStoreImpl where are stored the rules and the recipes
*
* @param servletContext
* {To get the context where the REST service is running.}
*/
- public Recipe(@Context ServletContext servletContext) {
+ public RestRecipe(@Context ServletContext servletContext) {
this.kresRuleStore = (RuleStore) servletContext.getAttribute(RuleStore.class.getName());
- this.onm = (KReSONManager) servletContext.getAttribute(KReSONManager.class.getName());
+ this.onm = (ONManager) servletContext.getAttribute(ONManager.class.getName());
// this.storage = (OntologyStorage) servletContext
// .getAttribute(OntologyStorage.class.getName());
// Contingency code for missing components follows.
@@ -89,7 +89,7 @@ public class Recipe extends NavigationMi
if (onm == null) {
log
.warn("No KReSONManager in servlet context. Instantiating manually...");
- onm = new ONManager(new TcManager(), null,
+ onm = new ONManagerImpl(new TcManager(), null,
new Hashtable<String, Object>());
}
this.storage = onm.getOntologyStore();
@@ -104,13 +104,13 @@ if (storage == null) {
// OWLOntology o;
// try {
// o = OWLManager.createOWLOntologyManager().loadOntologyFromOntologyDocument(IRI.create(iri));
-// this.kresRuleStore = new KReSRuleStore(onm, new Hashtable<String,Object>(), "");
+// this.kresRuleStore = new RuleStoreImpl(onm, new Hashtable<String,Object>(), "");
// log.debug("PATH TO OWL FILE LOADED: " + kresRuleStore.getFilePath());
// } catch (OWLOntologyCreationException e) {
//
// }
- this.kresRuleStore = new KReSRuleStore(onm, new Hashtable<String,Object>(), "");
+ this.kresRuleStore = new RuleStoreImpl(onm, new Hashtable<String,Object>(), "");
}
}
@@ -134,7 +134,7 @@ if (storage == null) {
public Response getRecipe(@PathParam("uri") String uri) {
try {
- KReSGetRecipe rule = new KReSGetRecipe(kresRuleStore);
+ GetRecipe rule = new GetRecipe(kresRuleStore);
// String ID =
// kresRuleStore.getOntology().getOntologyID().toString().replace(">","").replace("<","")+"#";
@@ -276,7 +276,7 @@ if (storage == null) {
try {
- KReSAddRecipe instance = new KReSAddRecipe(kresRuleStore);
+ AddRecipe instance = new AddRecipe(kresRuleStore);
// String ID =
// kresRuleStore.getOntology().getOntologyID().toString().replace(">","").replace("<","")+"#";
@@ -313,7 +313,7 @@ if (storage == null) {
try {
- KReSRemoveRecipe instance = new KReSRemoveRecipe(kresRuleStore);
+ RemoveRecipe instance = new RemoveRecipe(kresRuleStore);
// String ID =
// kresRuleStore.getOntology().getOntologyID().toString().replace(">","").replace("<","")+"#";
Copied: incubator/stanbol/trunk/kres/rules/web/src/main/java/org/apache/stanbol/rules/web/RestRule.java (from r1085259, incubator/stanbol/trunk/kres/rules/web/src/main/java/org/apache/stanbol/rules/web/Rule.java)
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/rules/web/src/main/java/org/apache/stanbol/rules/web/RestRule.java?p2=incubator/stanbol/trunk/kres/rules/web/src/main/java/org/apache/stanbol/rules/web/RestRule.java&p1=incubator/stanbol/trunk/kres/rules/web/src/main/java/org/apache/stanbol/rules/web/Rule.java&r1=1085259&r2=1085398&rev=1085398&view=diff
==============================================================================
--- incubator/stanbol/trunk/kres/rules/web/src/main/java/org/apache/stanbol/rules/web/Rule.java (original)
+++ incubator/stanbol/trunk/kres/rules/web/src/main/java/org/apache/stanbol/rules/web/RestRule.java Fri Mar 25 14:29:44 2011
@@ -32,17 +32,17 @@ import javax.ws.rs.core.Response;
import javax.ws.rs.core.Response.Status;
import org.apache.clerezza.rdf.core.access.TcManager;
-import org.apache.stanbol.ontologymanager.ontonet.api.KReSONManager;
-import org.apache.stanbol.ontologymanager.ontonet.impl.ONManager;
+import org.apache.stanbol.ontologymanager.ontonet.api.ONManager;
+import org.apache.stanbol.ontologymanager.ontonet.impl.ONManagerImpl;
import org.apache.stanbol.ontologymanager.ontonet.impl.ontology.OntologyStorage;
import org.apache.stanbol.rules.base.api.RuleStore;
-import org.apache.stanbol.rules.manager.changes.KReSAddRecipe;
-import org.apache.stanbol.rules.manager.changes.KReSAddRule;
-import org.apache.stanbol.rules.manager.changes.KReSGetRecipe;
-import org.apache.stanbol.rules.manager.changes.KReSGetRule;
-import org.apache.stanbol.rules.manager.changes.KReSRemoveRecipe;
-import org.apache.stanbol.rules.manager.changes.KReSRemoveRule;
-import org.apache.stanbol.rules.manager.changes.KReSRuleStore;
+import org.apache.stanbol.rules.manager.changes.AddRecipe;
+import org.apache.stanbol.rules.manager.changes.AddRule;
+import org.apache.stanbol.rules.manager.changes.GetRecipe;
+import org.apache.stanbol.rules.manager.changes.GetRule;
+import org.apache.stanbol.rules.manager.changes.RemoveRecipe;
+import org.apache.stanbol.rules.manager.changes.RemoveRule;
+import org.apache.stanbol.rules.manager.changes.RuleStoreImpl;
import org.semanticweb.owlapi.apibinding.OWLManager;
import org.semanticweb.owlapi.model.AddImport;
import org.semanticweb.owlapi.model.IRI;
@@ -64,9 +64,9 @@ import org.apache.stanbol.kres.jersey.re
*
*/
@Path("/rule")
-public class Rule extends NavigationMixin{
+public class RestRule extends NavigationMixin{
- protected KReSONManager onm;
+ protected ONManager onm;
protected OntologyStorage storage;
private Logger log = LoggerFactory.getLogger(getClass());
@@ -76,16 +76,16 @@ public class Rule extends NavigationMixi
private String desc;
/**
- * To get the KReSRuleStore where are stored the rules and the recipes
+ * To get the RuleStoreImpl where are stored the rules and the recipes
*
* @param servletContext
* {To get the context where the REST service is running.}
*/
- public Rule(@Context ServletContext servletContext){
+ public RestRule(@Context ServletContext servletContext){
this.kresRuleStore = (RuleStore) servletContext
.getAttribute(RuleStore.class.getName());
- this.onm = (KReSONManager) servletContext
- .getAttribute(KReSONManager.class.getName());
+ this.onm = (ONManager) servletContext
+ .getAttribute(ONManager.class.getName());
// this.storage = (OntologyStorage) servletContext
// .getAttribute(OntologyStorage.class.getName());
// Contingency code for missing components follows.
@@ -96,7 +96,7 @@ public class Rule extends NavigationMixi
if (onm == null) {
log
.warn("No KReSONManager in servlet context. Instantiating manually...");
- onm = new ONManager(new TcManager(), null,
+ onm = new ONManagerImpl(new TcManager(), null,
new Hashtable<String, Object>());
}
this.storage = onm.getOntologyStore();
@@ -108,7 +108,7 @@ public class Rule extends NavigationMixi
if (kresRuleStore == null) {
log
.warn("No KReSRuleStore with stored rules and recipes found in servlet context. Instantiating manually with default values...");
- this.kresRuleStore = new KReSRuleStore(onm,
+ this.kresRuleStore = new RuleStoreImpl(onm,
new Hashtable<String, Object>(), "");
log
.debug("PATH TO OWL FILE LOADED: "
@@ -139,7 +139,7 @@ public class Rule extends NavigationMixi
try{
- KReSGetRule recipe = new KReSGetRule(kresRuleStore);
+ GetRule recipe = new GetRule(kresRuleStore);
if(uri.equals("all")){
HashMap<IRI, String> rule = recipe.getAllRules();
@@ -260,7 +260,7 @@ public class Rule extends NavigationMixi
@Produces(value = { KReSFormat.RDF_XML, KReSFormat.RDF_JSON })
public Response getRulesOfRecipe(@PathParam("uri") String recipeURI){
- KReSGetRule kReSGetRule = new KReSGetRule(kresRuleStore);
+ GetRule kReSGetRule = new GetRule(kresRuleStore);
String recipeURIEnc;
try {
recipeURIEnc = URLEncoder
@@ -334,7 +334,7 @@ public class Rule extends NavigationMixi
//The rule is already inside the rule store
if((kres_syntax==null)){
//Get the rule
- KReSGetRule inrule = new KReSGetRule(kresRuleStore);
+ GetRule inrule = new GetRule(kresRuleStore);
this.map = inrule.getRule(IRI.create(rule));
if(map==null){
@@ -342,7 +342,7 @@ public class Rule extends NavigationMixi
}
//Get the recipe
- KReSGetRecipe getrecipe = new KReSGetRecipe(kresRuleStore);
+ GetRecipe getrecipe = new GetRecipe(kresRuleStore);
this.map = getrecipe.getRecipe(IRI.create(recipe));
if(map!=null){
this.desc = getrecipe.getDescription(IRI.create(recipe));
@@ -361,14 +361,14 @@ public class Rule extends NavigationMixi
//Add the new rule to the end
ruleseq.add(IRI.create(rule));
//Remove the old recipe
- KReSRemoveRecipe remove = new KReSRemoveRecipe(kresRuleStore);
+ RemoveRecipe remove = new RemoveRecipe(kresRuleStore);
boolean ok = remove.removeRecipe(IRI.create(recipe));
if(!ok)
return Response.status(Status.CONFLICT).build();
//Add the recipe with the new rule
- KReSAddRecipe newadd = new KReSAddRecipe(kresRuleStore);
+ AddRecipe newadd = new AddRecipe(kresRuleStore);
ok = newadd.addRecipe(IRI.create(recipe), ruleseq, desc);
if(ok){
@@ -382,7 +382,7 @@ public class Rule extends NavigationMixi
//The rule is added to the store and to the recipe
if((kres_syntax!=null)&(description!=null)){
//Get the rule
- KReSAddRule inrule = new KReSAddRule(kresRuleStore);
+ AddRule inrule = new AddRule(kresRuleStore);
boolean ok = inrule.addRule(IRI.create(rule), kres_syntax,
description);
if(!ok){
@@ -391,7 +391,7 @@ public class Rule extends NavigationMixi
}
//Get the recipe
- KReSGetRecipe getrecipe = new KReSGetRecipe(kresRuleStore);
+ GetRecipe getrecipe = new GetRecipe(kresRuleStore);
this.map = getrecipe.getRecipe(IRI.create(recipe));
System.out.println("RECIPE FOR RULE: "+recipe);
if(map!=null){
@@ -412,7 +412,7 @@ public class Rule extends NavigationMixi
//Add the new rule to the end
ruleseq.add(IRI.create(rule));
//Remove the old recipe
- KReSRemoveRecipe remove = new KReSRemoveRecipe(kresRuleStore);
+ RemoveRecipe remove = new RemoveRecipe(kresRuleStore);
ok = remove.removeRecipe(IRI.create(recipe));
if(!ok){
System.err.println("ERROR TO REMOVE OLD RECIPE: "+recipe);
@@ -420,7 +420,7 @@ public class Rule extends NavigationMixi
}
//Add the recipe with the new rule
- KReSAddRecipe newadd = new KReSAddRecipe(kresRuleStore);
+ AddRecipe newadd = new AddRecipe(kresRuleStore);
ok = newadd.addRecipe(IRI.create(recipe), ruleseq, desc);
if(ok){
kresRuleStore.saveOntology();
@@ -471,14 +471,14 @@ public class Rule extends NavigationMixi
recipe = recipe.replace(" ","").trim();
rule = rule.replace(" ","").trim();
//Get the rule
- KReSGetRule getrule = new KReSGetRule(kresRuleStore);
+ GetRule getrule = new GetRule(kresRuleStore);
this.map = getrule.getRule(IRI.create(rule));
if(map==null){
return Response.status(Status.NOT_FOUND).build();
}
//Get the recipe
- KReSGetRecipe getrecipe = new KReSGetRecipe(kresRuleStore);
+ GetRecipe getrecipe = new GetRecipe(kresRuleStore);
this.map = getrecipe.getRecipe(IRI.create(recipe));
if(map!=null){
this.desc = getrecipe.getDescription(IRI.create(recipe));
@@ -488,7 +488,7 @@ public class Rule extends NavigationMixi
return Response.status(Status.NOT_FOUND).build();
}
- KReSRemoveRule remove = new KReSRemoveRule(kresRuleStore);
+ RemoveRule remove = new RemoveRule(kresRuleStore);
ok = remove.removeRuleFromRecipe(IRI.create(rule), IRI
.create(recipe));
if(ok){
@@ -503,14 +503,14 @@ public class Rule extends NavigationMixi
if((recipe==null)&&(rule!=null)){
rule = rule.replace(" ","").trim();
//Get the rule
- KReSGetRule getrule = new KReSGetRule(kresRuleStore);
+ GetRule getrule = new GetRule(kresRuleStore);
this.map = getrule.getRule(IRI.create(rule));
if(map==null){
return Response.status(Status.NOT_FOUND).build();
}
//Remove the old recipe
- KReSRemoveRule remove = new KReSRemoveRule(kresRuleStore);
+ RemoveRule remove = new RemoveRule(kresRuleStore);
ok = remove.removeRule(IRI.create(rule));
if(ok){
Modified: incubator/stanbol/trunk/kres/rules/web/src/main/java/org/apache/stanbol/rules/web/RuleStoreResource.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/rules/web/src/main/java/org/apache/stanbol/rules/web/RuleStoreResource.java?rev=1085398&r1=1085397&r2=1085398&view=diff
==============================================================================
--- incubator/stanbol/trunk/kres/rules/web/src/main/java/org/apache/stanbol/rules/web/RuleStoreResource.java (original)
+++ incubator/stanbol/trunk/kres/rules/web/src/main/java/org/apache/stanbol/rules/web/RuleStoreResource.java Fri Mar 25 14:29:44 2011
@@ -12,7 +12,7 @@ import javax.ws.rs.Produces;
import javax.ws.rs.core.Context;
import javax.ws.rs.core.Response;
-import org.apache.stanbol.rules.manager.changes.KReSRuleStore;
+import org.apache.stanbol.rules.manager.changes.RuleStoreImpl;
/**
*
@@ -21,15 +21,15 @@ import org.apache.stanbol.rules.manager.
@Path("/rulestore")
public class RuleStoreResource {
- private KReSRuleStore kresRuleStore;
+ private RuleStoreImpl kresRuleStore;
/**
- * To get the KReSRuleStore where are stored the rules and the recipes
+ * To get the RuleStoreImpl where are stored the rules and the recipes
*
* @param servletContext {To get the context where the REST service is running.}
*/
public RuleStoreResource(@Context ServletContext servletContext){
- this.kresRuleStore = (KReSRuleStore) servletContext.getAttribute(KReSRuleStore.class.getName());
+ this.kresRuleStore = (RuleStoreImpl) servletContext.getAttribute(RuleStoreImpl.class.getName());
if (kresRuleStore == null) {
throw new IllegalStateException(
"KReSRuleStore with stored rules and recipes is missing in ServletContext");
@@ -37,8 +37,8 @@ public class RuleStoreResource {
}
/**
- * To get the KReSRuleStore in the serveletContext.
- * @return {An object of type KReSRuleStore.}
+ * To get the RuleStoreImpl in the serveletContext.
+ * @return {An object of type RuleStoreImpl.}
*/
@GET
//@Consumes(MediaType.APPLICATION_FORM_URLENCODED)