Author: alexdma
Date: Fri Jul 8 10:27:31 2011
New Revision: 1144239
URL: http://svn.apache.org/viewvc?rev=1144239&view=rev
Log:
STANBOL-177 STANBOL-179 :
- Added more content (Web view / REST API) to the ontonet templates.
- POST service to add ontologies to scopes no longer returns plain strings
along with 200
Added:
incubator/stanbol/trunk/ontologymanager/web/src/main/resources/org/apache/stanbol/ontologymanager/web/templates/imports/inc_scope.ftl
incubator/stanbol/trunk/ontologymanager/web/src/main/resources/org/apache/stanbol/ontologymanager/web/templates/imports/inc_scopemgr.ftl
- copied, changed from r1143708,
incubator/stanbol/trunk/ontologymanager/web/src/main/resources/org/apache/stanbol/ontologymanager/web/templates/org/apache/stanbol/ontologymanager/web/resources/RootResource/inc_scopemgr.ftl
incubator/stanbol/trunk/ontologymanager/web/src/main/resources/org/apache/stanbol/ontologymanager/web/templates/imports/inc_sessionmgr.ftl
- copied, changed from r1143708,
incubator/stanbol/trunk/ontologymanager/web/src/main/resources/org/apache/stanbol/ontologymanager/web/templates/org/apache/stanbol/ontologymanager/web/resources/SessionResource/inc_sessionmgr.ftl
incubator/stanbol/trunk/ontologymanager/web/src/main/resources/org/apache/stanbol/ontologymanager/web/templates/org/apache/stanbol/ontologymanager/web/resources/RootResource/webview.ftl
Removed:
incubator/stanbol/trunk/ontologymanager/web/src/main/resources/org/apache/stanbol/ontologymanager/web/templates/org/apache/stanbol/ontologymanager/web/resources/ONMRootResource/inc_scopemgr.ftl
incubator/stanbol/trunk/ontologymanager/web/src/main/resources/org/apache/stanbol/ontologymanager/web/templates/org/apache/stanbol/ontologymanager/web/resources/ONMRootResource/inc_sessionmgr.ftl
incubator/stanbol/trunk/ontologymanager/web/src/main/resources/org/apache/stanbol/ontologymanager/web/templates/org/apache/stanbol/ontologymanager/web/resources/RootResource/inc_scopemgr.ftl
incubator/stanbol/trunk/ontologymanager/web/src/main/resources/org/apache/stanbol/ontologymanager/web/templates/org/apache/stanbol/ontologymanager/web/resources/SessionResource/inc_sessionmgr.ftl
Modified:
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/SessionResource.java
incubator/stanbol/trunk/ontologymanager/web/src/main/resources/org/apache/stanbol/ontologymanager/web/templates/org/apache/stanbol/ontologymanager/web/resources/ONMRootResource/index.ftl
incubator/stanbol/trunk/ontologymanager/web/src/main/resources/org/apache/stanbol/ontologymanager/web/templates/org/apache/stanbol/ontologymanager/web/resources/RootResource/index.ftl
incubator/stanbol/trunk/ontologymanager/web/src/main/resources/org/apache/stanbol/ontologymanager/web/templates/org/apache/stanbol/ontologymanager/web/resources/SessionResource/index.ftl
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=1144239&r1=1144238&r2=1144239&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
Fri Jul 8 10:27:31 2011
@@ -103,7 +103,6 @@ public class ONMScopeResource extends Ba
@POST
// @Consumes(MediaType.APPLICATION_FORM_URLENCODED)
- @Produces("text/plain")
public Response loadCustomOntology(@PathParam("scopeid") String scopeid,
@FormParam("location") String physIri,
@FormParam("registry") boolean asRegistry,
@@ -112,7 +111,6 @@ public class ONMScopeResource extends Ba
ScopeRegistry reg = onm.getScopeRegistry();
- String res = "";
IRI scopeiri = null;
IRI ontoiri = null;
try {
@@ -123,7 +121,6 @@ public class ONMScopeResource extends Ba
throw new WebApplicationException(ex, BAD_REQUEST);
}
if (reg.containsScope(scopeiri)) {
- res = "Ok, scope is there";
OntologyScope scope = reg.getScope(scopeiri);
try {
OntologyInputSource src = new
RootOntologyIRISource(ontoiri);
@@ -143,7 +140,7 @@ public class ONMScopeResource extends Ba
}
} else
throw new WebApplicationException(NOT_FOUND);
- return Response.ok(res).build();
+ return Response.ok().build();
}
/**
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=1144239&r1=1144238&r2=1144239&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
Fri Jul 8 10:27:31 2011
@@ -1,8 +1,8 @@
package org.apache.stanbol.ontologymanager.web.resources;
-import static javax.ws.rs.core.MediaType.TEXT_HTML;
-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.MediaType.*;
+import static javax.ws.rs.core.Response.Status.*;
+import static org.apache.stanbol.commons.web.base.format.KRFormat.*;
import java.io.InputStream;
@@ -12,20 +12,16 @@ import javax.ws.rs.DELETE;
import javax.ws.rs.FormParam;
import javax.ws.rs.GET;
import javax.ws.rs.POST;
-import javax.ws.rs.PUT;
import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
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.HttpHeaders;
-import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Response;
import javax.ws.rs.core.UriInfo;
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;
import org.apache.stanbol.ontologymanager.ontonet.api.io.RootOntologyIRISource;
@@ -62,7 +58,7 @@ public class SessionResource extends Bas
}
@POST
- @Consumes(MediaType.MULTIPART_FORM_DATA)
+ @Consumes(MULTIPART_FORM_DATA)
public Response addOntology(@FormDataParam("scope") String scope,
@FormDataParam("import") InputStream
importOntology,
@FormDataParam("session") String session,
@@ -106,49 +102,47 @@ public class SessionResource extends Bas
* @return
*/
@POST
- @Consumes(MediaType.APPLICATION_FORM_URLENCODED)
- @Produces(value = {KRFormat.RDF_XML, KRFormat.OWL_XML, KRFormat.TURTLE,
KRFormat.FUNCTIONAL_OWL,
- KRFormat.MANCHESTER_OWL, KRFormat.RDF_JSON})
+ @Consumes(APPLICATION_FORM_URLENCODED)
+ @Produces(value = {RDF_XML, OWL_XML, TURTLE, FUNCTIONAL_OWL,
MANCHESTER_OWL, RDF_JSON})
public Response addOntology(@FormParam("scope") String scope,
@FormParam("session") String session,
@FormParam("location") String location,
@Context UriInfo uriInfo,
@Context HttpHeaders headers,
@Context ServletContext servletContext) {
- if(session==null||session.equals("")){
- return createSession(scope, uriInfo, headers);
- }else{
- IRI scopeIRI = IRI.create(scope);
- IRI sessionIRI = IRI.create(session);
- IRI ontologyIRI = IRI.create(location);
- ScopeRegistry scopeRegistry = onm.getScopeRegistry();
+ if (session == null || session.equals("")) {
+ return createSession(scope, uriInfo, headers);
+ } else {
+ IRI scopeIRI = IRI.create(scope);
+ IRI sessionIRI = IRI.create(session);
+ IRI ontologyIRI = IRI.create(location);
+ ScopeRegistry scopeRegistry = onm.getScopeRegistry();
- OntologyScope ontologyScope = scopeRegistry.getScope(scopeIRI);
- SessionOntologySpace sos = ontologyScope.getSessionSpace(sessionIRI);
- try {
- sos.addOntology(new RootOntologyIRISource(ontologyIRI));
- return Response.ok().build();
- } catch (UnmodifiableOntologySpaceException e) {
- return Response.status(INTERNAL_SERVER_ERROR).build();
- } catch (OWLOntologyCreationException e) {
- return Response.status(INTERNAL_SERVER_ERROR).build();
+ OntologyScope ontologyScope = scopeRegistry.getScope(scopeIRI);
+ SessionOntologySpace sos =
ontologyScope.getSessionSpace(sessionIRI);
+ try {
+ sos.addOntology(new RootOntologyIRISource(ontologyIRI));
+ return Response.ok().build();
+ } catch (UnmodifiableOntologySpaceException e) {
+ return Response.status(INTERNAL_SERVER_ERROR).build();
+ } catch (OWLOntologyCreationException e) {
+ return Response.status(INTERNAL_SERVER_ERROR).build();
+ }
}
- }
}
- /**
- * This method creates a session.
- *
- * @param scope
- * @param uriInfo
- * @param headers
- * @return
- */
- private Response createSession(String scope,
- UriInfo uriInfo,
- HttpHeaders headers) {
- if(scope==null||scope.equals("")){
- return Response.status(INTERNAL_SERVER_ERROR).build();
- }
+
+ /**
+ * This method creates a session.
+ *
+ * @param scope
+ * @param uriInfo
+ * @param headers
+ * @return
+ */
+ private Response createSession(String scope, UriInfo uriInfo, HttpHeaders
headers) {
+ if (scope == null || scope.equals("")) {
+ return Response.status(INTERNAL_SERVER_ERROR).build();
+ }
Session ses = null;
SessionManager mgr = onm.getSessionManager();
@@ -176,7 +170,7 @@ public class SessionResource extends Bas
try {
ontologyScope.addSessionSpace(sessionOntologySpace, ses.getID());
} catch (UnmodifiableOntologySpaceException e) {
-throw new WebApplicationException(e);
+ throw new WebApplicationException(e);
}
return
Response.ok(SessionRenderer.getSessionMetadataRDFasOntology(ses)).build();
Added:
incubator/stanbol/trunk/ontologymanager/web/src/main/resources/org/apache/stanbol/ontologymanager/web/templates/imports/inc_scope.ftl
URL:
http://svn.apache.org/viewvc/incubator/stanbol/trunk/ontologymanager/web/src/main/resources/org/apache/stanbol/ontologymanager/web/templates/imports/inc_scope.ftl?rev=1144239&view=auto
==============================================================================
---
incubator/stanbol/trunk/ontologymanager/web/src/main/resources/org/apache/stanbol/ontologymanager/web/templates/imports/inc_scope.ftl
(added)
+++
incubator/stanbol/trunk/ontologymanager/web/src/main/resources/org/apache/stanbol/ontologymanager/web/templates/imports/inc_scope.ftl
Fri Jul 8 10:27:31 2011
@@ -0,0 +1,152 @@
+<h4>Subresource ontonet/ontology/{scopeName}</h4>
+<p>Service for full CRUD operations on ontology scopes.</p>
+
+<!--
+ ============= GET =============
+-->
+<h4> GET ontonet/ontology/{scopeName}</h4>
+<table>
+ <tbody>
+ <tr>
+ <th>Description</th>
+ <td>Service to get the root ontology of the scope.</td>
+ </tr>
+ <tr>
+ <th>Request</th>
+ <td>GET <code>/ontonet/ontology/{scopeName}</code></td>
+ </tr>
+ <tr>
+ <th>Parameters</th>
+ <td><span style="font-style:italic">none</span></td>
+ </tr>
+ <tr>
+ <th>Produces</th>
+ <td>An ontology. Format depends on requested media type. 404 if the
scope does not exist.</td>
+ </tr>
+ </tbody>
+</table>
+
+<h5>Example</h5>
+
+<pre>curl -H "Accept:application/rdf+xml"
"${it.publicBaseUri}ontonet/ontology/User</pre>
+
+<!--
+ ============= POST =============
+-->
+<h4> POST ontonet/ontology/{scopeName}</h4>
+<table>
+ <tbody>
+ <tr>
+ <th>Description</th>
+ <td>Service to load an ontology into the custom space of the scope.</td>
+ </tr>
+ <tr>
+ <th>Request</th>
+ <td>POST <code>/ontonet/ontology/</code>{scopeName}</td>
+ </tr>
+ <tr>
+ <th>Parameters</th>
+ <td><code>location</code>: the physical URL of the ontology to be
loaded.
+ </td>
+ </tr>
+ <tr>
+ <th>Produces</th>
+ <td>Nothing. Returns Status 200 if successful.</td>
+ </tr>
+ </tbody>
+</table>
+
+<h5>Example</h5>
+
+<pre>curl -X POST "${it.publicBaseUri}ontonet/ontology/User</pre>
+
+<!--
+ ============= PUT =============
+-->
+<h4> PUT ontonet/ontology/{scopeName}</h4>
+<table>
+ <tbody>
+ <tr>
+ <th>Description</th>
+ <td>Service to get the root ontology of the scope.</td>
+ </tr>
+ <tr>
+ <th>Request</th>
+ <td>PUT <code>/ontonet/ontology/</code>{scopeName}</td>
+ </tr>
+ <tr>
+ <th>Parameters</th>
+ <td><code>corereg</code>: the physical URL of the registry that points
to the ontologies to be loaded into the core space.
+ <br/>
+ This parameter overrides <code>coreont</code> if both are specified.
+ </td>
+ </tr>
+ <tr>
+ <th></th>
+ <td><code>coreont</code>: the physical URL of the top ontology to be
loaded into the core space.
+ <br/>
+ This parameter is ignored if <code>corereg</code> is specified.
+ </td>
+ </tr>
+ <tr>
+ <th></th>
+ <td><code>customreg</code>: the physical URL of the registry that points
to the ontologies to be loaded into the custom space.
+ <br/>
+ This parameter is optional. Overrides <code>customont</code> if both
are specified.
+ </td>
+ </tr>
+ <tr>
+ <th></th>
+ <td><code>customont</code>: the physical URL of the top ontology to be
loaded into the custom space.
+ <br/>
+ This parameter is optional. Ignored if <code>customreg</code> is
specified.
+ </td>
+ </tr>
+ <tr>
+ <th></th>
+ <td><code>activate</code>: If <code>true</code>, the ontology scope will
be set as active upon creation.
+ <br/>
+ This parameter is optional, default is <code>false</code>.<
+ /td>
+ </tr>
+ <tr>
+ <th>Produces</th>
+ <td>Nothing. Returns Status 200 if successful, 500 otherwise.</td>
+ </tr>
+ </tbody>
+</table>
+
+<h5>Example</h5>
+
+<pre>curl -X PUT
"${it.publicBaseUri}ontonet/ontology/User?corereg=[registry_location]&customont=[ontology_location]</pre>
+
+<!--
+ ============= DELETE =============
+-->
+<h4> DELETE ontonet/ontology/{scopeName}</h4>
+<table>
+ <tbody>
+ <tr>
+ <th>Description</th>
+ <td>Service to unregister the ontology scope and unload its
resources.</td>
+ </tr>
+ <tr>
+ <th>Request</th>
+ <td>DELETE <code>/ontonet/ontology/</code>{scopeName}</td>
+ </tr>
+ <tr>
+ <th>Parameters</th>
+ <td>
+ None.
+ </td>
+ </tr>
+ <tr>
+ <th>Produces</th>
+ <td>Nothing. Returns Status 200 if successful, 500 otherwise.</td>
+ </tr>
+ </tbody>
+</table>
+
+<h5>Example</h5>
+
+<pre>curl -X PUT
"${it.publicBaseUri}ontonet/ontology/User?corereg=[registry_location]&customont=[ontology_location]</pre>
\ No newline at end of file
Copied:
incubator/stanbol/trunk/ontologymanager/web/src/main/resources/org/apache/stanbol/ontologymanager/web/templates/imports/inc_scopemgr.ftl
(from r1143708,
incubator/stanbol/trunk/ontologymanager/web/src/main/resources/org/apache/stanbol/ontologymanager/web/templates/org/apache/stanbol/ontologymanager/web/resources/RootResource/inc_scopemgr.ftl)
URL:
http://svn.apache.org/viewvc/incubator/stanbol/trunk/ontologymanager/web/src/main/resources/org/apache/stanbol/ontologymanager/web/templates/imports/inc_scopemgr.ftl?p2=incubator/stanbol/trunk/ontologymanager/web/src/main/resources/org/apache/stanbol/ontologymanager/web/templates/imports/inc_scopemgr.ftl&p1=incubator/stanbol/trunk/ontologymanager/web/src/main/resources/org/apache/stanbol/ontologymanager/web/templates/org/apache/stanbol/ontologymanager/web/resources/RootResource/inc_scopemgr.ftl&r1=1143708&r2=1144239&rev=1144239&view=diff
==============================================================================
---
incubator/stanbol/trunk/ontologymanager/web/src/main/resources/org/apache/stanbol/ontologymanager/web/templates/org/apache/stanbol/ontologymanager/web/resources/RootResource/inc_scopemgr.ftl
(original)
+++
incubator/stanbol/trunk/ontologymanager/web/src/main/resources/org/apache/stanbol/ontologymanager/web/templates/imports/inc_scopemgr.ftl
Fri Jul 8 10:27:31 2011
@@ -39,7 +39,7 @@
<th>Request</th>
<td>DELETE <code>/ontonet/ontology</code></td>
</tr>
- <tr>
+ <tr>
<th>Parameters</th>
<td><span style="font-style:italic">none</span></td>
</tr>
Copied:
incubator/stanbol/trunk/ontologymanager/web/src/main/resources/org/apache/stanbol/ontologymanager/web/templates/imports/inc_sessionmgr.ftl
(from r1143708,
incubator/stanbol/trunk/ontologymanager/web/src/main/resources/org/apache/stanbol/ontologymanager/web/templates/org/apache/stanbol/ontologymanager/web/resources/SessionResource/inc_sessionmgr.ftl)
URL:
http://svn.apache.org/viewvc/incubator/stanbol/trunk/ontologymanager/web/src/main/resources/org/apache/stanbol/ontologymanager/web/templates/imports/inc_sessionmgr.ftl?p2=incubator/stanbol/trunk/ontologymanager/web/src/main/resources/org/apache/stanbol/ontologymanager/web/templates/imports/inc_sessionmgr.ftl&p1=incubator/stanbol/trunk/ontologymanager/web/src/main/resources/org/apache/stanbol/ontologymanager/web/templates/org/apache/stanbol/ontologymanager/web/resources/SessionResource/inc_sessionmgr.ftl&r1=1143708&r2=1144239&rev=1144239&view=diff
==============================================================================
---
incubator/stanbol/trunk/ontologymanager/web/src/main/resources/org/apache/stanbol/ontologymanager/web/templates/org/apache/stanbol/ontologymanager/web/resources/SessionResource/inc_sessionmgr.ftl
(original)
+++
incubator/stanbol/trunk/ontologymanager/web/src/main/resources/org/apache/stanbol/ontologymanager/web/templates/imports/inc_sessionmgr.ftl
Fri Jul 8 10:27:31 2011
@@ -1,31 +1,43 @@
<h4>Subresource ontonet/session</h4>
-<p>Service to get/clear the set of registered and/or active ontology scopes.
+<p>Service to manage the set of active OntoNet sessions.
-<h4> GET ontonet/session</h4>
+<h4> POST ontonet/session</h4>
<table>
<tbody>
<tr>
<th>Description</th>
- <td>Service to get the set of registered and/or active ontology
scopes</td>
+ <td>Service to add an ontology to a session space, creating the session
if it does not exist.</td>
</tr>
<tr>
<th>Request</th>
- <td>GET <code>/ontonet/session</code></td>
+ <td>POST <code>/ontonet/session</code></td>
</tr>
<tr>
- <th>Parameter</th>
- <td><code>with-inactive</code>: include registered inactive scopes
(optional, default is false)</td>
+ <th>Parameters</th>
+ <td><code>input</code>: the OWL file to be loaded. This parameter is
mutually exclusive with <code>location</code>.</td>
+ </tr>
+ <tr>
+ <th></th>
+ <td><code>location</code>: the physical URL of the OWL file to be
loaded. This parameter is mutually exclusive with <code>input</code>.</td>
+ </tr>
+ <tr>
+ <th></th>
+ <td><code>scope</code>: the ID of the scope whose session space will
contain the ontology.</td>
+ </tr>
+ <tr>
+ <th></th>
+ <td><code>session</code>: the ID of the session to add the ontology. If
it does not exist it will be created, along with corresponding session spaces
for all active scopes.</td>
</tr>
<tr>
<th>Produces</th>
- <td>An ontology. Format depends on requested media type</td>
+ <td>Nothing. Returns Status 200 if successful, 500 otherwise.</td>
</tr>
</tbody>
</table>
<h5>Example</h5>
-<pre>curl -H "Accept:application/rdf+xml"
"${it.publicBaseUri}ontonet/ontology?with-inactive=true"</pre>
+<pre>curl -X POST
"${it.publicBaseUri}ontonet/session?scope=[scope_id]&session=[session_id]&location=[location]"</pre>
<h4> DELETE ontonet/session</h4>
@@ -33,23 +45,31 @@
<tbody>
<tr>
<th>Description</th>
- <td>Service to clear all ontology scopes and stored ontologies</td>
+ <td>Service to remove an ontology from an OntoNet session, or the whole
session.</td>
</tr>
<tr>
<th>Request</th>
- <td>DELETE <code>/ontonet/ontology</code></td>
+ <td>DELETE <code>/ontonet/session</code></td>
</tr>
- <tr>
+ <tr>
<th>Parameters</th>
- <td><span style="font-style:italic">none</span></td>
+ <td><code>scope</code>: the ID of the scope.</td>
+ </tr>
+ <tr>
+ <th></th>
+ <td><code>session</code>: the ID of the session to perform the deletion
on.</td>
+ </tr>
+ <tr>
+ <th></th>
+ <td><code>delete</code>: the ID of the ontology to remove from the
session. This parameter is optional, if unspecified will result in the removal
of the entire session.</td>
</tr>
<tr>
<th>Produces</th>
- <td><span style="font-style:italic">nothing</span></td>
+ <td>Nothing. Returns Status 200 if successful, 500 otherwise.</td>
</tr>
</tbody>
</table>
<h5>Example</h5>
-<pre>curl -X DELETE "${it.publicBaseUri}ontonet/ontology"</pre>
\ No newline at end of file
+<pre>curl -X DELETE
"${it.publicBaseUri}ontonet/session?scope=[scope_id]&session=[session_id]&delete=[ontology_id]"</pre>
\ No newline at end of file
Modified:
incubator/stanbol/trunk/ontologymanager/web/src/main/resources/org/apache/stanbol/ontologymanager/web/templates/org/apache/stanbol/ontologymanager/web/resources/ONMRootResource/index.ftl
URL:
http://svn.apache.org/viewvc/incubator/stanbol/trunk/ontologymanager/web/src/main/resources/org/apache/stanbol/ontologymanager/web/templates/org/apache/stanbol/ontologymanager/web/resources/ONMRootResource/index.ftl?rev=1144239&r1=1144238&r2=1144239&view=diff
==============================================================================
---
incubator/stanbol/trunk/ontologymanager/web/src/main/resources/org/apache/stanbol/ontologymanager/web/templates/org/apache/stanbol/ontologymanager/web/resources/ONMRootResource/index.ftl
(original)
+++
incubator/stanbol/trunk/ontologymanager/web/src/main/resources/org/apache/stanbol/ontologymanager/web/templates/org/apache/stanbol/ontologymanager/web/resources/ONMRootResource/index.ftl
Fri Jul 8 10:27:31 2011
@@ -9,7 +9,8 @@
</div>
<hr>
- <#include "inc_scopemgr.ftl">
+ <#include "/imports/inc_scopemgr.ftl">
+ <#include "/imports/inc_scope.ftl">
</@common.page>
</#escape>
\ No newline at end of file
Modified:
incubator/stanbol/trunk/ontologymanager/web/src/main/resources/org/apache/stanbol/ontologymanager/web/templates/org/apache/stanbol/ontologymanager/web/resources/RootResource/index.ftl
URL:
http://svn.apache.org/viewvc/incubator/stanbol/trunk/ontologymanager/web/src/main/resources/org/apache/stanbol/ontologymanager/web/templates/org/apache/stanbol/ontologymanager/web/resources/RootResource/index.ftl?rev=1144239&r1=1144238&r2=1144239&view=diff
==============================================================================
---
incubator/stanbol/trunk/ontologymanager/web/src/main/resources/org/apache/stanbol/ontologymanager/web/templates/org/apache/stanbol/ontologymanager/web/resources/RootResource/index.ftl
(original)
+++
incubator/stanbol/trunk/ontologymanager/web/src/main/resources/org/apache/stanbol/ontologymanager/web/templates/org/apache/stanbol/ontologymanager/web/resources/RootResource/index.ftl
Fri Jul 8 10:27:31 2011
@@ -6,8 +6,8 @@
<@ontonetDescription.view />
- <div class="panel" id="webview">
- <p>This is the start page of the ontology network manager.</p>
+ <div class="panel" id="webview">
+ <#include "webview.ftl">
</div>
<div class="panel" id="restapi" style="display: none;">
@@ -31,9 +31,11 @@
<li>Ontology scope @<code>/ontonet/ontology/{scopeName}</code>:
Manage the set of ontologies loaded within a single scope.
</li>
+<!--
<li>Ontology retrieval <a
href="${it.publicBaseUri}ontonet/ontology/get">/ontonet/ontology/get</a>:
Manage ontologies whose ID is known but not the scope(s) using
it.
</li>
+-->
<li>Ontology within scope
@<code>/ontonet/ontology/{scopeName}/{ontologyID}</code>:
Load/Unload operations on a single ontology loaded within a
scope.
</li>
@@ -49,7 +51,7 @@
Manage metadata for a single OntoNet session.
</li>
</ul>
-
+<!--
<h4>Graph Management (<code>"/ontonet/graphs"</code>):</h4>
<ul>
@@ -57,10 +59,11 @@
Storage and retrieval operation of RDF graphs, scope-independent.
</li>
</ul>
-
+-->
<hr>
- <#include "inc_scopemgr.ftl">
-
+ <#include "/imports/inc_scopemgr.ftl">
+ <#include "/imports/inc_scope.ftl">
+ <#include "/imports/inc_sessionmgr.ftl">
</div>
</@common.page>
Added:
incubator/stanbol/trunk/ontologymanager/web/src/main/resources/org/apache/stanbol/ontologymanager/web/templates/org/apache/stanbol/ontologymanager/web/resources/RootResource/webview.ftl
URL:
http://svn.apache.org/viewvc/incubator/stanbol/trunk/ontologymanager/web/src/main/resources/org/apache/stanbol/ontologymanager/web/templates/org/apache/stanbol/ontologymanager/web/resources/RootResource/webview.ftl?rev=1144239&view=auto
==============================================================================
---
incubator/stanbol/trunk/ontologymanager/web/src/main/resources/org/apache/stanbol/ontologymanager/web/templates/org/apache/stanbol/ontologymanager/web/resources/RootResource/webview.ftl
(added)
+++
incubator/stanbol/trunk/ontologymanager/web/src/main/resources/org/apache/stanbol/ontologymanager/web/templates/org/apache/stanbol/ontologymanager/web/resources/RootResource/webview.ftl
Fri Jul 8 10:27:31 2011
@@ -0,0 +1,14 @@
+<p>
+ Stanbol OntoNet implements the API section for managing OWL and OWL2
ontologies, in order to prepare them for consumption by reasoning services,
refactorers, rule engines and the like. Ontology management in ONM is sparse
and not connected: once loaded internally from their remote locations,
ontologies live and are known within the realm they were loaded in. This allows
loose-coupling and (de-)activation of ontologies in order to scale the data
sets for reasoners to process and optimize them for efficiency. The following
concepts have been introduced with the ONM:
+ <ul>
+ <li>
+ <u><em>Ontology scope</em></u>: a "logical realm" for all the ontologies
that encompass a certain CMS-related set of concepts (such as "User", "ACL",
"Event", "Content", "Domain", "Reengineering", "Community", "Travelling" etc.).
Scopes never inherit from each other, though they can load the same ontologies
if need be.
+ </li>
+ <li>
+ <u><em>Ontology space</em></u>: an access-restricted container for
synchronized access to ontologies within a scope. The ontologies in a scope are
loaded within its set of spaces. An ontology scope contains: (a) exactly one
<em>core space</em>, which contains the immutable set of essential ontologies
that describe the scope; (b) exactly one (possibly empty) <em>custom
space</em>, which extends the core space according to specific CMS needs (e.g.
the core space for the User scope may contains alignments to FOAF); (c) zero or
more <em>session spaces</em>, which extend the custom space with additional
models provided by end-users (e.g. the set of individuals that 'populate' a
scope may be fed to OntoNet via a session space). Session spaces are mapped
one-to-one with KReS sessions (see below).
+ </li>
+ <li>
+ <em><u>OntoNet session</u></em>: a container of session spaces for all
affected scopes, for stateful management of ontology networks. It is not
equivalent to an HTTP session (since it can live persistently across multiple
HTTP sessions), although its behaviour can reflect the one of the HTTP session
that created it, if required by the implementation.
+ </li>
+ </ul>
+</p>
\ No newline at end of file
Modified:
incubator/stanbol/trunk/ontologymanager/web/src/main/resources/org/apache/stanbol/ontologymanager/web/templates/org/apache/stanbol/ontologymanager/web/resources/SessionResource/index.ftl
URL:
http://svn.apache.org/viewvc/incubator/stanbol/trunk/ontologymanager/web/src/main/resources/org/apache/stanbol/ontologymanager/web/templates/org/apache/stanbol/ontologymanager/web/resources/SessionResource/index.ftl?rev=1144239&r1=1144238&r2=1144239&view=diff
==============================================================================
---
incubator/stanbol/trunk/ontologymanager/web/src/main/resources/org/apache/stanbol/ontologymanager/web/templates/org/apache/stanbol/ontologymanager/web/resources/SessionResource/index.ftl
(original)
+++
incubator/stanbol/trunk/ontologymanager/web/src/main/resources/org/apache/stanbol/ontologymanager/web/templates/org/apache/stanbol/ontologymanager/web/resources/SessionResource/index.ftl
Fri Jul 8 10:27:31 2011
@@ -9,7 +9,7 @@
</div>
<hr>
- <#include "inc_sessionmgr.ftl">
+ <#include "/imports/inc_sessionmgr.ftl">
</@common.page>
</#escape>
\ No newline at end of file
