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/31 19:12:47 UTC
svn commit: r1163710 - in /incubator/stanbol/trunk/reasoners: ./ base/
hermit/ hermit/src/main/java/org/apache/stanbol/reasoners/hermit/
hermit/src/main/resources/
hermit/src/test/java/org/apache/stanbol/reasoners/hermit/
hermit/src/test/resources/ jen...
Author: enridaga
Date: Wed Aug 31 17:12:43 2011
New Revision: 1163710
URL: http://svn.apache.org/viewvc?rev=1163710&view=rev
Log:
Reintegrating /branches/jena-reasoners/reasoners into /trunk/reasoners (STANBOL-185)
Added:
incubator/stanbol/trunk/reasoners/README
- copied unchanged from r1163703, incubator/stanbol/branches/jena-reasoners/reasoners/README
incubator/stanbol/trunk/reasoners/README.txt
- copied unchanged from r1163703, incubator/stanbol/branches/jena-reasoners/reasoners/README.txt
incubator/stanbol/trunk/reasoners/hermit/src/main/java/org/apache/stanbol/reasoners/hermit/HermitReasoningService.java
- copied unchanged from r1163703, incubator/stanbol/branches/jena-reasoners/reasoners/hermit/src/main/java/org/apache/stanbol/reasoners/hermit/HermitReasoningService.java
incubator/stanbol/trunk/reasoners/hermit/src/main/resources/log4j.properties
- copied unchanged from r1163703, incubator/stanbol/branches/jena-reasoners/reasoners/hermit/src/main/resources/log4j.properties
incubator/stanbol/trunk/reasoners/hermit/src/test/java/org/apache/stanbol/reasoners/hermit/HermitReasoningServiceTest.java
- copied unchanged from r1163703, incubator/stanbol/branches/jena-reasoners/reasoners/hermit/src/test/java/org/apache/stanbol/reasoners/hermit/HermitReasoningServiceTest.java
incubator/stanbol/trunk/reasoners/hermit/src/test/java/org/apache/stanbol/reasoners/hermit/TestData.java
- copied unchanged from r1163703, incubator/stanbol/branches/jena-reasoners/reasoners/hermit/src/test/java/org/apache/stanbol/reasoners/hermit/TestData.java
incubator/stanbol/trunk/reasoners/hermit/src/test/java/org/apache/stanbol/reasoners/hermit/TestUtils.java
- copied unchanged from r1163703, incubator/stanbol/branches/jena-reasoners/reasoners/hermit/src/test/java/org/apache/stanbol/reasoners/hermit/TestUtils.java
incubator/stanbol/trunk/reasoners/hermit/src/test/resources/
- copied from r1163703, incubator/stanbol/branches/jena-reasoners/reasoners/hermit/src/test/resources/
incubator/stanbol/trunk/reasoners/hermit/src/test/resources/catalog-v001.xml
- copied unchanged from r1163703, incubator/stanbol/branches/jena-reasoners/reasoners/hermit/src/test/resources/catalog-v001.xml
incubator/stanbol/trunk/reasoners/hermit/src/test/resources/dbpedia_3.6.owl
- copied unchanged from r1163703, incubator/stanbol/branches/jena-reasoners/reasoners/hermit/src/test/resources/dbpedia_3.6.owl
incubator/stanbol/trunk/reasoners/hermit/src/test/resources/example.owl
- copied unchanged from r1163703, incubator/stanbol/branches/jena-reasoners/reasoners/hermit/src/test/resources/example.owl
incubator/stanbol/trunk/reasoners/hermit/src/test/resources/foaf.owl
- copied unchanged from r1163703, incubator/stanbol/branches/jena-reasoners/reasoners/hermit/src/test/resources/foaf.owl
incubator/stanbol/trunk/reasoners/hermit/src/test/resources/foaf.rdf
- copied unchanged from r1163703, incubator/stanbol/branches/jena-reasoners/reasoners/hermit/src/test/resources/foaf.rdf
incubator/stanbol/trunk/reasoners/hermit/src/test/resources/log4j.properties
- copied unchanged from r1163703, incubator/stanbol/branches/jena-reasoners/reasoners/hermit/src/test/resources/log4j.properties
incubator/stanbol/trunk/reasoners/hermit/src/test/resources/test_1.owl
- copied unchanged from r1163703, incubator/stanbol/branches/jena-reasoners/reasoners/hermit/src/test/resources/test_1.owl
incubator/stanbol/trunk/reasoners/hermit/src/test/resources/test_1_expected.owl
- copied unchanged from r1163703, incubator/stanbol/branches/jena-reasoners/reasoners/hermit/src/test/resources/test_1_expected.owl
incubator/stanbol/trunk/reasoners/hermit/src/test/resources/test_2.owl
- copied unchanged from r1163703, incubator/stanbol/branches/jena-reasoners/reasoners/hermit/src/test/resources/test_2.owl
incubator/stanbol/trunk/reasoners/hermit/src/test/resources/test_2_expected.owl
- copied unchanged from r1163703, incubator/stanbol/branches/jena-reasoners/reasoners/hermit/src/test/resources/test_2_expected.owl
incubator/stanbol/trunk/reasoners/hermit/src/test/resources/test_3.owl
- copied unchanged from r1163703, incubator/stanbol/branches/jena-reasoners/reasoners/hermit/src/test/resources/test_3.owl
incubator/stanbol/trunk/reasoners/hermit/src/test/resources/test_3_expected.owl
- copied unchanged from r1163703, incubator/stanbol/branches/jena-reasoners/reasoners/hermit/src/test/resources/test_3_expected.owl
incubator/stanbol/trunk/reasoners/hermit/src/test/resources/test_3_rules.owl
- copied unchanged from r1163703, incubator/stanbol/branches/jena-reasoners/reasoners/hermit/src/test/resources/test_3_rules.owl
incubator/stanbol/trunk/reasoners/jena/ (props changed)
- copied from r1163703, incubator/stanbol/branches/jena-reasoners/reasoners/jena/
incubator/stanbol/trunk/reasoners/jena/pom.xml
- copied unchanged from r1163703, incubator/stanbol/branches/jena-reasoners/reasoners/jena/pom.xml
incubator/stanbol/trunk/reasoners/jena/src/
- copied from r1163703, incubator/stanbol/branches/jena-reasoners/reasoners/jena/src/
incubator/stanbol/trunk/reasoners/jena/src/main/
- copied from r1163703, incubator/stanbol/branches/jena-reasoners/reasoners/jena/src/main/
incubator/stanbol/trunk/reasoners/jena/src/main/java/
- copied from r1163703, incubator/stanbol/branches/jena-reasoners/reasoners/jena/src/main/java/
incubator/stanbol/trunk/reasoners/jena/src/main/java/org/
- copied from r1163703, incubator/stanbol/branches/jena-reasoners/reasoners/jena/src/main/java/org/
incubator/stanbol/trunk/reasoners/jena/src/main/java/org/apache/
- copied from r1163703, incubator/stanbol/branches/jena-reasoners/reasoners/jena/src/main/java/org/apache/
incubator/stanbol/trunk/reasoners/jena/src/main/java/org/apache/stanbol/
- copied from r1163703, incubator/stanbol/branches/jena-reasoners/reasoners/jena/src/main/java/org/apache/stanbol/
incubator/stanbol/trunk/reasoners/jena/src/main/java/org/apache/stanbol/reasoners/
- copied from r1163703, incubator/stanbol/branches/jena-reasoners/reasoners/jena/src/main/java/org/apache/stanbol/reasoners/
incubator/stanbol/trunk/reasoners/jena/src/main/java/org/apache/stanbol/reasoners/jena/
- copied from r1163703, incubator/stanbol/branches/jena-reasoners/reasoners/jena/src/main/java/org/apache/stanbol/reasoners/jena/
incubator/stanbol/trunk/reasoners/jena/src/main/java/org/apache/stanbol/reasoners/jena/AbstractJenaReasoningService.java
- copied unchanged from r1163703, incubator/stanbol/branches/jena-reasoners/reasoners/jena/src/main/java/org/apache/stanbol/reasoners/jena/AbstractJenaReasoningService.java
incubator/stanbol/trunk/reasoners/jena/src/main/java/org/apache/stanbol/reasoners/jena/JenaOWLMiniReasoningService.java
- copied unchanged from r1163703, incubator/stanbol/branches/jena-reasoners/reasoners/jena/src/main/java/org/apache/stanbol/reasoners/jena/JenaOWLMiniReasoningService.java
incubator/stanbol/trunk/reasoners/jena/src/main/java/org/apache/stanbol/reasoners/jena/JenaOWLReasoningService.java
- copied unchanged from r1163703, incubator/stanbol/branches/jena-reasoners/reasoners/jena/src/main/java/org/apache/stanbol/reasoners/jena/JenaOWLReasoningService.java
incubator/stanbol/trunk/reasoners/jena/src/main/java/org/apache/stanbol/reasoners/jena/JenaRDFSReasoningService.java
- copied unchanged from r1163703, incubator/stanbol/branches/jena-reasoners/reasoners/jena/src/main/java/org/apache/stanbol/reasoners/jena/JenaRDFSReasoningService.java
incubator/stanbol/trunk/reasoners/jena/src/main/java/org/apache/stanbol/reasoners/jena/JenaReasoningService.java
- copied unchanged from r1163703, incubator/stanbol/branches/jena-reasoners/reasoners/jena/src/main/java/org/apache/stanbol/reasoners/jena/JenaReasoningService.java
incubator/stanbol/trunk/reasoners/jena/src/main/java/org/apache/stanbol/reasoners/jena/filters/
- copied from r1163703, incubator/stanbol/branches/jena-reasoners/reasoners/jena/src/main/java/org/apache/stanbol/reasoners/jena/filters/
incubator/stanbol/trunk/reasoners/jena/src/main/java/org/apache/stanbol/reasoners/jena/filters/PropertyFilter.java
- copied unchanged from r1163703, incubator/stanbol/branches/jena-reasoners/reasoners/jena/src/main/java/org/apache/stanbol/reasoners/jena/filters/PropertyFilter.java
incubator/stanbol/trunk/reasoners/jena/src/test/
- copied from r1163703, incubator/stanbol/branches/jena-reasoners/reasoners/jena/src/test/
incubator/stanbol/trunk/reasoners/jena/src/test/java/
- copied from r1163703, incubator/stanbol/branches/jena-reasoners/reasoners/jena/src/test/java/
incubator/stanbol/trunk/reasoners/jena/src/test/java/org/
- copied from r1163703, incubator/stanbol/branches/jena-reasoners/reasoners/jena/src/test/java/org/
incubator/stanbol/trunk/reasoners/jena/src/test/java/org/apache/
- copied from r1163703, incubator/stanbol/branches/jena-reasoners/reasoners/jena/src/test/java/org/apache/
incubator/stanbol/trunk/reasoners/jena/src/test/java/org/apache/stanbol/
- copied from r1163703, incubator/stanbol/branches/jena-reasoners/reasoners/jena/src/test/java/org/apache/stanbol/
incubator/stanbol/trunk/reasoners/jena/src/test/java/org/apache/stanbol/reasoners/
- copied from r1163703, incubator/stanbol/branches/jena-reasoners/reasoners/jena/src/test/java/org/apache/stanbol/reasoners/
incubator/stanbol/trunk/reasoners/jena/src/test/java/org/apache/stanbol/reasoners/jena/
- copied from r1163703, incubator/stanbol/branches/jena-reasoners/reasoners/jena/src/test/java/org/apache/stanbol/reasoners/jena/
incubator/stanbol/trunk/reasoners/jena/src/test/java/org/apache/stanbol/reasoners/jena/JenaOWLReasoningServiceTest.java
- copied unchanged from r1163703, incubator/stanbol/branches/jena-reasoners/reasoners/jena/src/test/java/org/apache/stanbol/reasoners/jena/JenaOWLReasoningServiceTest.java
incubator/stanbol/trunk/reasoners/jena/src/test/java/org/apache/stanbol/reasoners/jena/JenaRDFSReasoningServiceTest.java
- copied unchanged from r1163703, incubator/stanbol/branches/jena-reasoners/reasoners/jena/src/test/java/org/apache/stanbol/reasoners/jena/JenaRDFSReasoningServiceTest.java
incubator/stanbol/trunk/reasoners/jena/src/test/java/org/apache/stanbol/reasoners/jena/JenaReasoningServiceTest.java
- copied unchanged from r1163703, incubator/stanbol/branches/jena-reasoners/reasoners/jena/src/test/java/org/apache/stanbol/reasoners/jena/JenaReasoningServiceTest.java
incubator/stanbol/trunk/reasoners/jena/src/test/java/org/apache/stanbol/reasoners/jena/PropertyFilterTest.java
- copied unchanged from r1163703, incubator/stanbol/branches/jena-reasoners/reasoners/jena/src/test/java/org/apache/stanbol/reasoners/jena/PropertyFilterTest.java
incubator/stanbol/trunk/reasoners/jena/src/test/java/org/apache/stanbol/reasoners/jena/TestData.java
- copied unchanged from r1163703, incubator/stanbol/branches/jena-reasoners/reasoners/jena/src/test/java/org/apache/stanbol/reasoners/jena/TestData.java
incubator/stanbol/trunk/reasoners/jena/src/test/java/org/apache/stanbol/reasoners/jena/TestUtils.java
- copied unchanged from r1163703, incubator/stanbol/branches/jena-reasoners/reasoners/jena/src/test/java/org/apache/stanbol/reasoners/jena/TestUtils.java
incubator/stanbol/trunk/reasoners/jena/src/test/resources/
- copied from r1163703, incubator/stanbol/branches/jena-reasoners/reasoners/jena/src/test/resources/
incubator/stanbol/trunk/reasoners/jena/src/test/resources/foaf.rdf
- copied unchanged from r1163703, incubator/stanbol/branches/jena-reasoners/reasoners/jena/src/test/resources/foaf.rdf
incubator/stanbol/trunk/reasoners/jena/src/test/resources/generic.rdfs.rules
- copied unchanged from r1163703, incubator/stanbol/branches/jena-reasoners/reasoners/jena/src/test/resources/generic.rdfs.rules
incubator/stanbol/trunk/reasoners/jena/src/test/resources/log4j.properties
- copied unchanged from r1163703, incubator/stanbol/branches/jena-reasoners/reasoners/jena/src/test/resources/log4j.properties
incubator/stanbol/trunk/reasoners/manager/ (props changed)
- copied from r1163703, incubator/stanbol/branches/jena-reasoners/reasoners/manager/
incubator/stanbol/trunk/reasoners/manager/pom.xml
- copied unchanged from r1163703, incubator/stanbol/branches/jena-reasoners/reasoners/manager/pom.xml
incubator/stanbol/trunk/reasoners/manager/src/
- copied from r1163703, incubator/stanbol/branches/jena-reasoners/reasoners/manager/src/
incubator/stanbol/trunk/reasoners/manager/src/main/
- copied from r1163703, incubator/stanbol/branches/jena-reasoners/reasoners/manager/src/main/
incubator/stanbol/trunk/reasoners/manager/src/main/java/
- copied from r1163703, incubator/stanbol/branches/jena-reasoners/reasoners/manager/src/main/java/
incubator/stanbol/trunk/reasoners/manager/src/main/java/org/
- copied from r1163703, incubator/stanbol/branches/jena-reasoners/reasoners/manager/src/main/java/org/
incubator/stanbol/trunk/reasoners/manager/src/main/java/org/apache/
- copied from r1163703, incubator/stanbol/branches/jena-reasoners/reasoners/manager/src/main/java/org/apache/
incubator/stanbol/trunk/reasoners/manager/src/main/java/org/apache/stanbol/
- copied from r1163703, incubator/stanbol/branches/jena-reasoners/reasoners/manager/src/main/java/org/apache/stanbol/
incubator/stanbol/trunk/reasoners/manager/src/main/java/org/apache/stanbol/reasoners/
- copied from r1163703, incubator/stanbol/branches/jena-reasoners/reasoners/manager/src/main/java/org/apache/stanbol/reasoners/
incubator/stanbol/trunk/reasoners/manager/src/main/java/org/apache/stanbol/reasoners/manager/
- copied from r1163703, incubator/stanbol/branches/jena-reasoners/reasoners/manager/src/main/java/org/apache/stanbol/reasoners/manager/
incubator/stanbol/trunk/reasoners/manager/src/main/java/org/apache/stanbol/reasoners/manager/ReasoningServicesManagerImpl.java
- copied unchanged from r1163703, incubator/stanbol/branches/jena-reasoners/reasoners/manager/src/main/java/org/apache/stanbol/reasoners/manager/ReasoningServicesManagerImpl.java
incubator/stanbol/trunk/reasoners/manager/src/test/
- copied from r1163703, incubator/stanbol/branches/jena-reasoners/reasoners/manager/src/test/
incubator/stanbol/trunk/reasoners/manager/src/test/java/
- copied from r1163703, incubator/stanbol/branches/jena-reasoners/reasoners/manager/src/test/java/
incubator/stanbol/trunk/reasoners/owlapi/ (props changed)
- copied from r1163703, incubator/stanbol/branches/jena-reasoners/reasoners/owlapi/
incubator/stanbol/trunk/reasoners/owlapi/pom.xml
- copied unchanged from r1163703, incubator/stanbol/branches/jena-reasoners/reasoners/owlapi/pom.xml
incubator/stanbol/trunk/reasoners/owlapi/src/
- copied from r1163703, incubator/stanbol/branches/jena-reasoners/reasoners/owlapi/src/
incubator/stanbol/trunk/reasoners/owlapi/src/main/
- copied from r1163703, incubator/stanbol/branches/jena-reasoners/reasoners/owlapi/src/main/
incubator/stanbol/trunk/reasoners/owlapi/src/main/java/
- copied from r1163703, incubator/stanbol/branches/jena-reasoners/reasoners/owlapi/src/main/java/
incubator/stanbol/trunk/reasoners/owlapi/src/main/java/org/
- copied from r1163703, incubator/stanbol/branches/jena-reasoners/reasoners/owlapi/src/main/java/org/
incubator/stanbol/trunk/reasoners/owlapi/src/main/java/org/apache/
- copied from r1163703, incubator/stanbol/branches/jena-reasoners/reasoners/owlapi/src/main/java/org/apache/
incubator/stanbol/trunk/reasoners/owlapi/src/main/java/org/apache/stanbol/
- copied from r1163703, incubator/stanbol/branches/jena-reasoners/reasoners/owlapi/src/main/java/org/apache/stanbol/
incubator/stanbol/trunk/reasoners/owlapi/src/main/java/org/apache/stanbol/reasoners/
- copied from r1163703, incubator/stanbol/branches/jena-reasoners/reasoners/owlapi/src/main/java/org/apache/stanbol/reasoners/
incubator/stanbol/trunk/reasoners/owlapi/src/main/java/org/apache/stanbol/reasoners/owlapi/
- copied from r1163703, incubator/stanbol/branches/jena-reasoners/reasoners/owlapi/src/main/java/org/apache/stanbol/reasoners/owlapi/
incubator/stanbol/trunk/reasoners/owlapi/src/main/java/org/apache/stanbol/reasoners/owlapi/AbstractOWLApiReasoningService.java
- copied unchanged from r1163703, incubator/stanbol/branches/jena-reasoners/reasoners/owlapi/src/main/java/org/apache/stanbol/reasoners/owlapi/AbstractOWLApiReasoningService.java
incubator/stanbol/trunk/reasoners/owlapi/src/main/java/org/apache/stanbol/reasoners/owlapi/OWLApiReasoningService.java
- copied unchanged from r1163703, incubator/stanbol/branches/jena-reasoners/reasoners/owlapi/src/main/java/org/apache/stanbol/reasoners/owlapi/OWLApiReasoningService.java
incubator/stanbol/trunk/reasoners/owlapi/src/main/resources/
- copied from r1163703, incubator/stanbol/branches/jena-reasoners/reasoners/owlapi/src/main/resources/
incubator/stanbol/trunk/reasoners/owlapi/src/main/resources/log4j.properties
- copied unchanged from r1163703, incubator/stanbol/branches/jena-reasoners/reasoners/owlapi/src/main/resources/log4j.properties
incubator/stanbol/trunk/reasoners/owlapi/src/test/
- copied from r1163703, incubator/stanbol/branches/jena-reasoners/reasoners/owlapi/src/test/
incubator/stanbol/trunk/reasoners/owlapi/src/test/java/
- copied from r1163703, incubator/stanbol/branches/jena-reasoners/reasoners/owlapi/src/test/java/
incubator/stanbol/trunk/reasoners/owlapi/src/test/resources/
- copied from r1163703, incubator/stanbol/branches/jena-reasoners/reasoners/owlapi/src/test/resources/
incubator/stanbol/trunk/reasoners/servicesapi/ (props changed)
- copied from r1163703, incubator/stanbol/branches/jena-reasoners/reasoners/servicesapi/
incubator/stanbol/trunk/reasoners/servicesapi/pom.xml
- copied unchanged from r1163703, incubator/stanbol/branches/jena-reasoners/reasoners/servicesapi/pom.xml
incubator/stanbol/trunk/reasoners/servicesapi/src/
- copied from r1163703, incubator/stanbol/branches/jena-reasoners/reasoners/servicesapi/src/
incubator/stanbol/trunk/reasoners/servicesapi/src/main/
- copied from r1163703, incubator/stanbol/branches/jena-reasoners/reasoners/servicesapi/src/main/
incubator/stanbol/trunk/reasoners/servicesapi/src/main/java/
- copied from r1163703, incubator/stanbol/branches/jena-reasoners/reasoners/servicesapi/src/main/java/
incubator/stanbol/trunk/reasoners/servicesapi/src/main/java/org/
- copied from r1163703, incubator/stanbol/branches/jena-reasoners/reasoners/servicesapi/src/main/java/org/
incubator/stanbol/trunk/reasoners/servicesapi/src/main/java/org/apache/
- copied from r1163703, incubator/stanbol/branches/jena-reasoners/reasoners/servicesapi/src/main/java/org/apache/
incubator/stanbol/trunk/reasoners/servicesapi/src/main/java/org/apache/stanbol/
- copied from r1163703, incubator/stanbol/branches/jena-reasoners/reasoners/servicesapi/src/main/java/org/apache/stanbol/
incubator/stanbol/trunk/reasoners/servicesapi/src/main/java/org/apache/stanbol/reasoners/
- copied from r1163703, incubator/stanbol/branches/jena-reasoners/reasoners/servicesapi/src/main/java/org/apache/stanbol/reasoners/
incubator/stanbol/trunk/reasoners/servicesapi/src/main/java/org/apache/stanbol/reasoners/servicesapi/
- copied from r1163703, incubator/stanbol/branches/jena-reasoners/reasoners/servicesapi/src/main/java/org/apache/stanbol/reasoners/servicesapi/
incubator/stanbol/trunk/reasoners/servicesapi/src/main/java/org/apache/stanbol/reasoners/servicesapi/InconsistentInputException.java
- copied unchanged from r1163703, incubator/stanbol/branches/jena-reasoners/reasoners/servicesapi/src/main/java/org/apache/stanbol/reasoners/servicesapi/InconsistentInputException.java
incubator/stanbol/trunk/reasoners/servicesapi/src/main/java/org/apache/stanbol/reasoners/servicesapi/ReasoningService.java
- copied unchanged from r1163703, incubator/stanbol/branches/jena-reasoners/reasoners/servicesapi/src/main/java/org/apache/stanbol/reasoners/servicesapi/ReasoningService.java
incubator/stanbol/trunk/reasoners/servicesapi/src/main/java/org/apache/stanbol/reasoners/servicesapi/ReasoningServiceException.java
- copied unchanged from r1163703, incubator/stanbol/branches/jena-reasoners/reasoners/servicesapi/src/main/java/org/apache/stanbol/reasoners/servicesapi/ReasoningServiceException.java
incubator/stanbol/trunk/reasoners/servicesapi/src/main/java/org/apache/stanbol/reasoners/servicesapi/ReasoningServicesManager.java
- copied unchanged from r1163703, incubator/stanbol/branches/jena-reasoners/reasoners/servicesapi/src/main/java/org/apache/stanbol/reasoners/servicesapi/ReasoningServicesManager.java
incubator/stanbol/trunk/reasoners/servicesapi/src/main/java/org/apache/stanbol/reasoners/servicesapi/UnboundReasoningServiceException.java
- copied unchanged from r1163703, incubator/stanbol/branches/jena-reasoners/reasoners/servicesapi/src/main/java/org/apache/stanbol/reasoners/servicesapi/UnboundReasoningServiceException.java
incubator/stanbol/trunk/reasoners/servicesapi/src/main/java/org/apache/stanbol/reasoners/servicesapi/UnsupportedTaskException.java
- copied unchanged from r1163703, incubator/stanbol/branches/jena-reasoners/reasoners/servicesapi/src/main/java/org/apache/stanbol/reasoners/servicesapi/UnsupportedTaskException.java
incubator/stanbol/trunk/reasoners/servicesapi/src/main/resources/
- copied from r1163703, incubator/stanbol/branches/jena-reasoners/reasoners/servicesapi/src/main/resources/
incubator/stanbol/trunk/reasoners/servicesapi/src/test/
- copied from r1163703, incubator/stanbol/branches/jena-reasoners/reasoners/servicesapi/src/test/
incubator/stanbol/trunk/reasoners/servicesapi/src/test/java/
- copied from r1163703, incubator/stanbol/branches/jena-reasoners/reasoners/servicesapi/src/test/java/
incubator/stanbol/trunk/reasoners/servicesapi/src/test/resources/
- copied from r1163703, incubator/stanbol/branches/jena-reasoners/reasoners/servicesapi/src/test/resources/
incubator/stanbol/trunk/reasoners/web/src/main/java/org/apache/stanbol/reasoners/web/resources/ReasoningServiceTaskResource.java
- copied unchanged from r1163703, incubator/stanbol/branches/jena-reasoners/reasoners/web/src/main/java/org/apache/stanbol/reasoners/web/resources/ReasoningServiceTaskResource.java
incubator/stanbol/trunk/reasoners/web/src/main/java/org/apache/stanbol/reasoners/web/resources/ReasoningServicesResource.java
- copied unchanged from r1163703, incubator/stanbol/branches/jena-reasoners/reasoners/web/src/main/java/org/apache/stanbol/reasoners/web/resources/ReasoningServicesResource.java
incubator/stanbol/trunk/reasoners/web/src/main/java/org/apache/stanbol/reasoners/web/utils/
- copied from r1163703, incubator/stanbol/branches/jena-reasoners/reasoners/web/src/main/java/org/apache/stanbol/reasoners/web/utils/
incubator/stanbol/trunk/reasoners/web/src/main/java/org/apache/stanbol/reasoners/web/utils/ReasoningPrettyResultResource.java
- copied unchanged from r1163703, incubator/stanbol/branches/jena-reasoners/reasoners/web/src/main/java/org/apache/stanbol/reasoners/web/utils/ReasoningPrettyResultResource.java
incubator/stanbol/trunk/reasoners/web/src/main/java/org/apache/stanbol/reasoners/web/utils/ReasoningServiceExecutor.java
- copied unchanged from r1163703, incubator/stanbol/branches/jena-reasoners/reasoners/web/src/main/java/org/apache/stanbol/reasoners/web/utils/ReasoningServiceExecutor.java
incubator/stanbol/trunk/reasoners/web/src/main/java/org/apache/stanbol/reasoners/web/writers/
- copied from r1163703, incubator/stanbol/branches/jena-reasoners/reasoners/web/src/main/java/org/apache/stanbol/reasoners/web/writers/
incubator/stanbol/trunk/reasoners/web/src/main/java/org/apache/stanbol/reasoners/web/writers/JenaModelWriter.java
- copied unchanged from r1163703, incubator/stanbol/branches/jena-reasoners/reasoners/web/src/main/java/org/apache/stanbol/reasoners/web/writers/JenaModelWriter.java
incubator/stanbol/trunk/reasoners/web/src/main/resources/org/apache/stanbol/reasoners/web/templates/org/apache/stanbol/reasoners/web/resources/ReasoningServiceTaskResource/
- copied from r1163703, incubator/stanbol/branches/jena-reasoners/reasoners/web/src/main/resources/org/apache/stanbol/reasoners/web/templates/org/apache/stanbol/reasoners/web/resources/ReasoningServiceTaskResource/
incubator/stanbol/trunk/reasoners/web/src/main/resources/org/apache/stanbol/reasoners/web/templates/org/apache/stanbol/reasoners/web/resources/ReasoningServiceTaskResource/index.ftl
- copied unchanged from r1163703, incubator/stanbol/branches/jena-reasoners/reasoners/web/src/main/resources/org/apache/stanbol/reasoners/web/templates/org/apache/stanbol/reasoners/web/resources/ReasoningServiceTaskResource/index.ftl
incubator/stanbol/trunk/reasoners/web/src/main/resources/org/apache/stanbol/reasoners/web/templates/org/apache/stanbol/reasoners/web/resources/ReasoningServiceTaskResource/ontonet-session.ftl
- copied unchanged from r1163703, incubator/stanbol/branches/jena-reasoners/reasoners/web/src/main/resources/org/apache/stanbol/reasoners/web/templates/org/apache/stanbol/reasoners/web/resources/ReasoningServiceTaskResource/ontonet-session.ftl
incubator/stanbol/trunk/reasoners/web/src/main/resources/org/apache/stanbol/reasoners/web/templates/org/apache/stanbol/reasoners/web/resources/ReasoningServiceTaskResource/result.ftl
- copied unchanged from r1163703, incubator/stanbol/branches/jena-reasoners/reasoners/web/src/main/resources/org/apache/stanbol/reasoners/web/templates/org/apache/stanbol/reasoners/web/resources/ReasoningServiceTaskResource/result.ftl
incubator/stanbol/trunk/reasoners/web/src/main/resources/org/apache/stanbol/reasoners/web/templates/org/apache/stanbol/reasoners/web/resources/ReasoningServicesResource/
- copied from r1163703, incubator/stanbol/branches/jena-reasoners/reasoners/web/src/main/resources/org/apache/stanbol/reasoners/web/templates/org/apache/stanbol/reasoners/web/resources/ReasoningServicesResource/
incubator/stanbol/trunk/reasoners/web/src/main/resources/org/apache/stanbol/reasoners/web/templates/org/apache/stanbol/reasoners/web/resources/ReasoningServicesResource/index.ftl
- copied unchanged from r1163703, incubator/stanbol/branches/jena-reasoners/reasoners/web/src/main/resources/org/apache/stanbol/reasoners/web/templates/org/apache/stanbol/reasoners/web/resources/ReasoningServicesResource/index.ftl
Modified:
incubator/stanbol/trunk/reasoners/ (props changed)
incubator/stanbol/trunk/reasoners/base/
incubator/stanbol/trunk/reasoners/hermit/pom.xml
incubator/stanbol/trunk/reasoners/owllink/pom.xml
incubator/stanbol/trunk/reasoners/pom.xml
incubator/stanbol/trunk/reasoners/web/pom.xml
incubator/stanbol/trunk/reasoners/web/src/main/java/org/apache/stanbol/reasoners/web/ReasonersFragment.java
incubator/stanbol/trunk/reasoners/web/src/main/java/org/apache/stanbol/reasoners/web/resources/Classify.java
incubator/stanbol/trunk/reasoners/web/src/main/java/org/apache/stanbol/reasoners/web/resources/ConsistencyCheck.java
incubator/stanbol/trunk/reasoners/web/src/main/java/org/apache/stanbol/reasoners/web/resources/ConsistentRefactoring.java
incubator/stanbol/trunk/reasoners/web/src/main/java/org/apache/stanbol/reasoners/web/resources/Enrichment.java
incubator/stanbol/trunk/reasoners/web/src/main/java/org/apache/stanbol/reasoners/web/resources/ReasonersResource.java
incubator/stanbol/trunk/reasoners/web/src/main/resources/RuleOntology/
incubator/stanbol/trunk/reasoners/web/src/main/resources/TestFile/
incubator/stanbol/trunk/reasoners/web/src/main/resources/org/apache/stanbol/reasoners/web/templates/org/apache/stanbol/reasoners/web/resources/Classify/
incubator/stanbol/trunk/reasoners/web/src/main/resources/org/apache/stanbol/reasoners/web/templates/org/apache/stanbol/reasoners/web/resources/ConsistecnyCheck/
incubator/stanbol/trunk/reasoners/web/src/main/resources/org/apache/stanbol/reasoners/web/templates/org/apache/stanbol/reasoners/web/resources/ConsistentRefactoring/
incubator/stanbol/trunk/reasoners/web/src/main/resources/org/apache/stanbol/reasoners/web/templates/org/apache/stanbol/reasoners/web/resources/Enrichment/
Propchange: incubator/stanbol/trunk/reasoners/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Wed Aug 31 17:12:43 2011
@@ -1 +1,3 @@
target
+.settings
+.project
Propchange: incubator/stanbol/trunk/reasoners/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Wed Aug 31 17:12:43 2011
@@ -0,0 +1 @@
+/incubator/stanbol/branches/jena-reasoners/reasoners:1156596-1163703
Modified: incubator/stanbol/trunk/reasoners/hermit/pom.xml
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/reasoners/hermit/pom.xml?rev=1163710&r1=1163709&r2=1163710&view=diff
==============================================================================
--- incubator/stanbol/trunk/reasoners/hermit/pom.xml (original)
+++ incubator/stanbol/trunk/reasoners/hermit/pom.xml Wed Aug 31 17:12:43 2011
@@ -17,19 +17,18 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
- <modelVersion>4.0.0</modelVersion>
<parent>
<groupId>org.apache.stanbol</groupId>
<artifactId>stanbol-parent</artifactId>
<version>0.9.0-incubating-SNAPSHOT</version>
- <relativePath>../../parent</relativePath>
+ <relativePath>../../../trunk/parent</relativePath>
</parent>
-
+<modelVersion>4.0.0</modelVersion>
<artifactId>org.apache.stanbol.reasoners.hermit</artifactId>
<packaging>bundle</packaging>
- <name>Apache Stanbol Reasoners Hermit Dependency</name>
+ <name>Apache Stanbol Reasoners: Hermit</name>
<repositories>
<repository>
@@ -56,7 +55,18 @@
<scope>compile</scope>
</dependency>
- <!-- Testing deps -->
+ <!--Diagnostic dependencies -->
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-log4j12</artifactId>
+ <scope>runtime</scope>
+ </dependency>
+ <!-- Dependencies for test -->
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
@@ -67,23 +77,53 @@
<artifactId>slf4j-log4j12</artifactId>
<scope>test</scope>
</dependency>
-
+ <!-- osgi dependencies -->
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.core</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>org.apache.felix.scr.annotations</artifactId>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.osgi</groupId>
+ <artifactId>org.osgi.compendium</artifactId>
+ <scope>provided</scope>
+ </dependency>
+
+ <!-- Stanbol dependencies -->
+ <dependency>
+ <groupId>org.apache.stanbol</groupId>
+ <artifactId>org.apache.stanbol.reasoners.servicesapi</artifactId>
+ <version>0.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.stanbol</groupId>
+ <artifactId>org.apache.stanbol.reasoners.owlapi</artifactId>
+ <version>0.1</version>
+ </dependency>
</dependencies>
<build>
+ <!-- make it an OSGi bundle -->
<plugins>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-scr-plugin</artifactId>
+ </plugin>
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
- <version>2.0.1</version>
<extensions>true</extensions>
<configuration>
<instructions>
+ <Embed-Dependency>hermit;scope=compile|runtime;inline=true</Embed-Dependency>
<Bundle-ClassPath>.</Bundle-ClassPath>
<Export-Package>
- com.clarkparsia.owlapi.explanation,
- com.clarkparsia.owlapi.explanation.io,
- com.clarkparsia.owlapi.explanation.util,
+ com.clarkparsia.owlapi.explanation.*,
com.clarkparsia.owlapi.modularity.locality,
de.uulm.ecs.ai.owlapi.krssparser,
de.uulm.ecs.ai.owlapi.krssrenderer,
@@ -109,6 +149,8 @@
org.coode.owlapi.turtle,
org.coode.string,org.coode.xml,
org.semanticweb.HermiT.*;version=1.3.4,
+ org.semanticweb.HermiT.datatypes.*;version=1.3.4,
+ org.semanticweb.HermiT.datatypes.rdfplainliteral.*,
org.semanticweb.owlapi.*,
rationals.*,
uk.ac.manchester.cs.bhig.util,
@@ -118,7 +160,8 @@
uk.ac.manchester.cs.owl.owlapi.turtle.parser,
uk.ac.manchester.cs.owlapi.dlsyntax,
uk.ac.manchester.cs.owlapi.dlsyntax.parser,
- uk.ac.manchester.cs.owlapi.modularity
+ uk.ac.manchester.cs.owlapi.modularity,
+ org.apache.stanbol.reasoners.hermit.*
</Export-Package>
<Private-Package/>
<Import-Package>
@@ -134,16 +177,18 @@
!org.jaxen.*,
!org.protege.editor.owl.model.*,
!org.w3c.dom.*,
+ org.apache.stanbol.reasoners.servicesapi.*,
+ org.semanticweb.HermiT.datatypes.*;version=1.3.4,
+ org.semanticweb.HermiT.datatypes.rdfplainliteral.*,
*
</Import-Package>
<_nouses>true</_nouses>
</instructions>
</configuration>
</plugin>
- <plugin>
+ <!-- plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>2.0.2</version>
<configuration>
<source>1.6</source>
<target>1.6</target>
@@ -153,114 +198,10 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
- <version>2.2</version>
<configuration>
<encoding>${project.build.sourceEncoding}</encoding>
</configuration>
- </plugin>
+ </plugin-->
</plugins>
</build>
-
- <profiles>
- <profile>
- <!-- this profile executes the bundle on apache felix-->
- <id>run-on-felix</id>
- <dependencies>
- <dependency>
- <groupId>org.apache.felix</groupId>
- <artifactId>org.apache.felix.main</artifactId>
- <version>2.0.2</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.felix.gogo</groupId>
- <artifactId>org.apache.felix.gogo.commands</artifactId>
- <version>0.2.2</version>
- </dependency>
- </dependencies>
-
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-antrun-plugin</artifactId>
- <version>1.3</version>
- <executions>
- <execution>
- <id>compile</id>
- <phase>compile</phase>
- <goals>
- <goal>run</goal>
- </goals>
- <configuration>
- <tasks>
- <property name="plugins" refid="maven.runtime.classpath"/>
- <pathconvert pathsep=" " dirsep="/"
- property="project.build.url">
- <path path="${project.build.directory}"/>
- </pathconvert>
- <pathconvert property="plugins.jars" pathsep=":">
- <path path="${plugins}"/>
- <map from="${project.build.directory}/classes" to=""/>
- </pathconvert>
- <makeurl property="urls" separator=" " validate="false">
- <path path="${plugins.jars}"/>
- </makeurl>
- <pathconvert pathsep=" " property="bundles">
- <path path="${plugins}"/>
- <mapper>
- <chainedmapper>
- <flattenmapper/>
- <globmapper from="*" to="file:modules/*"
- casesensitive="no"/>
- </chainedmapper>
- </mapper>
- </pathconvert>
- <makeurl property="main.bundle.url"
- file="${project.build.directory}/${project.artifactId}-${project.version}.jar"/>
- <echo file="${project.build.directory}/run.properties">
- felix.auto.install=${urls}
- felix.auto.start=${main.bundle.url}
- org.osgi.framework.storage=${project.build.url}/felix-cache
- org.osgi.framework.bootdelegation=*
- </echo>
- <replace file="${project.build.directory}/run.properties"
- token="\" value="\\"/>
- <echo file="${project.build.directory}/config.properties">
- felix.auto.install="${bundles}"
- felix.auto.start=file:modules/${project.artifactId}-${project.version}.jar
- </echo>
- <copy
- file="${maven.dependency.org.apache.felix.org.apache.felix.main.jar.path}"
- tofile="${project.build.directory}/felix.jar"/>
- </tasks>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-assembly-plugin</artifactId>
- <version>2.2-beta-5</version>
- <executions>
- <execution>
- <id>create-executable-jar</id>
- <phase>package</phase>
- <goals>
- <goal>single</goal>
- </goals>
- <configuration>
- <descriptors>
- <descriptor>${basedir}/src/main/assembly/felix.xml</descriptor>
- </descriptors>
- <finalName>${project.artifactId}-${project.version}</finalName>
- </configuration>
- </execution>
- </executions>
- </plugin>
- </plugins>
- </build>
- </profile>
- </profiles>
- <groupId>org.apache.stanbol</groupId>
</project>
Propchange: incubator/stanbol/trunk/reasoners/jena/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Wed Aug 31 17:12:43 2011
@@ -0,0 +1,4 @@
+.settings
+.classpath
+.project
+target
Propchange: incubator/stanbol/trunk/reasoners/manager/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Wed Aug 31 17:12:43 2011
@@ -0,0 +1,4 @@
+.project
+.classpath
+target
+.settings
Propchange: incubator/stanbol/trunk/reasoners/owlapi/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Wed Aug 31 17:12:43 2011
@@ -0,0 +1,4 @@
+.settings
+.classpath
+.project
+target
Modified: incubator/stanbol/trunk/reasoners/owllink/pom.xml
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/reasoners/owllink/pom.xml?rev=1163710&r1=1163709&r2=1163710&view=diff
==============================================================================
--- incubator/stanbol/trunk/reasoners/owllink/pom.xml (original)
+++ incubator/stanbol/trunk/reasoners/owllink/pom.xml Wed Aug 31 17:12:43 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>
@@ -131,7 +131,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-resources-plugin</artifactId>
- <version>2.2</version>
+ <!-- version>2.2</version-->
<configuration>
<encoding>${project.build.sourceEncoding}</encoding>
</configuration>
Modified: incubator/stanbol/trunk/reasoners/pom.xml
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/reasoners/pom.xml?rev=1163710&r1=1163709&r2=1163710&view=diff
==============================================================================
--- incubator/stanbol/trunk/reasoners/pom.xml (original)
+++ incubator/stanbol/trunk/reasoners/pom.xml Wed Aug 31 17:12:43 2011
@@ -38,8 +38,12 @@
<module>../owl</module>
<module>../rules/base</module>
<module>../rules/manager</module-->
- <module>hermit</module>
- <module>base</module>
+ <module>servicesapi</module>
+ <module>manager</module>
+ <module>owlapi</module>
+ <module>jena</module>
+ <!--module>hermit</module-->
+ <!--module>base</module-->
<module>owllink</module>
<module>web</module>
</modules>
Propchange: incubator/stanbol/trunk/reasoners/servicesapi/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Wed Aug 31 17:12:43 2011
@@ -0,0 +1,4 @@
+.classpath
+.project
+target
+.settings
Modified: incubator/stanbol/trunk/reasoners/web/pom.xml
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/reasoners/web/pom.xml?rev=1163710&r1=1163709&r2=1163710&view=diff
==============================================================================
--- incubator/stanbol/trunk/reasoners/web/pom.xml (original)
+++ incubator/stanbol/trunk/reasoners/web/pom.xml Wed Aug 31 17:12:43 2011
@@ -69,7 +69,9 @@
<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.*,
*
</Import-Package>
</instructions>
@@ -162,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>
@@ -188,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>
@@ -218,7 +213,6 @@
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
- <version>2.4</version>
<scope>provided</scope>
</dependency>
<dependency>
@@ -230,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>
@@ -259,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>
@@ -279,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>
@@ -316,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>
@@ -338,6 +322,22 @@
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.owl</artifactId>
</dependency>
+
+ <dependency>
+ <groupId>org.apache.stanbol</groupId>
+ <artifactId>org.apache.stanbol.reasoners.servicesapi</artifactId>
+ <version>0.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.stanbol</groupId>
+ <artifactId>org.apache.stanbol.reasoners.jena</artifactId>
+ <version>0.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.stanbol</groupId>
+ <artifactId>org.apache.stanbol.reasoners.owlapi</artifactId>
+ <version>0.1</version>
+ </dependency>
<dependency>
<groupId>com.hp.hpl.jena</groupId>
<artifactId>jena</artifactId>
@@ -350,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/trunk/reasoners/web/src/main/java/org/apache/stanbol/reasoners/web/ReasonersFragment.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/reasoners/web/src/main/java/org/apache/stanbol/reasoners/web/ReasonersFragment.java?rev=1163710&r1=1163709&r2=1163710&view=diff
==============================================================================
--- incubator/stanbol/trunk/reasoners/web/src/main/java/org/apache/stanbol/reasoners/web/ReasonersFragment.java (original)
+++ incubator/stanbol/trunk/reasoners/web/src/main/java/org/apache/stanbol/reasoners/web/ReasonersFragment.java Wed Aug 31 17:12:43 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;
@@ -31,12 +31,9 @@ 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;
import org.apache.stanbol.rules.base.api.RuleStore;
import org.osgi.framework.BundleContext;
import org.osgi.service.component.ComponentContext;
@@ -44,35 +41,33 @@ 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;
@@ -82,12 +77,12 @@ 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);
+
+ // Writer
+ classes.add(JenaModelWriter.class);
return classes;
}
@@ -129,12 +124,10 @@ public class ReasonersFragment implement
public TemplateLoader getTemplateLoader() {
return new ClassTemplateLoader(getClass(), TEMPLATE_PATH);
}
-
+
@Activate
protected void activate(ComponentContext ctx) {
this.bundleContext = ctx.getBundleContext();
}
-
-
}