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/23 14:02:25 UTC
svn commit: r1160643 [1/2] - in
/incubator/stanbol/branches/jena-reasoners/reasoners:
hermit/src/main/java/org/apache/stanbol/reasoners/hermit/
jena/src/main/java/org/apache/stanbol/reasoners/jena/
jena/src/main/java/org/apache/stanbol/reasoners/jena/f...
Author: enridaga
Date: Tue Aug 23 12:02:24 2011
New Revision: 1160643
URL: http://svn.apache.org/viewvc?rev=1160643&view=rev
Log:
Applied Stanbol code formatter (STANBOL-185)
Modified:
incubator/stanbol/branches/jena-reasoners/reasoners/hermit/src/main/java/org/apache/stanbol/reasoners/hermit/HermitReasoningService.java
incubator/stanbol/branches/jena-reasoners/reasoners/jena/src/main/java/org/apache/stanbol/reasoners/jena/AbstractJenaReasoningService.java
incubator/stanbol/branches/jena-reasoners/reasoners/jena/src/main/java/org/apache/stanbol/reasoners/jena/JenaOWLMiniReasoningService.java
incubator/stanbol/branches/jena-reasoners/reasoners/jena/src/main/java/org/apache/stanbol/reasoners/jena/JenaOWLReasoningService.java
incubator/stanbol/branches/jena-reasoners/reasoners/jena/src/main/java/org/apache/stanbol/reasoners/jena/JenaRDFSReasoningService.java
incubator/stanbol/branches/jena-reasoners/reasoners/jena/src/main/java/org/apache/stanbol/reasoners/jena/JenaReasoningService.java
incubator/stanbol/branches/jena-reasoners/reasoners/jena/src/main/java/org/apache/stanbol/reasoners/jena/filters/PropertyFilter.java
incubator/stanbol/branches/jena-reasoners/reasoners/manager/src/main/java/org/apache/stanbol/reasoners/manager/ReasoningServicesManagerImpl.java
incubator/stanbol/branches/jena-reasoners/reasoners/owlapi/src/main/java/org/apache/stanbol/reasoners/owlapi/AbstractOWLApiReasoningService.java
incubator/stanbol/branches/jena-reasoners/reasoners/owlapi/src/main/java/org/apache/stanbol/reasoners/owlapi/OWLApiReasoningService.java
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/servicesapi/src/main/java/org/apache/stanbol/reasoners/servicesapi/ReasoningServiceException.java
incubator/stanbol/branches/jena-reasoners/reasoners/servicesapi/src/main/java/org/apache/stanbol/reasoners/servicesapi/ReasoningServicesManager.java
incubator/stanbol/branches/jena-reasoners/reasoners/servicesapi/src/main/java/org/apache/stanbol/reasoners/servicesapi/UnboundReasoningServiceException.java
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/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/java/org/apache/stanbol/reasoners/web/resources/ReasoningPrettyResultResource.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/writers/JenaModelWriter.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=1160643&r1=1160642&r2=1160643&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 Tue Aug 23 12:02:24 2011
@@ -14,35 +14,33 @@ import org.semanticweb.owlapi.model.OWLO
import org.semanticweb.owlapi.reasoner.OWLReasoner;
/**
- * This class is the implementation of {@see OWLApiReasoningService} using the
- * HermiT reasoner
+ * This class is the implementation of {@see OWLApiReasoningService} using the HermiT reasoner
*/
@Component(immediate = true, metatype = true)
@Service
-public class HermitReasoningService extends AbstractOWLApiReasoningService
- implements OWLApiReasoningService, ReasoningService {
+public class HermitReasoningService extends AbstractOWLApiReasoningService implements OWLApiReasoningService,
+ ReasoningService {
- public static final String _DEFAULT_PATH = "owl2";
+ public static final String _DEFAULT_PATH = "owl2";
- @Property(name = ReasoningService.SERVICE_PATH, value = _DEFAULT_PATH)
- private String path;
+ @Property(name = ReasoningService.SERVICE_PATH, value = _DEFAULT_PATH)
+ private String path;
- @Override
- protected OWLReasoner getReasoner(OWLOntology ontology) {
- Configuration config = new Configuration();
- config.ignoreUnsupportedDatatypes = true;
- ReasonerFactory risfactory = new ReasonerFactory();
- return risfactory.createReasoner(ontology, config);
- }
-
- @Override
- public String getPath() {
- return path;
- }
-
- @Activate
- public void activate(ComponentContext context) {
- this.path = (String) context.getProperties().get(
- ReasoningService.SERVICE_PATH);
- }
+ @Override
+ protected OWLReasoner getReasoner(OWLOntology ontology) {
+ Configuration config = new Configuration();
+ config.ignoreUnsupportedDatatypes = true;
+ ReasonerFactory risfactory = new ReasonerFactory();
+ return risfactory.createReasoner(ontology, config);
+ }
+
+ @Override
+ public String getPath() {
+ return path;
+ }
+
+ @Activate
+ public void activate(ComponentContext context) {
+ this.path = (String) context.getProperties().get(ReasoningService.SERVICE_PATH);
+ }
}
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=1160643&r1=1160642&r2=1160643&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 Tue Aug 23 12:02:24 2011
@@ -25,226 +25,214 @@ import com.hp.hpl.jena.vocabulary.RDF;
/**
* Abstract implementation of the {@see JenaReasoningService} interface
*/
-public abstract class AbstractJenaReasoningService implements
- JenaReasoningService {
- private Reasoner reasoner;
- private static final Logger log = LoggerFactory
- .getLogger(AbstractJenaReasoningService.class);
-
- /**
- * This constructor sets the given reasoner instance as the default shared one.
- *
- * @param reasoner
- */
- protected AbstractJenaReasoningService(Reasoner reasoner) {
- this.reasoner = reasoner;
- }
-
- /**
- * Gets the Jena reasoner instance (to be used by subclasses)
- *
- * @return
- */
- protected Reasoner getReasoner() {
- return reasoner;
- }
-
- /**
- * Generic method to perform inferences
- */
- @Override
- public InfModel run(Model data) {
- InfGraph inferredGraph = this.reasoner.bind(data.getGraph());
- return ModelFactory.createInfModel(inferredGraph);
- }
-
- /**
- * This method performs inferences creating a new specialized reasoner,
- * which extends the capabilities of the default one and adds the given rule
- * set.
- *
- * @param data
- * @param rules
- * @return
- */
- @Override
- public InfModel run(Model data, List<Rule> rules) {
- InfGraph inferredGraph = customReasoner(rules).bind(data.getGraph());
- return ModelFactory.createInfModel(inferredGraph);
- }
-
- /**
- * This method is called to build a custom reasoner to be used with a given
- * rule set. Subclasses may want to specialize the default behavior, which
- * simply merge the standard rule set with the given list
- *
- * Note: to customized the default reasoner instance, we need to create a
- * new instance, to avoid to keep the configuration changes in the standard
- * shared instance. This is not much efficient, because we create a new
- * reasoner for each call which includes a specified rule set.
- *
- * In the future, we may want to implement a way to deploy customized shared
- * reasoning services, based on a specific recipe.
- *
- * @param rules
- * @return
- */
- protected Reasoner customReasoner(List<Rule> customRules) {
- List<Rule> standardRules = ((FBRuleReasoner) this.reasoner).getRules();
- standardRules.addAll(customRules);
- return new GenericRuleReasoner(standardRules);
- }
-
- /**
- * Classification: 1) Perform reasoning 2) Returns only rdf:type statements
- *
- * @param data
- * @return
- */
- @Override
- public Set<Statement> classify(Model data) {
- return run(data).listStatements()
- .filterKeep(new PropertyFilter(RDF.type)).toSet();
- }
-
- /**
- * Classification: 1) Perform reasoning on a reasoner customized with the
- * given rule set 2) Returns only rdf:type statements
- *
- * @param data
- * @param rules
- * @return
- */
- @Override
- public Set<Statement> classify(Model data, List<Rule> rules) {
- return run(data, rules).listStatements()
- .filterKeep(new PropertyFilter(RDF.type)).toSet();
- }
-
- /**
- * Enriching: 1) Perform reasoning 2) Returns all the statements (filtered =
- * false) or only inferred ones (filtered = true)
- *
- * @param data
- * @param rules
- * @return
- */
- @Override
- public Set<Statement> enrich(Model data, boolean filtered) {
- Set<Statement> statements = run(data).listStatements().toSet();
- if (filtered) {
- return prune(data.listStatements().toSet(), statements);
- }
- return statements;
- }
-
- /**
- * Removes the statements in the first set from the second set
- *
- * @param input
- * @param statements
- * @return
- */
- protected final Set<Statement> prune(Set<Statement> first,
- Set<Statement> second) {
- Set<Statement> remove = new HashSet<Statement>();
- for (Statement s : second) {
- if (first.contains(s)) {
- remove.add(s);
- }
- }
- second.removeAll(remove);
- return second;
- }
-
- /**
- * Enriching: 1) Perform reasoning 2) Returns the inferred statements only.
- * This is the same as enrich(data, true)
- *
- * @param data
- * @return
- */
- public Set<Statement> enrich(Model data) {
- return enrich(data, true);
- }
-
- /**
- * Enriching: 1) Perform reasoning on a reasoner customized with the given
- * rule set 2) Returns all the statements (filtered = false) or only
- * inferred ones (filtered = true)
- *
- * @param data
- * @param rules
- * @param filtered
- * @return
- */
- @Override
- public Set<Statement> enrich(Model data, List<Rule> rules, boolean filtered) {
- Set<Statement> statements = run(data, rules).listStatements().toSet();
- if (filtered) {
- return prune(data.listStatements().toSet(), statements);
- }
- return statements;
- }
-
- /**
- * Enriching: 1) Perform reasoning on a reasoner customized with the given
- * rule set 2) Returns the inferred statements only. This is the same as
- * enrich(data, rules, true)
- *
- * @param data
- * @param rules
- * @return
- */
- @Override
- public Set<Statement> enrich(Model data, List<Rule> rules) {
- return enrich(data, rules, true);
- }
-
- /**
- * Consistency check: whether this RDF is consistent or not
- *
- * @param data
- * @return
- */
- @Override
- public boolean isConsistent(Model data) {
- return isConsistent(run(data).validate());
- }
-
- /**
- * Consistency check: whether this RDF is consistent or not
- *
- * We decide to apply a strict meaning of consistency. The alternative would
- * be to use isValid() method, which tolerates classes that can't be
- * instantiated
- *
- * @param data
- * @param rules
- * @return
- */
- @Override
- public boolean isConsistent(Model data, List<Rule> rules) {
- return isConsistent(run(data, rules).validate());
- }
-
- /**
- * This internal method implements the logic of consistency.
- *
- * We decide to apply a strict meaning of consistency. The alternative would
- * be to use isValid() method, which tolerates classes that can't be
- * instantiated.
- *
- * Subclasses may want to change this behavior.
- *
- * @param report
- * @return
- */
- protected boolean isConsistent(ValidityReport report) {
- Iterator<Report> it = report.getReports();
- while(it.hasNext()){
- log.info("Report: {}",it.next());
- }
- return report.isClean();
- }
+public abstract class AbstractJenaReasoningService implements JenaReasoningService {
+ private Reasoner reasoner;
+ private static final Logger log = LoggerFactory.getLogger(AbstractJenaReasoningService.class);
+
+ /**
+ * This constructor sets the given reasoner instance as the default shared one.
+ *
+ * @param reasoner
+ */
+ protected AbstractJenaReasoningService(Reasoner reasoner) {
+ this.reasoner = reasoner;
+ }
+
+ /**
+ * Gets the Jena reasoner instance (to be used by subclasses)
+ *
+ * @return
+ */
+ protected Reasoner getReasoner() {
+ return reasoner;
+ }
+
+ /**
+ * Generic method to perform inferences
+ */
+ @Override
+ public InfModel run(Model data) {
+ InfGraph inferredGraph = this.reasoner.bind(data.getGraph());
+ return ModelFactory.createInfModel(inferredGraph);
+ }
+
+ /**
+ * This method performs inferences creating a new specialized reasoner, which extends the capabilities of
+ * the default one and adds the given rule set.
+ *
+ * @param data
+ * @param rules
+ * @return
+ */
+ @Override
+ public InfModel run(Model data, List<Rule> rules) {
+ InfGraph inferredGraph = customReasoner(rules).bind(data.getGraph());
+ return ModelFactory.createInfModel(inferredGraph);
+ }
+
+ /**
+ * This method is called to build a custom reasoner to be used with a given rule set. Subclasses may want
+ * to specialize the default behavior, which simply merge the standard rule set with the given list
+ *
+ * Note: to customized the default reasoner instance, we need to create a new instance, to avoid to keep
+ * the configuration changes in the standard shared instance. This is not much efficient, because we
+ * create a new reasoner for each call which includes a specified rule set.
+ *
+ * In the future, we may want to implement a way to deploy customized shared reasoning services, based on
+ * a specific recipe.
+ *
+ * @param rules
+ * @return
+ */
+ protected Reasoner customReasoner(List<Rule> customRules) {
+ List<Rule> standardRules = ((FBRuleReasoner) this.reasoner).getRules();
+ standardRules.addAll(customRules);
+ return new GenericRuleReasoner(standardRules);
+ }
+
+ /**
+ * Classification: 1) Perform reasoning 2) Returns only rdf:type statements
+ *
+ * @param data
+ * @return
+ */
+ @Override
+ public Set<Statement> classify(Model data) {
+ return run(data).listStatements().filterKeep(new PropertyFilter(RDF.type)).toSet();
+ }
+
+ /**
+ * Classification: 1) Perform reasoning on a reasoner customized with the given rule set 2) Returns only
+ * rdf:type statements
+ *
+ * @param data
+ * @param rules
+ * @return
+ */
+ @Override
+ public Set<Statement> classify(Model data, List<Rule> rules) {
+ return run(data, rules).listStatements().filterKeep(new PropertyFilter(RDF.type)).toSet();
+ }
+
+ /**
+ * Enriching: 1) Perform reasoning 2) Returns all the statements (filtered = false) or only inferred ones
+ * (filtered = true)
+ *
+ * @param data
+ * @param rules
+ * @return
+ */
+ @Override
+ public Set<Statement> enrich(Model data, boolean filtered) {
+ Set<Statement> statements = run(data).listStatements().toSet();
+ if (filtered) {
+ return prune(data.listStatements().toSet(), statements);
+ }
+ return statements;
+ }
+
+ /**
+ * Removes the statements in the first set from the second set
+ *
+ * @param input
+ * @param statements
+ * @return
+ */
+ protected final Set<Statement> prune(Set<Statement> first, Set<Statement> second) {
+ Set<Statement> remove = new HashSet<Statement>();
+ for (Statement s : second) {
+ if (first.contains(s)) {
+ remove.add(s);
+ }
+ }
+ second.removeAll(remove);
+ return second;
+ }
+
+ /**
+ * Enriching: 1) Perform reasoning 2) Returns the inferred statements only. This is the same as
+ * enrich(data, true)
+ *
+ * @param data
+ * @return
+ */
+ public Set<Statement> enrich(Model data) {
+ return enrich(data, true);
+ }
+
+ /**
+ * Enriching: 1) Perform reasoning on a reasoner customized with the given rule set 2) Returns all the
+ * statements (filtered = false) or only inferred ones (filtered = true)
+ *
+ * @param data
+ * @param rules
+ * @param filtered
+ * @return
+ */
+ @Override
+ public Set<Statement> enrich(Model data, List<Rule> rules, boolean filtered) {
+ Set<Statement> statements = run(data, rules).listStatements().toSet();
+ if (filtered) {
+ return prune(data.listStatements().toSet(), statements);
+ }
+ return statements;
+ }
+
+ /**
+ * Enriching: 1) Perform reasoning on a reasoner customized with the given rule set 2) Returns the
+ * inferred statements only. This is the same as enrich(data, rules, true)
+ *
+ * @param data
+ * @param rules
+ * @return
+ */
+ @Override
+ public Set<Statement> enrich(Model data, List<Rule> rules) {
+ return enrich(data, rules, true);
+ }
+
+ /**
+ * Consistency check: whether this RDF is consistent or not
+ *
+ * @param data
+ * @return
+ */
+ @Override
+ public boolean isConsistent(Model data) {
+ return isConsistent(run(data).validate());
+ }
+
+ /**
+ * Consistency check: whether this RDF is consistent or not
+ *
+ * We decide to apply a strict meaning of consistency. The alternative would be to use isValid() method,
+ * which tolerates classes that can't be instantiated
+ *
+ * @param data
+ * @param rules
+ * @return
+ */
+ @Override
+ public boolean isConsistent(Model data, List<Rule> rules) {
+ return isConsistent(run(data, rules).validate());
+ }
+
+ /**
+ * This internal method implements the logic of consistency.
+ *
+ * We decide to apply a strict meaning of consistency. The alternative would be to use isValid() method,
+ * which tolerates classes that can't be instantiated.
+ *
+ * Subclasses may want to change this behavior.
+ *
+ * @param report
+ * @return
+ */
+ protected boolean isConsistent(ValidityReport report) {
+ Iterator<Report> it = report.getReports();
+ while (it.hasNext()) {
+ log.info("Report: {}", it.next());
+ }
+ return report.isClean();
+ }
}
Modified: incubator/stanbol/branches/jena-reasoners/reasoners/jena/src/main/java/org/apache/stanbol/reasoners/jena/JenaOWLMiniReasoningService.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/branches/jena-reasoners/reasoners/jena/src/main/java/org/apache/stanbol/reasoners/jena/JenaOWLMiniReasoningService.java?rev=1160643&r1=1160642&r2=1160643&view=diff
==============================================================================
--- incubator/stanbol/branches/jena-reasoners/reasoners/jena/src/main/java/org/apache/stanbol/reasoners/jena/JenaOWLMiniReasoningService.java (original)
+++ incubator/stanbol/branches/jena-reasoners/reasoners/jena/src/main/java/org/apache/stanbol/reasoners/jena/JenaOWLMiniReasoningService.java Tue Aug 23 12:02:24 2011
@@ -14,24 +14,23 @@ import com.hp.hpl.jena.reasoner.Reasoner
*/
@Component(immediate = true, metatype = true)
@Service
-public class JenaOWLMiniReasoningService extends AbstractJenaReasoningService
- implements ReasoningService {
- public static final String _DEFAULT_PATH = "owlmini";
+public class JenaOWLMiniReasoningService extends AbstractJenaReasoningService implements ReasoningService {
+ public static final String _DEFAULT_PATH = "owlmini";
- @Property(name = ReasoningService.SERVICE_PATH, value = _DEFAULT_PATH)
- private String path;
+ @Property(name = ReasoningService.SERVICE_PATH, value = _DEFAULT_PATH)
+ private String path;
- public JenaOWLMiniReasoningService() {
- super(ReasonerRegistry.getOWLMiniReasoner());
- }
+ public JenaOWLMiniReasoningService() {
+ super(ReasonerRegistry.getOWLMiniReasoner());
+ }
- @Override
- public String getPath() {
- return path;
- }
-
- @Activate
- public void activate(ComponentContext context){
- this.path = (String) context.getProperties().get(ReasoningService.SERVICE_PATH);
- }
+ @Override
+ public String getPath() {
+ return path;
+ }
+
+ @Activate
+ public void activate(ComponentContext context) {
+ this.path = (String) context.getProperties().get(ReasoningService.SERVICE_PATH);
+ }
}
Modified: incubator/stanbol/branches/jena-reasoners/reasoners/jena/src/main/java/org/apache/stanbol/reasoners/jena/JenaOWLReasoningService.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/branches/jena-reasoners/reasoners/jena/src/main/java/org/apache/stanbol/reasoners/jena/JenaOWLReasoningService.java?rev=1160643&r1=1160642&r2=1160643&view=diff
==============================================================================
--- incubator/stanbol/branches/jena-reasoners/reasoners/jena/src/main/java/org/apache/stanbol/reasoners/jena/JenaOWLReasoningService.java (original)
+++ incubator/stanbol/branches/jena-reasoners/reasoners/jena/src/main/java/org/apache/stanbol/reasoners/jena/JenaOWLReasoningService.java Tue Aug 23 12:02:24 2011
@@ -14,23 +14,23 @@ import com.hp.hpl.jena.reasoner.Reasoner
*/
@Component(immediate = true, metatype = true)
@Service
-public class JenaOWLReasoningService extends AbstractJenaReasoningService
- implements ReasoningService {
- public static final String _DEFAULT_PATH = "owl";
-
- @Property(name = ReasoningService.SERVICE_PATH, value = _DEFAULT_PATH)
- private String path;
-
- public JenaOWLReasoningService() {
- super(ReasonerRegistry.getOWLReasoner());
- }
+public class JenaOWLReasoningService extends AbstractJenaReasoningService implements ReasoningService {
+ public static final String _DEFAULT_PATH = "owl";
- @Override
- public String getPath() {
- return path;
- }
- @Activate
- public void activate(ComponentContext context){
- this.path = (String) context.getProperties().get(ReasoningService.SERVICE_PATH);
- }
+ @Property(name = ReasoningService.SERVICE_PATH, value = _DEFAULT_PATH)
+ private String path;
+
+ public JenaOWLReasoningService() {
+ super(ReasonerRegistry.getOWLReasoner());
+ }
+
+ @Override
+ public String getPath() {
+ return path;
+ }
+
+ @Activate
+ public void activate(ComponentContext context) {
+ this.path = (String) context.getProperties().get(ReasoningService.SERVICE_PATH);
+ }
}
Modified: incubator/stanbol/branches/jena-reasoners/reasoners/jena/src/main/java/org/apache/stanbol/reasoners/jena/JenaRDFSReasoningService.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/branches/jena-reasoners/reasoners/jena/src/main/java/org/apache/stanbol/reasoners/jena/JenaRDFSReasoningService.java?rev=1160643&r1=1160642&r2=1160643&view=diff
==============================================================================
--- incubator/stanbol/branches/jena-reasoners/reasoners/jena/src/main/java/org/apache/stanbol/reasoners/jena/JenaRDFSReasoningService.java (original)
+++ incubator/stanbol/branches/jena-reasoners/reasoners/jena/src/main/java/org/apache/stanbol/reasoners/jena/JenaRDFSReasoningService.java Tue Aug 23 12:02:24 2011
@@ -17,23 +17,23 @@ import com.hp.hpl.jena.reasoner.Reasoner
*/
@Component(immediate = true, metatype = true)
@Service
-public class JenaRDFSReasoningService extends AbstractJenaReasoningService
- implements ReasoningService {
- public static final String _DEFAULT_PATH = "rdfs";
+public class JenaRDFSReasoningService extends AbstractJenaReasoningService implements ReasoningService {
+ public static final String _DEFAULT_PATH = "rdfs";
- @Property(name = ReasoningService.SERVICE_PATH, value = _DEFAULT_PATH)
- private String path;
+ @Property(name = ReasoningService.SERVICE_PATH, value = _DEFAULT_PATH)
+ private String path;
- public JenaRDFSReasoningService() {
- super(ReasonerRegistry.getRDFSReasoner());
- }
+ public JenaRDFSReasoningService() {
+ super(ReasonerRegistry.getRDFSReasoner());
+ }
- @Override
- public String getPath() {
- return path;
- }
- @Activate
- public void activate(ComponentContext context){
- this.path = (String) context.getProperties().get(ReasoningService.SERVICE_PATH);
- }
+ @Override
+ public String getPath() {
+ return path;
+ }
+
+ @Activate
+ public void activate(ComponentContext context) {
+ this.path = (String) context.getProperties().get(ReasoningService.SERVICE_PATH);
+ }
}
Modified: incubator/stanbol/branches/jena-reasoners/reasoners/jena/src/main/java/org/apache/stanbol/reasoners/jena/JenaReasoningService.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/branches/jena-reasoners/reasoners/jena/src/main/java/org/apache/stanbol/reasoners/jena/JenaReasoningService.java?rev=1160643&r1=1160642&r2=1160643&view=diff
==============================================================================
--- incubator/stanbol/branches/jena-reasoners/reasoners/jena/src/main/java/org/apache/stanbol/reasoners/jena/JenaReasoningService.java (original)
+++ incubator/stanbol/branches/jena-reasoners/reasoners/jena/src/main/java/org/apache/stanbol/reasoners/jena/JenaReasoningService.java Tue Aug 23 12:02:24 2011
@@ -13,56 +13,56 @@ import com.hp.hpl.jena.reasoner.rulesys.
*/
public interface JenaReasoningService {
- /**
- * Runs the reasoner over the given input data
- * s
- * @param data
- * @return
- */
- public abstract InfModel run(Model data);
-
- /**
- * This method returns only rdf:type statements
- *
- * @param data
- * @return
- */
- public abstract Set<Statement> classify(Model data);
-
- /**
- * This method returns only inferred statements Same as enrich(data, true);
- *
- * @param data
- * @return
- */
- public abstract Set<Statement> enrich(Model data);
-
- /**
- * Whether the data is consistent
- *
- * @param data
- * @return
- */
- public abstract boolean isConsistent(Model data);
-
- /**
- * This method returns all the inferred model as a set of statements. If
- * filtered = true, then return only the inferred statements
- *
- * @param data
- * @param filtered
- * @return
- */
- public abstract Set<Statement> enrich(Model data, boolean filtered);
-
- public abstract InfModel run(Model data, List<Rule> rules);
+ /**
+ * Runs the reasoner over the given input data s
+ *
+ * @param data
+ * @return
+ */
+ public abstract InfModel run(Model data);
+
+ /**
+ * This method returns only rdf:type statements
+ *
+ * @param data
+ * @return
+ */
+ public abstract Set<Statement> classify(Model data);
+
+ /**
+ * This method returns only inferred statements Same as enrich(data, true);
+ *
+ * @param data
+ * @return
+ */
+ public abstract Set<Statement> enrich(Model data);
+
+ /**
+ * Whether the data is consistent
+ *
+ * @param data
+ * @return
+ */
+ public abstract boolean isConsistent(Model data);
+
+ /**
+ * This method returns all the inferred model as a set of statements. If filtered = true, then return only
+ * the inferred statements
+ *
+ * @param data
+ * @param filtered
+ * @return
+ */
+ public abstract Set<Statement> enrich(Model data, boolean filtered);
+
+ public abstract InfModel run(Model data, List<Rule> rules);
- public abstract boolean isConsistent(Model data, List<Rule> rules);
+ public abstract boolean isConsistent(Model data, List<Rule> rules);
- public abstract Set<Statement> enrich(Model data, List<Rule> rules);
+ public abstract Set<Statement> enrich(Model data, List<Rule> rules);
- public abstract Set<Statement> enrich(Model data, List<Rule> rules, boolean filtered);
+ public abstract Set<Statement> enrich(Model data, List<Rule> rules, boolean filtered);
- public abstract Set<Statement> classify(Model data, List<Rule> rules);
+ public abstract Set<Statement> classify(Model data, List<Rule> rules);
}
\ No newline at end of file
Modified: incubator/stanbol/branches/jena-reasoners/reasoners/jena/src/main/java/org/apache/stanbol/reasoners/jena/filters/PropertyFilter.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/branches/jena-reasoners/reasoners/jena/src/main/java/org/apache/stanbol/reasoners/jena/filters/PropertyFilter.java?rev=1160643&r1=1160642&r2=1160643&view=diff
==============================================================================
--- incubator/stanbol/branches/jena-reasoners/reasoners/jena/src/main/java/org/apache/stanbol/reasoners/jena/filters/PropertyFilter.java (original)
+++ incubator/stanbol/branches/jena-reasoners/reasoners/jena/src/main/java/org/apache/stanbol/reasoners/jena/filters/PropertyFilter.java Tue Aug 23 12:02:24 2011
@@ -7,18 +7,18 @@ import com.hp.hpl.jena.util.iterator.Fil
/**
* A filter to get only statements with the given property
*/
-public class PropertyFilter extends Filter<Statement>{
- private Property property;
+public class PropertyFilter extends Filter<Statement> {
+ private Property property;
- public PropertyFilter(Property property) {
- this.property = property;
- }
-
- @Override
- public boolean accept(Statement statement) {
- /**
- * Only statements with the given property
- */
- return statement.getPredicate().equals(property);
- }
+ public PropertyFilter(Property property) {
+ this.property = property;
+ }
+
+ @Override
+ public boolean accept(Statement statement) {
+ /**
+ * Only statements with the given property
+ */
+ return statement.getPredicate().equals(property);
+ }
}
Modified: incubator/stanbol/branches/jena-reasoners/reasoners/manager/src/main/java/org/apache/stanbol/reasoners/manager/ReasoningServicesManagerImpl.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/branches/jena-reasoners/reasoners/manager/src/main/java/org/apache/stanbol/reasoners/manager/ReasoningServicesManagerImpl.java?rev=1160643&r1=1160642&r2=1160643&view=diff
==============================================================================
--- incubator/stanbol/branches/jena-reasoners/reasoners/manager/src/main/java/org/apache/stanbol/reasoners/manager/ReasoningServicesManagerImpl.java (original)
+++ incubator/stanbol/branches/jena-reasoners/reasoners/manager/src/main/java/org/apache/stanbol/reasoners/manager/ReasoningServicesManagerImpl.java Tue Aug 23 12:02:24 2011
@@ -14,54 +14,50 @@ import org.slf4j.LoggerFactory;
* @scr.component immediate="true"
* @scr.service
* @scr.reference name="ReasoningService"
- * interface="org.apache.stanbol.reasoners.servicesapi.ReasoningService"
- * cardinality="0..n" policy="dynamic")
+ * interface="org.apache.stanbol.reasoners.servicesapi.ReasoningService" cardinality="0..n"
+ * policy="dynamic")
*/
public class ReasoningServicesManagerImpl implements ReasoningServicesManager {
- private static final Logger log = LoggerFactory
- .getLogger(ReasoningServicesManagerImpl.class);
+ private static final Logger log = LoggerFactory.getLogger(ReasoningServicesManagerImpl.class);
- private Set<ReasoningService> services = new HashSet<ReasoningService>();
+ private Set<ReasoningService> services = new HashSet<ReasoningService>();
- public void bindReasoningService(ReasoningService service) {
- services.add(service);
- log.debug("Reasoning service {} added to path {}", service,
- service.getPath());
- log.debug("{} services bound.", services.size());
- }
-
- public void unbindReasoningService(ReasoningService service) {
- services.remove(service);
- log.debug("Reasoning service {} removed from path {}", service,
- service.getPath());
- log.debug("{} services bound.", services.size());
- }
-
- /*
- * (non-Javadoc)
- *
- * @see org.apache.stanbol.reasoners.web.resources.ReasoningServices#size()
- */
- @Override
- public int size() {
- return services.size();
- }
-
- @Override
- public ReasoningService get(String path) throws UnboundReasoningServiceException {
- for (ReasoningService service : services) {
- log.debug("Does service {} match path {}?",service,path);
- if (service.getPath().equals(path)) {
- return service;
- }
- }
- throw new UnboundReasoningServiceException();
- }
-
- @Override
- public Set<ReasoningService> asUnmodifiableSet(){
- return Collections.unmodifiableSet(services);
- }
+ public void bindReasoningService(ReasoningService service) {
+ services.add(service);
+ log.debug("Reasoning service {} added to path {}", service, service.getPath());
+ log.debug("{} services bound.", services.size());
+ }
+
+ public void unbindReasoningService(ReasoningService service) {
+ services.remove(service);
+ log.debug("Reasoning service {} removed from path {}", service, service.getPath());
+ log.debug("{} services bound.", services.size());
+ }
+
+ /*
+ * (non-Javadoc)
+ *
+ * @see org.apache.stanbol.reasoners.web.resources.ReasoningServices#size()
+ */
+ @Override
+ public int size() {
+ return services.size();
+ }
+
+ @Override
+ public ReasoningService get(String path) throws UnboundReasoningServiceException {
+ for (ReasoningService service : services) {
+ log.debug("Does service {} match path {}?", service, path);
+ if (service.getPath().equals(path)) {
+ return service;
+ }
+ }
+ throw new UnboundReasoningServiceException();
+ }
+
+ @Override
+ public Set<ReasoningService> asUnmodifiableSet() {
+ return Collections.unmodifiableSet(services);
+ }
}
-
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=1160643&r1=1160642&r2=1160643&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 Tue Aug 23 12:02:24 2011
@@ -33,277 +33,267 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/**
- * This abstract class implements basic methods for a reasoning service based on
- * OWLApi
+ * This abstract class implements basic methods for a reasoning service based on OWLApi
*/
-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 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() {
- // We want a single instance here
- if (manager == null) {
- manager = OWLManager.createOWLOntologyManager();
- }
- return manager;
- }
-
- /**
- * Method to be implemented by subclasses.
- *
- * @param ontology
- * @return
- */
- protected abstract OWLReasoner getReasoner(OWLOntology ontology);
-
- /**
- * Generic method for running the reasoner
- *
- * @param input
- * @param generators
- * @return
- */
- @Override
- public Set<OWLAxiom> run(OWLOntology input,
- List<InferredAxiomGenerator<? extends OWLAxiom>> generators)
- throws ReasoningServiceException, InconsistentInputException {
- try {
- // Get the manager
- OWLOntologyManager manager = getOWLOntologyManager();
-
- // Get the reasoner
- OWLReasoner reasoner = getReasoner(input);
- log.debug("Running {} reasoner on {} ", reasoner.getClass(),
- input.getOntologyID());
-
- // To generate inferred axioms
- InferredOntologyGenerator inferred = new InferredOntologyGenerator(
- reasoner, generators);
-
- // We fill an anonymous ontology with the result, the return the
- // axiom set
- Set<OWLAxiom> axioms = new HashSet<OWLAxiom>();
- try {
- OWLOntology output = manager.createOntology();
- inferred.fillOntology(manager, output);
- log.debug("Temporary ID is {}", output.getOntologyID());
- axioms = manager.getOntology(output.getOntologyID())
- .getAxioms();
- // We remove the ontology from the manager
- manager.removeOntology(output);
- } catch (OWLOntologyCreationException e) {
- log.error("An exception have been thrown when instantiating the ontology");
- throw new ReasoningServiceException();
- }
-
- return axioms;
- } catch (InconsistentOntologyException inconsistent) {
- /**
- * TODO Add report. Why it is inconsistent?
- */
- throw new InconsistentInputException();
- } catch (Exception exception) {
- log.error("An exception have been thrown while executing method run()");
- throw new ReasoningServiceException();
- }
- }
-
- /**
- * Merges the SWRL rules in the input ontology, then calls
- * run(OWLOntology,List<InferredAxiomGenerator<? extends OWLAxiom>>)
- *
- * @param ontology
- * @param rules
- * @param generators
- * @return
- */
- @Override
- public Set<OWLAxiom> run(OWLOntology ontology, List<SWRLRule> rules,
- List<InferredAxiomGenerator<? extends OWLAxiom>> generators)
- throws ReasoningServiceException, InconsistentInputException {
- log.debug("Called method run(OWLOntology,List<SWRLRule>,List)");
- OWLOntologyManager manager = getOWLOntologyManager();
- try {
- log.debug("Create a input ontology to merge rules in.");
- OWLOntology input = manager.createOntology();
- Set<SWRLRule> ruleSet = new HashSet<SWRLRule>();
- ruleSet.addAll(rules);
- manager.addAxioms(input, ruleSet);
- input = manager.getOntology(input.getOntologyID());
- log.debug("Created ontology: {}", input);
- log.debug("Calling the run method.");
- return run(input, generators);
- } catch (OWLOntologyCreationException e) {
- log.error(
- "An error have been thrown while attempting to create ontology. Message was: {}",
- e.getLocalizedMessage());
- // TODO Add explanation of this exception
- throw new ReasoningServiceException();
- }
- }
-
- /**
- * {@see InferredAxiomGenerator}s to use for the classify() reasoning
- * method.
- *
- * Subclasses may want to change this.
- *
- * @return
- */
- protected List<InferredAxiomGenerator<? extends OWLAxiom>> getClassifyAxiomGenerators() {
- List<InferredAxiomGenerator<? extends OWLAxiom>> gens = new ArrayList<InferredAxiomGenerator<? extends OWLAxiom>>();
- gens.add(new InferredClassAssertionAxiomGenerator());
- gens.add(new InferredSubClassAxiomGenerator());
- gens.add(new InferredEquivalentClassAxiomGenerator());
- gens.add(new InferredDisjointClassesAxiomGenerator());
- return gens;
- }
-
- /**
- * {@see InferredAxiomGenerator}s to use for the enrich() reasoning method.
- *
- * Subclasses may want to change this.
- *
- * @return
- */
- protected List<InferredAxiomGenerator<? extends OWLAxiom>> getEnrichAxiomGenerators() {
- List<InferredAxiomGenerator<? extends OWLAxiom>> gens = new ArrayList<InferredAxiomGenerator<? extends OWLAxiom>>();
- // Classes
- gens.add(new InferredClassAssertionAxiomGenerator());
- gens.add(new InferredSubClassAxiomGenerator());
- gens.add(new InferredEquivalentClassAxiomGenerator());
- gens.add(new InferredDisjointClassesAxiomGenerator());
- // data properties
- gens.add(new InferredDataPropertyCharacteristicAxiomGenerator());
- gens.add(new InferredEquivalentDataPropertiesAxiomGenerator());
- gens.add(new InferredSubDataPropertyAxiomGenerator());
- // object properties
- gens.add(new InferredEquivalentObjectPropertyAxiomGenerator());
- gens.add(new InferredInverseObjectPropertiesAxiomGenerator());
- gens.add(new InferredObjectPropertyCharacteristicAxiomGenerator());
- gens.add(new InferredSubObjectPropertyAxiomGenerator());
- // individuals
- gens.add(new InferredClassAssertionAxiomGenerator());
- gens.add(new InferredPropertyAssertionGenerator());
- return gens;
- }
-
- /**
- * Classify, returns only axioms about classes and instances
- *
- * @param ontology
- * @return
- */
- @Override
- public Set<OWLAxiom> classify(OWLOntology ontology)
- throws ReasoningServiceException, InconsistentInputException {
- return run(ontology, getClassifyAxiomGenerators());
- }
-
- /**
- * Classify, merge SWRL rules in the input ontology, before
- *
- * @param ontology
- * @param rules
- * @return
- * @throws InconsistentInputException
- * @throws ReasoningServiceException
- */
- @Override
- public Set<OWLAxiom> classify(OWLOntology ontology, List<SWRLRule> rules)
- throws ReasoningServiceException, InconsistentInputException {
- log.debug("Calling classify(OWLOntology ontology, List<SWRLRule> rules) ");
- return run(ontology, rules, getClassifyAxiomGenerators());
- }
-
- /**
- * Enrich, return all inferences
- *
- * @param ontology
- * @return
- * @throws ReasoningServiceException
- * @throws InconsistentInputException
- */
- @Override
- public Set<OWLAxiom> enrich(OWLOntology ontology)
- throws ReasoningServiceException, InconsistentInputException {
- return run(ontology, getEnrichAxiomGenerators());
- }
-
- /**
- * Enrich, merge SWRL rules and return all inferences
- *
- * @param ontology
- * @param rules
- * @return
- * @throws ReasoningServiceException
- * @throws InconsistentInputException
- */
- @Override
- public Set<OWLAxiom> enrich(OWLOntology ontology, List<SWRLRule> rules)
- throws ReasoningServiceException, InconsistentInputException {
- log.debug("Calling enrich(OWLOntology ontology, List<SWRLRule> rules) ");
- return run(ontology, rules, getEnrichAxiomGenerators());
- }
-
- /**
- * Only check consistency
- *
- * @param ontology
- * @return
- * @throws ReasoningServiceException
- */
- @Override
- public boolean isConsistent(OWLOntology ontology) throws ReasoningServiceException {
- try{
- return getReasoner(ontology).isConsistent();
- }catch(Exception e){
- log.error(
- "An error have been thrown while attempting to check consistency. Message was: {}",
- e.getLocalizedMessage());
- // TODO Add explanation of this exception
- throw new ReasoningServiceException();
- }
- }
-
- /**
- * Only check consistency
- *
- * @param ontology
- * @param rules
- * @return
- * @throws ReasoningServiceException
- */
- @Override
- public boolean isConsistent(OWLOntology ontology, List<SWRLRule> rules) throws ReasoningServiceException {
- log.debug("Create a input ontology to merge rules in.");
- OWLOntology input;
- try {
- input = manager.createOntology();
- Set<SWRLRule> ruleSet = new HashSet<SWRLRule>();
- ruleSet.addAll(rules);
- manager.addAxioms(input, ruleSet);
- input = manager.getOntology(input.getOntologyID());
- log.debug("Created ontology: {}", input);
- return getReasoner(ontology).isConsistent();
-
- } catch (OWLOntologyCreationException e) {
- log.error(
- "An error have been thrown while attempting to create ontology. Message was: {}",
- e.getLocalizedMessage());
- // TODO Add explanation of this exception
- throw new ReasoningServiceException();
- }
- }
+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
+ * 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() {
+ // We want a single instance here
+ if (manager == null) {
+ manager = OWLManager.createOWLOntologyManager();
+ }
+ return manager;
+ }
+
+ /**
+ * Method to be implemented by subclasses.
+ *
+ * @param ontology
+ * @return
+ */
+ protected abstract OWLReasoner getReasoner(OWLOntology ontology);
+
+ /**
+ * Generic method for running the reasoner
+ *
+ * @param input
+ * @param generators
+ * @return
+ */
+ @Override
+ public Set<OWLAxiom> run(OWLOntology input, List<InferredAxiomGenerator<? extends OWLAxiom>> generators) throws ReasoningServiceException,
+ InconsistentInputException {
+ try {
+ // Get the manager
+ OWLOntologyManager manager = getOWLOntologyManager();
+
+ // Get the reasoner
+ OWLReasoner reasoner = getReasoner(input);
+ log.debug("Running {} reasoner on {} ", reasoner.getClass(), input.getOntologyID());
+
+ // To generate inferred axioms
+ InferredOntologyGenerator inferred = new InferredOntologyGenerator(reasoner, generators);
+
+ // We fill an anonymous ontology with the result, the return the
+ // axiom set
+ Set<OWLAxiom> axioms = new HashSet<OWLAxiom>();
+ try {
+ OWLOntology output = manager.createOntology();
+ inferred.fillOntology(manager, output);
+ log.debug("Temporary ID is {}", output.getOntologyID());
+ axioms = manager.getOntology(output.getOntologyID()).getAxioms();
+ // We remove the ontology from the manager
+ manager.removeOntology(output);
+ } catch (OWLOntologyCreationException e) {
+ log.error("An exception have been thrown when instantiating the ontology");
+ throw new ReasoningServiceException();
+ }
+
+ return axioms;
+ } catch (InconsistentOntologyException inconsistent) {
+ /**
+ * TODO Add report. Why it is inconsistent?
+ */
+ throw new InconsistentInputException();
+ } catch (Exception exception) {
+ log.error("An exception have been thrown while executing method run()");
+ throw new ReasoningServiceException();
+ }
+ }
+
+ /**
+ * Merges the SWRL rules in the input ontology, then calls run(OWLOntology,List<InferredAxiomGenerator<?
+ * extends OWLAxiom>>)
+ *
+ * @param ontology
+ * @param rules
+ * @param generators
+ * @return
+ */
+ @Override
+ public Set<OWLAxiom> run(OWLOntology ontology,
+ List<SWRLRule> rules,
+ List<InferredAxiomGenerator<? extends OWLAxiom>> generators) throws ReasoningServiceException,
+ InconsistentInputException {
+ log.debug("Called method run(OWLOntology,List<SWRLRule>,List)");
+ OWLOntologyManager manager = getOWLOntologyManager();
+ try {
+ log.debug("Create a input ontology to merge rules in.");
+ OWLOntology input = manager.createOntology();
+ Set<SWRLRule> ruleSet = new HashSet<SWRLRule>();
+ ruleSet.addAll(rules);
+ manager.addAxioms(input, ruleSet);
+ input = manager.getOntology(input.getOntologyID());
+ log.debug("Created ontology: {}", input);
+ log.debug("Calling the run method.");
+ return run(input, generators);
+ } catch (OWLOntologyCreationException e) {
+ log.error("An error have been thrown while attempting to create ontology. Message was: {}",
+ e.getLocalizedMessage());
+ // TODO Add explanation of this exception
+ throw new ReasoningServiceException();
+ }
+ }
+
+ /**
+ * {@see InferredAxiomGenerator}s to use for the classify() reasoning method.
+ *
+ * Subclasses may want to change this.
+ *
+ * @return
+ */
+ protected List<InferredAxiomGenerator<? extends OWLAxiom>> getClassifyAxiomGenerators() {
+ List<InferredAxiomGenerator<? extends OWLAxiom>> gens = new ArrayList<InferredAxiomGenerator<? extends OWLAxiom>>();
+ gens.add(new InferredClassAssertionAxiomGenerator());
+ gens.add(new InferredSubClassAxiomGenerator());
+ gens.add(new InferredEquivalentClassAxiomGenerator());
+ gens.add(new InferredDisjointClassesAxiomGenerator());
+ return gens;
+ }
+
+ /**
+ * {@see InferredAxiomGenerator}s to use for the enrich() reasoning method.
+ *
+ * Subclasses may want to change this.
+ *
+ * @return
+ */
+ protected List<InferredAxiomGenerator<? extends OWLAxiom>> getEnrichAxiomGenerators() {
+ List<InferredAxiomGenerator<? extends OWLAxiom>> gens = new ArrayList<InferredAxiomGenerator<? extends OWLAxiom>>();
+ // Classes
+ gens.add(new InferredClassAssertionAxiomGenerator());
+ gens.add(new InferredSubClassAxiomGenerator());
+ gens.add(new InferredEquivalentClassAxiomGenerator());
+ gens.add(new InferredDisjointClassesAxiomGenerator());
+ // data properties
+ gens.add(new InferredDataPropertyCharacteristicAxiomGenerator());
+ gens.add(new InferredEquivalentDataPropertiesAxiomGenerator());
+ gens.add(new InferredSubDataPropertyAxiomGenerator());
+ // object properties
+ gens.add(new InferredEquivalentObjectPropertyAxiomGenerator());
+ gens.add(new InferredInverseObjectPropertiesAxiomGenerator());
+ gens.add(new InferredObjectPropertyCharacteristicAxiomGenerator());
+ gens.add(new InferredSubObjectPropertyAxiomGenerator());
+ // individuals
+ gens.add(new InferredClassAssertionAxiomGenerator());
+ gens.add(new InferredPropertyAssertionGenerator());
+ return gens;
+ }
+
+ /**
+ * Classify, returns only axioms about classes and instances
+ *
+ * @param ontology
+ * @return
+ */
+ @Override
+ public Set<OWLAxiom> classify(OWLOntology ontology) throws ReasoningServiceException,
+ InconsistentInputException {
+ return run(ontology, getClassifyAxiomGenerators());
+ }
+
+ /**
+ * Classify, merge SWRL rules in the input ontology, before
+ *
+ * @param ontology
+ * @param rules
+ * @return
+ * @throws InconsistentInputException
+ * @throws ReasoningServiceException
+ */
+ @Override
+ public Set<OWLAxiom> classify(OWLOntology ontology, List<SWRLRule> rules) throws ReasoningServiceException,
+ InconsistentInputException {
+ log.debug("Calling classify(OWLOntology ontology, List<SWRLRule> rules) ");
+ return run(ontology, rules, getClassifyAxiomGenerators());
+ }
+
+ /**
+ * Enrich, return all inferences
+ *
+ * @param ontology
+ * @return
+ * @throws ReasoningServiceException
+ * @throws InconsistentInputException
+ */
+ @Override
+ public Set<OWLAxiom> enrich(OWLOntology ontology) throws ReasoningServiceException,
+ InconsistentInputException {
+ return run(ontology, getEnrichAxiomGenerators());
+ }
+
+ /**
+ * Enrich, merge SWRL rules and return all inferences
+ *
+ * @param ontology
+ * @param rules
+ * @return
+ * @throws ReasoningServiceException
+ * @throws InconsistentInputException
+ */
+ @Override
+ public Set<OWLAxiom> enrich(OWLOntology ontology, List<SWRLRule> rules) throws ReasoningServiceException,
+ InconsistentInputException {
+ log.debug("Calling enrich(OWLOntology ontology, List<SWRLRule> rules) ");
+ return run(ontology, rules, getEnrichAxiomGenerators());
+ }
+
+ /**
+ * Only check consistency
+ *
+ * @param ontology
+ * @return
+ * @throws ReasoningServiceException
+ */
+ @Override
+ public boolean isConsistent(OWLOntology ontology) throws ReasoningServiceException {
+ try {
+ return getReasoner(ontology).isConsistent();
+ } catch (Exception e) {
+ log.error("An error have been thrown while attempting to check consistency. Message was: {}",
+ e.getLocalizedMessage());
+ // TODO Add explanation of this exception
+ throw new ReasoningServiceException();
+ }
+ }
+
+ /**
+ * Only check consistency
+ *
+ * @param ontology
+ * @param rules
+ * @return
+ * @throws ReasoningServiceException
+ */
+ @Override
+ public boolean isConsistent(OWLOntology ontology, List<SWRLRule> rules) throws ReasoningServiceException {
+ log.debug("Create a input ontology to merge rules in.");
+ OWLOntology input;
+ try {
+ input = manager.createOntology();
+ Set<SWRLRule> ruleSet = new HashSet<SWRLRule>();
+ ruleSet.addAll(rules);
+ manager.addAxioms(input, ruleSet);
+ input = manager.getOntology(input.getOntologyID());
+ log.debug("Created ontology: {}", input);
+ return getReasoner(ontology).isConsistent();
+
+ } catch (OWLOntologyCreationException e) {
+ log.error("An error have been thrown while attempting to create ontology. Message was: {}",
+ e.getLocalizedMessage());
+ // TODO Add explanation of this exception
+ throw new ReasoningServiceException();
+ }
+ }
}
Modified: incubator/stanbol/branches/jena-reasoners/reasoners/owlapi/src/main/java/org/apache/stanbol/reasoners/owlapi/OWLApiReasoningService.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/branches/jena-reasoners/reasoners/owlapi/src/main/java/org/apache/stanbol/reasoners/owlapi/OWLApiReasoningService.java?rev=1160643&r1=1160642&r2=1160643&view=diff
==============================================================================
--- incubator/stanbol/branches/jena-reasoners/reasoners/owlapi/src/main/java/org/apache/stanbol/reasoners/owlapi/OWLApiReasoningService.java (original)
+++ incubator/stanbol/branches/jena-reasoners/reasoners/owlapi/src/main/java/org/apache/stanbol/reasoners/owlapi/OWLApiReasoningService.java Tue Aug 23 12:02:24 2011
@@ -12,28 +12,29 @@ import org.semanticweb.owlapi.util.Infer
public interface OWLApiReasoningService {
- public abstract boolean isConsistent(OWLOntology ontology, List<SWRLRule> rules)
- throws ReasoningServiceException;
+ public abstract boolean isConsistent(OWLOntology ontology, List<SWRLRule> rules) throws ReasoningServiceException;
- public abstract boolean isConsistent(OWLOntology ontology)
- throws ReasoningServiceException;
+ public abstract boolean isConsistent(OWLOntology ontology) throws ReasoningServiceException;
- public abstract Set<OWLAxiom> enrich(OWLOntology ontology, List<SWRLRule> rules)
- throws ReasoningServiceException, InconsistentInputException;
+ public abstract Set<OWLAxiom> enrich(OWLOntology ontology, List<SWRLRule> rules) throws ReasoningServiceException,
+ InconsistentInputException;
- public abstract Set<OWLAxiom> enrich(OWLOntology ontology)
- throws ReasoningServiceException, InconsistentInputException;
+ public abstract Set<OWLAxiom> enrich(OWLOntology ontology) throws ReasoningServiceException,
+ InconsistentInputException;
- public abstract Set<OWLAxiom> classify(OWLOntology ontology, List<SWRLRule> rules)
- throws ReasoningServiceException, InconsistentInputException;
+ public abstract Set<OWLAxiom> classify(OWLOntology ontology, List<SWRLRule> rules) throws ReasoningServiceException,
+ InconsistentInputException;
- public abstract Set<OWLAxiom> classify(OWLOntology ontology)
- throws ReasoningServiceException, InconsistentInputException;
+ public abstract Set<OWLAxiom> classify(OWLOntology ontology) throws ReasoningServiceException,
+ InconsistentInputException;
- public abstract Set<OWLAxiom> run(OWLOntology ontology, List<SWRLRule> rules, List<InferredAxiomGenerator<? extends OWLAxiom>> generators)
- throws ReasoningServiceException, InconsistentInputException;
+ public abstract Set<OWLAxiom> run(OWLOntology ontology,
+ List<SWRLRule> rules,
+ List<InferredAxiomGenerator<? extends OWLAxiom>> generators) throws ReasoningServiceException,
+ InconsistentInputException;
- public abstract Set<OWLAxiom> run(OWLOntology input, List<InferredAxiomGenerator<? extends OWLAxiom>> generators)
- throws ReasoningServiceException, InconsistentInputException;
+ public abstract Set<OWLAxiom> run(OWLOntology input,
+ List<InferredAxiomGenerator<? extends OWLAxiom>> generators) throws ReasoningServiceException,
+ InconsistentInputException;
}
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=1160643&r1=1160642&r2=1160643&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 Tue Aug 23 12:02:24 2011
@@ -1,15 +1,14 @@
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.
+ * 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 {
- /**
+ /**
*
*/
- private static final long serialVersionUID = 117198026192803326L;
+ private static final long serialVersionUID = 117198026192803326L;
}
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=1160643&r1=1160642&r2=1160643&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 Tue Aug 23 12:02:24 2011
@@ -5,14 +5,14 @@ package org.apache.stanbol.reasoners.ser
*
*/
public interface ReasoningService {
-
- public static final String SERVICE_PATH = "org.apache.stanbol.reasoners.servicesapi.path";
- /**
- * The path that must be bound to this service
- *
- * @return
- */
- public String getPath();
+ public static final String SERVICE_PATH = "org.apache.stanbol.reasoners.servicesapi.path";
+
+ /**
+ * The path that must be bound to this service
+ *
+ * @return
+ */
+ public String getPath();
}
Modified: incubator/stanbol/branches/jena-reasoners/reasoners/servicesapi/src/main/java/org/apache/stanbol/reasoners/servicesapi/ReasoningServiceException.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/branches/jena-reasoners/reasoners/servicesapi/src/main/java/org/apache/stanbol/reasoners/servicesapi/ReasoningServiceException.java?rev=1160643&r1=1160642&r2=1160643&view=diff
==============================================================================
--- incubator/stanbol/branches/jena-reasoners/reasoners/servicesapi/src/main/java/org/apache/stanbol/reasoners/servicesapi/ReasoningServiceException.java (original)
+++ incubator/stanbol/branches/jena-reasoners/reasoners/servicesapi/src/main/java/org/apache/stanbol/reasoners/servicesapi/ReasoningServiceException.java Tue Aug 23 12:02:24 2011
@@ -2,9 +2,9 @@ package org.apache.stanbol.reasoners.ser
public class ReasoningServiceException extends Exception {
- /**
+ /**
*
*/
- private static final long serialVersionUID = 6196336593868459278L;
+ private static final long serialVersionUID = 6196336593868459278L;
}
Modified: incubator/stanbol/branches/jena-reasoners/reasoners/servicesapi/src/main/java/org/apache/stanbol/reasoners/servicesapi/ReasoningServicesManager.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/branches/jena-reasoners/reasoners/servicesapi/src/main/java/org/apache/stanbol/reasoners/servicesapi/ReasoningServicesManager.java?rev=1160643&r1=1160642&r2=1160643&view=diff
==============================================================================
--- incubator/stanbol/branches/jena-reasoners/reasoners/servicesapi/src/main/java/org/apache/stanbol/reasoners/servicesapi/ReasoningServicesManager.java (original)
+++ incubator/stanbol/branches/jena-reasoners/reasoners/servicesapi/src/main/java/org/apache/stanbol/reasoners/servicesapi/ReasoningServicesManager.java Tue Aug 23 12:02:24 2011
@@ -4,11 +4,10 @@ import java.util.Set;
public interface ReasoningServicesManager {
- public abstract int size();
+ public abstract int size();
- public abstract ReasoningService get(String path)
- throws UnboundReasoningServiceException;
+ public abstract ReasoningService get(String path) throws UnboundReasoningServiceException;
- public abstract Set<ReasoningService> asUnmodifiableSet();
+ public abstract Set<ReasoningService> asUnmodifiableSet();
}
Modified: incubator/stanbol/branches/jena-reasoners/reasoners/servicesapi/src/main/java/org/apache/stanbol/reasoners/servicesapi/UnboundReasoningServiceException.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/branches/jena-reasoners/reasoners/servicesapi/src/main/java/org/apache/stanbol/reasoners/servicesapi/UnboundReasoningServiceException.java?rev=1160643&r1=1160642&r2=1160643&view=diff
==============================================================================
--- incubator/stanbol/branches/jena-reasoners/reasoners/servicesapi/src/main/java/org/apache/stanbol/reasoners/servicesapi/UnboundReasoningServiceException.java (original)
+++ incubator/stanbol/branches/jena-reasoners/reasoners/servicesapi/src/main/java/org/apache/stanbol/reasoners/servicesapi/UnboundReasoningServiceException.java Tue Aug 23 12:02:24 2011
@@ -2,9 +2,9 @@ package org.apache.stanbol.reasoners.ser
public class UnboundReasoningServiceException extends Exception {
- /**
+ /**
*
*/
- private static final long serialVersionUID = -6670383378475916819L;
+ private static final long serialVersionUID = -6670383378475916819L;
}
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=1160643&r1=1160642&r2=1160643&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 Tue Aug 23 12:02:24 2011
@@ -1,19 +1,19 @@
/*
-* Licensed to the Apache Software Foundation (ASF) under one or more
-* contributor license agreements. See the NOTICE file distributed with
-* this work for additional information regarding copyright ownership.
-* The ASF licenses this file to You under the Apache License, Version 2.0
-* (the "License"); you may not use this file except in compliance with
-* the License. You may obtain a copy of the License at
-*
-* http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
-*/
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
package org.apache.stanbol.reasoners.web;
import java.util.ArrayList;
@@ -47,35 +47,34 @@ import org.osgi.service.component.Compon
import freemarker.cache.ClassTemplateLoader;
import freemarker.cache.TemplateLoader;
-
/**
* Implementation of WebFragment for the Stanbol Reasoner end-point.
*
* @author Alberto Musetti
- *
+ *
*/
@Component(immediate = true, metatype = true)
@Service(WebFragment.class)
-public class ReasonersFragment implements WebFragment{
-
+public class ReasonersFragment implements WebFragment {
+
private static final String NAME = "reasoners";
private static final String STATIC_RESOURCE_PATH = "/org/apache/stanbol/reasoners/web/static";
private static final String TEMPLATE_PATH = "/org/apache/stanbol/reasoners/web/templates";
-
+
@Reference
Reasoner reasoners;
-
+
@Reference
ONManager onm;
-
+
@Reference
RuleStore kresRuleStore;
private BundleContext bundleContext;
-
+
@Override
public BundleContext getBundleContext() {
return bundleContext;
@@ -90,10 +89,10 @@ public class ReasonersFragment implement
classes.add(ConsistentRefactoring.class);
classes.add(Classify.class);
classes.add(Enrichment.class);
-
+
classes.add(ReasoningServicesResource.class);
classes.add(ReasoningServiceTaskResource.class);
-
+
// Writer
classes.add(JenaModelWriter.class);
return classes;
@@ -137,12 +136,10 @@ public class ReasonersFragment implement
public TemplateLoader getTemplateLoader() {
return new ClassTemplateLoader(getClass(), TEMPLATE_PATH);
}
-
+
@Activate
protected void activate(ComponentContext ctx) {
this.bundleContext = ctx.getBundleContext();
}
-
-
}
Modified: incubator/stanbol/branches/jena-reasoners/reasoners/web/src/main/java/org/apache/stanbol/reasoners/web/resources/Classify.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/branches/jena-reasoners/reasoners/web/src/main/java/org/apache/stanbol/reasoners/web/resources/Classify.java?rev=1160643&r1=1160642&r2=1160643&view=diff
==============================================================================
--- incubator/stanbol/branches/jena-reasoners/reasoners/web/src/main/java/org/apache/stanbol/reasoners/web/resources/Classify.java (original)
+++ incubator/stanbol/branches/jena-reasoners/reasoners/web/src/main/java/org/apache/stanbol/reasoners/web/resources/Classify.java Tue Aug 23 12:02:24 2011
@@ -1,19 +1,19 @@
/*
-* Licensed to the Apache Software Foundation (ASF) under one or more
-* contributor license agreements. See the NOTICE file distributed with
-* this work for additional information regarding copyright ownership.
-* The ASF licenses this file to You under the Apache License, Version 2.0
-* (the "License"); you may not use this file except in compliance with
-* the License. You may obtain a copy of the License at
-*
-* http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
-*/
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
/*
* To change this template, choose Tools | Templates
* and open the template in the editor.
Modified: incubator/stanbol/branches/jena-reasoners/reasoners/web/src/main/java/org/apache/stanbol/reasoners/web/resources/ConsistencyCheck.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/branches/jena-reasoners/reasoners/web/src/main/java/org/apache/stanbol/reasoners/web/resources/ConsistencyCheck.java?rev=1160643&r1=1160642&r2=1160643&view=diff
==============================================================================
--- incubator/stanbol/branches/jena-reasoners/reasoners/web/src/main/java/org/apache/stanbol/reasoners/web/resources/ConsistencyCheck.java (original)
+++ incubator/stanbol/branches/jena-reasoners/reasoners/web/src/main/java/org/apache/stanbol/reasoners/web/resources/ConsistencyCheck.java Tue Aug 23 12:02:24 2011
@@ -1,19 +1,19 @@
/*
-* Licensed to the Apache Software Foundation (ASF) under one or more
-* contributor license agreements. See the NOTICE file distributed with
-* this work for additional information regarding copyright ownership.
-* The ASF licenses this file to You under the Apache License, Version 2.0
-* (the "License"); you may not use this file except in compliance with
-* the License. You may obtain a copy of the License at
-*
-* http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
-*/
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
package org.apache.stanbol.reasoners.web.resources;
import static javax.ws.rs.core.MediaType.*;
Modified: incubator/stanbol/branches/jena-reasoners/reasoners/web/src/main/java/org/apache/stanbol/reasoners/web/resources/ConsistentRefactoring.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/branches/jena-reasoners/reasoners/web/src/main/java/org/apache/stanbol/reasoners/web/resources/ConsistentRefactoring.java?rev=1160643&r1=1160642&r2=1160643&view=diff
==============================================================================
--- incubator/stanbol/branches/jena-reasoners/reasoners/web/src/main/java/org/apache/stanbol/reasoners/web/resources/ConsistentRefactoring.java (original)
+++ incubator/stanbol/branches/jena-reasoners/reasoners/web/src/main/java/org/apache/stanbol/reasoners/web/resources/ConsistentRefactoring.java Tue Aug 23 12:02:24 2011
@@ -1,19 +1,19 @@
/*
-* Licensed to the Apache Software Foundation (ASF) under one or more
-* contributor license agreements. See the NOTICE file distributed with
-* this work for additional information regarding copyright ownership.
-* The ASF licenses this file to You under the Apache License, Version 2.0
-* (the "License"); you may not use this file except in compliance with
-* the License. You may obtain a copy of the License at
-*
-* http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
-*/
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
package org.apache.stanbol.reasoners.web.resources;
import static javax.ws.rs.core.MediaType.*;
@@ -99,8 +99,7 @@ public class ConsistentRefactoring exten
@POST
@Path("/consistent")
@Consumes(MULTIPART_FORM_DATA)
- @Produces({TURTLE, FUNCTIONAL_OWL, MANCHESTER_OWL, RDF_XML,
- OWL_XML, RDF_JSON})
+ @Produces({TURTLE, FUNCTIONAL_OWL, MANCHESTER_OWL, RDF_XML, OWL_XML, RDF_JSON})
public Response consistentRefactoringOfNewGraph(@FormDataParam("recipe") String recipe,
@FormDataParam("input") InputStream input) {
Modified: incubator/stanbol/branches/jena-reasoners/reasoners/web/src/main/java/org/apache/stanbol/reasoners/web/resources/Enrichment.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/branches/jena-reasoners/reasoners/web/src/main/java/org/apache/stanbol/reasoners/web/resources/Enrichment.java?rev=1160643&r1=1160642&r2=1160643&view=diff
==============================================================================
--- incubator/stanbol/branches/jena-reasoners/reasoners/web/src/main/java/org/apache/stanbol/reasoners/web/resources/Enrichment.java (original)
+++ incubator/stanbol/branches/jena-reasoners/reasoners/web/src/main/java/org/apache/stanbol/reasoners/web/resources/Enrichment.java Tue Aug 23 12:02:24 2011
@@ -1,19 +1,19 @@
/*
-* Licensed to the Apache Software Foundation (ASF) under one or more
-* contributor license agreements. See the NOTICE file distributed with
-* this work for additional information regarding copyright ownership.
-* The ASF licenses this file to You under the Apache License, Version 2.0
-* (the "License"); you may not use this file except in compliance with
-* the License. You may obtain a copy of the License at
-*
-* http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
-*/
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
/*
* To change this template, choose Tools | Templates
* and open the template in the editor.
Modified: incubator/stanbol/branches/jena-reasoners/reasoners/web/src/main/java/org/apache/stanbol/reasoners/web/resources/ReasonersResource.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/branches/jena-reasoners/reasoners/web/src/main/java/org/apache/stanbol/reasoners/web/resources/ReasonersResource.java?rev=1160643&r1=1160642&r2=1160643&view=diff
==============================================================================
--- incubator/stanbol/branches/jena-reasoners/reasoners/web/src/main/java/org/apache/stanbol/reasoners/web/resources/ReasonersResource.java (original)
+++ incubator/stanbol/branches/jena-reasoners/reasoners/web/src/main/java/org/apache/stanbol/reasoners/web/resources/ReasonersResource.java Tue Aug 23 12:02:24 2011
@@ -1,19 +1,19 @@
/*
-* Licensed to the Apache Software Foundation (ASF) under one or more
-* contributor license agreements. See the NOTICE file distributed with
-* this work for additional information regarding copyright ownership.
-* The ASF licenses this file to You under the Apache License, Version 2.0
-* (the "License"); you may not use this file except in compliance with
-* the License. You may obtain a copy of the License at
-*
-* http://www.apache.org/licenses/LICENSE-2.0
-*
-* Unless required by applicable law or agreed to in writing, software
-* distributed under the License is distributed on an "AS IS" BASIS,
-* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-* See the License for the specific language governing permissions and
-* limitations under the License.
-*/
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
package org.apache.stanbol.reasoners.web.resources;
import static javax.ws.rs.core.MediaType.TEXT_HTML;
Modified: incubator/stanbol/branches/jena-reasoners/reasoners/web/src/main/java/org/apache/stanbol/reasoners/web/resources/ReasoningPrettyResultResource.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/branches/jena-reasoners/reasoners/web/src/main/java/org/apache/stanbol/reasoners/web/resources/ReasoningPrettyResultResource.java?rev=1160643&r1=1160642&r2=1160643&view=diff
==============================================================================
--- incubator/stanbol/branches/jena-reasoners/reasoners/web/src/main/java/org/apache/stanbol/reasoners/web/resources/ReasoningPrettyResultResource.java (original)
+++ incubator/stanbol/branches/jena-reasoners/reasoners/web/src/main/java/org/apache/stanbol/reasoners/web/resources/ReasoningPrettyResultResource.java Tue Aug 23 12:02:24 2011
@@ -6,15 +6,15 @@ import javax.ws.rs.core.UriInfo;
import org.apache.stanbol.commons.web.base.resource.BaseStanbolResource;
public class ReasoningPrettyResultResource extends BaseStanbolResource {
- private Object result;
+ private Object result;
- public ReasoningPrettyResultResource(ServletContext context,UriInfo uriInfo, Object result) {
- this.result = result;
- this.servletContext = context;
- this.uriInfo = uriInfo;
- }
+ public ReasoningPrettyResultResource(ServletContext context, UriInfo uriInfo, Object result) {
+ this.result = result;
+ this.servletContext = context;
+ this.uriInfo = uriInfo;
+ }
- public Object getResult() {
- return this.result;
- }
+ public Object getResult() {
+ return this.result;
+ }
}