Author: suat
Date: Tue Sep 13 08:31:59 2011
New Revision: 1170084
URL: http://svn.apache.org/viewvc?rev=1170084&view=rev
Log:
STANBOL-324:
-Removed dependencies of Ontology Manager and Ontology Manager based
functionalities from several bundles of CMS Adapter
Modified:
incubator/stanbol/trunk/cmsadapter/launchers/lite/src/main/bundles/list.xml
incubator/stanbol/trunk/cmsadapter/parent/pom.xml
incubator/stanbol/trunk/cmsadapter/pom.xml
incubator/stanbol/trunk/cmsadapter/servicesapi/pom.xml
incubator/stanbol/trunk/cmsadapter/servicesapi/src/main/java/org/apache/stanbol/cmsadapter/servicesapi/helper/OntologyResourceHelper.java
incubator/stanbol/trunk/cmsadapter/web/pom.xml
incubator/stanbol/trunk/cmsadapter/web/src/main/java/org/apache/stanbol/cmsadapter/web/resources/NotifyResource.java
incubator/stanbol/trunk/cmsadapter/web/src/main/java/org/apache/stanbol/cmsadapter/web/resources/ObjectTypesResource.java
Modified:
incubator/stanbol/trunk/cmsadapter/launchers/lite/src/main/bundles/list.xml
URL:
http://svn.apache.org/viewvc/incubator/stanbol/trunk/cmsadapter/launchers/lite/src/main/bundles/list.xml?rev=1170084&r1=1170083&r2=1170084&view=diff
==============================================================================
--- incubator/stanbol/trunk/cmsadapter/launchers/lite/src/main/bundles/list.xml
(original)
+++ incubator/stanbol/trunk/cmsadapter/launchers/lite/src/main/bundles/list.xml
Tue Sep 13 08:31:59 2011
@@ -466,47 +466,6 @@
</startLevel>
<startLevel level="22">
- <!-- Store -->
- <bundle>
- <groupId>org.apache.stanbol</groupId>
- <artifactId>org.apache.stanbol.ontologymanager.store.api
- </artifactId>
- <version>0.9.0-incubating-SNAPSHOT</version>
- </bundle>
- <bundle>
- <groupId>org.apache.stanbol</groupId>
- <artifactId>org.apache.stanbol.ontologymanager.store.web
- </artifactId>
- <version>0.9.0-incubating-SNAPSHOT</version>
- </bundle>
- <bundle>
- <groupId>org.apache.stanbol</groupId>
-
<artifactId>org.apache.stanbol.ontologymanager.store.jena
- </artifactId>
- <version>0.9.0-incubating-SNAPSHOT</version>
- </bundle>
- <bundle>
- <groupId>org.apache.stanbol</groupId>
-
<artifactId>org.apache.stanbol.ontologymanager.store.clerezza
- </artifactId>
- <version>0.9.0-incubating-SNAPSHOT</version>
- </bundle>
- <bundle>
- <groupId>org.apache.stanbol</groupId>
-
<artifactId>org.apache.stanbol.ontologymanager.store.rest.client
- </artifactId>
- <version>0.9.0-incubating-SNAPSHOT</version>
- </bundle>
- <bundle>
- <groupId>org.apache.stanbol</groupId>
- <artifactId>org.apache.stanbol.owl</artifactId>
- <version>0.9.0-incubating-SNAPSHOT</version>
- </bundle>
- <bundle>
- <groupId>org.apache.stanbol</groupId>
-
<artifactId>org.apache.stanbol.reasoners.owllink</artifactId>
- <version>0.9.0-incubating-SNAPSHOT</version>
- </bundle>
<!-- CMS Adapter -->
<bundle>
<groupId>org.apache.stanbol</groupId>
Modified: incubator/stanbol/trunk/cmsadapter/parent/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/stanbol/trunk/cmsadapter/parent/pom.xml?rev=1170084&r1=1170083&r2=1170084&view=diff
==============================================================================
--- incubator/stanbol/trunk/cmsadapter/parent/pom.xml (original)
+++ incubator/stanbol/trunk/cmsadapter/parent/pom.xml Tue Sep 13 08:31:59 2011
@@ -36,20 +36,6 @@
<dependencyManagement>
<dependencies>
- <!-- Ontology manager store -->
- <dependency>
- <groupId>org.apache.stanbol</groupId>
-
<artifactId>org.apache.stanbol.ontologymanager.store.rest.client</artifactId>
- <version>0.9.0-incubating-SNAPSHOT</version>
- <scope>compile</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.stanbol</groupId>
-
<artifactId>org.apache.stanbol.ontologymanager.store.api</artifactId>
- <version>0.9.0-incubating-SNAPSHOT</version>
- <scope>provided</scope>
- </dependency>
-
<!-- CMS Adapter -->
<dependency>
<groupId>org.apache.stanbol</groupId>
Modified: incubator/stanbol/trunk/cmsadapter/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/stanbol/trunk/cmsadapter/pom.xml?rev=1170084&r1=1170083&r2=1170084&view=diff
==============================================================================
--- incubator/stanbol/trunk/cmsadapter/pom.xml (original)
+++ incubator/stanbol/trunk/cmsadapter/pom.xml Tue Sep 13 08:31:59 2011
@@ -35,7 +35,7 @@
<module>cmis</module>
<module>web</module>
<module>rest-client</module>
- <module>launchers/lite</module>
+ <!--<module>launchers/lite</module>-->
</modules>
</project>
Modified: incubator/stanbol/trunk/cmsadapter/servicesapi/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/stanbol/trunk/cmsadapter/servicesapi/pom.xml?rev=1170084&r1=1170083&r2=1170084&view=diff
==============================================================================
--- incubator/stanbol/trunk/cmsadapter/servicesapi/pom.xml (original)
+++ incubator/stanbol/trunk/cmsadapter/servicesapi/pom.xml Tue Sep 13 08:31:59
2011
@@ -48,14 +48,6 @@
<dependencies>
<dependency>
- <groupId>org.apache.stanbol</groupId>
-
<artifactId>org.apache.stanbol.ontologymanager.store.api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.stanbol</groupId>
-
<artifactId>org.apache.stanbol.ontologymanager.store.rest.client</artifactId>
- </dependency>
- <dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
</dependency>
Modified:
incubator/stanbol/trunk/cmsadapter/servicesapi/src/main/java/org/apache/stanbol/cmsadapter/servicesapi/helper/OntologyResourceHelper.java
URL:
http://svn.apache.org/viewvc/incubator/stanbol/trunk/cmsadapter/servicesapi/src/main/java/org/apache/stanbol/cmsadapter/servicesapi/helper/OntologyResourceHelper.java?rev=1170084&r1=1170083&r2=1170084&view=diff
==============================================================================
---
incubator/stanbol/trunk/cmsadapter/servicesapi/src/main/java/org/apache/stanbol/cmsadapter/servicesapi/helper/OntologyResourceHelper.java
(original)
+++
incubator/stanbol/trunk/cmsadapter/servicesapi/src/main/java/org/apache/stanbol/cmsadapter/servicesapi/helper/OntologyResourceHelper.java
Tue Sep 13 08:31:59 2011
@@ -16,9 +16,6 @@
*/
package org.apache.stanbol.cmsadapter.servicesapi.helper;
-import java.io.ByteArrayInputStream;
-import java.io.InputStream;
-import java.io.UnsupportedEncodingException;
import java.util.ArrayList;
import java.util.List;
@@ -32,9 +29,6 @@ import org.apache.stanbol.cmsadapter.ser
import org.apache.stanbol.cmsadapter.servicesapi.model.web.PropType;
import org.apache.stanbol.cmsadapter.servicesapi.model.web.PropertyDefinition;
import
org.apache.stanbol.cmsadapter.servicesapi.repository.RepositoryAccessException;
-import org.apache.stanbol.ontologymanager.store.model.OntologyMetaInformation;
-import org.apache.stanbol.ontologymanager.store.rest.client.RestClient;
-import
org.apache.stanbol.ontologymanager.store.rest.client.RestClientException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -45,11 +39,9 @@ import com.hp.hpl.jena.ontology.Individu
import com.hp.hpl.jena.ontology.ObjectProperty;
import com.hp.hpl.jena.ontology.OntClass;
import com.hp.hpl.jena.ontology.OntModel;
-import com.hp.hpl.jena.ontology.OntModelSpec;
import com.hp.hpl.jena.ontology.OntProperty;
import com.hp.hpl.jena.ontology.OntResource;
import com.hp.hpl.jena.ontology.UnionClass;
-import com.hp.hpl.jena.rdf.model.ModelFactory;
import com.hp.hpl.jena.rdf.model.RDFList;
import com.hp.hpl.jena.rdf.model.RDFNode;
import com.hp.hpl.jena.rdf.model.ResIterator;
@@ -734,44 +726,6 @@ public class OntologyResourceHelper {
}
/**
- * Creates an OWL_DL compatible {@link OntModel}. Retrieves the ontology
through {@link RestClient} of
- * <b>Store</b> and reads its content from the created OntModel.
- *
- * @param storeClient
- * REST client of Store component
- * @param ontologyURI
- * URI of the ontology
- * @param ontologyHref
- * corresponding path of ontology in Store component
- * @return {@link OntModel} of retrieved ontology
- * @throws RestClientException
- * @throws UnsupportedEncodingException
- */
- public static OntModel getOntModel(RestClient storeClient, String
ontologyURI, String ontologyHref) throws RestClientException,
-
UnsupportedEncodingException {
- OntModel ontModel =
ModelFactory.createOntologyModel(OntModelSpec.OWL_DL_MEM);
- String ontContent = storeClient.retrieveOntology(ontologyHref,
"RDF/XML", false);
- InputStream is = new
ByteArrayInputStream(ontContent.getBytes("UTF-8"));
- ontModel.read(is, ontologyURI, "RDF/XML");
- return ontModel;
- }
-
- public static OntModel createOntModel(RestClient storeClient, String
ontologyURI, String ontologyHref) throws UnsupportedEncodingException,
-
RestClientException {
- OntologyMetaInformation omi = null;
- try {
- omi = storeClient.retrieveOntologyMetaInformation(ontologyHref);
- } catch (RestClientException e) {
- log.warn(e.getMessage());
- }
- if (omi == null) {
- return ModelFactory.createOntologyModel(OntModelSpec.OWL_DL_MEM);
- } else {
- return getOntModel(storeClient, ontologyURI, ontologyHref);
- }
- }
-
- /**
* Adds '#' character to at the end of the specified URI if there is not
any.
*/
public static final String addResourceDelimiter(String URI) {
Modified: incubator/stanbol/trunk/cmsadapter/web/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/stanbol/trunk/cmsadapter/web/pom.xml?rev=1170084&r1=1170083&r2=1170084&view=diff
==============================================================================
--- incubator/stanbol/trunk/cmsadapter/web/pom.xml (original)
+++ incubator/stanbol/trunk/cmsadapter/web/pom.xml Tue Sep 13 08:31:59 2011
@@ -52,14 +52,6 @@
</dependency>
<dependency>
<groupId>org.apache.stanbol</groupId>
-
<artifactId>org.apache.stanbol.ontologymanager.store.rest.client</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.stanbol</groupId>
-
<artifactId>org.apache.stanbol.ontologymanager.store.api</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.cmsadapter.servicesapi</artifactId>
</dependency>
<dependency>
Modified:
incubator/stanbol/trunk/cmsadapter/web/src/main/java/org/apache/stanbol/cmsadapter/web/resources/NotifyResource.java
URL:
http://svn.apache.org/viewvc/incubator/stanbol/trunk/cmsadapter/web/src/main/java/org/apache/stanbol/cmsadapter/web/resources/NotifyResource.java?rev=1170084&r1=1170083&r2=1170084&view=diff
==============================================================================
---
incubator/stanbol/trunk/cmsadapter/web/src/main/java/org/apache/stanbol/cmsadapter/web/resources/NotifyResource.java
(original)
+++
incubator/stanbol/trunk/cmsadapter/web/src/main/java/org/apache/stanbol/cmsadapter/web/resources/NotifyResource.java
Tue Sep 13 08:31:59 2011
@@ -16,7 +16,6 @@
*/
package org.apache.stanbol.cmsadapter.web.resources;
-import java.io.UnsupportedEncodingException;
import java.util.Hashtable;
import java.util.List;
@@ -32,8 +31,9 @@ import javax.ws.rs.QueryParam;
import javax.ws.rs.WebApplicationException;
import javax.ws.rs.core.Context;
import javax.ws.rs.core.Response;
-import javax.ws.rs.core.Response.Status;
+import org.apache.clerezza.rdf.core.access.TcManager;
+import org.apache.stanbol.cmsadapter.core.helper.TcManagerClient;
import org.apache.stanbol.cmsadapter.core.mapping.MappingConfigurationImpl;
import org.apache.stanbol.cmsadapter.servicesapi.helper.OntologyResourceHelper;
import org.apache.stanbol.cmsadapter.servicesapi.mapping.MappingConfiguration;
@@ -41,11 +41,8 @@ import org.apache.stanbol.cmsadapter.ser
import org.apache.stanbol.cmsadapter.servicesapi.model.web.CMSObject;
import org.apache.stanbol.cmsadapter.servicesapi.model.web.CMSObjects;
import
org.apache.stanbol.cmsadapter.servicesapi.model.web.decorated.AdapterMode;
-import org.apache.stanbol.cmsadapter.web.utils.RestURIHelper;
import org.apache.stanbol.commons.web.base.ContextHelper;
import org.apache.stanbol.commons.web.base.resource.BaseStanbolResource;
-import org.apache.stanbol.ontologymanager.store.rest.client.RestClient;
-import
org.apache.stanbol.ontologymanager.store.rest.client.RestClientException;
import org.osgi.framework.BundleContext;
import org.osgi.framework.InvalidSyntaxException;
import org.osgi.framework.ServiceReference;
@@ -55,16 +52,18 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import com.hp.hpl.jena.ontology.OntModel;
+import com.hp.hpl.jena.ontology.OntModelSpec;
+import com.hp.hpl.jena.rdf.model.ModelFactory;
@Path("/cmsadapter/{ontologyURI:.+}/notify")
public class NotifyResource extends BaseStanbolResource {
private static final Logger logger =
LoggerFactory.getLogger(NotifyResource.class);
private MappingEngine engine;
- private RestClient storeClient;
+
+ private TcManager tcManager;
public NotifyResource(@Context ServletContext context) {
- this.storeClient =
ContextHelper.getServiceFromContext(RestClient.class, context);
try {
BundleContext bundleContext = (BundleContext)
context.getAttribute(BundleContext.class.getName());
ServiceReference serviceReference =
bundleContext.getServiceReferences(null,
@@ -73,6 +72,7 @@ public class NotifyResource extends Base
ComponentInstance componentInstance = componentFactory
.newInstance(new Hashtable<Object,Object>());
this.engine = (MappingEngine) componentInstance.getInstance();
+ this.tcManager = (TcManager)
ContextHelper.getServiceFromContext(TcManager.class, context);
} catch (InvalidSyntaxException e) {
logger.warn("Mapping engine instance could not be instantiated",
e);
@@ -88,28 +88,19 @@ public class NotifyResource extends Base
@DefaultValue("true")
@QueryParam("considerBridges") boolean considerBridges) {
List<CMSObject> createdObjectList =
cmsObjects.getClassificationObjectOrContentObject();
- OntModel model;
- try {
- model = OntologyResourceHelper.createOntModel(storeClient,
ontologyURI,
- RestURIHelper.getOntologyHref(ontologyURI));
- MappingConfiguration conf = new MappingConfigurationImpl();
- conf.setOntModel(model);
- conf.setOntologyURI(ontologyURI);
- conf.setObjects((List<Object>) (List<?>) createdObjectList);
- conf.setAdapterMode(adapterMode);
- if (considerBridges) {
-
conf.setBridgeDefinitions(OntologyResourceHelper.getBridgeDefinitions(model));
- }
- engine.createModel(conf);
- return Response.ok().build();
-
- } catch (UnsupportedEncodingException e) {
- logger.warn("Ontology content could not be transformed to bytes",
e);
- } catch (RestClientException e) {
- logger.warn("Error occured while interacting with store", e);
- logger.warn("Message: " + e.getMessage());
+ TcManagerClient tcManagerClient = new TcManagerClient(tcManager);
+ OntModel model =
ModelFactory.createOntologyModel(OntModelSpec.OWL_DL_MEM,
+ tcManagerClient.getModel(ontologyURI));
+ MappingConfiguration conf = new MappingConfigurationImpl();
+ conf.setOntModel(model);
+ conf.setOntologyURI(ontologyURI);
+ conf.setObjects((List<Object>) (List<?>) createdObjectList);
+ conf.setAdapterMode(adapterMode);
+ if (considerBridges) {
+
conf.setBridgeDefinitions(OntologyResourceHelper.getBridgeDefinitions(model));
}
- return Response.status(Status.INTERNAL_SERVER_ERROR).build();
+ engine.createModel(conf);
+ return Response.ok().build();
}
/**
@@ -127,28 +118,19 @@ public class NotifyResource extends Base
@QueryParam("adapterMode") AdapterMode
adapterMode,
@QueryParam("considerBridges")
@DefaultValue("true") Boolean considerBridges) {
List<CMSObject> updatedObjectList =
cmsObjects.getClassificationObjectOrContentObject();
- OntModel model;
- try {
- model = OntologyResourceHelper.getOntModel(storeClient,
ontologyURI,
- RestURIHelper.getOntologyHref(ontologyURI));
- MappingConfiguration conf = new MappingConfigurationImpl();
- conf.setOntModel(model);
- conf.setOntologyURI(ontologyURI);
- conf.setObjects((List<Object>) (List<?>) updatedObjectList);
- conf.setAdapterMode(adapterMode);
- if (considerBridges) {
-
conf.setBridgeDefinitions(OntologyResourceHelper.getBridgeDefinitions(model));
- }
- engine.updateModel(conf);
- return Response.ok().build();
-
- } catch (UnsupportedEncodingException e) {
- logger.warn("Ontology content could not be transformed to bytes",
e);
- } catch (RestClientException e) {
- logger.warn("Error occured while interacting with store", e);
- logger.warn("Message: " + e.getMessage());
+ TcManagerClient tcManagerClient = new TcManagerClient(tcManager);
+ OntModel model =
ModelFactory.createOntologyModel(OntModelSpec.OWL_DL_MEM,
+ tcManagerClient.getModel(ontologyURI));
+ MappingConfiguration conf = new MappingConfigurationImpl();
+ conf.setOntModel(model);
+ conf.setOntologyURI(ontologyURI);
+ conf.setObjects((List<Object>) (List<?>) updatedObjectList);
+ conf.setAdapterMode(adapterMode);
+ if (considerBridges) {
+
conf.setBridgeDefinitions(OntologyResourceHelper.getBridgeDefinitions(model));
}
- return Response.status(Status.INTERNAL_SERVER_ERROR).build();
+ engine.updateModel(conf);
+ return Response.ok().build();
}
/**
@@ -164,27 +146,19 @@ public class NotifyResource extends Base
@FormParam("deletedObjects") CMSObjects
cmsObjects,
@QueryParam("considerBridges")
@DefaultValue("true") Boolean considerBridges) {
List<CMSObject> deletedObjectList =
cmsObjects.getClassificationObjectOrContentObject();
- OntModel model;
- try {
- model = OntologyResourceHelper.getOntModel(storeClient,
ontologyURI,
- RestURIHelper.getOntologyHref(ontologyURI));
- MappingConfiguration conf = new MappingConfigurationImpl();
- conf.setOntModel(model);
- conf.setOntologyURI(ontologyURI);
- conf.setObjects((List<Object>) (List<?>) deletedObjectList);
- conf.setAdapterMode(AdapterMode.STRICT_OFFLINE);
- if (considerBridges) {
-
conf.setBridgeDefinitions(OntologyResourceHelper.getBridgeDefinitions(model));
- }
- engine.deleteModel(conf);
- return Response.ok().build();
-
- } catch (UnsupportedEncodingException e) {
- logger.warn("Ontology content could not be transformed to bytes",
e);
- } catch (RestClientException e) {
- logger.warn("Error occured while interacting with store", e);
- logger.warn("Message: " + e.getMessage());
+ TcManagerClient tcManagerClient = new TcManagerClient(tcManager);
+ OntModel model =
ModelFactory.createOntologyModel(OntModelSpec.OWL_DL_MEM,
+ tcManagerClient.getModel(ontologyURI));
+ MappingConfiguration conf = new MappingConfigurationImpl();
+ conf.setOntModel(model);
+ conf.setOntologyURI(ontologyURI);
+ conf.setObjects((List<Object>) (List<?>) deletedObjectList);
+ conf.setAdapterMode(AdapterMode.STRICT_OFFLINE);
+
+ if (considerBridges) {
+
conf.setBridgeDefinitions(OntologyResourceHelper.getBridgeDefinitions(model));
}
- return Response.status(Status.INTERNAL_SERVER_ERROR).build();
+ engine.deleteModel(conf);
+ return Response.ok().build();
}
}
Modified:
incubator/stanbol/trunk/cmsadapter/web/src/main/java/org/apache/stanbol/cmsadapter/web/resources/ObjectTypesResource.java
URL:
http://svn.apache.org/viewvc/incubator/stanbol/trunk/cmsadapter/web/src/main/java/org/apache/stanbol/cmsadapter/web/resources/ObjectTypesResource.java?rev=1170084&r1=1170083&r2=1170084&view=diff
==============================================================================
---
incubator/stanbol/trunk/cmsadapter/web/src/main/java/org/apache/stanbol/cmsadapter/web/resources/ObjectTypesResource.java
(original)
+++
incubator/stanbol/trunk/cmsadapter/web/src/main/java/org/apache/stanbol/cmsadapter/web/resources/ObjectTypesResource.java
Tue Sep 13 08:31:59 2011
@@ -16,7 +16,6 @@
*/
package org.apache.stanbol.cmsadapter.web.resources;
-import java.io.UnsupportedEncodingException;
import java.util.Hashtable;
import java.util.List;
@@ -30,20 +29,17 @@ import javax.ws.rs.PathParam;
import javax.ws.rs.WebApplicationException;
import javax.ws.rs.core.Context;
import javax.ws.rs.core.Response;
-import javax.ws.rs.core.Response.Status;
+import org.apache.clerezza.rdf.core.access.TcManager;
+import org.apache.stanbol.cmsadapter.core.helper.TcManagerClient;
import org.apache.stanbol.cmsadapter.core.mapping.MappingConfigurationImpl;
-import org.apache.stanbol.cmsadapter.servicesapi.helper.OntologyResourceHelper;
import org.apache.stanbol.cmsadapter.servicesapi.mapping.MappingConfiguration;
import org.apache.stanbol.cmsadapter.servicesapi.mapping.MappingEngine;
import
org.apache.stanbol.cmsadapter.servicesapi.model.web.ObjectTypeDefinition;
import
org.apache.stanbol.cmsadapter.servicesapi.model.web.ObjectTypeDefinitions;
import
org.apache.stanbol.cmsadapter.servicesapi.model.web.decorated.AdapterMode;
-import org.apache.stanbol.cmsadapter.web.utils.RestURIHelper;
import org.apache.stanbol.commons.web.base.ContextHelper;
import org.apache.stanbol.commons.web.base.resource.BaseStanbolResource;
-import org.apache.stanbol.ontologymanager.store.rest.client.RestClient;
-import
org.apache.stanbol.ontologymanager.store.rest.client.RestClientException;
import org.osgi.framework.BundleContext;
import org.osgi.framework.InvalidSyntaxException;
import org.osgi.framework.ServiceReference;
@@ -53,16 +49,18 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import com.hp.hpl.jena.ontology.OntModel;
+import com.hp.hpl.jena.ontology.OntModelSpec;
+import com.hp.hpl.jena.rdf.model.ModelFactory;
@Path("/cmsadapter/{ontologyURI:.+}/objectTypes")
public class ObjectTypesResource extends BaseStanbolResource {
private static final Logger logger =
LoggerFactory.getLogger(ObjectTypesResource.class);
private MappingEngine engine;
- private RestClient psi;
+
+ private TcManager tcManager;
public ObjectTypesResource(@Context ServletContext context) {
- this.psi = ContextHelper.getServiceFromContext(RestClient.class,
context);
try {
BundleContext bundleContext = (BundleContext)
context.getAttribute(BundleContext.class.getName());
ServiceReference serviceReference =
bundleContext.getServiceReferences(null,
@@ -71,6 +69,7 @@ public class ObjectTypesResource extends
ComponentInstance componentInstance = componentFactory
.newInstance(new Hashtable<Object,Object>());
this.engine = (MappingEngine) componentInstance.getInstance();
+ this.tcManager = (TcManager)
ContextHelper.getServiceFromContext(TcManager.class, context);
} catch (InvalidSyntaxException e) {
logger.warn("Mapping engine instance could not be instantiated",
e);
@@ -84,24 +83,17 @@ public class ObjectTypesResource extends
@FormParam("objectTypeDefinitions")
ObjectTypeDefinitions objectTypeDefinitions) {
List<ObjectTypeDefinition> createdObjectList =
objectTypeDefinitions.getObjectTypeDefinition();
- OntModel model;
- try {
- model = OntologyResourceHelper.createOntModel(psi, ontologyURI,
- RestURIHelper.getOntologyHref(ontologyURI));
- MappingConfiguration conf = new MappingConfigurationImpl();
- conf.setOntModel(model);
- conf.setOntologyURI(ontologyURI);
- conf.setObjects((List<Object>) (List<?>) createdObjectList);
- conf.setAdapterMode(AdapterMode.STRICT_OFFLINE);
- engine.createModel(conf);
- return Response.ok().build();
-
- } catch (UnsupportedEncodingException e) {
- logger.warn("Ontology content could not be transformed to bytes",
e);
- } catch (RestClientException e) {
- logger.warn("Error occured while interacting with store", e);
- }
- return Response.status(Status.INTERNAL_SERVER_ERROR).build();
+
+ TcManagerClient tcManagerClient = new TcManagerClient(tcManager);
+ OntModel model =
ModelFactory.createOntologyModel(OntModelSpec.OWL_DL_MEM,
+ tcManagerClient.getModel(ontologyURI));
+ MappingConfiguration conf = new MappingConfigurationImpl();
+ conf.setOntModel(model);
+ conf.setOntologyURI(ontologyURI);
+ conf.setObjects((List<Object>) (List<?>) createdObjectList);
+ conf.setAdapterMode(AdapterMode.STRICT_OFFLINE);
+ engine.createModel(conf);
+ return Response.ok().build();
}
@SuppressWarnings("unchecked")
@@ -110,24 +102,16 @@ public class ObjectTypesResource extends
@FormParam("objectTypeDefinitions") ObjectTypeDefinitions
objectTypeDefinitions) {
List<ObjectTypeDefinition> createdObjectList =
objectTypeDefinitions.getObjectTypeDefinition();
- OntModel model;
- try {
- model = OntologyResourceHelper.getOntModel(psi, ontologyURI,
- RestURIHelper.getOntologyHref(ontologyURI));
- MappingConfiguration conf = new MappingConfigurationImpl();
- conf.setOntModel(model);
- conf.setOntologyURI(ontologyURI);
- conf.setObjects((List<Object>) (List<?>) createdObjectList);
- conf.setAdapterMode(AdapterMode.STRICT_OFFLINE);
- engine.updateModel(conf);
- return Response.ok().build();
-
- } catch (UnsupportedEncodingException e) {
- logger.warn("Ontology content could not be transformed to bytes",
e);
- } catch (RestClientException e) {
- logger.warn("Error occured while interacting with store", e);
- }
- return Response.status(Status.INTERNAL_SERVER_ERROR).build();
+ TcManagerClient tcManagerClient = new TcManagerClient(tcManager);
+ OntModel model =
ModelFactory.createOntologyModel(OntModelSpec.OWL_DL_MEM,
+ tcManagerClient.getModel(ontologyURI));
+ MappingConfiguration conf = new MappingConfigurationImpl();
+ conf.setOntModel(model);
+ conf.setOntologyURI(ontologyURI);
+ conf.setObjects((List<Object>) (List<?>) createdObjectList);
+ conf.setAdapterMode(AdapterMode.STRICT_OFFLINE);
+ engine.updateModel(conf);
+ return Response.ok().build();
}
@SuppressWarnings("unchecked")
@@ -136,23 +120,15 @@ public class ObjectTypesResource extends
@FormParam("objectTypeDefinitions") ObjectTypeDefinitions
objectTypeDefinitions) {
List<ObjectTypeDefinition> createdObjectList =
objectTypeDefinitions.getObjectTypeDefinition();
- OntModel model;
- try {
- model = OntologyResourceHelper.getOntModel(psi, ontologyURI,
- RestURIHelper.getOntologyHref(ontologyURI));
- MappingConfiguration conf = new MappingConfigurationImpl();
- conf.setOntModel(model);
- conf.setOntologyURI(ontologyURI);
- conf.setObjects((List<Object>) (List<?>) createdObjectList);
- conf.setAdapterMode(AdapterMode.STRICT_OFFLINE);
- engine.deleteModel(conf);
- return Response.ok().build();
-
- } catch (UnsupportedEncodingException e) {
- logger.warn("Ontology content could not be transformed to bytes",
e);
- } catch (RestClientException e) {
- logger.warn("Error occured while interacting with store", e);
- }
- return Response.status(Status.INTERNAL_SERVER_ERROR).build();
+ TcManagerClient tcManagerClient = new TcManagerClient(tcManager);
+ OntModel model =
ModelFactory.createOntologyModel(OntModelSpec.OWL_DL_MEM,
+ tcManagerClient.getModel(ontologyURI));
+ MappingConfiguration conf = new MappingConfigurationImpl();
+ conf.setOntModel(model);
+ conf.setOntologyURI(ontologyURI);
+ conf.setObjects((List<Object>) (List<?>) createdObjectList);
+ conf.setAdapterMode(AdapterMode.STRICT_OFFLINE);
+ engine.deleteModel(conf);
+ return Response.ok().build();
}
}
