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 2011/03/27 19:30:30 UTC
svn commit: r1085994 - in /incubator/stanbol/trunk/kres: jersey/
jersey/src/main/java/org/apache/stanbol/kres/jersey/
jersey/src/main/java/org/apache/stanbol/kres/jersey/resource/
ontologymanager/web/ owlapi/ reasoners/web/ reasoners/web/src/test/java/...
Author: alexdma
Date: Sun Mar 27 17:30:29 2011
New Revision: 1085994
URL: http://svn.apache.org/viewvc?rev=1085994&view=rev
Log:
STANBOL-39 :
- Deleted empty eu.iksproject.kres Java packages.
- Duplicated UriGenerator class across reengineer/base and rules/refactor to remove a dependency between them.
- Removed some bogus cross-dependencies implied by unused imports.
- Minimized cross-dependencies in /web modules.
Added:
incubator/stanbol/trunk/kres/reengineer/base/src/main/java/org/apache/stanbol/reengineer/base/api/util/URIGenerator.java
Removed:
incubator/stanbol/trunk/kres/reengineer/xerces/src/main/java/eu/iksproject/kres/shared/dependency/xerces/
incubator/stanbol/trunk/kres/reengineer/xerces/src/main/resources/eu/iksproject/kres/shared/dependency/xerces/
incubator/stanbol/trunk/kres/reengineer/xerces/src/test/java/eu/iksproject/kres/shared/dependency/xerces/
incubator/stanbol/trunk/kres/reengineer/xml/src/main/java/eu/iksproject/kres/semion/reengineer/
Modified:
incubator/stanbol/trunk/kres/jersey/pom.xml
incubator/stanbol/trunk/kres/jersey/src/main/java/org/apache/stanbol/kres/jersey/JerseyEndpoint.java
incubator/stanbol/trunk/kres/jersey/src/main/java/org/apache/stanbol/kres/jersey/resource/NavigationMixin.java
incubator/stanbol/trunk/kres/ontologymanager/web/pom.xml
incubator/stanbol/trunk/kres/owlapi/pom.xml
incubator/stanbol/trunk/kres/reasoners/web/pom.xml
incubator/stanbol/trunk/kres/reasoners/web/src/test/java/org/apache/stanbol/reasoners/web/ClassifyTest.java
incubator/stanbol/trunk/kres/reasoners/web/src/test/java/org/apache/stanbol/reasoners/web/ConsistencyCheckTest.java
incubator/stanbol/trunk/kres/reasoners/web/src/test/java/org/apache/stanbol/reasoners/web/EnrichmentTest.java
incubator/stanbol/trunk/kres/reengineer/base/pom.xml
incubator/stanbol/trunk/kres/reengineer/base/src/main/java/org/apache/stanbol/reengineer/base/api/datasources/RDB.java
incubator/stanbol/trunk/kres/reengineer/db/pom.xml
incubator/stanbol/trunk/kres/reengineer/web/pom.xml
incubator/stanbol/trunk/kres/reengineer/xml/pom.xml
incubator/stanbol/trunk/kres/reengineer/xml/src/main/java/org/apache/stanbol/reengineer/xml/vocab/XML.java
incubator/stanbol/trunk/kres/reengineer/xml/src/main/java/org/apache/stanbol/reengineer/xml/vocab/XSD.java
incubator/stanbol/trunk/kres/rules/base/src/main/java/org/apache/stanbol/rules/base/api/Recipe.java
incubator/stanbol/trunk/kres/rules/base/src/main/java/org/apache/stanbol/rules/base/api/util/AtomIterator.java
incubator/stanbol/trunk/kres/rules/manager/pom.xml
incubator/stanbol/trunk/kres/rules/refactor/pom.xml
incubator/stanbol/trunk/kres/rules/web/pom.xml
incubator/stanbol/trunk/kres/rules/web/src/test/java/org/apache/stanbol/rules/web/RecipeTest.java
incubator/stanbol/trunk/kres/rules/web/src/test/java/org/apache/stanbol/rules/web/RuleTest.java
Modified: incubator/stanbol/trunk/kres/jersey/pom.xml
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/jersey/pom.xml?rev=1085994&r1=1085993&r2=1085994&view=diff
==============================================================================
--- incubator/stanbol/trunk/kres/jersey/pom.xml (original)
+++ incubator/stanbol/trunk/kres/jersey/pom.xml Sun Mar 27 17:30:29 2011
@@ -208,57 +208,30 @@
<scope>test</scope>
</dependency>
+ <!-- Stanbol deps -->
<dependency>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.ontologymanager.ontonet</artifactId>
<version>${stanbol-version}</version>
</dependency>
- <!--
- <dependency>
- <groupId>org.apache.stanbol</groupId>
- <artifactId>org.apache.stanbol.ontologymanager.store</artifactId>
- <version>${stanbol-version}</version>
- </dependency>
- -->
- <dependency>
- <groupId>org.apache.stanbol</groupId>
- <artifactId>org.apache.stanbol.reasoners.base</artifactId>
- <version>${stanbol-version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.stanbol</groupId>
- <artifactId>org.apache.stanbol.reengineer.base</artifactId>
- <version>${stanbol-version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.stanbol</groupId>
- <artifactId>org.apache.stanbol.rules.manager</artifactId>
- <version>${stanbol-version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.stanbol</groupId>
- <artifactId>org.apache.stanbol.rules.refactor</artifactId>
- <version>${stanbol-version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.stanbol</groupId>
- <artifactId>org.apache.stanbol.owlapi</artifactId>
- <version>${stanbol-version}</version>
- <scope>provided</scope>
- </dependency>
-
+
+ <!-- OWL deps -->
<dependency>
<groupId>com.hp.hpl.jena</groupId>
<artifactId>jena</artifactId>
<version>2.6.2</version>
<scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>owlapi</groupId>
+ <artifactId>owlapi</artifactId>
+ <version>3.0.0</version>
+ <scope>provided</scope>
+ </dependency>
+
</dependencies>
-
-
-
<repositories>
<!-- needed for jersey -->
<repository>
Modified: incubator/stanbol/trunk/kres/jersey/src/main/java/org/apache/stanbol/kres/jersey/JerseyEndpoint.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/jersey/src/main/java/org/apache/stanbol/kres/jersey/JerseyEndpoint.java?rev=1085994&r1=1085993&r2=1085994&view=diff
==============================================================================
--- incubator/stanbol/trunk/kres/jersey/src/main/java/org/apache/stanbol/kres/jersey/JerseyEndpoint.java (original)
+++ incubator/stanbol/trunk/kres/jersey/src/main/java/org/apache/stanbol/kres/jersey/JerseyEndpoint.java Sun Mar 27 17:30:29 2011
@@ -12,9 +12,7 @@ import org.apache.clerezza.rdf.core.seri
import org.apache.felix.scr.annotations.Component;
import org.apache.felix.scr.annotations.Property;
import org.apache.felix.scr.annotations.Reference;
-import org.apache.stanbol.ontologymanager.ontonet.api.ONManager;
-import org.apache.stanbol.reengineer.base.api.ReengineerManager;
-import org.apache.stanbol.reengineer.base.api.Reengineer;
+import org.apache.stanbol.kres.jersey.processors.KReSViewProcessor;
import org.osgi.framework.BundleContext;
import org.osgi.service.component.ComponentContext;
import org.osgi.service.http.HttpService;
@@ -24,8 +22,6 @@ import org.slf4j.LoggerFactory;
import com.sun.jersey.spi.container.servlet.ServletContainer;
-import org.apache.stanbol.kres.jersey.processors.KReSViewProcessor;
-
/**
* Jersey-based RESTful endpoint for KReS.
*
Modified: incubator/stanbol/trunk/kres/jersey/src/main/java/org/apache/stanbol/kres/jersey/resource/NavigationMixin.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/jersey/src/main/java/org/apache/stanbol/kres/jersey/resource/NavigationMixin.java?rev=1085994&r1=1085993&r2=1085994&view=diff
==============================================================================
--- incubator/stanbol/trunk/kres/jersey/src/main/java/org/apache/stanbol/kres/jersey/resource/NavigationMixin.java (original)
+++ incubator/stanbol/trunk/kres/jersey/src/main/java/org/apache/stanbol/kres/jersey/resource/NavigationMixin.java Sun Mar 27 17:30:29 2011
@@ -7,9 +7,6 @@ import java.util.List;
import javax.ws.rs.core.Context;
import javax.ws.rs.core.UriInfo;
-import org.apache.commons.io.LineIterator;
-import org.apache.commons.lang.ArrayUtils;
-
public class NavigationMixin {
@Context
Modified: incubator/stanbol/trunk/kres/ontologymanager/web/pom.xml
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/ontologymanager/web/pom.xml?rev=1085994&r1=1085993&r2=1085994&view=diff
==============================================================================
--- incubator/stanbol/trunk/kres/ontologymanager/web/pom.xml (original)
+++ incubator/stanbol/trunk/kres/ontologymanager/web/pom.xml Sun Mar 27 17:30:29 2011
@@ -164,6 +164,20 @@
<version>1.2.0</version>
<scope>provided</scope>
</dependency>
+
+ <!-- Stanbol deps -->
+ <dependency>
+ <groupId>org.apache.stanbol</groupId>
+ <artifactId>org.apache.stanbol.kres.jersey</artifactId>
+ <version>${stanbol-version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.stanbol</groupId>
+ <artifactId>org.apache.stanbol.ontologymanager.ontonet</artifactId>
+ <version>${stanbol-version}</version>
+ <scope>provided</scope>
+ </dependency>
<!-- for tests -->
<dependency>
@@ -207,53 +221,7 @@
<version>${pax-exam-version}</version>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.apache.stanbol</groupId>
- <artifactId>org.apache.stanbol.ontologymanager.ontonet</artifactId>
- <version>${stanbol-version}</version>
- </dependency>
- <!--<dependency>
- <groupId>org.apache.stanbol</groupId>
- <artifactId>org.apache.stanbol.ontologymanager.store</artifactId>
- <version>${stanbol-version}</version>
- </dependency>-->
- <dependency>
- <groupId>org.apache.stanbol</groupId>
- <artifactId>org.apache.stanbol.reasoners.base</artifactId>
- <version>${stanbol-version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.stanbol</groupId>
- <artifactId>org.apache.stanbol.rules.base</artifactId>
- <version>${stanbol-version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.stanbol</groupId>
- <artifactId>org.apache.stanbol.reengineer.base</artifactId>
- <version>${stanbol-version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.stanbol</groupId>
- <artifactId>org.apache.stanbol.rules.manager</artifactId>
- <version>${stanbol-version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.stanbol</groupId>
- <artifactId>org.apache.stanbol.rules.refactor</artifactId>
- <version>${stanbol-version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.stanbol</groupId>
- <artifactId>org.apache.stanbol.kres.jersey</artifactId>
- <version>${stanbol-version}</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.stanbol</groupId>
- <artifactId>org.apache.stanbol.owlapi</artifactId>
- <version>${stanbol-version}</version>
- <scope>provided</scope>
- </dependency>
+
<dependency>
<groupId>com.hp.hpl.jena</groupId>
<artifactId>jena</artifactId>
@@ -262,10 +230,6 @@
</dependency>
</dependencies>
-
-
-
-
<repositories>
<!-- needed for jersey -->
<repository>
Modified: incubator/stanbol/trunk/kres/owlapi/pom.xml
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/owlapi/pom.xml?rev=1085994&r1=1085993&r2=1085994&view=diff
==============================================================================
--- incubator/stanbol/trunk/kres/owlapi/pom.xml (original)
+++ incubator/stanbol/trunk/kres/owlapi/pom.xml Sun Mar 27 17:30:29 2011
@@ -29,7 +29,7 @@
<artifactId>org.apache.stanbol.owlapi</artifactId>
<version>${stanbol-version}</version>
<packaging>bundle</packaging>
- <name>Apache Stanbol Owlapi Dependecy</name>
+ <name>Apache Stanbol OSGi bundle for OWL API</name>
<repositories>
<repository>
Modified: incubator/stanbol/trunk/kres/reasoners/web/pom.xml
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/reasoners/web/pom.xml?rev=1085994&r1=1085993&r2=1085994&view=diff
==============================================================================
--- incubator/stanbol/trunk/kres/reasoners/web/pom.xml (original)
+++ incubator/stanbol/trunk/kres/reasoners/web/pom.xml Sun Mar 27 17:30:29 2011
@@ -208,51 +208,35 @@
<scope>test</scope>
</dependency>
- <dependency>
+ <!-- Stanbol deps -->
+ <dependency>
<groupId>org.apache.stanbol</groupId>
- <artifactId>org.apache.stanbol.ontologymanager.ontonet</artifactId>
+ <artifactId>org.apache.stanbol.kres.jersey</artifactId>
<version>${stanbol-version}</version>
+ <scope>provided</scope>
</dependency>
- <!--<dependency>
+ <dependency>
<groupId>org.apache.stanbol</groupId>
- <artifactId>org.apache.stanbol.ontologymanager.store</artifactId>
+ <artifactId>org.apache.stanbol.ontologymanager.ontonet</artifactId>
<version>${stanbol-version}</version>
- </dependency>-->
+ <scope>provided</scope>
+ </dependency>
<dependency>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.reasoners.base</artifactId>
<version>${stanbol-version}</version>
+ <scope>provided</scope>
</dependency>
- <dependency>
+ <dependency>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.rules.base</artifactId>
<version>${stanbol-version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.stanbol</groupId>
- <artifactId>org.apache.stanbol.reengineer.base</artifactId>
- <version>${stanbol-version}</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.rules.manager</artifactId>
<version>${stanbol-version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.stanbol</groupId>
- <artifactId>org.apache.stanbol.rules.refactor</artifactId>
- <version>${stanbol-version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.stanbol</groupId>
- <artifactId>org.apache.stanbol.kres.jersey</artifactId>
- <version>${stanbol-version}</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.stanbol</groupId>
- <artifactId>org.apache.stanbol.owlapi</artifactId>
- <version>${stanbol-version}</version>
<scope>provided</scope>
</dependency>
@@ -262,12 +246,16 @@
<version>2.6.2</version>
<scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>owlapi</groupId>
+ <artifactId>owlapi</artifactId>
+ <version>3.0.0</version>
+ <scope>provided</scope>
+ </dependency>
+
</dependencies>
-
-
-
<repositories>
<!-- needed for jersey -->
<repository>
Modified: incubator/stanbol/trunk/kres/reasoners/web/src/test/java/org/apache/stanbol/reasoners/web/ClassifyTest.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/reasoners/web/src/test/java/org/apache/stanbol/reasoners/web/ClassifyTest.java?rev=1085994&r1=1085993&r2=1085994&view=diff
==============================================================================
--- incubator/stanbol/trunk/kres/reasoners/web/src/test/java/org/apache/stanbol/reasoners/web/ClassifyTest.java (original)
+++ incubator/stanbol/trunk/kres/reasoners/web/src/test/java/org/apache/stanbol/reasoners/web/ClassifyTest.java Sun Mar 27 17:30:29 2011
@@ -5,25 +5,17 @@
package org.apache.stanbol.reasoners.web;
-import java.util.Iterator;
-import org.semanticweb.owlapi.model.OWLAxiom;
-import org.semanticweb.owlapi.model.OWLOntology;
-import org.semanticweb.owlapi.apibinding.OWLManager;
-import com.sun.jersey.api.client.ClientResponse;
-import javax.ws.rs.core.MediaType;
-import com.sun.jersey.api.representation.Form;
-import com.sun.jersey.api.client.WebResource;
-import com.sun.jersey.api.client.Client;
import org.apache.stanbol.kres.jersey.JettyServer;
-import java.io.File;
import org.junit.After;
import org.junit.AfterClass;
import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.Test;
-import static org.junit.Assert.*;
import org.semanticweb.owlapi.model.OWLOntologyCreationException;
+import com.sun.jersey.api.client.Client;
+import com.sun.jersey.api.client.WebResource;
+
/**
*
* @author elvio
Modified: incubator/stanbol/trunk/kres/reasoners/web/src/test/java/org/apache/stanbol/reasoners/web/ConsistencyCheckTest.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/reasoners/web/src/test/java/org/apache/stanbol/reasoners/web/ConsistencyCheckTest.java?rev=1085994&r1=1085993&r2=1085994&view=diff
==============================================================================
--- incubator/stanbol/trunk/kres/reasoners/web/src/test/java/org/apache/stanbol/reasoners/web/ConsistencyCheckTest.java (original)
+++ incubator/stanbol/trunk/kres/reasoners/web/src/test/java/org/apache/stanbol/reasoners/web/ConsistencyCheckTest.java Sun Mar 27 17:30:29 2011
@@ -5,19 +5,15 @@
package org.apache.stanbol.reasoners.web;
-import com.sun.jersey.api.client.ClientResponse;
-import javax.ws.rs.core.MediaType;
-import com.sun.jersey.api.representation.Form;
-import com.sun.jersey.api.client.WebResource;
-import com.sun.jersey.api.client.Client;
import org.apache.stanbol.kres.jersey.JettyServer;
-import java.io.File;
import org.junit.After;
import org.junit.AfterClass;
import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.Test;
-import static org.junit.Assert.*;
+
+import com.sun.jersey.api.client.Client;
+import com.sun.jersey.api.client.WebResource;
/**
*
Modified: incubator/stanbol/trunk/kres/reasoners/web/src/test/java/org/apache/stanbol/reasoners/web/EnrichmentTest.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/reasoners/web/src/test/java/org/apache/stanbol/reasoners/web/EnrichmentTest.java?rev=1085994&r1=1085993&r2=1085994&view=diff
==============================================================================
--- incubator/stanbol/trunk/kres/reasoners/web/src/test/java/org/apache/stanbol/reasoners/web/EnrichmentTest.java (original)
+++ incubator/stanbol/trunk/kres/reasoners/web/src/test/java/org/apache/stanbol/reasoners/web/EnrichmentTest.java Sun Mar 27 17:30:29 2011
@@ -5,25 +5,17 @@
package org.apache.stanbol.reasoners.web;
-import org.semanticweb.owlapi.model.OWLOntology;
-import org.semanticweb.owlapi.apibinding.OWLManager;
-import com.sun.jersey.api.client.ClientResponse;
-import javax.ws.rs.core.MediaType;
-import com.sun.jersey.api.representation.Form;
-import com.sun.jersey.api.client.WebResource;
-import com.sun.jersey.api.client.Client;
import org.apache.stanbol.kres.jersey.JettyServer;
-import java.io.File;
-import java.util.Iterator;
import org.junit.After;
import org.junit.AfterClass;
import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.Test;
-import static org.junit.Assert.*;
-import org.semanticweb.owlapi.model.OWLAxiom;
import org.semanticweb.owlapi.model.OWLOntologyCreationException;
+import com.sun.jersey.api.client.Client;
+import com.sun.jersey.api.client.WebResource;
+
/**
*
* @author elvio
Modified: incubator/stanbol/trunk/kres/reengineer/base/pom.xml
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/reengineer/base/pom.xml?rev=1085994&r1=1085993&r2=1085994&view=diff
==============================================================================
--- incubator/stanbol/trunk/kres/reengineer/base/pom.xml (original)
+++ incubator/stanbol/trunk/kres/reengineer/base/pom.xml Sun Mar 27 17:30:29 2011
@@ -96,20 +96,10 @@
<!-- Stanbol deps -->
<dependency>
<groupId>org.apache.stanbol</groupId>
- <artifactId>org.apache.stanbol.owlapi</artifactId>
- <version>${stanbol-version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.ontologymanager.ontonet</artifactId>
<version>${stanbol-version}</version>
</dependency>
- <!-- NEEDED FOR Semion refactorer -->
- <dependency>
- <groupId>org.apache.stanbol</groupId>
- <artifactId>org.apache.stanbol.rules.refactor</artifactId>
- <version>${stanbol-version}</version>
- </dependency>
+
<dependency>
<groupId>owlapi</groupId>
<artifactId>owlapi</artifactId>
Modified: incubator/stanbol/trunk/kres/reengineer/base/src/main/java/org/apache/stanbol/reengineer/base/api/datasources/RDB.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/reengineer/base/src/main/java/org/apache/stanbol/reengineer/base/api/datasources/RDB.java?rev=1085994&r1=1085993&r2=1085994&view=diff
==============================================================================
--- incubator/stanbol/trunk/kres/reengineer/base/src/main/java/org/apache/stanbol/reengineer/base/api/datasources/RDB.java (original)
+++ incubator/stanbol/trunk/kres/reengineer/base/src/main/java/org/apache/stanbol/reengineer/base/api/datasources/RDB.java Sun Mar 27 17:30:29 2011
@@ -3,8 +3,7 @@ package org.apache.stanbol.reengineer.ba
import org.apache.stanbol.reengineer.base.api.IdentifiedDataSource;
import org.apache.stanbol.reengineer.base.api.settings.ConnectionSettings;
import org.apache.stanbol.reengineer.base.api.util.ReengineerType;
-import org.apache.stanbol.rules.refactor.api.util.URIGenerator;
-
+import org.apache.stanbol.reengineer.base.api.util.URIGenerator;
/**
* An object representing a relational database in Semion.
Added: incubator/stanbol/trunk/kres/reengineer/base/src/main/java/org/apache/stanbol/reengineer/base/api/util/URIGenerator.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/reengineer/base/src/main/java/org/apache/stanbol/reengineer/base/api/util/URIGenerator.java?rev=1085994&view=auto
==============================================================================
--- incubator/stanbol/trunk/kres/reengineer/base/src/main/java/org/apache/stanbol/reengineer/base/api/util/URIGenerator.java (added)
+++ incubator/stanbol/trunk/kres/reengineer/base/src/main/java/org/apache/stanbol/reengineer/base/api/util/URIGenerator.java Sun Mar 27 17:30:29 2011
@@ -0,0 +1,87 @@
+package org.apache.stanbol.reengineer.base.api.util;
+
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.OutputStream;
+import java.security.MessageDigest;
+import java.security.NoSuchAlgorithmException;
+
+public class URIGenerator {
+
+
+ public static final String SHA1 = "SHA1";
+
+ public static final int MIN_BUF_SIZE = 8 * 1024; // 8 kB
+
+ public static final int MAX_BUF_SIZE = 64 * 1024; // 64 kB
+
+ private static final char[] HEX_DIGITS = "0123456789abcdef".toCharArray();
+
+
+ public static String createID(String baseUri, byte[] content) {
+
+
+ // calculate an ID based on the digest of the content
+ String hexDigest = "";
+ if (!baseUri.startsWith("urn:") && !baseUri.endsWith("/")) {
+ baseUri = baseUri + "/";
+ }
+ try {
+ hexDigest = streamDigest(
+ new ByteArrayInputStream(content), null, SHA1);
+ } catch (IOException e) {
+ // this is not going to happen since output stream is null and the
+ // input data is already loaded in memory
+ }
+
+ return baseUri + SHA1.toLowerCase() + "-" + hexDigest;
+ }
+
+
+
+
+ public static String streamDigest(InputStream in, OutputStream out,
+ String digestAlgorithm) throws IOException {
+ MessageDigest digest;
+ try {
+ digest = MessageDigest.getInstance(digestAlgorithm);
+ } catch (NoSuchAlgorithmException e) {
+ throw (IOException) new IOException().initCause(e);
+ }
+
+ int size = in.available();
+ if (size == 0) {
+ size = MAX_BUF_SIZE;
+ } else if (size < MIN_BUF_SIZE) {
+ size = MIN_BUF_SIZE;
+ } else if (size > MAX_BUF_SIZE) {
+ size = MAX_BUF_SIZE;
+ }
+ byte[] buf = new byte[size];
+
+ /*
+ * Copy and digest.
+ */
+ int n;
+ while ((n = in.read(buf)) != -1) {
+ if (out != null) {
+ out.write(buf, 0, n);
+ }
+ digest.update(buf, 0, n);
+ }
+ if (out != null) {
+ out.flush();
+ }
+ return toHexString(digest.digest());
+ }
+
+ public static String toHexString(byte[] data) {
+ StringBuilder buf = new StringBuilder(2 * data.length);
+ for (byte b : data) {
+ buf.append(HEX_DIGITS[(0xF0 & b) >> 4]);
+ buf.append(HEX_DIGITS[0x0F & b]);
+ }
+ return buf.toString();
+ }
+}
Modified: incubator/stanbol/trunk/kres/reengineer/db/pom.xml
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/reengineer/db/pom.xml?rev=1085994&r1=1085993&r2=1085994&view=diff
==============================================================================
--- incubator/stanbol/trunk/kres/reengineer/db/pom.xml (original)
+++ incubator/stanbol/trunk/kres/reengineer/db/pom.xml Sun Mar 27 17:30:29 2011
@@ -110,11 +110,6 @@
<!-- Stanbol deps -->
<dependency>
<groupId>org.apache.stanbol</groupId>
- <artifactId>org.apache.stanbol.owlapi</artifactId>
- <version>${stanbol-version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.ontologymanager.ontonet</artifactId>
<version>${stanbol-version}</version>
</dependency>
@@ -124,7 +119,7 @@
<version>${stanbol-version}</version>
</dependency>
- <!-- Jena deps -->
+ <!-- OWL deps -->
<dependency>
<groupId>com.hp.hpl.jena</groupId>
<artifactId>iri</artifactId>
@@ -155,6 +150,11 @@
<version>0.8.5</version>
<scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>owlapi</groupId>
+ <artifactId>owlapi</artifactId>
+ <version>3.0.0</version>
+ </dependency>
<!-- Clerezza deps -->
<dependency>
Modified: incubator/stanbol/trunk/kres/reengineer/web/pom.xml
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/reengineer/web/pom.xml?rev=1085994&r1=1085993&r2=1085994&view=diff
==============================================================================
--- incubator/stanbol/trunk/kres/reengineer/web/pom.xml (original)
+++ incubator/stanbol/trunk/kres/reengineer/web/pom.xml Sun Mar 27 17:30:29 2011
@@ -208,60 +208,34 @@
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.apache.stanbol</groupId>
- <artifactId>org.apache.stanbol.ontologymanager.ontonet</artifactId>
- <version>${stanbol-version}</version>
- </dependency>
- <!--<dependency>
- <groupId>org.apache.stanbol</groupId>
- <artifactId>org.apache.stanbol.ontologymanager.store</artifactId>
- <version>${stanbol-version}</version>
- </dependency>-->
- <dependency>
- <groupId>org.apache.stanbol</groupId>
- <artifactId>org.apache.stanbol.reasoners.base</artifactId>
- <version>${stanbol-version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.stanbol</groupId>
- <artifactId>org.apache.stanbol.rules.base</artifactId>
- <version>${stanbol-version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.stanbol</groupId>
- <artifactId>org.apache.stanbol.reengineer.base</artifactId>
- <version>${stanbol-version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.stanbol</groupId>
- <artifactId>org.apache.stanbol.rules.manager</artifactId>
- <version>${stanbol-version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.stanbol</groupId>
- <artifactId>org.apache.stanbol.rules.refactor</artifactId>
- <version>${stanbol-version}</version>
- </dependency>
- <dependency>
+ <!-- Stanbol deps -->
+ <dependency>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.kres.jersey</artifactId>
<version>${stanbol-version}</version>
<scope>provided</scope>
</dependency>
- <dependency>
+ <dependency>
<groupId>org.apache.stanbol</groupId>
- <artifactId>org.apache.stanbol.owlapi</artifactId>
+ <artifactId>org.apache.stanbol.reengineer.base</artifactId>
<version>${stanbol-version}</version>
<scope>provided</scope>
- </dependency>
-
+ </dependency>
+
+ <!-- OWL deps -->
<dependency>
<groupId>com.hp.hpl.jena</groupId>
<artifactId>jena</artifactId>
<version>2.6.2</version>
<scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>owlapi</groupId>
+ <artifactId>owlapi</artifactId>
+ <version>3.0.0</version>
+ <scope>provided</scope>
+ </dependency>
+
</dependencies>
Modified: incubator/stanbol/trunk/kres/reengineer/xml/pom.xml
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/reengineer/xml/pom.xml?rev=1085994&r1=1085993&r2=1085994&view=diff
==============================================================================
--- incubator/stanbol/trunk/kres/reengineer/xml/pom.xml (original)
+++ incubator/stanbol/trunk/kres/reengineer/xml/pom.xml Sun Mar 27 17:30:29 2011
@@ -116,13 +116,8 @@
<artifactId>org.apache.stanbol.reengineer.base</artifactId>
<version>${stanbol-version}</version>
</dependency>
- <dependency>
- <groupId>org.apache.stanbol</groupId>
- <artifactId>org.apache.stanbol.owlapi</artifactId>
- <version>${stanbol-version}</version>
- </dependency>
- <!-- Jena deps -->
+ <!-- OWL deps -->
<dependency>
<groupId>com.hp.hpl.jena</groupId>
<artifactId>iri</artifactId>
@@ -153,6 +148,11 @@
<version>0.8.5</version>
<scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>owlapi</groupId>
+ <artifactId>owlapi</artifactId>
+ <version>3.0.0</version>
+ </dependency>
<!-- Clerezza deps -->
<dependency>
Modified: incubator/stanbol/trunk/kres/reengineer/xml/src/main/java/org/apache/stanbol/reengineer/xml/vocab/XML.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/reengineer/xml/src/main/java/org/apache/stanbol/reengineer/xml/vocab/XML.java?rev=1085994&r1=1085993&r2=1085994&view=diff
==============================================================================
--- incubator/stanbol/trunk/kres/reengineer/xml/src/main/java/org/apache/stanbol/reengineer/xml/vocab/XML.java (original)
+++ incubator/stanbol/trunk/kres/reengineer/xml/src/main/java/org/apache/stanbol/reengineer/xml/vocab/XML.java Sun Mar 27 17:30:29 2011
@@ -3,8 +3,6 @@ package org.apache.stanbol.reengineer.xm
/* CVS $Id$ */
import org.apache.clerezza.rdf.core.UriRef;
-
-import com.hp.hpl.jena.rdf.model.*;
/**
* Vocabulary definitions from http://ontologydesignpatterns.org/ont/iks/xml.owl
Modified: incubator/stanbol/trunk/kres/reengineer/xml/src/main/java/org/apache/stanbol/reengineer/xml/vocab/XSD.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/reengineer/xml/src/main/java/org/apache/stanbol/reengineer/xml/vocab/XSD.java?rev=1085994&r1=1085993&r2=1085994&view=diff
==============================================================================
--- incubator/stanbol/trunk/kres/reengineer/xml/src/main/java/org/apache/stanbol/reengineer/xml/vocab/XSD.java (original)
+++ incubator/stanbol/trunk/kres/reengineer/xml/src/main/java/org/apache/stanbol/reengineer/xml/vocab/XSD.java Sun Mar 27 17:30:29 2011
@@ -2,11 +2,7 @@ package org.apache.stanbol.reengineer.xm
/* CVS $Id$ */
-import org.apache.clerezza.rdf.core.MGraph;
import org.apache.clerezza.rdf.core.UriRef;
-import org.apache.clerezza.rdf.core.impl.SimpleMGraph;
-
-import com.hp.hpl.jena.rdf.model.*;
/**
* Vocabulary definitions from http://ontologydesignpatterns.org/ont/iks/xsd.owl
Modified: incubator/stanbol/trunk/kres/rules/base/src/main/java/org/apache/stanbol/rules/base/api/Recipe.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/rules/base/src/main/java/org/apache/stanbol/rules/base/api/Recipe.java?rev=1085994&r1=1085993&r2=1085994&view=diff
==============================================================================
--- incubator/stanbol/trunk/kres/rules/base/src/main/java/org/apache/stanbol/rules/base/api/Recipe.java (original)
+++ incubator/stanbol/trunk/kres/rules/base/src/main/java/org/apache/stanbol/rules/base/api/Recipe.java Sun Mar 27 17:30:29 2011
@@ -1,10 +1,5 @@
package org.apache.stanbol.rules.base.api;
-import java.net.URI;
-import java.util.Collection;
-
-import org.apache.clerezza.rdf.core.MGraph;
-import org.apache.clerezza.rdf.core.sparql.ResultSet;
import org.apache.stanbol.rules.base.api.util.RuleList;
import org.semanticweb.owlapi.model.IRI;
Modified: incubator/stanbol/trunk/kres/rules/base/src/main/java/org/apache/stanbol/rules/base/api/util/AtomIterator.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/rules/base/src/main/java/org/apache/stanbol/rules/base/api/util/AtomIterator.java?rev=1085994&r1=1085993&r2=1085994&view=diff
==============================================================================
--- incubator/stanbol/trunk/kres/rules/base/src/main/java/org/apache/stanbol/rules/base/api/util/AtomIterator.java (original)
+++ incubator/stanbol/trunk/kres/rules/base/src/main/java/org/apache/stanbol/rules/base/api/util/AtomIterator.java Sun Mar 27 17:30:29 2011
@@ -2,7 +2,6 @@ package org.apache.stanbol.rules.base.ap
import java.util.Iterator;
-import org.apache.stanbol.rules.base.api.Rule;
import org.apache.stanbol.rules.base.api.RuleAtom;
Modified: incubator/stanbol/trunk/kres/rules/manager/pom.xml
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/rules/manager/pom.xml?rev=1085994&r1=1085993&r2=1085994&view=diff
==============================================================================
--- incubator/stanbol/trunk/kres/rules/manager/pom.xml (original)
+++ incubator/stanbol/trunk/kres/rules/manager/pom.xml Sun Mar 27 17:30:29 2011
@@ -112,12 +112,14 @@
</dependency>
<!-- Stanbol deps -->
+ <!--
<dependency>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.owlapi</artifactId>
<version>${stanbol-version}</version>
<scope>provided</scope>
</dependency>
+ -->
<dependency>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.ontologymanager.ontonet</artifactId>
Modified: incubator/stanbol/trunk/kres/rules/refactor/pom.xml
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/rules/refactor/pom.xml?rev=1085994&r1=1085993&r2=1085994&view=diff
==============================================================================
--- incubator/stanbol/trunk/kres/rules/refactor/pom.xml (original)
+++ incubator/stanbol/trunk/kres/rules/refactor/pom.xml Sun Mar 27 17:30:29 2011
@@ -86,14 +86,6 @@
<version>${stanbol-version}</version>
<scope>provided</scope>
</dependency>
- <!--
- <dependency>
- <groupId>org.apache.stanbol</groupId>
- <artifactId>org.apache.stanbol.ontologymanager.store</artifactId>
- <version>${stanbol-version}</version>
- <scope>provided</scope>
- </dependency>
- -->
<dependency>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.reasoners.base</artifactId>
Modified: incubator/stanbol/trunk/kres/rules/web/pom.xml
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/rules/web/pom.xml?rev=1085994&r1=1085993&r2=1085994&view=diff
==============================================================================
--- incubator/stanbol/trunk/kres/rules/web/pom.xml (original)
+++ incubator/stanbol/trunk/kres/rules/web/pom.xml Sun Mar 27 17:30:29 2011
@@ -208,25 +208,22 @@
<version>${pax-exam-version}</version>
<scope>test</scope>
</dependency>
-
- <dependency>
- <groupId>org.apache.stanbol</groupId>
- <artifactId>org.apache.stanbol.ontologymanager.ontonet</artifactId>
- <version>${stanbol-version}</version>
- </dependency>
- <!--<dependency>
+
+ <!-- Stanbol deps -->
+ <dependency>
<groupId>org.apache.stanbol</groupId>
- <artifactId>org.apache.stanbol.ontologymanager.store</artifactId>
+ <artifactId>org.apache.stanbol.kres.jersey</artifactId>
<version>${stanbol-version}</version>
- </dependency>-->
+ <scope>provided</scope>
+ </dependency>
<dependency>
<groupId>org.apache.stanbol</groupId>
- <artifactId>org.apache.stanbol.reasoners.base</artifactId>
+ <artifactId>org.apache.stanbol.ontologymanager.ontonet</artifactId>
<version>${stanbol-version}</version>
</dependency>
<dependency>
<groupId>org.apache.stanbol</groupId>
- <artifactId>org.apache.stanbol.reengineer.base</artifactId>
+ <artifactId>org.apache.stanbol.reasoners.base</artifactId>
<version>${stanbol-version}</version>
</dependency>
<dependency>
@@ -244,25 +241,20 @@
<artifactId>org.apache.stanbol.rules.base</artifactId>
<version>${stanbol-version}</version>
</dependency>
- <dependency>
- <groupId>org.apache.stanbol</groupId>
- <artifactId>org.apache.stanbol.kres.jersey</artifactId>
- <version>${stanbol-version}</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.stanbol</groupId>
- <artifactId>org.apache.stanbol.owlapi</artifactId>
- <version>${stanbol-version}</version>
- <scope>provided</scope>
- </dependency>
+ <!-- OWL deps -->
<dependency>
<groupId>com.hp.hpl.jena</groupId>
<artifactId>jena</artifactId>
<version>2.6.2</version>
<scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>owlapi</groupId>
+ <artifactId>owlapi</artifactId>
+ <version>3.0.0</version>
+ </dependency>
+
</dependencies>
Modified: incubator/stanbol/trunk/kres/rules/web/src/test/java/org/apache/stanbol/rules/web/RecipeTest.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/rules/web/src/test/java/org/apache/stanbol/rules/web/RecipeTest.java?rev=1085994&r1=1085993&r2=1085994&view=diff
==============================================================================
--- incubator/stanbol/trunk/kres/rules/web/src/test/java/org/apache/stanbol/rules/web/RecipeTest.java (original)
+++ incubator/stanbol/trunk/kres/rules/web/src/test/java/org/apache/stanbol/rules/web/RecipeTest.java Sun Mar 27 17:30:29 2011
@@ -5,17 +5,18 @@
package org.apache.stanbol.rules.web;
-import javax.ws.rs.core.MediaType;
-import com.sun.jersey.api.representation.Form;
-import com.sun.jersey.api.client.ClientResponse;
-import com.sun.jersey.api.client.WebResource;
-import com.sun.jersey.api.client.Client;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.fail;
+
import org.junit.After;
import org.junit.AfterClass;
import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.Test;
-import static org.junit.Assert.*;
+
+import com.sun.jersey.api.client.Client;
+import com.sun.jersey.api.client.ClientResponse;
+import com.sun.jersey.api.client.WebResource;
/**
*
Modified: incubator/stanbol/trunk/kres/rules/web/src/test/java/org/apache/stanbol/rules/web/RuleTest.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/rules/web/src/test/java/org/apache/stanbol/rules/web/RuleTest.java?rev=1085994&r1=1085993&r2=1085994&view=diff
==============================================================================
--- incubator/stanbol/trunk/kres/rules/web/src/test/java/org/apache/stanbol/rules/web/RuleTest.java (original)
+++ incubator/stanbol/trunk/kres/rules/web/src/test/java/org/apache/stanbol/rules/web/RuleTest.java Sun Mar 27 17:30:29 2011
@@ -5,18 +5,17 @@
package org.apache.stanbol.rules.web;
-import javax.ws.rs.core.MediaType;
-import com.sun.jersey.api.representation.Form;
-import com.sun.jersey.api.client.ClientResponse;
-import com.sun.jersey.api.client.WebResource;
-import com.sun.jersey.api.client.Client;
-import javax.ws.rs.core.Response;
-import org.junit.After;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.fail;
+
import org.junit.AfterClass;
import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.Test;
-import static org.junit.Assert.*;
+
+import com.sun.jersey.api.client.Client;
+import com.sun.jersey.api.client.ClientResponse;
+import com.sun.jersey.api.client.WebResource;
/**
*