You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stanbol.apache.org by al...@apache.org on 2011/03/29 09:12:57 UTC
svn commit: r1086500 - in /incubator/stanbol/trunk/kres:
jersey/src/main/java/org/apache/stanbol/kres/jersey/
jersey/src/main/java/org/apache/stanbol/kres/jersey/format/
jersey/src/main/java/org/apache/stanbol/kres/jersey/processors/
jersey/src/main/ja...
Author: alexdma
Date: Tue Mar 29 07:12:56 2011
New Revision: 1086500
URL: http://svn.apache.org/viewvc?rev=1086500&view=rev
Log:
STANBOL-39 :
- Renamed KReSFormat to KRFormat and KReSViewProcessor to ViewProcessorImpl
- Removed rogue kres package from ontologymanager/web
Added:
incubator/stanbol/trunk/kres/jersey/src/main/java/org/apache/stanbol/kres/jersey/format/KRFormat.java
- copied, changed from r1086497, incubator/stanbol/trunk/kres/jersey/src/main/java/org/apache/stanbol/kres/jersey/format/KReSFormat.java
incubator/stanbol/trunk/kres/jersey/src/main/java/org/apache/stanbol/kres/jersey/processors/ViewProcessorImpl.java
- copied, changed from r1086497, incubator/stanbol/trunk/kres/jersey/src/main/java/org/apache/stanbol/kres/jersey/processors/KReSViewProcessor.java
Removed:
incubator/stanbol/trunk/kres/jersey/src/main/java/org/apache/stanbol/kres/jersey/format/KReSFormat.java
incubator/stanbol/trunk/kres/jersey/src/main/java/org/apache/stanbol/kres/jersey/processors/KReSViewProcessor.java
incubator/stanbol/trunk/kres/ontologymanager/web/src/main/java/org/apache/stanbol/kres/
Modified:
incubator/stanbol/trunk/kres/jersey/src/main/java/org/apache/stanbol/kres/jersey/JerseyEndpoint.java
incubator/stanbol/trunk/kres/jersey/src/main/java/org/apache/stanbol/kres/jersey/JerseyEndpointApplication.java
incubator/stanbol/trunk/kres/jersey/src/main/java/org/apache/stanbol/kres/jersey/writers/OWLOntologyWriter.java
incubator/stanbol/trunk/kres/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/JerseyEndpoint.java
incubator/stanbol/trunk/kres/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/JerseyEndpointApplication.java
incubator/stanbol/trunk/kres/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/resources/GraphsResource.java
incubator/stanbol/trunk/kres/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/resources/ONMRootResource.java
incubator/stanbol/trunk/kres/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/resources/ONMScopeOntologyResource.java
incubator/stanbol/trunk/kres/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/resources/ONMScopeResource.java
incubator/stanbol/trunk/kres/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/resources/SessionResource.java
incubator/stanbol/trunk/kres/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/util/OntologyRenderUtils.java
incubator/stanbol/trunk/kres/ontologymanager/web/src/test/java/org/apache/stanbol/ontologymanager/web/JettyServerTest.java
incubator/stanbol/trunk/kres/reasoners/web/src/main/java/org/apache/stanbol/reasoners/web/Classify.java
incubator/stanbol/trunk/kres/reasoners/web/src/main/java/org/apache/stanbol/reasoners/web/JerseyEndpoint.java
incubator/stanbol/trunk/kres/reasoners/web/src/main/java/org/apache/stanbol/reasoners/web/JerseyEndpointApplication.java
incubator/stanbol/trunk/kres/reengineer/web/src/main/java/org/apache/stanbol/reengineer/web/JerseyEndpoint.java
incubator/stanbol/trunk/kres/reengineer/web/src/main/java/org/apache/stanbol/reengineer/web/JerseyEndpointApplication.java
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/RefactorerResource.java
incubator/stanbol/trunk/kres/rules/web/src/main/java/org/apache/stanbol/rules/web/RestRecipe.java
incubator/stanbol/trunk/kres/rules/web/src/main/java/org/apache/stanbol/rules/web/RestRule.java
Modified: incubator/stanbol/trunk/kres/jersey/src/main/java/org/apache/stanbol/kres/jersey/JerseyEndpoint.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/jersey/src/main/java/org/apache/stanbol/kres/jersey/JerseyEndpoint.java?rev=1086500&r1=1086499&r2=1086500&view=diff
==============================================================================
--- incubator/stanbol/trunk/kres/jersey/src/main/java/org/apache/stanbol/kres/jersey/JerseyEndpoint.java (original)
+++ incubator/stanbol/trunk/kres/jersey/src/main/java/org/apache/stanbol/kres/jersey/JerseyEndpoint.java Tue Mar 29 07:12:56 2011
@@ -12,7 +12,7 @@ import org.apache.clerezza.rdf.core.seri
import org.apache.felix.scr.annotations.Component;
import org.apache.felix.scr.annotations.Property;
import org.apache.felix.scr.annotations.Reference;
-import org.apache.stanbol.kres.jersey.processors.KReSViewProcessor;
+import org.apache.stanbol.kres.jersey.processors.ViewProcessorImpl;
import org.osgi.framework.BundleContext;
import org.osgi.service.component.ComponentContext;
import org.osgi.service.http.HttpService;
@@ -110,7 +110,7 @@ public class JerseyEndpoint {
servletContext.setAttribute(STATIC_RESOURCES_URL_ROOT_PROPERTY,
staticUrlRoot);
servletContext.setAttribute(
- KReSViewProcessor.FREEMARKER_TEMPLATE_PATH_INIT_PARAM,
+ ViewProcessorImpl.FREEMARKER_TEMPLATE_PATH_INIT_PARAM,
freemakerTemplates);
log.info("Jersey servlet registered at {}", alias);
Modified: incubator/stanbol/trunk/kres/jersey/src/main/java/org/apache/stanbol/kres/jersey/JerseyEndpointApplication.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/jersey/src/main/java/org/apache/stanbol/kres/jersey/JerseyEndpointApplication.java?rev=1086500&r1=1086499&r2=1086500&view=diff
==============================================================================
--- incubator/stanbol/trunk/kres/jersey/src/main/java/org/apache/stanbol/kres/jersey/JerseyEndpointApplication.java (original)
+++ incubator/stanbol/trunk/kres/jersey/src/main/java/org/apache/stanbol/kres/jersey/JerseyEndpointApplication.java Tue Mar 29 07:12:56 2011
@@ -5,7 +5,7 @@ import java.util.Set;
import javax.ws.rs.core.Application;
-import org.apache.stanbol.kres.jersey.processors.KReSViewProcessor;
+import org.apache.stanbol.kres.jersey.processors.ViewProcessorImpl;
import org.apache.stanbol.kres.jersey.resource.DocumentationResource;
import org.apache.stanbol.kres.jersey.resource.RESTfulResource;
import org.apache.stanbol.kres.jersey.resource.RootResource;
@@ -50,7 +50,7 @@ public class JerseyEndpointApplication e
public Set<Object> getSingletons() {
Set<Object> singletons = new HashSet<Object>();
// view processors
- singletons.add(new KReSViewProcessor());
+ singletons.add(new ViewProcessorImpl());
return singletons;
}
Copied: incubator/stanbol/trunk/kres/jersey/src/main/java/org/apache/stanbol/kres/jersey/format/KRFormat.java (from r1086497, incubator/stanbol/trunk/kres/jersey/src/main/java/org/apache/stanbol/kres/jersey/format/KReSFormat.java)
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/jersey/src/main/java/org/apache/stanbol/kres/jersey/format/KRFormat.java?p2=incubator/stanbol/trunk/kres/jersey/src/main/java/org/apache/stanbol/kres/jersey/format/KRFormat.java&p1=incubator/stanbol/trunk/kres/jersey/src/main/java/org/apache/stanbol/kres/jersey/format/KReSFormat.java&r1=1086497&r2=1086500&rev=1086500&view=diff
==============================================================================
--- incubator/stanbol/trunk/kres/jersey/src/main/java/org/apache/stanbol/kres/jersey/format/KReSFormat.java (original)
+++ incubator/stanbol/trunk/kres/jersey/src/main/java/org/apache/stanbol/kres/jersey/format/KRFormat.java Tue Mar 29 07:12:56 2011
@@ -2,33 +2,37 @@ package org.apache.stanbol.kres.jersey.f
import javax.ws.rs.core.MediaType;
-public class KReSFormat extends MediaType {
+/**
+ * Additional MIME types for knowledge representation formats.
+ *
+ * @author andrea.nuzzolese
+ * @author alessandro
+ *
+ */
+public class KRFormat extends MediaType {
+
+ public static final String RDF_XML = "application/rdf+xml";
+
+ public static final MediaType RDF_XML_TYPE = new MediaType("application", "rdf+xml");
+
+ public static final String OWL_XML = "application/owl+xml";
+
+ public static final MediaType OWL_XML_TYPE = new MediaType("application", "owl+xml");
+
+ public static final String MANCHESTER_OWL = "application/manchester+owl";
+
+ public static final MediaType MANCHESTER_OWL_TYPE = new MediaType("application", "manchester+xml");
+
+ public static final String FUNCTIONAL_OWL = "application/functional+owl";
+
+ public static final MediaType FUNCTIONAL_OWL_TYPE = new MediaType("application", "functional+xml");
+
+ public static final String TURTLE = "application/turtle";
+
+ public static final MediaType TURTLE_TYPE = new MediaType("application", "turtle");
+
+ public static final String RDF_JSON = "application/rdf+json";
+
+ public static final MediaType RDF_JSON_TYPE = new MediaType("application", "rdf+json");
-
-
- public static final String RDF_XML = "application/rdf+xml";
-
- public static final MediaType RDF_XML_TYPE = new MediaType("application", "rdf+xml");
-
- public static final String OWL_XML = "application/owl+xml";
-
- public static final MediaType OWL_XML_TYPE = new MediaType("application", "owl+xml");
-
- public static final String MANCHESTER_OWL = "application/manchester+owl";
-
- public static final MediaType MANCHESTER_OWL_TYPE = new MediaType("application", "manchester+xml");
-
- public static final String FUNCTIONAL_OWL = "application/functional+owl";
-
- public static final MediaType FUNCTIONAL_OWL_TYPE = new MediaType("application", "functional+xml");
-
- public static final String TURTLE = "application/turtle";
-
- public static final MediaType TURTLE_TYPE = new MediaType("application", "turtle");
-
- public static final String RDF_JSON = "application/rdf+json";
-
- public static final MediaType RDF_JSON_TYPE = new MediaType("application", "rdf+json");
-
-
}
Copied: incubator/stanbol/trunk/kres/jersey/src/main/java/org/apache/stanbol/kres/jersey/processors/ViewProcessorImpl.java (from r1086497, incubator/stanbol/trunk/kres/jersey/src/main/java/org/apache/stanbol/kres/jersey/processors/KReSViewProcessor.java)
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/jersey/src/main/java/org/apache/stanbol/kres/jersey/processors/ViewProcessorImpl.java?p2=incubator/stanbol/trunk/kres/jersey/src/main/java/org/apache/stanbol/kres/jersey/processors/ViewProcessorImpl.java&p1=incubator/stanbol/trunk/kres/jersey/src/main/java/org/apache/stanbol/kres/jersey/processors/KReSViewProcessor.java&r1=1086497&r2=1086500&rev=1086500&view=diff
==============================================================================
--- incubator/stanbol/trunk/kres/jersey/src/main/java/org/apache/stanbol/kres/jersey/processors/KReSViewProcessor.java (original)
+++ incubator/stanbol/trunk/kres/jersey/src/main/java/org/apache/stanbol/kres/jersey/processors/ViewProcessorImpl.java Tue Mar 29 07:12:56 2011
@@ -56,7 +56,7 @@ import freemarker.template.Template;
*/
@Singleton
@Provider
-public class KReSViewProcessor implements ViewProcessor<Template> {
+public class ViewProcessorImpl implements ViewProcessor<Template> {
public static final String FREEMARKER_TEMPLATE_PATH_INIT_PARAM = "kres.freemarker.template.path";
@@ -69,7 +69,7 @@ public class KReSViewProcessor implement
@Context
protected ServletContext context;
- public KReSViewProcessor() {
+ public ViewProcessorImpl() {
}
/**
Modified: incubator/stanbol/trunk/kres/jersey/src/main/java/org/apache/stanbol/kres/jersey/writers/OWLOntologyWriter.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/jersey/src/main/java/org/apache/stanbol/kres/jersey/writers/OWLOntologyWriter.java?rev=1086500&r1=1086499&r2=1086500&view=diff
==============================================================================
--- incubator/stanbol/trunk/kres/jersey/src/main/java/org/apache/stanbol/kres/jersey/writers/OWLOntologyWriter.java (original)
+++ incubator/stanbol/trunk/kres/jersey/src/main/java/org/apache/stanbol/kres/jersey/writers/OWLOntologyWriter.java Tue Mar 29 07:12:56 2011
@@ -30,12 +30,12 @@ import org.semanticweb.owlapi.model.OWLO
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.apache.stanbol.kres.jersey.format.KReSFormat;
+import org.apache.stanbol.kres.jersey.format.KRFormat;
import org.apache.stanbol.owlapi.trasformation.OWLAPIToClerezzaConverter;
@Provider
-@Produces( { KReSFormat.RDF_XML, KReSFormat.OWL_XML, KReSFormat.MANCHESTER_OWL,
- KReSFormat.FUNCTIONAL_OWL, KReSFormat.TURTLE, KReSFormat.RDF_JSON })
+@Produces( { KRFormat.RDF_XML, KRFormat.OWL_XML, KRFormat.MANCHESTER_OWL,
+ KRFormat.FUNCTIONAL_OWL, KRFormat.TURTLE, KRFormat.RDF_JSON })
public class OWLOntologyWriter implements MessageBodyWriter<OWLOntology> {
protected Serializer serializer;
@@ -79,39 +79,39 @@ public class OWLOntologyWriter implement
log.debug("Rendering ontology " + ontology.getOntologyID()
+ "to KReS format " + mediaType);
- if (mediaType.toString().equals(KReSFormat.RDF_XML)) {
+ if (mediaType.toString().equals(KRFormat.RDF_XML)) {
try {
manager.saveOntology(ontology, new RDFXMLOntologyFormat(), out);
} catch (OWLOntologyStorageException e) {
log.error("Failed to store ontology for rendering.", e);
}
- } else if (mediaType.toString().equals(KReSFormat.OWL_XML)) {
+ } else if (mediaType.toString().equals(KRFormat.OWL_XML)) {
try {
manager.saveOntology(ontology, new OWLXMLOntologyFormat(), out);
} catch (OWLOntologyStorageException e) {
log.error("Failed to store ontology for rendering.", e);
}
- } else if (mediaType.toString().equals(KReSFormat.MANCHESTER_OWL)) {
+ } else if (mediaType.toString().equals(KRFormat.MANCHESTER_OWL)) {
try {
manager.saveOntology(ontology,
new ManchesterOWLSyntaxOntologyFormat(), out);
} catch (OWLOntologyStorageException e) {
log.error("Failed to store ontology for rendering.", e);
}
- } else if (mediaType.toString().equals(KReSFormat.FUNCTIONAL_OWL)) {
+ } else if (mediaType.toString().equals(KRFormat.FUNCTIONAL_OWL)) {
try {
manager.saveOntology(ontology,
new OWLFunctionalSyntaxOntologyFormat(), out);
} catch (OWLOntologyStorageException e) {
log.error("Failed to store ontology for rendering.", e);
}
- } else if (mediaType.toString().equals(KReSFormat.TURTLE)) {
+ } else if (mediaType.toString().equals(KRFormat.TURTLE)) {
try {
manager.saveOntology(ontology, new TurtleOntologyFormat(), out);
} catch (OWLOntologyStorageException e) {
log.error("Failed to store ontology for rendering.", e);
}
- } else if (mediaType.toString().equals(KReSFormat.RDF_JSON)) {
+ } else if (mediaType.toString().equals(KRFormat.RDF_JSON)) {
MGraph mGraph = OWLAPIToClerezzaConverter
.owlOntologyToClerezzaMGraph(ontology);
Modified: incubator/stanbol/trunk/kres/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/JerseyEndpoint.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/JerseyEndpoint.java?rev=1086500&r1=1086499&r2=1086500&view=diff
==============================================================================
--- incubator/stanbol/trunk/kres/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/JerseyEndpoint.java (original)
+++ incubator/stanbol/trunk/kres/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/JerseyEndpoint.java Tue Mar 29 07:12:56 2011
@@ -20,7 +20,7 @@ import org.slf4j.LoggerFactory;
import com.sun.jersey.spi.container.servlet.ServletContainer;
-import org.apache.stanbol.kres.jersey.processors.KReSViewProcessor;
+import org.apache.stanbol.kres.jersey.processors.ViewProcessorImpl;
/**
* Jersey-based RESTful endpoint for KReS.
@@ -106,7 +106,7 @@ public class JerseyEndpoint {
servletContext.setAttribute(STATIC_RESOURCES_URL_ROOT_PROPERTY,
staticUrlRoot);
servletContext.setAttribute(
- KReSViewProcessor.FREEMARKER_TEMPLATE_PATH_INIT_PARAM,
+ ViewProcessorImpl.FREEMARKER_TEMPLATE_PATH_INIT_PARAM,
freemakerTemplates);
log.info("Jersey servlet registered at {}", alias);
Modified: incubator/stanbol/trunk/kres/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/JerseyEndpointApplication.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/JerseyEndpointApplication.java?rev=1086500&r1=1086499&r2=1086500&view=diff
==============================================================================
--- incubator/stanbol/trunk/kres/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/JerseyEndpointApplication.java (original)
+++ incubator/stanbol/trunk/kres/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/JerseyEndpointApplication.java Tue Mar 29 07:12:56 2011
@@ -5,7 +5,7 @@ import java.util.Set;
import javax.ws.rs.core.Application;
-import org.apache.stanbol.kres.jersey.processors.KReSViewProcessor;
+import org.apache.stanbol.kres.jersey.processors.ViewProcessorImpl;
import org.apache.stanbol.kres.jersey.writers.GraphWriter;
import org.apache.stanbol.kres.jersey.writers.OWLOntologyWriter;
import org.apache.stanbol.kres.jersey.writers.ResultSetWriter;
@@ -57,7 +57,7 @@ public class JerseyEndpointApplication e
public Set<Object> getSingletons() {
Set<Object> singletons = new HashSet<Object>();
// view processors
- singletons.add(new KReSViewProcessor());
+ singletons.add(new ViewProcessorImpl());
return singletons;
}
Modified: incubator/stanbol/trunk/kres/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/resources/GraphsResource.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/resources/GraphsResource.java?rev=1086500&r1=1086499&r2=1086500&view=diff
==============================================================================
--- incubator/stanbol/trunk/kres/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/resources/GraphsResource.java (original)
+++ incubator/stanbol/trunk/kres/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/resources/GraphsResource.java Tue Mar 29 07:12:56 2011
@@ -20,7 +20,7 @@ import javax.ws.rs.core.Response;
import javax.ws.rs.core.UriInfo;
import org.apache.clerezza.rdf.core.access.TcManager;
-import org.apache.stanbol.kres.jersey.format.KReSFormat;
+import org.apache.stanbol.kres.jersey.format.KRFormat;
import org.apache.stanbol.kres.jersey.resource.NavigationMixin;
import org.apache.stanbol.ontologymanager.ontonet.api.ONManager;
import org.apache.stanbol.ontologymanager.ontonet.impl.io.ClerezzaOntologyStorage;
@@ -63,8 +63,8 @@ public class GraphsResource extends Navi
@GET
@Path("/resume")
- @Produces( {KReSFormat.FUNCTIONAL_OWL, KReSFormat.MANCHESTER_OWL, KReSFormat.OWL_XML, KReSFormat.RDF_XML,
- KReSFormat.TURTLE, KReSFormat.RDF_JSON})
+ @Produces( {KRFormat.FUNCTIONAL_OWL, KRFormat.MANCHESTER_OWL, KRFormat.OWL_XML, KRFormat.RDF_XML,
+ KRFormat.TURTLE, KRFormat.RDF_JSON})
public Response graphs(@Context HttpHeaders headers, @Context ServletContext servletContext) {
Set<IRI> iris = storage.listGraphs();
if (iris != null) {
Modified: incubator/stanbol/trunk/kres/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/resources/ONMRootResource.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/resources/ONMRootResource.java?rev=1086500&r1=1086499&r2=1086500&view=diff
==============================================================================
--- incubator/stanbol/trunk/kres/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/resources/ONMRootResource.java (original)
+++ incubator/stanbol/trunk/kres/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/resources/ONMRootResource.java Tue Mar 29 07:12:56 2011
@@ -26,7 +26,7 @@ import org.semanticweb.owlapi.model.OWLO
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.apache.stanbol.kres.jersey.format.KReSFormat;
+import org.apache.stanbol.kres.jersey.format.KRFormat;
import org.apache.stanbol.kres.jersey.resource.NavigationMixin;
/**
@@ -108,8 +108,8 @@ if (storage == null) {
* @return a string representation of the requested scope set, in a format acceptable by the client.
*/
@GET
- @Produces(value = {KReSFormat.RDF_XML, KReSFormat.OWL_XML, KReSFormat.TURTLE, KReSFormat.FUNCTIONAL_OWL,
- KReSFormat.MANCHESTER_OWL, KReSFormat.RDF_JSON})
+ @Produces(value = {KRFormat.RDF_XML, KRFormat.OWL_XML, KRFormat.TURTLE, KRFormat.FUNCTIONAL_OWL,
+ KRFormat.MANCHESTER_OWL, KRFormat.RDF_JSON})
public Response getScopes(@DefaultValue("false") @QueryParam("with-inactive") boolean inactive,
@Context HttpHeaders headers,
@Context ServletContext servletContext) {
Modified: incubator/stanbol/trunk/kres/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/resources/ONMScopeOntologyResource.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/resources/ONMScopeOntologyResource.java?rev=1086500&r1=1086499&r2=1086500&view=diff
==============================================================================
--- incubator/stanbol/trunk/kres/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/resources/ONMScopeOntologyResource.java (original)
+++ incubator/stanbol/trunk/kres/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/resources/ONMScopeOntologyResource.java Tue Mar 29 07:12:56 2011
@@ -42,7 +42,7 @@ import org.semanticweb.owlapi.util.OWLOn
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.apache.stanbol.kres.jersey.format.KReSFormat;
+import org.apache.stanbol.kres.jersey.format.KRFormat;
import org.apache.stanbol.kres.jersey.resource.NavigationMixin;
/**
@@ -98,8 +98,8 @@ if (storage == null) {
* that scope.
*/
@GET
- @Produces(value = {KReSFormat.RDF_XML, KReSFormat.OWL_XML, KReSFormat.TURTLE, KReSFormat.FUNCTIONAL_OWL,
- KReSFormat.MANCHESTER_OWL, KReSFormat.RDF_JSON})
+ @Produces(value = {KRFormat.RDF_XML, KRFormat.OWL_XML, KRFormat.TURTLE, KRFormat.FUNCTIONAL_OWL,
+ KRFormat.MANCHESTER_OWL, KRFormat.RDF_JSON})
public Response getScopeOntology(@PathParam("scopeid") String scopeid,
@PathParam("uri") String ontologyid,
@Context UriInfo uriInfo) {
Modified: incubator/stanbol/trunk/kres/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/resources/ONMScopeResource.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/resources/ONMScopeResource.java?rev=1086500&r1=1086499&r2=1086500&view=diff
==============================================================================
--- incubator/stanbol/trunk/kres/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/resources/ONMScopeResource.java (original)
+++ incubator/stanbol/trunk/kres/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/resources/ONMScopeResource.java Tue Mar 29 07:12:56 2011
@@ -44,7 +44,7 @@ import org.semanticweb.owlapi.model.OWLO
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.apache.stanbol.kres.jersey.format.KReSFormat;
+import org.apache.stanbol.kres.jersey.format.KRFormat;
import org.apache.stanbol.kres.jersey.resource.NavigationMixin;
@Path("/ontology/{scopeid}")
@@ -101,9 +101,9 @@ if (storage == null) {
}
@GET
- @Produces(value = { KReSFormat.RDF_XML, KReSFormat.OWL_XML,
- KReSFormat.TURTLE, KReSFormat.FUNCTIONAL_OWL,
- KReSFormat.MANCHESTER_OWL, KReSFormat.RDF_JSON })
+ @Produces(value = { KRFormat.RDF_XML, KRFormat.OWL_XML,
+ KRFormat.TURTLE, KRFormat.FUNCTIONAL_OWL,
+ KRFormat.MANCHESTER_OWL, KRFormat.RDF_JSON })
public Response getTopOntology(@Context UriInfo uriInfo,
@Context HttpHeaders headers, @Context ServletContext servletContext) {
Modified: incubator/stanbol/trunk/kres/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/resources/SessionResource.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/resources/SessionResource.java?rev=1086500&r1=1086499&r2=1086500&view=diff
==============================================================================
--- incubator/stanbol/trunk/kres/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/resources/SessionResource.java (original)
+++ incubator/stanbol/trunk/kres/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/resources/SessionResource.java Tue Mar 29 07:12:56 2011
@@ -38,7 +38,7 @@ import org.semanticweb.owlapi.model.IRI;
import org.semanticweb.owlapi.model.OWLOntology;
import org.semanticweb.owlapi.model.OWLOntologyCreationException;
-import org.apache.stanbol.kres.jersey.format.KReSFormat;
+import org.apache.stanbol.kres.jersey.format.KRFormat;
import org.apache.stanbol.kres.jersey.resource.NavigationMixin;
@Path("/session")
@@ -122,8 +122,8 @@ public class SessionResource extends Nav
@POST
@Consumes(MediaType.APPLICATION_FORM_URLENCODED)
- @Produces(value = {KReSFormat.RDF_XML, KReSFormat.OWL_XML, KReSFormat.TURTLE, KReSFormat.FUNCTIONAL_OWL,
- KReSFormat.MANCHESTER_OWL, KReSFormat.RDF_JSON})
+ @Produces(value = {KRFormat.RDF_XML, KRFormat.OWL_XML, KRFormat.TURTLE, KRFormat.FUNCTIONAL_OWL,
+ KRFormat.MANCHESTER_OWL, KRFormat.RDF_JSON})
public Response createSession(@FormParam("scope") String scope,
@Context UriInfo uriInfo,
@Context HttpHeaders headers) {
Modified: incubator/stanbol/trunk/kres/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/util/OntologyRenderUtils.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/util/OntologyRenderUtils.java?rev=1086500&r1=1086499&r2=1086500&view=diff
==============================================================================
--- incubator/stanbol/trunk/kres/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/util/OntologyRenderUtils.java (original)
+++ incubator/stanbol/trunk/kres/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/util/OntologyRenderUtils.java Tue Mar 29 07:12:56 2011
@@ -24,7 +24,7 @@ import org.semanticweb.owlapi.model.OWLO
import org.semanticweb.owlapi.model.OWLOntologyManager;
import org.semanticweb.owlapi.model.OWLOntologyStorageException;
-import org.apache.stanbol.kres.jersey.format.KReSFormat;
+import org.apache.stanbol.kres.jersey.format.KRFormat;
/**
* Contains hacks to regular ontology renderers with replacements for input statements.
@@ -138,21 +138,21 @@ public class OntologyRenderUtils {
else
o2 = ont;
- if (format.equals(KReSFormat.RDF_XML)) {
+ if (format.equals(KRFormat.RDF_XML)) {
try {
tmpmgr.saveOntology(o2, new RDFXMLOntologyFormat(), tgt);
} catch (OWLOntologyStorageException e) {
// TODO Auto-generated catch block
e.printStackTrace();
}
- } else if (format.equals(KReSFormat.OWL_XML)) {
+ } else if (format.equals(KRFormat.OWL_XML)) {
try {
tmpmgr.saveOntology(o2, new OWLXMLOntologyFormat(), tgt);
} catch (OWLOntologyStorageException e) {
// TODO Auto-generated catch block
e.printStackTrace();
}
- } else if (format.equals(KReSFormat.MANCHESTER_OWL)) {
+ } else if (format.equals(KRFormat.MANCHESTER_OWL)) {
try {
tmpmgr.saveOntology(o2,
new ManchesterOWLSyntaxOntologyFormat(), tgt);
@@ -160,7 +160,7 @@ public class OntologyRenderUtils {
// TODO Auto-generated catch block
e.printStackTrace();
}
- } else if (format.equals(KReSFormat.FUNCTIONAL_OWL)) {
+ } else if (format.equals(KRFormat.FUNCTIONAL_OWL)) {
try {
tmpmgr.saveOntology(o2,
new OWLFunctionalSyntaxOntologyFormat(), tgt);
@@ -168,7 +168,7 @@ public class OntologyRenderUtils {
// TODO Auto-generated catch block
e.printStackTrace();
}
- } else if (format.equals(KReSFormat.TURTLE)) {
+ } else if (format.equals(KRFormat.TURTLE)) {
try {
tmpmgr.saveOntology(o2, new TurtleOntologyFormat(), tgt);
} catch (OWLOntologyStorageException e) {
Modified: incubator/stanbol/trunk/kres/ontologymanager/web/src/test/java/org/apache/stanbol/ontologymanager/web/JettyServerTest.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/ontologymanager/web/src/test/java/org/apache/stanbol/ontologymanager/web/JettyServerTest.java?rev=1086500&r1=1086499&r2=1086500&view=diff
==============================================================================
--- incubator/stanbol/trunk/kres/ontologymanager/web/src/test/java/org/apache/stanbol/ontologymanager/web/JettyServerTest.java (original)
+++ incubator/stanbol/trunk/kres/ontologymanager/web/src/test/java/org/apache/stanbol/ontologymanager/web/JettyServerTest.java Tue Mar 29 07:12:56 2011
@@ -17,7 +17,7 @@ import com.sun.jersey.api.client.WebReso
import com.sun.jersey.api.representation.Form;
import org.apache.stanbol.kres.jersey.JettyServer;
-import org.apache.stanbol.kres.jersey.format.KReSFormat;
+import org.apache.stanbol.kres.jersey.format.KRFormat;
public class JettyServerTest {
@@ -159,7 +159,7 @@ public class JettyServerTest {
WebResource ts2res = client.resource(SCOPE2_URI + "?customont=" + ONT_PIZZA_URI + "&corereg="
+ REG_TEST_URI);
ts2res.put();
- r = scopeResourceTest2.accept(KReSFormat.RDF_XML).get(String.class);
+ r = scopeResourceTest2.accept(KRFormat.RDF_XML).get(String.class);
// System.err.println(r);
// Now add an ontology
try {
@@ -167,7 +167,7 @@ public class JettyServerTest {
f.add("location", ONT_PIZZA_URI);
f.add("registry", "false");
scopeResourceTest2.post(String.class, f);
- r = scopeResourceTest2.accept(KReSFormat.RDF_XML).get(String.class);
+ r = scopeResourceTest2.accept(KRFormat.RDF_XML).get(String.class);
// fail("Addition succeded on existing scope with supposedly locked core space!");
} catch (WebApplicationException ex) {
assertTrue(r != null);
@@ -182,7 +182,7 @@ public class JettyServerTest {
// @Test
public void testSessionCreation() {
WebResource resource = client.resource(__TEST_URI + "session");
- String r = resource.accept(KReSFormat.RDF_XML).post(String.class);
+ String r = resource.accept(KRFormat.RDF_XML).post(String.class);
// System.err.println(r);
assertTrue(true);
}
@@ -197,13 +197,13 @@ public class JettyServerTest {
// + "&customreg="+REG_TEST_URI
+ "&activate=true").put(String.class);
// Check that it appears in the scope set
- r = ontologyResource.accept(KReSFormat.RDF_XML).get(String.class);
+ r = ontologyResource.accept(KRFormat.RDF_XML).get(String.class);
// System.err.println(r);
assertTrue(r.contains(SCOPE1_URI)
&& r
.contains("rdf:type rdf:resource=\"http://kres.iks-project.eu/ontology/onm/meta.owl#Scope\""));
// Check that the top ontology has the correct ID and imports objectrole
- r = scopeResourceTest1.accept(KReSFormat.RDF_XML).get(String.class);
+ r = scopeResourceTest1.accept(KRFormat.RDF_XML).get(String.class);
// System.err.println(r);
assertTrue(r.contains(rootIdToken));
assertTrue(r.contains("http://xmlns.com/foaf/spec/index.rdf"));
@@ -212,7 +212,7 @@ public class JettyServerTest {
f.add("location", "http://www.co-ode.org/ontologies/pizza/2007/02/12/pizza.owl");
f.add("registry", "false");
scopeResourceTest1.post(String.class, f);
- r = scopeResourceTest1.accept(KReSFormat.RDF_XML).get(String.class);
+ r = scopeResourceTest1.accept(KRFormat.RDF_XML).get(String.class);
// System.err.println(r);
}
}
Modified: incubator/stanbol/trunk/kres/reasoners/web/src/main/java/org/apache/stanbol/reasoners/web/Classify.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/reasoners/web/src/main/java/org/apache/stanbol/reasoners/web/Classify.java?rev=1086500&r1=1086499&r2=1086500&view=diff
==============================================================================
--- incubator/stanbol/trunk/kres/reasoners/web/src/main/java/org/apache/stanbol/reasoners/web/Classify.java (original)
+++ incubator/stanbol/trunk/kres/reasoners/web/src/main/java/org/apache/stanbol/reasoners/web/Classify.java Tue Mar 29 07:12:56 2011
@@ -64,7 +64,7 @@ import com.hp.hpl.jena.rdf.model.Model;
import com.hp.hpl.jena.rdf.model.ModelFactory;
import com.hp.hpl.jena.rdf.model.Resource;
-import org.apache.stanbol.kres.jersey.format.KReSFormat;
+import org.apache.stanbol.kres.jersey.format.KRFormat;
/**
*
@@ -209,8 +209,8 @@ if (storage == null) {
*/
@POST
@Consumes(MediaType.MULTIPART_FORM_DATA)
- @Produces(value = { KReSFormat.RDF_XML, KReSFormat.TURTLE,
- KReSFormat.OWL_XML })
+ @Produces(value = { KRFormat.RDF_XML, KRFormat.TURTLE,
+ KRFormat.OWL_XML })
public Response ontologyClassify(
@FormParam(value = "session") String session,
@FormParam(value = "scope") String scope,
Modified: incubator/stanbol/trunk/kres/reasoners/web/src/main/java/org/apache/stanbol/reasoners/web/JerseyEndpoint.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/reasoners/web/src/main/java/org/apache/stanbol/reasoners/web/JerseyEndpoint.java?rev=1086500&r1=1086499&r2=1086500&view=diff
==============================================================================
--- incubator/stanbol/trunk/kres/reasoners/web/src/main/java/org/apache/stanbol/reasoners/web/JerseyEndpoint.java (original)
+++ incubator/stanbol/trunk/kres/reasoners/web/src/main/java/org/apache/stanbol/reasoners/web/JerseyEndpoint.java Tue Mar 29 07:12:56 2011
@@ -19,7 +19,7 @@ import org.slf4j.LoggerFactory;
import com.sun.jersey.spi.container.servlet.ServletContainer;
-import org.apache.stanbol.kres.jersey.processors.KReSViewProcessor;
+import org.apache.stanbol.kres.jersey.processors.ViewProcessorImpl;
/**
* Jersey-based RESTful endpoint for KReS.
@@ -100,7 +100,7 @@ public class JerseyEndpoint {
servletContext.setAttribute(STATIC_RESOURCES_URL_ROOT_PROPERTY,
staticUrlRoot);
servletContext.setAttribute(
- KReSViewProcessor.FREEMARKER_TEMPLATE_PATH_INIT_PARAM,
+ ViewProcessorImpl.FREEMARKER_TEMPLATE_PATH_INIT_PARAM,
freemakerTemplates);
log.info("Jersey servlet registered at {}", alias);
Modified: incubator/stanbol/trunk/kres/reasoners/web/src/main/java/org/apache/stanbol/reasoners/web/JerseyEndpointApplication.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/reasoners/web/src/main/java/org/apache/stanbol/reasoners/web/JerseyEndpointApplication.java?rev=1086500&r1=1086499&r2=1086500&view=diff
==============================================================================
--- incubator/stanbol/trunk/kres/reasoners/web/src/main/java/org/apache/stanbol/reasoners/web/JerseyEndpointApplication.java (original)
+++ incubator/stanbol/trunk/kres/reasoners/web/src/main/java/org/apache/stanbol/reasoners/web/JerseyEndpointApplication.java Tue Mar 29 07:12:56 2011
@@ -5,7 +5,7 @@ import java.util.Set;
import javax.ws.rs.core.Application;
-import org.apache.stanbol.kres.jersey.processors.KReSViewProcessor;
+import org.apache.stanbol.kres.jersey.processors.ViewProcessorImpl;
import org.apache.stanbol.kres.jersey.writers.GraphWriter;
import org.apache.stanbol.kres.jersey.writers.OWLOntologyWriter;
import org.apache.stanbol.kres.jersey.writers.ResultSetWriter;
@@ -45,7 +45,7 @@ public class JerseyEndpointApplication e
public Set<Object> getSingletons() {
Set<Object> singletons = new HashSet<Object>();
// view processors
- singletons.add(new KReSViewProcessor());
+ singletons.add(new ViewProcessorImpl());
return singletons;
}
Modified: incubator/stanbol/trunk/kres/reengineer/web/src/main/java/org/apache/stanbol/reengineer/web/JerseyEndpoint.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/reengineer/web/src/main/java/org/apache/stanbol/reengineer/web/JerseyEndpoint.java?rev=1086500&r1=1086499&r2=1086500&view=diff
==============================================================================
--- incubator/stanbol/trunk/kres/reengineer/web/src/main/java/org/apache/stanbol/reengineer/web/JerseyEndpoint.java (original)
+++ incubator/stanbol/trunk/kres/reengineer/web/src/main/java/org/apache/stanbol/reengineer/web/JerseyEndpoint.java Tue Mar 29 07:12:56 2011
@@ -21,7 +21,7 @@ import org.slf4j.LoggerFactory;
import com.sun.jersey.spi.container.servlet.ServletContainer;
-import org.apache.stanbol.kres.jersey.processors.KReSViewProcessor;
+import org.apache.stanbol.kres.jersey.processors.ViewProcessorImpl;
/**
* Jersey-based RESTful endpoint for KReS.
@@ -116,7 +116,7 @@ public class JerseyEndpoint {
servletContext.setAttribute(STATIC_RESOURCES_URL_ROOT_PROPERTY,
staticUrlRoot);
servletContext.setAttribute(
- KReSViewProcessor.FREEMARKER_TEMPLATE_PATH_INIT_PARAM,
+ ViewProcessorImpl.FREEMARKER_TEMPLATE_PATH_INIT_PARAM,
freemakerTemplates);
log.info("Jersey servlet registered at {}", alias);
Modified: incubator/stanbol/trunk/kres/reengineer/web/src/main/java/org/apache/stanbol/reengineer/web/JerseyEndpointApplication.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/reengineer/web/src/main/java/org/apache/stanbol/reengineer/web/JerseyEndpointApplication.java?rev=1086500&r1=1086499&r2=1086500&view=diff
==============================================================================
--- incubator/stanbol/trunk/kres/reengineer/web/src/main/java/org/apache/stanbol/reengineer/web/JerseyEndpointApplication.java (original)
+++ incubator/stanbol/trunk/kres/reengineer/web/src/main/java/org/apache/stanbol/reengineer/web/JerseyEndpointApplication.java Tue Mar 29 07:12:56 2011
@@ -5,7 +5,7 @@ import java.util.Set;
import javax.ws.rs.core.Application;
-import org.apache.stanbol.kres.jersey.processors.KReSViewProcessor;
+import org.apache.stanbol.kres.jersey.processors.ViewProcessorImpl;
import org.apache.stanbol.kres.jersey.writers.GraphWriter;
import org.apache.stanbol.kres.jersey.writers.OWLOntologyWriter;
import org.apache.stanbol.kres.jersey.writers.ResultSetWriter;
@@ -42,7 +42,7 @@ public class JerseyEndpointApplication e
public Set<Object> getSingletons() {
Set<Object> singletons = new HashSet<Object>();
// view processors
- singletons.add(new KReSViewProcessor());
+ singletons.add(new ViewProcessorImpl());
return singletons;
}
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=1086500&r1=1086499&r2=1086500&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 Tue Mar 29 07:12:56 2011
@@ -21,7 +21,7 @@ import org.slf4j.LoggerFactory;
import com.sun.jersey.spi.container.servlet.ServletContainer;
-import org.apache.stanbol.kres.jersey.processors.KReSViewProcessor;
+import org.apache.stanbol.kres.jersey.processors.ViewProcessorImpl;
/**
* Jersey-based RESTful endpoint for KReS.
@@ -130,7 +130,7 @@ public class JerseyEndpoint {
servletContext.setAttribute(STATIC_RESOURCES_URL_ROOT_PROPERTY,
staticUrlRoot);
servletContext.setAttribute(
- KReSViewProcessor.FREEMARKER_TEMPLATE_PATH_INIT_PARAM,
+ ViewProcessorImpl.FREEMARKER_TEMPLATE_PATH_INIT_PARAM,
freemakerTemplates);
//Rule manager
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=1086500&r1=1086499&r2=1086500&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 Tue Mar 29 07:12:56 2011
@@ -5,7 +5,7 @@ import java.util.Set;
import javax.ws.rs.core.Application;
-import org.apache.stanbol.kres.jersey.processors.KReSViewProcessor;
+import org.apache.stanbol.kres.jersey.processors.ViewProcessorImpl;
import org.apache.stanbol.kres.jersey.writers.GraphWriter;
import org.apache.stanbol.kres.jersey.writers.OWLOntologyWriter;
import org.apache.stanbol.kres.jersey.writers.ResultSetWriter;
@@ -47,7 +47,7 @@ public class JerseyEndpointApplication e
public Set<Object> getSingletons() {
Set<Object> singletons = new HashSet<Object>();
// view processors
- singletons.add(new KReSViewProcessor());
+ singletons.add(new ViewProcessorImpl());
return singletons;
}
Modified: incubator/stanbol/trunk/kres/rules/web/src/main/java/org/apache/stanbol/rules/web/RefactorerResource.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/rules/web/src/main/java/org/apache/stanbol/rules/web/RefactorerResource.java?rev=1086500&r1=1086499&r2=1086500&view=diff
==============================================================================
--- incubator/stanbol/trunk/kres/rules/web/src/main/java/org/apache/stanbol/rules/web/RefactorerResource.java (original)
+++ incubator/stanbol/trunk/kres/rules/web/src/main/java/org/apache/stanbol/rules/web/RefactorerResource.java Tue Mar 29 07:12:56 2011
@@ -28,7 +28,7 @@ import org.semanticweb.owlapi.model.OWLO
import com.sun.jersey.api.view.ImplicitProduces;
-import org.apache.stanbol.kres.jersey.format.KReSFormat;
+import org.apache.stanbol.kres.jersey.format.KRFormat;
import org.apache.stanbol.kres.jersey.resource.NavigationMixin;
/**
@@ -87,8 +87,8 @@ public class RefactorerResource extends
@POST
@Path("/lazy")
@Consumes(MediaType.MULTIPART_FORM_DATA)
- @Produces(value = {KReSFormat.TURTLE, KReSFormat.FUNCTIONAL_OWL, KReSFormat.MANCHESTER_OWL,
- KReSFormat.RDF_XML, KReSFormat.OWL_XML, KReSFormat.RDF_JSON})
+ @Produces(value = {KRFormat.TURTLE, KRFormat.FUNCTIONAL_OWL, KRFormat.MANCHESTER_OWL,
+ KRFormat.RDF_XML, KRFormat.OWL_XML, KRFormat.RDF_JSON})
public Response performRefactoring(@FormParam("recipe") String recipe,
@FormParam("input") InputStream input) {
@@ -147,8 +147,8 @@ public class RefactorerResource extends
@POST
@Path("/consistent")
@Consumes(MediaType.MULTIPART_FORM_DATA)
- @Produces( {KReSFormat.TURTLE, KReSFormat.FUNCTIONAL_OWL, KReSFormat.MANCHESTER_OWL, KReSFormat.RDF_XML,
- KReSFormat.OWL_XML, KReSFormat.RDF_JSON})
+ @Produces( {KRFormat.TURTLE, KRFormat.FUNCTIONAL_OWL, KRFormat.MANCHESTER_OWL, KRFormat.RDF_XML,
+ KRFormat.OWL_XML, KRFormat.RDF_JSON})
public Response consistentRefactoringOfNewGraph(@FormParam("recipe") String recipe,
@FormParam("input") InputStream input) {
Modified: incubator/stanbol/trunk/kres/rules/web/src/main/java/org/apache/stanbol/rules/web/RestRecipe.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/rules/web/src/main/java/org/apache/stanbol/rules/web/RestRecipe.java?rev=1086500&r1=1086499&r2=1086500&view=diff
==============================================================================
--- incubator/stanbol/trunk/kres/rules/web/src/main/java/org/apache/stanbol/rules/web/RestRecipe.java (original)
+++ incubator/stanbol/trunk/kres/rules/web/src/main/java/org/apache/stanbol/rules/web/RestRecipe.java Tue Mar 29 07:12:56 2011
@@ -51,7 +51,7 @@ import org.semanticweb.owlapi.model.OWLO
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.apache.stanbol.kres.jersey.format.KReSFormat;
+import org.apache.stanbol.kres.jersey.format.KRFormat;
import org.apache.stanbol.kres.jersey.resource.NavigationMixin;
/**
@@ -129,8 +129,8 @@ if (storage == null) {
*/
@GET
@Path("/{uri:.+}")
- @Produces(value = {KReSFormat.RDF_XML, KReSFormat.TURTLE, KReSFormat.OWL_XML, KReSFormat.FUNCTIONAL_OWL,
- KReSFormat.MANCHESTER_OWL, KReSFormat.RDF_JSON})
+ @Produces(value = {KRFormat.RDF_XML, KRFormat.TURTLE, KRFormat.OWL_XML, KRFormat.FUNCTIONAL_OWL,
+ KRFormat.MANCHESTER_OWL, KRFormat.RDF_JSON})
public Response getRecipe(@PathParam("uri") String uri) {
try {
@@ -269,8 +269,8 @@ if (storage == null) {
*/
@POST
@Consumes(MediaType.MULTIPART_FORM_DATA)
- @Produces(value = {KReSFormat.RDF_XML, KReSFormat.TURTLE, KReSFormat.OWL_XML, KReSFormat.FUNCTIONAL_OWL,
- KReSFormat.MANCHESTER_OWL, KReSFormat.RDF_JSON})
+ @Produces(value = {KRFormat.RDF_XML, KRFormat.TURTLE, KRFormat.OWL_XML, KRFormat.FUNCTIONAL_OWL,
+ KRFormat.MANCHESTER_OWL, KRFormat.RDF_JSON})
public Response addRecipe(@FormParam(value = "recipe") String recipe,
@FormParam(value = "description") String description) {
Modified: incubator/stanbol/trunk/kres/rules/web/src/main/java/org/apache/stanbol/rules/web/RestRule.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/rules/web/src/main/java/org/apache/stanbol/rules/web/RestRule.java?rev=1086500&r1=1086499&r2=1086500&view=diff
==============================================================================
--- incubator/stanbol/trunk/kres/rules/web/src/main/java/org/apache/stanbol/rules/web/RestRule.java (original)
+++ incubator/stanbol/trunk/kres/rules/web/src/main/java/org/apache/stanbol/rules/web/RestRule.java Tue Mar 29 07:12:56 2011
@@ -54,7 +54,7 @@ import org.semanticweb.owlapi.model.OWLO
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.apache.stanbol.kres.jersey.format.KReSFormat;
+import org.apache.stanbol.kres.jersey.format.KRFormat;
import org.apache.stanbol.kres.jersey.resource.NavigationMixin;
/**
@@ -133,8 +133,8 @@ public class RestRule extends Navigation
*/
@GET
@Path("/{uri:.+}")
- @Produces(value = { KReSFormat.RDF_XML, KReSFormat.TURTLE,
- KReSFormat.OWL_XML })
+ @Produces(value = { KRFormat.RDF_XML, KRFormat.TURTLE,
+ KRFormat.OWL_XML })
public Response getRule(@PathParam("uri") String uri){
try{
@@ -257,7 +257,7 @@ public class RestRule extends Navigation
@GET
@Path("/of-recipe/{uri:.+}")
- @Produces(value = { KReSFormat.RDF_XML, KReSFormat.RDF_JSON })
+ @Produces(value = { KRFormat.RDF_XML, KRFormat.RDF_JSON })
public Response getRulesOfRecipe(@PathParam("uri") String recipeURI){
GetRule kReSGetRule = new GetRule(kresRuleStore);
@@ -458,7 +458,7 @@ public class RestRule extends Navigation
*/
@DELETE
//@Consumes(MediaType.TEXT_PLAIN)
- @Produces(KReSFormat.TEXT_PLAIN)
+ @Produces(KRFormat.TEXT_PLAIN)
public Response removeRule(@QueryParam(value = "rule") String rule,
@QueryParam(value = "recipe") String recipe) {