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/15 19:37:20 UTC
svn commit: r1081894 [2/7] - in /incubator/stanbol/trunk/kres: ./
eu.iksproject.kres.jersey/ eu.iksproject.kres.jersey/KReSConf/
eu.iksproject.kres.jersey/src/main/java/eu/iksproject/kres/jersey/
eu.iksproject.kres.jersey/src/main/java/eu/iksproject/kr...
Modified: incubator/stanbol/trunk/kres/eu.iksproject.kres.jersey/src/main/java/eu/iksproject/kres/jersey/util/OntologyRenderUtils.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/eu.iksproject.kres.jersey/src/main/java/eu/iksproject/kres/jersey/util/OntologyRenderUtils.java?rev=1081894&r1=1081893&r2=1081894&view=diff
==============================================================================
--- incubator/stanbol/trunk/kres/eu.iksproject.kres.jersey/src/main/java/eu/iksproject/kres/jersey/util/OntologyRenderUtils.java (original)
+++ incubator/stanbol/trunk/kres/eu.iksproject.kres.jersey/src/main/java/eu/iksproject/kres/jersey/util/OntologyRenderUtils.java Tue Mar 15 18:37:12 2011
@@ -3,6 +3,7 @@ package eu.iksproject.kres.jersey.util;
import java.util.ArrayList;
import java.util.List;
+import org.apache.stanbol.ontologymanager.ontonet.api.KReSONManager;
import org.coode.owlapi.manchesterowlsyntax.ManchesterOWLSyntaxOntologyFormat;
import org.coode.owlapi.turtle.TurtleOntologyFormat;
import org.semanticweb.owlapi.apibinding.OWLManager;
@@ -13,10 +14,8 @@ import org.semanticweb.owlapi.io.StringD
import org.semanticweb.owlapi.model.AddAxiom;
import org.semanticweb.owlapi.model.AddImport;
import org.semanticweb.owlapi.model.IRI;
-import org.semanticweb.owlapi.model.OWLAnnotation;
import org.semanticweb.owlapi.model.OWLAxiom;
import org.semanticweb.owlapi.model.OWLDataFactory;
-import org.semanticweb.owlapi.model.OWLDataProperty;
import org.semanticweb.owlapi.model.OWLImportsDeclaration;
import org.semanticweb.owlapi.model.OWLOntology;
import org.semanticweb.owlapi.model.OWLOntologyChange;
@@ -25,7 +24,6 @@ import org.semanticweb.owlapi.model.OWLO
import org.semanticweb.owlapi.model.OWLOntologyManager;
import org.semanticweb.owlapi.model.OWLOntologyStorageException;
-import eu.iksproject.kres.api.manager.KReSONManager;
import eu.iksproject.kres.jersey.format.KReSFormat;
public class OntologyRenderUtils {
Modified: incubator/stanbol/trunk/kres/eu.iksproject.kres.manager/pom.xml
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/eu.iksproject.kres.manager/pom.xml?rev=1081894&r1=1081893&r2=1081894&view=diff
==============================================================================
--- incubator/stanbol/trunk/kres/eu.iksproject.kres.manager/pom.xml (original)
+++ incubator/stanbol/trunk/kres/eu.iksproject.kres.manager/pom.xml Tue Mar 15 18:37:12 2011
@@ -53,6 +53,7 @@
org.slf4j.*;version=1.5.2,
org.stlab.xd.registry.io,
org.stlab.xd.registry.models,
+ *
</Import-Package>
<Private-Package>
@@ -62,7 +63,7 @@
</Private-Package>
<_nouses>true</_nouses>
-
+
</instructions>
</configuration>
</plugin>
@@ -84,29 +85,47 @@
<dependencies>
<!-- KReS deps -->
- <dependency>
- <groupId>eu.iksproject</groupId>
+ <!--
+ <dependency> <groupId>eu.iksproject</groupId>
<artifactId>eu.iksproject.kres.api</artifactId>
- <version>${kres-version}</version>
- <scope>provided</scope>
- </dependency>
+ <version>${kres-version}</version> <scope>provided</scope>
+ </dependency>
+ -->
<dependency>
<groupId>eu.iksproject</groupId>
<artifactId>eu.iksproject.kres.shared.dependency.owlapi</artifactId>
<version>${kres-version}</version>
<scope>provided</scope>
</dependency>
- <dependency>
- <groupId>eu.iksproject</groupId>
+ <!--
+ <dependency> <groupId>eu.iksproject</groupId>
<artifactId>eu.iksproject.kres.storage</artifactId>
- <version>${kres-version}</version>
- <scope>provided</scope>
- <exclusions>
- <exclusion>
- <artifactId>slf4j-log4j12</artifactId>
- <groupId>org.slf4j</groupId>
- </exclusion>
- </exclusions>
+ <version>${kres-version}</version> <scope>provided</scope>
+ <exclusions> <exclusion> <artifactId>slf4j-log4j12</artifactId>
+ <groupId>org.slf4j</groupId> </exclusion> </exclusions> </dependency>
+ -->
+
+ <dependency>
+ <groupId>org.apache.stanbol</groupId>
+ <artifactId>org.apache.stanbol.ontologymanager.ontonet</artifactId>
+ <version>${stanbol-version}</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>slf4j-log4j12</artifactId>
+ <groupId>org.slf4j</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.stanbol</groupId>
+ <artifactId>org.apache.stanbol.ontologymanager.store</artifactId>
+ <version>${stanbol-version}</version>
+ <exclusions>
+ <exclusion>
+ <artifactId>slf4j-log4j12</artifactId>
+ <groupId>org.slf4j</groupId>
+ </exclusion>
+ </exclusions>
</dependency>
<!-- OSGi deps -->
@@ -132,8 +151,8 @@
<!-- Diagnostics deps -->
<dependency>
<groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- <version>1.5.2</version>
+ <artifactId>slf4j-api</artifactId>
+ <version>1.5.2</version>
<scope>provided</scope>
</dependency>
<dependency>
@@ -149,19 +168,19 @@
<artifactId>junit</artifactId>
<version>4.4</version>
<scope>test</scope>
- <exclusions>
- <exclusion>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-simple</artifactId>
- <version>1.5.2</version>
- <scope>test</scope>
- </dependency>
+ <exclusions>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-simple</artifactId>
+ <version>1.5.2</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<repositories />
Modified: incubator/stanbol/trunk/kres/eu.iksproject.kres.manager/src/main/java/eu/iksproject/kres/manager/ONManager.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/eu.iksproject.kres.manager/src/main/java/eu/iksproject/kres/manager/ONManager.java?rev=1081894&r1=1081893&r2=1081894&view=diff
==============================================================================
--- incubator/stanbol/trunk/kres/eu.iksproject.kres.manager/src/main/java/eu/iksproject/kres/manager/ONManager.java (original)
+++ incubator/stanbol/trunk/kres/eu.iksproject.kres.manager/src/main/java/eu/iksproject/kres/manager/ONManager.java Tue Mar 15 18:37:12 2011
@@ -11,6 +11,23 @@ import org.apache.felix.scr.annotations.
import org.apache.felix.scr.annotations.Property;
import org.apache.felix.scr.annotations.Reference;
import org.apache.felix.scr.annotations.Service;
+import org.apache.stanbol.ontologymanager.ontonet.api.DuplicateIDException;
+import org.apache.stanbol.ontologymanager.ontonet.api.KReSONManager;
+import org.apache.stanbol.ontologymanager.ontonet.api.io.BlankOntologySource;
+import org.apache.stanbol.ontologymanager.ontonet.api.io.OntologyInputSource;
+import org.apache.stanbol.ontologymanager.ontonet.api.io.RootOntologyIRISource;
+import org.apache.stanbol.ontologymanager.ontonet.api.ontology.CoreOntologySpace;
+import org.apache.stanbol.ontologymanager.ontonet.api.ontology.CustomOntologySpace;
+import org.apache.stanbol.ontologymanager.ontonet.api.ontology.NoSuchScopeException;
+import org.apache.stanbol.ontologymanager.ontonet.api.ontology.OntologyIndex;
+import org.apache.stanbol.ontologymanager.ontonet.api.ontology.OntologyScope;
+import org.apache.stanbol.ontologymanager.ontonet.api.ontology.OntologyScopeFactory;
+import org.apache.stanbol.ontologymanager.ontonet.api.ontology.OntologySpace;
+import org.apache.stanbol.ontologymanager.ontonet.api.ontology.OntologySpaceFactory;
+import org.apache.stanbol.ontologymanager.ontonet.api.ontology.ScopeRegistry;
+import org.apache.stanbol.ontologymanager.ontonet.api.ontology.UnmodifiableOntologySpaceException;
+import org.apache.stanbol.ontologymanager.ontonet.api.session.KReSSessionManager;
+import org.apache.stanbol.ontologymanager.store.api.OntologyStorage;
import org.osgi.service.component.ComponentContext;
import org.semanticweb.owlapi.apibinding.OWLManager;
import org.semanticweb.owlapi.io.FileDocumentSource;
@@ -25,23 +42,6 @@ import org.semanticweb.owlapi.model.OWLO
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import eu.iksproject.kres.api.manager.DuplicateIDException;
-import eu.iksproject.kres.api.manager.KReSONManager;
-import eu.iksproject.kres.api.manager.io.BlankOntologySource;
-import eu.iksproject.kres.api.manager.io.OntologyInputSource;
-import eu.iksproject.kres.api.manager.io.RootOntologyIRISource;
-import eu.iksproject.kres.api.manager.ontology.CoreOntologySpace;
-import eu.iksproject.kres.api.manager.ontology.CustomOntologySpace;
-import eu.iksproject.kres.api.manager.ontology.NoSuchScopeException;
-import eu.iksproject.kres.api.manager.ontology.OntologyIndex;
-import eu.iksproject.kres.api.manager.ontology.OntologyScope;
-import eu.iksproject.kres.api.manager.ontology.OntologyScopeFactory;
-import eu.iksproject.kres.api.manager.ontology.OntologySpace;
-import eu.iksproject.kres.api.manager.ontology.OntologySpaceFactory;
-import eu.iksproject.kres.api.manager.ontology.ScopeRegistry;
-import eu.iksproject.kres.api.manager.ontology.UnmodifiableOntologySpaceException;
-import eu.iksproject.kres.api.manager.session.KReSSessionManager;
-import eu.iksproject.kres.api.storage.OntologyStorage;
import eu.iksproject.kres.manager.ontology.OntologyIndexImpl;
import eu.iksproject.kres.manager.ontology.OntologyScopeFactoryImpl;
import eu.iksproject.kres.manager.ontology.OntologySpaceFactoryImpl;
Modified: incubator/stanbol/trunk/kres/eu.iksproject.kres.manager/src/main/java/eu/iksproject/kres/manager/io/OntologyRegistryIRISource.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/eu.iksproject.kres.manager/src/main/java/eu/iksproject/kres/manager/io/OntologyRegistryIRISource.java?rev=1081894&r1=1081893&r2=1081894&view=diff
==============================================================================
--- incubator/stanbol/trunk/kres/eu.iksproject.kres.manager/src/main/java/eu/iksproject/kres/manager/io/OntologyRegistryIRISource.java (original)
+++ incubator/stanbol/trunk/kres/eu.iksproject.kres.manager/src/main/java/eu/iksproject/kres/manager/io/OntologyRegistryIRISource.java Tue Mar 15 18:37:12 2011
@@ -3,6 +3,11 @@ package eu.iksproject.kres.manager.io;
import java.util.HashSet;
import java.util.Set;
+import org.apache.stanbol.ontologymanager.ontonet.api.io.AbstractOntologyInputSource;
+import org.apache.stanbol.ontologymanager.ontonet.api.io.OntologyInputSource;
+import org.apache.stanbol.ontologymanager.ontonet.api.registry.KReSRegistryLoader;
+import org.apache.stanbol.ontologymanager.ontonet.api.registry.models.Registry;
+import org.apache.stanbol.ontologymanager.ontonet.api.registry.models.RegistryItem;
import org.semanticweb.owlapi.model.IRI;
import org.semanticweb.owlapi.model.OWLOntology;
import org.semanticweb.owlapi.model.OWLOntologyAlreadyExistsException;
@@ -10,12 +15,7 @@ import org.semanticweb.owlapi.model.OWLO
import org.semanticweb.owlapi.model.OWLOntologyManager;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.stlab.xd.registry.models.Registry;
-import org.stlab.xd.registry.models.RegistryItem;
-import eu.iksproject.kres.api.manager.io.AbstractOntologyInputSource;
-import eu.iksproject.kres.api.manager.io.OntologyInputSource;
-import eu.iksproject.kres.api.manager.registry.KReSRegistryLoader;
import eu.iksproject.kres.manager.util.OntologyUtils;
/**
Modified: incubator/stanbol/trunk/kres/eu.iksproject.kres.manager/src/main/java/eu/iksproject/kres/manager/ontology/AbstractOntologySpaceImpl.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/eu.iksproject.kres.manager/src/main/java/eu/iksproject/kres/manager/ontology/AbstractOntologySpaceImpl.java?rev=1081894&r1=1081893&r2=1081894&view=diff
==============================================================================
--- incubator/stanbol/trunk/kres/eu.iksproject.kres.manager/src/main/java/eu/iksproject/kres/manager/ontology/AbstractOntologySpaceImpl.java (original)
+++ incubator/stanbol/trunk/kres/eu.iksproject.kres.manager/src/main/java/eu/iksproject/kres/manager/ontology/AbstractOntologySpaceImpl.java Tue Mar 15 18:37:12 2011
@@ -4,6 +4,17 @@ import java.util.Collection;
import java.util.HashSet;
import java.util.Set;
+import org.apache.stanbol.ontologymanager.ontonet.api.io.OntologyInputSource;
+import org.apache.stanbol.ontologymanager.ontonet.api.io.RootOntologySource;
+import org.apache.stanbol.ontologymanager.ontonet.api.ontology.IrremovableOntologyException;
+import org.apache.stanbol.ontologymanager.ontonet.api.ontology.MissingOntologyException;
+import org.apache.stanbol.ontologymanager.ontonet.api.ontology.OntologySpace;
+import org.apache.stanbol.ontologymanager.ontonet.api.ontology.OntologySpaceListener;
+import org.apache.stanbol.ontologymanager.ontonet.api.ontology.OntologySpaceModificationException;
+import org.apache.stanbol.ontologymanager.ontonet.api.ontology.SessionOntologySpace;
+import org.apache.stanbol.ontologymanager.ontonet.api.ontology.SpaceType;
+import org.apache.stanbol.ontologymanager.ontonet.api.ontology.UnmodifiableOntologySpaceException;
+import org.apache.stanbol.ontologymanager.store.api.OntologyStorage;
import org.semanticweb.owlapi.apibinding.OWLManager;
import org.semanticweb.owlapi.io.RDFXMLOntologyFormat;
import org.semanticweb.owlapi.io.StringDocumentSource;
@@ -21,19 +32,6 @@ import org.semanticweb.owlapi.model.Remo
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import eu.iksproject.kres.api.manager.io.OntologyInputSource;
-import eu.iksproject.kres.api.manager.io.RootOntologySource;
-import eu.iksproject.kres.api.manager.ontology.IrremovableOntologyException;
-import eu.iksproject.kres.api.manager.ontology.MissingOntologyException;
-import eu.iksproject.kres.api.manager.ontology.OntologyScope;
-import eu.iksproject.kres.api.manager.ontology.OntologySpace;
-import eu.iksproject.kres.api.manager.ontology.OntologySpaceListener;
-import eu.iksproject.kres.api.manager.ontology.OntologySpaceModificationException;
-import eu.iksproject.kres.api.manager.ontology.SessionOntologySpace;
-import eu.iksproject.kres.api.manager.ontology.SpaceType;
-import eu.iksproject.kres.api.manager.ontology.UnmodifiableOntologySpaceException;
-import eu.iksproject.kres.api.storage.OntologyStorage;
-import eu.iksproject.kres.manager.ONManager;
import eu.iksproject.kres.manager.util.OntologyUtils;
import eu.iksproject.kres.manager.util.StringUtils;
Modified: incubator/stanbol/trunk/kres/eu.iksproject.kres.manager/src/main/java/eu/iksproject/kres/manager/ontology/CoreOntologySpaceImpl.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/eu.iksproject.kres.manager/src/main/java/eu/iksproject/kres/manager/ontology/CoreOntologySpaceImpl.java?rev=1081894&r1=1081893&r2=1081894&view=diff
==============================================================================
--- incubator/stanbol/trunk/kres/eu.iksproject.kres.manager/src/main/java/eu/iksproject/kres/manager/ontology/CoreOntologySpaceImpl.java (original)
+++ incubator/stanbol/trunk/kres/eu.iksproject.kres.manager/src/main/java/eu/iksproject/kres/manager/ontology/CoreOntologySpaceImpl.java Tue Mar 15 18:37:12 2011
@@ -1,12 +1,11 @@
package eu.iksproject.kres.manager.ontology;
+import org.apache.stanbol.ontologymanager.ontonet.api.ontology.CoreOntologySpace;
+import org.apache.stanbol.ontologymanager.ontonet.api.ontology.SpaceType;
+import org.apache.stanbol.ontologymanager.store.api.OntologyStorage;
import org.semanticweb.owlapi.model.IRI;
import org.semanticweb.owlapi.model.OWLOntologyManager;
-import eu.iksproject.kres.api.manager.io.OntologyInputSource;
-import eu.iksproject.kres.api.manager.ontology.CoreOntologySpace;
-import eu.iksproject.kres.api.manager.ontology.SpaceType;
-import eu.iksproject.kres.api.storage.OntologyStorage;
import eu.iksproject.kres.manager.util.StringUtils;
public class CoreOntologySpaceImpl extends AbstractOntologySpaceImpl implements
Modified: incubator/stanbol/trunk/kres/eu.iksproject.kres.manager/src/main/java/eu/iksproject/kres/manager/ontology/CustomOntologySpaceImpl.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/eu.iksproject.kres.manager/src/main/java/eu/iksproject/kres/manager/ontology/CustomOntologySpaceImpl.java?rev=1081894&r1=1081893&r2=1081894&view=diff
==============================================================================
--- incubator/stanbol/trunk/kres/eu.iksproject.kres.manager/src/main/java/eu/iksproject/kres/manager/ontology/CustomOntologySpaceImpl.java (original)
+++ incubator/stanbol/trunk/kres/eu.iksproject.kres.manager/src/main/java/eu/iksproject/kres/manager/ontology/CustomOntologySpaceImpl.java Tue Mar 15 18:37:12 2011
@@ -1,16 +1,15 @@
package eu.iksproject.kres.manager.ontology;
+import org.apache.stanbol.ontologymanager.ontonet.api.io.RootOntologySource;
+import org.apache.stanbol.ontologymanager.ontonet.api.ontology.CoreOntologySpace;
+import org.apache.stanbol.ontologymanager.ontonet.api.ontology.CustomOntologySpace;
+import org.apache.stanbol.ontologymanager.ontonet.api.ontology.SpaceType;
+import org.apache.stanbol.ontologymanager.ontonet.api.ontology.UnmodifiableOntologySpaceException;
+import org.apache.stanbol.ontologymanager.store.api.OntologyStorage;
import org.semanticweb.owlapi.model.IRI;
import org.semanticweb.owlapi.model.OWLOntology;
import org.semanticweb.owlapi.model.OWLOntologyManager;
-import eu.iksproject.kres.api.manager.io.OntologyInputSource;
-import eu.iksproject.kres.api.manager.io.RootOntologySource;
-import eu.iksproject.kres.api.manager.ontology.CoreOntologySpace;
-import eu.iksproject.kres.api.manager.ontology.CustomOntologySpace;
-import eu.iksproject.kres.api.manager.ontology.SpaceType;
-import eu.iksproject.kres.api.manager.ontology.UnmodifiableOntologySpaceException;
-import eu.iksproject.kres.api.storage.OntologyStorage;
import eu.iksproject.kres.manager.util.StringUtils;
public class CustomOntologySpaceImpl extends AbstractOntologySpaceImpl
Modified: incubator/stanbol/trunk/kres/eu.iksproject.kres.manager/src/main/java/eu/iksproject/kres/manager/ontology/OntologyIndexImpl.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/eu.iksproject.kres.manager/src/main/java/eu/iksproject/kres/manager/ontology/OntologyIndexImpl.java?rev=1081894&r1=1081893&r2=1081894&view=diff
==============================================================================
--- incubator/stanbol/trunk/kres/eu.iksproject.kres.manager/src/main/java/eu/iksproject/kres/manager/ontology/OntologyIndexImpl.java (original)
+++ incubator/stanbol/trunk/kres/eu.iksproject.kres.manager/src/main/java/eu/iksproject/kres/manager/ontology/OntologyIndexImpl.java Tue Mar 15 18:37:12 2011
@@ -5,18 +5,16 @@ import java.util.HashSet;
import java.util.Map;
import java.util.Set;
+import org.apache.stanbol.ontologymanager.ontonet.api.KReSONManager;
+import org.apache.stanbol.ontologymanager.ontonet.api.ontology.NoSuchScopeException;
+import org.apache.stanbol.ontologymanager.ontonet.api.ontology.OntologyIndex;
+import org.apache.stanbol.ontologymanager.ontonet.api.ontology.OntologyScope;
+import org.apache.stanbol.ontologymanager.ontonet.api.ontology.ScopeRegistry;
import org.semanticweb.owlapi.model.IRI;
import org.semanticweb.owlapi.model.OWLOntology;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import eu.iksproject.kres.api.manager.KReSONManager;
-import eu.iksproject.kres.api.manager.ontology.NoSuchScopeException;
-import eu.iksproject.kres.api.manager.ontology.OntologyIndex;
-import eu.iksproject.kres.api.manager.ontology.OntologyScope;
-import eu.iksproject.kres.api.manager.ontology.ScopeRegistry;
-import eu.iksproject.kres.manager.ONManager;
-
public class OntologyIndexImpl implements OntologyIndex {
private final Logger log = LoggerFactory.getLogger(getClass());
Modified: incubator/stanbol/trunk/kres/eu.iksproject.kres.manager/src/main/java/eu/iksproject/kres/manager/ontology/OntologyScopeFactoryImpl.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/eu.iksproject.kres.manager/src/main/java/eu/iksproject/kres/manager/ontology/OntologyScopeFactoryImpl.java?rev=1081894&r1=1081893&r2=1081894&view=diff
==============================================================================
--- incubator/stanbol/trunk/kres/eu.iksproject.kres.manager/src/main/java/eu/iksproject/kres/manager/ontology/OntologyScopeFactoryImpl.java (original)
+++ incubator/stanbol/trunk/kres/eu.iksproject.kres.manager/src/main/java/eu/iksproject/kres/manager/ontology/OntologyScopeFactoryImpl.java Tue Mar 15 18:37:12 2011
@@ -4,17 +4,15 @@ import java.util.Collection;
import java.util.HashSet;
import java.util.Set;
+import org.apache.stanbol.ontologymanager.ontonet.api.DuplicateIDException;
+import org.apache.stanbol.ontologymanager.ontonet.api.io.OntologyInputSource;
+import org.apache.stanbol.ontologymanager.ontonet.api.ontology.OntologyScope;
+import org.apache.stanbol.ontologymanager.ontonet.api.ontology.OntologyScopeFactory;
+import org.apache.stanbol.ontologymanager.ontonet.api.ontology.OntologySpaceFactory;
+import org.apache.stanbol.ontologymanager.ontonet.api.ontology.ScopeEventListener;
+import org.apache.stanbol.ontologymanager.ontonet.api.ontology.ScopeRegistry;
import org.semanticweb.owlapi.model.IRI;
-import eu.iksproject.kres.api.manager.DuplicateIDException;
-import eu.iksproject.kres.api.manager.io.OntologyInputSource;
-import eu.iksproject.kres.api.manager.ontology.OntologyScope;
-import eu.iksproject.kres.api.manager.ontology.OntologyScopeFactory;
-import eu.iksproject.kres.api.manager.ontology.OntologySpaceFactory;
-import eu.iksproject.kres.api.manager.ontology.ScopeEventListener;
-import eu.iksproject.kres.api.manager.ontology.ScopeRegistry;
-import eu.iksproject.kres.manager.ONManager;
-
/**
* Utility class that instantiates default implementations of ontology scope.
*
Modified: incubator/stanbol/trunk/kres/eu.iksproject.kres.manager/src/main/java/eu/iksproject/kres/manager/ontology/OntologyScopeImpl.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/eu.iksproject.kres.manager/src/main/java/eu/iksproject/kres/manager/ontology/OntologyScopeImpl.java?rev=1081894&r1=1081893&r2=1081894&view=diff
==============================================================================
--- incubator/stanbol/trunk/kres/eu.iksproject.kres.manager/src/main/java/eu/iksproject/kres/manager/ontology/OntologyScopeImpl.java (original)
+++ incubator/stanbol/trunk/kres/eu.iksproject.kres.manager/src/main/java/eu/iksproject/kres/manager/ontology/OntologyScopeImpl.java Tue Mar 15 18:37:12 2011
@@ -6,20 +6,19 @@ import java.util.HashSet;
import java.util.Map;
import java.util.Set;
+import org.apache.stanbol.ontologymanager.ontonet.api.io.OntologyInputSource;
+import org.apache.stanbol.ontologymanager.ontonet.api.ontology.CoreOntologySpace;
+import org.apache.stanbol.ontologymanager.ontonet.api.ontology.CustomOntologySpace;
+import org.apache.stanbol.ontologymanager.ontonet.api.ontology.OntologyScope;
+import org.apache.stanbol.ontologymanager.ontonet.api.ontology.OntologySpace;
+import org.apache.stanbol.ontologymanager.ontonet.api.ontology.OntologySpaceFactory;
+import org.apache.stanbol.ontologymanager.ontonet.api.ontology.OntologySpaceListener;
+import org.apache.stanbol.ontologymanager.ontonet.api.ontology.ScopeOntologyListener;
+import org.apache.stanbol.ontologymanager.ontonet.api.ontology.SessionOntologySpace;
+import org.apache.stanbol.ontologymanager.ontonet.api.ontology.UnmodifiableOntologySpaceException;
import org.semanticweb.owlapi.model.IRI;
import org.slf4j.LoggerFactory;
-import eu.iksproject.kres.api.manager.io.OntologyInputSource;
-import eu.iksproject.kres.api.manager.ontology.CoreOntologySpace;
-import eu.iksproject.kres.api.manager.ontology.CustomOntologySpace;
-import eu.iksproject.kres.api.manager.ontology.OntologyScope;
-import eu.iksproject.kres.api.manager.ontology.OntologySpace;
-import eu.iksproject.kres.api.manager.ontology.OntologySpaceFactory;
-import eu.iksproject.kres.api.manager.ontology.OntologySpaceListener;
-import eu.iksproject.kres.api.manager.ontology.ScopeOntologyListener;
-import eu.iksproject.kres.api.manager.ontology.SessionOntologySpace;
-import eu.iksproject.kres.api.manager.ontology.UnmodifiableOntologySpaceException;
-
/**
* The default implementation of an ontology scope.
*
Modified: incubator/stanbol/trunk/kres/eu.iksproject.kres.manager/src/main/java/eu/iksproject/kres/manager/ontology/OntologySpaceFactoryImpl.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/eu.iksproject.kres.manager/src/main/java/eu/iksproject/kres/manager/ontology/OntologySpaceFactoryImpl.java?rev=1081894&r1=1081893&r2=1081894&view=diff
==============================================================================
--- incubator/stanbol/trunk/kres/eu.iksproject.kres.manager/src/main/java/eu/iksproject/kres/manager/ontology/OntologySpaceFactoryImpl.java (original)
+++ incubator/stanbol/trunk/kres/eu.iksproject.kres.manager/src/main/java/eu/iksproject/kres/manager/ontology/OntologySpaceFactoryImpl.java Tue Mar 15 18:37:12 2011
@@ -1,21 +1,20 @@
package eu.iksproject.kres.manager.ontology;
+import org.apache.stanbol.ontologymanager.ontonet.api.io.OntologyInputSource;
+import org.apache.stanbol.ontologymanager.ontonet.api.ontology.CoreOntologySpace;
+import org.apache.stanbol.ontologymanager.ontonet.api.ontology.CustomOntologySpace;
+import org.apache.stanbol.ontologymanager.ontonet.api.ontology.OntologyScope;
+import org.apache.stanbol.ontologymanager.ontonet.api.ontology.OntologySpace;
+import org.apache.stanbol.ontologymanager.ontonet.api.ontology.OntologySpaceFactory;
+import org.apache.stanbol.ontologymanager.ontonet.api.ontology.OntologySpaceListener;
+import org.apache.stanbol.ontologymanager.ontonet.api.ontology.ScopeRegistry;
+import org.apache.stanbol.ontologymanager.ontonet.api.ontology.SessionOntologySpace;
+import org.apache.stanbol.ontologymanager.ontonet.api.ontology.UnmodifiableOntologySpaceException;
+import org.apache.stanbol.ontologymanager.store.api.OntologyStorage;
import org.semanticweb.owlapi.model.IRI;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import eu.iksproject.kres.api.manager.io.OntologyInputSource;
-import eu.iksproject.kres.api.manager.ontology.CoreOntologySpace;
-import eu.iksproject.kres.api.manager.ontology.CustomOntologySpace;
-import eu.iksproject.kres.api.manager.ontology.OntologyScope;
-import eu.iksproject.kres.api.manager.ontology.OntologySpace;
-import eu.iksproject.kres.api.manager.ontology.OntologySpaceFactory;
-import eu.iksproject.kres.api.manager.ontology.OntologySpaceListener;
-import eu.iksproject.kres.api.manager.ontology.ScopeRegistry;
-import eu.iksproject.kres.api.manager.ontology.SessionOntologySpace;
-import eu.iksproject.kres.api.manager.ontology.UnmodifiableOntologySpaceException;
-import eu.iksproject.kres.api.storage.OntologyStorage;
-
/**
* Utility class that generates default implementations of the three types of
* ontology scope.
Modified: incubator/stanbol/trunk/kres/eu.iksproject.kres.manager/src/main/java/eu/iksproject/kres/manager/ontology/ScopeRegistryImpl.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/eu.iksproject.kres.manager/src/main/java/eu/iksproject/kres/manager/ontology/ScopeRegistryImpl.java?rev=1081894&r1=1081893&r2=1081894&view=diff
==============================================================================
--- incubator/stanbol/trunk/kres/eu.iksproject.kres.manager/src/main/java/eu/iksproject/kres/manager/ontology/ScopeRegistryImpl.java (original)
+++ incubator/stanbol/trunk/kres/eu.iksproject.kres.manager/src/main/java/eu/iksproject/kres/manager/ontology/ScopeRegistryImpl.java Tue Mar 15 18:37:12 2011
@@ -5,13 +5,12 @@ import java.util.HashSet;
import java.util.Map;
import java.util.Set;
+import org.apache.stanbol.ontologymanager.ontonet.api.ontology.NoSuchScopeException;
+import org.apache.stanbol.ontologymanager.ontonet.api.ontology.OntologyScope;
+import org.apache.stanbol.ontologymanager.ontonet.api.ontology.ScopeEventListener;
+import org.apache.stanbol.ontologymanager.ontonet.api.ontology.ScopeRegistry;
import org.semanticweb.owlapi.model.IRI;
-import eu.iksproject.kres.api.manager.ontology.NoSuchScopeException;
-import eu.iksproject.kres.api.manager.ontology.OntologyScope;
-import eu.iksproject.kres.api.manager.ontology.ScopeEventListener;
-import eu.iksproject.kres.api.manager.ontology.ScopeRegistry;
-
/**
* Default implementation of an ontology scope registry.
*
Modified: incubator/stanbol/trunk/kres/eu.iksproject.kres.manager/src/main/java/eu/iksproject/kres/manager/ontology/SessionOntologySpaceImpl.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/eu.iksproject.kres.manager/src/main/java/eu/iksproject/kres/manager/ontology/SessionOntologySpaceImpl.java?rev=1081894&r1=1081893&r2=1081894&view=diff
==============================================================================
--- incubator/stanbol/trunk/kres/eu.iksproject.kres.manager/src/main/java/eu/iksproject/kres/manager/ontology/SessionOntologySpaceImpl.java (original)
+++ incubator/stanbol/trunk/kres/eu.iksproject.kres.manager/src/main/java/eu/iksproject/kres/manager/ontology/SessionOntologySpaceImpl.java Tue Mar 15 18:37:12 2011
@@ -2,17 +2,17 @@ package eu.iksproject.kres.manager.ontol
import java.util.Random;
+import org.apache.stanbol.ontologymanager.ontonet.api.io.RootOntologySource;
+import org.apache.stanbol.ontologymanager.ontonet.api.ontology.SessionOntologySpace;
+import org.apache.stanbol.ontologymanager.ontonet.api.ontology.SpaceType;
+import org.apache.stanbol.ontologymanager.ontonet.api.ontology.UnmodifiableOntologySpaceException;
+import org.apache.stanbol.ontologymanager.store.api.OntologyStorage;
import org.semanticweb.owlapi.model.IRI;
import org.semanticweb.owlapi.model.OWLOntologyCreationException;
import org.semanticweb.owlapi.model.OWLOntologyManager;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import eu.iksproject.kres.api.manager.io.RootOntologySource;
-import eu.iksproject.kres.api.manager.ontology.SessionOntologySpace;
-import eu.iksproject.kres.api.manager.ontology.SpaceType;
-import eu.iksproject.kres.api.manager.ontology.UnmodifiableOntologySpaceException;
-import eu.iksproject.kres.api.storage.OntologyStorage;
import eu.iksproject.kres.manager.util.StringUtils;
public class SessionOntologySpaceImpl extends AbstractOntologySpaceImpl
Modified: incubator/stanbol/trunk/kres/eu.iksproject.kres.manager/src/main/java/eu/iksproject/kres/manager/registry/model/impl/RegistryLoader.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/eu.iksproject.kres.manager/src/main/java/eu/iksproject/kres/manager/registry/model/impl/RegistryLoader.java?rev=1081894&r1=1081893&r2=1081894&view=diff
==============================================================================
--- incubator/stanbol/trunk/kres/eu.iksproject.kres.manager/src/main/java/eu/iksproject/kres/manager/registry/model/impl/RegistryLoader.java (original)
+++ incubator/stanbol/trunk/kres/eu.iksproject.kres.manager/src/main/java/eu/iksproject/kres/manager/registry/model/impl/RegistryLoader.java Tue Mar 15 18:37:12 2011
@@ -14,6 +14,15 @@ import java.util.List;
import java.util.Map;
import java.util.Set;
+import org.apache.stanbol.ontologymanager.ontonet.api.KReSONManager;
+import org.apache.stanbol.ontologymanager.ontonet.api.registry.KReSRegistryLoader;
+import org.apache.stanbol.ontologymanager.ontonet.api.registry.io.XDRegistrySource;
+import org.apache.stanbol.ontologymanager.ontonet.api.registry.models.AbstractRegistryItem;
+import org.apache.stanbol.ontologymanager.ontonet.api.registry.models.Registry;
+import org.apache.stanbol.ontologymanager.ontonet.api.registry.models.RegistryContentException;
+import org.apache.stanbol.ontologymanager.ontonet.api.registry.models.RegistryItem;
+import org.apache.stanbol.ontologymanager.ontonet.api.registry.models.RegistryLibrary;
+import org.apache.stanbol.ontologymanager.ontonet.api.registry.models.RegistryOntology;
import org.semanticweb.owlapi.apibinding.OWLManager;
import org.semanticweb.owlapi.io.OWLOntologyCreationIOException;
import org.semanticweb.owlapi.model.IRI;
@@ -27,7 +36,6 @@ import org.semanticweb.owlapi.model.OWLO
import org.semanticweb.owlapi.model.OWLOntologyAlreadyExistsException;
import org.semanticweb.owlapi.model.OWLOntologyChangeException;
import org.semanticweb.owlapi.model.OWLOntologyCreationException;
-import org.semanticweb.owlapi.model.OWLOntologyLoaderListener;
import org.semanticweb.owlapi.model.OWLOntologyManager;
import org.semanticweb.owlapi.model.OWLOntologySetProvider;
import org.semanticweb.owlapi.util.OWLAxiomFilter;
@@ -35,23 +43,12 @@ import org.semanticweb.owlapi.util.OWLOn
import org.semanticweb.owlapi.vocab.OWLRDFVocabulary;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.stlab.xd.registry.io.XDRegistrySource;
-import org.stlab.xd.registry.models.AbstractRegistryItem;
-import org.stlab.xd.registry.models.Registry;
-import org.stlab.xd.registry.models.RegistryContentException;
-import org.stlab.xd.registry.models.RegistryItem;
-import org.stlab.xd.registry.models.RegistryLibrary;
-import org.stlab.xd.registry.models.RegistryOntology;
import org.stlab.xd.utils.RDFSLabelGetter;
import org.stlab.xd.vocabulary.CODOVocabulary;
-import eu.iksproject.kres.api.manager.KReSONManager;
-import eu.iksproject.kres.api.manager.registry.KReSRegistryLoader;
-import eu.iksproject.kres.manager.ONManager;
import eu.iksproject.kres.manager.registry.cache.ODPRegistryCacheException;
import eu.iksproject.kres.manager.registry.cache.ODPRegistryCacheManager;
import eu.iksproject.kres.manager.registry.cache.URIUnresolvableException;
-import eu.iksproject.kres.manager.util.OntologyLoaderPrinter;
public class RegistryLoader implements KReSRegistryLoader {
Modified: incubator/stanbol/trunk/kres/eu.iksproject.kres.manager/src/main/java/eu/iksproject/kres/manager/renderers/ScopeSetRenderer.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/eu.iksproject.kres.manager/src/main/java/eu/iksproject/kres/manager/renderers/ScopeSetRenderer.java?rev=1081894&r1=1081893&r2=1081894&view=diff
==============================================================================
--- incubator/stanbol/trunk/kres/eu.iksproject.kres.manager/src/main/java/eu/iksproject/kres/manager/renderers/ScopeSetRenderer.java (original)
+++ incubator/stanbol/trunk/kres/eu.iksproject.kres.manager/src/main/java/eu/iksproject/kres/manager/renderers/ScopeSetRenderer.java Tue Mar 15 18:37:12 2011
@@ -4,6 +4,7 @@ import java.util.LinkedList;
import java.util.List;
import java.util.Set;
+import org.apache.stanbol.ontologymanager.ontonet.api.ontology.OntologyScope;
import org.semanticweb.owlapi.apibinding.OWLManager;
import org.semanticweb.owlapi.model.AddAxiom;
import org.semanticweb.owlapi.model.AddImport;
@@ -19,8 +20,6 @@ import org.semanticweb.owlapi.model.OWLO
import org.slf4j.LoggerFactory;
import org.stlab.xd.vocabulary.Vocabulary;
-import eu.iksproject.kres.api.manager.ontology.OntologyScope;
-
/**
* Just an attempt. If we like it, make an API out of it.
*
Modified: incubator/stanbol/trunk/kres/eu.iksproject.kres.manager/src/main/java/eu/iksproject/kres/manager/renderers/SessionRenderer.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/eu.iksproject.kres.manager/src/main/java/eu/iksproject/kres/manager/renderers/SessionRenderer.java?rev=1081894&r1=1081893&r2=1081894&view=diff
==============================================================================
--- incubator/stanbol/trunk/kres/eu.iksproject.kres.manager/src/main/java/eu/iksproject/kres/manager/renderers/SessionRenderer.java (original)
+++ incubator/stanbol/trunk/kres/eu.iksproject.kres.manager/src/main/java/eu/iksproject/kres/manager/renderers/SessionRenderer.java Tue Mar 15 18:37:12 2011
@@ -3,6 +3,7 @@ package eu.iksproject.kres.manager.rende
import java.util.LinkedList;
import java.util.List;
+import org.apache.stanbol.ontologymanager.ontonet.api.session.KReSSession;
import org.semanticweb.owlapi.apibinding.OWLManager;
import org.semanticweb.owlapi.io.RDFXMLOntologyFormat;
import org.semanticweb.owlapi.io.StringDocumentTarget;
@@ -21,8 +22,6 @@ import org.semanticweb.owlapi.model.OWLO
import org.semanticweb.owlapi.model.OWLTypedLiteral;
import org.slf4j.LoggerFactory;
-import eu.iksproject.kres.api.manager.session.KReSSession;
-
public class SessionRenderer {
private static OWLDataFactory __factory = OWLManager.getOWLDataFactory();
Modified: incubator/stanbol/trunk/kres/eu.iksproject.kres.manager/src/main/java/eu/iksproject/kres/manager/session/KReSSessionImpl.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/eu.iksproject.kres.manager/src/main/java/eu/iksproject/kres/manager/session/KReSSessionImpl.java?rev=1081894&r1=1081893&r2=1081894&view=diff
==============================================================================
--- incubator/stanbol/trunk/kres/eu.iksproject.kres.manager/src/main/java/eu/iksproject/kres/manager/session/KReSSessionImpl.java (original)
+++ incubator/stanbol/trunk/kres/eu.iksproject.kres.manager/src/main/java/eu/iksproject/kres/manager/session/KReSSessionImpl.java Tue Mar 15 18:37:12 2011
@@ -4,15 +4,15 @@ import java.util.Collection;
import java.util.HashSet;
import java.util.Set;
+import org.apache.stanbol.ontologymanager.ontonet.api.session.KReSSession;
+import org.apache.stanbol.ontologymanager.ontonet.api.session.NonReferenceableSessionException;
+import org.apache.stanbol.ontologymanager.ontonet.api.session.SessionEvent;
+import org.apache.stanbol.ontologymanager.ontonet.api.session.SessionListener;
+import org.apache.stanbol.ontologymanager.ontonet.api.session.KReSSession.State;
+import org.apache.stanbol.ontologymanager.ontonet.api.session.SessionEvent.OperationType;
import org.semanticweb.owlapi.model.IRI;
import org.slf4j.LoggerFactory;
-import eu.iksproject.kres.api.manager.session.KReSSession;
-import eu.iksproject.kres.api.manager.session.NonReferenceableSessionException;
-import eu.iksproject.kres.api.manager.session.SessionEvent;
-import eu.iksproject.kres.api.manager.session.SessionListener;
-import eu.iksproject.kres.api.manager.session.SessionEvent.OperationType;
-
/**
* Standard implementation of the {@link KReSSession} interface. A
* KReSSessionImpl is initially inactive and creates its own identifier.
Modified: incubator/stanbol/trunk/kres/eu.iksproject.kres.manager/src/main/java/eu/iksproject/kres/manager/session/KReSSessionManagerImpl.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/eu.iksproject.kres.manager/src/main/java/eu/iksproject/kres/manager/session/KReSSessionManagerImpl.java?rev=1081894&r1=1081893&r2=1081894&view=diff
==============================================================================
--- incubator/stanbol/trunk/kres/eu.iksproject.kres.manager/src/main/java/eu/iksproject/kres/manager/session/KReSSessionManagerImpl.java (original)
+++ incubator/stanbol/trunk/kres/eu.iksproject.kres.manager/src/main/java/eu/iksproject/kres/manager/session/KReSSessionManagerImpl.java Tue Mar 15 18:37:12 2011
@@ -7,26 +7,24 @@ import java.util.HashSet;
import java.util.Map;
import java.util.Set;
+import org.apache.stanbol.ontologymanager.ontonet.api.ontology.OntologyScope;
+import org.apache.stanbol.ontologymanager.ontonet.api.ontology.ScopeRegistry;
+import org.apache.stanbol.ontologymanager.ontonet.api.ontology.SessionOntologySpace;
+import org.apache.stanbol.ontologymanager.ontonet.api.session.DuplicateSessionIDException;
+import org.apache.stanbol.ontologymanager.ontonet.api.session.KReSSession;
+import org.apache.stanbol.ontologymanager.ontonet.api.session.KReSSessionIDGenerator;
+import org.apache.stanbol.ontologymanager.ontonet.api.session.KReSSessionManager;
+import org.apache.stanbol.ontologymanager.ontonet.api.session.NonReferenceableSessionException;
+import org.apache.stanbol.ontologymanager.ontonet.api.session.SessionEvent;
+import org.apache.stanbol.ontologymanager.ontonet.api.session.SessionListener;
+import org.apache.stanbol.ontologymanager.ontonet.api.session.KReSSession.State;
+import org.apache.stanbol.ontologymanager.ontonet.api.session.SessionEvent.OperationType;
+import org.apache.stanbol.ontologymanager.store.api.OntologyStorage;
import org.semanticweb.owlapi.model.IRI;
import org.semanticweb.owlapi.model.OWLOntology;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import eu.iksproject.kres.api.manager.ontology.OntologyScope;
-import eu.iksproject.kres.api.manager.ontology.ScopeRegistry;
-import eu.iksproject.kres.api.manager.ontology.SessionOntologySpace;
-import eu.iksproject.kres.api.manager.session.DuplicateSessionIDException;
-import eu.iksproject.kres.api.manager.session.KReSSession;
-import eu.iksproject.kres.api.manager.session.KReSSessionIDGenerator;
-import eu.iksproject.kres.api.manager.session.KReSSessionManager;
-import eu.iksproject.kres.api.manager.session.NonReferenceableSessionException;
-import eu.iksproject.kres.api.manager.session.SessionEvent;
-import eu.iksproject.kres.api.manager.session.SessionListener;
-import eu.iksproject.kres.api.manager.session.KReSSession.State;
-import eu.iksproject.kres.api.manager.session.SessionEvent.OperationType;
-import eu.iksproject.kres.api.storage.OntologyStorage;
-import eu.iksproject.kres.manager.ONManager;
-
/**
*
* Calls to <code>getSessionListeners()</code> return a {@link Set} of
Modified: incubator/stanbol/trunk/kres/eu.iksproject.kres.manager/src/main/java/eu/iksproject/kres/manager/session/ScopeSessionSynchronizer.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/eu.iksproject.kres.manager/src/main/java/eu/iksproject/kres/manager/session/ScopeSessionSynchronizer.java?rev=1081894&r1=1081893&r2=1081894&view=diff
==============================================================================
--- incubator/stanbol/trunk/kres/eu.iksproject.kres.manager/src/main/java/eu/iksproject/kres/manager/session/ScopeSessionSynchronizer.java (original)
+++ incubator/stanbol/trunk/kres/eu.iksproject.kres.manager/src/main/java/eu/iksproject/kres/manager/session/ScopeSessionSynchronizer.java Tue Mar 15 18:37:12 2011
@@ -1,15 +1,13 @@
package eu.iksproject.kres.manager.session;
+import org.apache.stanbol.ontologymanager.ontonet.api.KReSONManager;
+import org.apache.stanbol.ontologymanager.ontonet.api.ontology.OntologyScope;
+import org.apache.stanbol.ontologymanager.ontonet.api.ontology.OntologySpaceFactory;
+import org.apache.stanbol.ontologymanager.ontonet.api.session.KReSSession;
+import org.apache.stanbol.ontologymanager.ontonet.api.session.SessionEvent;
+import org.apache.stanbol.ontologymanager.ontonet.api.session.SessionListener;
import org.semanticweb.owlapi.model.IRI;
-import eu.iksproject.kres.api.manager.KReSONManager;
-import eu.iksproject.kres.api.manager.ontology.OntologyScope;
-import eu.iksproject.kres.api.manager.ontology.OntologySpaceFactory;
-import eu.iksproject.kres.api.manager.session.KReSSession;
-import eu.iksproject.kres.api.manager.session.SessionEvent;
-import eu.iksproject.kres.api.manager.session.SessionListener;
-import eu.iksproject.kres.manager.ONManager;
-
public class ScopeSessionSynchronizer implements SessionListener {
private KReSONManager manager;
Modified: incubator/stanbol/trunk/kres/eu.iksproject.kres.manager/src/main/java/eu/iksproject/kres/manager/session/TimestampedSessionIDGenerator.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/eu.iksproject.kres.manager/src/main/java/eu/iksproject/kres/manager/session/TimestampedSessionIDGenerator.java?rev=1081894&r1=1081893&r2=1081894&view=diff
==============================================================================
--- incubator/stanbol/trunk/kres/eu.iksproject.kres.manager/src/main/java/eu/iksproject/kres/manager/session/TimestampedSessionIDGenerator.java (original)
+++ incubator/stanbol/trunk/kres/eu.iksproject.kres.manager/src/main/java/eu/iksproject/kres/manager/session/TimestampedSessionIDGenerator.java Tue Mar 15 18:37:12 2011
@@ -3,9 +3,9 @@ package eu.iksproject.kres.manager.sessi
import java.util.Date;
import java.util.Set;
+import org.apache.stanbol.ontologymanager.ontonet.api.session.KReSSessionIDGenerator;
import org.semanticweb.owlapi.model.IRI;
-import eu.iksproject.kres.api.manager.session.KReSSessionIDGenerator;
import eu.iksproject.kres.manager.util.StringUtils;
public class TimestampedSessionIDGenerator implements KReSSessionIDGenerator {
Modified: incubator/stanbol/trunk/kres/eu.iksproject.kres.manager/src/main/java/eu/iksproject/kres/manager/util/OntologyUtils.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/eu.iksproject.kres.manager/src/main/java/eu/iksproject/kres/manager/util/OntologyUtils.java?rev=1081894&r1=1081893&r2=1081894&view=diff
==============================================================================
--- incubator/stanbol/trunk/kres/eu.iksproject.kres.manager/src/main/java/eu/iksproject/kres/manager/util/OntologyUtils.java (original)
+++ incubator/stanbol/trunk/kres/eu.iksproject.kres.manager/src/main/java/eu/iksproject/kres/manager/util/OntologyUtils.java Tue Mar 15 18:37:12 2011
@@ -5,6 +5,8 @@ import java.util.LinkedList;
import java.util.List;
import java.util.Set;
+import org.apache.stanbol.ontologymanager.ontonet.api.io.OntologyInputSource;
+import org.apache.stanbol.ontologymanager.ontonet.api.io.RootOntologySource;
import org.semanticweb.owlapi.apibinding.OWLManager;
import org.semanticweb.owlapi.io.RDFXMLOntologyFormat;
import org.semanticweb.owlapi.io.StringDocumentTarget;
@@ -23,9 +25,6 @@ import org.semanticweb.owlapi.model.Unkn
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import eu.iksproject.kres.api.manager.io.OntologyInputSource;
-import eu.iksproject.kres.api.manager.io.RootOntologySource;
-
/**
* A set of static utility methods for managing ontologies in KReS.
*
Modified: incubator/stanbol/trunk/kres/eu.iksproject.kres.manager/src/test/java/eu/iksproject/kres/manager/Namespace.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/eu.iksproject.kres.manager/src/test/java/eu/iksproject/kres/manager/Namespace.java?rev=1081894&r1=1081893&r2=1081894&view=diff
==============================================================================
--- incubator/stanbol/trunk/kres/eu.iksproject.kres.manager/src/test/java/eu/iksproject/kres/manager/Namespace.java (original)
+++ incubator/stanbol/trunk/kres/eu.iksproject.kres.manager/src/test/java/eu/iksproject/kres/manager/Namespace.java Tue Mar 15 18:37:12 2011
@@ -1,14 +1,13 @@
package eu.iksproject.kres.manager;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertNotNull;
import java.util.Hashtable;
+import org.apache.stanbol.ontologymanager.ontonet.api.KReSONManager;
import org.junit.BeforeClass;
import org.junit.Test;
-import eu.iksproject.kres.api.manager.KReSONManager;
-
public class Namespace {
private static KReSONManager onm;
Modified: incubator/stanbol/trunk/kres/eu.iksproject.kres.manager/src/test/java/eu/iksproject/kres/manager/ontology/TestIndexing.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/eu.iksproject.kres.manager/src/test/java/eu/iksproject/kres/manager/ontology/TestIndexing.java?rev=1081894&r1=1081893&r2=1081894&view=diff
==============================================================================
--- incubator/stanbol/trunk/kres/eu.iksproject.kres.manager/src/test/java/eu/iksproject/kres/manager/ontology/TestIndexing.java (original)
+++ incubator/stanbol/trunk/kres/eu.iksproject.kres.manager/src/test/java/eu/iksproject/kres/manager/ontology/TestIndexing.java Tue Mar 15 18:37:12 2011
@@ -1,9 +1,20 @@
package eu.iksproject.kres.manager.ontology;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
import java.util.Hashtable;
+import org.apache.stanbol.ontologymanager.ontonet.api.DuplicateIDException;
+import org.apache.stanbol.ontologymanager.ontonet.api.KReSONManager;
+import org.apache.stanbol.ontologymanager.ontonet.api.io.RootOntologyIRISource;
+import org.apache.stanbol.ontologymanager.ontonet.api.ontology.OntologyIndex;
+import org.apache.stanbol.ontologymanager.ontonet.api.ontology.OntologyScope;
+import org.apache.stanbol.ontologymanager.ontonet.api.ontology.OntologySpaceModificationException;
+import org.apache.stanbol.ontologymanager.ontonet.api.ontology.UnmodifiableOntologySpaceException;
import org.junit.BeforeClass;
import org.junit.Test;
import org.semanticweb.owlapi.apibinding.OWLManager;
@@ -12,17 +23,8 @@ import org.semanticweb.owlapi.model.OWLO
import org.semanticweb.owlapi.model.OWLOntologyCreationException;
import org.semanticweb.owlapi.model.OWLOntologyManager;
-import eu.iksproject.kres.api.manager.DuplicateIDException;
-import eu.iksproject.kres.api.manager.KReSONManager;
-import eu.iksproject.kres.api.manager.io.RootOntologyIRISource;
-import eu.iksproject.kres.api.manager.io.RootOntologySource;
-import eu.iksproject.kres.api.manager.ontology.OntologyIndex;
-import eu.iksproject.kres.api.manager.ontology.OntologyScope;
-import eu.iksproject.kres.api.manager.ontology.OntologySpaceModificationException;
-import eu.iksproject.kres.api.manager.ontology.UnmodifiableOntologySpaceException;
import eu.iksproject.kres.manager.ONManager;
import eu.iksproject.kres.manager.io.OntologyRegistryIRISource;
-import eu.iksproject.kres.manager.util.OntologyUtils;
public class TestIndexing {
Modified: incubator/stanbol/trunk/kres/eu.iksproject.kres.manager/src/test/java/eu/iksproject/kres/manager/ontology/TestOntologyScope.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/eu.iksproject.kres.manager/src/test/java/eu/iksproject/kres/manager/ontology/TestOntologyScope.java?rev=1081894&r1=1081893&r2=1081894&view=diff
==============================================================================
--- incubator/stanbol/trunk/kres/eu.iksproject.kres.manager/src/test/java/eu/iksproject/kres/manager/ontology/TestOntologyScope.java (original)
+++ incubator/stanbol/trunk/kres/eu.iksproject.kres.manager/src/test/java/eu/iksproject/kres/manager/ontology/TestOntologyScope.java Tue Mar 15 18:37:12 2011
@@ -7,6 +7,13 @@ import static org.junit.Assert.fail;
import java.util.Hashtable;
+import org.apache.stanbol.ontologymanager.ontonet.api.DuplicateIDException;
+import org.apache.stanbol.ontologymanager.ontonet.api.KReSONManager;
+import org.apache.stanbol.ontologymanager.ontonet.api.io.OntologyInputSource;
+import org.apache.stanbol.ontologymanager.ontonet.api.io.RootOntologySource;
+import org.apache.stanbol.ontologymanager.ontonet.api.ontology.OntologyScope;
+import org.apache.stanbol.ontologymanager.ontonet.api.ontology.OntologyScopeFactory;
+import org.apache.stanbol.ontologymanager.ontonet.api.ontology.ScopeRegistry;
import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.Test;
@@ -15,13 +22,6 @@ import org.semanticweb.owlapi.model.IRI;
import org.semanticweb.owlapi.model.OWLOntologyCreationException;
import org.semanticweb.owlapi.model.OWLOntologyManager;
-import eu.iksproject.kres.api.manager.DuplicateIDException;
-import eu.iksproject.kres.api.manager.KReSONManager;
-import eu.iksproject.kres.api.manager.io.OntologyInputSource;
-import eu.iksproject.kres.api.manager.io.RootOntologySource;
-import eu.iksproject.kres.api.manager.ontology.OntologyScope;
-import eu.iksproject.kres.api.manager.ontology.OntologyScopeFactory;
-import eu.iksproject.kres.api.manager.ontology.ScopeRegistry;
import eu.iksproject.kres.manager.Constants;
import eu.iksproject.kres.manager.ONManager;
Modified: incubator/stanbol/trunk/kres/eu.iksproject.kres.manager/src/test/java/eu/iksproject/kres/manager/ontology/TestOntologySpaces.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/eu.iksproject.kres.manager/src/test/java/eu/iksproject/kres/manager/ontology/TestOntologySpaces.java?rev=1081894&r1=1081893&r2=1081894&view=diff
==============================================================================
--- incubator/stanbol/trunk/kres/eu.iksproject.kres.manager/src/test/java/eu/iksproject/kres/manager/ontology/TestOntologySpaces.java (original)
+++ incubator/stanbol/trunk/kres/eu.iksproject.kres.manager/src/test/java/eu/iksproject/kres/manager/ontology/TestOntologySpaces.java Tue Mar 15 18:37:12 2011
@@ -1,9 +1,22 @@
package eu.iksproject.kres.manager.ontology;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertSame;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
import java.util.Hashtable;
+import org.apache.stanbol.ontologymanager.ontonet.api.KReSONManager;
+import org.apache.stanbol.ontologymanager.ontonet.api.io.OntologyInputSource;
+import org.apache.stanbol.ontologymanager.ontonet.api.io.RootOntologyIRISource;
+import org.apache.stanbol.ontologymanager.ontonet.api.io.RootOntologySource;
+import org.apache.stanbol.ontologymanager.ontonet.api.ontology.CoreOntologySpace;
+import org.apache.stanbol.ontologymanager.ontonet.api.ontology.CustomOntologySpace;
+import org.apache.stanbol.ontologymanager.ontonet.api.ontology.OntologySpaceFactory;
+import org.apache.stanbol.ontologymanager.ontonet.api.ontology.OntologySpaceModificationException;
+import org.apache.stanbol.ontologymanager.ontonet.api.ontology.SessionOntologySpace;
+import org.apache.stanbol.ontologymanager.ontonet.api.ontology.UnmodifiableOntologySpaceException;
import org.junit.BeforeClass;
import org.junit.Test;
import org.semanticweb.owlapi.apibinding.OWLManager;
@@ -17,19 +30,8 @@ import org.semanticweb.owlapi.model.OWLO
import org.semanticweb.owlapi.model.OWLOntologyCreationException;
import org.semanticweb.owlapi.model.OWLOntologyManager;
-import eu.iksproject.kres.api.manager.KReSONManager;
-import eu.iksproject.kres.api.manager.io.OntologyInputSource;
-import eu.iksproject.kres.api.manager.io.RootOntologyIRISource;
-import eu.iksproject.kres.api.manager.io.RootOntologySource;
-import eu.iksproject.kres.api.manager.ontology.CoreOntologySpace;
-import eu.iksproject.kres.api.manager.ontology.CustomOntologySpace;
-import eu.iksproject.kres.api.manager.ontology.OntologySpaceFactory;
-import eu.iksproject.kres.api.manager.ontology.OntologySpaceModificationException;
-import eu.iksproject.kres.api.manager.ontology.SessionOntologySpace;
-import eu.iksproject.kres.api.manager.ontology.UnmodifiableOntologySpaceException;
import eu.iksproject.kres.manager.Constants;
import eu.iksproject.kres.manager.ONManager;
-import eu.iksproject.kres.manager.util.OntologyUtils;
public class TestOntologySpaces {
Modified: incubator/stanbol/trunk/kres/eu.iksproject.kres.manager/src/test/java/eu/iksproject/kres/manager/registry/TestRegistry.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/eu.iksproject.kres.manager/src/test/java/eu/iksproject/kres/manager/registry/TestRegistry.java?rev=1081894&r1=1081893&r2=1081894&view=diff
==============================================================================
--- incubator/stanbol/trunk/kres/eu.iksproject.kres.manager/src/test/java/eu/iksproject/kres/manager/registry/TestRegistry.java (original)
+++ incubator/stanbol/trunk/kres/eu.iksproject.kres.manager/src/test/java/eu/iksproject/kres/manager/registry/TestRegistry.java Tue Mar 15 18:37:12 2011
@@ -1,19 +1,20 @@
package eu.iksproject.kres.manager.registry;
-import static org.junit.Assert.*;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
import java.util.Hashtable;
+import org.apache.stanbol.ontologymanager.ontonet.api.DuplicateIDException;
+import org.apache.stanbol.ontologymanager.ontonet.api.KReSONManager;
+import org.apache.stanbol.ontologymanager.ontonet.api.ontology.CoreOntologySpace;
+import org.apache.stanbol.ontologymanager.ontonet.api.ontology.OntologyScope;
+import org.apache.stanbol.ontologymanager.ontonet.api.ontology.SessionOntologySpace;
+import org.apache.stanbol.ontologymanager.ontonet.api.ontology.UnmodifiableOntologySpaceException;
import org.junit.BeforeClass;
import org.junit.Test;
import org.semanticweb.owlapi.model.IRI;
-import eu.iksproject.kres.api.manager.DuplicateIDException;
-import eu.iksproject.kres.api.manager.KReSONManager;
-import eu.iksproject.kres.api.manager.ontology.CoreOntologySpace;
-import eu.iksproject.kres.api.manager.ontology.OntologyScope;
-import eu.iksproject.kres.api.manager.ontology.SessionOntologySpace;
-import eu.iksproject.kres.api.manager.ontology.UnmodifiableOntologySpaceException;
import eu.iksproject.kres.manager.ONManager;
import eu.iksproject.kres.manager.io.OntologyRegistryIRISource;
Modified: incubator/stanbol/trunk/kres/eu.iksproject.kres.manager/src/test/java/eu/iksproject/kres/manager/session/TestSessions.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/eu.iksproject.kres.manager/src/test/java/eu/iksproject/kres/manager/session/TestSessions.java?rev=1081894&r1=1081893&r2=1081894&view=diff
==============================================================================
--- incubator/stanbol/trunk/kres/eu.iksproject.kres.manager/src/test/java/eu/iksproject/kres/manager/session/TestSessions.java (original)
+++ incubator/stanbol/trunk/kres/eu.iksproject.kres.manager/src/test/java/eu/iksproject/kres/manager/session/TestSessions.java Tue Mar 15 18:37:12 2011
@@ -1,11 +1,28 @@
package eu.iksproject.kres.manager.session;
-import static junit.framework.Assert.*;
+import static junit.framework.Assert.assertEquals;
+import static junit.framework.Assert.assertFalse;
+import static junit.framework.Assert.assertNotNull;
+import static junit.framework.Assert.assertNull;
+import static junit.framework.Assert.assertTrue;
+import static junit.framework.Assert.fail;
import java.util.HashSet;
import java.util.Hashtable;
import java.util.Set;
+import org.apache.stanbol.ontologymanager.ontonet.api.DuplicateIDException;
+import org.apache.stanbol.ontologymanager.ontonet.api.KReSONManager;
+import org.apache.stanbol.ontologymanager.ontonet.api.io.OntologyInputSource;
+import org.apache.stanbol.ontologymanager.ontonet.api.io.RootOntologySource;
+import org.apache.stanbol.ontologymanager.ontonet.api.ontology.OntologyScope;
+import org.apache.stanbol.ontologymanager.ontonet.api.ontology.OntologyScopeFactory;
+import org.apache.stanbol.ontologymanager.ontonet.api.ontology.OntologySpaceFactory;
+import org.apache.stanbol.ontologymanager.ontonet.api.ontology.ScopeRegistry;
+import org.apache.stanbol.ontologymanager.ontonet.api.session.KReSSession;
+import org.apache.stanbol.ontologymanager.ontonet.api.session.KReSSessionManager;
+import org.apache.stanbol.ontologymanager.ontonet.api.session.NonReferenceableSessionException;
+import org.apache.stanbol.ontologymanager.ontonet.api.session.KReSSession.State;
import org.junit.BeforeClass;
import org.junit.Test;
import org.semanticweb.owlapi.apibinding.OWLManager;
@@ -13,18 +30,6 @@ import org.semanticweb.owlapi.model.IRI;
import org.semanticweb.owlapi.model.OWLOntologyCreationException;
import org.semanticweb.owlapi.model.OWLOntologyManager;
-import eu.iksproject.kres.api.manager.DuplicateIDException;
-import eu.iksproject.kres.api.manager.KReSONManager;
-import eu.iksproject.kres.api.manager.io.OntologyInputSource;
-import eu.iksproject.kres.api.manager.io.RootOntologySource;
-import eu.iksproject.kres.api.manager.ontology.OntologyScope;
-import eu.iksproject.kres.api.manager.ontology.OntologyScopeFactory;
-import eu.iksproject.kres.api.manager.ontology.OntologySpaceFactory;
-import eu.iksproject.kres.api.manager.ontology.ScopeRegistry;
-import eu.iksproject.kres.api.manager.session.KReSSession;
-import eu.iksproject.kres.api.manager.session.KReSSessionManager;
-import eu.iksproject.kres.api.manager.session.NonReferenceableSessionException;
-import eu.iksproject.kres.api.manager.session.KReSSession.State;
import eu.iksproject.kres.manager.Constants;
import eu.iksproject.kres.manager.ONManager;
Modified: incubator/stanbol/trunk/kres/eu.iksproject.kres.parent/pom.xml
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/eu.iksproject.kres.parent/pom.xml?rev=1081894&r1=1081893&r2=1081894&view=diff
==============================================================================
--- incubator/stanbol/trunk/kres/eu.iksproject.kres.parent/pom.xml (original)
+++ incubator/stanbol/trunk/kres/eu.iksproject.kres.parent/pom.xml Tue Mar 15 18:37:12 2011
@@ -17,7 +17,10 @@
</description>
<properties>
+ <jersey-version>1.1.5.1</jersey-version>
+ <kres-version>0.7</kres-version>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+ <stanbol-version>0.9-SNAPSHOT</stanbol-version>
</properties>
<inceptionYear>2010</inceptionYear>
Modified: incubator/stanbol/trunk/kres/eu.iksproject.kres.reasoners/pom.xml
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/eu.iksproject.kres.reasoners/pom.xml?rev=1081894&r1=1081893&r2=1081894&view=diff
==============================================================================
--- incubator/stanbol/trunk/kres/eu.iksproject.kres.reasoners/pom.xml (original)
+++ incubator/stanbol/trunk/kres/eu.iksproject.kres.reasoners/pom.xml Tue Mar 15 18:37:12 2011
@@ -45,9 +45,9 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>eu.iksproject</groupId>
- <artifactId>eu.iksproject.kres.api</artifactId>
- <version>${kres-version}</version>
+ <groupId>org.apache.stanbol</groupId>
+ <artifactId>org.apache.stanbol.reasoners.base</artifactId>
+ <version>${stanbol-version}</version>
</dependency>
<dependency>
<groupId>eu.iksproject</groupId>
Modified: incubator/stanbol/trunk/kres/eu.iksproject.kres.reasoners/src/main/java/eu/iksproject/kres/reasoners/KReSReasonerImpl.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/eu.iksproject.kres.reasoners/src/main/java/eu/iksproject/kres/reasoners/KReSReasonerImpl.java?rev=1081894&r1=1081893&r2=1081894&view=diff
==============================================================================
--- incubator/stanbol/trunk/kres/eu.iksproject.kres.reasoners/src/main/java/eu/iksproject/kres/reasoners/KReSReasonerImpl.java (original)
+++ incubator/stanbol/trunk/kres/eu.iksproject.kres.reasoners/src/main/java/eu/iksproject/kres/reasoners/KReSReasonerImpl.java Tue Mar 15 18:37:12 2011
@@ -6,14 +6,13 @@ import org.apache.felix.scr.annotations.
import org.apache.felix.scr.annotations.Component;
import org.apache.felix.scr.annotations.Deactivate;
import org.apache.felix.scr.annotations.Service;
+import org.apache.stanbol.reasoners.base.api.KReSReasoner;
import org.osgi.service.component.ComponentContext;
import org.semanticweb.owlapi.model.OWLOntology;
import org.semanticweb.owlapi.reasoner.OWLReasoner;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import eu.iksproject.kres.api.reasoners.KReSReasoner;
-
@Component(immediate = true, metatype = true)
@Service(KReSReasoner.class)
public class KReSReasonerImpl implements KReSReasoner {
Modified: incubator/stanbol/trunk/kres/eu.iksproject.kres.rules/KReSConf/rmi_config.owl
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/eu.iksproject.kres.rules/KReSConf/rmi_config.owl?rev=1081894&r1=1081893&r2=1081894&view=diff
==============================================================================
--- incubator/stanbol/trunk/kres/eu.iksproject.kres.rules/KReSConf/rmi_config.owl (original)
+++ incubator/stanbol/trunk/kres/eu.iksproject.kres.rules/KReSConf/rmi_config.owl Tue Mar 15 18:37:12 2011
@@ -170,5 +170,5 @@
-<!-- Generated by the OWL API (version [Not Released]) http://owlapi.sourceforge.net -->
+<!-- Generated by the OWL API (version 3.0.0.1413) http://owlapi.sourceforge.net -->
Modified: incubator/stanbol/trunk/kres/eu.iksproject.kres.rules/pom.xml
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/eu.iksproject.kres.rules/pom.xml?rev=1081894&r1=1081893&r2=1081894&view=diff
==============================================================================
--- incubator/stanbol/trunk/kres/eu.iksproject.kres.rules/pom.xml (original)
+++ incubator/stanbol/trunk/kres/eu.iksproject.kres.rules/pom.xml Tue Mar 15 18:37:12 2011
@@ -76,12 +76,26 @@
<artifactId>org.apache.felix.scr.annotations</artifactId>
<version>1.2.0</version>
</dependency>
+ <!--
<dependency>
<groupId>eu.iksproject</groupId>
<artifactId>eu.iksproject.kres.api</artifactId>
<version>${kres-version}</version>
<scope>provided</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.rules.base</artifactId>
+ <version>${stanbol-version}</version>
+ </dependency>
+
<dependency>
<groupId>com.hp.hpl.jena</groupId>
<artifactId>jena</artifactId>
Modified: incubator/stanbol/trunk/kres/eu.iksproject.kres.rules/src/main/java/eu/iksproject/kres/rules/KReSKB.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/eu.iksproject.kres.rules/src/main/java/eu/iksproject/kres/rules/KReSKB.java?rev=1081894&r1=1081893&r2=1081894&view=diff
==============================================================================
--- incubator/stanbol/trunk/kres/eu.iksproject.kres.rules/src/main/java/eu/iksproject/kres/rules/KReSKB.java (original)
+++ incubator/stanbol/trunk/kres/eu.iksproject.kres.rules/src/main/java/eu/iksproject/kres/rules/KReSKB.java Tue Mar 15 18:37:12 2011
@@ -5,13 +5,12 @@ import java.io.IOException;
import java.io.OutputStream;
import java.util.Hashtable;
+import org.apache.stanbol.rules.base.api.KReSRule;
+import org.apache.stanbol.rules.base.api.util.KReSRuleList;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import com.hp.hpl.jena.ontology.OntModel;
-
-import eu.iksproject.kres.api.rules.KReSRule;
-import eu.iksproject.kres.api.rules.util.KReSRuleList;;
/**
*
* FIXME
Modified: incubator/stanbol/trunk/kres/eu.iksproject.kres.rules/src/main/java/eu/iksproject/kres/rules/KReSRuleImpl.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/eu.iksproject.kres.rules/src/main/java/eu/iksproject/kres/rules/KReSRuleImpl.java?rev=1081894&r1=1081893&r2=1081894&view=diff
==============================================================================
--- incubator/stanbol/trunk/kres/eu.iksproject.kres.rules/src/main/java/eu/iksproject/kres/rules/KReSRuleImpl.java (original)
+++ incubator/stanbol/trunk/kres/eu.iksproject.kres.rules/src/main/java/eu/iksproject/kres/rules/KReSRuleImpl.java Tue Mar 15 18:37:12 2011
@@ -5,6 +5,11 @@ import java.util.HashSet;
import java.util.Iterator;
import java.util.Set;
+import org.apache.stanbol.rules.base.api.KReSRule;
+import org.apache.stanbol.rules.base.api.KReSRuleAtom;
+import org.apache.stanbol.rules.base.api.KReSRuleExpressiveness;
+import org.apache.stanbol.rules.base.api.SPARQLObject;
+import org.apache.stanbol.rules.base.api.util.AtomList;
import org.semanticweb.owlapi.model.IRI;
import org.semanticweb.owlapi.model.OWLDataFactory;
import org.semanticweb.owlapi.model.SWRLAtom;
@@ -15,11 +20,6 @@ import com.hp.hpl.jena.rdf.model.ModelFa
import com.hp.hpl.jena.rdf.model.RDFList;
import com.hp.hpl.jena.rdf.model.Resource;
-import eu.iksproject.kres.api.rules.KReSRule;
-import eu.iksproject.kres.api.rules.KReSRuleAtom;
-import eu.iksproject.kres.api.rules.KReSRuleExpressiveness;
-import eu.iksproject.kres.api.rules.SPARQLObject;
-import eu.iksproject.kres.api.rules.util.AtomList;
import eu.iksproject.kres.ontologies.SWRL;
public class KReSRuleImpl implements KReSRule {
Modified: incubator/stanbol/trunk/kres/eu.iksproject.kres.rules/src/main/java/eu/iksproject/kres/rules/SPARQLComparison.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/eu.iksproject.kres.rules/src/main/java/eu/iksproject/kres/rules/SPARQLComparison.java?rev=1081894&r1=1081893&r2=1081894&view=diff
==============================================================================
--- incubator/stanbol/trunk/kres/eu.iksproject.kres.rules/src/main/java/eu/iksproject/kres/rules/SPARQLComparison.java (original)
+++ incubator/stanbol/trunk/kres/eu.iksproject.kres.rules/src/main/java/eu/iksproject/kres/rules/SPARQLComparison.java Tue Mar 15 18:37:12 2011
@@ -1,6 +1,6 @@
package eu.iksproject.kres.rules;
-import eu.iksproject.kres.api.rules.SPARQLObject;
+import org.apache.stanbol.rules.base.api.SPARQLObject;
public class SPARQLComparison implements SPARQLObject {
Modified: incubator/stanbol/trunk/kres/eu.iksproject.kres.rules/src/main/java/eu/iksproject/kres/rules/SPARQLFunction.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/eu.iksproject.kres.rules/src/main/java/eu/iksproject/kres/rules/SPARQLFunction.java?rev=1081894&r1=1081893&r2=1081894&view=diff
==============================================================================
--- incubator/stanbol/trunk/kres/eu.iksproject.kres.rules/src/main/java/eu/iksproject/kres/rules/SPARQLFunction.java (original)
+++ incubator/stanbol/trunk/kres/eu.iksproject.kres.rules/src/main/java/eu/iksproject/kres/rules/SPARQLFunction.java Tue Mar 15 18:37:12 2011
@@ -1,6 +1,6 @@
package eu.iksproject.kres.rules;
-import eu.iksproject.kres.api.rules.SPARQLObject;
+import org.apache.stanbol.rules.base.api.SPARQLObject;
public class SPARQLFunction implements SPARQLObject {
Modified: incubator/stanbol/trunk/kres/eu.iksproject.kres.rules/src/main/java/eu/iksproject/kres/rules/SPARQLNot.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/eu.iksproject.kres.rules/src/main/java/eu/iksproject/kres/rules/SPARQLNot.java?rev=1081894&r1=1081893&r2=1081894&view=diff
==============================================================================
--- incubator/stanbol/trunk/kres/eu.iksproject.kres.rules/src/main/java/eu/iksproject/kres/rules/SPARQLNot.java (original)
+++ incubator/stanbol/trunk/kres/eu.iksproject.kres.rules/src/main/java/eu/iksproject/kres/rules/SPARQLNot.java Tue Mar 15 18:37:12 2011
@@ -1,6 +1,6 @@
package eu.iksproject.kres.rules;
-import eu.iksproject.kres.api.rules.SPARQLObject;
+import org.apache.stanbol.rules.base.api.SPARQLObject;
public class SPARQLNot implements SPARQLObject {
Modified: incubator/stanbol/trunk/kres/eu.iksproject.kres.rules/src/main/java/eu/iksproject/kres/rules/SPARQLTriple.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/eu.iksproject.kres.rules/src/main/java/eu/iksproject/kres/rules/SPARQLTriple.java?rev=1081894&r1=1081893&r2=1081894&view=diff
==============================================================================
--- incubator/stanbol/trunk/kres/eu.iksproject.kres.rules/src/main/java/eu/iksproject/kres/rules/SPARQLTriple.java (original)
+++ incubator/stanbol/trunk/kres/eu.iksproject.kres.rules/src/main/java/eu/iksproject/kres/rules/SPARQLTriple.java Tue Mar 15 18:37:12 2011
@@ -1,6 +1,6 @@
package eu.iksproject.kres.rules;
-import eu.iksproject.kres.api.rules.SPARQLObject;
+import org.apache.stanbol.rules.base.api.SPARQLObject;
public class SPARQLTriple implements SPARQLObject {
Modified: incubator/stanbol/trunk/kres/eu.iksproject.kres.rules/src/main/java/eu/iksproject/kres/rules/atoms/BlankNodeAtom.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/eu.iksproject.kres.rules/src/main/java/eu/iksproject/kres/rules/atoms/BlankNodeAtom.java?rev=1081894&r1=1081893&r2=1081894&view=diff
==============================================================================
--- incubator/stanbol/trunk/kres/eu.iksproject.kres.rules/src/main/java/eu/iksproject/kres/rules/atoms/BlankNodeAtom.java (original)
+++ incubator/stanbol/trunk/kres/eu.iksproject.kres.rules/src/main/java/eu/iksproject/kres/rules/atoms/BlankNodeAtom.java Tue Mar 15 18:37:12 2011
@@ -1,17 +1,13 @@
package eu.iksproject.kres.rules.atoms;
-import java.net.URI;
-import java.net.URISyntaxException;
-
+import org.apache.stanbol.rules.base.api.SPARQLObject;
+import org.apache.stanbol.rules.base.api.URIResource;
import org.semanticweb.owlapi.model.OWLDataFactory;
import org.semanticweb.owlapi.model.SWRLAtom;
import com.hp.hpl.jena.rdf.model.Model;
import com.hp.hpl.jena.rdf.model.Resource;
-import com.hp.hpl.jena.vocabulary.OWL;
-import eu.iksproject.kres.api.rules.SPARQLObject;
-import eu.iksproject.kres.api.rules.URIResource;
import eu.iksproject.kres.rules.SPARQLTriple;
Modified: incubator/stanbol/trunk/kres/eu.iksproject.kres.rules/src/main/java/eu/iksproject/kres/rules/atoms/ClassAtom.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/eu.iksproject.kres.rules/src/main/java/eu/iksproject/kres/rules/atoms/ClassAtom.java?rev=1081894&r1=1081893&r2=1081894&view=diff
==============================================================================
--- incubator/stanbol/trunk/kres/eu.iksproject.kres.rules/src/main/java/eu/iksproject/kres/rules/atoms/ClassAtom.java (original)
+++ incubator/stanbol/trunk/kres/eu.iksproject.kres.rules/src/main/java/eu/iksproject/kres/rules/atoms/ClassAtom.java Tue Mar 15 18:37:12 2011
@@ -2,24 +2,21 @@ package eu.iksproject.kres.rules.atoms;
import java.util.ArrayList;
+import org.apache.stanbol.rules.base.api.SPARQLObject;
+import org.apache.stanbol.rules.base.api.URIResource;
import org.semanticweb.owlapi.model.IRI;
import org.semanticweb.owlapi.model.OWLClass;
import org.semanticweb.owlapi.model.OWLDataFactory;
import org.semanticweb.owlapi.model.OWLIndividual;
-import org.semanticweb.owlapi.model.OWLRestriction;
import org.semanticweb.owlapi.model.SWRLAtom;
import org.semanticweb.owlapi.model.SWRLIArgument;
import com.hp.hpl.jena.rdf.model.Model;
import com.hp.hpl.jena.rdf.model.Resource;
-import com.hp.hpl.jena.vocabulary.OWL;
-import eu.iksproject.kres.api.rules.KReSRuleAtom;
+import eu.iksproject.kres.ontologies.SWRL;
import eu.iksproject.kres.rules.SPARQLNot;
-import eu.iksproject.kres.api.rules.SPARQLObject;
import eu.iksproject.kres.rules.SPARQLTriple;
-import eu.iksproject.kres.api.rules.URIResource;
-import eu.iksproject.kres.ontologies.SWRL;
public class ClassAtom extends KReSCoreAtom {
Modified: incubator/stanbol/trunk/kres/eu.iksproject.kres.rules/src/main/java/eu/iksproject/kres/rules/atoms/ComparisonAtom.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/eu.iksproject.kres.rules/src/main/java/eu/iksproject/kres/rules/atoms/ComparisonAtom.java?rev=1081894&r1=1081893&r2=1081894&view=diff
==============================================================================
--- incubator/stanbol/trunk/kres/eu.iksproject.kres.rules/src/main/java/eu/iksproject/kres/rules/atoms/ComparisonAtom.java (original)
+++ incubator/stanbol/trunk/kres/eu.iksproject.kres.rules/src/main/java/eu/iksproject/kres/rules/atoms/ComparisonAtom.java Tue Mar 15 18:37:12 2011
@@ -1,6 +1,6 @@
package eu.iksproject.kres.rules.atoms;
-import eu.iksproject.kres.api.rules.KReSRuleAtom;
+import org.apache.stanbol.rules.base.api.KReSRuleAtom;
public abstract class ComparisonAtom implements KReSRuleAtom {
Modified: incubator/stanbol/trunk/kres/eu.iksproject.kres.rules/src/main/java/eu/iksproject/kres/rules/atoms/ConcatAtom.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/eu.iksproject.kres.rules/src/main/java/eu/iksproject/kres/rules/atoms/ConcatAtom.java?rev=1081894&r1=1081893&r2=1081894&view=diff
==============================================================================
--- incubator/stanbol/trunk/kres/eu.iksproject.kres.rules/src/main/java/eu/iksproject/kres/rules/atoms/ConcatAtom.java (original)
+++ incubator/stanbol/trunk/kres/eu.iksproject.kres.rules/src/main/java/eu/iksproject/kres/rules/atoms/ConcatAtom.java Tue Mar 15 18:37:12 2011
@@ -1,14 +1,14 @@
package eu.iksproject.kres.rules.atoms;
-import eu.iksproject.kres.rules.SPARQLFunction;
-import eu.iksproject.kres.api.rules.SPARQLObject;
-
+import org.apache.stanbol.rules.base.api.SPARQLObject;
import org.semanticweb.owlapi.model.OWLDataFactory;
import org.semanticweb.owlapi.model.SWRLAtom;
import com.hp.hpl.jena.rdf.model.Model;
import com.hp.hpl.jena.rdf.model.Resource;
+import eu.iksproject.kres.rules.SPARQLFunction;
+
public class ConcatAtom extends StringFunctionAtom {
private StringFunctionAtom argument1;
Modified: incubator/stanbol/trunk/kres/eu.iksproject.kres.rules/src/main/java/eu/iksproject/kres/rules/atoms/CreateLabelAtom.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/eu.iksproject.kres.rules/src/main/java/eu/iksproject/kres/rules/atoms/CreateLabelAtom.java?rev=1081894&r1=1081893&r2=1081894&view=diff
==============================================================================
--- incubator/stanbol/trunk/kres/eu.iksproject.kres.rules/src/main/java/eu/iksproject/kres/rules/atoms/CreateLabelAtom.java (original)
+++ incubator/stanbol/trunk/kres/eu.iksproject.kres.rules/src/main/java/eu/iksproject/kres/rules/atoms/CreateLabelAtom.java Tue Mar 15 18:37:12 2011
@@ -1,14 +1,13 @@
package eu.iksproject.kres.rules.atoms;
+import org.apache.stanbol.rules.base.api.SPARQLObject;
import org.semanticweb.owlapi.model.OWLDataFactory;
import org.semanticweb.owlapi.model.SWRLAtom;
import com.hp.hpl.jena.rdf.model.Model;
import com.hp.hpl.jena.rdf.model.Resource;
-import eu.iksproject.kres.api.rules.KReSRuleAtom;
import eu.iksproject.kres.rules.SPARQLFunction;
-import eu.iksproject.kres.api.rules.SPARQLObject;
public class CreateLabelAtom extends StringFunctionAtom {
Modified: incubator/stanbol/trunk/kres/eu.iksproject.kres.rules/src/main/java/eu/iksproject/kres/rules/atoms/DatavaluedPropertyAtom.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/eu.iksproject.kres.rules/src/main/java/eu/iksproject/kres/rules/atoms/DatavaluedPropertyAtom.java?rev=1081894&r1=1081893&r2=1081894&view=diff
==============================================================================
--- incubator/stanbol/trunk/kres/eu.iksproject.kres.rules/src/main/java/eu/iksproject/kres/rules/atoms/DatavaluedPropertyAtom.java (original)
+++ incubator/stanbol/trunk/kres/eu.iksproject.kres.rules/src/main/java/eu/iksproject/kres/rules/atoms/DatavaluedPropertyAtom.java Tue Mar 15 18:37:12 2011
@@ -1,35 +1,27 @@
package eu.iksproject.kres.rules.atoms;
-import java.net.URI;
import java.util.ArrayList;
-
+import org.apache.stanbol.rules.base.api.SPARQLObject;
+import org.apache.stanbol.rules.base.api.URIResource;
import org.semanticweb.owlapi.apibinding.OWLManager;
import org.semanticweb.owlapi.model.IRI;
import org.semanticweb.owlapi.model.OWLDataFactory;
import org.semanticweb.owlapi.model.OWLDataProperty;
import org.semanticweb.owlapi.model.OWLIndividual;
import org.semanticweb.owlapi.model.OWLLiteral;
-import org.semanticweb.owlapi.model.OWLObjectProperty;
-import org.semanticweb.owlapi.model.OWLTypedLiteral;
-import org.semanticweb.owlapi.model.SWRLArgument;
import org.semanticweb.owlapi.model.SWRLAtom;
import org.semanticweb.owlapi.model.SWRLDArgument;
import org.semanticweb.owlapi.model.SWRLIArgument;
import org.semanticweb.owlapi.model.SWRLLiteralArgument;
-import org.semanticweb.owlapi.model.SWRLVariable;
-
import com.hp.hpl.jena.rdf.model.Literal;
import com.hp.hpl.jena.rdf.model.Model;
import com.hp.hpl.jena.rdf.model.Resource;
-import eu.iksproject.kres.api.rules.KReSRuleAtom;
+import eu.iksproject.kres.ontologies.SWRL;
import eu.iksproject.kres.rules.SPARQLNot;
-import eu.iksproject.kres.api.rules.SPARQLObject;
import eu.iksproject.kres.rules.SPARQLTriple;
-import eu.iksproject.kres.api.rules.URIResource;
-import eu.iksproject.kres.ontologies.SWRL;
public class DatavaluedPropertyAtom extends KReSCoreAtom {
Modified: incubator/stanbol/trunk/kres/eu.iksproject.kres.rules/src/main/java/eu/iksproject/kres/rules/atoms/DifferentAtom.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/eu.iksproject.kres.rules/src/main/java/eu/iksproject/kres/rules/atoms/DifferentAtom.java?rev=1081894&r1=1081893&r2=1081894&view=diff
==============================================================================
--- incubator/stanbol/trunk/kres/eu.iksproject.kres.rules/src/main/java/eu/iksproject/kres/rules/atoms/DifferentAtom.java (original)
+++ incubator/stanbol/trunk/kres/eu.iksproject.kres.rules/src/main/java/eu/iksproject/kres/rules/atoms/DifferentAtom.java Tue Mar 15 18:37:12 2011
@@ -1,7 +1,6 @@
package eu.iksproject.kres.rules.atoms;
-import java.util.ArrayList;
-
+import org.apache.stanbol.rules.base.api.SPARQLObject;
import org.semanticweb.owlapi.apibinding.OWLManager;
import org.semanticweb.owlapi.model.OWLDataFactory;
import org.semanticweb.owlapi.model.OWLLiteral;
@@ -10,12 +9,7 @@ import org.semanticweb.owlapi.model.SWRL
import com.hp.hpl.jena.rdf.model.Model;
import com.hp.hpl.jena.rdf.model.Resource;
-import eu.iksproject.kres.api.rules.KReSRuleAtom;
import eu.iksproject.kres.rules.SPARQLComparison;
-import eu.iksproject.kres.rules.SPARQLNot;
-import eu.iksproject.kres.api.rules.SPARQLObject;
-import eu.iksproject.kres.rules.SPARQLTriple;
-import eu.iksproject.kres.api.rules.URIResource;
public class DifferentAtom extends ComparisonAtom {
Modified: incubator/stanbol/trunk/kres/eu.iksproject.kres.rules/src/main/java/eu/iksproject/kres/rules/atoms/EndsWithAtom.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/eu.iksproject.kres.rules/src/main/java/eu/iksproject/kres/rules/atoms/EndsWithAtom.java?rev=1081894&r1=1081893&r2=1081894&view=diff
==============================================================================
--- incubator/stanbol/trunk/kres/eu.iksproject.kres.rules/src/main/java/eu/iksproject/kres/rules/atoms/EndsWithAtom.java (original)
+++ incubator/stanbol/trunk/kres/eu.iksproject.kres.rules/src/main/java/eu/iksproject/kres/rules/atoms/EndsWithAtom.java Tue Mar 15 18:37:12 2011
@@ -1,16 +1,13 @@
package eu.iksproject.kres.rules.atoms;
+import org.apache.stanbol.rules.base.api.SPARQLObject;
import org.semanticweb.owlapi.model.OWLDataFactory;
-import org.semanticweb.owlapi.model.OWLLiteral;
import org.semanticweb.owlapi.model.SWRLAtom;
import com.hp.hpl.jena.rdf.model.Model;
import com.hp.hpl.jena.rdf.model.Resource;
-import eu.iksproject.kres.api.rules.KReSRuleAtom;
import eu.iksproject.kres.rules.SPARQLComparison;
-import eu.iksproject.kres.api.rules.SPARQLObject;
-import eu.iksproject.kres.api.rules.URIResource;
public class EndsWithAtom extends ComparisonAtom {
Modified: incubator/stanbol/trunk/kres/eu.iksproject.kres.rules/src/main/java/eu/iksproject/kres/rules/atoms/GreaterThanAtom.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/eu.iksproject.kres.rules/src/main/java/eu/iksproject/kres/rules/atoms/GreaterThanAtom.java?rev=1081894&r1=1081893&r2=1081894&view=diff
==============================================================================
--- incubator/stanbol/trunk/kres/eu.iksproject.kres.rules/src/main/java/eu/iksproject/kres/rules/atoms/GreaterThanAtom.java (original)
+++ incubator/stanbol/trunk/kres/eu.iksproject.kres.rules/src/main/java/eu/iksproject/kres/rules/atoms/GreaterThanAtom.java Tue Mar 15 18:37:12 2011
@@ -1,9 +1,6 @@
package eu.iksproject.kres.rules.atoms;
-import eu.iksproject.kres.api.rules.KReSRuleAtom;
-import eu.iksproject.kres.rules.SPARQLComparison;
-import eu.iksproject.kres.api.rules.SPARQLObject;
-
+import org.apache.stanbol.rules.base.api.SPARQLObject;
import org.semanticweb.owlapi.apibinding.OWLManager;
import org.semanticweb.owlapi.model.OWLDataFactory;
import org.semanticweb.owlapi.model.OWLLiteral;
@@ -12,6 +9,8 @@ import org.semanticweb.owlapi.model.SWRL
import com.hp.hpl.jena.rdf.model.Model;
import com.hp.hpl.jena.rdf.model.Resource;
+import eu.iksproject.kres.rules.SPARQLComparison;
+
public class GreaterThanAtom extends ComparisonAtom {
Modified: incubator/stanbol/trunk/kres/eu.iksproject.kres.rules/src/main/java/eu/iksproject/kres/rules/atoms/IndividualPropertyAtom.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/eu.iksproject.kres.rules/src/main/java/eu/iksproject/kres/rules/atoms/IndividualPropertyAtom.java?rev=1081894&r1=1081893&r2=1081894&view=diff
==============================================================================
--- incubator/stanbol/trunk/kres/eu.iksproject.kres.rules/src/main/java/eu/iksproject/kres/rules/atoms/IndividualPropertyAtom.java (original)
+++ incubator/stanbol/trunk/kres/eu.iksproject.kres.rules/src/main/java/eu/iksproject/kres/rules/atoms/IndividualPropertyAtom.java Tue Mar 15 18:37:12 2011
@@ -1,29 +1,22 @@
package eu.iksproject.kres.rules.atoms;
-import java.net.URI;
-import java.net.URISyntaxException;
import java.util.ArrayList;
+import org.apache.stanbol.rules.base.api.SPARQLObject;
+import org.apache.stanbol.rules.base.api.URIResource;
import org.semanticweb.owlapi.model.IRI;
-import org.semanticweb.owlapi.model.OWLClass;
import org.semanticweb.owlapi.model.OWLDataFactory;
import org.semanticweb.owlapi.model.OWLIndividual;
-import org.semanticweb.owlapi.model.OWLLiteral;
import org.semanticweb.owlapi.model.OWLObjectProperty;
import org.semanticweb.owlapi.model.SWRLAtom;
import org.semanticweb.owlapi.model.SWRLIArgument;
-import org.semanticweb.owlapi.model.SWRLVariable;
-
import com.hp.hpl.jena.rdf.model.Model;
import com.hp.hpl.jena.rdf.model.Resource;
-import eu.iksproject.kres.api.rules.KReSRuleAtom;
+import eu.iksproject.kres.ontologies.SWRL;
import eu.iksproject.kres.rules.SPARQLNot;
-import eu.iksproject.kres.api.rules.SPARQLObject;
import eu.iksproject.kres.rules.SPARQLTriple;
-import eu.iksproject.kres.api.rules.URIResource;
-import eu.iksproject.kres.ontologies.SWRL;
public class IndividualPropertyAtom extends KReSCoreAtom {
Modified: incubator/stanbol/trunk/kres/eu.iksproject.kres.rules/src/main/java/eu/iksproject/kres/rules/atoms/IsBlankAtom.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/eu.iksproject.kres.rules/src/main/java/eu/iksproject/kres/rules/atoms/IsBlankAtom.java?rev=1081894&r1=1081893&r2=1081894&view=diff
==============================================================================
--- incubator/stanbol/trunk/kres/eu.iksproject.kres.rules/src/main/java/eu/iksproject/kres/rules/atoms/IsBlankAtom.java (original)
+++ incubator/stanbol/trunk/kres/eu.iksproject.kres.rules/src/main/java/eu/iksproject/kres/rules/atoms/IsBlankAtom.java Tue Mar 15 18:37:12 2011
@@ -1,15 +1,15 @@
package eu.iksproject.kres.rules.atoms;
-import eu.iksproject.kres.rules.SPARQLComparison;
-import eu.iksproject.kres.api.rules.SPARQLObject;
-import eu.iksproject.kres.api.rules.URIResource;
-
+import org.apache.stanbol.rules.base.api.SPARQLObject;
+import org.apache.stanbol.rules.base.api.URIResource;
import org.semanticweb.owlapi.model.OWLDataFactory;
import org.semanticweb.owlapi.model.SWRLAtom;
import com.hp.hpl.jena.rdf.model.Model;
import com.hp.hpl.jena.rdf.model.Resource;
+import eu.iksproject.kres.rules.SPARQLComparison;
+
public class IsBlankAtom extends ComparisonAtom {
private URIResource uriResource;
Modified: incubator/stanbol/trunk/kres/eu.iksproject.kres.rules/src/main/java/eu/iksproject/kres/rules/atoms/KReSBlankNode.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/eu.iksproject.kres.rules/src/main/java/eu/iksproject/kres/rules/atoms/KReSBlankNode.java?rev=1081894&r1=1081893&r2=1081894&view=diff
==============================================================================
--- incubator/stanbol/trunk/kres/eu.iksproject.kres.rules/src/main/java/eu/iksproject/kres/rules/atoms/KReSBlankNode.java (original)
+++ incubator/stanbol/trunk/kres/eu.iksproject.kres.rules/src/main/java/eu/iksproject/kres/rules/atoms/KReSBlankNode.java Tue Mar 15 18:37:12 2011
@@ -2,11 +2,11 @@ package eu.iksproject.kres.rules.atoms;
import java.net.URI;
+import org.apache.stanbol.rules.base.api.URIResource;
+
import com.hp.hpl.jena.rdf.model.Model;
import com.hp.hpl.jena.rdf.model.Resource;
-import eu.iksproject.kres.api.rules.URIResource;
-
public class KReSBlankNode implements URIResource {
private String bNode;