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 2011/08/26 19:10:42 UTC
svn commit: r1162171 [1/2] - in
/incubator/stanbol/branches/jena-reasoners/reasoners: ./ base/
hermit/src/main/java/org/apache/stanbol/reasoners/hermit/
hermit/src/main/resources/
hermit/src/test/java/org/apache/stanbol/reasoners/hermit/ jena/src/main/...
Author: enridaga
Date: Fri Aug 26 17:10:41 2011
New Revision: 1162171
URL: http://svn.apache.org/viewvc?rev=1162171&view=rev
Log:
* Completed support for ontonet scope/session
* Added support for recipe (only OWLApi)
* Deleted old reasoners code, which contained dependencies on HermiT
* Published the new endpoint implementation to the /reasoners path
* Removed the hermit dependency form the poms
* Removed hermit module from reactor pom
* Added logs in abstract implementations of owlapi and jena
STANBOL-185
Added:
incubator/stanbol/branches/jena-reasoners/reasoners/hermit/src/main/resources/log4j.properties
incubator/stanbol/branches/jena-reasoners/reasoners/owlapi/src/main/resources/
incubator/stanbol/branches/jena-reasoners/reasoners/owlapi/src/main/resources/log4j.properties
Removed:
incubator/stanbol/branches/jena-reasoners/reasoners/base/
incubator/stanbol/branches/jena-reasoners/reasoners/web/src/main/java/org/apache/stanbol/reasoners/web/resources/Classify.java
incubator/stanbol/branches/jena-reasoners/reasoners/web/src/main/java/org/apache/stanbol/reasoners/web/resources/ConsistencyCheck.java
incubator/stanbol/branches/jena-reasoners/reasoners/web/src/main/java/org/apache/stanbol/reasoners/web/resources/ConsistentRefactoring.java
incubator/stanbol/branches/jena-reasoners/reasoners/web/src/main/java/org/apache/stanbol/reasoners/web/resources/Enrichment.java
incubator/stanbol/branches/jena-reasoners/reasoners/web/src/main/java/org/apache/stanbol/reasoners/web/resources/ReasonersResource.java
incubator/stanbol/branches/jena-reasoners/reasoners/web/src/main/resources/RuleOntology/
incubator/stanbol/branches/jena-reasoners/reasoners/web/src/main/resources/TestFile/
incubator/stanbol/branches/jena-reasoners/reasoners/web/src/main/resources/org/apache/stanbol/reasoners/web/templates/org/apache/stanbol/reasoners/web/resources/Classify/
incubator/stanbol/branches/jena-reasoners/reasoners/web/src/main/resources/org/apache/stanbol/reasoners/web/templates/org/apache/stanbol/reasoners/web/resources/ConsistecnyCheck/
incubator/stanbol/branches/jena-reasoners/reasoners/web/src/main/resources/org/apache/stanbol/reasoners/web/templates/org/apache/stanbol/reasoners/web/resources/ConsistentRefactoring/
incubator/stanbol/branches/jena-reasoners/reasoners/web/src/main/resources/org/apache/stanbol/reasoners/web/templates/org/apache/stanbol/reasoners/web/resources/Enrichment/
Modified:
incubator/stanbol/branches/jena-reasoners/reasoners/hermit/src/main/java/org/apache/stanbol/reasoners/hermit/HermitReasoningService.java
incubator/stanbol/branches/jena-reasoners/reasoners/hermit/src/test/java/org/apache/stanbol/reasoners/hermit/TestUtils.java
incubator/stanbol/branches/jena-reasoners/reasoners/jena/src/main/java/org/apache/stanbol/reasoners/jena/AbstractJenaReasoningService.java
incubator/stanbol/branches/jena-reasoners/reasoners/owlapi/src/main/java/org/apache/stanbol/reasoners/owlapi/AbstractOWLApiReasoningService.java
incubator/stanbol/branches/jena-reasoners/reasoners/owllink/pom.xml
incubator/stanbol/branches/jena-reasoners/reasoners/pom.xml
incubator/stanbol/branches/jena-reasoners/reasoners/servicesapi/src/main/java/org/apache/stanbol/reasoners/servicesapi/InconsistentInputException.java
incubator/stanbol/branches/jena-reasoners/reasoners/servicesapi/src/main/java/org/apache/stanbol/reasoners/servicesapi/ReasoningService.java
incubator/stanbol/branches/jena-reasoners/reasoners/web/README
incubator/stanbol/branches/jena-reasoners/reasoners/web/pom.xml
incubator/stanbol/branches/jena-reasoners/reasoners/web/src/main/java/org/apache/stanbol/reasoners/web/ReasonersFragment.java
incubator/stanbol/branches/jena-reasoners/reasoners/web/src/main/java/org/apache/stanbol/reasoners/web/resources/ReasoningServiceTaskResource.java
incubator/stanbol/branches/jena-reasoners/reasoners/web/src/main/java/org/apache/stanbol/reasoners/web/resources/ReasoningServicesResource.java
incubator/stanbol/branches/jena-reasoners/reasoners/web/src/main/java/org/apache/stanbol/reasoners/web/utils/ReasoningServiceExecutor.java
Modified: incubator/stanbol/branches/jena-reasoners/reasoners/hermit/src/main/java/org/apache/stanbol/reasoners/hermit/HermitReasoningService.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/branches/jena-reasoners/reasoners/hermit/src/main/java/org/apache/stanbol/reasoners/hermit/HermitReasoningService.java?rev=1162171&r1=1162170&r2=1162171&view=diff
==============================================================================
--- incubator/stanbol/branches/jena-reasoners/reasoners/hermit/src/main/java/org/apache/stanbol/reasoners/hermit/HermitReasoningService.java (original)
+++ incubator/stanbol/branches/jena-reasoners/reasoners/hermit/src/main/java/org/apache/stanbol/reasoners/hermit/HermitReasoningService.java Fri Aug 26 17:10:41 2011
@@ -12,6 +12,8 @@ import org.semanticweb.HermiT.Configurat
import org.semanticweb.HermiT.Reasoner.ReasonerFactory;
import org.semanticweb.owlapi.model.OWLOntology;
import org.semanticweb.owlapi.reasoner.OWLReasoner;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* This class is the implementation of {@see OWLApiReasoningService} using the HermiT reasoner
@@ -19,7 +21,7 @@ import org.semanticweb.owlapi.reasoner.O
@Component(immediate = true, metatype = true)
@Service
public class HermitReasoningService extends AbstractOWLApiReasoningService implements OWLApiReasoningService {
-
+ private final Logger log = LoggerFactory.getLogger(getClass());
public static final String _DEFAULT_PATH = "owl2";
@Property(name = ReasoningService.SERVICE_PATH, value = _DEFAULT_PATH)
@@ -27,12 +29,26 @@ public class HermitReasoningService exte
@Override
protected OWLReasoner getReasoner(OWLOntology ontology) {
+ log.debug("Creating HermiT reasoner: {}",ontology);
Configuration config = new Configuration();
- config.ignoreUnsupportedDatatypes = true;
+ config.ignoreUnsupportedDatatypes = true; // This must be true!
+ config.throwInconsistentOntologyException = true; // This must be true!
+ //config.monitor = new Debugger(null, false);
+ log.debug("Configuration: {}, debugger {}",config,config.monitor);
ReasonerFactory risfactory = new ReasonerFactory();
- return risfactory.createReasoner(ontology, config);
+ log.debug("factory: {}",risfactory);
+ OWLReasoner reasoner = null;
+ reasoner = risfactory.createReasoner(ontology, config);
+
+ log.debug("Reasoner : {}",reasoner);
+ if(reasoner == null){
+ log.error("Cannot create the reasner!!");
+ throw new IllegalArgumentException("Cannot create the reasoner");
+ }
+ return reasoner;
}
+
@Override
public String getPath() {
return path;
Added: incubator/stanbol/branches/jena-reasoners/reasoners/hermit/src/main/resources/log4j.properties
URL: http://svn.apache.org/viewvc/incubator/stanbol/branches/jena-reasoners/reasoners/hermit/src/main/resources/log4j.properties?rev=1162171&view=auto
==============================================================================
--- incubator/stanbol/branches/jena-reasoners/reasoners/hermit/src/main/resources/log4j.properties (added)
+++ incubator/stanbol/branches/jena-reasoners/reasoners/hermit/src/main/resources/log4j.properties Fri Aug 26 17:10:41 2011
@@ -0,0 +1,8 @@
+
+log4j.rootLogger=WARN, CONSOLE
+log4j.appender.CONSOLE=org.apache.log4j.ConsoleAppender
+log4j.appender.CONSOLE.layout=org.apache.log4j.PatternLayout
+#log4j.appender.CONSOLE.layout.ConversionPattern=%d{HH:mm:ss,SSS} %-5p [%C{1}] %m%n
+log4j.appender.CONSOLE.layout.ConversionPattern=[%-5p] [%C{1}] %m%n
+
+log4j.category.org.apache.stanbol.reasoners.hermit=DEBUG
\ No newline at end of file
Modified: incubator/stanbol/branches/jena-reasoners/reasoners/hermit/src/test/java/org/apache/stanbol/reasoners/hermit/TestUtils.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/branches/jena-reasoners/reasoners/hermit/src/test/java/org/apache/stanbol/reasoners/hermit/TestUtils.java?rev=1162171&r1=1162170&r2=1162171&view=diff
==============================================================================
--- incubator/stanbol/branches/jena-reasoners/reasoners/hermit/src/test/java/org/apache/stanbol/reasoners/hermit/TestUtils.java (original)
+++ incubator/stanbol/branches/jena-reasoners/reasoners/hermit/src/test/java/org/apache/stanbol/reasoners/hermit/TestUtils.java Fri Aug 26 17:10:41 2011
@@ -1,8 +1,15 @@
package org.apache.stanbol.reasoners.hermit;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
import java.util.Set;
+import java.util.Map.Entry;
import org.semanticweb.owlapi.model.OWLAxiom;
+import org.semanticweb.owlapi.model.OWLDataProperty;
+import org.semanticweb.owlapi.model.OWLDataPropertyAssertionAxiom;
+import org.semanticweb.owlapi.model.OWLDatatype;
import org.semanticweb.owlapi.model.OWLOntology;
import org.slf4j.Logger;
@@ -33,5 +40,43 @@ public class TestUtils {
}
}
}
-
+ /**
+ * This is for monitoring hermit with datatype properties.
+ *
+ * @param ont
+ */
+ public static void checkProperties(OWLOntology ont,Logger log){
+ // When throw inconsistent exception = false and ignoreUnsupportedDatatypes=true
+ //- Datatypes which are not builtIn break the reasoner
+ //- Looks like rdf:PlainLiteral is not supported by Hermit, even if it is marked as BuiltIn datatype by OWLApi
+ // This incoherence generates an unexpected error!
+ //
+ Map<OWLDataProperty,Set<OWLDatatype>> properties = new HashMap<OWLDataProperty,Set<OWLDatatype>>();
+ Set<OWLAxiom> remove = new HashSet<OWLAxiom>();
+ for(OWLAxiom a :ont.getLogicalAxioms()){
+ if(a instanceof OWLDataPropertyAssertionAxiom){
+ OWLDataPropertyAssertionAxiom aa = (OWLDataPropertyAssertionAxiom) a;
+ for (OWLDataProperty p : aa.getDataPropertiesInSignature()) {
+ if (!properties.keySet().contains(p)) {
+ properties.put(p, new HashSet<OWLDatatype>());
+ }
+ for (OWLDatatype dt : aa.getDatatypesInSignature()){
+ properties.get(p).add(dt);
+
+ }
+ }
+ }
+ }
+ log.info("Data properties : ");
+ for(Entry<OWLDataProperty,Set<OWLDatatype>> p: properties.entrySet()){
+ log.info(" - {} ",p.getKey());
+ for(OWLDatatype d : p.getValue()){
+ log.info(" ---> {} [{}]",d,d.isBuiltIn());
+ }
+ }
+ log.info("Data property axioms removed:");
+ for(OWLAxiom d : remove){
+ log.info(" removed ---> {} ",d.getDataPropertiesInSignature());
+ }
+ }
}
Modified: incubator/stanbol/branches/jena-reasoners/reasoners/jena/src/main/java/org/apache/stanbol/reasoners/jena/AbstractJenaReasoningService.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/branches/jena-reasoners/reasoners/jena/src/main/java/org/apache/stanbol/reasoners/jena/AbstractJenaReasoningService.java?rev=1162171&r1=1162170&r2=1162171&view=diff
==============================================================================
--- incubator/stanbol/branches/jena-reasoners/reasoners/jena/src/main/java/org/apache/stanbol/reasoners/jena/AbstractJenaReasoningService.java (original)
+++ incubator/stanbol/branches/jena-reasoners/reasoners/jena/src/main/java/org/apache/stanbol/reasoners/jena/AbstractJenaReasoningService.java Fri Aug 26 17:10:41 2011
@@ -58,6 +58,7 @@ public abstract class AbstractJenaReason
*/
@Override
public InfModel run(Model data) {
+ log.info("Called run(Model data)");
InfGraph inferredGraph = this.reasoner.bind(data.getGraph());
return ModelFactory.createInfModel(inferredGraph);
}
@@ -90,6 +91,7 @@ public abstract class AbstractJenaReason
Map<String,List<String>> parameters) throws UnsupportedTaskException,
ReasoningServiceException,
InconsistentInputException {
+ log.info("Called runTask(String taskID,Model data,List<Rule> rules,boolean filtered,Map<String,List<String>> parameters)");
if (taskID.equals(ReasoningService.Tasks.CLASSIFY)) {
if (rules != null) {
return classify(data, rules);
Modified: incubator/stanbol/branches/jena-reasoners/reasoners/owlapi/src/main/java/org/apache/stanbol/reasoners/owlapi/AbstractOWLApiReasoningService.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/branches/jena-reasoners/reasoners/owlapi/src/main/java/org/apache/stanbol/reasoners/owlapi/AbstractOWLApiReasoningService.java?rev=1162171&r1=1162170&r2=1162171&view=diff
==============================================================================
--- incubator/stanbol/branches/jena-reasoners/reasoners/owlapi/src/main/java/org/apache/stanbol/reasoners/owlapi/AbstractOWLApiReasoningService.java (original)
+++ incubator/stanbol/branches/jena-reasoners/reasoners/owlapi/src/main/java/org/apache/stanbol/reasoners/owlapi/AbstractOWLApiReasoningService.java Fri Aug 26 17:10:41 2011
@@ -11,11 +11,16 @@ import org.apache.stanbol.reasoners.serv
import org.apache.stanbol.reasoners.servicesapi.ReasoningServiceException;
import org.apache.stanbol.reasoners.servicesapi.UnsupportedTaskException;
import org.semanticweb.owlapi.apibinding.OWLManager;
+import org.semanticweb.owlapi.model.MissingImportEvent;
+import org.semanticweb.owlapi.model.MissingImportListener;
import org.semanticweb.owlapi.model.OWLAxiom;
import org.semanticweb.owlapi.model.OWLOntology;
import org.semanticweb.owlapi.model.OWLOntologyCreationException;
+import org.semanticweb.owlapi.model.OWLOntologyLoaderListener;
import org.semanticweb.owlapi.model.OWLOntologyManager;
import org.semanticweb.owlapi.model.SWRLRule;
+import org.semanticweb.owlapi.model.OWLOntologyLoaderListener.LoadingFinishedEvent;
+import org.semanticweb.owlapi.model.OWLOntologyLoaderListener.LoadingStartedEvent;
import org.semanticweb.owlapi.reasoner.InconsistentOntologyException;
import org.semanticweb.owlapi.reasoner.OWLReasoner;
import org.semanticweb.owlapi.util.InferredAxiomGenerator;
@@ -41,21 +46,42 @@ import org.slf4j.LoggerFactory;
public abstract class AbstractOWLApiReasoningService implements OWLApiReasoningService {
private final Logger log = LoggerFactory.getLogger(getClass());
- private OWLOntologyManager manager = null;
/**
- * A unique instance of OWLOntologyManager to be used to place a target ontology. We don't want to use the
+ * An OWLOntologyManager to be used to place a target ontology. We don't want to use the
* manager bound to the input ontologies for that, we don't want to interfere with it.
*
* Other {@see OWLApiReasoningService}s may want to change this.
*
* @return
*/
- protected OWLOntologyManager getOWLOntologyManager() {
+ protected OWLOntologyManager createOWLOntologyManager() {
+ log.info("createOWLOntologyManager()");
// We want a single instance here
- if (manager == null) {
- manager = OWLManager.createOWLOntologyManager();
- }
+ OWLOntologyManager manager = OWLManager.createOWLOntologyManager();
+ log.info("manager: {}",manager);
+ // FIXME Which is the other way of doing this?
+ // Maybe -> OWLOntologyManagerProperties();
+ manager.setSilentMissingImportsHandling(true);
+ // Listening for missing imports
+ manager.addMissingImportListener(new MissingImportListener() {
+ @Override
+ public void importMissing(MissingImportEvent arg0) {
+ log.warn("Missing import {} ", arg0.getImportedOntologyURI());
+ }
+ });
+ manager.addOntologyLoaderListener(new OWLOntologyLoaderListener(){
+
+ @Override
+ public void finishedLoadingOntology(LoadingFinishedEvent arg0) {
+ log.info("Finished loading {} (imported: {})",arg0.getOntologyID(),arg0.isImported());
+ }
+
+ @Override
+ public void startedLoadingOntology(LoadingStartedEvent arg0) {
+ log.info("Started loading {} (imported: {}) ...",arg0.getOntologyID(),arg0.isImported());
+ log.info(" ... from {}",arg0.getDocumentIRI().toString());
+ }});
return manager;
}
@@ -75,15 +101,16 @@ public abstract class AbstractOWLApiReas
* @return
*/
@Override
- public Set<OWLAxiom> run(OWLOntology input, List<InferredAxiomGenerator<? extends OWLAxiom>> generators) throws ReasoningServiceException,
- InconsistentInputException {
+ public Set<OWLAxiom> run(OWLOntology input, List<InferredAxiomGenerator<? extends OWLAxiom>> generators) throws ReasoningServiceException,
+ InconsistentInputException {
+ log.info("run(OWLOntology input, List<InferredAxiomGenerator<? extends OWLAxiom>> generators)");
try {
// Get the manager
- OWLOntologyManager manager = getOWLOntologyManager();
+ OWLOntologyManager manager = createOWLOntologyManager();
// Get the reasoner
OWLReasoner reasoner = getReasoner(input);
- log.debug("Running {} reasoner on {} ", reasoner.getClass(), input.getOntologyID());
+ log.info("Running {} reasoner on {} ", reasoner.getClass(), input.getOntologyID());
// To generate inferred axioms
InferredOntologyGenerator inferred = new InferredOntologyGenerator(reasoner, generators);
@@ -93,10 +120,19 @@ public abstract class AbstractOWLApiReas
Set<OWLAxiom> axioms = new HashSet<OWLAxiom>();
try {
OWLOntology output = manager.createOntology();
- inferred.fillOntology(manager, output);
- log.debug("Temporary ID is {}", output.getOntologyID());
+ log.info("Created output ontology: {}",output);
+ try{
+ inferred.fillOntology(manager, output);
+ }catch(InconsistentOntologyException i){
+ throw i;
+ }catch(Throwable t){
+ log.error("Some problem occurred:\n {}",t.getStackTrace());
+ throw new ReasoningServiceException();
+ }
+ log.info("Filled ontology: {}",output);
+ log.info("Temporary ID is {}", output.getOntologyID());
axioms = manager.getOntology(output.getOntologyID()).getAxioms();
- // We remove the ontology from the manager
+ // IMPORTANT We remove the ontology from the manager
manager.removeOntology(output);
} catch (OWLOntologyCreationException e) {
log.error("An exception have been thrown when instantiating the ontology");
@@ -110,7 +146,7 @@ public abstract class AbstractOWLApiReas
*/
throw new InconsistentInputException();
} catch (Exception exception) {
- log.error("An exception have been thrown while executing method run()");
+ log.error("An exception have been thrown while executing method run()",exception);
throw new ReasoningServiceException();
}
}
@@ -130,7 +166,7 @@ public abstract class AbstractOWLApiReas
List<InferredAxiomGenerator<? extends OWLAxiom>> generators) throws ReasoningServiceException,
InconsistentInputException {
log.debug("Called method run(OWLOntology,List<SWRLRule>,List)");
- OWLOntologyManager manager = getOWLOntologyManager();
+ OWLOntologyManager manager = createOWLOntologyManager();
try {
log.debug("Create a input ontology to merge rules in.");
OWLOntology input = manager.createOntology();
@@ -179,10 +215,13 @@ public abstract class AbstractOWLApiReas
Map<String,List<String>> parameters) throws UnsupportedTaskException,
ReasoningServiceException,
InconsistentInputException {
+ log.info("Called task {} with data {}",taskID,data);
if (taskID.equals(ReasoningService.Tasks.CLASSIFY)) {
if (rules != null) {
+
return classify(data, rules);
} else {
+ log.info("No rules attached");
return classify(data);
}
} else if (taskID.equals(ReasoningService.Tasks.ENRICH)) {
@@ -250,6 +289,7 @@ public abstract class AbstractOWLApiReas
*/
protected Set<OWLAxiom> classify(OWLOntology ontology) throws ReasoningServiceException,
InconsistentInputException {
+ log.info("classify(OWLOntology ontology)");
return run(ontology, getClassifyAxiomGenerators());
}
@@ -392,6 +432,7 @@ public abstract class AbstractOWLApiReas
log.debug("Create a input ontology to merge rules in.");
OWLOntology input;
try {
+ OWLOntologyManager manager = createOWLOntologyManager();
input = manager.createOntology();
Set<SWRLRule> ruleSet = new HashSet<SWRLRule>();
ruleSet.addAll(rules);
Added: incubator/stanbol/branches/jena-reasoners/reasoners/owlapi/src/main/resources/log4j.properties
URL: http://svn.apache.org/viewvc/incubator/stanbol/branches/jena-reasoners/reasoners/owlapi/src/main/resources/log4j.properties?rev=1162171&view=auto
==============================================================================
--- incubator/stanbol/branches/jena-reasoners/reasoners/owlapi/src/main/resources/log4j.properties (added)
+++ incubator/stanbol/branches/jena-reasoners/reasoners/owlapi/src/main/resources/log4j.properties Fri Aug 26 17:10:41 2011
@@ -0,0 +1,8 @@
+
+log4j.rootLogger=WARN, CONSOLE
+log4j.appender.CONSOLE=org.apache.log4j.ConsoleAppender
+log4j.appender.CONSOLE.layout=org.apache.log4j.PatternLayout
+#log4j.appender.CONSOLE.layout.ConversionPattern=%d{HH:mm:ss,SSS} %-5p [%C{1}] %m%n
+log4j.appender.CONSOLE.layout.ConversionPattern=[%-5p] [%C{1}] %m%n
+
+log4j.category.org.apache.stanbol.reasoners.hermit=DEBUG
\ No newline at end of file
Modified: incubator/stanbol/branches/jena-reasoners/reasoners/owllink/pom.xml
URL: http://svn.apache.org/viewvc/incubator/stanbol/branches/jena-reasoners/reasoners/owllink/pom.xml?rev=1162171&r1=1162170&r2=1162171&view=diff
==============================================================================
--- incubator/stanbol/branches/jena-reasoners/reasoners/owllink/pom.xml (original)
+++ incubator/stanbol/branches/jena-reasoners/reasoners/owllink/pom.xml Fri Aug 26 17:10:41 2011
@@ -28,7 +28,7 @@
<artifactId>org.apache.stanbol.reasoners.owllink</artifactId>
<packaging>bundle</packaging>
- <name>Apache Stanbol Reasoners OwlLink Dependency</name>
+ <name>Apache Stanbol Reasoners: OwlLink Dependency</name>
<repositories>
<repository>
Modified: incubator/stanbol/branches/jena-reasoners/reasoners/pom.xml
URL: http://svn.apache.org/viewvc/incubator/stanbol/branches/jena-reasoners/reasoners/pom.xml?rev=1162171&r1=1162170&r2=1162171&view=diff
==============================================================================
--- incubator/stanbol/branches/jena-reasoners/reasoners/pom.xml (original)
+++ incubator/stanbol/branches/jena-reasoners/reasoners/pom.xml Fri Aug 26 17:10:41 2011
@@ -42,8 +42,8 @@
<module>manager</module>
<module>owlapi</module>
<module>jena</module>
- <module>hermit</module>
- <module>base</module>
+ <!--module>hermit</module-->
+ <!--module>base</module-->
<module>owllink</module>
<module>web</module>
</modules>
Modified: incubator/stanbol/branches/jena-reasoners/reasoners/servicesapi/src/main/java/org/apache/stanbol/reasoners/servicesapi/InconsistentInputException.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/branches/jena-reasoners/reasoners/servicesapi/src/main/java/org/apache/stanbol/reasoners/servicesapi/InconsistentInputException.java?rev=1162171&r1=1162170&r2=1162171&view=diff
==============================================================================
--- incubator/stanbol/branches/jena-reasoners/reasoners/servicesapi/src/main/java/org/apache/stanbol/reasoners/servicesapi/InconsistentInputException.java (original)
+++ incubator/stanbol/branches/jena-reasoners/reasoners/servicesapi/src/main/java/org/apache/stanbol/reasoners/servicesapi/InconsistentInputException.java Fri Aug 26 17:10:41 2011
@@ -1,10 +1,16 @@
package org.apache.stanbol.reasoners.servicesapi;
+
/**
* The process cannot be completed because the input is inconsistent. This Exception must be used by reasoning
* services which must stop the inference process if any inconsistency is found.
*/
public class InconsistentInputException extends Exception {
+public InconsistentInputException() {
+}
+ public InconsistentInputException(Exception cause) {
+ super(cause);
+ }
/**
*
Modified: incubator/stanbol/branches/jena-reasoners/reasoners/servicesapi/src/main/java/org/apache/stanbol/reasoners/servicesapi/ReasoningService.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/branches/jena-reasoners/reasoners/servicesapi/src/main/java/org/apache/stanbol/reasoners/servicesapi/ReasoningService.java?rev=1162171&r1=1162170&r2=1162171&view=diff
==============================================================================
--- incubator/stanbol/branches/jena-reasoners/reasoners/servicesapi/src/main/java/org/apache/stanbol/reasoners/servicesapi/ReasoningService.java (original)
+++ incubator/stanbol/branches/jena-reasoners/reasoners/servicesapi/src/main/java/org/apache/stanbol/reasoners/servicesapi/ReasoningService.java Fri Aug 26 17:10:41 2011
@@ -5,6 +5,8 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
+import javax.sql.rowset.spi.SyncResolver;
+
/**
* Interface to be used by Reasoning services. This interface defines also default task to be implemented by
* all reasoning services: * CLASSIFY : Should return only rdfs:subClassOf and rdf:type statements * ENRICH :
Modified: incubator/stanbol/branches/jena-reasoners/reasoners/web/README
URL: http://svn.apache.org/viewvc/incubator/stanbol/branches/jena-reasoners/reasoners/web/README?rev=1162171&r1=1162170&r2=1162171&view=diff
==============================================================================
--- incubator/stanbol/branches/jena-reasoners/reasoners/web/README (original)
+++ incubator/stanbol/branches/jena-reasoners/reasoners/web/README Fri Aug 26 17:10:41 2011
@@ -1,5 +1,9 @@
+STANBOL REASONERS
-Examples:
+
+TODO:
+
+EXAMPLES:
#
# Basic GET calls to the reasoning services.
# Send a URL and the service will return the inferred triples
@@ -39,3 +43,4 @@ curl -X POST -H "Content-type: multipart
curl "http://localhost:8080/reasoners/services/owl/classify?url=http://xmlns.com/foaf/0.1/&target=example-foaf-inferred"
# or, posting a file
curl -X POST -H "Content-type: multipart/form-data" -F file=@foaf.rdf -F target=example-rdfs-inferences "http://localhost:8080/reasoners/services/rdfs/enrich"
+
Modified: incubator/stanbol/branches/jena-reasoners/reasoners/web/pom.xml
URL: http://svn.apache.org/viewvc/incubator/stanbol/branches/jena-reasoners/reasoners/web/pom.xml?rev=1162171&r1=1162170&r2=1162171&view=diff
==============================================================================
--- incubator/stanbol/branches/jena-reasoners/reasoners/web/pom.xml (original)
+++ incubator/stanbol/branches/jena-reasoners/reasoners/web/pom.xml Fri Aug 26 17:10:41 2011
@@ -69,7 +69,6 @@
<Import-Package>
!org.apache.felix.http.jetty,
!org.mortbay.jetty.*,
- org.semanticweb.HermiT.*;version=1.3.4,
org.apache.stanbol.reasoners.servicesapi.*,
org.apache.stanbol.reasoners.jena.*,
org.apache.stanbol.reasoners.owlapi.*,
@@ -165,25 +164,21 @@
<dependency>
<groupId>org.apache.clerezza</groupId>
<artifactId>rdf.core</artifactId>
- <version>0.12-incubating-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.clerezza</groupId>
<artifactId>rdf.rdfjson</artifactId>
- <version>0.3-incubating-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.clerezza</groupId>
<artifactId>jaxrs.rdf.providers</artifactId>
- <version>0.13-incubating-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.clerezza</groupId>
<artifactId>rdf.jena.serializer</artifactId>
- <version>0.9-incubating-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
@@ -191,17 +186,14 @@
<dependency>
<groupId>com.sun.jersey</groupId>
<artifactId>jersey-server</artifactId>
- <version>${jersey-version}</version>
</dependency>
<dependency>
<groupId>com.sun.jersey</groupId>
<artifactId>jersey-core</artifactId>
- <version>${jersey-version}</version>
</dependency>
<dependency>
<groupId>com.sun.jersey</groupId>
<artifactId>jersey-json</artifactId>
- <version>${jersey-version}</version>
<exclusions>
<!-- jaxb is now part of java 6 -->
<exclusion>
@@ -221,7 +213,6 @@
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
- <version>2.4</version>
<scope>provided</scope>
</dependency>
<dependency>
@@ -233,14 +224,12 @@
<dependency>
<groupId>org.codehaus.jettison</groupId>
<artifactId>jettison</artifactId>
- <version>1.2</version>
</dependency>
<!-- servlet container, most useful for the tests -->
<dependency>
<groupId>org.mortbay.jetty</groupId>
<artifactId>jetty</artifactId>
- <version>6.1.22</version>
<scope>provided</scope>
</dependency>
@@ -262,19 +251,16 @@
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
- <version>4.1.0</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.compendium</artifactId>
- <version>4.1.0</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.scr.annotations</artifactId>
- <version>1.2.0</version>
<scope>provided</scope>
</dependency>
@@ -282,31 +268,26 @@
<dependency>
<groupId>org.mockito</groupId>
<artifactId>mockito-all</artifactId>
- <version>1.6</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.sun.jersey</groupId>
<artifactId>jersey-client</artifactId>
- <version>${jersey-version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.ops4j.pax.exam</groupId>
<artifactId>pax-exam</artifactId>
- <version>${pax-exam-version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.ops4j.pax.exam</groupId>
<artifactId>pax-exam-junit</artifactId>
- <version>${pax-exam-version}</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.ops4j.pax.exam</groupId>
<artifactId>pax-exam-container-default</artifactId>
- <version>${pax-exam-version}</version>
<scope>test</scope>
</dependency>
@@ -319,12 +300,12 @@
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.ontologymanager.ontonet</artifactId>
</dependency>
- <dependency>
+ <!-- dependency>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.reasoners.base</artifactId>
<version>0.9.0-incubating-SNAPSHOT</version>
<scope>provided</scope>
- </dependency>
+ </dependency-->
<dependency>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.rules.base</artifactId>
@@ -369,14 +350,14 @@
<artifactId>junit</artifactId>
<scope>test</scope>
</dependency>
- <dependency>
+ <!-- dependency>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.commons.testing.jarexec</artifactId>
</dependency>
<dependency>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.commons.testing.stanbol</artifactId>
- </dependency>
+ </dependency-->
</dependencies>
Modified: incubator/stanbol/branches/jena-reasoners/reasoners/web/src/main/java/org/apache/stanbol/reasoners/web/ReasonersFragment.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/branches/jena-reasoners/reasoners/web/src/main/java/org/apache/stanbol/reasoners/web/ReasonersFragment.java?rev=1162171&r1=1162170&r2=1162171&view=diff
==============================================================================
--- incubator/stanbol/branches/jena-reasoners/reasoners/web/src/main/java/org/apache/stanbol/reasoners/web/ReasonersFragment.java (original)
+++ incubator/stanbol/branches/jena-reasoners/reasoners/web/src/main/java/org/apache/stanbol/reasoners/web/ReasonersFragment.java Fri Aug 26 17:10:41 2011
@@ -31,12 +31,6 @@ import org.apache.stanbol.commons.web.ba
import org.apache.stanbol.commons.web.base.ScriptResource;
import org.apache.stanbol.commons.web.base.WebFragment;
import org.apache.stanbol.ontologymanager.ontonet.api.ONManager;
-import org.apache.stanbol.reasoners.base.api.Reasoner;
-import org.apache.stanbol.reasoners.web.resources.Classify;
-import org.apache.stanbol.reasoners.web.resources.ConsistencyCheck;
-import org.apache.stanbol.reasoners.web.resources.ConsistentRefactoring;
-import org.apache.stanbol.reasoners.web.resources.Enrichment;
-import org.apache.stanbol.reasoners.web.resources.ReasonersResource;
import org.apache.stanbol.reasoners.web.resources.ReasoningServiceTaskResource;
import org.apache.stanbol.reasoners.web.resources.ReasoningServicesResource;
import org.apache.stanbol.reasoners.web.writers.JenaModelWriter;
@@ -64,8 +58,7 @@ public class ReasonersFragment implement
private static final String TEMPLATE_PATH = "/org/apache/stanbol/reasoners/web/templates";
- @Reference
- Reasoner reasoners;
+
@Reference
ONManager onm;
@@ -84,12 +77,7 @@ public class ReasonersFragment implement
public Set<Class<?>> getJaxrsResourceClasses() {
Set<Class<?>> classes = new HashSet<Class<?>>();
// Reasoner
- classes.add(ReasonersResource.class);
- classes.add(ConsistencyCheck.class);
- classes.add(ConsistentRefactoring.class);
- classes.add(Classify.class);
- classes.add(Enrichment.class);
-
+ //classes.add(ReasonersResource.class);
classes.add(ReasoningServicesResource.class);
classes.add(ReasoningServiceTaskResource.class);