Author: cihan
Date: Fri Apr 8 08:16:20 2011
New Revision: 1090156
URL: http://svn.apache.org/viewvc?rev=1090156&view=rev
Log:
STANBOL-154: Reorganized ontology submit form fields.
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/java/org/apache/stanbol/ontologymanager/store/rest/resources/OntologyImports.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=1090156&r1=1090155&r2=1090156&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
Fri Apr 8 08:16:20 2011
@@ -72,8 +72,7 @@ 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("ontologyURL") String ontologyURL)
{
+ @FormParam("ontologyContent") String
ontologyContent) {
Response response = null;
LockManager lockManager = LockManagerImp.getInstance();
lockManager.obtainReadLockFor(LockManagerImp.GLOBAL_SPACE);
@@ -83,15 +82,15 @@ public class Ontologies extends BaseStan
if (ontologyContent != null && !ontologyContent.isEmpty()) {
ontologyMetaInformation = persistenceStore
.saveOntology(ontologyContent, ontologyURI, "UTF-8");
- } else if (ontologyURL != null && !ontologyURL.isEmpty()) {
+ } else if (ontologyURI != null && !ontologyURI.isEmpty()) {
try{
- ontologyMetaInformation = persistenceStore.saveOntology(new
URL(ontologyURL), ontologyURI,
+ ontologyMetaInformation = persistenceStore.saveOntology(new
URL(ontologyURI), 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);
+ throw new WebApplicationException(new
IllegalArgumentException("Ontology Content or URI can not be both
null"),Status.BAD_REQUEST);
}
response = Response.ok(ontologyMetaInformation,
MediaType.APPLICATION_XML_TYPE).build();
} catch (Exception e) {
@@ -133,9 +132,8 @@ public class Ontologies extends BaseStan
@Consumes(MediaType.APPLICATION_FORM_URLENCODED)
@Produces(MediaType.TEXT_HTML + ";qs=2")
public Response createAndRedirect(@FormParam("ontologyURI") String
ontologyURI,
- @FormParam("ontologyContent") String
ontologyContent,
- @FormParam("ontologyURL") String
ontologyURL ) {
- Response response = this.saveOntology(ontologyURI, ontologyContent,
ontologyURL);
+ @FormParam("ontologyContent") String
ontologyContent) {
+ Response response = this.saveOntology(ontologyURI, ontologyContent);
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/java/org/apache/stanbol/ontologymanager/store/rest/resources/OntologyImports.java
URL:
http://svn.apache.org/viewvc/incubator/stanbol/trunk/commons/web/ontology/src/main/java/org/apache/stanbol/ontologymanager/store/rest/resources/OntologyImports.java?rev=1090156&r1=1090155&r2=1090156&view=diff
==============================================================================
---
incubator/stanbol/trunk/commons/web/ontology/src/main/java/org/apache/stanbol/ontologymanager/store/rest/resources/OntologyImports.java
(original)
+++
incubator/stanbol/trunk/commons/web/ontology/src/main/java/org/apache/stanbol/ontologymanager/store/rest/resources/OntologyImports.java
Fri Apr 8 08:16:20 2011
@@ -2,7 +2,6 @@ package org.apache.stanbol.ontologymanag
import java.net.URI;
import java.net.URISyntaxException;
-import java.util.List;
import javax.servlet.ServletContext;
import javax.ws.rs.Consumes;
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=1090156&r1=1090155&r2=1090156&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
Fri Apr 8 08:16:20 2011
@@ -12,7 +12,6 @@
<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>
