You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stanbol.apache.org by en...@apache.org on 2013/09/08 23:10:31 UTC
svn commit: r1520930 - in /stanbol/branches/commons-ng/ontologymanager: ./
generic/core/ generic/servicesapi/ multiplexer/clerezza/ registry/
sources/clerezza/ sources/owlapi/ web/
web/src/main/java/org/apache/stanbol/ontologymanager/web/resources/ web...
Author: enridaga
Date: Sun Sep 8 21:10:30 2013
New Revision: 1520930
URL: http://svn.apache.org/r1520930
Log:
STANBOL-1152 Changed dependencies in pom files according to the new versions on ng branch Removed references to the servlet context in jax-rs resources Removed usage of ContextHelper to obtain components, using @Reference instead Removed CORS configuration relying on servlet contexts Jersey dependencies are kept by now, as multipart and other features are still the jersey way.
Modified:
stanbol/branches/commons-ng/ontologymanager/generic/core/pom.xml
stanbol/branches/commons-ng/ontologymanager/generic/servicesapi/pom.xml
stanbol/branches/commons-ng/ontologymanager/multiplexer/clerezza/pom.xml
stanbol/branches/commons-ng/ontologymanager/pom.xml
stanbol/branches/commons-ng/ontologymanager/registry/pom.xml
stanbol/branches/commons-ng/ontologymanager/sources/clerezza/pom.xml
stanbol/branches/commons-ng/ontologymanager/sources/owlapi/pom.xml
stanbol/branches/commons-ng/ontologymanager/web/pom.xml
stanbol/branches/commons-ng/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/resources/OntoNetRootResource.java
stanbol/branches/commons-ng/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/resources/RegistryManagerResource.java
stanbol/branches/commons-ng/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/resources/ScopeManagerResource.java
stanbol/branches/commons-ng/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/resources/ScopeResource.java
stanbol/branches/commons-ng/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/resources/SessionManagerResource.java
stanbol/branches/commons-ng/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/resources/SessionResource.java
stanbol/branches/commons-ng/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/util/OntologyPrettyPrintResource.java
stanbol/branches/commons-ng/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/util/OntologyStatsResource.java
Modified: stanbol/branches/commons-ng/ontologymanager/generic/core/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/branches/commons-ng/ontologymanager/generic/core/pom.xml?rev=1520930&r1=1520929&r2=1520930&view=diff
==============================================================================
--- stanbol/branches/commons-ng/ontologymanager/generic/core/pom.xml (original)
+++ stanbol/branches/commons-ng/ontologymanager/generic/core/pom.xml Sun Sep 8 21:10:30 2013
@@ -23,13 +23,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>org.apache.stanbol.ontologymanager.core</artifactId>
- <version>0.10.0-SNAPSHOT</version>
+ <version>0.11.0-SNAPSHOT</version>
<packaging>bundle</packaging>
<name>Apache Stanbol Ontology Manager : Core</name>
@@ -82,19 +82,19 @@
<dependency>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.commons.stanboltools.offline</artifactId>
- <version>0.11.0</version>
+ <version>1.0.0-SNAPSHOT</version>
</dependency>
<!-- Stanbol deps -->
<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.ontologymanager.sources.owlapi</artifactId>
- <version>0.10.0-SNAPSHOT</version>
+ <version>0.11.0-SNAPSHOT</version>
</dependency>
</dependencies>
Modified: stanbol/branches/commons-ng/ontologymanager/generic/servicesapi/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/branches/commons-ng/ontologymanager/generic/servicesapi/pom.xml?rev=1520930&r1=1520929&r2=1520930&view=diff
==============================================================================
--- stanbol/branches/commons-ng/ontologymanager/generic/servicesapi/pom.xml (original)
+++ stanbol/branches/commons-ng/ontologymanager/generic/servicesapi/pom.xml Sun Sep 8 21:10:30 2013
@@ -23,13 +23,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>org.apache.stanbol.ontologymanager.servicesapi</artifactId>
- <version>0.10.0-SNAPSHOT</version>
+ <version>0.11.0-SNAPSHOT</version>
<packaging>bundle</packaging>
<name>Apache Stanbol Ontology Manager : Services API</name>
@@ -73,7 +73,7 @@
<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>
</dependencies>
Modified: stanbol/branches/commons-ng/ontologymanager/multiplexer/clerezza/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/branches/commons-ng/ontologymanager/multiplexer/clerezza/pom.xml?rev=1520930&r1=1520929&r2=1520930&view=diff
==============================================================================
--- stanbol/branches/commons-ng/ontologymanager/multiplexer/clerezza/pom.xml (original)
+++ stanbol/branches/commons-ng/ontologymanager/multiplexer/clerezza/pom.xml Sun Sep 8 21:10:30 2013
@@ -23,13 +23,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>org.apache.stanbol.ontologymanager.multiplexer.clerezza</artifactId>
- <version>0.10.0-SNAPSHOT</version>
+ <version>0.11.0-SNAPSHOT</version>
<packaging>bundle</packaging>
<name>Apache Stanbol Ontology Manager : Network Multiplexer (Clerezza implementation)</name>
@@ -86,29 +86,29 @@
<dependency>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.commons.stanboltools.offline</artifactId>
- <version>0.11.0</version>
+ <version>1.0.0-SNAPSHOT</version>
</dependency>
<!-- Stanbol deps -->
<dependency>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.ontologymanager.core</artifactId>
- <version>0.10.0-SNAPSHOT</version>
+ <version>0.11.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.ontologymanager.sources.clerezza</artifactId>
- <version>0.10.0-SNAPSHOT</version>
+ <version>0.11.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.ontologymanager.sources.owlapi</artifactId>
- <version>0.10.0-SNAPSHOT</version>
+ <version>0.11.0-SNAPSHOT</version>
</dependency>
<!-- for testing -->
Modified: stanbol/branches/commons-ng/ontologymanager/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/branches/commons-ng/ontologymanager/pom.xml?rev=1520930&r1=1520929&r2=1520930&view=diff
==============================================================================
--- stanbol/branches/commons-ng/ontologymanager/pom.xml (original)
+++ stanbol/branches/commons-ng/ontologymanager/pom.xml Sun Sep 8 21:10:30 2013
@@ -22,12 +22,12 @@
<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>org.apache.stanbol.ontologymanager.reactor</artifactId>
- <version>0.10.0-SNAPSHOT</version>
+ <version>0.11.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>Apache Stanbol Ontology Manager Reactor</name>
Modified: stanbol/branches/commons-ng/ontologymanager/registry/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/branches/commons-ng/ontologymanager/registry/pom.xml?rev=1520930&r1=1520929&r2=1520930&view=diff
==============================================================================
--- stanbol/branches/commons-ng/ontologymanager/registry/pom.xml (original)
+++ stanbol/branches/commons-ng/ontologymanager/registry/pom.xml Sun Sep 8 21:10:30 2013
@@ -23,13 +23,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>org.apache.stanbol.ontologymanager.registry</artifactId>
- <version>0.10.0-SNAPSHOT</version>
+ <version>0.11.0-SNAPSHOT</version>
<packaging>bundle</packaging>
<name>Apache Stanbol Ontology Manager : Registry Manager</name>
@@ -82,29 +82,29 @@
<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.stanboltools.datafileprovider</artifactId>
- <version>0.11.0</version>
+ <version>1.0.0-SNAPSHOT</version>
</dependency>
<!-- Stanbol deps -->
<dependency>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.ontologymanager.multiplexer.clerezza</artifactId>
- <version>0.10.0-SNAPSHOT</version>
+ <version>0.11.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.ontologymanager.sources.owlapi</artifactId>
- <version>0.10.0-SNAPSHOT</version>
+ <version>0.11.0-SNAPSHOT</version>
</dependency>
<!-- for testing -->
Modified: stanbol/branches/commons-ng/ontologymanager/sources/clerezza/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/branches/commons-ng/ontologymanager/sources/clerezza/pom.xml?rev=1520930&r1=1520929&r2=1520930&view=diff
==============================================================================
--- stanbol/branches/commons-ng/ontologymanager/sources/clerezza/pom.xml (original)
+++ stanbol/branches/commons-ng/ontologymanager/sources/clerezza/pom.xml Sun Sep 8 21:10:30 2013
@@ -23,13 +23,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>org.apache.stanbol.ontologymanager.sources.clerezza</artifactId>
- <version>0.10.0-SNAPSHOT</version>
+ <version>0.11.0-SNAPSHOT</version>
<packaging>bundle</packaging>
<name>Apache Stanbol Ontology Manager : Input Sources (Clerezza-based)</name>
@@ -75,14 +75,14 @@
<dependency>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.commons.indexedgraph</artifactId>
- <version>0.11.0</version>
+ <version>1.0.0-SNAPSHOT</version>
</dependency>
<!-- Stanbol deps -->
<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>
<!-- for tests -->
Modified: stanbol/branches/commons-ng/ontologymanager/sources/owlapi/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/branches/commons-ng/ontologymanager/sources/owlapi/pom.xml?rev=1520930&r1=1520929&r2=1520930&view=diff
==============================================================================
--- stanbol/branches/commons-ng/ontologymanager/sources/owlapi/pom.xml (original)
+++ stanbol/branches/commons-ng/ontologymanager/sources/owlapi/pom.xml Sun Sep 8 21:10:30 2013
@@ -23,13 +23,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>org.apache.stanbol.ontologymanager.sources.owlapi</artifactId>
- <version>0.10.0-SNAPSHOT</version>
+ <version>0.11.0-SNAPSHOT</version>
<packaging>bundle</packaging>
<name>Apache Stanbol Ontology Manager : Input Sources (OWL API-based)</name>
@@ -73,7 +73,7 @@
<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>
<!-- for testing -->
Modified: stanbol/branches/commons-ng/ontologymanager/web/pom.xml
URL: http://svn.apache.org/viewvc/stanbol/branches/commons-ng/ontologymanager/web/pom.xml?rev=1520930&r1=1520929&r2=1520930&view=diff
==============================================================================
--- stanbol/branches/commons-ng/ontologymanager/web/pom.xml (original)
+++ stanbol/branches/commons-ng/ontologymanager/web/pom.xml Sun Sep 8 21:10:30 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>org.apache.stanbol.ontologymanager.web</artifactId>
- <version>0.10.0-SNAPSHOT</version>
+ <version>0.11.0-SNAPSHOT</version>
<packaging>bundle</packaging>
<name>Apache Stanbol Ontology Manager : Web</name>
@@ -94,37 +94,37 @@
<dependency>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.commons.indexedgraph</artifactId>
- <version>0.11.0</version>
+ <version>1.0.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.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.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.ontologymanager.sources.clerezza</artifactId>
- <version>0.10.0-SNAPSHOT</version>
+ <version>0.11.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.ontologymanager.sources.owlapi</artifactId>
- <version>0.10.0-SNAPSHOT</version>
+ <version>0.11.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.ontologymanager.registry</artifactId>
- <version>0.10.0-SNAPSHOT</version>
+ <version>0.11.0-SNAPSHOT</version>
</dependency>
@@ -132,17 +132,19 @@
<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>
<!-- Jersey specific JAX-RS annotations -->
<dependency> <!-- because of ImplicitProduces -->
<groupId>com.sun.jersey</groupId>
<artifactId>jersey-server</artifactId>
+ <version>1.15</version>
</dependency>
<dependency> <!-- because of multipart -->
<groupId>com.sun.jersey.contribs</groupId>
<artifactId>jersey-multipart</artifactId>
+ <version>1.15</version>
</dependency>
<!-- generic tax -->
@@ -177,6 +179,7 @@
<dependency>
<groupId>com.sun.jersey</groupId>
<artifactId>jersey-client</artifactId>
+ <version>1.15</version>
<scope>test</scope>
</dependency>
Modified: stanbol/branches/commons-ng/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/resources/OntoNetRootResource.java
URL: http://svn.apache.org/viewvc/stanbol/branches/commons-ng/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/resources/OntoNetRootResource.java?rev=1520930&r1=1520929&r2=1520930&view=diff
==============================================================================
--- stanbol/branches/commons-ng/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/resources/OntoNetRootResource.java (original)
+++ stanbol/branches/commons-ng/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/resources/OntoNetRootResource.java Sun Sep 8 21:10:30 2013
@@ -26,7 +26,7 @@ import static javax.ws.rs.core.Response.
import static javax.ws.rs.core.Response.Status.NOT_FOUND;
import static javax.ws.rs.core.Response.Status.NO_CONTENT;
import static javax.ws.rs.core.Response.Status.UNSUPPORTED_MEDIA_TYPE;
-import static org.apache.stanbol.commons.web.base.CorsHelper.addCORSOrigin;
+//import static org.apache.stanbol.commons.web.base.CorsHelper.addCORSOrigin;
import static org.apache.stanbol.commons.web.base.format.KRFormat.FUNCTIONAL_OWL;
import static org.apache.stanbol.commons.web.base.format.KRFormat.FUNCTIONAL_OWL_TYPE;
import static org.apache.stanbol.commons.web.base.format.KRFormat.MANCHESTER_OWL;
@@ -91,11 +91,12 @@ import org.apache.clerezza.rdf.core.impl
import org.apache.clerezza.rdf.core.serializedform.Parser;
import org.apache.clerezza.rdf.core.serializedform.UnsupportedFormatException;
import org.apache.clerezza.rdf.ontologies.OWL;
+import org.apache.felix.scr.annotations.Reference;
import org.apache.stanbol.commons.owl.util.OWL2Constants;
import org.apache.stanbol.commons.owl.util.OWLUtils;
import org.apache.stanbol.commons.owl.util.URIUtils;
-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.ContextHelper;
import org.apache.stanbol.ontologymanager.multiplexer.clerezza.collector.MGraphMultiplexer;
import org.apache.stanbol.ontologymanager.registry.api.RegistryContentException;
import org.apache.stanbol.ontologymanager.registry.api.RegistryManager;
@@ -146,30 +147,36 @@ import java.security.PrivilegedAction;
public class OntoNetRootResource extends AbstractOntologyAccessResource {
private Logger log = LoggerFactory.getLogger(getClass());
+
+ @Reference
protected ScopeManager onManager;
/*
* Placeholder for the OntologyProvider to be fetched from the servlet context.
*/
+ @Reference
protected OntologyProvider<?> ontologyProvider;
/*
* Placeholder for the OntologyProvider to be fetched from the servlet context.
*/
+ @Reference
protected RegistryManager registryManager;
+
+ @Reference
protected SessionManager sessionManager;
- public OntoNetRootResource(@Context ServletContext servletContext) {
+ public OntoNetRootResource() {
super();
- this.servletContext = servletContext;
- this.ontologyProvider = (OntologyProvider<?>) ContextHelper.getServiceFromContext(
- OntologyProvider.class, servletContext);
- this.onManager = (ScopeManager) ContextHelper.getServiceFromContext(ScopeManager.class,
- servletContext);
- this.sessionManager = (SessionManager) ContextHelper.getServiceFromContext(SessionManager.class,
- servletContext);
- this.registryManager = (RegistryManager) ContextHelper.getServiceFromContext(RegistryManager.class,
- servletContext);
+// this.servletContext = servletContext;
+// this.ontologyProvider = (OntologyProvider<?>) ContextHelper.getServiceFromContext(
+// OntologyProvider.class, servletContext);
+// this.onManager = (ScopeManager) ContextHelper.getServiceFromContext(ScopeManager.class,
+// servletContext);
+// this.sessionManager = (SessionManager) ContextHelper.getServiceFromContext(SessionManager.class,
+// servletContext);
+// this.registryManager = (RegistryManager) ContextHelper.getServiceFromContext(RegistryManager.class,
+// servletContext);
}
/*
@@ -179,7 +186,7 @@ public class OntoNetRootResource extends
// @DELETE
public Response clear(@Context HttpHeaders headers) {
ResponseBuilder rb = Response.ok();
- addCORSOrigin(servletContext, rb, headers);
+ //addCORSOrigin(servletContext, rb, headers);
return rb.build();
}
@@ -196,7 +203,7 @@ public class OntoNetRootResource extends
ontologyProvider.createBlankOntologyEntry(key);
rb = Response.created(uriInfo.getRequestUri());
}
- addCORSOrigin(servletContext, rb, headers);
+ //addCORSOrigin(servletContext, rb, headers);
return rb.build();
}
@@ -221,7 +228,7 @@ public class OntoNetRootResource extends
log.warn("Orphan ontology key {}. No associated graph found in store.", e.getOntologyKey());
rb = Response.status(NOT_FOUND);
}
- addCORSOrigin(servletContext, rb, headers);
+ //addCORSOrigin(servletContext, rb, headers);
return rb.build();
}
@@ -372,7 +379,7 @@ public class OntoNetRootResource extends
public Response getHtmlInfo(@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);
+ //addCORSOrigin(servletContext, rb, headers);
return rb.build();
}
@@ -380,7 +387,7 @@ public class OntoNetRootResource extends
@Produces({RDF_XML, TURTLE, X_TURTLE, APPLICATION_JSON, RDF_JSON})
public Response getMetaGraph(@Context HttpHeaders headers) {
ResponseBuilder rb = Response.ok(ontologyProvider.getMetaGraph(Graph.class));
- addCORSOrigin(servletContext, rb, headers);
+ //addCORSOrigin(servletContext, rb, headers);
return rb.build();
}
@@ -528,7 +535,7 @@ public class OntoNetRootResource extends
TripleCollection o = getGraph(ontologyId, merged, uriInfo.getRequestUri());
rb = o == null ? Response.status(NOT_FOUND) : Response.ok(o);
}
- addCORSOrigin(servletContext, rb, headers);
+ //addCORSOrigin(servletContext, rb, headers);
return rb.build();
}
@@ -562,7 +569,7 @@ public class OntoNetRootResource extends
OWLOntology o = getOWLOntology(ontologyId, merged, uriInfo.getRequestUri());
rb = o == null ? Response.status(NOT_FOUND) : Response.ok(o);
}
- addCORSOrigin(servletContext, rb, headers);
+ //addCORSOrigin(servletContext, rb, headers);
return rb.build();
}
@@ -576,7 +583,7 @@ public class OntoNetRootResource extends
mGraph.add(new TripleImpl(new UriRef(getPublicBaseUri() + "ontonet/" + alias), OWL.sameAs, me));
}
rb = Response.ok(mGraph);
- addCORSOrigin(servletContext, rb, headers);
+ //addCORSOrigin(servletContext, rb, headers);
return rb.build();
}
@@ -590,7 +597,7 @@ public class OntoNetRootResource extends
ResponseBuilder rb = performLoadOntology(data, headers,
Origin.create(OntologyUtils.decode(ontologyId)));
// rb.header(HttpHeaders.CONTENT_TYPE, TEXT_HTML + "; charset=utf-8");
- addCORSOrigin(servletContext, rb, headers);
+ //addCORSOrigin(servletContext, rb, headers);
return rb.build();
}
@@ -792,7 +799,7 @@ public class OntoNetRootResource extends
return Response.ok(new Viewable("ontology",
// new OntologyPrettyPrintResource(servletContext,
// uriInfo, out)
- new OntologyStatsResource(servletContext, uriInfo, key, o, ontologyProvider.listAliases(key),
+ new OntologyStatsResource(uriInfo, key, o, ontologyProvider.listAliases(key),
handles)));
// } catch (OWLOntologyStorageException e) {
// throw new WebApplicationException(e, INTERNAL_SERVER_ERROR);
@@ -805,7 +812,7 @@ public class OntoNetRootResource extends
public Response postOntology(FormDataMultiPart data, @Context HttpHeaders headers) {
ResponseBuilder rb = performLoadOntology(data, headers);
// rb.header(HttpHeaders.CONTENT_TYPE, TEXT_HTML + "; charset=utf-8");
- addCORSOrigin(servletContext, rb, headers);
+ //addCORSOrigin(servletContext, rb, headers);
return rb.build();
}
@@ -817,7 +824,7 @@ public class OntoNetRootResource extends
@Context UriInfo uriInfo) {
ResponseBuilder rb = performShowOntology(ontologyId);
rb.header(HttpHeaders.CONTENT_TYPE, TEXT_HTML + "; charset=utf-8");
- addCORSOrigin(servletContext, rb, headers);
+ //addCORSOrigin(servletContext, rb, headers);
return rb.build();
}
@@ -867,7 +874,7 @@ public class OntoNetRootResource extends
rb = Response.status(UNSUPPORTED_MEDIA_TYPE);
}
- addCORSOrigin(servletContext, rb, headers);
+// addCORSOrigin(servletContext, rb, headers);
Response r = rb.build();
log.debug("POST request for ontology addition completed in {} ms with status {}.",
(System.currentTimeMillis() - before), r.getStatus());
Modified: stanbol/branches/commons-ng/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/resources/RegistryManagerResource.java
URL: http://svn.apache.org/viewvc/stanbol/branches/commons-ng/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/resources/RegistryManagerResource.java?rev=1520930&r1=1520929&r2=1520930&view=diff
==============================================================================
--- stanbol/branches/commons-ng/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/resources/RegistryManagerResource.java (original)
+++ stanbol/branches/commons-ng/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/resources/RegistryManagerResource.java Sun Sep 8 21:10:30 2013
@@ -17,7 +17,7 @@
package org.apache.stanbol.ontologymanager.web.resources;
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.util.ArrayList;
import java.util.Collections;
@@ -34,8 +34,9 @@ import javax.ws.rs.core.Response;
import javax.ws.rs.core.Response.ResponseBuilder;
import javax.ws.rs.core.UriInfo;
-import org.apache.stanbol.commons.viewable.Viewable;
-import org.apache.stanbol.commons.web.base.ContextHelper;
+import org.apache.felix.scr.annotations.Reference;
+import org.apache.stanbol.commons.web.viewable.Viewable;
+//import org.apache.stanbol.commons.web.base.ContextHelper;
import org.apache.stanbol.commons.web.base.resource.BaseStanbolResource;
import org.apache.stanbol.ontologymanager.registry.api.RegistryManager;
import org.apache.stanbol.ontologymanager.registry.api.model.Library;
@@ -47,13 +48,13 @@ import org.slf4j.LoggerFactory;
public class RegistryManagerResource extends BaseStanbolResource {
private final Logger log = LoggerFactory.getLogger(getClass());
-
+ @Reference
protected RegistryManager regMgr;
// bind the registry manager by looking it up from the servlet request context
- public RegistryManagerResource(@Context ServletContext context, @Context UriInfo uriInfo) {
+ public RegistryManagerResource( @Context UriInfo uriInfo) {
super();
- regMgr = ContextHelper.getServiceFromContext(RegistryManager.class, context);
+// regMgr = ContextHelper.getServiceFromContext(RegistryManager.class, context);
this.uriInfo = uriInfo;
}
@@ -62,7 +63,7 @@ public class RegistryManagerResource ext
public Response getHtmlInfo(@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);
+// addCORSOrigin(servletContext, rb, headers);
return rb.build();
}
Modified: stanbol/branches/commons-ng/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/resources/ScopeManagerResource.java
URL: http://svn.apache.org/viewvc/stanbol/branches/commons-ng/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/resources/ScopeManagerResource.java?rev=1520930&r1=1520929&r2=1520930&view=diff
==============================================================================
--- stanbol/branches/commons-ng/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/resources/ScopeManagerResource.java (original)
+++ stanbol/branches/commons-ng/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/resources/ScopeManagerResource.java Sun Sep 8 21:10:30 2013
@@ -18,8 +18,8 @@ package org.apache.stanbol.ontologymanag
import static javax.ws.rs.core.MediaType.TEXT_HTML;
import static javax.ws.rs.core.MediaType.TEXT_PLAIN;
-import static org.apache.stanbol.commons.web.base.CorsHelper.addCORSOrigin;
-import static org.apache.stanbol.commons.web.base.CorsHelper.enableCORS;
+//import static org.apache.stanbol.commons.web.base.CorsHelper.addCORSOrigin;
+//import static org.apache.stanbol.commons.web.base.CorsHelper.enableCORS;
import static org.apache.stanbol.commons.web.base.format.KRFormat.FUNCTIONAL_OWL;
import static org.apache.stanbol.commons.web.base.format.KRFormat.MANCHESTER_OWL;
import static org.apache.stanbol.commons.web.base.format.KRFormat.N3;
@@ -47,8 +47,9 @@ import javax.ws.rs.core.Response;
import javax.ws.rs.core.Response.ResponseBuilder;
import org.apache.clerezza.rdf.core.access.TcManager;
-import org.apache.stanbol.commons.viewable.Viewable;
-import org.apache.stanbol.commons.web.base.ContextHelper;
+import org.apache.felix.scr.annotations.Reference;
+import org.apache.stanbol.commons.web.viewable.Viewable;
+//import org.apache.stanbol.commons.web.base.ContextHelper;
import org.apache.stanbol.commons.web.base.resource.BaseStanbolResource;
import org.apache.stanbol.commons.web.base.utils.MediaTypeUtil;
import org.apache.stanbol.ontologymanager.servicesapi.scope.Scope;
@@ -78,14 +79,15 @@ public class ScopeManagerResource extend
/*
* Placeholder for the ONManager to be fetched from the servlet context.
*/
+ @Reference
protected ScopeManager onm;
-
+ @Reference
protected TcManager tcManager;
public ScopeManagerResource(@Context ServletContext servletContext) {
- this.servletContext = servletContext;
- this.onm = (ScopeManager) ContextHelper.getServiceFromContext(ScopeManager.class, servletContext);
- this.tcManager = (TcManager) ContextHelper.getServiceFromContext(TcManager.class, servletContext);
+// this.servletContext = servletContext;
+// this.onm = (ScopeManager) ContextHelper.getServiceFromContext(ScopeManager.class, servletContext);
+// this.tcManager = (TcManager) ContextHelper.getServiceFromContext(TcManager.class, servletContext);
}
/**
@@ -109,7 +111,7 @@ public class ScopeManagerResource extend
public Response getHtmlInfo(@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);
+// addCORSOrigin(servletContext, rb, headers);
return rb.build();
}
@@ -138,7 +140,7 @@ public class ScopeManagerResource extend
ResponseBuilder rb = Response.ok(ontology);
MediaType mediaType = MediaTypeUtil.getAcceptableMediaType(headers, null);
if (mediaType != null) rb.header(HttpHeaders.CONTENT_TYPE, mediaType);
- addCORSOrigin(servletContext, rb, headers);
+// addCORSOrigin(servletContext, rb, headers);
return rb.build();
}
@@ -149,7 +151,7 @@ public class ScopeManagerResource extend
@OPTIONS
public Response handleCorsPreflight(@Context HttpHeaders headers) {
ResponseBuilder rb = Response.ok();
- enableCORS(servletContext, rb, headers);
+// enableCORS(servletContext, rb, headers);
return rb.build();
}
Modified: stanbol/branches/commons-ng/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/resources/ScopeResource.java
URL: http://svn.apache.org/viewvc/stanbol/branches/commons-ng/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/resources/ScopeResource.java?rev=1520930&r1=1520929&r2=1520930&view=diff
==============================================================================
--- stanbol/branches/commons-ng/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/resources/ScopeResource.java (original)
+++ stanbol/branches/commons-ng/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/resources/ScopeResource.java Sun Sep 8 21:10:30 2013
@@ -16,11 +16,11 @@
*/
package org.apache.stanbol.ontologymanager.web.resources;
-import static javax.ws.rs.HttpMethod.DELETE;
-import static javax.ws.rs.HttpMethod.GET;
-import static javax.ws.rs.HttpMethod.OPTIONS;
-import static javax.ws.rs.HttpMethod.POST;
-import static javax.ws.rs.HttpMethod.PUT;
+//import static javax.ws.rs.HttpMethod.DELETE;
+//import static javax.ws.rs.HttpMethod.GET;
+//import static javax.ws.rs.HttpMethod.OPTIONS;
+//import static javax.ws.rs.HttpMethod.POST;
+//import static javax.ws.rs.HttpMethod.PUT;
import static javax.ws.rs.core.MediaType.APPLICATION_JSON;
import static javax.ws.rs.core.MediaType.MULTIPART_FORM_DATA;
import static javax.ws.rs.core.MediaType.TEXT_HTML;
@@ -31,8 +31,8 @@ import static javax.ws.rs.core.Response.
import static javax.ws.rs.core.Response.Status.INTERNAL_SERVER_ERROR;
import static javax.ws.rs.core.Response.Status.NOT_FOUND;
import static javax.ws.rs.core.Response.Status.UNSUPPORTED_MEDIA_TYPE;
-import static org.apache.stanbol.commons.web.base.CorsHelper.addCORSOrigin;
-import static org.apache.stanbol.commons.web.base.CorsHelper.enableCORS;
+//import static org.apache.stanbol.commons.web.base.CorsHelper.addCORSOrigin;
+//import static org.apache.stanbol.commons.web.base.CorsHelper.enableCORS;
import static org.apache.stanbol.commons.web.base.format.KRFormat.FUNCTIONAL_OWL;
import static org.apache.stanbol.commons.web.base.format.KRFormat.MANCHESTER_OWL;
import static org.apache.stanbol.commons.web.base.format.KRFormat.N3;
@@ -85,10 +85,11 @@ import org.apache.clerezza.rdf.core.Trip
import org.apache.clerezza.rdf.core.access.TcProvider;
import org.apache.clerezza.rdf.core.serializedform.Parser;
import org.apache.clerezza.rdf.core.serializedform.UnsupportedFormatException;
+import org.apache.felix.scr.annotations.Reference;
import org.apache.stanbol.commons.owl.util.OWLUtils;
import org.apache.stanbol.commons.owl.util.URIUtils;
-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.ContextHelper;
import org.apache.stanbol.ontologymanager.ontonet.api.scope.OntologyScope;
import org.apache.stanbol.ontologymanager.registry.api.RegistryManager;
import org.apache.stanbol.ontologymanager.registry.api.model.Library;
@@ -137,13 +138,15 @@ public class ScopeResource extends Abstr
/*
* Placeholder for the ONManager to be fetched from the servlet context.
*/
+ @Reference
protected ScopeManager onm;
-
+ @Reference
protected OntologyProvider<TcProvider> ontologyProvider;
/*
* Placeholder for the RegistryManager to be fetched from the servlet context.
*/
+ @Reference
protected RegistryManager regMgr;
protected Scope scope;
@@ -151,13 +154,13 @@ public class ScopeResource extends Abstr
public ScopeResource(@PathParam(value = "scopeid") String scopeId, @Context ServletContext servletContext) {
super();
log.info("<init> with scope {}", scopeId);
-
- this.servletContext = servletContext;
- this.onm = (ScopeManager) ContextHelper.getServiceFromContext(ScopeManager.class, servletContext);
- this.regMgr = (RegistryManager) ContextHelper.getServiceFromContext(RegistryManager.class,
- servletContext);
- this.ontologyProvider = (OntologyProvider<TcProvider>) ContextHelper.getServiceFromContext(
- OntologyProvider.class, servletContext);
+//
+// this.servletContext = servletContext;
+// this.onm = (ScopeManager) ContextHelper.getServiceFromContext(ScopeManager.class, servletContext);
+// this.regMgr = (RegistryManager) ContextHelper.getServiceFromContext(RegistryManager.class,
+// servletContext);
+// this.ontologyProvider = (OntologyProvider<TcProvider>) ContextHelper.getServiceFromContext(
+// OntologyProvider.class, servletContext);
if (scopeId == null || scopeId.isEmpty()) {
log.error("Missing path parameter scopeid={}", scopeId);
@@ -181,7 +184,7 @@ public class ScopeResource extends Abstr
IRI prefix = IRI.create(getPublicBaseUri() + "ontonet/ontology/");
// Export to Clerezza Graph, which can be rendered as JSON-LD.
ResponseBuilder rb = Response.ok(scope.export(Graph.class, merge, prefix));
- addCORSOrigin(servletContext, rb, headers);
+// addCORSOrigin(servletContext, rb, headers);
return rb.build();
}
@@ -196,7 +199,7 @@ public class ScopeResource extends Abstr
IRI prefix = IRI.create(getPublicBaseUri() + "ontonet/ontology/");
if (merge) rb = Response.ok(scope.export(Graph.class, merge, prefix));
else rb = Response.ok(scope.export(OWLOntology.class, merge, prefix));
- addCORSOrigin(servletContext, rb, headers);
+// addCORSOrigin(servletContext, rb, headers);
return rb.build();
}
@@ -209,7 +212,7 @@ public class ScopeResource extends Abstr
IRI prefix = IRI.create(getPublicBaseUri() + "ontonet/ontology/");
// Export to OWLOntology due to the more human-readable rendering.
ResponseBuilder rb = Response.ok(scope.export(OWLOntology.class, merge, prefix));
- addCORSOrigin(servletContext, rb, headers);
+// addCORSOrigin(servletContext, rb, headers);
return rb.build();
}
@@ -221,7 +224,7 @@ public class ScopeResource extends Abstr
onm.deregisterScope(scope);
scope = null;
ResponseBuilder rb = Response.ok();
- addCORSOrigin(servletContext, rb, headers);
+// addCORSOrigin(servletContext, rb, headers);
return rb.build();
}
@@ -243,7 +246,7 @@ public class ScopeResource extends Abstr
IRI prefix = IRI.create(getPublicBaseUri() + "ontonet/ontology/");
Graph o = space.export(Graph.class, merge, prefix);
ResponseBuilder rb = Response.ok(o);
- addCORSOrigin(servletContext, rb, headers);
+// addCORSOrigin(servletContext, rb, headers);
return rb.build();
}
@@ -258,7 +261,7 @@ public class ScopeResource extends Abstr
IRI prefix = IRI.create(getPublicBaseUri() + "ontonet/ontology/");
OWLOntology o = space.export(OWLOntology.class, merge, prefix);
ResponseBuilder rb = Response.ok(o);
- addCORSOrigin(servletContext, rb, headers);
+// addCORSOrigin(servletContext, rb, headers);
return rb.build();
}
@@ -284,7 +287,7 @@ public class ScopeResource extends Abstr
IRI prefix = IRI.create(getPublicBaseUri() + "ontonet/ontology/");
Graph o = space.export(Graph.class, merge, prefix);
ResponseBuilder rb = Response.ok(o);
- addCORSOrigin(servletContext, rb, headers);
+// addCORSOrigin(servletContext, rb, headers);
return rb.build();
}
@@ -299,7 +302,7 @@ public class ScopeResource extends Abstr
IRI prefix = IRI.create(getPublicBaseUri() + "ontonet/ontology/");
OWLOntology o = space.export(OWLOntology.class, merge, prefix);
ResponseBuilder rb = Response.ok(o);
- addCORSOrigin(servletContext, rb, headers);
+// addCORSOrigin(servletContext, rb, headers);
return rb.build();
}
@@ -308,9 +311,9 @@ public class ScopeResource extends Abstr
public Response getHtmlInfo(@Context HttpHeaders headers) {
ResponseBuilder rb;
if (scope == null) rb = Response.status(NOT_FOUND);
- else rb = Response.ok(new Viewable("index", this));
+ else rb = Response.ok(new Viewable("index", this)); // TODO move to a dedicated class
rb.header(HttpHeaders.CONTENT_TYPE, TEXT_HTML + "; charset=utf-8");
- addCORSOrigin(servletContext, rb, headers);
+// addCORSOrigin(servletContext, rb, headers);
return rb.build();
}
@@ -343,7 +346,7 @@ public class ScopeResource extends Abstr
@OPTIONS
public Response handleCorsPreflight(@Context HttpHeaders headers) {
ResponseBuilder rb = Response.ok();
- enableCORS(servletContext, rb, headers, GET, POST, PUT, DELETE, OPTIONS);
+// enableCORS(servletContext, rb, headers, GET, POST, PUT, DELETE, OPTIONS);
return rb.build();
}
@@ -351,7 +354,7 @@ public class ScopeResource extends Abstr
@Path("/core")
public Response handleCorsPreflightCore(@Context HttpHeaders headers) {
ResponseBuilder rb = Response.ok();
- enableCORS(servletContext, rb, headers, GET, OPTIONS);
+// enableCORS(servletContext, rb, headers, GET, OPTIONS);
return rb.build();
}
@@ -359,7 +362,7 @@ public class ScopeResource extends Abstr
@Path("/custom")
public Response handleCorsPreflightCustom(@Context HttpHeaders headers) {
ResponseBuilder rb = Response.ok();
- enableCORS(servletContext, rb, headers, GET, OPTIONS);
+// enableCORS(servletContext, rb, headers, GET, OPTIONS);
return rb.build();
}
@@ -367,7 +370,7 @@ public class ScopeResource extends Abstr
@Path("/{ontologyId:.+}")
public Response handleCorsPreflightOntology(@Context HttpHeaders headers) {
ResponseBuilder rb = Response.ok();
- enableCORS(servletContext, rb, headers, GET, DELETE, OPTIONS);
+// enableCORS(servletContext, rb, headers, GET, DELETE, OPTIONS);
return rb.build();
}
@@ -409,7 +412,7 @@ public class ScopeResource extends Abstr
else rb = Response.ok(o);
}
- addCORSOrigin(servletContext, rb, headers);
+// addCORSOrigin(servletContext, rb, headers);
return rb.build();
}
@@ -451,7 +454,7 @@ public class ScopeResource extends Abstr
if (o == null) rb = Response.status(NOT_FOUND);
else rb = Response.ok(o);
}
- addCORSOrigin(servletContext, rb, headers);
+// addCORSOrigin(servletContext, rb, headers);
return rb.build();
}
@@ -475,14 +478,14 @@ public class ScopeResource extends Abstr
else try {
ByteArrayOutputStream out = new ByteArrayOutputStream();
o.getOWLOntologyManager().saveOntology(o, new ManchesterOWLSyntaxOntologyFormat(), out);
- rb = Response.ok(new Viewable("ontology", new OntologyPrettyPrintResource(servletContext,
+ rb = Response.ok(new Viewable("ontology", new OntologyPrettyPrintResource(
uriInfo, out, scope)));
} catch (OWLOntologyStorageException e) {
throw new WebApplicationException(e, INTERNAL_SERVER_ERROR);
}
}
rb.header(HttpHeaders.CONTENT_TYPE, TEXT_HTML + "; charset=utf-8");
- addCORSOrigin(servletContext, rb, headers);
+// addCORSOrigin(servletContext, rb, headers);
return rb.build();
}
@@ -519,7 +522,7 @@ public class ScopeResource extends Abstr
onm.setScopeActive(scopeId, true);
}
} else rb = Response.status(BAD_REQUEST); // null/blank ontology ID
- addCORSOrigin(servletContext, rb, headers);
+// addCORSOrigin(servletContext, rb, headers);
return rb.build();
}
@@ -573,7 +576,7 @@ public class ScopeResource extends Abstr
} catch (UnmodifiableOntologyCollectorException e) {
throw new WebApplicationException(e, FORBIDDEN);
}
- addCORSOrigin(servletContext, rb, headers);
+// addCORSOrigin(servletContext, rb, headers);
return rb.build();
}
@@ -603,7 +606,7 @@ public class ScopeResource extends Abstr
} catch (OWLOntologyCreationException e) {
throw new WebApplicationException(e, INTERNAL_SERVER_ERROR);
}
- addCORSOrigin(servletContext, rb, headers);
+// addCORSOrigin(servletContext, rb, headers);
return rb.build();
}
@@ -734,7 +737,7 @@ public class ScopeResource extends Abstr
// else throw new WebApplicationException(BAD_REQUEST);
// rb.header(HttpHeaders.CONTENT_TYPE, TEXT_HTML + "; charset=utf-8");
// FIXME return an appropriate response e.g. 201
- addCORSOrigin(servletContext, rb, headers);
+// addCORSOrigin(servletContext, rb, headers);
return rb.build();
}
@@ -813,7 +816,7 @@ public class ScopeResource extends Abstr
}
ResponseBuilder rb = Response.created(uriInfo.getAbsolutePath());
- addCORSOrigin(servletContext, rb, headers);
+// addCORSOrigin(servletContext, rb, headers);
return rb.build();
}
Modified: stanbol/branches/commons-ng/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/resources/SessionManagerResource.java
URL: http://svn.apache.org/viewvc/stanbol/branches/commons-ng/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/resources/SessionManagerResource.java?rev=1520930&r1=1520929&r2=1520930&view=diff
==============================================================================
--- stanbol/branches/commons-ng/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/resources/SessionManagerResource.java (original)
+++ stanbol/branches/commons-ng/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/resources/SessionManagerResource.java Sun Sep 8 21:10:30 2013
@@ -20,7 +20,7 @@ import static javax.ws.rs.core.MediaType
import static javax.ws.rs.core.MediaType.TEXT_PLAIN;
import static javax.ws.rs.core.Response.Status.FORBIDDEN;
import static javax.ws.rs.core.Response.Status.INTERNAL_SERVER_ERROR;
-import static org.apache.stanbol.commons.web.base.CorsHelper.addCORSOrigin;
+//import static org.apache.stanbol.commons.web.base.CorsHelper.addCORSOrigin;
import static org.apache.stanbol.commons.web.base.format.KRFormat.FUNCTIONAL_OWL;
import static org.apache.stanbol.commons.web.base.format.KRFormat.MANCHESTER_OWL;
import static org.apache.stanbol.commons.web.base.format.KRFormat.N3;
@@ -50,8 +50,9 @@ import javax.ws.rs.core.Response;
import javax.ws.rs.core.Response.ResponseBuilder;
import javax.ws.rs.core.UriInfo;
-import org.apache.stanbol.commons.viewable.Viewable;
-import org.apache.stanbol.commons.web.base.ContextHelper;
+import org.apache.felix.scr.annotations.Reference;
+import org.apache.stanbol.commons.web.viewable.Viewable;
+//import org.apache.stanbol.commons.web.base.ContextHelper;
import org.apache.stanbol.commons.web.base.resource.BaseStanbolResource;
import org.apache.stanbol.commons.web.base.utils.MediaTypeUtil;
import org.apache.stanbol.ontologymanager.servicesapi.session.Session;
@@ -75,12 +76,12 @@ public class SessionManagerResource exte
/*
* Placeholder for the ONManager to be fetched from the servlet context.
*/
+ @Reference
protected SessionManager sessionManager;
- public SessionManagerResource(@Context ServletContext servletContext) {
- this.servletContext = servletContext;
- this.sessionManager = (SessionManager) ContextHelper.getServiceFromContext(SessionManager.class,
- servletContext);
+ public SessionManagerResource() {
+// this.sessionManager = (SessionManager) ContextHelper.getServiceFromContext(SessionManager.class,
+// servletContext);
}
@POST
@@ -96,7 +97,7 @@ public class SessionManagerResource exte
uri = uri.substring(0, uri.length() - 1);
uri += "/" + s.getID();
ResponseBuilder rb = Response.created(URI.create(uri));
- addCORSOrigin(servletContext, rb, headers);
+// addCORSOrigin(servletContext, rb, headers);
return rb.build();
}
@@ -105,7 +106,7 @@ public class SessionManagerResource exte
public Response getHtmlInfo(@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);
+// addCORSOrigin(servletContext, rb, headers);
return rb.build();
}
@@ -140,7 +141,7 @@ public class SessionManagerResource exte
ResponseBuilder rb = Response.ok(o);
MediaType mediaType = MediaTypeUtil.getAcceptableMediaType(headers, null);
if (mediaType != null) rb.header(HttpHeaders.CONTENT_TYPE, mediaType);
- addCORSOrigin(servletContext, rb, headers);
+// addCORSOrigin(servletContext, rb, headers);
return rb.build();
}
Modified: stanbol/branches/commons-ng/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/resources/SessionResource.java
URL: http://svn.apache.org/viewvc/stanbol/branches/commons-ng/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/resources/SessionResource.java?rev=1520930&r1=1520929&r2=1520930&view=diff
==============================================================================
--- stanbol/branches/commons-ng/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/resources/SessionResource.java (original)
+++ stanbol/branches/commons-ng/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/resources/SessionResource.java Sun Sep 8 21:10:30 2013
@@ -16,11 +16,11 @@
*/
package org.apache.stanbol.ontologymanager.web.resources;
-import static javax.ws.rs.HttpMethod.DELETE;
-import static javax.ws.rs.HttpMethod.GET;
-import static javax.ws.rs.HttpMethod.OPTIONS;
-import static javax.ws.rs.HttpMethod.POST;
-import static javax.ws.rs.HttpMethod.PUT;
+//import static javax.ws.rs.HttpMethod.DELETE;
+//import static javax.ws.rs.HttpMethod.GET;
+//import static javax.ws.rs.HttpMethod.OPTIONS;
+//import static javax.ws.rs.HttpMethod.POST;
+//import static javax.ws.rs.HttpMethod.PUT;
import static javax.ws.rs.core.MediaType.APPLICATION_JSON;
import static javax.ws.rs.core.MediaType.MULTIPART_FORM_DATA;
import static javax.ws.rs.core.MediaType.TEXT_HTML;
@@ -31,8 +31,6 @@ import static javax.ws.rs.core.Response.
import static javax.ws.rs.core.Response.Status.FORBIDDEN;
import static javax.ws.rs.core.Response.Status.INTERNAL_SERVER_ERROR;
import static javax.ws.rs.core.Response.Status.NOT_FOUND;
-import static org.apache.stanbol.commons.web.base.CorsHelper.addCORSOrigin;
-import static org.apache.stanbol.commons.web.base.CorsHelper.enableCORS;
import static org.apache.stanbol.commons.web.base.format.KRFormat.FUNCTIONAL_OWL;
import static org.apache.stanbol.commons.web.base.format.KRFormat.MANCHESTER_OWL;
import static org.apache.stanbol.commons.web.base.format.KRFormat.N3;
@@ -81,9 +79,10 @@ import javax.ws.rs.core.UriInfo;
import org.apache.clerezza.rdf.core.Graph;
import org.apache.clerezza.rdf.core.access.TcProvider;
import org.apache.clerezza.rdf.core.serializedform.Parser;
+import org.apache.felix.scr.annotations.Reference;
import org.apache.stanbol.commons.owl.util.OWLUtils;
-import org.apache.stanbol.commons.viewable.Viewable;
-import org.apache.stanbol.commons.web.base.ContextHelper;
+//import org.apache.stanbol.commons.viewable.Viewable;
+import org.apache.stanbol.commons.web.viewable.Viewable;
import org.apache.stanbol.ontologymanager.registry.api.RegistryManager;
import org.apache.stanbol.ontologymanager.registry.io.LibrarySource;
import org.apache.stanbol.ontologymanager.servicesapi.collector.IrremovableOntologyException;
@@ -116,6 +115,9 @@ import org.slf4j.LoggerFactory;
import com.sun.jersey.multipart.BodyPart;
import com.sun.jersey.multipart.FormDataBodyPart;
import com.sun.jersey.multipart.FormDataMultiPart;
+//import static org.apache.stanbol.commons.web.base.CorsHelper.addCORSOrigin;
+//import static org.apache.stanbol.commons.web.base.CorsHelper.enableCORS;
+//import org.apache.stanbol.commons.web.base.ContextHelper;
/**
* The REST resource of an OntoNet {@link Session} whose identifier is known.
@@ -128,31 +130,36 @@ public class SessionResource extends Abs
private Logger log = LoggerFactory.getLogger(getClass());
+ @Reference
protected ScopeManager onMgr;
+ @Reference
protected OntologyProvider<TcProvider> ontologyProvider;
/*
* Placeholder for the RegistryManager to be fetched from the servlet context.
*/
+ @Reference
protected RegistryManager regMgr;
/*
* Placeholder for the session manager to be fetched from the servlet context.
*/
+ @Reference
protected SessionManager sesMgr;
protected Session session;
- public SessionResource(@PathParam(value = "id") String sessionId, @Context ServletContext servletContext) {
- this.servletContext = servletContext;
- this.sesMgr = (SessionManager) ContextHelper.getServiceFromContext(SessionManager.class,
- servletContext);
- this.regMgr = (RegistryManager) ContextHelper.getServiceFromContext(RegistryManager.class,
- servletContext);
- this.ontologyProvider = (OntologyProvider<TcProvider>) ContextHelper.getServiceFromContext(
- OntologyProvider.class, servletContext);
- this.onMgr = (ScopeManager) ContextHelper.getServiceFromContext(ScopeManager.class, servletContext);
+ public SessionResource(@PathParam(value = "id") String sessionId) {
+// public SessionResource(@PathParam(value = "id") String sessionId, @Context ServletContext servletContext) {
+// this.servletContext = servletContext;
+// this.sesMgr = (SessionManager) ContextHelper.getServiceFromContext(SessionManager.class,
+// servletContext);
+// this.regMgr = (RegistryManager) ContextHelper.getServiceFromContext(RegistryManager.class,
+// servletContext);
+// this.ontologyProvider = (OntologyProvider<TcProvider>) ContextHelper.getServiceFromContext(
+// OntologyProvider.class, servletContext);
+// this.onMgr = (ScopeManager) ContextHelper.getServiceFromContext(ScopeManager.class, servletContext);
session = sesMgr.getSession(sessionId);
}
@@ -165,7 +172,7 @@ public class SessionResource extends Abs
IRI prefix = IRI.create(getPublicBaseUri() + "ontonet/session/");
// Export to Clerezza Graph, which can be rendered as JSON-LD.
ResponseBuilder rb = Response.ok(session.export(Graph.class, merge, prefix));
- addCORSOrigin(servletContext, rb, headers);
+// addCORSOrigin(servletContext, rb, headers);
return rb.build();
}
@@ -180,7 +187,7 @@ public class SessionResource extends Abs
// Export smaller graphs to OWLOntology due to the more human-readable rendering.
if (merge) rb = Response.ok(session.export(Graph.class, merge, prefix));
else rb = Response.ok(session.export(OWLOntology.class, merge, prefix));
- addCORSOrigin(servletContext, rb, headers);
+// addCORSOrigin(servletContext, rb, headers);
return rb.build();
}
@@ -193,7 +200,7 @@ public class SessionResource extends Abs
IRI prefix = IRI.create(getPublicBaseUri() + "ontonet/session/");
// Export to OWLOntology, the only to support OWL formats.
ResponseBuilder rb = Response.ok(session.export(OWLOntology.class, merge, prefix));
- addCORSOrigin(servletContext, rb, headers);
+// addCORSOrigin(servletContext, rb, headers);
return rb.build();
}
@@ -219,7 +226,7 @@ public class SessionResource extends Abs
throw new WebApplicationException(e, FORBIDDEN);
}
ResponseBuilder rb = Response.created(uriInfo.getRequestUri());
- addCORSOrigin(servletContext, rb, headers);
+// addCORSOrigin(servletContext, rb, headers);
return rb.build();
}
@@ -241,7 +248,7 @@ public class SessionResource extends Abs
sesMgr.destroySession(sessionId);
session = null;
ResponseBuilder rb = Response.ok();
- addCORSOrigin(servletContext, rb, headers);
+// addCORSOrigin(servletContext, rb, headers);
return rb.build();
}
@@ -257,7 +264,7 @@ public class SessionResource extends Abs
}
}
ResponseBuilder rb = Response.ok();
- addCORSOrigin(servletContext, rb, headers);
+// addCORSOrigin(servletContext, rb, headers);
return rb.build();
}
@@ -299,7 +306,7 @@ public class SessionResource extends Abs
if (session == null) rb = Response.status(NOT_FOUND);
else rb = Response.ok(new Viewable("index", this));
rb.header(HttpHeaders.CONTENT_TYPE, TEXT_HTML + "; charset=utf-8");
- addCORSOrigin(servletContext, rb, headers);
+// addCORSOrigin(servletContext, rb, headers);
return rb.build();
}
@@ -329,7 +336,7 @@ public class SessionResource extends Abs
@OPTIONS
public Response handleCorsPreflight(@Context HttpHeaders headers) {
ResponseBuilder rb = Response.ok();
- enableCORS(servletContext, rb, headers, GET, POST, PUT, DELETE, OPTIONS);
+// enableCORS(servletContext, rb, headers, GET, POST, PUT, DELETE, OPTIONS);
return rb.build();
}
@@ -337,7 +344,7 @@ public class SessionResource extends Abs
@Path("/{ontologyId:.+}")
public Response handleCorsPreflightOntology(@Context HttpHeaders headers) {
ResponseBuilder rb = Response.ok();
- enableCORS(servletContext, rb, headers, GET, DELETE, OPTIONS);
+// enableCORS(servletContext, rb, headers, GET, DELETE, OPTIONS);
return rb.build();
}
@@ -365,7 +372,7 @@ public class SessionResource extends Abs
IRI prefix = IRI.create(getPublicBaseUri() + "ontonet/session/");
Graph o = session.getOntology(OntologyUtils.decode(ontologyId), Graph.class, merge, prefix);
ResponseBuilder rb = (o != null) ? Response.ok(o) : Response.status(NOT_FOUND);
- addCORSOrigin(servletContext, rb, headers);
+// addCORSOrigin(servletContext, rb, headers);
return rb.build();
}
@@ -402,7 +409,7 @@ public class SessionResource extends Abs
rb = (o != null) ? Response.ok(o) : Response.status(NOT_FOUND);
}
}
- addCORSOrigin(servletContext, rb, headers);
+// addCORSOrigin(servletContext, rb, headers);
return rb.build();
}
@@ -431,7 +438,7 @@ public class SessionResource extends Abs
OWLOntology o = session.getOntology(OntologyUtils.decode(ontologyId), OWLOntology.class, merge,
prefix);
ResponseBuilder rb = (o != null) ? Response.ok(o) : Response.status(NOT_FOUND);
- addCORSOrigin(servletContext, rb, headers);
+// addCORSOrigin(servletContext, rb, headers);
return rb.build();
}
@@ -453,14 +460,14 @@ public class SessionResource extends Abs
else try {
ByteArrayOutputStream out = new ByteArrayOutputStream();
o.getOWLOntologyManager().saveOntology(o, new ManchesterOWLSyntaxOntologyFormat(), out);
- rb = Response.ok(new Viewable("ontology", new OntologyPrettyPrintResource(servletContext,
+ rb = Response.ok(new Viewable("ontology", new OntologyPrettyPrintResource(
uriInfo, out, session)));
} catch (OWLOntologyStorageException e) {
throw new WebApplicationException(e, INTERNAL_SERVER_ERROR);
}
}
rb.header(HttpHeaders.CONTENT_TYPE, TEXT_HTML + "; charset=utf-8");
- addCORSOrigin(servletContext, rb, headers);
+// addCORSOrigin(servletContext, rb, headers);
return rb.build();
}
@@ -501,7 +508,7 @@ public class SessionResource extends Abs
throw new WebApplicationException(e, INTERNAL_SERVER_ERROR);
}
}
- addCORSOrigin(servletContext, rb, headers);
+// addCORSOrigin(servletContext, rb, headers);
return rb.build();
}
@@ -558,7 +565,7 @@ public class SessionResource extends Abs
log.error("FAILED parse with media type {}.", mt);
throw new WebApplicationException(e, BAD_REQUEST);
}
- addCORSOrigin(servletContext, rb, headers);
+// addCORSOrigin(servletContext, rb, headers);
return rb.build();
}
@@ -586,7 +593,7 @@ public class SessionResource extends Abs
throw new WebApplicationException(e, INTERNAL_SERVER_ERROR);
}
ResponseBuilder rb = Response.ok();
- addCORSOrigin(servletContext, rb, headers);
+// addCORSOrigin(servletContext, rb, headers);
return rb.build();
}
@@ -757,7 +764,7 @@ public class SessionResource extends Abs
// throw new WebApplicationException(BAD_REQUEST);
// }
// rb.header(HttpHeaders.CONTENT_TYPE, TEXT_HTML + "; charset=utf-8");
- addCORSOrigin(servletContext, rb, headers);
+// addCORSOrigin(servletContext, rb, headers);
log.info("POST ontology completed in {} ms.", System.currentTimeMillis() - before);
return rb.build();
}
Modified: stanbol/branches/commons-ng/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/util/OntologyPrettyPrintResource.java
URL: http://svn.apache.org/viewvc/stanbol/branches/commons-ng/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/util/OntologyPrettyPrintResource.java?rev=1520930&r1=1520929&r2=1520930&view=diff
==============================================================================
--- stanbol/branches/commons-ng/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/util/OntologyPrettyPrintResource.java (original)
+++ stanbol/branches/commons-ng/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/util/OntologyPrettyPrintResource.java Sun Sep 8 21:10:30 2013
@@ -16,7 +16,7 @@
*/
package org.apache.stanbol.ontologymanager.web.util;
-import javax.servlet.ServletContext;
+//import javax.servlet.ServletContext;
import javax.ws.rs.core.UriInfo;
import org.apache.stanbol.commons.web.base.resource.BaseStanbolResource;
@@ -34,17 +34,17 @@ public class OntologyPrettyPrintResource
private Object result;
- public OntologyPrettyPrintResource(ServletContext context, UriInfo uriInfo, Object result) {
+ public OntologyPrettyPrintResource(UriInfo uriInfo, Object result) {
this.result = result;
- this.servletContext = context;
+// this.servletContext = context;
this.uriInfo = uriInfo;
}
- public OntologyPrettyPrintResource(ServletContext context,
+ public OntologyPrettyPrintResource(
UriInfo uriInfo,
Object result,
NamedArtifact owner) {
- this(context, uriInfo, result);
+ this(uriInfo, result);
this.owner = owner;
}
Modified: stanbol/branches/commons-ng/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/util/OntologyStatsResource.java
URL: http://svn.apache.org/viewvc/stanbol/branches/commons-ng/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/util/OntologyStatsResource.java?rev=1520930&r1=1520929&r2=1520930&view=diff
==============================================================================
--- stanbol/branches/commons-ng/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/util/OntologyStatsResource.java (original)
+++ stanbol/branches/commons-ng/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/util/OntologyStatsResource.java Sun Sep 8 21:10:30 2013
@@ -20,7 +20,6 @@ import java.util.Collections;
import java.util.HashSet;
import java.util.Set;
-import javax.servlet.ServletContext;
import javax.ws.rs.core.UriInfo;
import org.apache.stanbol.ontologymanager.servicesapi.collector.OntologyCollector;
@@ -45,13 +44,13 @@ public class OntologyStatsResource exten
private OWLOntology o;
- public OntologyStatsResource(ServletContext context,
+ public OntologyStatsResource(
UriInfo uriInfo,
OWLOntologyID key,
OWLOntology o,
Set<OWLOntologyID> identifiers,
Set<OntologyCollector> handles) {
- this.servletContext = context;
+// this.servletContext = context;
this.uriInfo = uriInfo;
this.submitted = key;
this.o = o;