You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stanbol.apache.org by ci...@apache.org on 2011/06/16 08:36:59 UTC
svn commit: r1136297 - in
/incubator/stanbol/trunk/commons/web/ontology/src/main/java/org/apache/stanbol/ontologymanager/store/rest:
./ resources/
Author: cihan
Date: Thu Jun 16 06:36:58 2011
New Revision: 1136297
URL: http://svn.apache.org/viewvc?rev=1136297&view=rev
Log:
-Fixed a bug in ontology deletion that removes resources from other ontologies.
-Fixed disjoint/equivalent/super class paths of JAX-RS resources.
Modified:
incubator/stanbol/trunk/commons/web/ontology/src/main/java/org/apache/stanbol/ontologymanager/store/rest/ResourceManagerImp.java
incubator/stanbol/trunk/commons/web/ontology/src/main/java/org/apache/stanbol/ontologymanager/store/rest/resources/ParticularClass.java
incubator/stanbol/trunk/commons/web/ontology/src/main/java/org/apache/stanbol/ontologymanager/store/rest/resources/ParticularClassDisjointClasses.java
incubator/stanbol/trunk/commons/web/ontology/src/main/java/org/apache/stanbol/ontologymanager/store/rest/resources/ParticularClassEquivalentClasses.java
incubator/stanbol/trunk/commons/web/ontology/src/main/java/org/apache/stanbol/ontologymanager/store/rest/resources/ParticularClassSuperClasses.java
incubator/stanbol/trunk/commons/web/ontology/src/main/java/org/apache/stanbol/ontologymanager/store/rest/resources/ParticularDatatypePropertyDomains.java
incubator/stanbol/trunk/commons/web/ontology/src/main/java/org/apache/stanbol/ontologymanager/store/rest/resources/ParticularDatatypePropertyRanges.java
incubator/stanbol/trunk/commons/web/ontology/src/main/java/org/apache/stanbol/ontologymanager/store/rest/resources/ParticularDatatypePropertySuperProperties.java
incubator/stanbol/trunk/commons/web/ontology/src/main/java/org/apache/stanbol/ontologymanager/store/rest/resources/ParticularIndividualPropertyAssertions.java
incubator/stanbol/trunk/commons/web/ontology/src/main/java/org/apache/stanbol/ontologymanager/store/rest/resources/ParticularIndividualTypes.java
incubator/stanbol/trunk/commons/web/ontology/src/main/java/org/apache/stanbol/ontologymanager/store/rest/resources/ParticularObjectPropertyDomains.java
incubator/stanbol/trunk/commons/web/ontology/src/main/java/org/apache/stanbol/ontologymanager/store/rest/resources/ParticularObjectPropertyRanges.java
incubator/stanbol/trunk/commons/web/ontology/src/main/java/org/apache/stanbol/ontologymanager/store/rest/resources/ParticularObjectPropertySuperProperties.java
Modified: incubator/stanbol/trunk/commons/web/ontology/src/main/java/org/apache/stanbol/ontologymanager/store/rest/ResourceManagerImp.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/commons/web/ontology/src/main/java/org/apache/stanbol/ontologymanager/store/rest/ResourceManagerImp.java?rev=1136297&r1=1136296&r2=1136297&view=diff
==============================================================================
--- incubator/stanbol/trunk/commons/web/ontology/src/main/java/org/apache/stanbol/ontologymanager/store/rest/ResourceManagerImp.java (original)
+++ incubator/stanbol/trunk/commons/web/ontology/src/main/java/org/apache/stanbol/ontologymanager/store/rest/ResourceManagerImp.java Thu Jun 16 06:36:58 2011
@@ -32,6 +32,8 @@ import org.slf4j.LoggerFactory;
@Service
public class ResourceManagerImp implements ResourceManager {
+ private static final String DELIMITER = "|";
+
private static final String DB_URL = "jdbc:derby:ps_db;create=true";
private static String ontologyPathPrefix = "/ontology/";
@@ -141,10 +143,10 @@ public class ResourceManagerImp implemen
if (rSet3.next()) {
String ontologyURIForResource = rSet3.getString("ontologyURI");
String ontologyPathForResource = rSet3.getString("ontologyPath");
- resources.put(ontologyURIForResource + "#" + resourceURI, resourcePath);
- resourcesInverted.put(ontologyPathForResource + "#" + resourcePath, resourceURI);
+ resources.put(ontologyURIForResource + DELIMITER + resourceURI, resourcePath);
+ resourcesInverted.put(ontologyPathForResource + DELIMITER + resourcePath, resourceURI);
resourceToOntologyURIs.put(resourceURI, ontologyURIForResource);
- resourcesTypes.put(ontologyURIForResource + "#" + resourceURI, resourceType);
+ resourcesTypes.put(ontologyURIForResource + DELIMITER + resourceURI, resourceType);
}
}
con.close();
@@ -231,12 +233,12 @@ public class ResourceManagerImp implemen
*/
public void registerClass(String ontologyURI, String classURI) {
try {
- if (!resources.containsKey(ontologyURI + "#" + classURI)) {
+ if (!resources.containsKey(ontologyURI + DELIMITER + classURI)) {
String classPath = normalizeURI(classURI);
- resources.put(ontologyURI + "#" + classURI, classPath);
- resourcesInverted.put(ontologies.get(ontologyURI) + "#" + classPath, classURI);
+ resources.put(ontologyURI + DELIMITER + classURI, classPath);
+ resourcesInverted.put(ontologies.get(ontologyURI) + DELIMITER + classPath, classURI);
resourceToOntologyURIs.put(classURI, ontologyURI);
- resourcesTypes.put(ontologyURI + "#" + classURI, CLASS_RESOURCE);
+ resourcesTypes.put(ontologyURI + DELIMITER + classURI, CLASS_RESOURCE);
Connection con = obtainConnection();
Statement statement = con.createStatement();
ResultSet rSet = statement.executeQuery("SELECT id from " + ontologiesTable
@@ -263,12 +265,12 @@ public class ResourceManagerImp implemen
*/
public void registerDatatypeProperty(String ontologyURI, String dataPropertyURI) {
try {
- if (!resources.containsKey(ontologyURI + "#" + dataPropertyURI)) {
+ if (!resources.containsKey(ontologyURI + DELIMITER + dataPropertyURI)) {
String dataPropertyPath = normalizeURI(dataPropertyURI);
- resources.put(ontologyURI + "#" + dataPropertyURI, dataPropertyPath);
- resourcesInverted.put(ontologies.get(ontologyURI) + "#" + dataPropertyPath, dataPropertyURI);
+ resources.put(ontologyURI + DELIMITER + dataPropertyURI, dataPropertyPath);
+ resourcesInverted.put(ontologies.get(ontologyURI) + DELIMITER + dataPropertyPath, dataPropertyURI);
resourceToOntologyURIs.put(dataPropertyURI, ontologyURI);
- resourcesTypes.put(ontologyURI + "#" + dataPropertyURI, DATA_PROPERTY_RESOURCE);
+ resourcesTypes.put(ontologyURI + DELIMITER + dataPropertyURI, DATA_PROPERTY_RESOURCE);
Connection con = obtainConnection();
Statement statement = con.createStatement();
ResultSet rSet = statement.executeQuery("SELECT id from " + ontologiesTable
@@ -295,13 +297,13 @@ public class ResourceManagerImp implemen
*/
public void registerObjectProperty(String ontologyURI, String objectPropertyURI) {
try {
- if (!resources.containsKey(ontologyURI + "#" + objectPropertyURI)) {
+ if (!resources.containsKey(ontologyURI + DELIMITER + objectPropertyURI)) {
String objectPropertyPath = normalizeURI(objectPropertyURI);
- resources.put(ontologyURI + "#" + objectPropertyURI, objectPropertyPath);
- resourcesInverted.put(ontologies.get(ontologyURI) + "#" + objectPropertyPath,
+ resources.put(ontologyURI + DELIMITER + objectPropertyURI, objectPropertyPath);
+ resourcesInverted.put(ontologies.get(ontologyURI) + DELIMITER + objectPropertyPath,
objectPropertyURI);
resourceToOntologyURIs.put(objectPropertyURI, ontologyURI);
- resourcesTypes.put(ontologyURI + "#" + objectPropertyURI, OBJECT_PROPERTY_RESOURCE);
+ resourcesTypes.put(ontologyURI + DELIMITER + objectPropertyURI, OBJECT_PROPERTY_RESOURCE);
Connection con = obtainConnection();
Statement statement = con.createStatement();
ResultSet rSet = statement.executeQuery("SELECT id from " + ontologiesTable
@@ -328,12 +330,12 @@ public class ResourceManagerImp implemen
*/
public void registerIndividual(String ontologyURI, String individualURI) {
try {
- if (!resources.containsKey(ontologyURI + "#" + individualURI)) {
+ if (!resources.containsKey(ontologyURI + DELIMITER + individualURI)) {
String individualPath = normalizeURI(individualURI);
- resources.put(ontologyURI + "#" + individualURI, individualPath);
- resourcesInverted.put(ontologies.get(ontologyURI) + "#" + individualPath, individualURI);
+ resources.put(ontologyURI + DELIMITER + individualURI, individualPath);
+ resourcesInverted.put(ontologies.get(ontologyURI) + DELIMITER + individualPath, individualURI);
resourceToOntologyURIs.put(individualURI, ontologyURI);
- resourcesTypes.put(ontologyURI + "#" + individualURI, INDIVIDUAL_RESOURCE);
+ resourcesTypes.put(ontologyURI + DELIMITER + individualURI, INDIVIDUAL_RESOURCE);
Connection con = obtainConnection();
Statement statement = con.createStatement();
ResultSet rSet = statement.executeQuery("SELECT id from " + ontologiesTable
@@ -401,8 +403,8 @@ public class ResourceManagerImp implemen
public String getResourceFullPath(String resourceURI) {
String result = null;
String ontologyURI = resourceToOntologyURIs.get(resourceURI);
- if (ontologies.containsKey(ontologyURI) && resources.containsKey(ontologyURI + "#" + resourceURI)) {
- String resourceType = resourcesTypes.get(ontologyURI + "#" + resourceURI);
+ if (ontologies.containsKey(ontologyURI) && resources.containsKey(ontologyURI + DELIMITER + resourceURI)) {
+ String resourceType = resourcesTypes.get(ontologyURI + DELIMITER + resourceURI);
String pathPrefix = null;
if (resourceType.equalsIgnoreCase(CLASS_RESOURCE)) {
pathPrefix = classPathPrefix;
@@ -414,7 +416,7 @@ public class ResourceManagerImp implemen
pathPrefix = individualPathPrefix;
}
result = ontologyPathPrefix + ontologies.get(ontologyURI) + "/" + pathPrefix
- + resources.get(ontologyURI + "#" + resourceURI);
+ + resources.get(ontologyURI + DELIMITER + resourceURI);
}
return result;
}
@@ -441,8 +443,8 @@ public class ResourceManagerImp implemen
*/
public String getResourceURIForPath(String ontologyPath, String resourcePath) {
String result = null;
- if (resourcesInverted.containsKey(ontologyPath + "#" + resourcePath)) {
- result = resourcesInverted.get(ontologyPath + "#" + resourcePath);
+ if (resourcesInverted.containsKey(ontologyPath + DELIMITER + resourcePath)) {
+ result = resourcesInverted.get(ontologyPath + DELIMITER + resourcePath);
}
return result;
}
@@ -478,7 +480,8 @@ public class ResourceManagerImp implemen
Iterator<String> resources_keys_itr = resources_keys.iterator();
while (resources_keys_itr.hasNext()) {
String key = resources_keys_itr.next();
- if (key.startsWith(ontologyURI)) {
+ //FIXME were startswith
+ if (key.split("\\"+DELIMITER)[0].contentEquals(ontologyURI)) {
keysToRemove.add(key);
}
}
@@ -492,7 +495,8 @@ public class ResourceManagerImp implemen
Iterator<String> resourcesInverted_keys_itr = resourcesInverted_keys.iterator();
while (resourcesInverted_keys_itr.hasNext()) {
String key = resourcesInverted_keys_itr.next();
- if (key.startsWith(ontologyURI)) {
+ //FIXME were startswith
+ if (key.split("\\"+DELIMITER)[0].contentEquals(ontologyURI)) {
keysToRemove.add(key);
}
}
@@ -506,7 +510,8 @@ public class ResourceManagerImp implemen
Iterator<String> resourcesTypes_keys_itr = resourcesTypes_keys.iterator();
while (resourcesTypes_keys_itr.hasNext()) {
String key = resourcesTypes_keys_itr.next();
- if (key.startsWith(ontologyURI)) {
+ //FIXME were startswith
+ if (key.split("\\"+DELIMITER)[0].contentEquals(ontologyURI)) {
keysToRemove.add(key);
}
}
@@ -571,9 +576,9 @@ public class ResourceManagerImp implemen
String ontologyURI = resourceToOntologyURIs.get(resourceURI);
String ontologyPath = ontologies.get(ontologyURI);
- resources.remove(ontologyURI + "#" + resourceURI);
- resourcesInverted.remove(ontologyPath + "#" + classPath);
- resourcesTypes.remove(ontologyURI + "#" + resourceURI);
+ resources.remove(ontologyURI + DELIMITER + resourceURI);
+ resourcesInverted.remove(ontologyPath + DELIMITER + classPath);
+ resourcesTypes.remove(ontologyURI + DELIMITER + resourceURI);
resourceToOntologyURIs.remove(resourceURI);
// then clear database
Modified: incubator/stanbol/trunk/commons/web/ontology/src/main/java/org/apache/stanbol/ontologymanager/store/rest/resources/ParticularClass.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/commons/web/ontology/src/main/java/org/apache/stanbol/ontologymanager/store/rest/resources/ParticularClass.java?rev=1136297&r1=1136296&r2=1136297&view=diff
==============================================================================
--- incubator/stanbol/trunk/commons/web/ontology/src/main/java/org/apache/stanbol/ontologymanager/store/rest/resources/ParticularClass.java (original)
+++ incubator/stanbol/trunk/commons/web/ontology/src/main/java/org/apache/stanbol/ontologymanager/store/rest/resources/ParticularClass.java Thu Jun 16 06:36:58 2011
@@ -1,13 +1,9 @@
package org.apache.stanbol.ontologymanager.store.rest.resources;
-import java.util.List;
-
import javax.servlet.ServletContext;
import javax.ws.rs.DELETE;
import javax.ws.rs.DefaultValue;
-import javax.ws.rs.FormParam;
import javax.ws.rs.GET;
-import javax.ws.rs.POST;
import javax.ws.rs.Path;
import javax.ws.rs.PathParam;
import javax.ws.rs.Produces;
@@ -16,7 +12,6 @@ import javax.ws.rs.WebApplicationExcepti
import javax.ws.rs.core.Context;
import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Response;
-import javax.ws.rs.core.Response.Status;
import org.apache.stanbol.commons.web.base.ContextHelper;
import org.apache.stanbol.commons.web.base.resource.BaseStanbolResource;
@@ -31,7 +26,7 @@ import org.slf4j.LoggerFactory;
import com.sun.jersey.api.view.Viewable;
@Path("/ontology/{ontologyPath:.+}/classes/{classPath:.+}/")
-public class ParticularClass extends BaseStanbolResource{
+public class ParticularClass extends BaseStanbolResource {
private static final Logger logger = LoggerFactory.getLogger(ParticularClass.class);
private static final String VIEWABLE_PATH = "/org/apache/stanbol/ontologymanager/store/rest/resources/particularClass";
@@ -91,66 +86,13 @@ public class ParticularClass extends Bas
}
}
- @POST
- @Path("/ontologymanager/store/unionClasses")
- public Response addUnionClasses(@PathParam("ontologyPath") String ontologyPath,
- @PathParam("classPath") String classPath,
- @FormParam("unionClassURIs") List<String> unionClassURIs) {
- LockManager lockManager = LockManagerImp.getInstance();
- lockManager.obtainWriteLockFor(ontologyPath);
- try {
- ResourceManagerImp resourceManager = ResourceManagerImp.getInstance();
- String classURI = resourceManager.getResourceURIForPath(ontologyPath, classPath);
- if (classURI == null) {
- throw new WebApplicationException(Status.NOT_FOUND);
- } else {
- for (String unionClassURI : unionClassURIs) {
- try {
- persistenceStore.addUnionClass(classURI, unionClassURI);
- } catch (Exception e) {
- throw new WebApplicationException(Status.INTERNAL_SERVER_ERROR);
- }
- }
- }
- } finally {
- lockManager.releaseWriteLockFor(ontologyPath);
- }
- return Response.ok().build();
- }
-
- @DELETE
- @Path("/ontologymanager/store/unionClasses/{unionClassPath:.+}")
- public Response removeUnionClass(@PathParam("ontologyPath") String ontologyPath,
- @PathParam("classPath") String classPath,
- @PathParam("unionClassPath") String unionClassPath) {
- LockManager lockManager = LockManagerImp.getInstance();
- lockManager.obtainWriteLockFor(ontologyPath);
- try {
- ResourceManagerImp resourceManager = ResourceManagerImp.getInstance();
- String classURI = resourceManager.getResourceURIForPath(ontologyPath, classPath);
- String unionClassURI = resourceManager.convertEntityRelativePathToURI(unionClassPath);
- if (classURI == null) {
- throw new WebApplicationException(Status.NOT_FOUND);
- } else {
- try {
- persistenceStore.deleteUnionClass(classURI, unionClassURI);
- } catch (Exception e) {
- throw new WebApplicationException(e, Status.INTERNAL_SERVER_ERROR);
- }
- }
- } finally {
-
- }
- return Response.ok().build();
- }
-
// HTML View Methods
public ClassContext getMetadata() {
return metadata;
}
@GET
- @Produces(MediaType.TEXT_HTML+";qs=2")
+ @Produces(MediaType.TEXT_HTML + ";qs=2")
public Viewable getViewable(@PathParam("ontologyPath") String ontologyPath,
@PathParam("classPath") String classPath,
@DefaultValue("false") @QueryParam("withInferredAxioms") boolean withInferredAxioms) {
Modified: incubator/stanbol/trunk/commons/web/ontology/src/main/java/org/apache/stanbol/ontologymanager/store/rest/resources/ParticularClassDisjointClasses.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/commons/web/ontology/src/main/java/org/apache/stanbol/ontologymanager/store/rest/resources/ParticularClassDisjointClasses.java?rev=1136297&r1=1136296&r2=1136297&view=diff
==============================================================================
--- incubator/stanbol/trunk/commons/web/ontology/src/main/java/org/apache/stanbol/ontologymanager/store/rest/resources/ParticularClassDisjointClasses.java (original)
+++ incubator/stanbol/trunk/commons/web/ontology/src/main/java/org/apache/stanbol/ontologymanager/store/rest/resources/ParticularClassDisjointClasses.java Thu Jun 16 06:36:58 2011
@@ -60,7 +60,7 @@ public class ParticularClassDisjointClas
}
@DELETE
- @Path("/ontologymanager/store{disjointClassPath:.+}")
+ @Path("/{disjointClassPath:.+}")
public Response removeDisjointClass(@PathParam("ontologyPath") String ontologyPath,
@PathParam("classPath") String classPath,
@PathParam("disjointClassPath") String disjointClassPath) {
Modified: incubator/stanbol/trunk/commons/web/ontology/src/main/java/org/apache/stanbol/ontologymanager/store/rest/resources/ParticularClassEquivalentClasses.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/commons/web/ontology/src/main/java/org/apache/stanbol/ontologymanager/store/rest/resources/ParticularClassEquivalentClasses.java?rev=1136297&r1=1136296&r2=1136297&view=diff
==============================================================================
--- incubator/stanbol/trunk/commons/web/ontology/src/main/java/org/apache/stanbol/ontologymanager/store/rest/resources/ParticularClassEquivalentClasses.java (original)
+++ incubator/stanbol/trunk/commons/web/ontology/src/main/java/org/apache/stanbol/ontologymanager/store/rest/resources/ParticularClassEquivalentClasses.java Thu Jun 16 06:36:58 2011
@@ -60,7 +60,7 @@ public class ParticularClassEquivalentCl
}
@DELETE
- @Path("/ontologymanager/store{equivalentClassPath:.+}")
+ @Path("/{equivalentClassPath:.+}")
public Response removeEquivalentClass(@PathParam("ontologyPath") String ontologyPath,
@PathParam("classPath") String classPath,
@PathParam("equivalentClassPath") String equivalentClassPath) {
Modified: incubator/stanbol/trunk/commons/web/ontology/src/main/java/org/apache/stanbol/ontologymanager/store/rest/resources/ParticularClassSuperClasses.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/commons/web/ontology/src/main/java/org/apache/stanbol/ontologymanager/store/rest/resources/ParticularClassSuperClasses.java?rev=1136297&r1=1136296&r2=1136297&view=diff
==============================================================================
--- incubator/stanbol/trunk/commons/web/ontology/src/main/java/org/apache/stanbol/ontologymanager/store/rest/resources/ParticularClassSuperClasses.java (original)
+++ incubator/stanbol/trunk/commons/web/ontology/src/main/java/org/apache/stanbol/ontologymanager/store/rest/resources/ParticularClassSuperClasses.java Thu Jun 16 06:36:58 2011
@@ -59,7 +59,7 @@ public class ParticularClassSuperClasses
}
@DELETE
- @Path("/ontologymanager/store{superClassPath:.+}/")
+ @Path("/{superClassPath:.+}/")
public Response removeSuperClass(@PathParam("ontologyPath") String ontologyPath,
@PathParam("classPath") String classPath,
@PathParam("superClassPath") String superClassPath) {
Modified: incubator/stanbol/trunk/commons/web/ontology/src/main/java/org/apache/stanbol/ontologymanager/store/rest/resources/ParticularDatatypePropertyDomains.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/commons/web/ontology/src/main/java/org/apache/stanbol/ontologymanager/store/rest/resources/ParticularDatatypePropertyDomains.java?rev=1136297&r1=1136296&r2=1136297&view=diff
==============================================================================
--- incubator/stanbol/trunk/commons/web/ontology/src/main/java/org/apache/stanbol/ontologymanager/store/rest/resources/ParticularDatatypePropertyDomains.java (original)
+++ incubator/stanbol/trunk/commons/web/ontology/src/main/java/org/apache/stanbol/ontologymanager/store/rest/resources/ParticularDatatypePropertyDomains.java Thu Jun 16 06:36:58 2011
@@ -64,7 +64,7 @@ public class ParticularDatatypePropertyD
}
@DELETE
- @Path("/ontologymanager/store{domainPath:.+}")
+ @Path("/{domainPath:.+}")
public Response deleteDomain(@PathParam("ontologyPath") String ontologyPath,
@PathParam("datatypePropertyPath") String datatypePropertyPath,
@PathParam("domainPath") String domainPath) {
Modified: incubator/stanbol/trunk/commons/web/ontology/src/main/java/org/apache/stanbol/ontologymanager/store/rest/resources/ParticularDatatypePropertyRanges.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/commons/web/ontology/src/main/java/org/apache/stanbol/ontologymanager/store/rest/resources/ParticularDatatypePropertyRanges.java?rev=1136297&r1=1136296&r2=1136297&view=diff
==============================================================================
--- incubator/stanbol/trunk/commons/web/ontology/src/main/java/org/apache/stanbol/ontologymanager/store/rest/resources/ParticularDatatypePropertyRanges.java (original)
+++ incubator/stanbol/trunk/commons/web/ontology/src/main/java/org/apache/stanbol/ontologymanager/store/rest/resources/ParticularDatatypePropertyRanges.java Thu Jun 16 06:36:58 2011
@@ -64,7 +64,7 @@ public class ParticularDatatypePropertyR
}
@DELETE
- @Path("/ontologymanager/store{rangePath:.+}")
+ @Path("/{rangePath:.+}")
public Response deleteRange(@PathParam("ontologyPath") String ontologyPath,
@PathParam("datatypePropertyPath") String datatypePropertyPath,
@PathParam("rangePath") String rangePath) {
Modified: incubator/stanbol/trunk/commons/web/ontology/src/main/java/org/apache/stanbol/ontologymanager/store/rest/resources/ParticularDatatypePropertySuperProperties.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/commons/web/ontology/src/main/java/org/apache/stanbol/ontologymanager/store/rest/resources/ParticularDatatypePropertySuperProperties.java?rev=1136297&r1=1136296&r2=1136297&view=diff
==============================================================================
--- incubator/stanbol/trunk/commons/web/ontology/src/main/java/org/apache/stanbol/ontologymanager/store/rest/resources/ParticularDatatypePropertySuperProperties.java (original)
+++ incubator/stanbol/trunk/commons/web/ontology/src/main/java/org/apache/stanbol/ontologymanager/store/rest/resources/ParticularDatatypePropertySuperProperties.java Thu Jun 16 06:36:58 2011
@@ -62,7 +62,7 @@ public class ParticularDatatypePropertyS
}
@DELETE
- @Path("/ontologymanager/store{superPropertyPath:.+}")
+ @Path("/{superPropertyPath:.+}")
public Response deleteSuperProperty(@PathParam("ontologyPath") String ontologyPath,
@PathParam("datatypePropertyPath") String datatypePropertyPath,
@PathParam("superPropertyPath") String superPropertyPath) {
Modified: incubator/stanbol/trunk/commons/web/ontology/src/main/java/org/apache/stanbol/ontologymanager/store/rest/resources/ParticularIndividualPropertyAssertions.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/commons/web/ontology/src/main/java/org/apache/stanbol/ontologymanager/store/rest/resources/ParticularIndividualPropertyAssertions.java?rev=1136297&r1=1136296&r2=1136297&view=diff
==============================================================================
--- incubator/stanbol/trunk/commons/web/ontology/src/main/java/org/apache/stanbol/ontologymanager/store/rest/resources/ParticularIndividualPropertyAssertions.java (original)
+++ incubator/stanbol/trunk/commons/web/ontology/src/main/java/org/apache/stanbol/ontologymanager/store/rest/resources/ParticularIndividualPropertyAssertions.java Thu Jun 16 06:36:58 2011
@@ -38,7 +38,7 @@ public class ParticularIndividualPropert
// FIXME Handle PS errors properly, correct return values
@POST
@Consumes(MediaType.APPLICATION_FORM_URLENCODED)
- @Path("/ontologymanager/store{propertyPath:.+}")
+ @Path("/{propertyPath:.+}")
public Response addPropertyAssertions(@PathParam("ontologyPath") String ontologyPath,
@PathParam("individualPath") String individualPath,
@PathParam("propertyPath") String propertyPath,
@@ -84,7 +84,7 @@ public class ParticularIndividualPropert
@DELETE
@Consumes(MediaType.APPLICATION_FORM_URLENCODED)
- @Path("/ontologymanager/store{propertyPath:.+}/literals/")
+ @Path("/{propertyPath:.+}/literals/")
public Response deleteDatatypePropertyAssertions(@PathParam("ontologyPath") String ontologyPath,
@PathParam("individualPath") String individualPath,
@PathParam("propertyPath") String propertyPath,
@@ -111,7 +111,7 @@ public class ParticularIndividualPropert
}
@DELETE
- @Path("/ontologymanager/store{propertyPath:.+}/objects/{value:.+}")
+ @Path("/{propertyPath:.+}/objects/{value:.+}")
public Response deleteObjectPropertyAssertions(@PathParam("ontologyPath") String ontologyPath,
@PathParam("individualPath") String individualPath,
@PathParam("propertyPath") String propertyPath,
Modified: incubator/stanbol/trunk/commons/web/ontology/src/main/java/org/apache/stanbol/ontologymanager/store/rest/resources/ParticularIndividualTypes.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/commons/web/ontology/src/main/java/org/apache/stanbol/ontologymanager/store/rest/resources/ParticularIndividualTypes.java?rev=1136297&r1=1136296&r2=1136297&view=diff
==============================================================================
--- incubator/stanbol/trunk/commons/web/ontology/src/main/java/org/apache/stanbol/ontologymanager/store/rest/resources/ParticularIndividualTypes.java (original)
+++ incubator/stanbol/trunk/commons/web/ontology/src/main/java/org/apache/stanbol/ontologymanager/store/rest/resources/ParticularIndividualTypes.java Thu Jun 16 06:36:58 2011
@@ -65,7 +65,7 @@ public class ParticularIndividualTypes e
}
@DELETE
- @Path("/ontologymanager/store{containerClassPath:.+}")
+ @Path("/{containerClassPath:.+}")
public Response addType(@PathParam("ontologyPath") String ontologyPath,
@PathParam("individualPath") String individualPath,
@PathParam("containerClassPath") String containerClassPath) {
Modified: incubator/stanbol/trunk/commons/web/ontology/src/main/java/org/apache/stanbol/ontologymanager/store/rest/resources/ParticularObjectPropertyDomains.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/commons/web/ontology/src/main/java/org/apache/stanbol/ontologymanager/store/rest/resources/ParticularObjectPropertyDomains.java?rev=1136297&r1=1136296&r2=1136297&view=diff
==============================================================================
--- incubator/stanbol/trunk/commons/web/ontology/src/main/java/org/apache/stanbol/ontologymanager/store/rest/resources/ParticularObjectPropertyDomains.java (original)
+++ incubator/stanbol/trunk/commons/web/ontology/src/main/java/org/apache/stanbol/ontologymanager/store/rest/resources/ParticularObjectPropertyDomains.java Thu Jun 16 06:36:58 2011
@@ -61,7 +61,7 @@ public class ParticularObjectPropertyDom
}
@DELETE
- @Path("/ontologymanager/store{domainPath:.+}")
+ @Path("/{domainPath:.+}")
public Response deleteDomain(@PathParam("ontologyPath") String ontologyPath,
@PathParam("objectPropertyPath") String objectPropertyPath,
@PathParam("domainPath") String domainPath) {
Modified: incubator/stanbol/trunk/commons/web/ontology/src/main/java/org/apache/stanbol/ontologymanager/store/rest/resources/ParticularObjectPropertyRanges.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/commons/web/ontology/src/main/java/org/apache/stanbol/ontologymanager/store/rest/resources/ParticularObjectPropertyRanges.java?rev=1136297&r1=1136296&r2=1136297&view=diff
==============================================================================
--- incubator/stanbol/trunk/commons/web/ontology/src/main/java/org/apache/stanbol/ontologymanager/store/rest/resources/ParticularObjectPropertyRanges.java (original)
+++ incubator/stanbol/trunk/commons/web/ontology/src/main/java/org/apache/stanbol/ontologymanager/store/rest/resources/ParticularObjectPropertyRanges.java Thu Jun 16 06:36:58 2011
@@ -61,7 +61,7 @@ public class ParticularObjectPropertyRan
}
@DELETE
- @Path("/ontologymanager/store{rangePath:.+}")
+ @Path("/{rangePath:.+}")
public Response deleteRange(@PathParam("ontologyPath") String ontologyPath,
@PathParam("objectPropertyPath") String objectPropertyPath,
@PathParam("rangePath") String rangePath) {
Modified: incubator/stanbol/trunk/commons/web/ontology/src/main/java/org/apache/stanbol/ontologymanager/store/rest/resources/ParticularObjectPropertySuperProperties.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/commons/web/ontology/src/main/java/org/apache/stanbol/ontologymanager/store/rest/resources/ParticularObjectPropertySuperProperties.java?rev=1136297&r1=1136296&r2=1136297&view=diff
==============================================================================
--- incubator/stanbol/trunk/commons/web/ontology/src/main/java/org/apache/stanbol/ontologymanager/store/rest/resources/ParticularObjectPropertySuperProperties.java (original)
+++ incubator/stanbol/trunk/commons/web/ontology/src/main/java/org/apache/stanbol/ontologymanager/store/rest/resources/ParticularObjectPropertySuperProperties.java Thu Jun 16 06:36:58 2011
@@ -62,7 +62,7 @@ public class ParticularObjectPropertySup
}
@DELETE
- @Path("/ontologymanager/store{superPropertyPath:.+}")
+ @Path("/{superPropertyPath:.+}")
public Response deleteSuperProperty(@PathParam("ontologyPath") String ontologyPath,
@PathParam("objectPropertyPath") String objectPropertyPath,
@PathParam("superPropertyPath") String superPropertyPath) {