You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stanbol.apache.org by al...@apache.org on 2012/06/26 17:39:15 UTC
svn commit: r1354069 - in /incubator/stanbol/trunk: commons/owl/
contrib/reasoners/hermit/
contrib/reasoners/hermit/src/main/java/org/apache/stanbol/reasoners/hermit/
contrib/reasoners/owllink/
ontologymanager/web/src/main/java/org/apache/stanbol/ontol...
Author: alexdma
Date: Tue Jun 26 15:39:12 2012
New Revision: 1354069
URL: http://svn.apache.org/viewvc?rev=1354069&view=rev
Log:
* Excluded embedded repositories from commons.owl (STANBOL-265), hermit and owllink (STANBOL-266) build targets, I don't think they're of any use in the compiled jar.
* Added net.sourceforge.owlapi:owlapi exclusion from reasoners/hermit build (STANBOL-664)
* Some links in the OntoNet HTML services depend on configured namespaces for the OntoNet components. This is unnecessary for RESTful services so the public base URI of the resource is used instead (TODO use for import statements for generated ontologies when requested via RESTful services) (STANBOL-649)
Modified:
incubator/stanbol/trunk/commons/owl/pom.xml
incubator/stanbol/trunk/contrib/reasoners/hermit/pom.xml
incubator/stanbol/trunk/contrib/reasoners/hermit/src/main/java/org/apache/stanbol/reasoners/hermit/HermitReasoningService.java
incubator/stanbol/trunk/contrib/reasoners/owllink/pom.xml
incubator/stanbol/trunk/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/resources/OntoNetRootResource.java
incubator/stanbol/trunk/ontologymanager/web/src/main/resources/org/apache/stanbol/ontologymanager/web/templates/org/apache/stanbol/ontologymanager/web/resources/OntologyNetworkResource/index.ftl
incubator/stanbol/trunk/ontologymanager/web/src/main/resources/org/apache/stanbol/ontologymanager/web/templates/org/apache/stanbol/ontologymanager/web/resources/SessionManagerResource/index.ftl
incubator/stanbol/trunk/reasoners/web/src/main/resources/org/apache/stanbol/reasoners/web/templates/imports/reasonersDescription.ftl
Modified: incubator/stanbol/trunk/commons/owl/pom.xml
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/commons/owl/pom.xml?rev=1354069&r1=1354068&r2=1354069&view=diff
==============================================================================
--- incubator/stanbol/trunk/commons/owl/pom.xml (original)
+++ incubator/stanbol/trunk/commons/owl/pom.xml Tue Jun 26 15:39:12 2012
@@ -107,6 +107,14 @@
<artifactId>maven-scr-plugin</artifactId>
</plugin>
</plugins>
+ <resources> <!-- Do not include the embedded repository in the build -->
+ <resource>
+ <directory>src/main/resources</directory>
+ <excludes>
+ <exclude>maven/**</exclude>
+ </excludes>
+ </resource>
+ </resources>
</build>
Modified: incubator/stanbol/trunk/contrib/reasoners/hermit/pom.xml
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/contrib/reasoners/hermit/pom.xml?rev=1354069&r1=1354068&r2=1354069&view=diff
==============================================================================
--- incubator/stanbol/trunk/contrib/reasoners/hermit/pom.xml (original)
+++ incubator/stanbol/trunk/contrib/reasoners/hermit/pom.xml Tue Jun 26 15:39:12 2012
@@ -1,22 +1,24 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
- 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.
+-->
<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>
@@ -25,7 +27,6 @@
<relativePath>../../../parent</relativePath>
</parent>
- <modelVersion>4.0.0</modelVersion>
<artifactId>org.apache.stanbol.reasoners.hermit</artifactId>
<version>0.10.0-incubating-SNAPSHOT</version>
<packaging>bundle</packaging>
@@ -44,14 +45,14 @@
<repositories>
<repository>
- <releases>
- <updatePolicy>always</updatePolicy>
- </releases>
- <snapshots>
- <updatePolicy>always</updatePolicy>
- </snapshots>
- <id>reasoners-hermit-embedded</id>
- <url>file://localhost/${project.basedir}/src/main/resources/maven/repo</url>
+ <id>reasoners-hermit-embedded</id>
+ <url>file://localhost/${project.basedir}/src/main/resources/maven/repo</url>
+ <releases>
+ <updatePolicy>always</updatePolicy>
+ </releases>
+ <snapshots>
+ <updatePolicy>always</updatePolicy>
+ </snapshots>
</repository>
</repositories>
@@ -66,8 +67,13 @@
<groupId>owlapi</groupId>
<artifactId>owlapi</artifactId>
</exclusion>
+ <exclusion><!-- we want to use owlapi version exported by o.a.s.commons.owl -->
+ <groupId>net.sourceforge.owlapi</groupId>
+ <artifactId>owlapi</artifactId>
+ </exclusion>
</exclusions>
</dependency>
+ <!-- Dependencies of the HermiT library -->
<dependency>
<groupId>jautomata</groupId>
<artifactId>core</artifactId>
@@ -78,7 +84,7 @@
<artifactId>automaton</artifactId>
<version>1.11-8</version>
</dependency>
- <!--Diagnostic dependencies -->
+ <!-- Diagnostic dependencies -->
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
@@ -100,7 +106,7 @@
<artifactId>slf4j-log4j12</artifactId>
<scope>test</scope>
</dependency>
- <!-- osgi dependencies -->
+ <!-- OSGi dependencies -->
<dependency>
<groupId>org.osgi</groupId>
<artifactId>org.osgi.core</artifactId>
@@ -116,7 +122,6 @@
<artifactId>org.osgi.compendium</artifactId>
<scope>provided</scope>
</dependency>
-
<!-- Stanbol dependencies -->
<dependency>
<groupId>org.apache.stanbol</groupId>
@@ -133,17 +138,17 @@
<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-scr-plugin</artifactId>
+ </plugin>
<plugin>
<groupId>org.apache.felix</groupId>
<artifactId>maven-bundle-plugin</artifactId>
<extensions>true</extensions>
<configuration>
<instructions>
- <Embed-Dependency>hermit;scope=compile|runtime;inline=true</Embed-Dependency>
+ <Embed-Dependency>hermit,core,automaton</Embed-Dependency>
<Bundle-ClassPath>.</Bundle-ClassPath>
<Export-Package>org.apache.stanbol.reasoners.hermit.*</Export-Package>
<Private-Package/>
@@ -164,30 +169,22 @@
!org.w3c.dom.*,
!org.apache.axiom.*,
org.apache.stanbol.reasoners.servicesapi.*,
- org.semanticweb.HermiT.datatypes.*;version=1.3.6,
+ org.semanticweb.HermiT.*;version=1.3.6,
*
</Import-Package>
<_nouses>true</_nouses>
- <Embed-Dependency>hermit,core,automaton</Embed-Dependency>
</instructions>
</configuration>
</plugin>
- <!-- plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <source>1.6</source>
- <target>1.6</target>
- <encoding>${project.build.sourceEncoding}</encoding>
- </configuration>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-resources-plugin</artifactId>
- <configuration>
- <encoding>${project.build.sourceEncoding}</encoding>
- </configuration>
- </plugin-->
</plugins>
+ <resources> <!-- Do not include the embedded repository in the build -->
+ <resource>
+ <directory>src/main/resources</directory>
+ <excludes>
+ <exclude>maven/**</exclude>
+ </excludes>
+ </resource>
+ </resources>
</build>
+
</project>
Modified: incubator/stanbol/trunk/contrib/reasoners/hermit/src/main/java/org/apache/stanbol/reasoners/hermit/HermitReasoningService.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/contrib/reasoners/hermit/src/main/java/org/apache/stanbol/reasoners/hermit/HermitReasoningService.java?rev=1354069&r1=1354068&r2=1354069&view=diff
==============================================================================
--- incubator/stanbol/trunk/contrib/reasoners/hermit/src/main/java/org/apache/stanbol/reasoners/hermit/HermitReasoningService.java (original)
+++ incubator/stanbol/trunk/contrib/reasoners/hermit/src/main/java/org/apache/stanbol/reasoners/hermit/HermitReasoningService.java Tue Jun 26 15:39:12 2012
@@ -23,6 +23,7 @@ import org.apache.felix.scr.annotations.
import org.apache.stanbol.reasoners.owlapi.AbstractOWLApiReasoningService;
import org.apache.stanbol.reasoners.owlapi.OWLApiReasoningService;
import org.apache.stanbol.reasoners.servicesapi.ReasoningService;
+import org.apache.stanbol.reasoners.servicesapi.annotations.Documentation;
import org.osgi.service.component.ComponentContext;
import org.semanticweb.HermiT.Configuration;
import org.semanticweb.HermiT.Reasoner.ReasonerFactory;
@@ -38,6 +39,7 @@ import org.slf4j.LoggerFactory;
*/
@Component(immediate = true, metatype = true)
@Service
+@Documentation(name = "HermiT OWL 2", description = "This service supports OWL 2 profiles as implemented by the HermiT reasoner.")
public class HermitReasoningService extends AbstractOWLApiReasoningService implements OWLApiReasoningService {
private final Logger log = LoggerFactory.getLogger(getClass());
public static final String _DEFAULT_PATH = "owl2";
Modified: incubator/stanbol/trunk/contrib/reasoners/owllink/pom.xml
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/contrib/reasoners/owllink/pom.xml?rev=1354069&r1=1354068&r2=1354069&view=diff
==============================================================================
--- incubator/stanbol/trunk/contrib/reasoners/owllink/pom.xml (original)
+++ incubator/stanbol/trunk/contrib/reasoners/owllink/pom.xml Tue Jun 26 15:39:12 2012
@@ -86,6 +86,14 @@
</configuration>
</plugin>
</plugins>
+ <resources> <!-- Do not include the embedded repository in the build -->
+ <resource>
+ <directory>src/main/resources</directory>
+ <excludes>
+ <exclude>maven/**</exclude>
+ </excludes>
+ </resource>
+ </resources>
</build>
<dependencies>
Modified: incubator/stanbol/trunk/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/resources/OntoNetRootResource.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/resources/OntoNetRootResource.java?rev=1354069&r1=1354068&r2=1354069&view=diff
==============================================================================
--- incubator/stanbol/trunk/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/resources/OntoNetRootResource.java (original)
+++ incubator/stanbol/trunk/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/resources/OntoNetRootResource.java Tue Jun 26 15:39:12 2012
@@ -344,11 +344,9 @@ public class OntoNetRootResource extends
log.debug("Retrieved ontology {} .", iri);
- // Rewrite imports
+ // Rewrite import statements
String uri = uriInfo.getRequestUri().toString();
URI base = URI.create(uri.substring(0, uri.lastIndexOf(ontologyId) - 1));
-
- // Rewrite import statements
List<OWLOntologyChange> changes = new ArrayList<OWLOntologyChange>();
OWLDataFactory df = o.getOWLOntologyManager().getOWLDataFactory();
/*
Modified: incubator/stanbol/trunk/ontologymanager/web/src/main/resources/org/apache/stanbol/ontologymanager/web/templates/org/apache/stanbol/ontologymanager/web/resources/OntologyNetworkResource/index.ftl
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/ontologymanager/web/src/main/resources/org/apache/stanbol/ontologymanager/web/templates/org/apache/stanbol/ontologymanager/web/resources/OntologyNetworkResource/index.ftl?rev=1354069&r1=1354068&r2=1354069&view=diff
==============================================================================
--- incubator/stanbol/trunk/ontologymanager/web/src/main/resources/org/apache/stanbol/ontologymanager/web/templates/org/apache/stanbol/ontologymanager/web/resources/OntologyNetworkResource/index.ftl (original)
+++ incubator/stanbol/trunk/ontologymanager/web/src/main/resources/org/apache/stanbol/ontologymanager/web/templates/org/apache/stanbol/ontologymanager/web/resources/OntologyNetworkResource/index.ftl Tue Jun 26 15:39:12 2012
@@ -42,7 +42,7 @@
<img src="${it.staticRootUrl}/contenthub/images/delete_icon_16.png" title="(not available yet) Delete this item" />
-->
</td>
- <td><a href="${scope.namespace}${scope.ID}" title="${scope.ID}">${scope.ID}</a></td>
+ <td><a href="${it.publicBaseUri}ontonet/ontology/${scope.ID}" title="${scope.ID}">${scope.ID}</a></td>
<td>${scope.locked?string("locked", "modifiable")}</td>
<td></td>
<td>${scope.coreSpace.listManagedOntologies()?size + scope.customSpace.listManagedOntologies()?size}</td>
Modified: incubator/stanbol/trunk/ontologymanager/web/src/main/resources/org/apache/stanbol/ontologymanager/web/templates/org/apache/stanbol/ontologymanager/web/resources/SessionManagerResource/index.ftl
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/ontologymanager/web/src/main/resources/org/apache/stanbol/ontologymanager/web/templates/org/apache/stanbol/ontologymanager/web/resources/SessionManagerResource/index.ftl?rev=1354069&r1=1354068&r2=1354069&view=diff
==============================================================================
--- incubator/stanbol/trunk/ontologymanager/web/src/main/resources/org/apache/stanbol/ontologymanager/web/templates/org/apache/stanbol/ontologymanager/web/resources/SessionManagerResource/index.ftl (original)
+++ incubator/stanbol/trunk/ontologymanager/web/src/main/resources/org/apache/stanbol/ontologymanager/web/templates/org/apache/stanbol/ontologymanager/web/resources/SessionManagerResource/index.ftl Tue Jun 26 15:39:12 2012
@@ -42,7 +42,7 @@
<img src="${it.staticRootUrl}/contenthub/images/delete_icon_16.png" title="(not available yet) Delete this item" />
-->
</td>
- <td><a href="${session.namespace}${session.ID}" title="${session.ID}">${session.ID}</a></td>
+ <td><a href="${it.publicBaseUri}ontonet/session/${session.ID}" title="${session.ID}">${session.ID}</a></td>
<td>${session.locked?string("locked", "modifiable")}</td>
<td></td>
<td>${session.listManagedOntologies()?size}</td>
Modified: incubator/stanbol/trunk/reasoners/web/src/main/resources/org/apache/stanbol/reasoners/web/templates/imports/reasonersDescription.ftl
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/reasoners/web/src/main/resources/org/apache/stanbol/reasoners/web/templates/imports/reasonersDescription.ftl?rev=1354069&r1=1354068&r2=1354069&view=diff
==============================================================================
--- incubator/stanbol/trunk/reasoners/web/src/main/resources/org/apache/stanbol/reasoners/web/templates/imports/reasonersDescription.ftl (original)
+++ incubator/stanbol/trunk/reasoners/web/src/main/resources/org/apache/stanbol/reasoners/web/templates/imports/reasonersDescription.ftl Tue Jun 26 15:39:12 2012
@@ -14,4 +14,6 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<#macro view>This is a the implementation of Stanbol Reasoners.</#macro>
\ No newline at end of file
+The entry point to multiple <strong>reasoning services</strong> that are used for
+obtaining unexpressed additional knowledge from the explicit axioms in an ontology.
+Multiple reasoning profiles are available, each with its expressive power and computational cost.
\ No newline at end of file