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 2011/03/19 17:55:27 UTC
svn commit: r1083230 [1/3] - in /incubator/stanbol/trunk/kres:
eu.iksproject.kres.jersey/
eu.iksproject.kres.jersey/src/main/java/eu/iksproject/kres/jersey/
eu.iksproject.kres.jersey/src/main/java/eu/iksproject/kres/jersey/manager/
eu.iksproject.kres.j...
Author: alexdma
Date: Sat Mar 19 16:55:26 2011
New Revision: 1083230
URL: http://svn.apache.org/viewvc?rev=1083230&view=rev
Log:
STANBOL-116 STANBOL-39 :
- org.apache.stanbol.ontologymanager.store is no longer a dependency
- Replaced OntologyStore interface with its Clerezza implementation
- OntologyStore class is no longer a service component
- Duplicated OntologyStore as internal classes of ontologymanager/ontonet and reengineer/base (further decoupling will be required to solve the issue)
- Refactored SemionManager and ONManager constructors to accept TcManager and WeightedTcProvider in their signatures instead of OntologyStore
- Refactored jersey module accordingly
- Unit tests now instantiate TcManager (with a JenaSparqlEngine binding) and SimpleTcProviders where needed, null values otherwise.
Added:
incubator/stanbol/trunk/kres/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/impl/ontology/NoSuchStoreException.java
- copied, changed from r1083178, incubator/stanbol/trunk/kres/ontologymanager/store/src/main/java/org/apache/stanbol/ontologymanager/store/api/NoSuchStoreException.java
incubator/stanbol/trunk/kres/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/impl/ontology/OntologyStorage.java
- copied, changed from r1083178, incubator/stanbol/trunk/kres/ontologymanager/store/src/main/java/org/apache/stanbol/ontologymanager/store/impl/ClerezzaStorage.java
incubator/stanbol/trunk/kres/reengineer/base/src/main/java/org/apache/stanbol/reengineer/base/impl/
- copied from r1083178, incubator/stanbol/trunk/kres/reengineer/base/src/main/java/org/apache/stanbol/reengineer/base/api/impl/
incubator/stanbol/trunk/kres/reengineer/base/src/main/java/org/apache/stanbol/reengineer/base/impl/NoSuchOntologyInStoreException.java
incubator/stanbol/trunk/kres/reengineer/base/src/main/java/org/apache/stanbol/reengineer/base/impl/OntologyStorage.java
Removed:
incubator/stanbol/trunk/kres/reengineer/base/src/main/java/org/apache/stanbol/reengineer/base/api/impl/
Modified:
incubator/stanbol/trunk/kres/eu.iksproject.kres.jersey/pom.xml
incubator/stanbol/trunk/kres/eu.iksproject.kres.jersey/src/main/java/eu/iksproject/kres/jersey/JerseyEndpoint.java
incubator/stanbol/trunk/kres/eu.iksproject.kres.jersey/src/main/java/eu/iksproject/kres/jersey/manager/Recipe.java
incubator/stanbol/trunk/kres/eu.iksproject.kres.jersey/src/main/java/eu/iksproject/kres/jersey/manager/Rule.java
incubator/stanbol/trunk/kres/eu.iksproject.kres.jersey/src/main/java/eu/iksproject/kres/jersey/reasoners/Classify.java
incubator/stanbol/trunk/kres/eu.iksproject.kres.jersey/src/main/java/eu/iksproject/kres/jersey/reasoners/ConsistencyCheck.java
incubator/stanbol/trunk/kres/eu.iksproject.kres.jersey/src/main/java/eu/iksproject/kres/jersey/reasoners/Enrichment.java
incubator/stanbol/trunk/kres/eu.iksproject.kres.jersey/src/main/java/eu/iksproject/kres/jersey/resource/GraphsResource.java
incubator/stanbol/trunk/kres/eu.iksproject.kres.jersey/src/main/java/eu/iksproject/kres/jersey/resource/ONMOntResource.java
incubator/stanbol/trunk/kres/eu.iksproject.kres.jersey/src/main/java/eu/iksproject/kres/jersey/resource/ONMRootResource.java
incubator/stanbol/trunk/kres/eu.iksproject.kres.jersey/src/main/java/eu/iksproject/kres/jersey/resource/ONMScopeOntologyResource.java
incubator/stanbol/trunk/kres/eu.iksproject.kres.jersey/src/main/java/eu/iksproject/kres/jersey/resource/ONMScopeResource.java
incubator/stanbol/trunk/kres/eu.iksproject.kres.jersey/src/main/java/eu/iksproject/kres/jersey/resource/OntologyStorageResource.java
incubator/stanbol/trunk/kres/eu.iksproject.kres.jersey/src/main/java/eu/iksproject/kres/jersey/resource/SemionReengineerResource.java
incubator/stanbol/trunk/kres/ontologymanager/ontonet/pom.xml
incubator/stanbol/trunk/kres/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/KReSONManager.java
incubator/stanbol/trunk/kres/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/impl/ONManager.java
incubator/stanbol/trunk/kres/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/impl/ontology/AbstractOntologySpaceImpl.java
incubator/stanbol/trunk/kres/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/impl/ontology/CoreOntologySpaceImpl.java
incubator/stanbol/trunk/kres/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/impl/ontology/CustomOntologySpaceImpl.java
incubator/stanbol/trunk/kres/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/impl/ontology/OntologySpaceFactoryImpl.java
incubator/stanbol/trunk/kres/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/impl/ontology/SessionOntologySpaceImpl.java
incubator/stanbol/trunk/kres/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/impl/session/KReSSessionManagerImpl.java
incubator/stanbol/trunk/kres/ontologymanager/ontonet/src/test/java/org/apache/stanbol/ontologymanager/ontonet/Namespace.java
incubator/stanbol/trunk/kres/ontologymanager/ontonet/src/test/java/org/apache/stanbol/ontologymanager/ontonet/ontology/TestIndexing.java
incubator/stanbol/trunk/kres/ontologymanager/ontonet/src/test/java/org/apache/stanbol/ontologymanager/ontonet/ontology/TestOntologyScope.java
incubator/stanbol/trunk/kres/ontologymanager/ontonet/src/test/java/org/apache/stanbol/ontologymanager/ontonet/ontology/TestOntologySpaces.java
incubator/stanbol/trunk/kres/ontologymanager/ontonet/src/test/java/org/apache/stanbol/ontologymanager/ontonet/registry/TestRegistry.java
incubator/stanbol/trunk/kres/ontologymanager/ontonet/src/test/java/org/apache/stanbol/ontologymanager/ontonet/session/TestSessions.java
incubator/stanbol/trunk/kres/reengineer/base/src/main/java/org/apache/stanbol/reengineer/base/api/SemionManager.java
incubator/stanbol/trunk/kres/reengineer/base/src/main/java/org/apache/stanbol/reengineer/base/impl/SemionManagerImpl.java
incubator/stanbol/trunk/kres/reengineer/base/src/test/java/org/apache/stanbol/rengineer/base/SemionManagerTest.java
incubator/stanbol/trunk/kres/reengineer/db/pom.xml
incubator/stanbol/trunk/kres/reengineer/db/src/test/java/org/apache/stanbol/reengineer/db/DBExtractorTest.java
incubator/stanbol/trunk/kres/reengineer/xml/pom.xml
incubator/stanbol/trunk/kres/reengineer/xml/src/test/java/org/apache/stanbol/reengineer/xml/XMLReengineerTest.java
incubator/stanbol/trunk/kres/rules/manager/src/test/java/org/apache/stanbol/rules/manager/KReSAddRecipeTest.java
incubator/stanbol/trunk/kres/rules/manager/src/test/java/org/apache/stanbol/rules/manager/KReSAddRuleTest.java
incubator/stanbol/trunk/kres/rules/manager/src/test/java/org/apache/stanbol/rules/manager/KReSGetRecipeTest.java
incubator/stanbol/trunk/kres/rules/manager/src/test/java/org/apache/stanbol/rules/manager/KReSGetRuleTest.java
incubator/stanbol/trunk/kres/rules/manager/src/test/java/org/apache/stanbol/rules/manager/KReSLoadRuleFileTest.java
incubator/stanbol/trunk/kres/rules/manager/src/test/java/org/apache/stanbol/rules/manager/KReSRemoveRecipeTest.java
incubator/stanbol/trunk/kres/rules/manager/src/test/java/org/apache/stanbol/rules/manager/KReSRemoveRuleTest.java
incubator/stanbol/trunk/kres/rules/manager/src/test/java/org/apache/stanbol/rules/manager/KReSRuleStoreTest.java
incubator/stanbol/trunk/kres/rules/refactor/pom.xml
incubator/stanbol/trunk/kres/rules/refactor/src/main/java/org/apache/stanbol/rules/refactor/impl/SemionRefactorerImpl.java
incubator/stanbol/trunk/kres/rules/refactor/src/test/java/org/apache/stanbol/rules/refactor/SemionRefactoringTest.java
Modified: incubator/stanbol/trunk/kres/eu.iksproject.kres.jersey/pom.xml
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/eu.iksproject.kres.jersey/pom.xml?rev=1083230&r1=1083229&r2=1083230&view=diff
==============================================================================
--- incubator/stanbol/trunk/kres/eu.iksproject.kres.jersey/pom.xml (original)
+++ incubator/stanbol/trunk/kres/eu.iksproject.kres.jersey/pom.xml Sat Mar 19 16:55:26 2011
@@ -210,11 +210,13 @@
<artifactId>org.apache.stanbol.ontologymanager.ontonet</artifactId>
<version>${stanbol-version}</version>
</dependency>
+ <!--
<dependency>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.ontologymanager.store</artifactId>
<version>${stanbol-version}</version>
</dependency>
+ -->
<dependency>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.reasoners.base</artifactId>
Modified: incubator/stanbol/trunk/kres/eu.iksproject.kres.jersey/src/main/java/eu/iksproject/kres/jersey/JerseyEndpoint.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/eu.iksproject.kres.jersey/src/main/java/eu/iksproject/kres/jersey/JerseyEndpoint.java?rev=1083230&r1=1083229&r2=1083230&view=diff
==============================================================================
--- incubator/stanbol/trunk/kres/eu.iksproject.kres.jersey/src/main/java/eu/iksproject/kres/jersey/JerseyEndpoint.java (original)
+++ incubator/stanbol/trunk/kres/eu.iksproject.kres.jersey/src/main/java/eu/iksproject/kres/jersey/JerseyEndpoint.java Sat Mar 19 16:55:26 2011
@@ -13,7 +13,6 @@ import org.apache.felix.scr.annotations.
import org.apache.felix.scr.annotations.Property;
import org.apache.felix.scr.annotations.Reference;
import org.apache.stanbol.ontologymanager.ontonet.api.KReSONManager;
-import org.apache.stanbol.ontologymanager.store.api.OntologyStoreProvider;
import org.apache.stanbol.reengineer.base.api.SemionManager;
import org.apache.stanbol.reengineer.base.api.SemionReengineer;
import org.apache.stanbol.rules.base.api.RuleStore;
@@ -76,8 +75,11 @@ public class JerseyEndpoint {
// @Reference
// LinkDiscovery linkDiscovery;
- @Reference
- OntologyStoreProvider ontologyStoreProvider;
+// @Reference
+// OntologyStoreProvider ontologyStoreProvider;
+
+// @Reference
+// OntologyStorage ontologyStorage;
@Reference
RuleStore ruleStore;
@@ -145,7 +147,8 @@ public class JerseyEndpoint {
servletContext.setAttribute(KReSONManager.class.getName(), onm);
- servletContext.setAttribute(OntologyStoreProvider.class.getName(), ontologyStoreProvider);
+// servletContext.setAttribute(OntologyStoreProvider.class.getName(), ontologyStoreProvider);
+// servletContext.setAttribute(OntologyStorage.class.getName(), ontologyStorage);
servletContext.setAttribute(STATIC_RESOURCES_URL_ROOT_PROPERTY,
staticUrlRoot);
Modified: incubator/stanbol/trunk/kres/eu.iksproject.kres.jersey/src/main/java/eu/iksproject/kres/jersey/manager/Recipe.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/eu.iksproject.kres.jersey/src/main/java/eu/iksproject/kres/jersey/manager/Recipe.java?rev=1083230&r1=1083229&r2=1083230&view=diff
==============================================================================
--- incubator/stanbol/trunk/kres/eu.iksproject.kres.jersey/src/main/java/eu/iksproject/kres/jersey/manager/Recipe.java (original)
+++ incubator/stanbol/trunk/kres/eu.iksproject.kres.jersey/src/main/java/eu/iksproject/kres/jersey/manager/Recipe.java Sat Mar 19 16:55:26 2011
@@ -29,10 +29,10 @@ import javax.ws.rs.core.MediaType;
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.ontologymanager.ontonet.api.KReSONManager;
import org.apache.stanbol.ontologymanager.ontonet.impl.ONManager;
-import org.apache.stanbol.ontologymanager.store.api.OntologyStoreProvider;
-import org.apache.stanbol.ontologymanager.store.impl.OntologyStorageProviderImpl;
+import org.apache.stanbol.ontologymanager.ontonet.impl.ontology.OntologyStorage;
import org.apache.stanbol.rules.base.api.RuleStore;
import org.apache.stanbol.rules.manager.changes.KReSAddRecipe;
import org.apache.stanbol.rules.manager.changes.KReSGetRecipe;
@@ -68,7 +68,7 @@ public class Recipe extends NavigationMi
private Logger log = LoggerFactory.getLogger(getClass());
private RuleStore kresRuleStore;
- private OntologyStoreProvider storeProvider;
+ private OntologyStorage storage;
/**
* To get the KReSRuleStore where are stored the rules and the recipes
@@ -79,21 +79,24 @@ public class Recipe extends NavigationMi
public Recipe(@Context ServletContext servletContext) {
this.kresRuleStore = (RuleStore) servletContext.getAttribute(RuleStore.class.getName());
this.onm = (KReSONManager) servletContext.getAttribute(KReSONManager.class.getName());
- this.storeProvider = (OntologyStoreProvider) servletContext.getAttribute(OntologyStoreProvider.class
- .getName());
- // Contingency code for missing components follows.
- /*
- * FIXME! The following code is required only for the tests. This should be removed and the test
- * should work without this code.
- */
- if (storeProvider == null) {
- log.warn("No OntologyStoreProvider in servlet context. Instantiating manually...");
- storeProvider = new OntologyStorageProviderImpl();
- }
- if (onm == null) {
- log.warn("No KReSONManager in servlet context. Instantiating manually...");
- onm = new ONManager(storeProvider.getActiveOntologyStorage(), new Hashtable<String,Object>());
- }
+// this.storage = (OntologyStorage) servletContext
+// .getAttribute(OntologyStorage.class.getName());
+// Contingency code for missing components follows.
+/*
+ * FIXME! The following code is required only for the tests. This should
+ * be removed and the test should work without this code.
+ */
+if (onm == null) {
+ log
+ .warn("No KReSONManager in servlet context. Instantiating manually...");
+ onm = new ONManager(new TcManager(), null,
+ new Hashtable<String, Object>());
+}
+this.storage = onm.getOntologyStore();
+if (storage == null) {
+ log.warn("No OntologyStorage in servlet context. Instantiating manually...");
+ storage = new OntologyStorage(new TcManager(),null);
+}
if (kresRuleStore == null) {
log
.warn("No KReSRuleStore with stored rules and recipes found in servlet context. Instantiating manually with default values...");
Modified: incubator/stanbol/trunk/kres/eu.iksproject.kres.jersey/src/main/java/eu/iksproject/kres/jersey/manager/Rule.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/eu.iksproject.kres.jersey/src/main/java/eu/iksproject/kres/jersey/manager/Rule.java?rev=1083230&r1=1083229&r2=1083230&view=diff
==============================================================================
--- incubator/stanbol/trunk/kres/eu.iksproject.kres.jersey/src/main/java/eu/iksproject/kres/jersey/manager/Rule.java (original)
+++ incubator/stanbol/trunk/kres/eu.iksproject.kres.jersey/src/main/java/eu/iksproject/kres/jersey/manager/Rule.java Sat Mar 19 16:55:26 2011
@@ -31,10 +31,10 @@ import javax.ws.rs.core.MediaType;
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.ontologymanager.ontonet.api.KReSONManager;
import org.apache.stanbol.ontologymanager.ontonet.impl.ONManager;
-import org.apache.stanbol.ontologymanager.store.api.OntologyStoreProvider;
-import org.apache.stanbol.ontologymanager.store.impl.OntologyStorageProviderImpl;
+import org.apache.stanbol.ontologymanager.ontonet.impl.ontology.OntologyStorage;
import org.apache.stanbol.rules.base.api.RuleStore;
import org.apache.stanbol.rules.manager.changes.KReSAddRecipe;
import org.apache.stanbol.rules.manager.changes.KReSAddRule;
@@ -67,7 +67,7 @@ import eu.iksproject.kres.jersey.resourc
public class Rule extends NavigationMixin{
protected KReSONManager onm;
- protected OntologyStoreProvider storeProvider;
+ protected OntologyStorage storage;
private Logger log = LoggerFactory.getLogger(getClass());
@@ -86,24 +86,25 @@ public class Rule extends NavigationMixi
.getAttribute(RuleStore.class.getName());
this.onm = (KReSONManager) servletContext
.getAttribute(KReSONManager.class.getName());
- this.storeProvider = (OntologyStoreProvider) servletContext
- .getAttribute(OntologyStoreProvider.class.getName());
+// this.storage = (OntologyStorage) servletContext
+// .getAttribute(OntologyStorage.class.getName());
// Contingency code for missing components follows.
/*
* FIXME! The following code is required only for the tests. This should
* be removed and the test should work without this code.
*/
- if (storeProvider == null) {
- log
- .warn("No OntologyStoreProvider in servlet context. Instantiating manually...");
- storeProvider = new OntologyStorageProviderImpl();
- }
- if (onm == null) {
- log
- .warn("No KReSONManager in servlet context. Instantiating manually...");
- onm = new ONManager(storeProvider.getActiveOntologyStorage(),
- new Hashtable<String, Object>());
+ if (onm == null) {
+ log
+ .warn("No KReSONManager in servlet context. Instantiating manually...");
+ onm = new ONManager(new TcManager(), null,
+ new Hashtable<String, Object>());
+ }
+ this.storage = onm.getOntologyStore();
+ if (storage == null) {
+ log.warn("No OntologyStorage in servlet context. Instantiating manually...");
+ storage = new OntologyStorage(new TcManager(),null);
}
+
if (kresRuleStore == null) {
log
.warn("No KReSRuleStore with stored rules and recipes found in servlet context. Instantiating manually with default values...");
Modified: incubator/stanbol/trunk/kres/eu.iksproject.kres.jersey/src/main/java/eu/iksproject/kres/jersey/reasoners/Classify.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/eu.iksproject.kres.jersey/src/main/java/eu/iksproject/kres/jersey/reasoners/Classify.java?rev=1083230&r1=1083229&r2=1083230&view=diff
==============================================================================
--- incubator/stanbol/trunk/kres/eu.iksproject.kres.jersey/src/main/java/eu/iksproject/kres/jersey/reasoners/Classify.java (original)
+++ incubator/stanbol/trunk/kres/eu.iksproject.kres.jersey/src/main/java/eu/iksproject/kres/jersey/reasoners/Classify.java Sat Mar 19 16:55:26 2011
@@ -25,14 +25,14 @@ import javax.ws.rs.core.MediaType;
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.ontologymanager.ontonet.api.KReSONManager;
import org.apache.stanbol.ontologymanager.ontonet.api.ontology.OntologyScope;
import org.apache.stanbol.ontologymanager.ontonet.api.ontology.OntologySpace;
import org.apache.stanbol.ontologymanager.ontonet.api.ontology.ScopeRegistry;
import org.apache.stanbol.ontologymanager.ontonet.api.ontology.SessionOntologySpace;
import org.apache.stanbol.ontologymanager.ontonet.impl.ONManager;
-import org.apache.stanbol.ontologymanager.store.api.OntologyStoreProvider;
-import org.apache.stanbol.ontologymanager.store.impl.OntologyStorageProviderImpl;
+import org.apache.stanbol.ontologymanager.ontonet.impl.ontology.OntologyStorage;
import org.apache.stanbol.reasoners.base.commands.KReSCreateReasoner;
import org.apache.stanbol.reasoners.base.commands.KReSRunReasoner;
import org.apache.stanbol.reasoners.base.commands.KReSRunRules;
@@ -78,7 +78,7 @@ public class Classify {
private OWLOntology scopeowl;
protected KReSONManager onm;
- protected OntologyStoreProvider storeProvider;
+ protected OntologyStorage storage;
private Logger log = LoggerFactory.getLogger(getClass());
@@ -93,24 +93,24 @@ public class Classify {
.getAttribute(RuleStore.class.getName());
this.onm = (KReSONManager) servletContext
.getAttribute(KReSONManager.class.getName());
- this.storeProvider = (OntologyStoreProvider) servletContext
- .getAttribute(OntologyStoreProvider.class.getName());
- // Contingency code for missing components follows.
- /*
- * FIXME! The following code is required only for the tests. This should
- * be removed and the test should work without this code.
- */
- if (storeProvider == null) {
- log
- .warn("No OntologyStoreProvider in servlet context. Instantiating manually...");
- storeProvider = new OntologyStorageProviderImpl();
- }
- if (onm == null) {
- log
- .warn("No KReSONManager in servlet context. Instantiating manually...");
- onm = new ONManager(storeProvider.getActiveOntologyStorage(),
- new Hashtable<String, Object>());
- }
+// this.storage = (OntologyStorage) servletContext
+// .getAttribute(OntologyStorage.class.getName());
+// Contingency code for missing components follows.
+/*
+ * FIXME! The following code is required only for the tests. This should
+ * be removed and the test should work without this code.
+ */
+if (onm == null) {
+ log
+ .warn("No KReSONManager in servlet context. Instantiating manually...");
+ onm = new ONManager(new TcManager(), null,
+ new Hashtable<String, Object>());
+}
+this.storage = onm.getOntologyStore();
+if (storage == null) {
+ log.warn("No OntologyStorage in servlet context. Instantiating manually...");
+ storage = new OntologyStorage(new TcManager(),null);
+}
if (kresRuleStore == null) {
log
.warn("No KReSRuleStore with stored rules and recipes found in servlet context. Instantiating manually with default values...");
Modified: incubator/stanbol/trunk/kres/eu.iksproject.kres.jersey/src/main/java/eu/iksproject/kres/jersey/reasoners/ConsistencyCheck.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/eu.iksproject.kres.jersey/src/main/java/eu/iksproject/kres/jersey/reasoners/ConsistencyCheck.java?rev=1083230&r1=1083229&r2=1083230&view=diff
==============================================================================
--- incubator/stanbol/trunk/kres/eu.iksproject.kres.jersey/src/main/java/eu/iksproject/kres/jersey/reasoners/ConsistencyCheck.java (original)
+++ incubator/stanbol/trunk/kres/eu.iksproject.kres.jersey/src/main/java/eu/iksproject/kres/jersey/reasoners/ConsistencyCheck.java Sat Mar 19 16:55:26 2011
@@ -21,6 +21,7 @@ import javax.ws.rs.core.MediaType;
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.ontologymanager.ontonet.api.KReSONManager;
import org.apache.stanbol.ontologymanager.ontonet.api.OWLDuplicateSafeLoader;
import org.apache.stanbol.ontologymanager.ontonet.api.ontology.OntologyScope;
@@ -28,8 +29,7 @@ import org.apache.stanbol.ontologymanage
import org.apache.stanbol.ontologymanager.ontonet.api.ontology.ScopeRegistry;
import org.apache.stanbol.ontologymanager.ontonet.api.ontology.SessionOntologySpace;
import org.apache.stanbol.ontologymanager.ontonet.impl.ONManager;
-import org.apache.stanbol.ontologymanager.store.api.OntologyStoreProvider;
-import org.apache.stanbol.ontologymanager.store.impl.OntologyStorageProviderImpl;
+import org.apache.stanbol.ontologymanager.ontonet.impl.ontology.OntologyStorage;
import org.apache.stanbol.reasoners.base.commands.KReSCreateReasoner;
import org.apache.stanbol.reasoners.base.commands.KReSRunReasoner;
import org.apache.stanbol.reasoners.base.commands.KReSRunRules;
@@ -79,7 +79,7 @@ public class ConsistencyCheck {
private final OWLDuplicateSafeLoader loader = new OWLDuplicateSafeLoader();
protected KReSONManager onm;
- protected OntologyStoreProvider storeProvider;
+ protected OntologyStorage storage;
private Logger log = LoggerFactory.getLogger(getClass());
@@ -97,24 +97,24 @@ public class ConsistencyCheck {
// Retrieve the ontology network manager
this.onm = (KReSONManager) servletContext
.getAttribute(KReSONManager.class.getName());
- this.storeProvider = (OntologyStoreProvider) servletContext
- .getAttribute(OntologyStoreProvider.class.getName());
- // Contingency code for missing components follows.
- /*
- * FIXME! The following code is required only for the tests. This should
- * be removed and the test should work without this code.
- */
- if (storeProvider == null) {
- log
- .warn("No OntologyStoreProvider in servlet context. Instantiating manually...");
- storeProvider = new OntologyStorageProviderImpl();
- }
- if (onm == null) {
- log
- .warn("No KReSONManager in servlet context. Instantiating manually...");
- onm = new ONManager(storeProvider.getActiveOntologyStorage(),
- new Hashtable<String, Object>());
- }
+// this.storage = (OntologyStorage) servletContext
+// .getAttribute(OntologyStorage.class.getName());
+// Contingency code for missing components follows.
+/*
+ * FIXME! The following code is required only for the tests. This should
+ * be removed and the test should work without this code.
+ */
+if (onm == null) {
+ log
+ .warn("No KReSONManager in servlet context. Instantiating manually...");
+ onm = new ONManager(new TcManager(), null,
+ new Hashtable<String, Object>());
+}
+this.storage = onm.getOntologyStore();
+if (storage == null) {
+ log.warn("No OntologyStorage in servlet context. Instantiating manually...");
+ storage = new OntologyStorage(new TcManager(),null);
+}
if (kresRuleStore == null) {
log
.warn("No KReSRuleStore with stored rules and recipes found in servlet context. Instantiating manually with default values...");
Modified: incubator/stanbol/trunk/kres/eu.iksproject.kres.jersey/src/main/java/eu/iksproject/kres/jersey/reasoners/Enrichment.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/eu.iksproject.kres.jersey/src/main/java/eu/iksproject/kres/jersey/reasoners/Enrichment.java?rev=1083230&r1=1083229&r2=1083230&view=diff
==============================================================================
--- incubator/stanbol/trunk/kres/eu.iksproject.kres.jersey/src/main/java/eu/iksproject/kres/jersey/reasoners/Enrichment.java (original)
+++ incubator/stanbol/trunk/kres/eu.iksproject.kres.jersey/src/main/java/eu/iksproject/kres/jersey/reasoners/Enrichment.java Sat Mar 19 16:55:26 2011
@@ -25,14 +25,14 @@ import javax.ws.rs.core.MediaType;
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.ontologymanager.ontonet.api.KReSONManager;
import org.apache.stanbol.ontologymanager.ontonet.api.ontology.OntologyScope;
import org.apache.stanbol.ontologymanager.ontonet.api.ontology.OntologySpace;
import org.apache.stanbol.ontologymanager.ontonet.api.ontology.ScopeRegistry;
import org.apache.stanbol.ontologymanager.ontonet.api.ontology.SessionOntologySpace;
import org.apache.stanbol.ontologymanager.ontonet.impl.ONManager;
-import org.apache.stanbol.ontologymanager.store.api.OntologyStoreProvider;
-import org.apache.stanbol.ontologymanager.store.impl.OntologyStorageProviderImpl;
+import org.apache.stanbol.ontologymanager.ontonet.impl.ontology.OntologyStorage;
import org.apache.stanbol.reasoners.base.commands.KReSCreateReasoner;
import org.apache.stanbol.reasoners.base.commands.KReSRunReasoner;
import org.apache.stanbol.reasoners.base.commands.KReSRunRules;
@@ -77,7 +77,7 @@ public class Enrichment {
private OWLOntology scopeowl;
protected KReSONManager onm;
- protected OntologyStoreProvider storeProvider;
+ protected OntologyStorage storage;
private Logger log = LoggerFactory.getLogger(getClass());
@@ -94,24 +94,24 @@ public class Enrichment {
// Retrieve the ontology network manager
this.onm = (KReSONManager) servletContext
.getAttribute(KReSONManager.class.getName());
- this.storeProvider = (OntologyStoreProvider) servletContext
- .getAttribute(OntologyStoreProvider.class.getName());
- // Contingency code for missing components follows.
- /*
- * FIXME! The following code is required only for the tests. This should
- * be removed and the test should work without this code.
- */
- if (storeProvider == null) {
- log
- .warn("No OntologyStoreProvider in servlet context. Instantiating manually...");
- storeProvider = new OntologyStorageProviderImpl();
- }
- if (onm == null) {
- log
- .warn("No KReSONManager in servlet context. Instantiating manually...");
- onm = new ONManager(storeProvider.getActiveOntologyStorage(),
- new Hashtable<String, Object>());
- }
+// this.storage = (OntologyStorage) servletContext
+// .getAttribute(OntologyStorage.class.getName());
+// Contingency code for missing components follows.
+/*
+ * FIXME! The following code is required only for the tests. This should
+ * be removed and the test should work without this code.
+ */
+if (onm == null) {
+ log
+ .warn("No KReSONManager in servlet context. Instantiating manually...");
+ onm = new ONManager(new TcManager(), null,
+ new Hashtable<String, Object>());
+}
+this.storage = onm.getOntologyStore();
+if (storage == null) {
+ log.warn("No OntologyStorage in servlet context. Instantiating manually...");
+ storage = new OntologyStorage(new TcManager(),null);
+}
if (kresRuleStore == null) {
log
.warn("No KReSRuleStore with stored rules and recipes found in servlet context. Instantiating manually with default values...");
Modified: incubator/stanbol/trunk/kres/eu.iksproject.kres.jersey/src/main/java/eu/iksproject/kres/jersey/resource/GraphsResource.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/eu.iksproject.kres.jersey/src/main/java/eu/iksproject/kres/jersey/resource/GraphsResource.java?rev=1083230&r1=1083229&r2=1083230&view=diff
==============================================================================
--- incubator/stanbol/trunk/kres/eu.iksproject.kres.jersey/src/main/java/eu/iksproject/kres/jersey/resource/GraphsResource.java (original)
+++ incubator/stanbol/trunk/kres/eu.iksproject.kres.jersey/src/main/java/eu/iksproject/kres/jersey/resource/GraphsResource.java Sat Mar 19 16:55:26 2011
@@ -21,9 +21,8 @@ import javax.ws.rs.core.UriInfo;
import org.apache.clerezza.rdf.core.access.TcManager;
import org.apache.stanbol.ontologymanager.ontonet.api.KReSONManager;
-import org.apache.stanbol.ontologymanager.store.api.NoSuchStoreException;
-import org.apache.stanbol.ontologymanager.store.api.OntologyStorage;
-import org.apache.stanbol.ontologymanager.store.api.OntologyStoreProvider;
+import org.apache.stanbol.ontologymanager.ontonet.impl.ontology.NoSuchStoreException;
+import org.apache.stanbol.ontologymanager.ontonet.impl.ontology.OntologyStorage;
import org.semanticweb.owlapi.apibinding.OWLManager;
import org.semanticweb.owlapi.model.AddAxiom;
import org.semanticweb.owlapi.model.IRI;
@@ -45,109 +44,103 @@ import eu.iksproject.kres.jersey.format.
@ImplicitProduces(MediaType.TEXT_HTML + ";qs=2")
public class GraphsResource extends NavigationMixin {
- private OntologyStoreProvider ontologyStoreProvider;
- protected TcManager tcManager;
- protected KReSONManager onManager;
- protected OntologyStorage storage;
-
- private final Logger log = LoggerFactory.getLogger(getClass());
-
- public GraphsResource(@Context ServletContext servletContext) {
- ontologyStoreProvider = (OntologyStoreProvider) (servletContext.getAttribute(OntologyStoreProvider.class.getName()));
- tcManager = (TcManager) servletContext.getAttribute(TcManager.class.getName());
- onManager = (KReSONManager) (servletContext.getAttribute(KReSONManager.class.getName()));
+ protected TcManager tcManager;
+ protected KReSONManager onManager;
+ protected OntologyStorage storage;
+
+ private final Logger log = LoggerFactory.getLogger(getClass());
+
+ public GraphsResource(@Context ServletContext servletContext) {
+ storage = (OntologyStorage) (servletContext.getAttribute(OntologyStorage.class.getName()));
+ tcManager = (TcManager) servletContext.getAttribute(TcManager.class.getName());
+ onManager = (KReSONManager) (servletContext.getAttribute(KReSONManager.class.getName()));
if (onManager == null) {
- throw new IllegalStateException(
- "OntologyStorage missing in ServletContext");
+ throw new IllegalStateException("OntologyStorage missing in ServletContext");
+ } else {
+ storage = onManager.getOntologyStore();
+ }
+ }
+
+ @GET
+ @Path("/resume")
+ @Produces( {KReSFormat.FUNCTIONAL_OWL, KReSFormat.MANCHESTER_OWL, KReSFormat.OWL_XML, KReSFormat.RDF_XML,
+ KReSFormat.TURTLE, KReSFormat.RDF_JSON})
+ public Response graphs(@Context HttpHeaders headers, @Context ServletContext servletContext) {
+ Set<IRI> iris = storage.listGraphs();
+ if (iris != null) {
+
+ OWLOntologyManager manager = OWLManager.createOWLOntologyManager();
+ OWLDataFactory factory = OWLManager.getOWLDataFactory();
+
+ OWLOntology ontology;
+ try {
+ ontology = manager.createOntology();
+
+ String ns = onManager.getKReSNamespace();
+
+ OWLNamedIndividual storage = factory.getOWLNamedIndividual(IRI.create(ns + "Storage"));
+
+ OWLObjectProperty p = factory.getOWLObjectProperty(IRI.create(ns + "hasGraph"));
+
+ for (IRI iri : iris) {
+ iri = IRI.create(iri.toString().replace("<", "").replace(">", ""));
+ OWLNamedIndividual graph = factory.getOWLNamedIndividual(iri);
+ OWLObjectPropertyAssertionAxiom axiom = factory.getOWLObjectPropertyAssertionAxiom(p,
+ storage, graph);
+ manager.applyChange(new AddAxiom(ontology, axiom));
+ }
+
+ return Response.ok(ontology).build();
+ } catch (OWLOntologyCreationException e) {
+ return Response.status(500).build();
+ }
+
+ }
+
+ return Response.status(404).build();
+ }
+
+ @GET
+ @Path("/{graphid:.+}")
+ public Response getGraph(@PathParam("graphid") String graphid,
+ @Context UriInfo uriInfo,
+ @Context HttpHeaders headers) {
+
+ IRI ontologyID = IRI.create(graphid);
+
+ // return Response.ok(tcManager.getMGraph(new UriRef(graphid))).build();
+ try {
+ return Response.ok(storage.getGraph(ontologyID)).build();
+ } catch (NoSuchStoreException e) {
+ return Response.status(204).build();
+ }
+
+ }
+
+ @POST
+ @Consumes(MediaType.MULTIPART_FORM_DATA)
+ public Response storeGraph(@FormParam("graph") InputStream graph, @FormParam("id") String id) {
+ try {
+ OWLOntology ontology = OWLManager.createOWLOntologyManager().loadOntologyFromOntologyDocument(
+ graph);
+ storage.store(ontology, IRI.create(id));
+ return Response.ok().build();
+ } catch (OWLOntologyCreationException e) {
+ return Response.status(500).build();
}
- else{
- storage = onManager.getOntologyStore();
+ }
+
+ public String getNamespace() {
+ return onManager.getKReSNamespace();
+ }
+
+ public List<String> getStoredGraphs() {
+ Set<IRI> iris = storage.listGraphs();
+
+ ArrayList<String> graphs = new ArrayList<String>();
+ for (IRI iri : iris) {
+ graphs.add(iri.toString());
}
+ return graphs;
}
-
- @GET
- @Path("/resume")
- @Produces( {KReSFormat.FUNCTIONAL_OWL,
- KReSFormat.MANCHESTER_OWL,
- KReSFormat.OWL_XML,
- KReSFormat.RDF_XML,
- KReSFormat.TURTLE,
- KReSFormat.RDF_JSON})
- public Response graphs(@Context HttpHeaders headers, @Context ServletContext servletContext){
- Set<IRI> iris = storage.listGraphs();
- if(iris != null){
-
- OWLOntologyManager manager = OWLManager.createOWLOntologyManager();
- OWLDataFactory factory = OWLManager.getOWLDataFactory();
-
- OWLOntology ontology;
- try {
- ontology = manager.createOntology();
-
- String ns = onManager.getKReSNamespace();
-
- OWLNamedIndividual storage = factory.getOWLNamedIndividual(IRI.create(ns+"Storage"));
-
- OWLObjectProperty p = factory.getOWLObjectProperty(IRI.create(ns+"hasGraph"));
-
- for(IRI iri : iris){
- iri = IRI.create(iri.toString().replace("<", "").replace(">", ""));
- OWLNamedIndividual graph = factory.getOWLNamedIndividual(iri);
- OWLObjectPropertyAssertionAxiom axiom = factory.getOWLObjectPropertyAssertionAxiom(p, storage, graph);
- manager.applyChange(new AddAxiom(ontology, axiom));
- }
-
- return Response.ok(ontology).build();
- } catch (OWLOntologyCreationException e) {
- return Response.status(500).build();
- }
-
-
- }
-
- return Response.status(404).build();
- }
-
- @GET
- @Path("/{graphid:.+}")
- public Response getGraph(@PathParam("graphid") String graphid, @Context UriInfo uriInfo, @Context HttpHeaders headers){
- OntologyStorage ontologyStorage = ontologyStoreProvider.getActiveOntologyStorage();
-
- IRI ontologyID = IRI.create(graphid);
-
- //return Response.ok(tcManager.getMGraph(new UriRef(graphid))).build();
- try {
- return Response.ok(ontologyStorage.getGraph(ontologyID)).build();
- } catch (NoSuchStoreException e) {
- return Response.status(204).build();
- }
-
- }
-
- @POST
- @Consumes(MediaType.MULTIPART_FORM_DATA)
- public Response storeGraph(@FormParam("graph") InputStream graph, @FormParam("id") String id){
- try {
- OWLOntology ontology = OWLManager.createOWLOntologyManager().loadOntologyFromOntologyDocument(graph);
- ontologyStoreProvider.getActiveOntologyStorage().store(ontology, IRI.create(id));
- return Response.ok().build();
- } catch (OWLOntologyCreationException e) {
- return Response.status(500).build();
- }
- }
-
- public String getNamespace(){
- return onManager.getKReSNamespace();
- }
-
-
- public List<String> getStoredGraphs(){
- Set<IRI> iris = ontologyStoreProvider.getActiveOntologyStorage().listGraphs();
-
- ArrayList<String> graphs = new ArrayList<String>();
- for(IRI iri : iris){
- graphs.add(iri.toString());
- }
- return graphs;
- }
}
Modified: incubator/stanbol/trunk/kres/eu.iksproject.kres.jersey/src/main/java/eu/iksproject/kres/jersey/resource/ONMOntResource.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/eu.iksproject.kres.jersey/src/main/java/eu/iksproject/kres/jersey/resource/ONMOntResource.java?rev=1083230&r1=1083229&r2=1083230&view=diff
==============================================================================
--- incubator/stanbol/trunk/kres/eu.iksproject.kres.jersey/src/main/java/eu/iksproject/kres/jersey/resource/ONMOntResource.java (original)
+++ incubator/stanbol/trunk/kres/eu.iksproject.kres.jersey/src/main/java/eu/iksproject/kres/jersey/resource/ONMOntResource.java Sat Mar 19 16:55:26 2011
@@ -11,12 +11,12 @@ import javax.ws.rs.WebApplicationExcepti
import javax.ws.rs.core.Context;
import javax.ws.rs.core.Response;
+import org.apache.clerezza.rdf.core.access.TcManager;
import org.apache.clerezza.rdf.core.serializedform.Serializer;
import org.apache.stanbol.ontologymanager.ontonet.api.KReSONManager;
import org.apache.stanbol.ontologymanager.ontonet.api.ontology.OntologyIndex;
import org.apache.stanbol.ontologymanager.ontonet.impl.ONManager;
-import org.apache.stanbol.ontologymanager.store.api.OntologyStoreProvider;
-import org.apache.stanbol.ontologymanager.store.impl.OntologyStorageProviderImpl;
+import org.apache.stanbol.ontologymanager.ontonet.impl.ontology.OntologyStorage;
import org.coode.owlapi.turtle.TurtleOntologyFormat;
import org.semanticweb.owlapi.apibinding.OWLManager;
import org.semanticweb.owlapi.io.RDFXMLOntologyFormat;
@@ -31,94 +31,92 @@ import org.slf4j.LoggerFactory;
@Path("/ontology/get")
public class ONMOntResource extends NavigationMixin {
- private Logger log = LoggerFactory.getLogger(getClass());
+ private Logger log = LoggerFactory.getLogger(getClass());
- /*
- * Placeholder for the KReSONManager to be fetched from the servlet context.
- */
- protected KReSONManager onm;
- protected OntologyStoreProvider storeProvider;
-
- protected ServletContext servletContext;
-
- protected Serializer serializer;
-
- public ONMOntResource(@Context ServletContext servletContext) {
- this.servletContext = servletContext;
- this.onm = (KReSONManager) servletContext
- .getAttribute(KReSONManager.class.getName());
-this.storeProvider = (OntologyStoreProvider) servletContext
- .getAttribute(OntologyStoreProvider.class.getName());
+ /*
+ * Placeholder for the KReSONManager to be fetched from the servlet context.
+ */
+ protected KReSONManager onm;
+ protected OntologyStorage storage;
+
+ protected ServletContext servletContext;
+
+ protected Serializer serializer;
+
+ public ONMOntResource(@Context ServletContext servletContext) {
+ this.servletContext = servletContext;
+ this.onm = (KReSONManager) servletContext.getAttribute(KReSONManager.class.getName());
+// this.storage = (OntologyStorage) servletContext
+// .getAttribute(OntologyStorage.class.getName());
// Contingency code for missing components follows.
/*
* FIXME! The following code is required only for the tests. This should
* be removed and the test should work without this code.
*/
-if (storeProvider == null) {
- log
- .warn("No OntologyStoreProvider in servlet context. Instantiating manually...");
- storeProvider = new OntologyStorageProviderImpl();
-}
if (onm == null) {
- log
- .warn("No KReSONManager in servlet context. Instantiating manually...");
- onm = new ONManager(storeProvider.getActiveOntologyStorage(),
- new Hashtable<String, Object>());
+ log
+ .warn("No KReSONManager in servlet context. Instantiating manually...");
+ onm = new ONManager(new TcManager(), null,
+ new Hashtable<String, Object>());
+}
+this.storage = onm.getOntologyStore();
+if (storage == null) {
+ log.warn("No OntologyStorage in servlet context. Instantiating manually...");
+ storage = new OntologyStorage(new TcManager(),null);
}
- serializer = (Serializer) this.servletContext
- .getAttribute(Serializer.class.getName());
- }
-
- @GET
- @Produces("application/rdf+xml")
- public Response getOntology(@QueryParam("iri") String ontologyIri) {
-
- IRI iri = null;
- try {
- iri = IRI.create(ontologyIri);
- } catch (Exception ex) {
- throw new WebApplicationException(404);
- }
- OntologyIndex index = onm.getOntologyIndex();
- if (!index.isOntologyLoaded(iri))
- // No such ontology registered, so return 404.
- return Response.status(404).build();
-
- OWLOntology ont = index.getOntology(iri);
- OWLOntologyManager tmpmgr = OWLManager.createOWLOntologyManager();
- StringDocumentTarget tgt = new StringDocumentTarget();
- try {
- tmpmgr.saveOntology(ont, new RDFXMLOntologyFormat(), tgt);
- } catch (OWLOntologyStorageException e) {
- throw new WebApplicationException(500);
- }
- return Response.ok(tgt.toString()).build();
- }
-
- @GET
- @Produces("text/turtle")
- public Response getOntologyT(@QueryParam("iri") String ontologyIri) {
-
- IRI iri = null;
- try {
- iri = IRI.create(ontologyIri);
- } catch (Exception ex) {
- throw new WebApplicationException(404);
- }
- OntologyIndex index = onm.getOntologyIndex();
- if (!index.isOntologyLoaded(iri))
- // No such ontology registered, so return 404.
- return Response.status(404).build();
-
- OWLOntology ont = index.getOntology(iri);
- OWLOntologyManager tmpmgr = OWLManager.createOWLOntologyManager();
- StringDocumentTarget tgt = new StringDocumentTarget();
- try {
- tmpmgr.saveOntology(ont, new TurtleOntologyFormat(), tgt);
- } catch (OWLOntologyStorageException e) {
- throw new WebApplicationException(500);
- }
- return Response.ok(tgt.toString()).build();
- }
+ serializer = (Serializer) this.servletContext.getAttribute(Serializer.class.getName());
+ }
+
+ @GET
+ @Produces("application/rdf+xml")
+ public Response getOntology(@QueryParam("iri") String ontologyIri) {
+
+ IRI iri = null;
+ try {
+ iri = IRI.create(ontologyIri);
+ } catch (Exception ex) {
+ throw new WebApplicationException(404);
+ }
+ OntologyIndex index = onm.getOntologyIndex();
+ if (!index.isOntologyLoaded(iri))
+ // No such ontology registered, so return 404.
+ return Response.status(404).build();
+
+ OWLOntology ont = index.getOntology(iri);
+ OWLOntologyManager tmpmgr = OWLManager.createOWLOntologyManager();
+ StringDocumentTarget tgt = new StringDocumentTarget();
+ try {
+ tmpmgr.saveOntology(ont, new RDFXMLOntologyFormat(), tgt);
+ } catch (OWLOntologyStorageException e) {
+ throw new WebApplicationException(500);
+ }
+ return Response.ok(tgt.toString()).build();
+ }
+
+ @GET
+ @Produces("text/turtle")
+ public Response getOntologyT(@QueryParam("iri") String ontologyIri) {
+
+ IRI iri = null;
+ try {
+ iri = IRI.create(ontologyIri);
+ } catch (Exception ex) {
+ throw new WebApplicationException(404);
+ }
+ OntologyIndex index = onm.getOntologyIndex();
+ if (!index.isOntologyLoaded(iri))
+ // No such ontology registered, so return 404.
+ return Response.status(404).build();
+
+ OWLOntology ont = index.getOntology(iri);
+ OWLOntologyManager tmpmgr = OWLManager.createOWLOntologyManager();
+ StringDocumentTarget tgt = new StringDocumentTarget();
+ try {
+ tmpmgr.saveOntology(ont, new TurtleOntologyFormat(), tgt);
+ } catch (OWLOntologyStorageException e) {
+ throw new WebApplicationException(500);
+ }
+ return Response.ok(tgt.toString()).build();
+ }
}
Modified: incubator/stanbol/trunk/kres/eu.iksproject.kres.jersey/src/main/java/eu/iksproject/kres/jersey/resource/ONMRootResource.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/eu.iksproject.kres.jersey/src/main/java/eu/iksproject/kres/jersey/resource/ONMRootResource.java?rev=1083230&r1=1083229&r2=1083230&view=diff
==============================================================================
--- incubator/stanbol/trunk/kres/eu.iksproject.kres.jersey/src/main/java/eu/iksproject/kres/jersey/resource/ONMRootResource.java (original)
+++ incubator/stanbol/trunk/kres/eu.iksproject.kres.jersey/src/main/java/eu/iksproject/kres/jersey/resource/ONMRootResource.java Sat Mar 19 16:55:26 2011
@@ -15,13 +15,13 @@ import javax.ws.rs.core.Context;
import javax.ws.rs.core.HttpHeaders;
import javax.ws.rs.core.Response;
+import org.apache.clerezza.rdf.core.access.TcManager;
import org.apache.stanbol.ontologymanager.ontonet.api.KReSONManager;
import org.apache.stanbol.ontologymanager.ontonet.api.ontology.OntologyScope;
import org.apache.stanbol.ontologymanager.ontonet.api.ontology.ScopeRegistry;
import org.apache.stanbol.ontologymanager.ontonet.impl.ONManager;
+import org.apache.stanbol.ontologymanager.ontonet.impl.ontology.OntologyStorage;
import org.apache.stanbol.ontologymanager.ontonet.impl.renderers.ScopeSetRenderer;
-import org.apache.stanbol.ontologymanager.store.api.OntologyStoreProvider;
-import org.apache.stanbol.ontologymanager.store.impl.OntologyStorageProviderImpl;
import org.semanticweb.owlapi.model.OWLOntology;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -29,12 +29,11 @@ import org.slf4j.LoggerFactory;
import eu.iksproject.kres.jersey.format.KReSFormat;
/**
- * The main Web resource of the KReS ontology manager. All the scopes, sessions
- * and ontologies are accessible as subresources of ONMRootResource.<br>
+ * The main Web resource of the KReS ontology manager. All the scopes, sessions and ontologies are accessible
+ * as subresources of ONMRootResource.<br>
* <br>
- * This resource allows a GET method for obtaining an RDF representation of the
- * set of registered scopes and a DELETE method for clearing the scope set and
- * ontology store accordingly.
+ * This resource allows a GET method for obtaining an RDF representation of the set of registered scopes and a
+ * DELETE method for clearing the scope set and ontology store accordingly.
*
* @author alessandro
*
@@ -42,148 +41,141 @@ import eu.iksproject.kres.jersey.format.
@Path("/ontology")
public class ONMRootResource extends NavigationMixin {
- private Logger log = LoggerFactory.getLogger(getClass());
+ private Logger log = LoggerFactory.getLogger(getClass());
- /*
- * Placeholder for the KReSONManager to be fetched from the servlet context.
- */
- protected KReSONManager onm;
- protected OntologyStoreProvider storeProvider;
-
- protected ServletContext servletContext;
-
- public ONMRootResource(@Context ServletContext servletContext) {
- this.servletContext = servletContext;
- this.onm = (KReSONManager) servletContext
- .getAttribute(KReSONManager.class.getName());
- this.storeProvider = (OntologyStoreProvider) servletContext
- .getAttribute(OntologyStoreProvider.class.getName());
- // Contingency code for missing components follows.
- /*
- * FIXME! The following code is required only for the tests. This should
- * be removed and the test should work without this code.
- */
- if (storeProvider == null) {
- log
- .warn("No OntologyStoreProvider in servlet context. Instantiating manually...");
- storeProvider = new OntologyStorageProviderImpl();
- }
- if (onm == null) {
- log
- .warn("No KReSONManager in servlet context. Instantiating manually...");
- onm = new ONManager(storeProvider.getActiveOntologyStorage(),
- new Hashtable<String, Object>());
- }
- }
-
- /**
- * RESTful DELETE method that clears the entire scope registry and managed
- * ontology store.
- */
- @DELETE
- public void clearOntologies() {
- // First clear the registry...
- ScopeRegistry reg = onm.getScopeRegistry();
- for (OntologyScope scope : reg.getRegisteredScopes())
- reg.deregisterScope(scope);
- // ...then clear the store.
- // TODO : the other way around?
- onm.getOntologyStore().clear();
- }
-
- @GET
- @Path("/{param:.+}")
- public Response echo(@PathParam("param") String s) {
- return Response.ok(s).build();
- }
-
- /**
- * Default GET method for obtaining the set of (both active and, optionally,
- * inactive) ontology scopes currently registered with this instance of
- * KReS.
- *
- * @param inactive
- * if true, both active and inactive scopes will be included.
- * Default is false.
- * @param headers
- * the HTTP headers, supplied by the REST call.
- * @param servletContext
- * the servlet context, supplied by the REST call.
- * @return a string representation of the requested scope set, in a format
- * acceptable by the client.
- */
- @GET
- @Produces(value = { KReSFormat.RDF_XML, KReSFormat.OWL_XML,
- KReSFormat.TURTLE, KReSFormat.FUNCTIONAL_OWL,
- KReSFormat.MANCHESTER_OWL, KReSFormat.RDF_JSON })
- public Response getScopes(
- @DefaultValue("false") @QueryParam("with-inactive") boolean inactive,
- @Context HttpHeaders headers, @Context ServletContext servletContext) {
-
- ScopeRegistry reg = onm.getScopeRegistry();
-
- Set<OntologyScope> scopes = inactive ? reg.getRegisteredScopes() : reg
- .getActiveScopes();
-
- OWLOntology ontology = ScopeSetRenderer.getScopes(scopes);
-
- return Response.ok(ontology).build();
- }
-
- // @Path("upload")
- // @Consumes(MediaType.MULTIPART_FORM_DATA)
- // @POST
- // public void uploadDumb(@FormParam("file") InputStream is) {
- // Writer writer = new StringWriter();
- //
- // char[] buffer = new char[1024];
- //
- // try {
- //
- // Reader reader = new BufferedReader(
- //
- // new InputStreamReader(is, "UTF-8"));
- //
- // int n;
- //
- // while ((n = reader.read(buffer)) != -1) {
- //
- // writer.write(buffer, 0, n);
- //
- // }
- // } catch (IOException ex) {
- // throw new WebApplicationException(ex);
- // } finally {
- //
- // try {
- // is.close();
- // } catch (IOException e) {
- // throw new WebApplicationException(e);
- // }
- //
- // }
- // System.out.println(writer.toString());
- // }
- //
- // @Path("formdata")
- // @Consumes(MediaType.MULTIPART_FORM_DATA)
- // @POST
- // public void uploadUrlFormData(
- // @FormDataParam("file") List<FormDataBodyPart> parts,
- // @FormDataParam("submit") FormDataBodyPart submit)
- // throws IOException, ParseException {
- //
- // System.out.println("XXXX: " + submit.getMediaType());
- // System.out.println("XXXX: "
- // + submit.getHeaders().getFirst("Content-Type"));
- //
- // for (FormDataBodyPart bp : parts) {
- // System.out.println(bp.getMediaType());
- // System.out.println(bp.getHeaders().get("Content-Disposition"));
- // System.out.println(bp.getParameterizedHeaders().getFirst(
- // "Content-Disposition").getParameters().get("name"));
- // bp.cleanup();
- // }
- // }
+ /*
+ * Placeholder for the KReSONManager to be fetched from the servlet context.
+ */
+ protected KReSONManager onm;
+ protected OntologyStorage storage;
+
+ protected ServletContext servletContext;
+
+ public ONMRootResource(@Context ServletContext servletContext) {
+ this.servletContext = servletContext;
+ this.onm = (KReSONManager) servletContext.getAttribute(KReSONManager.class.getName());
+// this.storage = (OntologyStorage) servletContext
+// .getAttribute(OntologyStorage.class.getName());
+// Contingency code for missing components follows.
+/*
+ * FIXME! The following code is required only for the tests. This should
+ * be removed and the test should work without this code.
+ */
+if (onm == null) {
+ log
+ .warn("No KReSONManager in servlet context. Instantiating manually...");
+ onm = new ONManager(new TcManager(), null,
+ new Hashtable<String, Object>());
+}
+this.storage = onm.getOntologyStore();
+if (storage == null) {
+ log.warn("No OntologyStorage in servlet context. Instantiating manually...");
+ storage = new OntologyStorage(new TcManager(),null);
+}
+ }
+
+ /**
+ * RESTful DELETE method that clears the entire scope registry and managed ontology store.
+ */
+ @DELETE
+ public void clearOntologies() {
+ // First clear the registry...
+ ScopeRegistry reg = onm.getScopeRegistry();
+ for (OntologyScope scope : reg.getRegisteredScopes())
+ reg.deregisterScope(scope);
+ // ...then clear the store.
+ // TODO : the other way around?
+ onm.getOntologyStore().clear();
+ }
+
+ @GET
+ @Path("/{param:.+}")
+ public Response echo(@PathParam("param") String s) {
+ return Response.ok(s).build();
+ }
+
+ /**
+ * Default GET method for obtaining the set of (both active and, optionally, inactive) ontology scopes
+ * currently registered with this instance of KReS.
+ *
+ * @param inactive
+ * if true, both active and inactive scopes will be included. Default is false.
+ * @param headers
+ * the HTTP headers, supplied by the REST call.
+ * @param servletContext
+ * the servlet context, supplied by the REST call.
+ * @return a string representation of the requested scope set, in a format acceptable by the client.
+ */
+ @GET
+ @Produces(value = {KReSFormat.RDF_XML, KReSFormat.OWL_XML, KReSFormat.TURTLE, KReSFormat.FUNCTIONAL_OWL,
+ KReSFormat.MANCHESTER_OWL, KReSFormat.RDF_JSON})
+ public Response getScopes(@DefaultValue("false") @QueryParam("with-inactive") boolean inactive,
+ @Context HttpHeaders headers,
+ @Context ServletContext servletContext) {
+
+ ScopeRegistry reg = onm.getScopeRegistry();
+
+ Set<OntologyScope> scopes = inactive ? reg.getRegisteredScopes() : reg.getActiveScopes();
+
+ OWLOntology ontology = ScopeSetRenderer.getScopes(scopes);
+
+ return Response.ok(ontology).build();
+ }
+
+ // @Path("upload")
+ // @Consumes(MediaType.MULTIPART_FORM_DATA)
+ // @POST
+ // public void uploadDumb(@FormParam("file") InputStream is) {
+ // Writer writer = new StringWriter();
+ //
+ // char[] buffer = new char[1024];
+ //
+ // try {
+ //
+ // Reader reader = new BufferedReader(
+ //
+ // new InputStreamReader(is, "UTF-8"));
+ //
+ // int n;
+ //
+ // while ((n = reader.read(buffer)) != -1) {
+ //
+ // writer.write(buffer, 0, n);
+ //
+ // }
+ // } catch (IOException ex) {
+ // throw new WebApplicationException(ex);
+ // } finally {
+ //
+ // try {
+ // is.close();
+ // } catch (IOException e) {
+ // throw new WebApplicationException(e);
+ // }
+ //
+ // }
+ // System.out.println(writer.toString());
+ // }
+ //
+ // @Path("formdata")
+ // @Consumes(MediaType.MULTIPART_FORM_DATA)
+ // @POST
+ // public void uploadUrlFormData(
+ // @FormDataParam("file") List<FormDataBodyPart> parts,
+ // @FormDataParam("submit") FormDataBodyPart submit)
+ // throws IOException, ParseException {
+ //
+ // System.out.println("XXXX: " + submit.getMediaType());
+ // System.out.println("XXXX: "
+ // + submit.getHeaders().getFirst("Content-Type"));
+ //
+ // for (FormDataBodyPart bp : parts) {
+ // System.out.println(bp.getMediaType());
+ // System.out.println(bp.getHeaders().get("Content-Disposition"));
+ // System.out.println(bp.getParameterizedHeaders().getFirst(
+ // "Content-Disposition").getParameters().get("name"));
+ // bp.cleanup();
+ // }
+ // }
}
Modified: incubator/stanbol/trunk/kres/eu.iksproject.kres.jersey/src/main/java/eu/iksproject/kres/jersey/resource/ONMScopeOntologyResource.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/eu.iksproject.kres.jersey/src/main/java/eu/iksproject/kres/jersey/resource/ONMScopeOntologyResource.java?rev=1083230&r1=1083229&r2=1083230&view=diff
==============================================================================
--- incubator/stanbol/trunk/kres/eu.iksproject.kres.jersey/src/main/java/eu/iksproject/kres/jersey/resource/ONMScopeOntologyResource.java (original)
+++ incubator/stanbol/trunk/kres/eu.iksproject.kres.jersey/src/main/java/eu/iksproject/kres/jersey/resource/ONMScopeOntologyResource.java Sat Mar 19 16:55:26 2011
@@ -19,6 +19,7 @@ import javax.ws.rs.core.HttpHeaders;
import javax.ws.rs.core.Response;
import javax.ws.rs.core.UriInfo;
+import org.apache.clerezza.rdf.core.access.TcManager;
import org.apache.stanbol.ontologymanager.ontonet.api.KReSONManager;
import org.apache.stanbol.ontologymanager.ontonet.api.io.RootOntologySource;
import org.apache.stanbol.ontologymanager.ontonet.api.ontology.OntologyScope;
@@ -26,8 +27,7 @@ import org.apache.stanbol.ontologymanage
import org.apache.stanbol.ontologymanager.ontonet.api.ontology.OntologySpaceModificationException;
import org.apache.stanbol.ontologymanager.ontonet.api.ontology.ScopeRegistry;
import org.apache.stanbol.ontologymanager.ontonet.impl.ONManager;
-import org.apache.stanbol.ontologymanager.store.api.OntologyStoreProvider;
-import org.apache.stanbol.ontologymanager.store.impl.OntologyStorageProviderImpl;
+import org.apache.stanbol.ontologymanager.ontonet.impl.ontology.OntologyStorage;
import org.semanticweb.owlapi.apibinding.OWLManager;
import org.semanticweb.owlapi.io.RDFXMLOntologyFormat;
import org.semanticweb.owlapi.model.IRI;
@@ -53,174 +53,162 @@ import eu.iksproject.kres.jersey.util.On
@Path("/ontology/{scopeid}/{uri:.+}")
public class ONMScopeOntologyResource extends NavigationMixin {
- private Logger log = LoggerFactory.getLogger(getClass());
+ private Logger log = LoggerFactory.getLogger(getClass());
- /*
- * Placeholder for the KReSONManager to be fetched from the servlet context.
- */
- protected KReSONManager onm;
- protected OntologyStoreProvider storeProvider;
-
- protected ServletContext servletContext;
-
- public ONMScopeOntologyResource(@Context ServletContext servletContext) {
- this.servletContext = servletContext;
- this.onm = (KReSONManager) servletContext
- .getAttribute(KReSONManager.class.getName());
-this.storeProvider = (OntologyStoreProvider) servletContext
- .getAttribute(OntologyStoreProvider.class.getName());
+ /*
+ * Placeholder for the KReSONManager to be fetched from the servlet context.
+ */
+ protected KReSONManager onm;
+ protected OntologyStorage storage;
+
+ protected ServletContext servletContext;
+
+ public ONMScopeOntologyResource(@Context ServletContext servletContext) {
+ this.servletContext = servletContext;
+ this.onm = (KReSONManager) servletContext.getAttribute(KReSONManager.class.getName());
+// this.storage = (OntologyStorage) servletContext
+// .getAttribute(OntologyStorage.class.getName());
// Contingency code for missing components follows.
/*
* FIXME! The following code is required only for the tests. This should
* be removed and the test should work without this code.
*/
-if (storeProvider == null) {
- log
- .warn("No OntologyStoreProvider in servlet context. Instantiating manually...");
- storeProvider = new OntologyStorageProviderImpl();
-}
if (onm == null) {
- log
- .warn("No KReSONManager in servlet context. Instantiating manually...");
- onm = new ONManager(storeProvider.getActiveOntologyStorage(),
- new Hashtable<String, Object>());
+ log
+ .warn("No KReSONManager in servlet context. Instantiating manually...");
+ onm = new ONManager(new TcManager(), null,
+ new Hashtable<String, Object>());
+}
+this.storage = onm.getOntologyStore();
+if (storage == null) {
+ log.warn("No OntologyStorage in servlet context. Instantiating manually...");
+ storage = new OntologyStorage(new TcManager(),null);
}
- }
+ }
- /**
- * Returns an RDF/XML representation of the ontology identified by logical
- * IRI <code>ontologyid</code>, if it is loaded within the scope
- * <code>[baseUri]/scopeid</code>.
- *
- * @param scopeid
- * @param ontologyid
- * @param uriInfo
- * @return, or a status 404 if either the scope is not registered or the
- * ontology is not loaded within that scope.
- */
- @GET
- @Produces(value = { KReSFormat.RDF_XML, KReSFormat.OWL_XML,
- KReSFormat.TURTLE, KReSFormat.FUNCTIONAL_OWL,
- KReSFormat.MANCHESTER_OWL, KReSFormat.RDF_JSON })
- public Response getScopeOntology(@PathParam("scopeid") String scopeid,
- @PathParam("uri") String ontologyid, @Context UriInfo uriInfo) {
-
- String absur = uriInfo.getAbsolutePath().toString();
- URI uri = URI.create(absur.substring(0,
- absur.lastIndexOf(ontologyid) - 1));
-
- IRI sciri = IRI.create(uri);
- IRI ontiri = IRI.create(ontologyid);
-
- // TODO: hack (ma anche no)
- if (!ontiri.isAbsolute())
- ontiri = IRI.create(absur);
-
- ScopeRegistry reg = onm.getScopeRegistry();
- OntologyScope scope = reg.getScope(sciri);
- if (scope == null)
- return Response.status(NOT_FOUND).build();
-
- /* BEGIN debug code, uncomment only for local testing */
- OWLOntology test = null, top = null;
- test = scope.getCustomSpace().getOntology(ontiri);
- System.out.println("Ontology " + ontiri);
- for (OWLImportsDeclaration imp : test.getImportsDeclarations())
- System.out.println("\timports " + imp.getIRI());
- top = scope.getCoreSpace().getTopOntology();
- System.out.println("Core root for scope " + scopeid);
- for (OWLImportsDeclaration imp : top.getImportsDeclarations())
- System.out.println("\timports " + imp.getIRI());
- /* END debug code */
-
- OWLOntology ont = null;
- // By default, always try retrieving the ontology from the custom space
- // first.
- OntologySpace space = scope.getCustomSpace();
- if (space == null)
- space = scope.getCoreSpace();
- if (space != null)
- ont = space.getOntology(ontiri);
-
- if (ont == null) {
- OWLOntologyManager man = OWLManager.createOWLOntologyManager();
- final Set<OWLOntology> ontologies = scope.getSessionSpace(ontiri)
- .getOntologies();
-
- OWLOntologySetProvider provider = new OWLOntologySetProvider() {
-
- @Override
- public Set<OWLOntology> getOntologies() {
- // System.out.println("ID SPACE : " + ontologies);
- return ontologies;
- }
- };
- OWLOntologyMerger merger = new OWLOntologyMerger(provider);
-
- /*
- * Set<OntologySpace> spaces = scope.getSessionSpaces();
- * for(OntologySpace space : spaces){
- * System.out.println("ID SPACE : "+space.getID()); }
- */
-
- try {
- ont = merger.createMergedOntology(man, ontiri);
- } catch (OWLOntologyCreationException e) {
- throw new WebApplicationException(e, INTERNAL_SERVER_ERROR);
- }
-
- }
- if (ont == null) {
- return Response.status(NOT_FOUND).build();
- }
- String res = null;
- try {
- res = OntologyRenderUtils.renderOntology(ont,
- new RDFXMLOntologyFormat(), sciri.toString(), onm);
- } catch (OWLOntologyStorageException e) {
- throw new WebApplicationException(e, INTERNAL_SERVER_ERROR);
- }
- return Response.ok(/*ont*/res).build();
-
- }
-
- /**
- * Unloads an ontology from an ontology scope.
- *
- * @param scopeId
- * @param ontologyid
- * @param uriInfo
- * @param headers
- */
- @DELETE
- public void unloadOntology(@PathParam("scopeid") String scopeId,
- @PathParam("uri") String ontologyid, @Context UriInfo uriInfo,
- @Context HttpHeaders headers) {
-
- if (ontologyid != null && !ontologyid.equals("")) {
- String scopeURI = uriInfo.getAbsolutePath().toString().replace(
- ontologyid, "");
- System.out.println("Received DELETE request for ontology "
- + ontologyid + " in scope " + scopeURI);
- IRI scopeIri = IRI.create(uriInfo.getBaseUri() + "ontology/"
- + scopeId);
- System.out.println("SCOPE IRI : " + scopeIri);
- IRI ontIri = IRI.create(ontologyid);
- ScopeRegistry reg = onm.getScopeRegistry();
- OntologyScope scope = reg.getScope(scopeIri);
- OntologySpace cs = scope.getCustomSpace();
- if (cs.hasOntology(ontIri)) {
- try {
- reg.setScopeActive(scopeIri, false);
- cs.removeOntology(new RootOntologySource(cs
- .getOntology(ontIri)));
- reg.setScopeActive(scopeIri, true);
- } catch (OntologySpaceModificationException e) {
- reg.setScopeActive(scopeIri, true);
- throw new WebApplicationException(e, INTERNAL_SERVER_ERROR);
- }
- }
- }
- }
+ /**
+ * Returns an RDF/XML representation of the ontology identified by logical IRI <code>ontologyid</code>, if
+ * it is loaded within the scope <code>[baseUri]/scopeid</code>.
+ *
+ * @param scopeid
+ * @param ontologyid
+ * @param uriInfo
+ * @return, or a status 404 if either the scope is not registered or the ontology is not loaded within
+ * that scope.
+ */
+ @GET
+ @Produces(value = {KReSFormat.RDF_XML, KReSFormat.OWL_XML, KReSFormat.TURTLE, KReSFormat.FUNCTIONAL_OWL,
+ KReSFormat.MANCHESTER_OWL, KReSFormat.RDF_JSON})
+ public Response getScopeOntology(@PathParam("scopeid") String scopeid,
+ @PathParam("uri") String ontologyid,
+ @Context UriInfo uriInfo) {
+
+ String absur = uriInfo.getAbsolutePath().toString();
+ URI uri = URI.create(absur.substring(0, absur.lastIndexOf(ontologyid) - 1));
+
+ IRI sciri = IRI.create(uri);
+ IRI ontiri = IRI.create(ontologyid);
+
+ // TODO: hack (ma anche no)
+ if (!ontiri.isAbsolute()) ontiri = IRI.create(absur);
+
+ ScopeRegistry reg = onm.getScopeRegistry();
+ OntologyScope scope = reg.getScope(sciri);
+ if (scope == null) return Response.status(NOT_FOUND).build();
+
+ /* BEGIN debug code, uncomment only for local testing */
+ OWLOntology test = null, top = null;
+ test = scope.getCustomSpace().getOntology(ontiri);
+ System.out.println("Ontology " + ontiri);
+ for (OWLImportsDeclaration imp : test.getImportsDeclarations())
+ System.out.println("\timports " + imp.getIRI());
+ top = scope.getCoreSpace().getTopOntology();
+ System.out.println("Core root for scope " + scopeid);
+ for (OWLImportsDeclaration imp : top.getImportsDeclarations())
+ System.out.println("\timports " + imp.getIRI());
+ /* END debug code */
+
+ OWLOntology ont = null;
+ // By default, always try retrieving the ontology from the custom space
+ // first.
+ OntologySpace space = scope.getCustomSpace();
+ if (space == null) space = scope.getCoreSpace();
+ if (space != null) ont = space.getOntology(ontiri);
+
+ if (ont == null) {
+ OWLOntologyManager man = OWLManager.createOWLOntologyManager();
+ final Set<OWLOntology> ontologies = scope.getSessionSpace(ontiri).getOntologies();
+
+ OWLOntologySetProvider provider = new OWLOntologySetProvider() {
+
+ @Override
+ public Set<OWLOntology> getOntologies() {
+ // System.out.println("ID SPACE : " + ontologies);
+ return ontologies;
+ }
+ };
+ OWLOntologyMerger merger = new OWLOntologyMerger(provider);
+
+ /*
+ * Set<OntologySpace> spaces = scope.getSessionSpaces(); for(OntologySpace space : spaces){
+ * System.out.println("ID SPACE : "+space.getID()); }
+ */
+
+ try {
+ ont = merger.createMergedOntology(man, ontiri);
+ } catch (OWLOntologyCreationException e) {
+ throw new WebApplicationException(e, INTERNAL_SERVER_ERROR);
+ }
+
+ }
+ if (ont == null) {
+ return Response.status(NOT_FOUND).build();
+ }
+ String res = null;
+ try {
+ res = OntologyRenderUtils.renderOntology(ont, new RDFXMLOntologyFormat(), sciri.toString(), onm);
+ } catch (OWLOntologyStorageException e) {
+ throw new WebApplicationException(e, INTERNAL_SERVER_ERROR);
+ }
+ return Response.ok(/* ont */res).build();
+
+ }
+
+ /**
+ * Unloads an ontology from an ontology scope.
+ *
+ * @param scopeId
+ * @param ontologyid
+ * @param uriInfo
+ * @param headers
+ */
+ @DELETE
+ public void unloadOntology(@PathParam("scopeid") String scopeId,
+ @PathParam("uri") String ontologyid,
+ @Context UriInfo uriInfo,
+ @Context HttpHeaders headers) {
+
+ if (ontologyid != null && !ontologyid.equals("")) {
+ String scopeURI = uriInfo.getAbsolutePath().toString().replace(ontologyid, "");
+ System.out
+ .println("Received DELETE request for ontology " + ontologyid + " in scope " + scopeURI);
+ IRI scopeIri = IRI.create(uriInfo.getBaseUri() + "ontology/" + scopeId);
+ System.out.println("SCOPE IRI : " + scopeIri);
+ IRI ontIri = IRI.create(ontologyid);
+ ScopeRegistry reg = onm.getScopeRegistry();
+ OntologyScope scope = reg.getScope(scopeIri);
+ OntologySpace cs = scope.getCustomSpace();
+ if (cs.hasOntology(ontIri)) {
+ try {
+ reg.setScopeActive(scopeIri, false);
+ cs.removeOntology(new RootOntologySource(cs.getOntology(ontIri)));
+ reg.setScopeActive(scopeIri, true);
+ } catch (OntologySpaceModificationException e) {
+ reg.setScopeActive(scopeIri, true);
+ throw new WebApplicationException(e, INTERNAL_SERVER_ERROR);
+ }
+ }
+ }
+ }
}
Modified: incubator/stanbol/trunk/kres/eu.iksproject.kres.jersey/src/main/java/eu/iksproject/kres/jersey/resource/ONMScopeResource.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/eu.iksproject.kres.jersey/src/main/java/eu/iksproject/kres/jersey/resource/ONMScopeResource.java?rev=1083230&r1=1083229&r2=1083230&view=diff
==============================================================================
--- incubator/stanbol/trunk/kres/eu.iksproject.kres.jersey/src/main/java/eu/iksproject/kres/jersey/resource/ONMScopeResource.java (original)
+++ incubator/stanbol/trunk/kres/eu.iksproject.kres.jersey/src/main/java/eu/iksproject/kres/jersey/resource/ONMScopeResource.java Sat Mar 19 16:55:26 2011
@@ -25,6 +25,7 @@ import javax.ws.rs.core.MediaType;
import javax.ws.rs.core.Response;
import javax.ws.rs.core.UriInfo;
+import org.apache.clerezza.rdf.core.access.TcManager;
import org.apache.stanbol.ontologymanager.ontonet.api.DuplicateIDException;
import org.apache.stanbol.ontologymanager.ontonet.api.KReSONManager;
import org.apache.stanbol.ontologymanager.ontonet.api.io.OntologyInputSource;
@@ -36,8 +37,7 @@ import org.apache.stanbol.ontologymanage
import org.apache.stanbol.ontologymanager.ontonet.api.ontology.UnmodifiableOntologySpaceException;
import org.apache.stanbol.ontologymanager.ontonet.impl.ONManager;
import org.apache.stanbol.ontologymanager.ontonet.impl.io.OntologyRegistryIRISource;
-import org.apache.stanbol.ontologymanager.store.api.OntologyStoreProvider;
-import org.apache.stanbol.ontologymanager.store.impl.OntologyStorageProviderImpl;
+import org.apache.stanbol.ontologymanager.ontonet.impl.ontology.OntologyStorage;
import org.semanticweb.owlapi.model.IRI;
import org.semanticweb.owlapi.model.OWLOntology;
import org.semanticweb.owlapi.model.OWLOntologyCreationException;
@@ -55,7 +55,7 @@ public class ONMScopeResource extends Na
* Placeholder for the KReSONManager to be fetched from the servlet context.
*/
protected KReSONManager onm;
- protected OntologyStoreProvider storeProvider;
+ protected OntologyStorage storage;
protected ServletContext servletContext;
@@ -63,24 +63,26 @@ public class ONMScopeResource extends Na
this.servletContext = servletContext;
this.onm = (KReSONManager) servletContext
.getAttribute(KReSONManager.class.getName());
- this.storeProvider = (OntologyStoreProvider) servletContext
- .getAttribute(OntologyStoreProvider.class.getName());
- // Contingency code for missing components follows.
- /*
- * FIXME! The following code is required only for the tests. This should
- * be removed and the test should work without this code.
- */
- if (storeProvider == null) {
- log
- .warn("No OntologyStoreProvider in servlet context. Instantiating manually...");
- storeProvider = new OntologyStorageProviderImpl();
- }
- if (onm == null) {
- log
- .warn("No KReSONManager in servlet context. Instantiating manually...");
- onm = new ONManager(storeProvider.getActiveOntologyStorage(),
- new Hashtable<String, Object>());
- }
+ this.storage = (OntologyStorage) servletContext
+ .getAttribute(OntologyStorage.class.getName());
+// this.storage = (OntologyStorage) servletContext
+// .getAttribute(OntologyStorage.class.getName());
+// Contingency code for missing components follows.
+/*
+ * FIXME! The following code is required only for the tests. This should
+ * be removed and the test should work without this code.
+ */
+if (onm == null) {
+ log
+ .warn("No KReSONManager in servlet context. Instantiating manually...");
+ onm = new ONManager(new TcManager(), null,
+ new Hashtable<String, Object>());
+}
+this.storage = onm.getOntologyStore();
+if (storage == null) {
+ log.warn("No OntologyStorage in servlet context. Instantiating manually...");
+ storage = new OntologyStorage(new TcManager(),null);
+}
}
@DELETE
Modified: incubator/stanbol/trunk/kres/eu.iksproject.kres.jersey/src/main/java/eu/iksproject/kres/jersey/resource/OntologyStorageResource.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/eu.iksproject.kres.jersey/src/main/java/eu/iksproject/kres/jersey/resource/OntologyStorageResource.java?rev=1083230&r1=1083229&r2=1083230&view=diff
==============================================================================
--- incubator/stanbol/trunk/kres/eu.iksproject.kres.jersey/src/main/java/eu/iksproject/kres/jersey/resource/OntologyStorageResource.java (original)
+++ incubator/stanbol/trunk/kres/eu.iksproject.kres.jersey/src/main/java/eu/iksproject/kres/jersey/resource/OntologyStorageResource.java Sat Mar 19 16:55:26 2011
@@ -6,7 +6,7 @@ import javax.ws.rs.core.Context;
import org.apache.clerezza.rdf.core.access.TcManager;
import org.apache.stanbol.ontologymanager.ontonet.api.KReSONManager;
-import org.apache.stanbol.ontologymanager.store.api.OntologyStoreProvider;
+import org.apache.stanbol.ontologymanager.ontonet.impl.ontology.OntologyStorage;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -14,15 +14,15 @@ import org.slf4j.LoggerFactory;
public class OntologyStorageResource extends NavigationMixin {
private final Logger log = LoggerFactory.getLogger(getClass());
- private OntologyStoreProvider ontologyStoreProvider;
+ private OntologyStorage storage;
private KReSONManager onManager;
private TcManager tcManager;
public OntologyStorageResource(@Context ServletContext servletContext) {
- ontologyStoreProvider = (OntologyStoreProvider) (servletContext.getAttribute(OntologyStoreProvider.class.getName()));
+ storage = (OntologyStorage) (servletContext.getAttribute(OntologyStorage.class.getName()));
onManager = (KReSONManager) (servletContext.getAttribute(KReSONManager.class.getName()));
tcManager = (TcManager) (servletContext.getAttribute(TcManager.class.getName()));
- if (ontologyStoreProvider == null) {
+ if (storage == null) {
throw new IllegalStateException(
"OntologyStoreProvider missing in ServletContext");
}
Modified: incubator/stanbol/trunk/kres/eu.iksproject.kres.jersey/src/main/java/eu/iksproject/kres/jersey/resource/SemionReengineerResource.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/eu.iksproject.kres.jersey/src/main/java/eu/iksproject/kres/jersey/resource/SemionReengineerResource.java?rev=1083230&r1=1083229&r2=1083230&view=diff
==============================================================================
--- incubator/stanbol/trunk/kres/eu.iksproject.kres.jersey/src/main/java/eu/iksproject/kres/jersey/resource/SemionReengineerResource.java (original)
+++ incubator/stanbol/trunk/kres/eu.iksproject.kres.jersey/src/main/java/eu/iksproject/kres/jersey/resource/SemionReengineerResource.java Sat Mar 19 16:55:26 2011
@@ -23,7 +23,7 @@ import org.apache.clerezza.rdf.core.UriR
import org.apache.clerezza.rdf.core.access.TcManager;
import org.apache.clerezza.rdf.core.impl.SimpleMGraph;
import org.apache.clerezza.rdf.core.impl.TripleImpl;
-import org.apache.stanbol.ontologymanager.store.api.OntologyStoreProvider;
+import org.apache.stanbol.ontologymanager.ontonet.impl.ontology.OntologyStorage;
import org.apache.stanbol.reengineer.base.api.DataSource;
import org.apache.stanbol.reengineer.base.api.ReengineeringException;
import org.apache.stanbol.reengineer.base.api.SemionManager;
@@ -52,14 +52,14 @@ public class SemionReengineerResource ex
protected SemionManager reengineeringManager;
protected TcManager tcManager;
- protected OntologyStoreProvider storeProvider;
+ protected OntologyStorage storage;
private final Logger log = LoggerFactory.getLogger(getClass());
public SemionReengineerResource(@Context ServletContext servletContext) {
tcManager = (TcManager) servletContext.getAttribute(TcManager.class.getName());
- storeProvider = (OntologyStoreProvider) servletContext.getAttribute(OntologyStoreProvider.class.getName());
+ storage = (OntologyStorage) servletContext.getAttribute(OntologyStorage.class.getName());
reengineeringManager = (SemionManager) (servletContext.getAttribute(SemionManager.class.getName()));
if (reengineeringManager == null) {
throw new IllegalStateException(
@@ -90,7 +90,7 @@ public class SemionReengineerResource ex
try {
OWLOntology ontology;
- System.out.println("STORE PROVIDER : "+storeProvider);
+ System.out.println("STORE PROVIDER : "+storage);
System.out.println("OUTGRAPH: "+outputGraph);
String servletPath = httpServletRequest.getLocalAddr();
System.out.println("SERVER PATH : "+servletPath);
@@ -102,7 +102,7 @@ public class SemionReengineerResource ex
else{
ontology = reengineeringManager.performReengineering(servletPath, IRI.create(outputGraph), dataSource);
- storeProvider.getActiveOntologyStorage().store(ontology);
+ storage.store(ontology);
return Response.ok(ontology).build();
}
} catch (ReengineeringException e) {
Modified: incubator/stanbol/trunk/kres/ontologymanager/ontonet/pom.xml
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/ontologymanager/ontonet/pom.xml?rev=1083230&r1=1083229&r2=1083230&view=diff
==============================================================================
--- incubator/stanbol/trunk/kres/ontologymanager/ontonet/pom.xml (original)
+++ incubator/stanbol/trunk/kres/ontologymanager/ontonet/pom.xml Sat Mar 19 16:55:26 2011
@@ -51,6 +51,10 @@
<extensions>true</extensions>
<configuration>
<instructions>
+ <Bundle-ClassPath>
+ .,
+ OSGI-INF
+ </Bundle-ClassPath>
<Bundle-Activator>
org.apache.stanbol.ontologymanager.ontonet.impl.Activator
</Bundle-Activator>
@@ -58,6 +62,16 @@
org.apache.stanbol.ontologymanager.ontonet.*;version=${stanbol-version}
</Export-Package>
<Import-Package>
+ com.hp.hpl.jena.ontology,
+ com.hp.hpl.jena.util,
+ com.hp.hpl.jena.rdf.model,
+ javax.xml.namespace,
+ javax.xml.parsers,
+ javax.xml.xpath,
+ org.apache.clerezza.rdf.core.*,
+ org.slf4j,
+ org.w3c.dom,
+ org.xml.sax,
org.osgi.*,
org.semanticweb.owlapi.*,
org.slf4j.*;version=1.5.2,
@@ -108,18 +122,46 @@
<scope>provided</scope>
</dependency>
+ <!-- OWL deps -->
<dependency>
<groupId>owlapi</groupId>
<artifactId>owlapi</artifactId>
<version>3.0.0</version>
<scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>com.hp.hpl.jena</groupId>
+ <artifactId>jena</artifactId>
+ <version>2.6.2</version>
+ <scope>provided</scope>
+ <!--
+ <exclusions>
+ <exclusion>
+ <artifactId>slf4j-log4j12</artifactId>
+ <groupId>org.slf4j</groupId>
+ </exclusion>
+ </exclusions>
+ -->
+ </dependency>
<!-- Stanbol deps -->
<dependency>
- <groupId>org.apache.stanbol</groupId>
+ <groupId>eu.iksproject</groupId>
+ <artifactId>eu.iksproject.kres.shared.transformation</artifactId>
+ <version>${kres-version}</version>
+ </dependency>
+ <!--
+ <dependency> <groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.ontologymanager.store</artifactId>
- <version>${stanbol-version}</version>
+ <version>${stanbol-version}</version> </dependency>
+ -->
+
+ <!-- Persistence deps -->
+ <dependency>
+ <groupId>org.apache.clerezza</groupId>
+ <artifactId>org.apache.clerezza.rdf.core</artifactId>
+ <version>0.12-incubating-SNAPSHOT</version>
+ <scope>provided</scope>
</dependency>
<!-- Diagnostics deps -->
Modified: incubator/stanbol/trunk/kres/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/KReSONManager.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/KReSONManager.java?rev=1083230&r1=1083229&r2=1083230&view=diff
==============================================================================
--- incubator/stanbol/trunk/kres/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/KReSONManager.java (original)
+++ incubator/stanbol/trunk/kres/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/KReSONManager.java Sat Mar 19 16:55:26 2011
@@ -6,7 +6,7 @@ import org.apache.stanbol.ontologymanage
import org.apache.stanbol.ontologymanager.ontonet.api.ontology.ScopeRegistry;
import org.apache.stanbol.ontologymanager.ontonet.api.registry.KReSRegistryLoader;
import org.apache.stanbol.ontologymanager.ontonet.api.session.KReSSessionManager;
-import org.apache.stanbol.ontologymanager.store.api.OntologyStorage;
+import org.apache.stanbol.ontologymanager.ontonet.impl.ontology.OntologyStorage;
import org.semanticweb.owlapi.model.OWLDataFactory;
import org.semanticweb.owlapi.model.OWLOntologyAlreadyExistsException;
import org.semanticweb.owlapi.model.OWLOntologyManager;