You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stanbol.apache.org by al...@apache.org on 2012/08/10 18:29:24 UTC
svn commit: r1371761 [3/3] - in /incubator/stanbol/trunk/ontologymanager:
ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/
ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/collector/
ontonet/src/main/java/org/ap...
Modified: incubator/stanbol/trunk/ontologymanager/ontonet/src/test/java/org/apache/stanbol/ontologymanager/ontonet/session/TestSessions.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/ontologymanager/ontonet/src/test/java/org/apache/stanbol/ontologymanager/ontonet/session/TestSessions.java?rev=1371761&r1=1371760&r2=1371761&view=diff
==============================================================================
--- incubator/stanbol/trunk/ontologymanager/ontonet/src/test/java/org/apache/stanbol/ontologymanager/ontonet/session/TestSessions.java (original)
+++ incubator/stanbol/trunk/ontologymanager/ontonet/src/test/java/org/apache/stanbol/ontologymanager/ontonet/session/TestSessions.java Fri Aug 10 16:29:22 2012
@@ -33,7 +33,7 @@ import org.apache.stanbol.commons.owl.OW
import org.apache.stanbol.ontologymanager.ontonet.Constants;
import org.apache.stanbol.ontologymanager.ontonet.api.collector.DuplicateIDException;
import org.apache.stanbol.ontologymanager.ontonet.api.io.OntologyInputSource;
-import org.apache.stanbol.ontologymanager.ontonet.api.io.Origin;
+import org.apache.stanbol.ontologymanager.ontonet.api.io.RootOntologyIRISource;
import org.apache.stanbol.ontologymanager.ontonet.api.io.RootOntologySource;
import org.apache.stanbol.ontologymanager.ontonet.api.scope.OntologyScope;
import org.apache.stanbol.ontologymanager.ontonet.api.session.NonReferenceableSessionException;
@@ -148,10 +148,11 @@ public class TestSessions {
assertFalse(resurrect);
}
-// @Test
+ // @Test
public void zombieSessionClearsContents() throws Exception {
Session ses = sessionManager.createSession();
- ses.addOntology(Origin.create(IRI.create(getClass().getResource("/ontologies/mockfoaf.rdf"))));
+ ses.addOntology(new RootOntologyIRISource((IRI.create(getClass().getResource(
+ "/ontologies/mockfoaf.rdf")))));
OWLOntologyID expectedKey = new OWLOntologyID(IRI.create("http://xmlns.com/foaf/0.1/"));
assertTrue(ontologyProvider.hasOntology(expectedKey));
sessionManager.destroySession(ses.getID());
Modified: incubator/stanbol/trunk/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/resources/ScopeResource.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/resources/ScopeResource.java?rev=1371761&r1=1371760&r2=1371761&view=diff
==============================================================================
--- incubator/stanbol/trunk/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/resources/ScopeResource.java (original)
+++ incubator/stanbol/trunk/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/resources/ScopeResource.java Fri Aug 10 16:29:22 2012
@@ -94,10 +94,10 @@ import org.apache.stanbol.ontologymanage
import org.apache.stanbol.ontologymanager.ontonet.api.io.GraphContentInputSource;
import org.apache.stanbol.ontologymanager.ontonet.api.io.GraphSource;
import org.apache.stanbol.ontologymanager.ontonet.api.io.OntologyInputSource;
-import org.apache.stanbol.ontologymanager.ontonet.api.io.Origin;
import org.apache.stanbol.ontologymanager.ontonet.api.io.RootOntologyIRISource;
import org.apache.stanbol.ontologymanager.ontonet.api.io.RootOntologySource;
import org.apache.stanbol.ontologymanager.ontonet.api.io.SetInputSource;
+import org.apache.stanbol.ontologymanager.ontonet.api.io.StoredOntologySource;
import org.apache.stanbol.ontologymanager.ontonet.api.ontology.OntologyProvider;
import org.apache.stanbol.ontologymanager.ontonet.api.scope.OntologyScope;
import org.apache.stanbol.ontologymanager.ontonet.api.scope.OntologySpace;
@@ -462,10 +462,10 @@ public class ScopeResource extends BaseS
else if (ontologyId == null || ontologyId.isEmpty()) rb = Response.status(BAD_REQUEST);
else {
IRI prefix = IRI.create(getPublicBaseUri() + "ontonet/ontology/");
- OWLOntology o = scope.getCustomSpace().getOntology(IRI.create(ontologyId), OWLOntology.class,
- false, prefix);
- if (o == null) o = scope.getCoreSpace().getOntology(IRI.create(ontologyId), OWLOntology.class,
- false, prefix);
+ OWLOntology o = scope.getCustomSpace().getOntology(OntologyUtils.decode(ontologyId),
+ OWLOntology.class, false, prefix);
+ if (o == null) o = scope.getCoreSpace().getOntology(OntologyUtils.decode(ontologyId),
+ OWLOntology.class, false, prefix);
if (o == null) rb = Response.status(NOT_FOUND);
else try {
ByteArrayOutputStream out = new ByteArrayOutputStream();
@@ -709,7 +709,7 @@ public class ScopeResource extends BaseS
}
if (!keys.isEmpty()) {
for (String key : keys)
- scope.getCustomSpace().addOntology(Origin.create(OntologyUtils.decode(key)));
+ scope.getCustomSpace().addOntology(new StoredOntologySource(OntologyUtils.decode(key)));
rb = Response.seeOther(URI.create("/ontonet/ontology/" + scope.getID()));
}
// else throw new WebApplicationException(BAD_REQUEST);
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=1371761&r1=1371760&r2=1371761&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 Aug 10 16:29:22 2012
@@ -90,8 +90,8 @@ import org.apache.stanbol.ontologymanage
import org.apache.stanbol.ontologymanager.ontonet.api.io.GraphContentInputSource;
import org.apache.stanbol.ontologymanager.ontonet.api.io.OntologyContentInputSource;
import org.apache.stanbol.ontologymanager.ontonet.api.io.OntologyInputSource;
-import org.apache.stanbol.ontologymanager.ontonet.api.io.Origin;
import org.apache.stanbol.ontologymanager.ontonet.api.io.RootOntologyIRISource;
+import org.apache.stanbol.ontologymanager.ontonet.api.io.StoredOntologySource;
import org.apache.stanbol.ontologymanager.ontonet.api.ontology.OntologyProvider;
import org.apache.stanbol.ontologymanager.ontonet.api.scope.OntologyScope;
import org.apache.stanbol.ontologymanager.ontonet.api.session.DuplicateSessionIDException;
@@ -716,7 +716,7 @@ public class SessionResource extends Bas
}
if (!keys.isEmpty()) {
for (String key : keys)
- session.addOntology(Origin.create(OntologyUtils.decode(key)));
+ session.addOntology(new StoredOntologySource(OntologyUtils.decode(key)));
rb = Response.seeOther(URI.create("/ontonet/session/" + session.getID()));
} // Now check scopes
if (toAppend != null
Modified: 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=1371761&r1=1371760&r2=1371761&view=diff
==============================================================================
--- incubator/stanbol/trunk/ontologymanager/web/src/main/resources/org/apache/stanbol/ontologymanager/web/templates/imports/inc_scope.ftl (original)
+++ incubator/stanbol/trunk/ontologymanager/web/src/main/resources/org/apache/stanbol/ontologymanager/web/templates/imports/inc_scope.ftl Fri Aug 10 16:29:22 2012
@@ -61,19 +61,11 @@
<td>POST <code>/ontonet/ontology/</code>{scopeName}
<br/>
Content types :
- <ul>
- <li><code>application/owl+xml</code></li>
- <li><code>application/rdf+json</code></li>
- <li><code>application/rdf+xml</code></li>
- <li><code>application/x-turtle</code></li>
- <li><code>multipart/form-data</code></li>
- <li><code>text/owl-functional</code></li>
- <li><code>text/owl-manchester</code></li>
- <li><code>text/plain</code></li>
- <li><code>text/rdf+n3</code></li>
- <li><code>text/rdf+nt</code></li>
- <li><code>text/turtle</code></li>
- </ul>
+ <code>application/owl+xml</code>, <code>application/rdf+json</code>,
+ <code>application/rdf+xml</code>, <code>application/x-turtle</code>,
+ <code>multipart/form-data</code>, <code>text/owl-functional</code>,
+ <code>text/owl-manchester</code>, <code>text/plain</code>,
+ <code>text/rdf+n3</code>, <code>text/rdf+nt</code>, <code>text/turtle</code>
</td>
</tr>
<tr>
@@ -124,12 +116,12 @@
</table>
<h5>Examples</h5>
-Load and store the SKOS thesaurus of ISO 3166-1 country codes into a scope that manages Geographical content, without knowing the ontology format.
+Load and store the SKOS thesaurus of ISO 3166-1 country codes into a scope that manages Geographical content.
<pre>curl -X POST -F "url=http://eulersharp.sourceforge.net/2003/03swap/countries" ${it.publicBaseUri}ontonet/ontology/Geographical</pre>
or
<pre>curl -H "Content-type: text/plain" -d http://eulersharp.sourceforge.net/2003/03swap/countries ${it.publicBaseUri}ontonet/ontology/Geographical</pre>
<br/>
-Load and store an ontology from a local file called <tt>acme-hierarchy.owl</tt> in the scope about the ACME organization, knowing the file is in RDF/XML format.
+Load an ontology from local file <tt>acme-hierarchy.owl</tt> in the scope about the ACME organization, knowing the file is in RDF/XML format.
<pre>curl -X POST -F file=@acme-hierarchy.owl -F format=application/rdf+xml ${it.publicBaseUri}ontonet/ontology/ACME</pre>
or
<pre>curl -H "Content-type: application/rdf+xml" -d @acme-hierarchy.owl ${it.publicBaseUri}ontonet/ontology/ACME