Author: cihan
Date: Thu Apr 7 08:28:25 2011
New Revision: 1089770
URL: http://svn.apache.org/viewvc?rev=1089770&view=rev
Log:
STANBOL-151: Remove web module from ontology manager store reactor. Update
launcher accordingly.
Removed:
incubator/stanbol/trunk/ontologymanager/store/rest/
Modified:
incubator/stanbol/trunk/ontologymanager/store/jena/src/main/java/org/apache/stanbol/ontologymanager/store/jena/JenaPersistenceStore.java
incubator/stanbol/trunk/ontologymanager/store/jena/src/main/java/org/apache/stanbol/ontologymanager/store/jena/SynchronizerThread.java
incubator/stanbol/trunk/ontologymanager/store/launchers/lite/src/main/bundles/list.xml
incubator/stanbol/trunk/ontologymanager/store/pom.xml
Modified:
incubator/stanbol/trunk/ontologymanager/store/jena/src/main/java/org/apache/stanbol/ontologymanager/store/jena/JenaPersistenceStore.java
URL:
http://svn.apache.org/viewvc/incubator/stanbol/trunk/ontologymanager/store/jena/src/main/java/org/apache/stanbol/ontologymanager/store/jena/JenaPersistenceStore.java?rev=1089770&r1=1089769&r2=1089770&view=diff
==============================================================================
---
incubator/stanbol/trunk/ontologymanager/store/jena/src/main/java/org/apache/stanbol/ontologymanager/store/jena/JenaPersistenceStore.java
(original)
+++
incubator/stanbol/trunk/ontologymanager/store/jena/src/main/java/org/apache/stanbol/ontologymanager/store/jena/JenaPersistenceStore.java
Thu Apr 7 08:28:25 2011
@@ -61,6 +61,7 @@ import org.apache.stanbol.ontologymanage
import
org.apache.stanbol.ontologymanager.store.model.PropertyAssertions.PropertyAssertion;
import org.osgi.service.component.ComponentContext;
import org.osgi.service.component.ComponentFactory;
+import org.osgi.service.component.ComponentInstance;
import org.semanticweb.owlapi.apibinding.OWLManager;
import org.semanticweb.owlapi.io.RDFXMLOntologyFormat;
import org.semanticweb.owlapi.model.AddAxiom;
@@ -102,6 +103,7 @@ import org.semanticweb.owlapi.util.Infer
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+
import com.hp.hpl.jena.ontology.AllValuesFromRestriction;
import com.hp.hpl.jena.ontology.ComplementClass;
import com.hp.hpl.jena.ontology.ConversionException;
@@ -229,9 +231,10 @@ public class JenaPersistenceStore implem
if (this.componentFactory != null) {
final Dictionary props = new Hashtable();
props.put(ResourceManager.class.getName(), resourceManager);
- StoreSynchronizer storeSynchronizer = (StoreSynchronizer)
this.componentFactory.newInstance(
- props).getInstance();
- this.synchronizerThread = new
SynchronizerThread(storeSynchronizer);
+ ComponentInstance componentInstance =
this.componentFactory.newInstance(props);
+ StoreSynchronizer storeSynchronizer = (StoreSynchronizer)
componentInstance.getInstance();
+
+ this.synchronizerThread = new
SynchronizerThread(storeSynchronizer, componentInstance);
synchronizerThread.start();
} else {
logger.info("No synchronizer factory found");
@@ -2185,6 +2188,7 @@ public class JenaPersistenceStore implem
Set<OWLObjectProperty> equiProperties =
reasoner.getEquivalentObjectProperties(owlObjectProperty)
.getEntities();
for (OWLObjectProperty objectProp : equiProperties) {
+
PropertyMetaInformation datatypePropertyMetaInformation =
generatePropertyMetaInformation(objectProp
.getIRI().toString());
equivalentProperties.getPropertyMetaInformation().add(datatypePropertyMetaInformation);
@@ -2987,10 +2991,9 @@ public class JenaPersistenceStore implem
OWLlinkReasonerConfiguration config = new
OWLlinkReasonerConfiguration(progressMonitor, REASONER_URL,
IndividualNodeSetPolicy.BY_NAME);
- OWLReasoner reasoner = factory.createNonBufferingReasoner(ontology,
config);
+ OWLlinkHTTPXMLReasoner reasoner = (OWLlinkHTTPXMLReasoner)
factory.createNonBufferingReasoner(ontology, config);
reasoner.flush();
- reasoner.prepareReasoner();
- return (OWLlinkHTTPXMLReasoner) reasoner;
+ return reasoner;
}
private OntModel addInferencesToModel(OntModel model, String ontologyURI,
InferenceScope infScope) {
@@ -3009,7 +3012,6 @@ public class JenaPersistenceStore implem
IRI kb = reasoner.getDefaultKB();
try {
reasoner.flush();
- reasoner.prepareReasoner();
long t2 = System.currentTimeMillis();
OWLOntology ont = manager.createOntology();
generateInferredAxioms(manager, ont, reasoner,
inferredAxiomGenerators);
Modified:
incubator/stanbol/trunk/ontologymanager/store/jena/src/main/java/org/apache/stanbol/ontologymanager/store/jena/SynchronizerThread.java
URL:
http://svn.apache.org/viewvc/incubator/stanbol/trunk/ontologymanager/store/jena/src/main/java/org/apache/stanbol/ontologymanager/store/jena/SynchronizerThread.java?rev=1089770&r1=1089769&r2=1089770&view=diff
==============================================================================
---
incubator/stanbol/trunk/ontologymanager/store/jena/src/main/java/org/apache/stanbol/ontologymanager/store/jena/SynchronizerThread.java
(original)
+++
incubator/stanbol/trunk/ontologymanager/store/jena/src/main/java/org/apache/stanbol/ontologymanager/store/jena/SynchronizerThread.java
Thu Apr 7 08:28:25 2011
@@ -1,5 +1,6 @@
package org.apache.stanbol.ontologymanager.store.jena;
+import org.osgi.service.component.ComponentInstance;
import org.apache.stanbol.ontologymanager.store.api.StoreSynchronizer;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -9,10 +10,12 @@ public class SynchronizerThread extends
Logger logger = LoggerFactory.getLogger(SynchronizerThread.class);
private StoreSynchronizer synchronizer;
+ private ComponentInstance instance;
private Boolean done = false;
- public SynchronizerThread(StoreSynchronizer synchronizer) {
+ public SynchronizerThread(StoreSynchronizer synchronizer,
ComponentInstance instance) {
this.synchronizer = synchronizer;
+ this.instance = instance;
}
@Override
@@ -45,5 +48,6 @@ public class SynchronizerThread extends
this.synchronizer.clear();
logger.info("Stopped synchronizer");
}
+ this.instance.dispose();
}
}
Modified:
incubator/stanbol/trunk/ontologymanager/store/launchers/lite/src/main/bundles/list.xml
URL:
http://svn.apache.org/viewvc/incubator/stanbol/trunk/ontologymanager/store/launchers/lite/src/main/bundles/list.xml?rev=1089770&r1=1089769&r2=1089770&view=diff
==============================================================================
---
incubator/stanbol/trunk/ontologymanager/store/launchers/lite/src/main/bundles/list.xml
(original)
+++
incubator/stanbol/trunk/ontologymanager/store/launchers/lite/src/main/bundles/list.xml
Thu Apr 7 08:28:25 2011
@@ -66,11 +66,11 @@
<artifactId>httpcore-osgi</artifactId>
<version>4.0.1</version>
</bundle>
- <bundle>
+ <!-- <bundle>
<groupId>org.apache.commons</groupId>
<artifactId>commons-math</artifactId>
<version>2.1</version>
- </bundle>
+ </bundle>-->
<bundle>
<groupId>org.apache.derby</groupId>
<artifactId>derby</artifactId>
@@ -189,7 +189,31 @@
</bundle>
</startLevel>
+ <!-- Stanbol Web -->
<startLevel level="17">
+ <bundle>
+ <groupId>org.apache.stanbol</groupId>
+
<artifactId>org.apache.stanbol.commons.web.base</artifactId>
+ <version>0.9-SNAPSHOT</version>
+ </bundle>
+ <bundle>
+ <groupId>org.apache.stanbol</groupId>
+
<artifactId>org.apache.stanbol.commons.web.home</artifactId>
+ <version>0.9-SNAPSHOT</version>
+ </bundle>
+ <bundle>
+ <groupId>org.apache.stanbol</groupId>
+
<artifactId>org.apache.stanbol.commons.web.sparql</artifactId>
+ <version>0.9-SNAPSHOT</version>
+ </bundle>
+ <bundle>
+ <groupId>org.apache.stanbol</groupId>
+ <artifactId>org.apache.stanbol.jsonld</artifactId>
+ <version>0.9-SNAPSHOT</version>
+ </bundle>
+ </startLevel>
+
+ <startLevel level="18">
<bundle>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.ontologymanager.store.api</artifactId>
@@ -197,7 +221,7 @@
</bundle>
<bundle>
<groupId>org.apache.stanbol</groupId>
-
<artifactId>org.apache.stanbol.ontologymanager.store.web</artifactId>
+
<artifactId>org.apache.stanbol.commons.web.ontology</artifactId>
<version>0.9-SNAPSHOT</version>
</bundle>
<bundle>
Modified: incubator/stanbol/trunk/ontologymanager/store/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/stanbol/trunk/ontologymanager/store/pom.xml?rev=1089770&r1=1089769&r2=1089770&view=diff
==============================================================================
--- incubator/stanbol/trunk/ontologymanager/store/pom.xml (original)
+++ incubator/stanbol/trunk/ontologymanager/store/pom.xml Thu Apr 7 08:28:25
2011
@@ -47,13 +47,11 @@
<module>ext/org.semanticweb.owlapi</module>
<module>ext/org.semanticweb.owlapi.owllink</module>
<module>api</module>
- <module>rest</module>
<module>rest-client</module>
<module>jena</module>
<module>clerezza</module>
<module>tdb</module>
<!--<module>fise-adapter</module>-->
- <module>launchers/lite</module>
- <!--<module>launchers/fise</module>-->
+ <!--<module>launchers/lite</module>-->
</modules>
</project>
