Author: alexdma
Date: Mon Feb 28 10:14:23 2011
New Revision: 1075265
URL: http://svn.apache.org/viewvc?rev=1075265&view=rev
Log:
STANBOL-88 :
- Moved KReSFormat class from eu.iksproject.kres.api to
eu.iksproject.kres.jersey
- Updated obsolete KReSFormat import statements in kres.jersey classes
- Removed useless Jersey import statements in kres-rules and kres.api
- Removed Jersey dependencies from kres.api POM
- Removed redundant import/export statements in maven bundle POM
Added:
incubator/stanbol/trunk/kres/eu.iksproject.kres.jersey/src/main/java/eu/iksproject/kres/jersey/format/
incubator/stanbol/trunk/kres/eu.iksproject.kres.jersey/src/main/java/eu/iksproject/kres/jersey/format/KReSFormat.java
- copied, changed from r1075261,
incubator/stanbol/trunk/kres/eu.iksproject.kres.api/src/main/java/eu/iksproject/kres/api/format/KReSFormat.java
Removed:
incubator/stanbol/trunk/kres/eu.iksproject.kres.api/src/main/java/eu/iksproject/kres/api/format/
Modified:
incubator/stanbol/trunk/kres/eu.iksproject.kres.api/pom.xml
incubator/stanbol/trunk/kres/eu.iksproject.kres.api/src/main/java/eu/iksproject/kres/api/manager/KReSONManager.java
incubator/stanbol/trunk/kres/eu.iksproject.kres.jersey/src/main/java/eu/iksproject/kres/jersey/manager/Recipe.java
incubator/stanbol/trunk/kres/eu.iksproject.kres.jersey/src/main/java/eu/iksproject/kres/jersey/manager/Rule.java
incubator/stanbol/trunk/kres/eu.iksproject.kres.jersey/src/main/java/eu/iksproject/kres/jersey/reasoners/Classify.java
incubator/stanbol/trunk/kres/eu.iksproject.kres.jersey/src/main/java/eu/iksproject/kres/jersey/resource/GraphsResource.java
incubator/stanbol/trunk/kres/eu.iksproject.kres.jersey/src/main/java/eu/iksproject/kres/jersey/resource/KReSSessionResource.java
incubator/stanbol/trunk/kres/eu.iksproject.kres.jersey/src/main/java/eu/iksproject/kres/jersey/resource/ONMRootResource.java
incubator/stanbol/trunk/kres/eu.iksproject.kres.jersey/src/main/java/eu/iksproject/kres/jersey/resource/ONMScopeOntologyResource.java
incubator/stanbol/trunk/kres/eu.iksproject.kres.jersey/src/main/java/eu/iksproject/kres/jersey/resource/ONMScopeResource.java
incubator/stanbol/trunk/kres/eu.iksproject.kres.jersey/src/main/java/eu/iksproject/kres/jersey/resource/SemionReengineerResource.java
incubator/stanbol/trunk/kres/eu.iksproject.kres.jersey/src/main/java/eu/iksproject/kres/jersey/resource/SemionRefactorerResource.java
incubator/stanbol/trunk/kres/eu.iksproject.kres.jersey/src/main/java/eu/iksproject/kres/jersey/util/OntologyRenderUtils.java
incubator/stanbol/trunk/kres/eu.iksproject.kres.jersey/src/main/java/eu/iksproject/kres/jersey/writers/OWLOntologyWriter.java
incubator/stanbol/trunk/kres/eu.iksproject.kres.jersey/src/test/java/eu/iksproject/kres/jersey/JettyServerTest.java
incubator/stanbol/trunk/kres/eu.iksproject.kres.rules/src/main/java/eu/iksproject/kres/rules/KReSRuleImpl.java
Modified: incubator/stanbol/trunk/kres/eu.iksproject.kres.api/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/eu.iksproject.kres.api/pom.xml?rev=1075265&r1=1075264&r2=1075265&view=diff
==============================================================================
--- incubator/stanbol/trunk/kres/eu.iksproject.kres.api/pom.xml (original)
+++ incubator/stanbol/trunk/kres/eu.iksproject.kres.api/pom.xml Mon Feb 28
10:14:23 2011
@@ -34,42 +34,16 @@
<artifactId>maven-bundle-plugin</artifactId>
<extensions>true</extensions>
<configuration>
- <instructions>
+ <instructions>
<Export-Package>
eu.iksproject.kres.api.*;version=${kres-version},
- com.hp.hpl.jena.*,
- com.ibm.icu.*,
- com.sun.jersey.*,
-
javax.ws.*;version=1.1.1,
org.stlab.xd.registry.*
</Export-Package>
<Import-Package>
org.slf4j.*,
- !org.apache.lucene.*,
- !org.apache.xerces.*,
- !org.apache.tools.*,
- !org.codehaus.*,
- !org.openjena.atlas.*,
- !javax.ws.*,
- !org.objectweb.*,
- !tdb.*,
- !arq.*,
- !javax.xml.*,
- !com.sun.*,
- !javax.activation,
- !javax.ejb,
- !javax.enterprise.*,
- !javax.interceptor.*,
- !javax.mail.*,
- !javax.persistence.*,
- !javax.annotation.*,
-
!javax.servlet.annotation.*,
- !javax.imageio.*,
- !javax.servlet.*,
- !org.w3c.*,
- !org.xml.*,
*
</Import-Package>
+ <_nouses>true</_nouses>
</instructions>
</configuration>
</plugin>
@@ -160,33 +134,6 @@
<version>3.0.0</version>
<scope>provided</scope>
</dependency>
- <dependency>
- <groupId>org.apache.lucene</groupId>
- <artifactId>lucene-queries</artifactId>
- <version>3.0.1</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.lucene</groupId>
- <artifactId>lucene-analyzers</artifactId>
- <version>3.0.1</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>com.sun.jersey</groupId>
- <artifactId>jersey-server</artifactId>
- <version>${jersey-version}</version>
- </dependency>
- <dependency>
- <groupId>com.sun.jersey</groupId>
- <artifactId>jersey-core</artifactId>
- <version>${jersey-version}</version>
- </dependency>
- <dependency>
- <groupId>com.sun.jersey</groupId>
- <artifactId>jersey-json</artifactId>
- <version>${jersey-version}</version>
- </dependency>
<dependency>
<groupId>org.apache.clerezza</groupId>
Modified:
incubator/stanbol/trunk/kres/eu.iksproject.kres.api/src/main/java/eu/iksproject/kres/api/manager/KReSONManager.java
URL:
http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/eu.iksproject.kres.api/src/main/java/eu/iksproject/kres/api/manager/KReSONManager.java?rev=1075265&r1=1075264&r2=1075265&view=diff
==============================================================================
---
incubator/stanbol/trunk/kres/eu.iksproject.kres.api/src/main/java/eu/iksproject/kres/api/manager/KReSONManager.java
(original)
+++
incubator/stanbol/trunk/kres/eu.iksproject.kres.api/src/main/java/eu/iksproject/kres/api/manager/KReSONManager.java
Mon Feb 28 10:14:23 2011
@@ -1,9 +1,7 @@
package eu.iksproject.kres.api.manager;
-import javax.ws.rs.core.Context;
-
-import org.osgi.service.component.ComponentContext;
import org.semanticweb.owlapi.model.OWLDataFactory;
+import org.semanticweb.owlapi.model.OWLOntologyAlreadyExistsException;
import org.semanticweb.owlapi.model.OWLOntologyManager;
import eu.iksproject.kres.api.manager.ontology.OntologyIndex;
Copied:
incubator/stanbol/trunk/kres/eu.iksproject.kres.jersey/src/main/java/eu/iksproject/kres/jersey/format/KReSFormat.java
(from r1075261,
incubator/stanbol/trunk/kres/eu.iksproject.kres.api/src/main/java/eu/iksproject/kres/api/format/KReSFormat.java)
URL:
http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/eu.iksproject.kres.jersey/src/main/java/eu/iksproject/kres/jersey/format/KReSFormat.java?p2=incubator/stanbol/trunk/kres/eu.iksproject.kres.jersey/src/main/java/eu/iksproject/kres/jersey/format/KReSFormat.java&p1=incubator/stanbol/trunk/kres/eu.iksproject.kres.api/src/main/java/eu/iksproject/kres/api/format/KReSFormat.java&r1=1075261&r2=1075265&rev=1075265&view=diff
==============================================================================
---
incubator/stanbol/trunk/kres/eu.iksproject.kres.api/src/main/java/eu/iksproject/kres/api/format/KReSFormat.java
(original)
+++
incubator/stanbol/trunk/kres/eu.iksproject.kres.jersey/src/main/java/eu/iksproject/kres/jersey/format/KReSFormat.java
Mon Feb 28 10:14:23 2011
@@ -1,4 +1,4 @@
-package eu.iksproject.kres.api.format;
+package eu.iksproject.kres.jersey.format;
import javax.ws.rs.core.MediaType;
Modified:
incubator/stanbol/trunk/kres/eu.iksproject.kres.jersey/src/main/java/eu/iksproject/kres/jersey/manager/Recipe.java
URL:
http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/eu.iksproject.kres.jersey/src/main/java/eu/iksproject/kres/jersey/manager/Recipe.java?rev=1075265&r1=1075264&r2=1075265&view=diff
==============================================================================
---
incubator/stanbol/trunk/kres/eu.iksproject.kres.jersey/src/main/java/eu/iksproject/kres/jersey/manager/Recipe.java
(original)
+++
incubator/stanbol/trunk/kres/eu.iksproject.kres.jersey/src/main/java/eu/iksproject/kres/jersey/manager/Recipe.java
Mon Feb 28 10:14:23 2011
@@ -43,10 +43,10 @@ import org.semanticweb.owlapi.model.OWLO
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import eu.iksproject.kres.api.format.KReSFormat;
import eu.iksproject.kres.api.manager.KReSONManager;
import eu.iksproject.kres.api.rules.RuleStore;
import eu.iksproject.kres.api.storage.OntologyStoreProvider;
+import eu.iksproject.kres.jersey.format.KReSFormat;
import eu.iksproject.kres.jersey.resource.NavigationMixin;
import eu.iksproject.kres.manager.ONManager;
import eu.iksproject.kres.rules.manager.KReSAddRecipe;
Modified:
incubator/stanbol/trunk/kres/eu.iksproject.kres.jersey/src/main/java/eu/iksproject/kres/jersey/manager/Rule.java
URL:
http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/eu.iksproject.kres.jersey/src/main/java/eu/iksproject/kres/jersey/manager/Rule.java?rev=1075265&r1=1075264&r2=1075265&view=diff
==============================================================================
---
incubator/stanbol/trunk/kres/eu.iksproject.kres.jersey/src/main/java/eu/iksproject/kres/jersey/manager/Rule.java
(original)
+++
incubator/stanbol/trunk/kres/eu.iksproject.kres.jersey/src/main/java/eu/iksproject/kres/jersey/manager/Rule.java
Mon Feb 28 10:14:23 2011
@@ -43,10 +43,10 @@ import org.semanticweb.owlapi.model.OWLO
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import eu.iksproject.kres.api.format.KReSFormat;
import eu.iksproject.kres.api.manager.KReSONManager;
import eu.iksproject.kres.api.rules.RuleStore;
import eu.iksproject.kres.api.storage.OntologyStoreProvider;
+import eu.iksproject.kres.jersey.format.KReSFormat;
import eu.iksproject.kres.jersey.resource.NavigationMixin;
import eu.iksproject.kres.manager.ONManager;
import eu.iksproject.kres.rules.manager.KReSAddRecipe;
Modified:
incubator/stanbol/trunk/kres/eu.iksproject.kres.jersey/src/main/java/eu/iksproject/kres/jersey/reasoners/Classify.java
URL:
http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/eu.iksproject.kres.jersey/src/main/java/eu/iksproject/kres/jersey/reasoners/Classify.java?rev=1075265&r1=1075264&r2=1075265&view=diff
==============================================================================
---
incubator/stanbol/trunk/kres/eu.iksproject.kres.jersey/src/main/java/eu/iksproject/kres/jersey/reasoners/Classify.java
(original)
+++
incubator/stanbol/trunk/kres/eu.iksproject.kres.jersey/src/main/java/eu/iksproject/kres/jersey/reasoners/Classify.java
Mon Feb 28 10:14:23 2011
@@ -46,7 +46,6 @@ import com.hp.hpl.jena.rdf.model.Model;
import com.hp.hpl.jena.rdf.model.ModelFactory;
import com.hp.hpl.jena.rdf.model.Resource;
-import eu.iksproject.kres.api.format.KReSFormat;
import eu.iksproject.kres.api.manager.KReSONManager;
import eu.iksproject.kres.api.manager.ontology.OntologyScope;
import eu.iksproject.kres.api.manager.ontology.OntologySpace;
@@ -57,6 +56,7 @@ import eu.iksproject.kres.api.rules.NoSu
import eu.iksproject.kres.api.rules.RuleStore;
import eu.iksproject.kres.api.rules.util.KReSRuleList;
import eu.iksproject.kres.api.storage.OntologyStoreProvider;
+import eu.iksproject.kres.jersey.format.KReSFormat;
import eu.iksproject.kres.manager.ONManager;
import eu.iksproject.kres.reasoners.KReSCreateReasoner;
import eu.iksproject.kres.reasoners.KReSRunReasoner;
Modified:
incubator/stanbol/trunk/kres/eu.iksproject.kres.jersey/src/main/java/eu/iksproject/kres/jersey/resource/GraphsResource.java
URL:
http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/eu.iksproject.kres.jersey/src/main/java/eu/iksproject/kres/jersey/resource/GraphsResource.java?rev=1075265&r1=1075264&r2=1075265&view=diff
==============================================================================
---
incubator/stanbol/trunk/kres/eu.iksproject.kres.jersey/src/main/java/eu/iksproject/kres/jersey/resource/GraphsResource.java
(original)
+++
incubator/stanbol/trunk/kres/eu.iksproject.kres.jersey/src/main/java/eu/iksproject/kres/jersey/resource/GraphsResource.java
Mon Feb 28 10:14:23 2011
@@ -33,11 +33,11 @@ import org.semanticweb.owlapi.model.OWLO
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import eu.iksproject.kres.api.format.KReSFormat;
import eu.iksproject.kres.api.manager.KReSONManager;
import eu.iksproject.kres.api.storage.NoSuchStoreException;
import eu.iksproject.kres.api.storage.OntologyStorage;
import eu.iksproject.kres.api.storage.OntologyStoreProvider;
+import eu.iksproject.kres.jersey.format.KReSFormat;
import eu.iksproject.kres.shared.transformation.JenaToOwlConvert;
import org.semanticweb.owlapi.model.OWLOntology;
Modified:
incubator/stanbol/trunk/kres/eu.iksproject.kres.jersey/src/main/java/eu/iksproject/kres/jersey/resource/KReSSessionResource.java
URL:
http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/eu.iksproject.kres.jersey/src/main/java/eu/iksproject/kres/jersey/resource/KReSSessionResource.java?rev=1075265&r1=1075264&r2=1075265&view=diff
==============================================================================
---
incubator/stanbol/trunk/kres/eu.iksproject.kres.jersey/src/main/java/eu/iksproject/kres/jersey/resource/KReSSessionResource.java
(original)
+++
incubator/stanbol/trunk/kres/eu.iksproject.kres.jersey/src/main/java/eu/iksproject/kres/jersey/resource/KReSSessionResource.java
Mon Feb 28 10:14:23 2011
@@ -22,7 +22,6 @@ import org.semanticweb.owlapi.model.IRI;
import org.semanticweb.owlapi.model.OWLOntology;
import org.semanticweb.owlapi.model.OWLOntologyCreationException;
-import eu.iksproject.kres.api.format.KReSFormat;
import eu.iksproject.kres.api.manager.KReSONManager;
import eu.iksproject.kres.api.manager.ontology.OntologyInputSource;
import eu.iksproject.kres.api.manager.ontology.OntologyScope;
@@ -33,6 +32,7 @@ import eu.iksproject.kres.api.manager.on
import
eu.iksproject.kres.api.manager.ontology.UnmodifiableOntologySpaceException;
import eu.iksproject.kres.api.manager.session.KReSSession;
import eu.iksproject.kres.api.manager.session.KReSSessionManager;
+import eu.iksproject.kres.jersey.format.KReSFormat;
import eu.iksproject.kres.manager.ONManager;
import eu.iksproject.kres.manager.renderers.SessionRenderer;
Modified:
incubator/stanbol/trunk/kres/eu.iksproject.kres.jersey/src/main/java/eu/iksproject/kres/jersey/resource/ONMRootResource.java
URL:
http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/eu.iksproject.kres.jersey/src/main/java/eu/iksproject/kres/jersey/resource/ONMRootResource.java?rev=1075265&r1=1075264&r2=1075265&view=diff
==============================================================================
---
incubator/stanbol/trunk/kres/eu.iksproject.kres.jersey/src/main/java/eu/iksproject/kres/jersey/resource/ONMRootResource.java
(original)
+++
incubator/stanbol/trunk/kres/eu.iksproject.kres.jersey/src/main/java/eu/iksproject/kres/jersey/resource/ONMRootResource.java
Mon Feb 28 10:14:23 2011
@@ -19,11 +19,11 @@ import org.semanticweb.owlapi.model.OWLO
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import eu.iksproject.kres.api.format.KReSFormat;
import eu.iksproject.kres.api.manager.KReSONManager;
import eu.iksproject.kres.api.manager.ontology.OntologyScope;
import eu.iksproject.kres.api.manager.ontology.ScopeRegistry;
import eu.iksproject.kres.api.storage.OntologyStoreProvider;
+import eu.iksproject.kres.jersey.format.KReSFormat;
import eu.iksproject.kres.manager.ONManager;
import eu.iksproject.kres.manager.renderers.ScopeSetRenderer;
import eu.iksproject.kres.storage.provider.OntologyStorageProviderImpl;
Modified:
incubator/stanbol/trunk/kres/eu.iksproject.kres.jersey/src/main/java/eu/iksproject/kres/jersey/resource/ONMScopeOntologyResource.java
URL:
http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/eu.iksproject.kres.jersey/src/main/java/eu/iksproject/kres/jersey/resource/ONMScopeOntologyResource.java?rev=1075265&r1=1075264&r2=1075265&view=diff
==============================================================================
---
incubator/stanbol/trunk/kres/eu.iksproject.kres.jersey/src/main/java/eu/iksproject/kres/jersey/resource/ONMScopeOntologyResource.java
(original)
+++
incubator/stanbol/trunk/kres/eu.iksproject.kres.jersey/src/main/java/eu/iksproject/kres/jersey/resource/ONMScopeOntologyResource.java
Mon Feb 28 10:14:23 2011
@@ -32,13 +32,13 @@ import org.semanticweb.owlapi.util.OWLOn
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import eu.iksproject.kres.api.format.KReSFormat;
import eu.iksproject.kres.api.manager.KReSONManager;
import eu.iksproject.kres.api.manager.ontology.OntologyScope;
import eu.iksproject.kres.api.manager.ontology.OntologySpace;
import
eu.iksproject.kres.api.manager.ontology.OntologySpaceModificationException;
import eu.iksproject.kres.api.manager.ontology.ScopeRegistry;
import eu.iksproject.kres.api.storage.OntologyStoreProvider;
+import eu.iksproject.kres.jersey.format.KReSFormat;
import eu.iksproject.kres.jersey.util.OntologyRenderUtils;
import eu.iksproject.kres.manager.ONManager;
import eu.iksproject.kres.manager.io.RootOntologySource;
Modified:
incubator/stanbol/trunk/kres/eu.iksproject.kres.jersey/src/main/java/eu/iksproject/kres/jersey/resource/ONMScopeResource.java
URL:
http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/eu.iksproject.kres.jersey/src/main/java/eu/iksproject/kres/jersey/resource/ONMScopeResource.java?rev=1075265&r1=1075264&r2=1075265&view=diff
==============================================================================
---
incubator/stanbol/trunk/kres/eu.iksproject.kres.jersey/src/main/java/eu/iksproject/kres/jersey/resource/ONMScopeResource.java
(original)
+++
incubator/stanbol/trunk/kres/eu.iksproject.kres.jersey/src/main/java/eu/iksproject/kres/jersey/resource/ONMScopeResource.java
Mon Feb 28 10:14:23 2011
@@ -29,7 +29,6 @@ import org.semanticweb.owlapi.model.OWLO
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import eu.iksproject.kres.api.format.KReSFormat;
import eu.iksproject.kres.api.manager.DuplicateIDException;
import eu.iksproject.kres.api.manager.KReSONManager;
import eu.iksproject.kres.api.manager.ontology.OntologyInputSource;
@@ -39,6 +38,7 @@ import eu.iksproject.kres.api.manager.on
import eu.iksproject.kres.api.manager.ontology.ScopeRegistry;
import
eu.iksproject.kres.api.manager.ontology.UnmodifiableOntologySpaceException;
import eu.iksproject.kres.api.storage.OntologyStoreProvider;
+import eu.iksproject.kres.jersey.format.KReSFormat;
import eu.iksproject.kres.manager.ONManager;
import eu.iksproject.kres.manager.io.OntologyRegistryIRISource;
import eu.iksproject.kres.manager.io.RootOntologyIRISource;
Modified:
incubator/stanbol/trunk/kres/eu.iksproject.kres.jersey/src/main/java/eu/iksproject/kres/jersey/resource/SemionReengineerResource.java
URL:
http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/eu.iksproject.kres.jersey/src/main/java/eu/iksproject/kres/jersey/resource/SemionReengineerResource.java?rev=1075265&r1=1075264&r2=1075265&view=diff
==============================================================================
---
incubator/stanbol/trunk/kres/eu.iksproject.kres.jersey/src/main/java/eu/iksproject/kres/jersey/resource/SemionReengineerResource.java
(original)
+++
incubator/stanbol/trunk/kres/eu.iksproject.kres.jersey/src/main/java/eu/iksproject/kres/jersey/resource/SemionReengineerResource.java
Mon Feb 28 10:14:23 2011
@@ -38,7 +38,6 @@ import org.slf4j.LoggerFactory;
import com.sun.jersey.api.view.ImplicitProduces;
-import eu.iksproject.kres.api.format.KReSFormat;
import eu.iksproject.kres.api.semion.DataSource;
import eu.iksproject.kres.api.semion.ReengineeringException;
import eu.iksproject.kres.api.semion.SemionManager;
@@ -49,6 +48,7 @@ import eu.iksproject.kres.api.semion.uti
import eu.iksproject.kres.api.semion.util.URIGenerator;
import eu.iksproject.kres.api.semion.util.UnsupportedReengineerException;
import eu.iksproject.kres.api.storage.OntologyStoreProvider;
+import eu.iksproject.kres.jersey.format.KReSFormat;
import eu.iksproject.kres.jersey.util.OntologyRenderUtils;
import eu.iksproject.kres.semion.manager.datasources.DataSourceFactory;
import
eu.iksproject.kres.semion.manager.datasources.InvalidDataSourceForTypeSelectedException;
Modified:
incubator/stanbol/trunk/kres/eu.iksproject.kres.jersey/src/main/java/eu/iksproject/kres/jersey/resource/SemionRefactorerResource.java
URL:
http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/eu.iksproject.kres.jersey/src/main/java/eu/iksproject/kres/jersey/resource/SemionRefactorerResource.java?rev=1075265&r1=1075264&r2=1075265&view=diff
==============================================================================
---
incubator/stanbol/trunk/kres/eu.iksproject.kres.jersey/src/main/java/eu/iksproject/kres/jersey/resource/SemionRefactorerResource.java
(original)
+++
incubator/stanbol/trunk/kres/eu.iksproject.kres.jersey/src/main/java/eu/iksproject/kres/jersey/resource/SemionRefactorerResource.java
Mon Feb 28 10:14:23 2011
@@ -44,7 +44,6 @@ import org.semanticweb.owlapi.model.OWLO
import com.sun.jersey.api.view.ImplicitProduces;
-import eu.iksproject.kres.api.format.KReSFormat;
import eu.iksproject.kres.api.manager.KReSONManager;
import eu.iksproject.kres.api.reasoners.InconcistencyException;
import eu.iksproject.kres.api.rules.NoSuchRecipeException;
@@ -52,6 +51,7 @@ import eu.iksproject.kres.api.rules.Reci
import eu.iksproject.kres.api.semion.SemionRefactorer;
import eu.iksproject.kres.api.semion.SemionManager;
import eu.iksproject.kres.api.semion.SemionRefactoringException;
+import eu.iksproject.kres.jersey.format.KReSFormat;
import eu.iksproject.kres.semion.refactorer.SemionRefactorerImpl;
/**
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=1075265&r1=1075264&r2=1075265&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
Mon Feb 28 10:14:23 2011
@@ -25,8 +25,8 @@ import org.semanticweb.owlapi.model.OWLO
import org.semanticweb.owlapi.model.OWLOntologyManager;
import org.semanticweb.owlapi.model.OWLOntologyStorageException;
-import eu.iksproject.kres.api.format.KReSFormat;
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.jersey/src/main/java/eu/iksproject/kres/jersey/writers/OWLOntologyWriter.java
URL:
http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/eu.iksproject.kres.jersey/src/main/java/eu/iksproject/kres/jersey/writers/OWLOntologyWriter.java?rev=1075265&r1=1075264&r2=1075265&view=diff
==============================================================================
---
incubator/stanbol/trunk/kres/eu.iksproject.kres.jersey/src/main/java/eu/iksproject/kres/jersey/writers/OWLOntologyWriter.java
(original)
+++
incubator/stanbol/trunk/kres/eu.iksproject.kres.jersey/src/main/java/eu/iksproject/kres/jersey/writers/OWLOntologyWriter.java
Mon Feb 28 10:14:23 2011
@@ -30,7 +30,7 @@ import org.semanticweb.owlapi.model.OWLO
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import eu.iksproject.kres.api.format.KReSFormat;
+import eu.iksproject.kres.jersey.format.KReSFormat;
import eu.iksproject.kres.shared.transformation.OWLAPIToClerezzaConverter;
@Provider
Modified:
incubator/stanbol/trunk/kres/eu.iksproject.kres.jersey/src/test/java/eu/iksproject/kres/jersey/JettyServerTest.java
URL:
http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/eu.iksproject.kres.jersey/src/test/java/eu/iksproject/kres/jersey/JettyServerTest.java?rev=1075265&r1=1075264&r2=1075265&view=diff
==============================================================================
---
incubator/stanbol/trunk/kres/eu.iksproject.kres.jersey/src/test/java/eu/iksproject/kres/jersey/JettyServerTest.java
(original)
+++
incubator/stanbol/trunk/kres/eu.iksproject.kres.jersey/src/test/java/eu/iksproject/kres/jersey/JettyServerTest.java
Mon Feb 28 10:14:23 2011
@@ -18,7 +18,7 @@ import com.sun.jersey.api.client.WebReso
import com.sun.jersey.api.client.ClientResponse.Status;
import com.sun.jersey.api.representation.Form;
-import eu.iksproject.kres.api.format.KReSFormat;
+import eu.iksproject.kres.jersey.format.KReSFormat;
public class JettyServerTest {
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=1075265&r1=1075264&r2=1075265&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
Mon Feb 28 10:14:23 2011
@@ -1,14 +1,8 @@
package eu.iksproject.kres.rules;
-import java.net.URI;
-import java.net.URISyntaxException;
-import java.util.ArrayList;
-import java.util.Collections;
import java.util.HashSet;
import java.util.Set;
-import javax.ws.rs.HEAD;
-
import org.semanticweb.owlapi.model.IRI;
import org.semanticweb.owlapi.model.OWLDataFactory;
import org.semanticweb.owlapi.model.SWRLAtom;
@@ -22,7 +16,6 @@ import com.hp.hpl.jena.rdf.model.Resourc
import eu.iksproject.kres.api.rules.KReSRule;
import eu.iksproject.kres.api.rules.KReSRuleAtom;
import eu.iksproject.kres.api.rules.util.AtomList;
-import eu.iksproject.kres.api.rules.Recipe;
import eu.iksproject.kres.ontologies.SWRL;
public class KReSRuleImpl implements KReSRule {
