You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stanbol.apache.org by en...@apache.org on 2010/12/29 19:04:22 UTC
svn commit: r1053689 [6/6] - in /incubator/stanbol/trunk/kres:
eu.iksproject.kres.api/
eu.iksproject.kres.api/src/main/java/eu/iksproject/kres/api/manager/ontology/
eu.iksproject.kres.api/src/main/java/eu/iksproject/kres/api/manager/registry/
eu.ikspro...
Modified: incubator/stanbol/trunk/kres/eu.iksproject.kres.semion.refactorer/src/test/java/eu/iksproject/kres/semion/refactorer/SemionRefactoringTest.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/eu.iksproject.kres.semion.refactorer/src/test/java/eu/iksproject/kres/semion/refactorer/SemionRefactoringTest.java?rev=1053689&r1=1053688&r2=1053689&view=diff
==============================================================================
--- incubator/stanbol/trunk/kres/eu.iksproject.kres.semion.refactorer/src/test/java/eu/iksproject/kres/semion/refactorer/SemionRefactoringTest.java (original)
+++ incubator/stanbol/trunk/kres/eu.iksproject.kres.semion.refactorer/src/test/java/eu/iksproject/kres/semion/refactorer/SemionRefactoringTest.java Wed Dec 29 18:04:19 2010
@@ -1,14 +1,16 @@
package eu.iksproject.kres.semion.refactorer;
-import eu.iksproject.kres.api.rules.KReSRule;
import static org.junit.Assert.fail;
import java.io.InputStream;
+import java.util.Dictionary;
+import java.util.Hashtable;
import java.util.Set;
+import org.apache.clerezza.rdf.core.access.TcManager;
+import org.apache.clerezza.rdf.core.serializedform.Serializer;
import org.junit.BeforeClass;
import org.junit.Test;
-import org.openjena.atlas.logging.Log;
import org.semanticweb.owlapi.apibinding.OWLManager;
import org.semanticweb.owlapi.model.IRI;
import org.semanticweb.owlapi.model.OWLDataFactory;
@@ -20,6 +22,8 @@ import org.semanticweb.owlapi.model.OWLO
import org.semanticweb.owlapi.model.OWLOntologyCreationException;
import org.semanticweb.owlapi.model.OWLOntologyStorageException;
+import eu.iksproject.kres.api.manager.KReSONManager;
+import eu.iksproject.kres.api.rules.KReSRule;
import eu.iksproject.kres.api.rules.NoSuchRecipeException;
import eu.iksproject.kres.api.rules.Recipe;
import eu.iksproject.kres.api.rules.RuleStore;
@@ -27,10 +31,11 @@ import eu.iksproject.kres.api.rules.util
import eu.iksproject.kres.api.semion.SemionRefactorer;
import eu.iksproject.kres.api.semion.SemionRefactoringException;
import eu.iksproject.kres.api.semion.util.RecipeList;
-import eu.iksproject.kres.rules.KReSKB;
+import eu.iksproject.kres.manager.ONManager;
+import eu.iksproject.kres.reasoners.KReSReasonerImpl;
import eu.iksproject.kres.rules.manager.RecipeImpl;
import eu.iksproject.kres.rules.parser.KReSRuleParser;
-
+import eu.iksproject.kres.semion.manager.SemionManagerImpl;
public class SemionRefactoringTest {
@@ -41,21 +46,23 @@ public class SemionRefactoringTest {
@BeforeClass
public static void setup(){
- recipeIRI = IRI.create("http://kres.iks-project.eu/ontology/meta/rmi_config.owl#MyTestRecipe");
-
- InputStream ontologyStream = SemionRefactoringTest.class.getResourceAsStream("/META-INF/test/testKReSOnt.owl");
- InputStream recipeStream = SemionRefactoringTest.class.getResourceAsStream("/META-INF/test/rmi.owl");
+ recipeIRI = IRI
+ .create("http://kres.iks-project.eu/ontology/meta/rmi_config.owl#MyTestRecipe");
+ InputStream ontologyStream = SemionRefactoringTest.class
+ .getResourceAsStream("/META-INF/test/testKReSOnt.owl");
+ InputStream recipeStream = SemionRefactoringTest.class
+ .getResourceAsStream("/META-INF/test/rmi.owl");
try {
- final OWLOntology recipeModel = OWLManager.createOWLOntologyManager().loadOntologyFromOntologyDocument(recipeStream);
- ontology = OWLManager.createOWLOntologyManager().loadOntologyFromOntologyDocument(ontologyStream);
-
+ final OWLOntology recipeModel = OWLManager
+ .createOWLOntologyManager()
+ .loadOntologyFromOntologyDocument(recipeStream);
+ ontology = OWLManager.createOWLOntologyManager()
+ .loadOntologyFromOntologyDocument(ontologyStream);
ruleStore = new RuleStore() {
-
-
@Override
public void setStore(OWLOntology owl) {
// TODO Auto-generated method stub
@@ -87,62 +94,79 @@ public class SemionRefactoringTest {
}
@Override
- public Recipe getRecipe(IRI recipeIRI) throws NoSuchRecipeException {
+ public Recipe getRecipe(IRI recipeIRI)
+ throws NoSuchRecipeException {
Recipe recipe = null;
if(recipeIRI!=null){
OWLDataFactory factory = OWLManager.getOWLDataFactory();
- OWLIndividual recipeIndividual = factory.getOWLNamedIndividual(recipeIRI);
+ OWLIndividual recipeIndividual = factory
+ .getOWLNamedIndividual(recipeIRI);
if(recipeIndividual != null){
String ruleNS = "http://kres.iks-project.eu/ontology/meta/rmi.owl#";
/**
- * First get the recipe description in the rule/recipe ontology.
+ * First get the recipe description in the
+ * rule/recipe ontology.
*/
- OWLDataProperty hasDescription = factory.getOWLDataProperty(IRI.create(ruleNS + "hasDescription"));
+ OWLDataProperty hasDescription = factory
+ .getOWLDataProperty(IRI.create(ruleNS
+ + "hasDescription"));
String recipeDescription = null;
- Set<OWLLiteral> descriptions = recipeIndividual.getDataPropertyValues(hasDescription, recipeModel);
+ Set<OWLLiteral> descriptions = recipeIndividual
+ .getDataPropertyValues(hasDescription,
+ recipeModel);
for(OWLLiteral description : descriptions){
recipeDescription = description.getLiteral();
}
-
/**
- * Then retrieve the rules associated to the recipe in the rule store.
+ * Then retrieve the rules associated to the recipe
+ * in the rule store.
*/
- OWLObjectProperty objectProperty = factory.getOWLObjectProperty(IRI.create(ruleNS + "hasRule"));
- Set<OWLIndividual> rules = recipeIndividual.getObjectPropertyValues(objectProperty, ontology);
-
+ OWLObjectProperty objectProperty = factory
+ .getOWLObjectProperty(IRI.create(ruleNS
+ + "hasRule"));
+ Set<OWLIndividual> rules = recipeIndividual
+ .getObjectPropertyValues(objectProperty,
+ ontology);
String kReSRulesInKReSSyntax = "";
-
/**
- * Fetch the rule content expressed as a literal in KReSRule Syntax.
+ * Fetch the rule content expressed as a literal in
+ * KReSRule Syntax.
*/
- OWLDataProperty hasBodyAndHead = factory.getOWLDataProperty(IRI.create(ruleNS + "hasBodyAndHead"));
+ OWLDataProperty hasBodyAndHead = factory
+ .getOWLDataProperty(IRI.create(ruleNS
+ + "hasBodyAndHead"));
for(OWLIndividual rule : rules){
- Set<OWLLiteral> kReSRuleLiterals = rule.getDataPropertyValues(hasBodyAndHead, ontology);
+ Set<OWLLiteral> kReSRuleLiterals = rule
+ .getDataPropertyValues(hasBodyAndHead,
+ ontology);
for(OWLLiteral kReSRuleLiteral : kReSRuleLiterals){
- String ruleTmp = kReSRuleLiteral.getLiteral().replace("<", "<");
+ String ruleTmp = kReSRuleLiteral
+ .getLiteral().replace("<", "<");
ruleTmp = ruleTmp.replace(">", ">");
- kReSRulesInKReSSyntax += ruleTmp + System.getProperty("line.separator");
+ kReSRulesInKReSSyntax += ruleTmp
+ + System
+ .getProperty("line.separator");
}
}
-
/**
* Create the Recipe object.
*/
- KReSRuleList ruleList = KReSRuleParser.parse(kReSRulesInKReSSyntax).getkReSRuleList();
- recipe = new RecipeImpl(recipeIRI, recipeDescription, ruleList);
- }
- else{
+ KReSRuleList ruleList = KReSRuleParser.parse(
+ kReSRulesInKReSSyntax).getkReSRuleList();
+ recipe = new RecipeImpl(recipeIRI,
+ recipeDescription, ruleList);
+ } else {
throw new NoSuchRecipeException(recipeIRI);
}
}
@@ -169,14 +193,16 @@ public class SemionRefactoringTest {
}
@Override
- public Recipe addRuleToRecipe(String recipeID, String kReSRuleInKReSSyntax)
+ public Recipe addRuleToRecipe(String recipeID,
+ String kReSRuleInKReSSyntax)
throws NoSuchRecipeException {
return null;
}
@Override
- public Recipe addRuleToRecipe(Recipe recipe, String kReSRuleInKReSSyntax) {
+ public Recipe addRuleToRecipe(Recipe recipe,
+ String kReSRuleInKReSSyntax) {
return null;
// TODO Auto-generated method stub
@@ -191,17 +217,20 @@ public class SemionRefactoringTest {
@Override
public boolean removeRecipe(Recipe recipe) {
- throw new UnsupportedOperationException("Not supported yet.");
+ throw new UnsupportedOperationException(
+ "Not supported yet.");
}
@Override
public boolean removeRecipe(IRI recipeIRI) {
- throw new UnsupportedOperationException("Not supported yet.");
+ throw new UnsupportedOperationException(
+ "Not supported yet.");
}
@Override
public boolean removeRule(KReSRule rule) {
- throw new UnsupportedOperationException("Not supported yet.");
+ throw new UnsupportedOperationException(
+ "Not supported yet.");
}
};
} catch (OWLOntologyCreationException e) {
@@ -211,8 +240,13 @@ public class SemionRefactoringTest {
}
@Test
- public void refactoringTest(){
- SemionRefactorer refactorer = new SemionRefactorerImpl();
+ public void refactoringTest() throws Exception {
+ Dictionary<String, Object> emptyConfig = new Hashtable<String, Object>();
+ KReSONManager onm = new ONManager(null, emptyConfig);
+ SemionRefactorer refactorer = new SemionRefactorerImpl(null,
+ new Serializer(), new TcManager(), onm, new SemionManagerImpl(
+ onm), ruleStore, new KReSReasonerImpl(emptyConfig),
+ emptyConfig);
try {
refactorer.ontologyRefactoring(ontology, recipeIRI);
} catch (SemionRefactoringException e) {
Modified: incubator/stanbol/trunk/kres/eu.iksproject.kres.shared/dependency/hermit124/pom.xml
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/eu.iksproject.kres.shared/dependency/hermit124/pom.xml?rev=1053689&r1=1053688&r2=1053689&view=diff
==============================================================================
--- incubator/stanbol/trunk/kres/eu.iksproject.kres.shared/dependency/hermit124/pom.xml (original)
+++ incubator/stanbol/trunk/kres/eu.iksproject.kres.shared/dependency/hermit124/pom.xml Wed Dec 29 18:04:19 2010
@@ -6,17 +6,22 @@
<parent>
<groupId>eu.iksproject</groupId>
<artifactId>eu.iksproject.kres.parent</artifactId>
- <version>0.6-SNAPSHOT</version>
+ <version>0.7</version>
<relativePath>../parent</relativePath>
</parent>
<groupId>eu.iksproject</groupId>
<artifactId>eu.iksproject.kres.shared.dependency.hermit</artifactId>
- <version>0.6-SNAPSHOT</version>
+ <version>${kres-version}</version>
<packaging>bundle</packaging>
<name>IKS KReS hermit OSGI bundle</name>
+ <properties>
+ <kres-version>0.7</kres-version>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ </properties>
+
<dependencies>
<dependency>
<groupId>org.apache.felix</groupId>
@@ -45,8 +50,128 @@
<configuration>
<instructions>
<Bundle-ClassPath>.,hermit124/hermit-1.2.4.jar</Bundle-ClassPath>
- <Export-Package>com.clarkparsia.owlapi.explanation,com.clarkparsia.owlapi.explanation.io,com.clarkparsia.owlapi.explanation.util,com.clarkparsia.owlapi.modularity.locality,de.uulm.ecs.ai.owlapi.krssparser,de.uulm.ecs.ai.owlapi.krssrenderer,dk.brics.automaton,gnu.getopt,org.apache.axiom.attachments,org.apache.axiom.attachments.impl,org.apache.axiom.attachments.lifecycle,org.apache.axiom.attachments.lifecycle.impl,org.apache.axiom.attachments.utils,org.apache.axiom.c14n,org.apache.axiom.c14n.exceptions,org.apache.axiom.c14n.helpers,org.apache.axiom.c14n.impl,org.apache.axiom.c14n.omwrapper,org.apache.axiom.c14n.omwrapper.factory,org.apache.axiom.c14n.omwrapper.interfaces,org.apache.axiom.c14n.utils,org.apache.axiom.om,org.apache.axiom.om.ds,org.apache.axiom.om.ds.custombuilder,org.apache.axiom.om.impl,org.apache.axiom.om.impl.builder,org.apache.axiom.om.impl.dom,org.apache.axiom.om.impl.dom.factory,org.apache.axiom.om.impl.dom.jaxp,org.apache.axiom.om.i
mpl.exception,org.apache.axiom.om.impl.jaxp,org.apache.axiom.om.impl.llom,org.apache.axiom.om.impl.llom.factory,org.apache.axiom.om.impl.llom.util,org.apache.axiom.om.impl.serialize,org.apache.axiom.om.impl.traverse,org.apache.axiom.om.impl.util,org.apache.axiom.om.util,org.apache.axiom.om.xpath,org.apache.axiom.soap,org.apache.axiom.soap.impl.builder,org.apache.axiom.soap.impl.dom,org.apache.axiom.soap.impl.dom.factory,org.apache.axiom.soap.impl.dom.soap11,org.apache.axiom.soap.impl.dom.soap12,org.apache.axiom.soap.impl.llom,org.apache.axiom.soap.impl.llom.soap11,org.apache.axiom.soap.impl.llom.soap12,org.apache.commons.logging,org.apache.commons.logging.impl,org.coode.owlapi.functionalparser,org.coode.owlapi.functionalrenderer,org.coode.owlapi.latex,org.coode.owlapi.manchesterowlsyntax,org.coode.owlapi.obo.parser,org.coode.owlapi.obo.renderer,org.coode.owlapi.owlxml.renderer,org.coode.owlapi.owlxmlparser,org.coode.owlapi.rdf.model,org.coode.owlapi.rdf.rdfxml,org.coode.owla
pi.rdf.renderer,org.coode.owlapi.rdfxml.parser,org.coode.owlapi.turtle,org.coode.string,org.coode.xml,org.semanticweb.HermiT,org.semanticweb.HermiT.blocking,org.semanticweb.HermiT.cli,org.semanticweb.HermiT.datatypes,org.semanticweb.HermiT.datatypes.anyuri,org.semanticweb.HermiT.datatypes.binarydata,org.semanticweb.HermiT.datatypes.bool,org.semanticweb.HermiT.datatypes.datetime,org.semanticweb.HermiT.datatypes.doublenum,org.semanticweb.HermiT.datatypes.floatnum,org.semanticweb.HermiT.datatypes.owlreal,org.semanticweb.HermiT.datatypes.rdfplainliteral,org.semanticweb.HermiT.datatypes.xmlliteral,org.semanticweb.HermiT.debugger,org.semanticweb.HermiT.debugger.commands,org.semanticweb.HermiT.examples,org.semanticweb.HermiT.existentials,org.semanticweb.HermiT.graph,org.semanticweb.HermiT.hierarchy,org.semanticweb.HermiT.model,org.semanticweb.HermiT.monitor,org.semanticweb.HermiT.structural,org.semanticweb.HermiT.tableau,org.semanticweb.owlapi,org.semanticweb.owlapi.apibinding,org.
semanticweb.owlapi.debugging,org.semanticweb.owlapi.expression,org.semanticweb.owlapi.io,org.semanticweb.owlapi.metrics,org.semanticweb.owlapi.model,org.semanticweb.owlapi.modularity,org.semanticweb.owlapi.normalform,org.semanticweb.owlapi.profiles,org.semanticweb.owlapi.rdf.syntax,org.semanticweb.owlapi.rdf.util,org.semanticweb.owlapi.reasoner,org.semanticweb.owlapi.reasoner.impl,org.semanticweb.owlapi.reasoner.structural,org.semanticweb.owlapi.util,org.semanticweb.owlapi.vocab,rationals,rationals.algebra,rationals.converters,rationals.converters.analyzers,rationals.expr,rationals.properties,rationals.transformations,rationals.utils,uk.ac.manchester.cs.bhig.util,uk.ac.manchester.cs.owl.explanation.ordering,uk.ac.manchester.cs.owl.owlapi,uk.ac.manchester.cs.owl.owlapi.mansyntaxrenderer,uk.ac.manchester.cs.owl.owlapi.turtle.parser,uk.ac.manchester.cs.owlapi.dlsyntax,uk.ac.manchester.cs.owlapi.dlsyntax.parser,uk.ac.manchester.cs.owlapi.modularity</Export-Package>
- <Private-Package></Private-Package>
+ <Export-Package>
+ com.clarkparsia.owlapi.explanation,
+ com.clarkparsia.owlapi.explanation.io,
+ com.clarkparsia.owlapi.explanation.util,
+ com.clarkparsia.owlapi.modularity.locality,
+ de.uulm.ecs.ai.owlapi.krssparser,
+ de.uulm.ecs.ai.owlapi.krssrenderer,
+ dk.brics.automaton,gnu.getopt,
+ org.apache.axiom.attachments,
+ org.apache.axiom.attachments.impl,
+ org.apache.axiom.attachments.lifecycle,
+ org.apache.axiom.attachments.lifecycle.impl,
+ org.apache.axiom.attachments.utils,
+ org.apache.axiom.c14n,
+ org.apache.axiom.c14n.exceptions,
+ org.apache.axiom.c14n.helpers,
+ org.apache.axiom.c14n.impl,
+ org.apache.axiom.c14n.omwrapper,
+ org.apache.axiom.c14n.omwrapper.factory,
+ org.apache.axiom.c14n.omwrapper.interfaces,
+ org.apache.axiom.c14n.utils,
+ org.apache.axiom.om,
+ org.apache.axiom.om.ds,
+ org.apache.axiom.om.ds.custombuilder,
+ org.apache.axiom.om.impl,
+ org.apache.axiom.om.impl.builder,
+ org.apache.axiom.om.impl.dom,
+ org.apache.axiom.om.impl.dom.factory,
+ org.apache.axiom.om.impl.dom.jaxp,
+ org.apache.axiom.om.impl.exception,
+ org.apache.axiom.om.impl.jaxp,
+ org.apache.axiom.om.impl.llom,
+ org.apache.axiom.om.impl.llom.factory,
+ org.apache.axiom.om.impl.llom.util,
+ org.apache.axiom.om.impl.serialize,
+ org.apache.axiom.om.impl.traverse,
+ org.apache.axiom.om.impl.util,
+ org.apache.axiom.om.util,
+ org.apache.axiom.om.xpath,
+ org.apache.axiom.soap,
+ org.apache.axiom.soap.impl.builder,
+ org.apache.axiom.soap.impl.dom,
+ org.apache.axiom.soap.impl.dom.factory,
+ org.apache.axiom.soap.impl.dom.soap11,
+ org.apache.axiom.soap.impl.dom.soap12,
+ org.apache.axiom.soap.impl.llom,
+ org.apache.axiom.soap.impl.llom.soap11,
+ org.apache.axiom.soap.impl.llom.soap12,
+ org.apache.commons.logging,
+ org.apache.commons.logging.impl,
+ org.coode.owlapi.functionalparser,
+ org.coode.owlapi.functionalrenderer,
+ org.coode.owlapi.latex,
+ org.coode.owlapi.manchesterowlsyntax,
+ org.coode.owlapi.obo.parser,
+ org.coode.owlapi.obo.renderer,
+ org.coode.owlapi.owlxml.renderer,
+ org.coode.owlapi.owlxmlparser,
+ org.coode.owlapi.rdf.model,
+ org.coode.owlapi.rdf.rdfxml,
+ org.coode.owlapi.rdf.renderer,
+ org.coode.owlapi.rdfxml.parser,
+ org.coode.owlapi.turtle,
+ org.coode.string,org.coode.xml,
+ org.semanticweb.HermiT,
+ org.semanticweb.HermiT.blocking,
+ org.semanticweb.HermiT.cli,
+ org.semanticweb.HermiT.datatypes,
+ org.semanticweb.HermiT.datatypes.anyuri,
+ org.semanticweb.HermiT.datatypes.binarydata,
+ org.semanticweb.HermiT.datatypes.bool,
+ org.semanticweb.HermiT.datatypes.datetime,
+ org.semanticweb.HermiT.datatypes.doublenum,
+ org.semanticweb.HermiT.datatypes.floatnum,
+ org.semanticweb.HermiT.datatypes.owlreal,
+ org.semanticweb.HermiT.datatypes.rdfplainliteral,
+ org.semanticweb.HermiT.datatypes.xmlliteral,
+ org.semanticweb.HermiT.debugger,
+ org.semanticweb.HermiT.debugger.commands,
+ org.semanticweb.HermiT.examples,
+ org.semanticweb.HermiT.existentials,
+ org.semanticweb.HermiT.graph,
+ org.semanticweb.HermiT.hierarchy,
+ org.semanticweb.HermiT.model,
+ org.semanticweb.HermiT.monitor,
+ org.semanticweb.HermiT.structural,
+ org.semanticweb.HermiT.tableau,
+ org.semanticweb.owlapi,
+ org.semanticweb.owlapi.apibinding,
+ org.semanticweb.owlapi.debugging,
+ org.semanticweb.owlapi.expression,
+ org.semanticweb.owlapi.io,
+ org.semanticweb.owlapi.metrics,
+ org.semanticweb.owlapi.model,
+ org.semanticweb.owlapi.modularity,
+ org.semanticweb.owlapi.normalform,
+ org.semanticweb.owlapi.profiles,
+ org.semanticweb.owlapi.rdf.syntax,
+ org.semanticweb.owlapi.rdf.util,
+ org.semanticweb.owlapi.reasoner,
+ org.semanticweb.owlapi.reasoner.impl,
+ org.semanticweb.owlapi.reasoner.structural,
+ org.semanticweb.owlapi.util,
+ org.semanticweb.owlapi.vocab,
+ rationals,
+ rationals.algebra,
+ rationals.converters,
+ rationals.converters.analyzers,
+ rationals.expr,
+ rationals.properties,
+ rationals.transformations,
+ rationals.utils,
+ uk.ac.manchester.cs.bhig.util,
+ uk.ac.manchester.cs.owl.explanation.ordering,
+ uk.ac.manchester.cs.owl.owlapi,
+ uk.ac.manchester.cs.owl.owlapi.mansyntaxrenderer,
+ uk.ac.manchester.cs.owl.owlapi.turtle.parser,
+ uk.ac.manchester.cs.owlapi.dlsyntax,
+ uk.ac.manchester.cs.owlapi.dlsyntax.parser,
+ uk.ac.manchester.cs.owlapi.modularity
+ </Export-Package>
+ <Private-Package />
<Import-Package>
!javax.xml.stream.*,
!javax.activation.*,
@@ -134,7 +259,8 @@
<configuration>
<tasks>
<property name="plugins" refid="maven.runtime.classpath"/>
- <pathconvert pathsep=" " dirsep="/" property="project.build.url">
+ <pathconvert pathsep=" " dirsep="/"
+ property="project.build.url">
<path path="${project.build.directory}"/>
</pathconvert>
<pathconvert property="plugins.jars" pathsep=":">
@@ -149,23 +275,28 @@
<mapper>
<chainedmapper>
<flattenmapper/>
- <globmapper from="*" to="file:modules/*" casesensitive="no"/>
+ <globmapper from="*" to="file:modules/*"
+ casesensitive="no" />
</chainedmapper>
</mapper>
</pathconvert>
- <makeurl property="main.bundle.url" file="${project.build.directory}/${project.artifactId}-${project.version}.jar"/>
+ <makeurl property="main.bundle.url"
+ file="${project.build.directory}/${project.artifactId}-${project.version}.jar" />
<echo file="${project.build.directory}/run.properties">
felix.auto.install=${urls}
felix.auto.start=${main.bundle.url}
org.osgi.framework.storage=${project.build.url}/felix-cache
org.osgi.framework.bootdelegation=*
</echo>
- <replace file="${project.build.directory}/run.properties" token="\" value="\\"/>
+ <replace file="${project.build.directory}/run.properties"
+ token="\" value="\\" />
<echo file="${project.build.directory}/config.properties">
felix.auto.install="${bundles}"
felix.auto.start=file:modules/${project.artifactId}-${project.version}.jar
</echo>
- <copy file="${maven.dependency.org.apache.felix.org.apache.felix.main.jar.path}" tofile="${project.build.directory}/felix.jar"/>
+ <copy
+ file="${maven.dependency.org.apache.felix.org.apache.felix.main.jar.path}"
+ tofile="${project.build.directory}/felix.jar" />
</tasks>
</configuration>
</execution>
@@ -196,7 +327,4 @@
</profile>
</profiles>
- <properties>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- </properties>
</project>
Modified: incubator/stanbol/trunk/kres/eu.iksproject.kres.shared/dependency/mysql/pom.xml
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/eu.iksproject.kres.shared/dependency/mysql/pom.xml?rev=1053689&r1=1053688&r2=1053689&view=diff
==============================================================================
--- incubator/stanbol/trunk/kres/eu.iksproject.kres.shared/dependency/mysql/pom.xml (original)
+++ incubator/stanbol/trunk/kres/eu.iksproject.kres.shared/dependency/mysql/pom.xml Wed Dec 29 18:04:19 2010
@@ -6,16 +6,22 @@
<parent>
<groupId>eu.iksproject</groupId>
<artifactId>eu.iksproject.kres.parent</artifactId>
- <version>0.6-SNAPSHOT</version>
+ <version>0.7</version>
<relativePath>../parent</relativePath>
</parent>
<groupId>eu.iksproject</groupId>
<artifactId>eu.iksproject.kres.shared.dependency.mysql</artifactId>
- <version>0.6-SNAPSHOT</version>
+ <version>${kres-version}</version>
<packaging>bundle</packaging>
<name>IKS KReS MySQL dependency</name>
+
+ <properties>
+ <kres-version>0.7</kres-version>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ </properties>
+
<dependencies>
<dependency>
<groupId>mysql</groupId>
Modified: incubator/stanbol/trunk/kres/eu.iksproject.kres.shared/dependency/owlapi3/pom.xml
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/eu.iksproject.kres.shared/dependency/owlapi3/pom.xml?rev=1053689&r1=1053688&r2=1053689&view=diff
==============================================================================
--- incubator/stanbol/trunk/kres/eu.iksproject.kres.shared/dependency/owlapi3/pom.xml (original)
+++ incubator/stanbol/trunk/kres/eu.iksproject.kres.shared/dependency/owlapi3/pom.xml Wed Dec 29 18:04:19 2010
@@ -6,16 +6,21 @@
<parent>
<groupId>eu.iksproject</groupId>
<artifactId>eu.iksproject.kres.parent</artifactId>
- <version>0.6-SNAPSHOT</version>
+ <version>0.7</version>
<relativePath>../parent</relativePath>
</parent>
<groupId>eu.iksproject</groupId>
<artifactId>eu.iksproject.kres.shared.dependency.owlapi</artifactId>
- <version>0.6-SNAPSHOT</version>
+ <version>${kres-version}</version>
<packaging>bundle</packaging>
<name>IKS KReS owlapi OSGi Bundle</name>
+ <properties>
+ <kres-version>0.7</kres-version>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ </properties>
+
<dependencies>
<dependency>
<groupId>org.apache.felix</groupId>
@@ -45,8 +50,28 @@
<configuration>
<instructions>
- <Import-Package>javax.swing, javax.xml.parsers, org.xml.sax, org.xml.sax.helpers,de.uulm.ecs.ai.*,org.semanticweb.owlapi.*,org.coode.*,uk.ac.manchester.cs.*,com.clarkparsia.owlapi.*</Import-Package>
- <Export-Package> javax.swing, javax.xml.parsers, org.xml.sax, org.xml.sax.helpers,de.uulm.ecs.ai.*,org.semanticweb.owlapi.*,org.coode.*,uk.ac.manchester.cs.*,com.clarkparsia.owlapi.*</Export-Package>
+ <Import-Package>
+ javax.swing,
+ javax.xml.parsers,
+ org.xml.sax,
+ org.xml.sax.helpers,
+ de.uulm.ecs.ai.*,
+ org.semanticweb.owlapi.*,
+ org.coode.*,
+ uk.ac.manchester.cs.*,
+ com.clarkparsia.owlapi.*
+ </Import-Package>
+ <Export-Package>
+ java.swing,
+ javax.xml.parsers,
+ org.xml.sax,
+ org.xml.sax.helpers,
+ de.uulm.ecs.ai.*,
+ org.semanticweb.owlapi.*,
+ org.coode.*,
+ uk.ac.manchester.cs.*,
+ com.clarkparsia.owlapi.*
+ </Export-Package>
</instructions>
</configuration>
@@ -106,7 +131,8 @@
<configuration>
<tasks>
<property name="plugins" refid="maven.runtime.classpath"/>
- <pathconvert pathsep=" " dirsep="/" property="project.build.url">
+ <pathconvert pathsep=" " dirsep="/"
+ property="project.build.url">
<path path="${project.build.directory}"/>
</pathconvert>
<pathconvert property="plugins.jars" pathsep=":">
@@ -121,23 +147,28 @@
<mapper>
<chainedmapper>
<flattenmapper/>
- <globmapper from="*" to="file:modules/*" casesensitive="no"/>
+ <globmapper from="*" to="file:modules/*"
+ casesensitive="no" />
</chainedmapper>
</mapper>
</pathconvert>
- <makeurl property="main.bundle.url" file="${project.build.directory}/${project.artifactId}-${project.version}.jar"/>
+ <makeurl property="main.bundle.url"
+ file="${project.build.directory}/${project.artifactId}-${project.version}.jar" />
<echo file="${project.build.directory}/run.properties">
felix.auto.install=${urls}
felix.auto.start=${main.bundle.url}
org.osgi.framework.storage=${project.build.url}/felix-cache
org.osgi.framework.bootdelegation=*
</echo>
- <replace file="${project.build.directory}/run.properties" token="\" value="\\"/>
+ <replace file="${project.build.directory}/run.properties"
+ token="\" value="\\" />
<echo file="${project.build.directory}/config.properties">
felix.auto.install="${bundles}"
felix.auto.start=file:modules/${project.artifactId}-${project.version}.jar
</echo>
- <copy file="${maven.dependency.org.apache.felix.org.apache.felix.main.jar.path}" tofile="${project.build.directory}/felix.jar"/>
+ <copy
+ file="${maven.dependency.org.apache.felix.org.apache.felix.main.jar.path}"
+ tofile="${project.build.directory}/felix.jar" />
</tasks>
</configuration>
</execution>
@@ -167,7 +198,4 @@
</build>
</profile>
</profiles>
- <properties>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- </properties>
</project>
Modified: incubator/stanbol/trunk/kres/eu.iksproject.kres.shared/dependency/owllink102/pom.xml
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/eu.iksproject.kres.shared/dependency/owllink102/pom.xml?rev=1053689&r1=1053688&r2=1053689&view=diff
==============================================================================
--- incubator/stanbol/trunk/kres/eu.iksproject.kres.shared/dependency/owllink102/pom.xml (original)
+++ incubator/stanbol/trunk/kres/eu.iksproject.kres.shared/dependency/owllink102/pom.xml Wed Dec 29 18:04:19 2010
@@ -6,16 +6,21 @@
<parent>
<groupId>eu.iksproject</groupId>
<artifactId>eu.iksproject.kres.parent</artifactId>
- <version>0.6-SNAPSHOT</version>
+ <version>0.7</version>
<relativePath>../parent</relativePath>
</parent>
-
<groupId>eu.iksproject</groupId>
<artifactId>eu.iksproject.kres.shared.dependency.owllink</artifactId>
- <version>0.6-SNAPSHOT</version>
+ <version>${kres-version}</version>
<packaging>bundle</packaging>
<name>IKS KReS owl-link OSGi Bundle</name>
+
+ <properties>
+ <kres-version>0.7</kres-version>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ </properties>
+
<dependencies>
<dependency>
<groupId>org.apache.felix</groupId>
@@ -137,7 +142,8 @@
<configuration>
<tasks>
<property name="plugins" refid="maven.runtime.classpath"/>
- <pathconvert pathsep=" " dirsep="/" property="project.build.url">
+ <pathconvert pathsep=" " dirsep="/"
+ property="project.build.url">
<path path="${project.build.directory}"/>
</pathconvert>
<pathconvert property="plugins.jars" pathsep=":">
@@ -152,23 +158,28 @@
<mapper>
<chainedmapper>
<flattenmapper/>
- <globmapper from="*" to="file:modules/*" casesensitive="no"/>
+ <globmapper from="*" to="file:modules/*"
+ casesensitive="no" />
</chainedmapper>
</mapper>
</pathconvert>
- <makeurl property="main.bundle.url" file="${project.build.directory}/${project.artifactId}-${project.version}.jar"/>
+ <makeurl property="main.bundle.url"
+ file="${project.build.directory}/${project.artifactId}-${project.version}.jar" />
<echo file="${project.build.directory}/run.properties">
felix.auto.install=${urls}
felix.auto.start=${main.bundle.url}
org.osgi.framework.storage=${project.build.url}/felix-cache
org.osgi.framework.bootdelegation=*
</echo>
- <replace file="${project.build.directory}/run.properties" token="\" value="\\"/>
+ <replace file="${project.build.directory}/run.properties"
+ token="\" value="\\" />
<echo file="${project.build.directory}/config.properties">
felix.auto.install="${bundles}"
felix.auto.start=file:modules/${project.artifactId}-${project.version}.jar
</echo>
- <copy file="${maven.dependency.org.apache.felix.org.apache.felix.main.jar.path}" tofile="${project.build.directory}/felix.jar"/>
+ <copy
+ file="${maven.dependency.org.apache.felix.org.apache.felix.main.jar.path}"
+ tofile="${project.build.directory}/felix.jar" />
</tasks>
</configuration>
</execution>
@@ -198,7 +209,5 @@
</build>
</profile>
</profiles>
- <properties>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- </properties>
+
</project>
Modified: incubator/stanbol/trunk/kres/eu.iksproject.kres.shared/dependency/xerces/pom.xml
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/eu.iksproject.kres.shared/dependency/xerces/pom.xml?rev=1053689&r1=1053688&r2=1053689&view=diff
==============================================================================
--- incubator/stanbol/trunk/kres/eu.iksproject.kres.shared/dependency/xerces/pom.xml (original)
+++ incubator/stanbol/trunk/kres/eu.iksproject.kres.shared/dependency/xerces/pom.xml Wed Dec 29 18:04:19 2010
@@ -6,16 +6,21 @@
<parent>
<groupId>eu.iksproject</groupId>
<artifactId>eu.iksproject.kres.parent</artifactId>
- <version>0.6-SNAPSHOT</version>
+ <version>0.7</version>
<relativePath>../parent</relativePath>
</parent>
-
<groupId>eu.iksproject</groupId>
<artifactId>eu.iksproject.kres.shared.dependency.xerces</artifactId>
- <version>0.6-SNAPSHOT</version>
+ <version>${kres-version}</version>
<packaging>bundle</packaging>
<name>IKS KReS Xerces dependency</name>
+
+ <properties>
+ <kres-version>0.7</kres-version>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ </properties>
+
<dependencies>
<dependency>
<groupId>xerces</groupId>
@@ -43,21 +48,38 @@
<configuration>
<instructions>
<Export-Package>
- org.apache.xerces.*, org.exolab.castor.*, org.xml.sax.*
+ org.apache.xerces.*,
+ org.apache.xml.serialize,
+ org.castor.core.*,
+ org.castor.mapping,
+ org.exolab.castor.*,
+ org.exolab.javasource
</Export-Package>
+ <Private-Package>
+ org.castor.xml
+ </Private-Package>
<Import-Package>
- !javax.xml.*,
- !org.apache.xml.*,
- org.w3c.dom.*,
- org.apache.xerces.*,
- !org.w3c.dom.traversal.*,
- !org.exolab.castor.types.*,
- !org.castor.*,
- !org.exolab.javasource.*,
- !netscape.ldap.*,
- !org.apache.regexp.*,
+ javax.naming,
+ javax.naming.directory,
+ javax.servlet,
+ javax.xml.datatype,
+ javax.xml.namespace,
+ javax.xml.parsers,
+ javax.xml.transform.*,
+ javax.xml.validation,
+ !netscape.ldap,
+ !org.apache.avalon.framework.logger,
+ !org.apache.log,
+ org.apache.log4j,
+ !org.apache.oro.text.regex,
+ !org.apache.regexp,
!org.apache.velocity.*,
- !org.apache.oro.*,
+ !org.apache.xml.resolver,
+ !org.apache.xml.resolver.readers,
+ org.castor.mapping,
+ org.w3c.dom.*,
+ org.xml.sax.*,
+ !sun.io,
*
</Import-Package>
Modified: incubator/stanbol/trunk/kres/eu.iksproject.kres.shared/transformation/pom.xml
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/eu.iksproject.kres.shared/transformation/pom.xml?rev=1053689&r1=1053688&r2=1053689&view=diff
==============================================================================
--- incubator/stanbol/trunk/kres/eu.iksproject.kres.shared/transformation/pom.xml (original)
+++ incubator/stanbol/trunk/kres/eu.iksproject.kres.shared/transformation/pom.xml Wed Dec 29 18:04:19 2010
@@ -6,17 +6,23 @@
<parent>
<groupId>eu.iksproject</groupId>
<artifactId>eu.iksproject.kres.parent</artifactId>
- <version>0.6-SNAPSHOT</version>
+ <version>0.7</version>
<relativePath>../parent</relativePath>
</parent>
<groupId>eu.iksproject</groupId>
<artifactId>eu.iksproject.kres.shared.transformation</artifactId>
- <version>0.6-SNAPSHOT</version>
+ <version>${kres-version}</version>
<packaging>bundle</packaging>
<name>IKS KReS Transformation</name>
+ <properties>
+ <jersey-version>1.1.5.1</jersey-version>
+ <kres-version>0.7</kres-version>
+ <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ </properties>
+
<dependencies>
<dependency>
<groupId>org.apache.felix</groupId>
@@ -188,7 +194,5 @@
</build>
</profile>
</profiles>
- <properties>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- </properties>
+
</project>
Modified: incubator/stanbol/trunk/kres/eu.iksproject.kres.storage.provider/pom.xml
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/eu.iksproject.kres.storage.provider/pom.xml?rev=1053689&r1=1053688&r2=1053689&view=diff
==============================================================================
--- incubator/stanbol/trunk/kres/eu.iksproject.kres.storage.provider/pom.xml (original)
+++ incubator/stanbol/trunk/kres/eu.iksproject.kres.storage.provider/pom.xml Wed Dec 29 18:04:19 2010
@@ -7,14 +7,14 @@
<parent>
<groupId>eu.iksproject</groupId>
<artifactId>eu.iksproject.kres.parent</artifactId>
- <version>0.6-SNAPSHOT</version>
+ <version>0.7</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
<groupId>eu.iksproject</groupId>
<artifactId>eu.iksproject.kres.storage.provider</artifactId>
<packaging>bundle</packaging>
- <version>0.6-SNAPSHOT</version>
+ <version>${kres-version}</version>
<name>IKS KReS Storage Provider</name>
<description>IKS KReS Storage Provider</description>
@@ -23,7 +23,7 @@
<properties>
<jersey-version>1.1.5.1</jersey-version>
- <kres-version>0.6-SNAPSHOT</kres-version>
+ <kres-version>0.7</kres-version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
Modified: incubator/stanbol/trunk/kres/eu.iksproject.kres.storage.provider/src/main/java/eu/iksproject/kres/storage/provider/OntologyStorageProviderImpl.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/eu.iksproject.kres.storage.provider/src/main/java/eu/iksproject/kres/storage/provider/OntologyStorageProviderImpl.java?rev=1053689&r1=1053688&r2=1053689&view=diff
==============================================================================
--- incubator/stanbol/trunk/kres/eu.iksproject.kres.storage.provider/src/main/java/eu/iksproject/kres/storage/provider/OntologyStorageProviderImpl.java (original)
+++ incubator/stanbol/trunk/kres/eu.iksproject.kres.storage.provider/src/main/java/eu/iksproject/kres/storage/provider/OntologyStorageProviderImpl.java Wed Dec 29 18:04:19 2010
@@ -1,13 +1,17 @@
package eu.iksproject.kres.storage.provider;
import java.util.Collection;
+import java.util.Dictionary;
import java.util.Hashtable;
-
+import org.apache.felix.scr.annotations.Activate;
import org.apache.felix.scr.annotations.Component;
+import org.apache.felix.scr.annotations.Deactivate;
import org.apache.felix.scr.annotations.Property;
import org.apache.felix.scr.annotations.Service;
import org.osgi.service.component.ComponentContext;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import eu.iksproject.kres.api.storage.OntologyStorage;
import eu.iksproject.kres.api.storage.OntologyStoreProvider;
@@ -16,24 +20,88 @@ import eu.iksproject.kres.api.storage.On
@Service(OntologyStoreProvider.class)
public class OntologyStorageProviderImpl implements OntologyStoreProvider {
- @Property(value = "eu.iksproject.kres.storage.ClerezzaStorage")
+ public static final String _ACTIVE_STORAGE_DEFAULT = "eu.iksproject.kres.storage.ClerezzaStorage";
+
+ @Property(value = _ACTIVE_STORAGE_DEFAULT)
public static final String ACTIVE_STORAGE = "activeStorage";
- private Hashtable<String, OntologyStorage> registeredStorages;
+ private static Logger log = LoggerFactory
+ .getLogger(OntologyStorageProviderImpl.class);
+
private OntologyStorage activeOntologyStorage;
- private String activeStorage;
+ /*
+ * For safety in non-OSGi environments, we initially set this variable to
+ * its default value.
+ */
+ private String activeStorage = _ACTIVE_STORAGE_DEFAULT;
+ private Hashtable<String, OntologyStorage> registeredStorages;
+
+ /**
+ * This default constructor is <b>only</b> intended to be used by the OSGI
+ * environment with Service Component Runtime support.
+ * <p>
+ * DO NOT USE to manually create instances - the OntologyStorageProviderImpl
+ * instances do need to be configured! YOU NEED TO USE
+ * {@link #OntologyStorageProviderImpl(Dictionary)} or its overloads, to
+ * parse the configuration and then initialise the rule store if running
+ * outside a OSGI environment.
+ */
+ public OntologyStorageProviderImpl() {
+ }
+
+ /**
+ * Basic constructor to be used if outside of an OSGi environment. Invokes
+ * default constructor.
+ *
+ * @param configuration
+ */
+ public OntologyStorageProviderImpl(Dictionary<String, Object> configuration) {
+ this();
+ activate(configuration);
+ }
+
+ /**
+ * Used to configure an instance within an OSGi container.
+ */
+ @SuppressWarnings("unchecked")
+ @Activate
+ protected void activate(ComponentContext context) {
+ log.info("in " + OntologyStorageProviderImpl.class
+ + " activate with context " + context);
+ if (context == null) {
+ throw new IllegalStateException("No valid" + ComponentContext.class
+ + " parsed in activate!");
+ }
+ activate((Dictionary<String, Object>) context.getProperties());
+ }
+
+ /**
+ * Internally used to configure an instance (within and without an OSGi
+ * container.
+ *
+ * @param configuration
+ */
+ protected void activate(Dictionary<String, Object> configuration) {
+ String tStorage = (String) configuration.get(ACTIVE_STORAGE);
+ if (tStorage != null)
+ this.activeStorage = tStorage;
+ registeredStorages = new Hashtable<String, OntologyStorage>();
+ }
@Override
public void activateOntologyStorage(OntologyStorage ontologyStorage) {
activeOntologyStorage = ontologyStorage;
+ }
+ @Deactivate
+ protected void deactivate(ComponentContext context) {
+ registeredStorages = null;
}
@Override
public void deactivateOntologyStorage() {
activeOntologyStorage = null;
-
}
@Override
@@ -54,29 +122,21 @@ public class OntologyStorageProviderImpl
@Override
public void registerOntologyStorage(OntologyStorage ontologyStorage) {
- registeredStorages.put(ontologyStorage.getClass().getCanonicalName(), ontologyStorage);
- System.out.println("Registerd "+registeredStorages.size()+" storages -> "+ontologyStorage.getClass().getCanonicalName());
- System.out.println("Active storage class is "+activeStorage);
- if(ontologyStorage.getClass().getCanonicalName().equals(activeStorage)){
+ String storageClass = ontologyStorage.getClass().getCanonicalName();
+ registeredStorages.put(storageClass, ontologyStorage);
+ log.info("Registerd " + registeredStorages.size() + " storages -> "
+ + storageClass);
+ log.info("Active storage class is " + activeStorage);
+ if (storageClass.equals(activeStorage)) {
activeOntologyStorage = ontologyStorage;
- System.out.println("Setted active storage");
+ log.debug("Setted active storage");
}
}
@Override
- public void unregisterOntologyStorage(Class<? extends OntologyStorage> ontologyStorage) {
+ public void unregisterOntologyStorage(
+ Class<? extends OntologyStorage> ontologyStorage) {
registeredStorages.remove(ontologyStorage.getCanonicalName());
-
- }
-
- protected void activate(ComponentContext context) {
- registeredStorages = new Hashtable<String, OntologyStorage>();
- activeStorage = (String) context.getProperties().get(ACTIVE_STORAGE);
-
- }
-
- protected void deactivate(ComponentContext context) {
- registeredStorages = null;
}
}
Modified: incubator/stanbol/trunk/kres/eu.iksproject.kres.storage/pom.xml
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/eu.iksproject.kres.storage/pom.xml?rev=1053689&r1=1053688&r2=1053689&view=diff
==============================================================================
--- incubator/stanbol/trunk/kres/eu.iksproject.kres.storage/pom.xml (original)
+++ incubator/stanbol/trunk/kres/eu.iksproject.kres.storage/pom.xml Wed Dec 29 18:04:19 2010
@@ -7,14 +7,14 @@
<parent>
<groupId>eu.iksproject</groupId>
<artifactId>eu.iksproject.kres.parent</artifactId>
- <version>0.6-SNAPSHOT</version>
+ <version>0.7</version>
<relativePath>../parent/pom.xml</relativePath>
</parent>
<groupId>eu.iksproject</groupId>
<artifactId>eu.iksproject.kres.storage</artifactId>
<packaging>bundle</packaging>
- <version>0.6-SNAPSHOT</version>
+ <version>${kres-version}</version>
<name>IKS KReS Storage Manager</name>
<description>IKS KReS Storage Manager</description>
@@ -23,7 +23,7 @@
<properties>
<jersey-version>1.1.5.1</jersey-version>
- <kres-version>0.6-SNAPSHOT</kres-version>
+ <kres-version>0.7</kres-version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
Modified: incubator/stanbol/trunk/kres/eu.iksproject.kres.storage/src/main/java/eu/iksproject/kres/storage/ClerezzaStorage.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/eu.iksproject.kres.storage/src/main/java/eu/iksproject/kres/storage/ClerezzaStorage.java?rev=1053689&r1=1053688&r2=1053689&view=diff
==============================================================================
--- incubator/stanbol/trunk/kres/eu.iksproject.kres.storage/src/main/java/eu/iksproject/kres/storage/ClerezzaStorage.java (original)
+++ incubator/stanbol/trunk/kres/eu.iksproject.kres.storage/src/main/java/eu/iksproject/kres/storage/ClerezzaStorage.java Wed Dec 29 18:04:19 2010
@@ -1,8 +1,8 @@
package eu.iksproject.kres.storage;
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
+import java.util.Dictionary;
import java.util.HashSet;
+import java.util.Hashtable;
import java.util.Set;
import org.apache.clerezza.rdf.core.MGraph;
@@ -14,16 +14,16 @@ import org.apache.clerezza.rdf.core.impl
import org.apache.clerezza.rdf.core.sparql.ParseException;
import org.apache.clerezza.rdf.core.sparql.QueryParser;
import org.apache.clerezza.rdf.core.sparql.query.Query;
+import org.apache.felix.scr.annotations.Activate;
import org.apache.felix.scr.annotations.Component;
-import org.apache.felix.scr.annotations.Property;
+import org.apache.felix.scr.annotations.Deactivate;
import org.apache.felix.scr.annotations.Reference;
import org.apache.felix.scr.annotations.Service;
import org.osgi.service.component.ComponentContext;
-import org.semanticweb.owlapi.apibinding.OWLManager;
import org.semanticweb.owlapi.model.IRI;
import org.semanticweb.owlapi.model.OWLOntology;
-import org.semanticweb.owlapi.model.OWLOntologyCreationException;
-import org.semanticweb.owlapi.model.OWLOntologyManager;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
import com.hp.hpl.jena.ontology.OntModel;
import com.hp.hpl.jena.ontology.OntModelSpec;
@@ -37,54 +37,131 @@ import eu.iksproject.kres.api.storage.On
import eu.iksproject.kres.ontologies.XML_OWL;
import eu.iksproject.kres.shared.transformation.JenaToClerezzaConverter;
import eu.iksproject.kres.shared.transformation.JenaToOwlConvert;
-import eu.iksproject.kres.shared.transformation.OWLAPIToClerezzaConverter;
@Component(immediate = true, metatype = true)
@Service(OntologyStorage.class)
public class ClerezzaStorage implements OntologyStorage {
- // private static Logger log =
- // LoggerFactory.getLogger(ClerezzaStorage.class);
+ private static Logger log = LoggerFactory.getLogger(ClerezzaStorage.class);
@Reference
- WeightedTcProvider weightedTcProvider;
+ OntologyStoreProvider ontologyStoreProvider;
@Reference
TcManager tcManager;
@Reference
- OntologyStoreProvider ontologyStoreProvider;
-
+ WeightedTcProvider weightedTcProvider;
- @Override
- public void store(OWLOntology o) {
+ /**
+ * This default constructor is <b>only</b> intended to be used by the OSGI
+ * environment with Service Component Runtime support.
+ * <p>
+ * DO NOT USE to manually create instances - the ClerezzaStorage instances
+ * do need to be configured! YOU NEED TO USE
+ * {@link #ClerezzaStorage(TcManager, WeightedTcProvider, OntologyStoreProvider)}
+ * or its overloads, to parse the configuration and then initialise the rule
+ * store if running outside a OSGI environment.
+ */
+ public ClerezzaStorage() {
- JenaToOwlConvert converter = new JenaToOwlConvert();
- OntModel om = converter.ModelOwlToJenaConvert(o, "RDF/XML");
- MGraph mg = JenaToClerezzaConverter.jenaModelToClerezzaMGraph(om);
- //MGraph mg = OWLAPIToClerezzaConverter.owlOntologyToClerezzaMGraph(o);
- MGraph mg2 = tcManager.createMGraph(
- new UriRef(o.getOntologyID().getOntologyIRI().toString()));
- mg2.addAll(mg);
}
- @Override
- public void store(OWLOntology o, IRI ontologyID) {
-
- JenaToOwlConvert converter = new JenaToOwlConvert();
- OntModel om = converter.ModelOwlToJenaConvert(o, "RDF/XML");
- MGraph mg = JenaToClerezzaConverter.jenaModelToClerezzaMGraph(om);
- //MGraph mg = OWLAPIToClerezzaConverter.owlOntologyToClerezzaMGraph(o);
- MGraph mg2 = tcManager.createMGraph(new UriRef(ontologyID.toString()));
- mg2.addAll(mg);
+ /**
+ * Basic constructor to be used if outside of an OSGi environment. Invokes
+ * default constructor.
+ *
+ * @param tcManager
+ * @param wtcProvider
+ * @param osProvider
+ */
+ public ClerezzaStorage(TcManager tcManager, WeightedTcProvider wtcProvider,
+ OntologyStoreProvider osProvider) {
+ this();
+ this.tcManager = tcManager;
+ this.weightedTcProvider = wtcProvider;
+ this.ontologyStoreProvider = osProvider;
+ activate(new Hashtable<String, Object>());
}
+ @SuppressWarnings("unchecked")
+ @Activate
protected void activate(ComponentContext context) {
+ log.info("in " + ClerezzaStorage.class + " activate with context "
+ + context);
+ if (context == null) {
+ throw new IllegalStateException("No valid" + ComponentContext.class
+ + " parsed in activate!");
+ }
+ activate((Dictionary<String, Object>) context.getProperties());
+ }
+
+ protected void activate(Dictionary<String, Object> configuration) {
ontologyStoreProvider.registerOntologyStorage(this);
}
+ @Override
+ public void clear() {
+ // TODO Auto-generated method stub
+ }
+
+ @Deactivate
protected void deactivate(ComponentContext context) {
+ log.info("in " + ClerezzaStorage.class + " deactivate with context "
+ + context);
ontologyStoreProvider.unregisterOntologyStorage(this.getClass());
+ tcManager = null;
+ weightedTcProvider = null;
+ ontologyStoreProvider = null;
+ }
+
+ @Override
+ public void delete(IRI ontologyId) {
+ // TODO Auto-generated method stub
+ }
+
+ @Override
+ public void deleteAll(Set<IRI> ontologyIds) {
+ // TODO Auto-generated method stub
+ }
+
+ @Override
+ public OWLOntology getGraph(IRI ontologyID) throws NoSuchStoreException {
+ OWLOntology ontology = null;
+
+ if (tcManager != null) {
+ MGraph mGraph = tcManager.getMGraph(new UriRef(ontologyID
+ .toString()));
+ JenaToOwlConvert jowl = new JenaToOwlConvert();
+ OntModel ontModel = ModelFactory.createOntologyModel(
+ OntModelSpec.OWL_DL_MEM, FileManager.get().loadModel(
+ XML_OWL.URI));
+ ontModel.add(JenaToClerezzaConverter
+ .clerezzaMGraphToJenaModel(mGraph));
+ ontology = jowl.ModelJenaToOwlConvert(ontModel, "RDF/XML");
+ // ontology =
+ // OWLAPIToClerezzaConverter.clerezzaMGraphToOWLOntology(mGraph);
+
+ } else {
+ throw new NoSuchStoreException(
+ "No store registered or activated in the environment.");
+ }
+ return ontology;
+ }
+
+ @Override
+ public Set<IRI> listGraphs() {
+
+ Set<IRI> iris = null;
+ Set<UriRef> uriRefs = tcManager.listTripleCollections();
+ if (uriRefs != null) {
+ iris = new HashSet<IRI>();
+ for (UriRef uriRef : uriRefs) {
+ iris.add(IRI.create(uriRef.toString()));
+ }
+ }
+ return iris;
+
}
@Override
@@ -108,8 +185,8 @@ public class ClerezzaStorage implements
UriRef datasetUriRef = new UriRef(datasetURI);
MGraph dataset = weightedTcProvider.getMGraph(datasetUriRef);
- mGraph.addAll((SimpleGraph) tcManager.executeSparqlQuery(query, dataset));
-
+ mGraph.addAll((SimpleGraph) tcManager.executeSparqlQuery(query,
+ dataset));
} catch (ParseException e) {
// TODO Auto-generated catch block
@@ -122,56 +199,25 @@ public class ClerezzaStorage implements
}
@Override
- public void clear() {
- // TODO Auto-generated method stub
-
- }
-
- @Override
- public void delete(IRI ontologyId) {
- // TODO Auto-generated method stub
-
- }
-
- @Override
- public void
- deleteAll(Set<IRI> ontologyIds) {
- // TODO Auto-generated method stub
-
- }
-
- @Override
- public Set<IRI> listGraphs(){
-
- Set<IRI> iris = null;
- Set<UriRef> uriRefs = tcManager.listTripleCollections();
- if(uriRefs != null){
- iris = new HashSet<IRI>();
- for(UriRef uriRef : uriRefs){
- iris.add(IRI.create(uriRef.toString()));
- }
- }
- return iris;
+ public void store(OWLOntology o) {
+ JenaToOwlConvert converter = new JenaToOwlConvert();
+ OntModel om = converter.ModelOwlToJenaConvert(o, "RDF/XML");
+ MGraph mg = JenaToClerezzaConverter.jenaModelToClerezzaMGraph(om);
+ // MGraph mg = OWLAPIToClerezzaConverter.owlOntologyToClerezzaMGraph(o);
+ MGraph mg2 = tcManager.createMGraph(new UriRef(o.getOntologyID()
+ .getOntologyIRI().toString()));
+ mg2.addAll(mg);
}
@Override
- public OWLOntology getGraph(IRI ontologyID) throws NoSuchStoreException {
- OWLOntology ontology = null;
-
- if(tcManager != null){
- MGraph mGraph = tcManager.getMGraph(new UriRef(ontologyID.toString()));
- JenaToOwlConvert jowl = new JenaToOwlConvert();
- OntModel ontModel = ModelFactory.createOntologyModel(OntModelSpec.OWL_DL_MEM, FileManager.get().loadModel(XML_OWL.URI));
- ontModel.add(JenaToClerezzaConverter.clerezzaMGraphToJenaModel(mGraph));
- ontology = jowl.ModelJenaToOwlConvert(ontModel, "RDF/XML");
- //ontology = OWLAPIToClerezzaConverter.clerezzaMGraphToOWLOntology(mGraph);
-
+ public void store(OWLOntology o, IRI ontologyID) {
- }
- else{
- throw new NoSuchStoreException("No store registered or activated in the environment.");
- }
- return ontology;
+ JenaToOwlConvert converter = new JenaToOwlConvert();
+ OntModel om = converter.ModelOwlToJenaConvert(o, "RDF/XML");
+ MGraph mg = JenaToClerezzaConverter.jenaModelToClerezzaMGraph(om);
+ // MGraph mg = OWLAPIToClerezzaConverter.owlOntologyToClerezzaMGraph(o);
+ MGraph mg2 = tcManager.createMGraph(new UriRef(ontologyID.toString()));
+ mg2.addAll(mg);
}
}