Author: enridaga
Date: Thu Jun 30 11:15:35 2011
New Revision: 1141480
URL: http://svn.apache.org/viewvc?rev=1141480&view=rev
Log:
Changed the way OSGi components are retrieved by the context.
Deleted instantiation of the components if they are not present in the context
(this should neve happen). Removed some System.out.* stuff. This is work for
STANBOL-177
Modified:
incubator/stanbol/trunk/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/resources/ONMOntResource.java
incubator/stanbol/trunk/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/resources/ONMRootResource.java
incubator/stanbol/trunk/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/resources/ONMScopeOntologyResource.java
incubator/stanbol/trunk/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/resources/ONMScopeResource.java
incubator/stanbol/trunk/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/resources/SessionIDResource.java
incubator/stanbol/trunk/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/resources/SessionResource.java
Modified:
incubator/stanbol/trunk/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/resources/ONMOntResource.java
URL:
http://svn.apache.org/viewvc/incubator/stanbol/trunk/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/resources/ONMOntResource.java?rev=1141480&r1=1141479&r2=1141480&view=diff
==============================================================================
---
incubator/stanbol/trunk/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/resources/ONMOntResource.java
(original)
+++
incubator/stanbol/trunk/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/resources/ONMOntResource.java
Thu Jun 30 11:15:35 2011
@@ -13,6 +13,7 @@ import javax.ws.rs.core.Response;
import org.apache.clerezza.rdf.core.access.TcManager;
import org.apache.clerezza.rdf.core.serializedform.Serializer;
+import org.apache.stanbol.commons.web.base.ContextHelper;
import org.apache.stanbol.commons.web.base.resource.BaseStanbolResource;
import org.apache.stanbol.ontologymanager.ontonet.api.ONManager;
import org.apache.stanbol.ontologymanager.ontonet.api.ontology.OntologyIndex;
@@ -45,26 +46,9 @@ public class ONMOntResource extends Base
public ONMOntResource(@Context ServletContext servletContext) {
this.servletContext = servletContext;
- this.onm = (ONManager)
servletContext.getAttribute(ONManager.class.getName());
-// this.storage = (OntologyStorage) servletContext
-// .getAttribute(OntologyStorage.class.getName());
-// Contingency code for missing components follows.
-/*
- * FIXME! The following code is required only for the tests. This should
- * be removed and the test should work without this code.
- */
-if (onm == null) {
- log
- .warn("No KReSONManager in servlet context. Instantiating
manually...");
- onm = new ONManagerImpl(new TcManager(), null,
- new Hashtable<String, Object>());
-}
-this.storage = onm.getOntologyStore();
-if (storage == null) {
- log.warn("No OntologyStorage in servlet context. Instantiating
manually...");
- storage = new ClerezzaOntologyStorage(new TcManager(),null);
-}
- serializer = (Serializer)
this.servletContext.getAttribute(Serializer.class.getName());
+ this.onm = (ONManager)
ContextHelper.getServiceFromContext(ONManager.class, servletContext);
+ this.storage = (ClerezzaOntologyStorage)
ContextHelper.getServiceFromContext(ClerezzaOntologyStorage.class,
servletContext);
+ this.serializer = (Serializer)
ContextHelper.getServiceFromContext(Serializer.class,servletContext);
}
@GET
Modified:
incubator/stanbol/trunk/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/resources/ONMRootResource.java
URL:
http://svn.apache.org/viewvc/incubator/stanbol/trunk/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/resources/ONMRootResource.java?rev=1141480&r1=1141479&r2=1141480&view=diff
==============================================================================
---
incubator/stanbol/trunk/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/resources/ONMRootResource.java
(original)
+++
incubator/stanbol/trunk/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/resources/ONMRootResource.java
Thu Jun 30 11:15:35 2011
@@ -26,6 +26,7 @@ import org.semanticweb.owlapi.model.OWLO
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.apache.stanbol.commons.web.base.ContextHelper;
import org.apache.stanbol.commons.web.base.format.KRFormat;
import org.apache.stanbol.commons.web.base.resource.BaseStanbolResource;
@@ -54,25 +55,8 @@ public class ONMRootResource extends Bas
public ONMRootResource(@Context ServletContext servletContext) {
this.servletContext = servletContext;
- this.onm = (ONManager)
servletContext.getAttribute(ONManager.class.getName());
-// this.storage = (OntologyStorage) servletContext
-// .getAttribute(OntologyStorage.class.getName());
-// Contingency code for missing components follows.
-/*
- * FIXME! The following code is required only for the tests. This should
- * be removed and the test should work without this code.
- */
-if (onm == null) {
- log
- .warn("No KReSONManager in servlet context. Instantiating
manually...");
- onm = new ONManagerImpl(new TcManager(), null,
- new Hashtable<String, Object>());
-}
-this.storage = onm.getOntologyStore();
-if (storage == null) {
- log.warn("No OntologyStorage in servlet context. Instantiating
manually...");
- storage = new ClerezzaOntologyStorage(new TcManager(),null);
-}
+ this.onm = (ONManager)
ContextHelper.getServiceFromContext(ONManager.class, servletContext);
+ this.storage = (ClerezzaOntologyStorage)
ContextHelper.getServiceFromContext(ClerezzaOntologyStorage.class,
servletContext);
}
/**
@@ -123,60 +107,4 @@ if (storage == null) {
return Response.ok(ontology).build();
}
- // @Path("upload")
- // @Consumes(MediaType.MULTIPART_FORM_DATA)
- // @POST
- // public void uploadDumb(@FormParam("file") InputStream is) {
- // Writer writer = new StringWriter();
- //
- // char[] buffer = new char[1024];
- //
- // try {
- //
- // Reader reader = new BufferedReader(
- //
- // new InputStreamReader(is, "UTF-8"));
- //
- // int n;
- //
- // while ((n = reader.read(buffer)) != -1) {
- //
- // writer.write(buffer, 0, n);
- //
- // }
- // } catch (IOException ex) {
- // throw new WebApplicationException(ex);
- // } finally {
- //
- // try {
- // is.close();
- // } catch (IOException e) {
- // throw new WebApplicationException(e);
- // }
- //
- // }
- // System.out.println(writer.toString());
- // }
- //
- // @Path("formdata")
- // @Consumes(MediaType.MULTIPART_FORM_DATA)
- // @POST
- // public void uploadUrlFormData(
- // @FormDataParam("file") List<FormDataBodyPart> parts,
- // @FormDataParam("submit") FormDataBodyPart submit)
- // throws IOException, ParseException {
- //
- // System.out.println("XXXX: " + submit.getMediaType());
- // System.out.println("XXXX: "
- // + submit.getHeaders().getFirst("Content-Type"));
- //
- // for (FormDataBodyPart bp : parts) {
- // System.out.println(bp.getMediaType());
- // System.out.println(bp.getHeaders().get("Content-Disposition"));
- // System.out.println(bp.getParameterizedHeaders().getFirst(
- // "Content-Disposition").getParameters().get("name"));
- // bp.cleanup();
- // }
- // }
-
}
Modified:
incubator/stanbol/trunk/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/resources/ONMScopeOntologyResource.java
URL:
http://svn.apache.org/viewvc/incubator/stanbol/trunk/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/resources/ONMScopeOntologyResource.java?rev=1141480&r1=1141479&r2=1141480&view=diff
==============================================================================
---
incubator/stanbol/trunk/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/resources/ONMScopeOntologyResource.java
(original)
+++
incubator/stanbol/trunk/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/resources/ONMScopeOntologyResource.java
Thu Jun 30 11:15:35 2011
@@ -21,6 +21,7 @@ import javax.ws.rs.core.Response;
import javax.ws.rs.core.UriInfo;
import org.apache.clerezza.rdf.core.access.TcManager;
+import org.apache.stanbol.commons.web.base.ContextHelper;
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;
@@ -69,25 +70,8 @@ public class ONMScopeOntologyResource ex
public ONMScopeOntologyResource(@Context ServletContext servletContext) {
this.servletContext = servletContext;
- this.onm = (ONManager)
servletContext.getAttribute(ONManager.class.getName());
-// this.storage = (OntologyStorage) servletContext
-// .getAttribute(OntologyStorage.class.getName());
-// Contingency code for missing components follows.
-/*
- * FIXME! The following code is required only for the tests. This should
- * be removed and the test should work without this code.
- */
-if (onm == null) {
- log
- .warn("No KReSONManager in servlet context. Instantiating
manually...");
- onm = new ONManagerImpl(new TcManager(), null,
- new Hashtable<String, Object>());
-}
-this.storage = onm.getOntologyStore();
-if (storage == null) {
- log.warn("No OntologyStorage in servlet context. Instantiating
manually...");
- storage = new ClerezzaOntologyStorage(new TcManager(),null);
-}
+ this.onm = (ONManager)
ContextHelper.getServiceFromContext(ONManager.class, servletContext);
+ this.storage = (ClerezzaOntologyStorage)
ContextHelper.getServiceFromContext(ClerezzaOntologyStorage.class,
servletContext);
}
/**
@@ -122,7 +106,7 @@ if (storage == null) {
OntologyScope scope = reg.getScope(sciri);
if (scope == null) return Response.status(NOT_FOUND).build();
- /* BEGIN debug code, uncomment only for local testing */
+ /* BEGIN debug code, uncomment only for local testing
OWLOntology test = null, top = null;
test = scope.getCustomSpace().getOntology(ontiri);
System.out.println("Ontology " + ontiri);
@@ -132,7 +116,7 @@ if (storage == null) {
System.out.println("Core root for scope " + scopeid);
for (OWLImportsDeclaration imp : top.getImportsDeclarations())
System.out.println("\timports " + imp.getIRI());
- /* END debug code */
+ END debug code */
OWLOntology ont = null;
// By default, always try retrieving the ontology from the custom
space
@@ -307,10 +291,11 @@ if (storage == null) {
if (ontologyid != null && !ontologyid.equals("")) {
String scopeURI =
uriInfo.getAbsolutePath().toString().replace(ontologyid, "");
- System.out
+ /* System.out
.println("Received DELETE request for ontology " +
ontologyid + " in scope " + scopeURI);
+ */
IRI scopeIri = IRI.create(uriInfo.getBaseUri() + "ontology/" +
scopeId);
- System.out.println("SCOPE IRI : " + scopeIri);
+ //System.out.println("SCOPE IRI : " + scopeIri);
IRI ontIri = IRI.create(ontologyid);
ScopeRegistry reg = onm.getScopeRegistry();
OntologyScope scope = reg.getScope(scopeIri);
Modified:
incubator/stanbol/trunk/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/resources/ONMScopeResource.java
URL:
http://svn.apache.org/viewvc/incubator/stanbol/trunk/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/resources/ONMScopeResource.java?rev=1141480&r1=1141479&r2=1141480&view=diff
==============================================================================
---
incubator/stanbol/trunk/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/resources/ONMScopeResource.java
(original)
+++
incubator/stanbol/trunk/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/resources/ONMScopeResource.java
Thu Jun 30 11:15:35 2011
@@ -26,6 +26,7 @@ import javax.ws.rs.core.Response;
import javax.ws.rs.core.UriInfo;
import org.apache.clerezza.rdf.core.access.TcManager;
+import org.apache.stanbol.commons.web.base.ContextHelper;
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.DuplicateIDException;
@@ -35,6 +36,7 @@ import org.apache.stanbol.ontologymanage
import org.apache.stanbol.ontologymanager.ontonet.api.ontology.OntologyScope;
import
org.apache.stanbol.ontologymanager.ontonet.api.ontology.OntologyScopeFactory;
import org.apache.stanbol.ontologymanager.ontonet.api.ontology.OntologySpace;
+import
org.apache.stanbol.ontologymanager.ontonet.api.ontology.ScopeEventListener;
import org.apache.stanbol.ontologymanager.ontonet.api.ontology.ScopeRegistry;
import
org.apache.stanbol.ontologymanager.ontonet.api.ontology.UnmodifiableOntologySpaceException;
import
org.apache.stanbol.ontologymanager.ontonet.api.registry.io.OntologyRegistryIRISource;
@@ -61,28 +63,8 @@ public class ONMScopeResource extends Ba
public ONMScopeResource(@Context ServletContext servletContext) {
this.servletContext = servletContext;
- this.onm = (ONManager) servletContext
- .getAttribute(ONManager.class.getName());
- this.storage = (ClerezzaOntologyStorage) servletContext
-
.getAttribute(ClerezzaOntologyStorage.class.getName());
-// this.storage = (OntologyStorage) servletContext
-// .getAttribute(OntologyStorage.class.getName());
-// Contingency code for missing components follows.
-/*
- * FIXME! The following code is required only for the tests. This should
- * be removed and the test should work without this code.
- */
-if (onm == null) {
- log
- .warn("No KReSONManager in servlet context. Instantiating
manually...");
- onm = new ONManagerImpl(new TcManager(), null,
- new Hashtable<String, Object>());
-}
-this.storage = onm.getOntologyStore();
-if (storage == null) {
- log.warn("No OntologyStorage in servlet context. Instantiating
manually...");
- storage = new ClerezzaOntologyStorage(new TcManager(),null);
-}
+ this.onm = (ONManager)
ContextHelper.getServiceFromContext(ONManager.class, servletContext);
+ this.storage = (ClerezzaOntologyStorage)
ContextHelper.getServiceFromContext(ClerezzaOntologyStorage.class,
servletContext);
}
@DELETE
@@ -202,8 +184,6 @@ if (storage == null) {
ScopeRegistry reg = onm.getScopeRegistry();
OntologyScopeFactory f = onm.getOntologyScopeFactory();
- System.out.println("GOT PUT");
-
OntologyScope scope;
OntologyInputSource coreSrc = null, custSrc = null;
@@ -267,6 +247,8 @@ if (storage == null) {
reg.setScopeActive(scopeId, activateBool);
} catch (DuplicateIDException e) {
throw new WebApplicationException(e, CONFLICT);
+ } catch (Exception ex){
+ throw new WebApplicationException(ex,
INTERNAL_SERVER_ERROR);
}
return Response.ok().build();
Modified:
incubator/stanbol/trunk/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/resources/SessionIDResource.java
URL:
http://svn.apache.org/viewvc/incubator/stanbol/trunk/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/resources/SessionIDResource.java?rev=1141480&r1=1141479&r2=1141480&view=diff
==============================================================================
---
incubator/stanbol/trunk/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/resources/SessionIDResource.java
(original)
+++
incubator/stanbol/trunk/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/resources/SessionIDResource.java
Thu Jun 30 11:15:35 2011
@@ -11,6 +11,7 @@ import javax.ws.rs.core.Response;
import javax.ws.rs.core.UriInfo;
import javax.ws.rs.core.Response.Status;
+import org.apache.stanbol.commons.web.base.ContextHelper;
import org.apache.stanbol.commons.web.base.resource.BaseStanbolResource;
import org.apache.stanbol.ontologymanager.ontonet.api.ONManager;
import org.apache.stanbol.ontologymanager.ontonet.api.session.Session;
@@ -31,13 +32,7 @@ public class SessionIDResource extends B
public SessionIDResource(@Context ServletContext servletContext) {
this.servletContext = servletContext;
- onm = (ONManager) this.servletContext
- .getAttribute(ONManager.class.getName());
- if (onm == null) {
- System.err
- .println("[KReS] :: No KReS Ontology
Network Manager provided by Servlet Context. Instantiating now...");
- onm = new ONManagerImpl();
- }
+ this.onm = (ONManager)
ContextHelper.getServiceFromContext(ONManager.class, servletContext);
}
@GET
Modified:
incubator/stanbol/trunk/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/resources/SessionResource.java
URL:
http://svn.apache.org/viewvc/incubator/stanbol/trunk/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/resources/SessionResource.java?rev=1141480&r1=1141479&r2=1141480&view=diff
==============================================================================
---
incubator/stanbol/trunk/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/resources/SessionResource.java
(original)
+++
incubator/stanbol/trunk/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/resources/SessionResource.java
Thu Jun 30 11:15:35 2011
@@ -38,6 +38,7 @@ import org.semanticweb.owlapi.model.IRI;
import org.semanticweb.owlapi.model.OWLOntology;
import org.semanticweb.owlapi.model.OWLOntologyCreationException;
+import org.apache.stanbol.commons.web.base.ContextHelper;
import org.apache.stanbol.commons.web.base.format.KRFormat;
import org.apache.stanbol.commons.web.base.resource.BaseStanbolResource;
@@ -55,12 +56,7 @@ public class SessionResource extends Bas
public SessionResource(@Context ServletContext servletContext) {
this.servletContext = servletContext;
- onm = (ONManager)
this.servletContext.getAttribute(ONManager.class.getName());
- if (onm == null) {
- System.err
- .println("[KReS] :: No KReS Ontology Network Manager
provided by Servlet Context. Instantiating now...");
- onm = new ONManagerImpl();
- }
+ this.onm = (ONManager)
ContextHelper.getServiceFromContext(ONManager.class, servletContext);
}
@PUT
