Author: cihan
Date: Thu Apr 7 12:14:45 2011
New Revision: 1089844
URL: http://svn.apache.org/viewvc?rev=1089844&view=rev
Log:
STANBOL-154: Reflect newly added functionality in PersistenceStore api, on HTML
interface and rest services.
Modified:
incubator/stanbol/trunk/commons/web/ontology/src/main/java/org/apache/stanbol/ontologymanager/store/rest/resources/Ontologies.java
incubator/stanbol/trunk/commons/web/ontology/src/main/resources/org/apache/stanbol/commons/web/ontologymanager/store/templates/org/apache/stanbol/ontologymanager/store/rest/resources/ontologies.ftl
Modified:
incubator/stanbol/trunk/commons/web/ontology/src/main/java/org/apache/stanbol/ontologymanager/store/rest/resources/Ontologies.java
URL:
http://svn.apache.org/viewvc/incubator/stanbol/trunk/commons/web/ontology/src/main/java/org/apache/stanbol/ontologymanager/store/rest/resources/Ontologies.java?rev=1089844&r1=1089843&r2=1089844&view=diff
==============================================================================
---
incubator/stanbol/trunk/commons/web/ontology/src/main/java/org/apache/stanbol/ontologymanager/store/rest/resources/Ontologies.java
(original)
+++
incubator/stanbol/trunk/commons/web/ontology/src/main/java/org/apache/stanbol/ontologymanager/store/rest/resources/Ontologies.java
Thu Apr 7 12:14:45 2011
@@ -2,7 +2,9 @@ package org.apache.stanbol.ontologymanag
import static javax.ws.rs.core.MediaType.TEXT_HTML;
+import java.net.MalformedURLException;
import java.net.URI;
+import java.net.URL;
import java.util.ArrayList;
import java.util.List;
@@ -70,14 +72,27 @@ public class Ontologies extends BaseStan
@Consumes("application/x-www-form-urlencoded")
@Produces(MediaType.APPLICATION_XML)
public Response saveOntology(@FormParam("ontologyURI") String ontologyURI,
- @FormParam("ontologyContent") String
ontologyContent) {
+ @FormParam("ontologyContent") String
ontologyContent,
+ @FormParam("ontologyURL") String ontologyURL)
{
Response response = null;
LockManager lockManager = LockManagerImp.getInstance();
lockManager.obtainReadLockFor(LockManagerImp.GLOBAL_SPACE);
lockManager.obtainWriteLockFor(ontologyURI);
try {
- OntologyMetaInformation ontologyMetaInformation =
persistenceStore.saveOntology(ontologyContent,
- ontologyURI, "UTF-8");
+ OntologyMetaInformation ontologyMetaInformation = null;
+ if (ontologyContent != null && ontologyContent.isEmpty()) {
+ ontologyMetaInformation = persistenceStore
+ .saveOntology(ontologyContent, ontologyURI, "UTF-8");
+ } else if (ontologyURL != null && ontologyURL.isEmpty()) {
+ try{
+ ontologyMetaInformation = persistenceStore.saveOntology(new
URL(ontologyURL), ontologyURI,
+ "UTF-8");
+ }catch (MalformedURLException e) {
+ throw new WebApplicationException(e, Status.BAD_REQUEST);
+ }
+ }else{
+ throw new WebApplicationException(new
IllegalArgumentException("Ontology Content or URL can not be both
null"),Status.BAD_REQUEST);
+ }
response = Response.ok(ontologyMetaInformation,
MediaType.APPLICATION_XML_TYPE).build();
} catch (Exception e) {
logger.error("Error ", e);
@@ -116,10 +131,11 @@ public class Ontologies extends BaseStan
@POST
@Consumes(MediaType.APPLICATION_FORM_URLENCODED)
- @Produces(MediaType.TEXT_HTML+";qs=2")
+ @Produces(MediaType.TEXT_HTML + ";qs=2")
public Response createAndRedirect(@FormParam("ontologyURI") String
ontologyURI,
- @FormParam("ontologyContent") String
ontologyContent) {
- Response response = this.saveOntology(ontologyURI, ontologyContent);
+ @FormParam("ontologyContent") String
ontologyContent,
+ @FormParam("ontologyURL") String
ontologyURL ) {
+ Response response = this.saveOntology(ontologyURI, ontologyContent,
ontologyURL);
OntologyMetaInformation ont = ((OntologyMetaInformation)
response.getEntity());
try {
return
Response.seeOther(URI.create(ont.getHref())).type(MediaType.TEXT_HTML)
Modified:
incubator/stanbol/trunk/commons/web/ontology/src/main/resources/org/apache/stanbol/commons/web/ontologymanager/store/templates/org/apache/stanbol/ontologymanager/store/rest/resources/ontologies.ftl
URL:
http://svn.apache.org/viewvc/incubator/stanbol/trunk/commons/web/ontology/src/main/resources/org/apache/stanbol/commons/web/ontologymanager/store/templates/org/apache/stanbol/ontologymanager/store/rest/resources/ontologies.ftl?rev=1089844&r1=1089843&r2=1089844&view=diff
==============================================================================
---
incubator/stanbol/trunk/commons/web/ontology/src/main/resources/org/apache/stanbol/commons/web/ontologymanager/store/templates/org/apache/stanbol/ontologymanager/store/rest/resources/ontologies.ftl
(original)
+++
incubator/stanbol/trunk/commons/web/ontology/src/main/resources/org/apache/stanbol/commons/web/ontologymanager/store/templates/org/apache/stanbol/ontologymanager/store/rest/resources/ontologies.ftl
Thu Apr 7 12:14:45 2011
@@ -12,6 +12,7 @@
<fieldset>
<legend>Submit raw text in RDF/XML format</legend>
<p>Ontology URI: <textarea rows="1"
name="ontologyURI"></textarea></p>
+ <p>Ontology URL: <textarea rows="1"
name="ontologyURL"></textarea></p>
<p>Ontology Content:<textarea rows="15"
name="ontologyContent"></textarea></p>
<p><input type="submit" value="Submit Ontology"></p>
</fieldset>
@@ -46,7 +47,7 @@
function clearStore()
{
xmlhttp=new XMLHttpRequest();
- xmlhttp.open('DELETE',"ontologies",false);
+ xmlhttp.open('DELETE',"/ontology",false);
xmlhttp.send();
location.reload('true');
}
