Author: enridaga
Date: Sun Oct 20 19:14:28 2013
New Revision: 1533955
URL: http://svn.apache.org/r1533955
Log:
STANBOL-1174 Initial changes for migration to commons-ng. Removed dependencies
to jersey specific implementation. Removed references to servlet contexts in
rsources. Changed dependencies in pom files. Moved to multipart-the clerezza
way.
Added:
stanbol/branches/commons-ng/reasoners/web/src/main/java/org/apache/stanbol/reasoners/web/input/provider/impl/ByteArrayInputProvider.java
Modified:
stanbol/branches/commons-ng/reasoners/jena/pom.xml
stanbol/branches/commons-ng/reasoners/manager/pom.xml
stanbol/branches/commons-ng/reasoners/owlapi/pom.xml
stanbol/branches/commons-ng/reasoners/pom.xml
stanbol/branches/commons-ng/reasoners/servicesapi/pom.xml
stanbol/branches/commons-ng/reasoners/test/pom.xml
stanbol/branches/commons-ng/reasoners/web/pom.xml
stanbol/branches/commons-ng/reasoners/web/src/main/java/org/apache/stanbol/reasoners/web/input/impl/RESTInputFactory.java
stanbol/branches/commons-ng/reasoners/web/src/main/java/org/apache/stanbol/reasoners/web/input/provider/impl/OntologyManagerInputProvider.java
stanbol/branches/commons-ng/reasoners/web/src/main/java/org/apache/stanbol/reasoners/web/input/provider/impl/RecipeInputProvider.java
stanbol/branches/commons-ng/reasoners/web/src/main/java/org/apache/stanbol/reasoners/web/resources/JobsResource.java
stanbol/branches/commons-ng/reasoners/web/src/main/java/org/apache/stanbol/reasoners/web/resources/ReasoningServiceTaskResource.java
stanbol/branches/commons-ng/reasoners/web/src/main/java/org/apache/stanbol/reasoners/web/resources/ReasoningServicesResource.java
stanbol/branches/commons-ng/reasoners/web/src/main/java/org/apache/stanbol/reasoners/web/utils/ReasoningPrettyResultResource.java
stanbol/branches/commons-ng/reasoners/web/src/main/java/org/apache/stanbol/reasoners/web/utils/ResponseTaskBuilder.java
Modified: stanbol/branches/commons-ng/reasoners/jena/pom.xml
URL:
http://svn.apache.org/viewvc/stanbol/branches/commons-ng/reasoners/jena/pom.xml?rev=1533955&r1=1533954&r2=1533955&view=diff
==============================================================================
--- stanbol/branches/commons-ng/reasoners/jena/pom.xml (original)
+++ stanbol/branches/commons-ng/reasoners/jena/pom.xml Sun Oct 20 19:14:28 2013
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.stanbol</groupId>
<artifactId>apache-stanbol-reasoners</artifactId>
- <version>0.10.0-SNAPSHOT</version>
+ <version>0.11.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
@@ -82,7 +82,7 @@
<dependency>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.reasoners.servicesapi</artifactId>
- <version>0.9.0-incubating</version>
+ <version>0.11.0-SNAPSHOT</version>
</dependency>
<!-- Diagnostic dependencies -->
Modified: stanbol/branches/commons-ng/reasoners/manager/pom.xml
URL:
http://svn.apache.org/viewvc/stanbol/branches/commons-ng/reasoners/manager/pom.xml?rev=1533955&r1=1533954&r2=1533955&view=diff
==============================================================================
--- stanbol/branches/commons-ng/reasoners/manager/pom.xml (original)
+++ stanbol/branches/commons-ng/reasoners/manager/pom.xml Sun Oct 20 19:14:28
2013
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.stanbol</groupId>
<artifactId>apache-stanbol-reasoners</artifactId>
- <version>0.10.0-SNAPSHOT</version>
+ <version>0.11.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
@@ -65,7 +65,7 @@
<dependency>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.reasoners.servicesapi</artifactId>
- <version>0.9.0-incubating</version>
+ <version>0.11.0-SNAPSHOT</version>
</dependency>
<!-- Diagnostic dependencies -->
Modified: stanbol/branches/commons-ng/reasoners/owlapi/pom.xml
URL:
http://svn.apache.org/viewvc/stanbol/branches/commons-ng/reasoners/owlapi/pom.xml?rev=1533955&r1=1533954&r2=1533955&view=diff
==============================================================================
--- stanbol/branches/commons-ng/reasoners/owlapi/pom.xml (original)
+++ stanbol/branches/commons-ng/reasoners/owlapi/pom.xml Sun Oct 20 19:14:28
2013
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.stanbol</groupId>
<artifactId>apache-stanbol-reasoners</artifactId>
- <version>0.10.0-SNAPSHOT</version>
+ <version>0.11.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
@@ -69,12 +69,12 @@
<dependency>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.commons.owl</artifactId>
- <version>0.11.0</version>
+ <version>1.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.reasoners.servicesapi</artifactId>
- <version>0.9.0-incubating</version>
+ <version>0.11.0-SNAPSHOT</version>
</dependency>
<!-- Diagnostic dependencies -->
Modified: stanbol/branches/commons-ng/reasoners/pom.xml
URL:
http://svn.apache.org/viewvc/stanbol/branches/commons-ng/reasoners/pom.xml?rev=1533955&r1=1533954&r2=1533955&view=diff
==============================================================================
--- stanbol/branches/commons-ng/reasoners/pom.xml (original)
+++ stanbol/branches/commons-ng/reasoners/pom.xml Sun Oct 20 19:14:28 2013
@@ -22,13 +22,13 @@
<parent>
<groupId>org.apache.stanbol</groupId>
<artifactId>stanbol-parent</artifactId>
- <version>4-SNAPSHOT</version>
+ <version>5-SNAPSHOT</version>
<relativePath>../parent</relativePath>
</parent>
<groupId>org.apache.stanbol</groupId>
<artifactId>apache-stanbol-reasoners</artifactId>
- <version>0.10.0-SNAPSHOT</version>
+ <version>0.11.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Apache Stanbol Reasoners</name>
Modified: stanbol/branches/commons-ng/reasoners/servicesapi/pom.xml
URL:
http://svn.apache.org/viewvc/stanbol/branches/commons-ng/reasoners/servicesapi/pom.xml?rev=1533955&r1=1533954&r2=1533955&view=diff
==============================================================================
--- stanbol/branches/commons-ng/reasoners/servicesapi/pom.xml (original)
+++ stanbol/branches/commons-ng/reasoners/servicesapi/pom.xml Sun Oct 20
19:14:28 2013
@@ -24,7 +24,7 @@
<parent>
<groupId>org.apache.stanbol</groupId>
<artifactId>apache-stanbol-reasoners</artifactId>
- <version>0.10.0-SNAPSHOT</version>
+ <version>0.11.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
Modified: stanbol/branches/commons-ng/reasoners/test/pom.xml
URL:
http://svn.apache.org/viewvc/stanbol/branches/commons-ng/reasoners/test/pom.xml?rev=1533955&r1=1533954&r2=1533955&view=diff
==============================================================================
--- stanbol/branches/commons-ng/reasoners/test/pom.xml (original)
+++ stanbol/branches/commons-ng/reasoners/test/pom.xml Sun Oct 20 19:14:28 2013
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.stanbol</groupId>
<artifactId>apache-stanbol-reasoners</artifactId>
- <version>0.10.0-SNAPSHOT</version>
+ <version>0.11.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
@@ -48,12 +48,12 @@
<dependency>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.commons.testing.stanbol</artifactId>
- <version>0.11.0</version>
+ <version>1.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.commons.jobs.api</artifactId>
- <version>0.11.0</version>
+ <version>1.0.0-SNAPSHOT</version>
</dependency>
<dependency>
@@ -74,6 +74,7 @@
<dependency>
<groupId>org.apache.james</groupId>
<artifactId>apache-mime4j</artifactId>
+ <version>0.6</version>
<scope>provided</scope>
</dependency>
<dependency>
Modified: stanbol/branches/commons-ng/reasoners/web/pom.xml
URL:
http://svn.apache.org/viewvc/stanbol/branches/commons-ng/reasoners/web/pom.xml?rev=1533955&r1=1533954&r2=1533955&view=diff
==============================================================================
--- stanbol/branches/commons-ng/reasoners/web/pom.xml (original)
+++ stanbol/branches/commons-ng/reasoners/web/pom.xml Sun Oct 20 19:14:28 2013
@@ -23,7 +23,7 @@
<parent>
<groupId>org.apache.stanbol</groupId>
<artifactId>apache-stanbol-reasoners</artifactId>
- <version>0.10.0-SNAPSHOT</version>
+ <version>0.11.0-SNAPSHOT</version>
<relativePath>..</relativePath>
</parent>
@@ -47,7 +47,7 @@
<instructions>
<Import-Package>
javax.servlet.*; version="[2.5.0,4.0.0)",
- javax.ws.rs.*; version="[0,2)",
+ javax.ws.rs.*; version="[2.0,3)",
org.apache.stanbol.commons.web.base; provide:=true,
*
</Import-Package>
@@ -83,58 +83,58 @@
<dependency>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.commons.web.base</artifactId>
- <version>0.12.0-SNAPSHOT</version>
+ <version>1.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.commons.web.viewable</artifactId>
- <version>0.11.0</version>
+ <version>1.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.ontologymanager.servicesapi</artifactId>
- <version>0.10.0-SNAPSHOT</version>
+ <version>0.11.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.rules.base</artifactId>
- <version>0.10.0-SNAPSHOT</version>
+ <version>0.11.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.rules.manager</artifactId>
- <version>0.10.0-SNAPSHOT</version>
+ <version>0.11.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.rules.refactor</artifactId>
- <version>0.10.0-SNAPSHOT</version>
+ <version>0.11.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.commons.owl</artifactId>
- <version>0.11.0</version>
+ <version>1.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.commons.jobs.api</artifactId>
- <version>0.11.0</version>
+ <version>1.0.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.reasoners.servicesapi</artifactId>
- <version>0.9.0-incubating</version>
+ <version>0.11.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.reasoners.jena</artifactId>
- <version>0.9.0-incubating</version>
+ <version>0.11.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.reasoners.owlapi</artifactId>
- <version>0.9.0-incubating</version>
+ <version>0.11.0-SNAPSHOT</version>
</dependency>
<dependency>
@@ -153,16 +153,24 @@
<groupId>org.apache.clerezza</groupId>
<artifactId>rdf.jena.serializer</artifactId>
</dependency>
- <!-- specific deps for this project -->
+ <dependency>
+ <groupId>org.apache.clerezza</groupId>
+ <artifactId>jaxrs.utils</artifactId>
+ </dependency>
+ <!-- specific deps for this project (TEMP)
<dependency>
<groupId>com.sun.jersey</groupId>
<artifactId>jersey-server</artifactId>
+ <version>1.15</version>
+ <scope>compile</scope>
</dependency>
<dependency>
<groupId>com.sun.jersey.contribs</groupId>
<artifactId>jersey-multipart</artifactId>
+ <version>1.15</version>
+ <scope>compile</scope>
</dependency>
-
+-->
<!-- generic tax -->
<dependency>
<groupId>org.slf4j</groupId>
Modified:
stanbol/branches/commons-ng/reasoners/web/src/main/java/org/apache/stanbol/reasoners/web/input/impl/RESTInputFactory.java
URL:
http://svn.apache.org/viewvc/stanbol/branches/commons-ng/reasoners/web/src/main/java/org/apache/stanbol/reasoners/web/input/impl/RESTInputFactory.java?rev=1533955&r1=1533954&r2=1533955&view=diff
==============================================================================
---
stanbol/branches/commons-ng/reasoners/web/src/main/java/org/apache/stanbol/reasoners/web/input/impl/RESTInputFactory.java
(original)
+++
stanbol/branches/commons-ng/reasoners/web/src/main/java/org/apache/stanbol/reasoners/web/input/impl/RESTInputFactory.java
Sun Oct 20 19:14:28 2013
@@ -24,7 +24,7 @@ import java.util.Map.Entry;
import javax.ws.rs.WebApplicationException;
import javax.ws.rs.core.Response;
-import org.apache.stanbol.ontologymanager.ontonet.api.ONManager;
+import org.apache.stanbol.ontologymanager.servicesapi.scope.ScopeManager;
import org.apache.stanbol.ontologymanager.servicesapi.session.SessionManager;
import org.apache.stanbol.reasoners.servicesapi.ReasoningServiceInputFactory;
import org.apache.stanbol.reasoners.servicesapi.ReasoningServiceInputManager;
@@ -47,14 +47,14 @@ import org.slf4j.LoggerFactory;
*
*/
public class RESTInputFactory implements ReasoningServiceInputFactory {
- ONManager onm;
+ ScopeManager onm;
SessionManager sessionManager;
RuleStore rStore;
RuleAdapterManager adapterManager;
private Logger log = LoggerFactory.getLogger(getClass());
- public RESTInputFactory(ONManager onm,
+ public RESTInputFactory(ScopeManager onm,
SessionManager sm,
RuleStore rStore,
RuleAdapterManager adapterManager) {
Added:
stanbol/branches/commons-ng/reasoners/web/src/main/java/org/apache/stanbol/reasoners/web/input/provider/impl/ByteArrayInputProvider.java
URL:
http://svn.apache.org/viewvc/stanbol/branches/commons-ng/reasoners/web/src/main/java/org/apache/stanbol/reasoners/web/input/provider/impl/ByteArrayInputProvider.java?rev=1533955&view=auto
==============================================================================
---
stanbol/branches/commons-ng/reasoners/web/src/main/java/org/apache/stanbol/reasoners/web/input/provider/impl/ByteArrayInputProvider.java
(added)
+++
stanbol/branches/commons-ng/reasoners/web/src/main/java/org/apache/stanbol/reasoners/web/input/provider/impl/ByteArrayInputProvider.java
Sun Oct 20 19:14:28 2013
@@ -0,0 +1,144 @@
+package org.apache.stanbol.reasoners.web.input.provider.impl;
+
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Set;
+
+import org.apache.stanbol.reasoners.servicesapi.ReasoningServiceInputProvider;
+import org.semanticweb.owlapi.apibinding.OWLManager;
+import org.semanticweb.owlapi.model.MissingImportEvent;
+import org.semanticweb.owlapi.model.MissingImportListener;
+import org.semanticweb.owlapi.model.OWLAxiom;
+import org.semanticweb.owlapi.model.OWLOntology;
+import org.semanticweb.owlapi.model.OWLOntologyCreationException;
+import org.semanticweb.owlapi.model.OWLOntologyLoaderListener;
+import org.semanticweb.owlapi.model.OWLOntologyManager;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.hp.hpl.jena.ontology.OntModel;
+import com.hp.hpl.jena.rdf.model.ModelFactory;
+import com.hp.hpl.jena.rdf.model.Statement;
+import com.hp.hpl.jena.rdf.model.StmtIterator;
+
+public class ByteArrayInputProvider implements ReasoningServiceInputProvider {
+ private final Logger log =
LoggerFactory.getLogger(ByteArrayInputProvider.class);
+ private byte[] bytes;
+
+ public ByteArrayInputProvider(byte[] bytes) {
+ this.bytes = bytes;
+ }
+
+ @Override
+ public <T> Iterator<T> getInput(Class<T> type) throws IOException {
+
+ if (type.isAssignableFrom(OWLAxiom.class)) {
+ // We add additional axioms
+ OWLOntology fromUrl;
+ try {
+ fromUrl =
createOWLOntologyManager().loadOntologyFromOntologyDocument(new
ByteArrayInputStream(bytes));
+ } catch (OWLOntologyCreationException e) {
+ throw new IOException(e);
+ }
+ Set<OWLOntology> all = fromUrl.getImportsClosure();
+ List<OWLAxiom> axiomList = new ArrayList<OWLAxiom>();
+ for(OWLOntology o : all){
+ axiomList.addAll(o.getAxioms());
+ }
+ final Iterator<OWLAxiom> iterator = axiomList.iterator();
+ return new Iterator<T>(){
+
+ @Override
+ public boolean hasNext() {
+ return iterator.hasNext();
+ }
+
+ @SuppressWarnings("unchecked")
+ @Override
+ public T next() {
+ return (T) iterator.next();
+ }
+
+ @Override
+ public void remove() {
+ // This iterator is read-only
+ throw new UnsupportedOperationException("Cannot remove
statements from the iterator");
+ }
+
+ };
+ } else if (type.isAssignableFrom(Statement.class)) {
+ final OntModel input = ModelFactory.createOntologyModel();
+ synchronized (bytes) {
+ // XXX
+ // Not sure this would always work. What if we have an
RDF/XML relying on an implicit base?
+ input.read(new ByteArrayInputStream(bytes), "");
+ }
+ final StmtIterator iterator = input.listStatements();
+ return new Iterator<T>(){
+
+ @Override
+ public boolean hasNext() {
+ return iterator.hasNext();
+ }
+
+ @SuppressWarnings("unchecked")
+ @Override
+ public T next() {
+ return (T) iterator.next();
+ }
+
+ @Override
+ public void remove() {
+ // This iterator is read-only
+ throw new UnsupportedOperationException("Cannot remove
statements from the iterator");
+ }
+ };
+ } else {
+ throw new UnsupportedOperationException("This provider does not
adapt to the given type");
+ }
+ }
+
+ @Override
+ public <T> boolean adaptTo(Class<T> type) {
+ if (type.isAssignableFrom(OWLAxiom.class) ||
type.isAssignableFrom(Statement.class)) return true;
+ return false;
+ }
+
+ @SuppressWarnings("deprecation")
+ private OWLOntologyManager createOWLOntologyManager() {
+ // We isolate here the creation of the temporary manager
+ // TODO How to behave when resolving owl:imports?
+ // We should set the manager to use a service to lookup for ontologies,
+ // instead of trying on the web
+ // directly/only
+ OWLOntologyManager manager = OWLManager.createOWLOntologyManager();
+
+ // FIXME Which is the other way of doing this?
+ // Maybe -> OWLOntologyManagerProperties();
+ manager.setSilentMissingImportsHandling(true);
+ // Listening for missing imports
+ manager.addMissingImportListener(new MissingImportListener() {
+ @Override
+ public void importMissing(MissingImportEvent arg0) {
+ log.warn("Missing import {} ", arg0.getImportedOntologyURI());
+ }
+ });
+ manager.addOntologyLoaderListener(new OWLOntologyLoaderListener(){
+
+ @Override
+ public void finishedLoadingOntology(LoadingFinishedEvent arg0) {
+ log.info("Finished loading {} (imported:
{})",arg0.getOntologyID(),arg0.isImported());
+ }
+
+ @Override
+ public void startedLoadingOntology(LoadingStartedEvent arg0) {
+ log.info("Started loading {} (imported: {})
...",arg0.getOntologyID(),arg0.isImported());
+ log.info(" ... from {}",arg0.getDocumentIRI().toString());
+ }});
+ return manager;
+ }
+
+}
Modified:
stanbol/branches/commons-ng/reasoners/web/src/main/java/org/apache/stanbol/reasoners/web/input/provider/impl/OntologyManagerInputProvider.java
URL:
http://svn.apache.org/viewvc/stanbol/branches/commons-ng/reasoners/web/src/main/java/org/apache/stanbol/reasoners/web/input/provider/impl/OntologyManagerInputProvider.java?rev=1533955&r1=1533954&r2=1533955&view=diff
==============================================================================
---
stanbol/branches/commons-ng/reasoners/web/src/main/java/org/apache/stanbol/reasoners/web/input/provider/impl/OntologyManagerInputProvider.java
(original)
+++
stanbol/branches/commons-ng/reasoners/web/src/main/java/org/apache/stanbol/reasoners/web/input/provider/impl/OntologyManagerInputProvider.java
Sun Oct 20 19:14:28 2013
@@ -22,8 +22,8 @@ import java.util.Iterator;
import java.util.Set;
import org.apache.stanbol.commons.owl.transformation.JenaToOwlConvert;
-import org.apache.stanbol.ontologymanager.ontonet.api.ONManager;
import org.apache.stanbol.ontologymanager.servicesapi.scope.Scope;
+import org.apache.stanbol.ontologymanager.servicesapi.scope.ScopeManager;
import org.apache.stanbol.ontologymanager.servicesapi.session.Session;
import org.apache.stanbol.ontologymanager.servicesapi.session.SessionManager;
import org.apache.stanbol.reasoners.servicesapi.ReasoningServiceInputProvider;
@@ -57,7 +57,7 @@ public class OntologyManagerInputProvide
private String scopeId;
private String sessionId;
- private ONManager onManager;
+ private ScopeManager onManager;
private SessionManager sessionManager;
/**
@@ -66,7 +66,7 @@ public class OntologyManagerInputProvide
* @param onManager
* @param scopeId
*/
- public OntologyManagerInputProvider(ONManager onManager, String scopeId) {
+ public OntologyManagerInputProvider(ScopeManager onManager, String
scopeId) {
this(onManager, null, scopeId, null);
}
@@ -77,7 +77,7 @@ public class OntologyManagerInputProvide
* @param scopeId
* @param sessionId
*/
- public OntologyManagerInputProvider(ONManager onManager,
+ public OntologyManagerInputProvider(ScopeManager onManager,
SessionManager sessionManager,
String scopeId,
String sessionId) {
Modified:
stanbol/branches/commons-ng/reasoners/web/src/main/java/org/apache/stanbol/reasoners/web/input/provider/impl/RecipeInputProvider.java
URL:
http://svn.apache.org/viewvc/stanbol/branches/commons-ng/reasoners/web/src/main/java/org/apache/stanbol/reasoners/web/input/provider/impl/RecipeInputProvider.java?rev=1533955&r1=1533954&r2=1533955&view=diff
==============================================================================
---
stanbol/branches/commons-ng/reasoners/web/src/main/java/org/apache/stanbol/reasoners/web/input/provider/impl/RecipeInputProvider.java
(original)
+++
stanbol/branches/commons-ng/reasoners/web/src/main/java/org/apache/stanbol/reasoners/web/input/provider/impl/RecipeInputProvider.java
Sun Oct 20 19:14:28 2013
@@ -148,7 +148,6 @@ public class RecipeInputProvider impleme
return iterator.hasNext();
}
- @SuppressWarnings("unchecked")
@Override
public T next() {
return (T) iterator.next();
@@ -222,7 +221,6 @@ public class RecipeInputProvider impleme
return jRiterator.hasNext();
}
- @SuppressWarnings("unchecked")
@Override
public T next() {
return (T) jRiterator.next();
Modified:
stanbol/branches/commons-ng/reasoners/web/src/main/java/org/apache/stanbol/reasoners/web/resources/JobsResource.java
URL:
http://svn.apache.org/viewvc/stanbol/branches/commons-ng/reasoners/web/src/main/java/org/apache/stanbol/reasoners/web/resources/JobsResource.java?rev=1533955&r1=1533954&r2=1533955&view=diff
==============================================================================
---
stanbol/branches/commons-ng/reasoners/web/src/main/java/org/apache/stanbol/reasoners/web/resources/JobsResource.java
(original)
+++
stanbol/branches/commons-ng/reasoners/web/src/main/java/org/apache/stanbol/reasoners/web/resources/JobsResource.java
Sun Oct 20 19:14:28 2013
@@ -16,13 +16,9 @@
*/
package org.apache.stanbol.reasoners.web.resources;
-import static org.apache.stanbol.commons.web.base.CorsHelper.addCORSOrigin;
-import static org.apache.stanbol.commons.web.base.CorsHelper.enableCORS;
-
import java.util.concurrent.ExecutionException;
import java.util.concurrent.Future;
-import javax.servlet.ServletContext;
import javax.ws.rs.GET;
import javax.ws.rs.OPTIONS;
import javax.ws.rs.Path;
@@ -35,9 +31,9 @@ import javax.ws.rs.core.Response;
import javax.ws.rs.core.Response.ResponseBuilder;
import javax.ws.rs.core.Response.Status;
+import org.apache.felix.scr.annotations.Reference;
import org.apache.stanbol.commons.jobs.api.JobManager;
-import org.apache.stanbol.commons.viewable.Viewable;
-import org.apache.stanbol.commons.web.base.ContextHelper;
+import org.apache.stanbol.commons.web.viewable.Viewable;
import org.apache.stanbol.commons.web.base.resource.BaseStanbolResource;
import org.apache.stanbol.reasoners.web.utils.ReasoningServiceResult;
import org.apache.stanbol.reasoners.web.utils.ResponseTaskBuilder;
@@ -54,13 +50,15 @@ import org.slf4j.LoggerFactory;
@Path("/reasoners/jobs")
public class JobsResource extends BaseStanbolResource {
private Logger log = LoggerFactory.getLogger(getClass());
- private ServletContext context;
+
private HttpHeaders headers;
private String jobLocation = "";
+
+ @Reference
+ private JobManager jobManager;
- public JobsResource(@Context ServletContext servletContext,@Context
HttpHeaders headers) {
- this.context = servletContext;
+ public JobsResource(@Context HttpHeaders headers) {
this.headers = headers;
}
@@ -72,8 +70,7 @@ public class JobsResource extends BaseSt
*/
@GET
@Path("/{jid}")
- public Response get(@PathParam("jid") String id,
- @Context HttpHeaders headers) {
+ public Response get(@PathParam("jid") String id) {
log.info("Pinging job {}", id);
@@ -81,7 +78,6 @@ public class JobsResource extends BaseSt
// No id
if(id == null || id.equals("")){
ResponseBuilder rb = Response.status(Status.BAD_REQUEST);
- addCORSOrigin(servletContext, rb, headers);
return rb.build();
}
@@ -101,7 +97,7 @@ public class JobsResource extends BaseSt
if(o instanceof ReasoningServiceResult){
log.debug("Is a ReasoningServiceResult");
ReasoningServiceResult<?> result =
(ReasoningServiceResult<?>) o;
- return new
ResponseTaskBuilder(uriInfo,context,headers).build(result);
+ return new ResponseTaskBuilder(uriInfo,
headers).build(result);
}else{
log.error("Job {} does not belong to reasoners", id);
throw new
WebApplicationException(Response.Status.NOT_FOUND);
@@ -121,20 +117,16 @@ public class JobsResource extends BaseSt
String jobService = new
StringBuilder().append(getPublicBaseUri()).append("jobs/").append(id).toString();
this.jobLocation = jobService;
Viewable viewable = new Viewable("404.ftl",this);
- //return Response.status(404).header("Content-Location",
jobService).header("Content-type","text/html").entity( viewable ).build();
ResponseBuilder rb = Response.status(Status.NOT_FOUND);
rb.header(HttpHeaders.CONTENT_TYPE, MediaType.TEXT_HTML+ ";
charset=utf-8");
- addCORSOrigin(servletContext, rb, headers);
rb.entity(viewable);
return rb.build();
}
} else {
log.info("No job found with id {}", id);
- //return Response.status(Response.Status.NOT_FOUND).build();
ResponseBuilder rb = Response.status(Status.NOT_FOUND);
rb.header(HttpHeaders.CONTENT_TYPE, MediaType.TEXT_HTML+ ";
charset=utf-8");
- addCORSOrigin(servletContext, rb, headers);
return rb.build();
}
@@ -156,13 +148,12 @@ public class JobsResource extends BaseSt
*/
private JobManager getJobManager() {
log.debug("(getJobManager()) ");
- return (JobManager)
ContextHelper.getServiceFromContext(JobManager.class, this.context);
+ return jobManager;
}
@OPTIONS
- public Response handleCorsPreflight(@Context HttpHeaders headers) {
+ public Response handleCorsPreflight() {
ResponseBuilder rb = Response.ok();
- enableCORS(servletContext, rb, headers);
return rb.build();
}
}
Modified:
stanbol/branches/commons-ng/reasoners/web/src/main/java/org/apache/stanbol/reasoners/web/resources/ReasoningServiceTaskResource.java
URL:
http://svn.apache.org/viewvc/stanbol/branches/commons-ng/reasoners/web/src/main/java/org/apache/stanbol/reasoners/web/resources/ReasoningServiceTaskResource.java?rev=1533955&r1=1533954&r2=1533955&view=diff
==============================================================================
---
stanbol/branches/commons-ng/reasoners/web/src/main/java/org/apache/stanbol/reasoners/web/resources/ReasoningServiceTaskResource.java
(original)
+++
stanbol/branches/commons-ng/reasoners/web/src/main/java/org/apache/stanbol/reasoners/web/resources/ReasoningServiceTaskResource.java
Sun Oct 20 19:14:28 2013
@@ -19,10 +19,7 @@ package org.apache.stanbol.reasoners.web
import static javax.ws.rs.core.MediaType.APPLICATION_FORM_URLENCODED;
import static javax.ws.rs.core.MediaType.MULTIPART_FORM_DATA;
import static javax.ws.rs.core.MediaType.TEXT_HTML;
-import static org.apache.stanbol.commons.web.base.CorsHelper.addCORSOrigin;
-import java.io.File;
-import java.net.MalformedURLException;
import java.net.URI;
import java.util.ArrayList;
import java.util.Arrays;
@@ -32,7 +29,6 @@ import java.util.Map;
import java.util.Map.Entry;
import java.util.Set;
-import javax.servlet.ServletContext;
import javax.ws.rs.Consumes;
import javax.ws.rs.GET;
import javax.ws.rs.POST;
@@ -42,31 +38,32 @@ import javax.ws.rs.Produces;
import javax.ws.rs.QueryParam;
import javax.ws.rs.WebApplicationException;
import javax.ws.rs.core.Context;
+import javax.ws.rs.core.Form;
import javax.ws.rs.core.HttpHeaders;
import javax.ws.rs.core.MultivaluedMap;
import javax.ws.rs.core.Response;
import javax.ws.rs.core.Response.ResponseBuilder;
+import javax.ws.rs.core.UriInfo;
+import org.apache.clerezza.jaxrs.utils.form.FormFile;
+import org.apache.clerezza.jaxrs.utils.form.MultiPartBody;
import org.apache.clerezza.rdf.core.access.TcManager;
+import org.apache.felix.scr.annotations.Reference;
import org.apache.stanbol.commons.jobs.api.JobManager;
-import org.apache.stanbol.commons.viewable.Viewable;
-import org.apache.stanbol.commons.web.base.ContextHelper;
+import org.apache.stanbol.commons.web.viewable.Viewable;
import org.apache.stanbol.commons.web.base.format.KRFormat;
import org.apache.stanbol.commons.web.base.resource.BaseStanbolResource;
-import org.apache.stanbol.ontologymanager.ontonet.api.ONManager;
+import org.apache.stanbol.ontologymanager.servicesapi.scope.ScopeManager;
import org.apache.stanbol.ontologymanager.servicesapi.session.SessionManager;
import org.apache.stanbol.reasoners.jena.JenaReasoningService;
import org.apache.stanbol.reasoners.owlapi.OWLApiReasoningService;
-import org.apache.stanbol.reasoners.servicesapi.InconsistentInputException;
import org.apache.stanbol.reasoners.servicesapi.ReasoningService;
-import org.apache.stanbol.reasoners.servicesapi.ReasoningServiceException;
import org.apache.stanbol.reasoners.servicesapi.ReasoningServiceInputManager;
import org.apache.stanbol.reasoners.servicesapi.ReasoningServicesManager;
import
org.apache.stanbol.reasoners.servicesapi.UnboundReasoningServiceException;
-import org.apache.stanbol.reasoners.servicesapi.UnsupportedTaskException;
import org.apache.stanbol.reasoners.servicesapi.annotations.Documentation;
import org.apache.stanbol.reasoners.web.input.impl.SimpleInputManager;
-import org.apache.stanbol.reasoners.web.input.provider.impl.FileInputProvider;
+import
org.apache.stanbol.reasoners.web.input.provider.impl.ByteArrayInputProvider;
import
org.apache.stanbol.reasoners.web.input.provider.impl.OntologyManagerInputProvider;
import
org.apache.stanbol.reasoners.web.input.provider.impl.RecipeInputProvider;
import org.apache.stanbol.reasoners.web.input.provider.impl.UrlInputProvider;
@@ -78,11 +75,6 @@ import org.apache.stanbol.rules.base.api
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import com.sun.jersey.api.core.HttpContext;
-import com.sun.jersey.api.core.HttpRequestContext;
-import com.sun.jersey.multipart.BodyPart;
-import com.sun.jersey.multipart.FormDataBodyPart;
-import com.sun.jersey.multipart.FormDataMultiPart;
/**
* Endpoint for reasoning services. Services can be invoked using the service
name and task in the request
@@ -101,20 +93,41 @@ import com.sun.jersey.multipart.FormData
@Path("/reasoners/{service}/{task: [^/]+}{job: (/job)?}")
public class ReasoningServiceTaskResource extends BaseStanbolResource {
private Logger log = LoggerFactory.getLogger(getClass());
- private ServletContext context;
+// private ServletContext context;
+
private ReasoningService<?,?,?> service;
private String taskID;
- private HttpContext httpContext;
+
private Map<String,List<String>> parameters;
- private TcManager tcManager;
+ private FormFile file = null;
+
+ @Reference
+ protected TcManager tcManager;
private HttpHeaders headers;
- private ONManager onm;
- private SessionManager sessionManager;
- private RuleStore ruleStore;
- private RuleAdapterManager adapterManager;
+
+ @Reference
+ protected ScopeManager onm;
+
+ @Reference
+ protected SessionManager sessionManager;
+
+ @Reference
+ protected RuleStore ruleStore;
+
+ @Reference
+ protected RuleAdapterManager adapterManager;
private boolean job = false;
private String jobLocation = "";
-
+
+ @Reference
+ protected ReasoningServicesManager reasoningServicesManager;
+
+ @Reference
+ protected JobManager jobManager;
+
+ @Context private UriInfo uriInfo;
+ @Context private Form form;
+
/**
* Constructor
*
@@ -128,47 +141,22 @@ public class ReasoningServiceTaskResourc
public ReasoningServiceTaskResource(@PathParam(value = "service") String
serviceID,
@PathParam(value = "task") String
taskID,
@PathParam(value = "job") String job,
- @Context ServletContext servletContext,
- @Context HttpHeaders headers,
- @Context HttpContext httpContext) {
+ @Context HttpHeaders headers) {
super();
log.debug("Called service {} to perform task {}", serviceID, taskID);
- // ServletContext
- this.context = servletContext;
-
- // HttpContext
- this.httpContext = httpContext;
-
// HttpHeaders
this.headers = headers;
// Parameters for customized reasoning services
this.parameters = prepareParameters();
- // Clerezza storage
- this.tcManager = (TcManager)
ContextHelper.getServiceFromContext(TcManager.class, servletContext);
-
- // Retrieve the ontology network manager
- this.onm = (ONManager)
ContextHelper.getServiceFromContext(ONManager.class, servletContext);
-
- // Retrieve the ontology network manager
- this.sessionManager = (SessionManager)
ContextHelper.getServiceFromContext(SessionManager.class,
- servletContext);
-
- // Retrieve the rule store
- this.ruleStore = (RuleStore)
ContextHelper.getServiceFromContext(RuleStore.class, servletContext);
-
- // Retrieve the rule adapter manager
- this.adapterManager = (RuleAdapterManager)
ContextHelper.getServiceFromContext(
- RuleAdapterManager.class, servletContext);
-
// Check if method is allowed
// FIXME Supported methods are only GET and POST, but also PUT comes
here, why?
- String[] supported = {"GET", "POST"};
- if
(!Arrays.asList(supported).contains(this.httpContext.getRequest().getMethod()))
{
- throw new WebApplicationException(405);
- }
+// String[] supported = {"GET", "POST"};
+// if
(!Arrays.asList(supported).contains(this.httpContext.getRequest().getMethod()))
{
+// throw new WebApplicationException(405);
+// }
// Retrieve the service
try {
@@ -216,16 +204,18 @@ public class ReasoningServiceTaskResourc
Map<String,List<String>> parameters = new
HashMap<String,List<String>>();
log.debug("Preparing parameters...");
- HttpRequestContext request = this.httpContext.getRequest();
- // Parameters for a GET request
- MultivaluedMap<String,String> queryParameters =
request.getQueryParameters();
+
+ // Parameters for a GET request and POST
+ Map<?,?> queryParameters = uriInfo.getQueryParameters();
log.debug("... {} query parameters found", queryParameters.size());
- for (Entry<String,List<String>> e : queryParameters.entrySet()) {
- parameters.put(e.getKey(), e.getValue());
+ for (Entry<?,?> e : queryParameters.entrySet()) {
+ String k = (String) e.getKey();
+ String[] v = (String[]) e.getValue();
+ parameters.put(k, Arrays.asList(v));
}
// Parameters for a POST request with content-type
// application/x-www-form-urlencoded
- MultivaluedMap<String,String> formParameters =
request.getFormParameters();
+ MultivaluedMap<String,String> formParameters = form.asMap();
log.debug("... {} form urlencoded parameters found",
formParameters.size());
for (Entry<String,List<String>> e : formParameters.entrySet()) {
parameters.put(e.getKey(), e.getValue());
@@ -265,7 +255,7 @@ public class ReasoningServiceTaskResourc
@GET
@Produces({TEXT_HTML, "text/plain", KRFormat.RDF_XML, KRFormat.TURTLE,
"text/turtle", "text/n3"})
public Response get(@QueryParam("target") String targetGraphID) {
- log.debug("Called {} with parameters: {} ",
httpContext.getRequest().getMethod(), parameters.keySet()
+ log.debug("Called GET with parameters: {} ", parameters.keySet()
.toArray(new String[parameters.keySet().size()]));
return processRequest();
}
@@ -310,7 +300,6 @@ public class ReasoningServiceTaskResourc
// return Response.ok(new Viewable("index", this)).build();
ResponseBuilder rb = Response.ok(new Viewable("index", this));
rb.header(HttpHeaders.CONTENT_TYPE, TEXT_HTML + "; charset=utf-8");
- addCORSOrigin(servletContext, rb, headers);
return rb.build();
}
try {
@@ -321,7 +310,7 @@ public class ReasoningServiceTaskResourc
ReasoningServiceExecutor executor = new
ReasoningServiceExecutor(tcManager, imngr,
getCurrentService(), getCurrentTask(), target, parameters);
ReasoningServiceResult<?> result = executor.call();
- return new ResponseTaskBuilder(uriInfo, context,
headers).build(result);
+ return new ResponseTaskBuilder(uriInfo, headers).build(result);
} catch (Exception e) {
if (e instanceof RuntimeException) {
throw (RuntimeException)e;
@@ -364,49 +353,37 @@ public class ReasoningServiceTaskResourc
@POST
@Consumes({MULTIPART_FORM_DATA})
@Produces({TEXT_HTML, "text/plain", KRFormat.RDF_XML, KRFormat.TURTLE,
"text/turtle", "text/n3"})
- public Response post(FormDataMultiPart data) {
+ public Response post(MultiPartBody data) {
log.debug(" post(FormDataMultiPart data)");
// In this case we setup the parameter from a multipart request
- File file = null;
- for (BodyPart bpart : data.getBodyParts()) {
- log.debug("is a {}", bpart.getClass());
- if (bpart instanceof FormDataBodyPart) {
- FormDataBodyPart dbp = (FormDataBodyPart) bpart;
- if (dbp.getName().equals("file")) {
- file = bpart.getEntityAs(File.class);
- }
- // We put all the parameters field
- // XXX We supports here only simple fields
- // We do NOT support the sent of additional files, for
- // example
- if (dbp.isSimple()) {
- if (this.parameters.containsKey(dbp.getName())) {
- this.parameters.get(dbp.getName()).add(dbp.getValue());
- } else {
- List<String> values = new ArrayList<String>();
- values.add(dbp.getValue());
- this.parameters.put(dbp.getName(), values);
- }
- }
- }
- }
- // Then add the file
- if (file != null) {
- List<String> values = new ArrayList<String>();
- try {
- if (file.canRead() && file.exists()) {
- values.add(file.toURI().toURL().toString());
- } else {
- log.error("Bad request");
- log.error(" file is: {}", file);
- throw new
WebApplicationException(Response.Status.BAD_REQUEST);
- }
- } catch (MalformedURLException e) {
- // This should never happen
- throw new WebApplicationException();
- }
- this.parameters.put("file", values);
- }
+
+ if(data.getFormFileParameterValues("file").length > 0){
+ file = data.getFormFileParameterValues("file")[0];
+ }
+
+ for(String p : data.getTextParameterNames()){
+ this.parameters.put(p,
Arrays.asList(data.getTextParameterValues(p)));
+ }
+
+ log.debug(" parameters: {}", parameters);
+ log.debug(" file: {}", file);
+// // Then add the file
+// if (file != null) {
+// List<String> values = new ArrayList<String>();
+// try {
+// if (file.canRead() && file.exists()) {
+// values.add(file.toURI().toURL().toString());
+// } else {
+// log.error("Bad request");
+// log.error(" file is: {}", file);
+// throw new
WebApplicationException(Response.Status.BAD_REQUEST);
+// }
+// } catch (MalformedURLException e) {
+// // This should never happen
+// throw new WebApplicationException();
+// }
+// this.parameters.put("file", values);
+// }
return processRequest();
}
@@ -421,6 +398,11 @@ public class ReasoningServiceTaskResourc
ReasoningServiceInputManager inmgr = new SimpleInputManager();
String scope = null;
String session = null;
+
+ if(file != null){
+ inmgr.addInputProvider(new
ByteArrayInputProvider(file.getContent()));
+ }
+
for (Entry<String,List<String>> entry : this.parameters.entrySet()) {
if (entry.getKey().equals("url")) {
if (!entry.getValue().isEmpty()) {
@@ -434,21 +416,23 @@ public class ReasoningServiceTaskResourc
log.error("Parameter 'url' must have a value!");
throw new
WebApplicationException(Response.Status.BAD_REQUEST);
}
- } else if (entry.getKey().equals("file")) {
- if (!entry.getValue().isEmpty()) {
- // We keep only the first value
- // FIXME We create the file once again...
- String fv = entry.getValue().iterator().next();
- log.debug("File value is: {}", fv);
- inmgr.addInputProvider(new FileInputProvider(new
File(URI.create(fv))));
- // We remove it form the additional parameter list
- this.parameters.remove("url");
- } else {
- // Parameter exists with no value
- log.error("Parameter 'url' must have a value!");
- throw new
WebApplicationException(Response.Status.BAD_REQUEST);
- }
- } else if (entry.getKey().equals("scope")) {
+ }
+// else if (entry.getKey().equals("file")) {
+// if (!entry.getValue().isEmpty()) {
+// // We keep only the first value
+// // FIXME We create the file once again...
+// String fv = entry.getValue().iterator().next();
+// log.debug("File value is: {}", fv);
+// inmgr.addInputProvider(new FileInputProvider(new
File(URI.create(fv))));
+// // We remove it form the additional parameter list
+// this.parameters.remove("url");
+// } else {
+// // Parameter exists with no value
+// log.error("Parameter 'url' must have a value!");
+// throw new
WebApplicationException(Response.Status.BAD_REQUEST);
+// }
+// }
+ else if (entry.getKey().equals("scope")) {
if (!entry.getValue().isEmpty()) {
scope = entry.getValue().iterator().next();
} else {
@@ -552,8 +536,7 @@ public class ReasoningServiceTaskResourc
*/
private ReasoningServicesManager getServicesManager() {
log.debug("(getServicesManager()) ");
- return (ReasoningServicesManager)
ContextHelper.getServiceFromContext(ReasoningServicesManager.class,
- this.context);
+ return reasoningServicesManager;
}
/**
@@ -573,7 +556,7 @@ public class ReasoningServiceTaskResourc
*/
private JobManager getJobManager() {
log.debug("(getJobManager()) ");
- return (JobManager)
ContextHelper.getServiceFromContext(JobManager.class, this.context);
+ return jobManager;
}
public Map<String,String> getServiceDescription() {
Modified:
stanbol/branches/commons-ng/reasoners/web/src/main/java/org/apache/stanbol/reasoners/web/resources/ReasoningServicesResource.java
URL:
http://svn.apache.org/viewvc/stanbol/branches/commons-ng/reasoners/web/src/main/java/org/apache/stanbol/reasoners/web/resources/ReasoningServicesResource.java?rev=1533955&r1=1533954&r2=1533955&view=diff
==============================================================================
---
stanbol/branches/commons-ng/reasoners/web/src/main/java/org/apache/stanbol/reasoners/web/resources/ReasoningServicesResource.java
(original)
+++
stanbol/branches/commons-ng/reasoners/web/src/main/java/org/apache/stanbol/reasoners/web/resources/ReasoningServicesResource.java
Sun Oct 20 19:14:28 2013
@@ -17,7 +17,6 @@
package org.apache.stanbol.reasoners.web.resources;
import static javax.ws.rs.core.MediaType.TEXT_HTML;
-import static org.apache.stanbol.commons.web.base.CorsHelper.addCORSOrigin;
import java.util.ArrayList;
import java.util.HashMap;
@@ -25,7 +24,6 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
-import javax.servlet.ServletContext;
import javax.ws.rs.GET;
import javax.ws.rs.Path;
import javax.ws.rs.PathParam;
@@ -37,8 +35,7 @@ import javax.ws.rs.core.Response.Respons
import javax.ws.rs.core.Response.Status;
import javax.ws.rs.core.UriInfo;
-import org.apache.stanbol.commons.viewable.Viewable;
-import org.apache.stanbol.commons.web.base.ContextHelper;
+import org.apache.stanbol.commons.web.viewable.Viewable;
import org.apache.stanbol.commons.web.base.resource.BaseStanbolResource;
import org.apache.stanbol.reasoners.servicesapi.ReasoningService;
import org.apache.stanbol.reasoners.servicesapi.ReasoningServicesManager;
@@ -57,12 +54,10 @@ import org.slf4j.LoggerFactory;
@Path("/reasoners")
public class ReasoningServicesResource extends BaseStanbolResource {
private Logger log = LoggerFactory.getLogger(getClass());
- private ServletContext context;
private UriInfo uriInfo;
- public ReasoningServicesResource(@Context ServletContext servletContext,
@Context UriInfo uriInfo) {
+ public ReasoningServicesResource(@Context UriInfo uriInfo) {
super();
- this.context = servletContext;
this.uriInfo = uriInfo;
}
@@ -75,11 +70,11 @@ public class ReasoningServicesResource e
public Response getDocumentation(@Context HttpHeaders headers) {
ResponseBuilder rb = Response.ok(new Viewable("index", this));
rb.header(HttpHeaders.CONTENT_TYPE, TEXT_HTML + "; charset=utf-8");
- addCORSOrigin(servletContext, rb, headers);
return rb.build();
}
private ReasoningService<?,?,?> service = null;
+ private ReasoningServicesManager reasoningServicesManager;
@GET
@Produces(TEXT_HTML)
@@ -93,20 +88,17 @@ public class ReasoningServicesResource e
ResponseBuilder rb = Response.status(Status.NOT_FOUND);
rb.header(HttpHeaders.CONTENT_TYPE, TEXT_HTML + ";
charset=utf-8");
- addCORSOrigin(servletContext, rb, headers);
return rb.build();
}
ResponseBuilder rb = Response.ok(new Viewable("service", this));
rb.header(HttpHeaders.CONTENT_TYPE, TEXT_HTML + "; charset=utf-8");
- addCORSOrigin(servletContext, rb, headers);
return rb.build();
}
private ReasoningServicesManager getServicesManager() {
log.debug("(getServicesManager()) ");
- return (ReasoningServicesManager)
ContextHelper.getServiceFromContext(ReasoningServicesManager.class,
- this.context);
+ return reasoningServicesManager;
}
public Set<ReasoningService<?,?,?>> getActiveServices() {
Modified:
stanbol/branches/commons-ng/reasoners/web/src/main/java/org/apache/stanbol/reasoners/web/utils/ReasoningPrettyResultResource.java
URL:
http://svn.apache.org/viewvc/stanbol/branches/commons-ng/reasoners/web/src/main/java/org/apache/stanbol/reasoners/web/utils/ReasoningPrettyResultResource.java?rev=1533955&r1=1533954&r2=1533955&view=diff
==============================================================================
---
stanbol/branches/commons-ng/reasoners/web/src/main/java/org/apache/stanbol/reasoners/web/utils/ReasoningPrettyResultResource.java
(original)
+++
stanbol/branches/commons-ng/reasoners/web/src/main/java/org/apache/stanbol/reasoners/web/utils/ReasoningPrettyResultResource.java
Sun Oct 20 19:14:28 2013
@@ -16,7 +16,6 @@
*/
package org.apache.stanbol.reasoners.web.utils;
-import javax.servlet.ServletContext;
import javax.ws.rs.core.UriInfo;
import org.apache.stanbol.commons.web.base.resource.BaseStanbolResource;
@@ -30,9 +29,8 @@ import org.apache.stanbol.commons.web.ba
public class ReasoningPrettyResultResource extends BaseStanbolResource {
private Object result;
- public ReasoningPrettyResultResource(ServletContext context, UriInfo
uriInfo, Object result) {
+ public ReasoningPrettyResultResource(UriInfo uriInfo, Object result) {
this.result = result;
- this.servletContext = context;
this.uriInfo = uriInfo;
}
Modified:
stanbol/branches/commons-ng/reasoners/web/src/main/java/org/apache/stanbol/reasoners/web/utils/ResponseTaskBuilder.java
URL:
http://svn.apache.org/viewvc/stanbol/branches/commons-ng/reasoners/web/src/main/java/org/apache/stanbol/reasoners/web/utils/ResponseTaskBuilder.java?rev=1533955&r1=1533954&r2=1533955&view=diff
==============================================================================
---
stanbol/branches/commons-ng/reasoners/web/src/main/java/org/apache/stanbol/reasoners/web/utils/ResponseTaskBuilder.java
(original)
+++
stanbol/branches/commons-ng/reasoners/web/src/main/java/org/apache/stanbol/reasoners/web/utils/ResponseTaskBuilder.java
Sun Oct 20 19:14:28 2013
@@ -17,7 +17,7 @@
package org.apache.stanbol.reasoners.web.utils;
import static javax.ws.rs.core.MediaType.TEXT_HTML;
-import static org.apache.stanbol.commons.web.base.CorsHelper.addCORSOrigin;
+//import static org.apache.stanbol.commons.web.base.CorsHelper.addCORSOrigin;
import java.io.ByteArrayOutputStream;
import java.io.OutputStream;
@@ -26,7 +26,6 @@ import java.util.HashSet;
import java.util.List;
import java.util.Set;
-import javax.servlet.ServletContext;
import javax.ws.rs.core.HttpHeaders;
import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Response;
@@ -34,7 +33,7 @@ import javax.ws.rs.core.UriInfo;
import javax.ws.rs.core.Response.ResponseBuilder;
import javax.ws.rs.core.Response.Status;
-import org.apache.stanbol.commons.viewable.Viewable;
+import org.apache.stanbol.commons.web.viewable.Viewable;
import org.apache.stanbol.commons.web.base.format.KRFormat;
import org.coode.owlapi.manchesterowlsyntax.ManchesterOWLSyntaxOntologyFormat;
import org.semanticweb.owlapi.io.StreamDocumentTarget;
@@ -56,12 +55,12 @@ import com.hp.hpl.jena.rdf.model.Model;
public class ResponseTaskBuilder {
private final Logger log = LoggerFactory.getLogger(getClass());
private UriInfo info;
- private ServletContext context;
+// private ServletContext context;
private HttpHeaders headers;
- public ResponseTaskBuilder(UriInfo info, ServletContext context,
HttpHeaders headers) {
+ public ResponseTaskBuilder(UriInfo info, HttpHeaders headers) {
this.info = info;
- this.context = context;
+// this.context = context;
this.headers = headers;
}
@@ -78,7 +77,7 @@ public class ResponseTaskBuilder {
private Response build(){
//return Response.ok().build();
ResponseBuilder rb = Response.ok();
- addCORSOrigin(context, rb, headers);
+// addCORSOrigin(context, rb, headers);
return rb.build();
}
@@ -95,13 +94,11 @@ public class ResponseTaskBuilder {
ResponseBuilder rb = Response.ok(
new Viewable("result",
- new ReasoningPrettyResultResource(
- context, info, out)
- )
+ new ReasoningPrettyResultResource(info, out))
);
rb.header(HttpHeaders.CONTENT_TYPE, TEXT_HTML + "; charset=utf-8");
- addCORSOrigin(context, rb, headers);
+// addCORSOrigin(context, rb, headers);
return rb.build();
/* return Response.ok(
new Viewable("result",
@@ -111,7 +108,7 @@ public class ResponseTaskBuilder {
} else {
//return Response.ok(object).build();
ResponseBuilder rb = Response.ok( object );
- addCORSOrigin(context, rb, headers);
+// addCORSOrigin(context, rb, headers);
return rb.build();
}
}
@@ -192,13 +189,12 @@ public class ResponseTaskBuilder {
ResponseBuilder rb = Response.ok(
new Viewable("result",
- new ReasoningPrettyResultResource(
- context, info, "The input is consistent :)")
+ new ReasoningPrettyResultResource(info, "The input is
consistent :)")
)
);
rb.header(HttpHeaders.CONTENT_TYPE, TEXT_HTML + ";
charset=utf-8");
- addCORSOrigin(context, rb, headers);
+// addCORSOrigin(context, rb, headers);
return rb.build();
/*return Response.ok(
@@ -211,8 +207,8 @@ public class ResponseTaskBuilder {
log.debug("The input is not consistent");
ResponseBuilder rb = Response.status(Status.CONFLICT);
rb.header(HttpHeaders.CONTENT_TYPE, TEXT_HTML + ";
charset=utf-8");
- addCORSOrigin(context, rb, headers);
- rb.entity(new Viewable("result", new
ReasoningPrettyResultResource(context, info,
+// addCORSOrigin(context, rb, headers);
+ rb.entity(new Viewable("result", new
ReasoningPrettyResultResource(info,
"The input is NOT consistent :(")));
return rb.build();
@@ -229,14 +225,14 @@ public class ResponseTaskBuilder {
log.debug("The input is consistent");
//return Response.ok("The input is consistent :)").build();
ResponseBuilder rb = Response.ok("The input is consistent :)");
- addCORSOrigin(context, rb, headers);
+// addCORSOrigin(context, rb, headers);
return rb.build();
} else {
log.debug("The input is not consistent");
//return Response.status(Status.CONFLICT).build();
ResponseBuilder rb = Response.status(Status.CONFLICT);
- addCORSOrigin(context, rb, headers);
+// addCORSOrigin(context, rb, headers);
return rb.build();
}
}
