You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stanbol.apache.org by fc...@apache.org on 2011/03/28 14:17:42 UTC
svn commit: r1086204 - in
/incubator/stanbol/branches/http-endpoint-refactoring: ./ commons/web/
commons/web/src/main/java/org/apache/stanbol/commons/web/
entityhub/indexing/dblp/ entityhub/indexing/dbpedia/ kres/jersey/
kres/jersey/src/main/java/org/a...
Author: fchrist
Date: Mon Mar 28 12:17:41 2011
New Revision: 1086204
URL: http://svn.apache.org/viewvc?rev=1086204&view=rev
Log:
STANBOL-120 Merged latest changes from trunk into this refactoring branch
Added:
incubator/stanbol/branches/http-endpoint-refactoring/commons/web/src/main/java/org/apache/stanbol/commons/web/JaxrsResource.java
incubator/stanbol/branches/http-endpoint-refactoring/kres/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/session/SessionManager.java
- copied unchanged from r1086136, incubator/stanbol/trunk/kres/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/session/SessionManager.java
incubator/stanbol/branches/http-endpoint-refactoring/kres/ontologymanager/pom.xml
- copied unchanged from r1086136, incubator/stanbol/trunk/kres/ontologymanager/pom.xml
incubator/stanbol/branches/http-endpoint-refactoring/kres/reasoners/pom.xml
- copied unchanged from r1086136, incubator/stanbol/trunk/kres/reasoners/pom.xml
incubator/stanbol/branches/http-endpoint-refactoring/kres/reengineer/base/src/main/java/org/apache/stanbol/reengineer/base/api/util/URIGenerator.java
- copied unchanged from r1086136, incubator/stanbol/trunk/kres/reengineer/base/src/main/java/org/apache/stanbol/reengineer/base/api/util/URIGenerator.java
incubator/stanbol/branches/http-endpoint-refactoring/kres/reengineer/pom.xml
- copied unchanged from r1086136, incubator/stanbol/trunk/kres/reengineer/pom.xml
incubator/stanbol/branches/http-endpoint-refactoring/kres/rules/pom.xml
- copied unchanged from r1086136, incubator/stanbol/trunk/kres/rules/pom.xml
Removed:
incubator/stanbol/branches/http-endpoint-refactoring/kres/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/session/KReSSessionManager.java
incubator/stanbol/branches/http-endpoint-refactoring/kres/reengineer/xerces/src/main/java/eu/iksproject/kres/shared/dependency/xerces/
incubator/stanbol/branches/http-endpoint-refactoring/kres/reengineer/xerces/src/main/resources/eu/iksproject/kres/shared/dependency/xerces/
incubator/stanbol/branches/http-endpoint-refactoring/kres/reengineer/xerces/src/test/java/eu/iksproject/kres/shared/dependency/xerces/
incubator/stanbol/branches/http-endpoint-refactoring/kres/reengineer/xml/src/main/java/eu/iksproject/kres/semion/reengineer/
Modified:
incubator/stanbol/branches/http-endpoint-refactoring/ (props changed)
incubator/stanbol/branches/http-endpoint-refactoring/commons/web/pom.xml
incubator/stanbol/branches/http-endpoint-refactoring/entityhub/indexing/dblp/pom.xml
incubator/stanbol/branches/http-endpoint-refactoring/entityhub/indexing/dbpedia/pom.xml
incubator/stanbol/branches/http-endpoint-refactoring/kres/jersey/pom.xml
incubator/stanbol/branches/http-endpoint-refactoring/kres/jersey/src/main/java/org/apache/stanbol/kres/jersey/JerseyEndpoint.java
incubator/stanbol/branches/http-endpoint-refactoring/kres/jersey/src/main/java/org/apache/stanbol/kres/jersey/resource/KReSSessionIDResource.java
incubator/stanbol/branches/http-endpoint-refactoring/kres/jersey/src/main/java/org/apache/stanbol/kres/jersey/resource/KReSSessionResource.java
incubator/stanbol/branches/http-endpoint-refactoring/kres/jersey/src/main/java/org/apache/stanbol/kres/jersey/resource/NavigationMixin.java
incubator/stanbol/branches/http-endpoint-refactoring/kres/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/ONManager.java
incubator/stanbol/branches/http-endpoint-refactoring/kres/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/impl/ONManagerImpl.java
incubator/stanbol/branches/http-endpoint-refactoring/kres/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/impl/session/SessionManagerImpl.java
incubator/stanbol/branches/http-endpoint-refactoring/kres/ontologymanager/ontonet/src/test/java/org/apache/stanbol/ontologymanager/ontonet/session/TestSessions.java
incubator/stanbol/branches/http-endpoint-refactoring/kres/ontologymanager/web/pom.xml
incubator/stanbol/branches/http-endpoint-refactoring/kres/owlapi/pom.xml
incubator/stanbol/branches/http-endpoint-refactoring/kres/reasoners/web/pom.xml
incubator/stanbol/branches/http-endpoint-refactoring/kres/reasoners/web/src/test/java/org/apache/stanbol/reasoners/web/ClassifyTest.java
incubator/stanbol/branches/http-endpoint-refactoring/kres/reasoners/web/src/test/java/org/apache/stanbol/reasoners/web/ConsistencyCheckTest.java
incubator/stanbol/branches/http-endpoint-refactoring/kres/reasoners/web/src/test/java/org/apache/stanbol/reasoners/web/EnrichmentTest.java
incubator/stanbol/branches/http-endpoint-refactoring/kres/reengineer/base/pom.xml
incubator/stanbol/branches/http-endpoint-refactoring/kres/reengineer/base/src/main/java/org/apache/stanbol/reengineer/base/api/datasources/RDB.java
incubator/stanbol/branches/http-endpoint-refactoring/kres/reengineer/db/pom.xml
incubator/stanbol/branches/http-endpoint-refactoring/kres/reengineer/db/src/main/java/org/apache/stanbol/reengineer/db/DBExtractor.java
incubator/stanbol/branches/http-endpoint-refactoring/kres/reengineer/web/pom.xml
incubator/stanbol/branches/http-endpoint-refactoring/kres/reengineer/xml/pom.xml
incubator/stanbol/branches/http-endpoint-refactoring/kres/reengineer/xml/src/main/java/org/apache/stanbol/reengineer/xml/XMLExtractor.java
incubator/stanbol/branches/http-endpoint-refactoring/kres/reengineer/xml/src/main/java/org/apache/stanbol/reengineer/xml/vocab/XML.java
incubator/stanbol/branches/http-endpoint-refactoring/kres/reengineer/xml/src/main/java/org/apache/stanbol/reengineer/xml/vocab/XSD.java
incubator/stanbol/branches/http-endpoint-refactoring/kres/rules/base/src/main/java/org/apache/stanbol/rules/base/api/Recipe.java
incubator/stanbol/branches/http-endpoint-refactoring/kres/rules/base/src/main/java/org/apache/stanbol/rules/base/api/util/AtomIterator.java
incubator/stanbol/branches/http-endpoint-refactoring/kres/rules/manager/pom.xml
incubator/stanbol/branches/http-endpoint-refactoring/kres/rules/refactor/pom.xml
incubator/stanbol/branches/http-endpoint-refactoring/kres/rules/refactor/src/main/java/org/apache/stanbol/rules/refactor/impl/RefactorerImpl.java
incubator/stanbol/branches/http-endpoint-refactoring/kres/rules/web/pom.xml
incubator/stanbol/branches/http-endpoint-refactoring/kres/rules/web/src/test/java/org/apache/stanbol/rules/web/RecipeTest.java
incubator/stanbol/branches/http-endpoint-refactoring/kres/rules/web/src/test/java/org/apache/stanbol/rules/web/RuleTest.java
Propchange: incubator/stanbol/branches/http-endpoint-refactoring/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Mar 28 12:17:41 2011
@@ -1 +1 @@
-/incubator/stanbol/trunk:1084917-1085446
+/incubator/stanbol/trunk:1084917-1086136
Modified: incubator/stanbol/branches/http-endpoint-refactoring/commons/web/pom.xml
URL: http://svn.apache.org/viewvc/incubator/stanbol/branches/http-endpoint-refactoring/commons/web/pom.xml?rev=1086204&r1=1086203&r2=1086204&view=diff
==============================================================================
--- incubator/stanbol/branches/http-endpoint-refactoring/commons/web/pom.xml (original)
+++ incubator/stanbol/branches/http-endpoint-refactoring/commons/web/pom.xml Mon Mar 28 12:17:41 2011
@@ -6,7 +6,7 @@
<parent>
<groupId>org.apache.stanbol</groupId>
<artifactId>stanbol-parent</artifactId>
- <version>0.9-SNAPSHOT</version>
+ <version>${stanbol-version}</version>
<relativePath>../../parent/pom.xml</relativePath>
</parent>
Added: incubator/stanbol/branches/http-endpoint-refactoring/commons/web/src/main/java/org/apache/stanbol/commons/web/JaxrsResource.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/branches/http-endpoint-refactoring/commons/web/src/main/java/org/apache/stanbol/commons/web/JaxrsResource.java?rev=1086204&view=auto
==============================================================================
--- incubator/stanbol/branches/http-endpoint-refactoring/commons/web/src/main/java/org/apache/stanbol/commons/web/JaxrsResource.java (added)
+++ incubator/stanbol/branches/http-endpoint-refactoring/commons/web/src/main/java/org/apache/stanbol/commons/web/JaxrsResource.java Mon Mar 28 12:17:41 2011
@@ -0,0 +1,5 @@
+package org.apache.stanbol.commons.web;
+
+public interface JaxrsResource {
+
+}
Modified: incubator/stanbol/branches/http-endpoint-refactoring/entityhub/indexing/dblp/pom.xml
URL: http://svn.apache.org/viewvc/incubator/stanbol/branches/http-endpoint-refactoring/entityhub/indexing/dblp/pom.xml?rev=1086204&r1=1086203&r2=1086204&view=diff
==============================================================================
--- incubator/stanbol/branches/http-endpoint-refactoring/entityhub/indexing/dblp/pom.xml (original)
+++ incubator/stanbol/branches/http-endpoint-refactoring/entityhub/indexing/dblp/pom.xml Mon Mar 28 12:17:41 2011
@@ -82,7 +82,7 @@
</dependency>
<dependency>
<groupId>org.apache.stanbol</groupId>
- <artifactId>org.apache.stanbol.entityhub.indexing.genericRdf</artifactId>
+ <artifactId>org.apache.stanbol.entityhub.indexing.genericrdf</artifactId>
<version>0.9-SNAPSHOT</version>
</dependency>
<!-- for the main -->
Modified: incubator/stanbol/branches/http-endpoint-refactoring/entityhub/indexing/dbpedia/pom.xml
URL: http://svn.apache.org/viewvc/incubator/stanbol/branches/http-endpoint-refactoring/entityhub/indexing/dbpedia/pom.xml?rev=1086204&r1=1086203&r2=1086204&view=diff
==============================================================================
--- incubator/stanbol/branches/http-endpoint-refactoring/entityhub/indexing/dbpedia/pom.xml (original)
+++ incubator/stanbol/branches/http-endpoint-refactoring/entityhub/indexing/dbpedia/pom.xml Mon Mar 28 12:17:41 2011
@@ -78,7 +78,7 @@
</dependency>
<dependency>
<groupId>org.apache.stanbol</groupId>
- <artifactId>org.apache.stanbol.entityhub.indexing.genericRdf</artifactId>
+ <artifactId>org.apache.stanbol.entityhub.indexing.genericrdf</artifactId>
<version>0.9-SNAPSHOT</version>
</dependency>
<!-- for the main -->
Modified: incubator/stanbol/branches/http-endpoint-refactoring/kres/jersey/pom.xml
URL: http://svn.apache.org/viewvc/incubator/stanbol/branches/http-endpoint-refactoring/kres/jersey/pom.xml?rev=1086204&r1=1086203&r2=1086204&view=diff
==============================================================================
--- incubator/stanbol/branches/http-endpoint-refactoring/kres/jersey/pom.xml (original)
+++ incubator/stanbol/branches/http-endpoint-refactoring/kres/jersey/pom.xml Mon Mar 28 12:17:41 2011
@@ -208,57 +208,30 @@
<scope>test</scope>
</dependency>
+ <!-- Stanbol deps -->
<dependency>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.ontologymanager.ontonet</artifactId>
<version>${stanbol-version}</version>
</dependency>
- <!--
- <dependency>
- <groupId>org.apache.stanbol</groupId>
- <artifactId>org.apache.stanbol.ontologymanager.store</artifactId>
- <version>${stanbol-version}</version>
- </dependency>
- -->
- <dependency>
- <groupId>org.apache.stanbol</groupId>
- <artifactId>org.apache.stanbol.reasoners.base</artifactId>
- <version>${stanbol-version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.stanbol</groupId>
- <artifactId>org.apache.stanbol.reengineer.base</artifactId>
- <version>${stanbol-version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.stanbol</groupId>
- <artifactId>org.apache.stanbol.rules.manager</artifactId>
- <version>${stanbol-version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.stanbol</groupId>
- <artifactId>org.apache.stanbol.rules.refactor</artifactId>
- <version>${stanbol-version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.stanbol</groupId>
- <artifactId>org.apache.stanbol.owlapi</artifactId>
- <version>${stanbol-version}</version>
- <scope>provided</scope>
- </dependency>
-
+
+ <!-- OWL deps -->
<dependency>
<groupId>com.hp.hpl.jena</groupId>
<artifactId>jena</artifactId>
<version>2.6.2</version>
<scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>owlapi</groupId>
+ <artifactId>owlapi</artifactId>
+ <version>3.0.0</version>
+ <scope>provided</scope>
+ </dependency>
+
</dependencies>
-
-
-
<repositories>
<!-- needed for jersey -->
<repository>
Modified: incubator/stanbol/branches/http-endpoint-refactoring/kres/jersey/src/main/java/org/apache/stanbol/kres/jersey/JerseyEndpoint.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/branches/http-endpoint-refactoring/kres/jersey/src/main/java/org/apache/stanbol/kres/jersey/JerseyEndpoint.java?rev=1086204&r1=1086203&r2=1086204&view=diff
==============================================================================
--- incubator/stanbol/branches/http-endpoint-refactoring/kres/jersey/src/main/java/org/apache/stanbol/kres/jersey/JerseyEndpoint.java (original)
+++ incubator/stanbol/branches/http-endpoint-refactoring/kres/jersey/src/main/java/org/apache/stanbol/kres/jersey/JerseyEndpoint.java Mon Mar 28 12:17:41 2011
@@ -12,9 +12,7 @@ import org.apache.clerezza.rdf.core.seri
import org.apache.felix.scr.annotations.Component;
import org.apache.felix.scr.annotations.Property;
import org.apache.felix.scr.annotations.Reference;
-import org.apache.stanbol.ontologymanager.ontonet.api.ONManager;
-import org.apache.stanbol.reengineer.base.api.ReengineerManager;
-import org.apache.stanbol.reengineer.base.api.Reengineer;
+import org.apache.stanbol.kres.jersey.processors.KReSViewProcessor;
import org.osgi.framework.BundleContext;
import org.osgi.service.component.ComponentContext;
import org.osgi.service.http.HttpService;
@@ -24,8 +22,6 @@ import org.slf4j.LoggerFactory;
import com.sun.jersey.spi.container.servlet.ServletContainer;
-import org.apache.stanbol.kres.jersey.processors.KReSViewProcessor;
-
/**
* Jersey-based RESTful endpoint for KReS.
*
Modified: incubator/stanbol/branches/http-endpoint-refactoring/kres/jersey/src/main/java/org/apache/stanbol/kres/jersey/resource/KReSSessionIDResource.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/branches/http-endpoint-refactoring/kres/jersey/src/main/java/org/apache/stanbol/kres/jersey/resource/KReSSessionIDResource.java?rev=1086204&r1=1086203&r2=1086204&view=diff
==============================================================================
--- incubator/stanbol/branches/http-endpoint-refactoring/kres/jersey/src/main/java/org/apache/stanbol/kres/jersey/resource/KReSSessionIDResource.java (original)
+++ incubator/stanbol/branches/http-endpoint-refactoring/kres/jersey/src/main/java/org/apache/stanbol/kres/jersey/resource/KReSSessionIDResource.java Mon Mar 28 12:17:41 2011
@@ -13,7 +13,7 @@ import javax.ws.rs.core.Response.Status;
import org.apache.stanbol.ontologymanager.ontonet.api.ONManager;
import org.apache.stanbol.ontologymanager.ontonet.api.session.Session;
-import org.apache.stanbol.ontologymanager.ontonet.api.session.KReSSessionManager;
+import org.apache.stanbol.ontologymanager.ontonet.api.session.SessionManager;
import org.apache.stanbol.ontologymanager.ontonet.impl.ONManagerImpl;
import org.apache.stanbol.ontologymanager.ontonet.impl.renderers.SessionRenderer;
import org.semanticweb.owlapi.model.IRI;
@@ -46,7 +46,7 @@ public class KReSSessionIDResource exten
@Context HttpHeaders headers) {
Session ses = null;
- KReSSessionManager mgr = onm.getSessionManager();
+ SessionManager mgr = onm.getSessionManager();
ses = mgr.getSession(IRI.create(sessionId));
if (ses == null)
return Response.status(Status.NO_CONTENT).build();
Modified: incubator/stanbol/branches/http-endpoint-refactoring/kres/jersey/src/main/java/org/apache/stanbol/kres/jersey/resource/KReSSessionResource.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/branches/http-endpoint-refactoring/kres/jersey/src/main/java/org/apache/stanbol/kres/jersey/resource/KReSSessionResource.java?rev=1086204&r1=1086203&r2=1086204&view=diff
==============================================================================
--- incubator/stanbol/branches/http-endpoint-refactoring/kres/jersey/src/main/java/org/apache/stanbol/kres/jersey/resource/KReSSessionResource.java (original)
+++ incubator/stanbol/branches/http-endpoint-refactoring/kres/jersey/src/main/java/org/apache/stanbol/kres/jersey/resource/KReSSessionResource.java Mon Mar 28 12:17:41 2011
@@ -31,7 +31,7 @@ import org.apache.stanbol.ontologymanage
import org.apache.stanbol.ontologymanager.ontonet.api.ontology.SessionOntologySpace;
import org.apache.stanbol.ontologymanager.ontonet.api.ontology.UnmodifiableOntologySpaceException;
import org.apache.stanbol.ontologymanager.ontonet.api.session.Session;
-import org.apache.stanbol.ontologymanager.ontonet.api.session.KReSSessionManager;
+import org.apache.stanbol.ontologymanager.ontonet.api.session.SessionManager;
import org.apache.stanbol.ontologymanager.ontonet.impl.ONManagerImpl;
import org.apache.stanbol.ontologymanager.ontonet.impl.renderers.SessionRenderer;
import org.semanticweb.owlapi.model.IRI;
@@ -128,7 +128,7 @@ public class KReSSessionResource extends
@Context HttpHeaders headers) {
Session ses = null;
- KReSSessionManager mgr = onm.getSessionManager();
+ SessionManager mgr = onm.getSessionManager();
/*
* Create the KReS session to associate to the scope.
Modified: incubator/stanbol/branches/http-endpoint-refactoring/kres/jersey/src/main/java/org/apache/stanbol/kres/jersey/resource/NavigationMixin.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/branches/http-endpoint-refactoring/kres/jersey/src/main/java/org/apache/stanbol/kres/jersey/resource/NavigationMixin.java?rev=1086204&r1=1086203&r2=1086204&view=diff
==============================================================================
--- incubator/stanbol/branches/http-endpoint-refactoring/kres/jersey/src/main/java/org/apache/stanbol/kres/jersey/resource/NavigationMixin.java (original)
+++ incubator/stanbol/branches/http-endpoint-refactoring/kres/jersey/src/main/java/org/apache/stanbol/kres/jersey/resource/NavigationMixin.java Mon Mar 28 12:17:41 2011
@@ -7,9 +7,6 @@ import java.util.List;
import javax.ws.rs.core.Context;
import javax.ws.rs.core.UriInfo;
-import org.apache.commons.io.LineIterator;
-import org.apache.commons.lang.ArrayUtils;
-
public class NavigationMixin {
@Context
Modified: incubator/stanbol/branches/http-endpoint-refactoring/kres/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/ONManager.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/branches/http-endpoint-refactoring/kres/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/ONManager.java?rev=1086204&r1=1086203&r2=1086204&view=diff
==============================================================================
--- incubator/stanbol/branches/http-endpoint-refactoring/kres/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/ONManager.java (original)
+++ incubator/stanbol/branches/http-endpoint-refactoring/kres/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/api/ONManager.java Mon Mar 28 12:17:41 2011
@@ -5,7 +5,7 @@ import org.apache.stanbol.ontologymanage
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.registry.RegistryLoader;
-import org.apache.stanbol.ontologymanager.ontonet.api.session.KReSSessionManager;
+import org.apache.stanbol.ontologymanager.ontonet.api.session.SessionManager;
import org.apache.stanbol.ontologymanager.ontonet.impl.io.ClerezzaOntologyStorage;
import org.semanticweb.owlapi.model.OWLDataFactory;
import org.semanticweb.owlapi.model.OWLOntologyAlreadyExistsException;
@@ -88,7 +88,7 @@ public interface ONManager {
*
* @return the KreS session manager.
*/
- public KReSSessionManager getSessionManager();
+ public SessionManager getSessionManager();
/**
* Returns the list of IRIs that identify scopes that should be activated on
Modified: incubator/stanbol/branches/http-endpoint-refactoring/kres/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/impl/ONManagerImpl.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/branches/http-endpoint-refactoring/kres/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/impl/ONManagerImpl.java?rev=1086204&r1=1086203&r2=1086204&view=diff
==============================================================================
--- incubator/stanbol/branches/http-endpoint-refactoring/kres/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/impl/ONManagerImpl.java (original)
+++ incubator/stanbol/branches/http-endpoint-refactoring/kres/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/impl/ONManagerImpl.java Mon Mar 28 12:17:41 2011
@@ -28,7 +28,7 @@ import org.apache.stanbol.ontologymanage
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.ontonet.api.session.SessionManager;
import org.apache.stanbol.ontologymanager.ontonet.impl.io.ClerezzaOntologyStorage;
import org.apache.stanbol.ontologymanager.ontonet.impl.io.InMemoryOntologyStorage;
import org.apache.stanbol.ontologymanager.ontonet.impl.ontology.OntologyIndexImpl;
@@ -106,7 +106,7 @@ public class ONManagerImpl implements ON
private ScopeRegistry scopeRegistry;
- private KReSSessionManager sessionManager;
+ private SessionManager sessionManager;
@Reference
private TcManager tcm;
@@ -427,7 +427,7 @@ public class ONManagerImpl implements ON
return scopeRegistry;
}
- public KReSSessionManager getSessionManager() {
+ public SessionManager getSessionManager() {
return sessionManager;
}
Modified: incubator/stanbol/branches/http-endpoint-refactoring/kres/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/impl/session/SessionManagerImpl.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/branches/http-endpoint-refactoring/kres/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/impl/session/SessionManagerImpl.java?rev=1086204&r1=1086203&r2=1086204&view=diff
==============================================================================
--- incubator/stanbol/branches/http-endpoint-refactoring/kres/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/impl/session/SessionManagerImpl.java (original)
+++ incubator/stanbol/branches/http-endpoint-refactoring/kres/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/impl/session/SessionManagerImpl.java Mon Mar 28 12:17:41 2011
@@ -13,7 +13,7 @@ import org.apache.stanbol.ontologymanage
import org.apache.stanbol.ontologymanager.ontonet.api.session.DuplicateSessionIDException;
import org.apache.stanbol.ontologymanager.ontonet.api.session.Session;
import org.apache.stanbol.ontologymanager.ontonet.api.session.SessionIDGenerator;
-import org.apache.stanbol.ontologymanager.ontonet.api.session.KReSSessionManager;
+import org.apache.stanbol.ontologymanager.ontonet.api.session.SessionManager;
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;
@@ -35,7 +35,7 @@ import org.slf4j.LoggerFactory;
* @author alessandro
*
*/
-public class SessionManagerImpl implements KReSSessionManager {
+public class SessionManagerImpl implements SessionManager {
private Map<IRI, Session> sessionsByID;
Modified: incubator/stanbol/branches/http-endpoint-refactoring/kres/ontologymanager/ontonet/src/test/java/org/apache/stanbol/ontologymanager/ontonet/session/TestSessions.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/branches/http-endpoint-refactoring/kres/ontologymanager/ontonet/src/test/java/org/apache/stanbol/ontologymanager/ontonet/session/TestSessions.java?rev=1086204&r1=1086203&r2=1086204&view=diff
==============================================================================
--- incubator/stanbol/branches/http-endpoint-refactoring/kres/ontologymanager/ontonet/src/test/java/org/apache/stanbol/ontologymanager/ontonet/session/TestSessions.java (original)
+++ incubator/stanbol/branches/http-endpoint-refactoring/kres/ontologymanager/ontonet/src/test/java/org/apache/stanbol/ontologymanager/ontonet/session/TestSessions.java Mon Mar 28 12:17:41 2011
@@ -21,7 +21,7 @@ import org.apache.stanbol.ontologymanage
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.Session;
-import org.apache.stanbol.ontologymanager.ontonet.api.session.KReSSessionManager;
+import org.apache.stanbol.ontologymanager.ontonet.api.session.SessionManager;
import org.apache.stanbol.ontologymanager.ontonet.api.session.NonReferenceableSessionException;
import org.apache.stanbol.ontologymanager.ontonet.api.session.Session.State;
import org.apache.stanbol.ontologymanager.ontonet.impl.ONManagerImpl;
@@ -46,7 +46,7 @@ public class TestSessions {
private static ScopeRegistry scopeRegistry = null;
- private static KReSSessionManager sesmgr = null;
+ private static SessionManager sesmgr = null;
private static OntologySpaceFactory spaceFactory = null;
Modified: incubator/stanbol/branches/http-endpoint-refactoring/kres/ontologymanager/web/pom.xml
URL: http://svn.apache.org/viewvc/incubator/stanbol/branches/http-endpoint-refactoring/kres/ontologymanager/web/pom.xml?rev=1086204&r1=1086203&r2=1086204&view=diff
==============================================================================
--- incubator/stanbol/branches/http-endpoint-refactoring/kres/ontologymanager/web/pom.xml (original)
+++ incubator/stanbol/branches/http-endpoint-refactoring/kres/ontologymanager/web/pom.xml Mon Mar 28 12:17:41 2011
@@ -164,6 +164,20 @@
<version>1.2.0</version>
<scope>provided</scope>
</dependency>
+
+ <!-- Stanbol deps -->
+ <dependency>
+ <groupId>org.apache.stanbol</groupId>
+ <artifactId>org.apache.stanbol.kres.jersey</artifactId>
+ <version>${stanbol-version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.stanbol</groupId>
+ <artifactId>org.apache.stanbol.ontologymanager.ontonet</artifactId>
+ <version>${stanbol-version}</version>
+ <scope>provided</scope>
+ </dependency>
<!-- for tests -->
<dependency>
@@ -207,53 +221,7 @@
<version>${pax-exam-version}</version>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.apache.stanbol</groupId>
- <artifactId>org.apache.stanbol.ontologymanager.ontonet</artifactId>
- <version>${stanbol-version}</version>
- </dependency>
- <!--<dependency>
- <groupId>org.apache.stanbol</groupId>
- <artifactId>org.apache.stanbol.ontologymanager.store</artifactId>
- <version>${stanbol-version}</version>
- </dependency>-->
- <dependency>
- <groupId>org.apache.stanbol</groupId>
- <artifactId>org.apache.stanbol.reasoners.base</artifactId>
- <version>${stanbol-version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.stanbol</groupId>
- <artifactId>org.apache.stanbol.rules.base</artifactId>
- <version>${stanbol-version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.stanbol</groupId>
- <artifactId>org.apache.stanbol.reengineer.base</artifactId>
- <version>${stanbol-version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.stanbol</groupId>
- <artifactId>org.apache.stanbol.rules.manager</artifactId>
- <version>${stanbol-version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.stanbol</groupId>
- <artifactId>org.apache.stanbol.rules.refactor</artifactId>
- <version>${stanbol-version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.stanbol</groupId>
- <artifactId>org.apache.stanbol.kres.jersey</artifactId>
- <version>${stanbol-version}</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.stanbol</groupId>
- <artifactId>org.apache.stanbol.owlapi</artifactId>
- <version>${stanbol-version}</version>
- <scope>provided</scope>
- </dependency>
+
<dependency>
<groupId>com.hp.hpl.jena</groupId>
<artifactId>jena</artifactId>
@@ -262,10 +230,6 @@
</dependency>
</dependencies>
-
-
-
-
<repositories>
<!-- needed for jersey -->
<repository>
Modified: incubator/stanbol/branches/http-endpoint-refactoring/kres/owlapi/pom.xml
URL: http://svn.apache.org/viewvc/incubator/stanbol/branches/http-endpoint-refactoring/kres/owlapi/pom.xml?rev=1086204&r1=1086203&r2=1086204&view=diff
==============================================================================
--- incubator/stanbol/branches/http-endpoint-refactoring/kres/owlapi/pom.xml (original)
+++ incubator/stanbol/branches/http-endpoint-refactoring/kres/owlapi/pom.xml Mon Mar 28 12:17:41 2011
@@ -29,7 +29,7 @@
<artifactId>org.apache.stanbol.owlapi</artifactId>
<version>${stanbol-version}</version>
<packaging>bundle</packaging>
- <name>Apache Stanbol Owlapi Dependecy</name>
+ <name>Apache Stanbol OSGi bundle for OWL API</name>
<repositories>
<repository>
Modified: incubator/stanbol/branches/http-endpoint-refactoring/kres/reasoners/web/pom.xml
URL: http://svn.apache.org/viewvc/incubator/stanbol/branches/http-endpoint-refactoring/kres/reasoners/web/pom.xml?rev=1086204&r1=1086203&r2=1086204&view=diff
==============================================================================
--- incubator/stanbol/branches/http-endpoint-refactoring/kres/reasoners/web/pom.xml (original)
+++ incubator/stanbol/branches/http-endpoint-refactoring/kres/reasoners/web/pom.xml Mon Mar 28 12:17:41 2011
@@ -208,51 +208,35 @@
<scope>test</scope>
</dependency>
- <dependency>
+ <!-- Stanbol deps -->
+ <dependency>
<groupId>org.apache.stanbol</groupId>
- <artifactId>org.apache.stanbol.ontologymanager.ontonet</artifactId>
+ <artifactId>org.apache.stanbol.kres.jersey</artifactId>
<version>${stanbol-version}</version>
+ <scope>provided</scope>
</dependency>
- <!--<dependency>
+ <dependency>
<groupId>org.apache.stanbol</groupId>
- <artifactId>org.apache.stanbol.ontologymanager.store</artifactId>
+ <artifactId>org.apache.stanbol.ontologymanager.ontonet</artifactId>
<version>${stanbol-version}</version>
- </dependency>-->
+ <scope>provided</scope>
+ </dependency>
<dependency>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.reasoners.base</artifactId>
<version>${stanbol-version}</version>
+ <scope>provided</scope>
</dependency>
- <dependency>
+ <dependency>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.rules.base</artifactId>
<version>${stanbol-version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.stanbol</groupId>
- <artifactId>org.apache.stanbol.reengineer.base</artifactId>
- <version>${stanbol-version}</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.rules.manager</artifactId>
<version>${stanbol-version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.stanbol</groupId>
- <artifactId>org.apache.stanbol.rules.refactor</artifactId>
- <version>${stanbol-version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.stanbol</groupId>
- <artifactId>org.apache.stanbol.kres.jersey</artifactId>
- <version>${stanbol-version}</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.stanbol</groupId>
- <artifactId>org.apache.stanbol.owlapi</artifactId>
- <version>${stanbol-version}</version>
<scope>provided</scope>
</dependency>
@@ -262,12 +246,16 @@
<version>2.6.2</version>
<scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>owlapi</groupId>
+ <artifactId>owlapi</artifactId>
+ <version>3.0.0</version>
+ <scope>provided</scope>
+ </dependency>
+
</dependencies>
-
-
-
<repositories>
<!-- needed for jersey -->
<repository>
Modified: incubator/stanbol/branches/http-endpoint-refactoring/kres/reasoners/web/src/test/java/org/apache/stanbol/reasoners/web/ClassifyTest.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/branches/http-endpoint-refactoring/kres/reasoners/web/src/test/java/org/apache/stanbol/reasoners/web/ClassifyTest.java?rev=1086204&r1=1086203&r2=1086204&view=diff
==============================================================================
--- incubator/stanbol/branches/http-endpoint-refactoring/kres/reasoners/web/src/test/java/org/apache/stanbol/reasoners/web/ClassifyTest.java (original)
+++ incubator/stanbol/branches/http-endpoint-refactoring/kres/reasoners/web/src/test/java/org/apache/stanbol/reasoners/web/ClassifyTest.java Mon Mar 28 12:17:41 2011
@@ -5,25 +5,17 @@
package org.apache.stanbol.reasoners.web;
-import java.util.Iterator;
-import org.semanticweb.owlapi.model.OWLAxiom;
-import org.semanticweb.owlapi.model.OWLOntology;
-import org.semanticweb.owlapi.apibinding.OWLManager;
-import com.sun.jersey.api.client.ClientResponse;
-import javax.ws.rs.core.MediaType;
-import com.sun.jersey.api.representation.Form;
-import com.sun.jersey.api.client.WebResource;
-import com.sun.jersey.api.client.Client;
import org.apache.stanbol.kres.jersey.JettyServer;
-import java.io.File;
import org.junit.After;
import org.junit.AfterClass;
import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.Test;
-import static org.junit.Assert.*;
import org.semanticweb.owlapi.model.OWLOntologyCreationException;
+import com.sun.jersey.api.client.Client;
+import com.sun.jersey.api.client.WebResource;
+
/**
*
* @author elvio
Modified: incubator/stanbol/branches/http-endpoint-refactoring/kres/reasoners/web/src/test/java/org/apache/stanbol/reasoners/web/ConsistencyCheckTest.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/branches/http-endpoint-refactoring/kres/reasoners/web/src/test/java/org/apache/stanbol/reasoners/web/ConsistencyCheckTest.java?rev=1086204&r1=1086203&r2=1086204&view=diff
==============================================================================
--- incubator/stanbol/branches/http-endpoint-refactoring/kres/reasoners/web/src/test/java/org/apache/stanbol/reasoners/web/ConsistencyCheckTest.java (original)
+++ incubator/stanbol/branches/http-endpoint-refactoring/kres/reasoners/web/src/test/java/org/apache/stanbol/reasoners/web/ConsistencyCheckTest.java Mon Mar 28 12:17:41 2011
@@ -5,19 +5,15 @@
package org.apache.stanbol.reasoners.web;
-import com.sun.jersey.api.client.ClientResponse;
-import javax.ws.rs.core.MediaType;
-import com.sun.jersey.api.representation.Form;
-import com.sun.jersey.api.client.WebResource;
-import com.sun.jersey.api.client.Client;
import org.apache.stanbol.kres.jersey.JettyServer;
-import java.io.File;
import org.junit.After;
import org.junit.AfterClass;
import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.Test;
-import static org.junit.Assert.*;
+
+import com.sun.jersey.api.client.Client;
+import com.sun.jersey.api.client.WebResource;
/**
*
Modified: incubator/stanbol/branches/http-endpoint-refactoring/kres/reasoners/web/src/test/java/org/apache/stanbol/reasoners/web/EnrichmentTest.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/branches/http-endpoint-refactoring/kres/reasoners/web/src/test/java/org/apache/stanbol/reasoners/web/EnrichmentTest.java?rev=1086204&r1=1086203&r2=1086204&view=diff
==============================================================================
--- incubator/stanbol/branches/http-endpoint-refactoring/kres/reasoners/web/src/test/java/org/apache/stanbol/reasoners/web/EnrichmentTest.java (original)
+++ incubator/stanbol/branches/http-endpoint-refactoring/kres/reasoners/web/src/test/java/org/apache/stanbol/reasoners/web/EnrichmentTest.java Mon Mar 28 12:17:41 2011
@@ -5,25 +5,17 @@
package org.apache.stanbol.reasoners.web;
-import org.semanticweb.owlapi.model.OWLOntology;
-import org.semanticweb.owlapi.apibinding.OWLManager;
-import com.sun.jersey.api.client.ClientResponse;
-import javax.ws.rs.core.MediaType;
-import com.sun.jersey.api.representation.Form;
-import com.sun.jersey.api.client.WebResource;
-import com.sun.jersey.api.client.Client;
import org.apache.stanbol.kres.jersey.JettyServer;
-import java.io.File;
-import java.util.Iterator;
import org.junit.After;
import org.junit.AfterClass;
import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.Test;
-import static org.junit.Assert.*;
-import org.semanticweb.owlapi.model.OWLAxiom;
import org.semanticweb.owlapi.model.OWLOntologyCreationException;
+import com.sun.jersey.api.client.Client;
+import com.sun.jersey.api.client.WebResource;
+
/**
*
* @author elvio
Modified: incubator/stanbol/branches/http-endpoint-refactoring/kres/reengineer/base/pom.xml
URL: http://svn.apache.org/viewvc/incubator/stanbol/branches/http-endpoint-refactoring/kres/reengineer/base/pom.xml?rev=1086204&r1=1086203&r2=1086204&view=diff
==============================================================================
--- incubator/stanbol/branches/http-endpoint-refactoring/kres/reengineer/base/pom.xml (original)
+++ incubator/stanbol/branches/http-endpoint-refactoring/kres/reengineer/base/pom.xml Mon Mar 28 12:17:41 2011
@@ -96,20 +96,10 @@
<!-- Stanbol deps -->
<dependency>
<groupId>org.apache.stanbol</groupId>
- <artifactId>org.apache.stanbol.owlapi</artifactId>
- <version>${stanbol-version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.ontologymanager.ontonet</artifactId>
<version>${stanbol-version}</version>
</dependency>
- <!-- NEEDED FOR Semion refactorer -->
- <dependency>
- <groupId>org.apache.stanbol</groupId>
- <artifactId>org.apache.stanbol.rules.refactor</artifactId>
- <version>${stanbol-version}</version>
- </dependency>
+
<dependency>
<groupId>owlapi</groupId>
<artifactId>owlapi</artifactId>
Modified: incubator/stanbol/branches/http-endpoint-refactoring/kres/reengineer/base/src/main/java/org/apache/stanbol/reengineer/base/api/datasources/RDB.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/branches/http-endpoint-refactoring/kres/reengineer/base/src/main/java/org/apache/stanbol/reengineer/base/api/datasources/RDB.java?rev=1086204&r1=1086203&r2=1086204&view=diff
==============================================================================
--- incubator/stanbol/branches/http-endpoint-refactoring/kres/reengineer/base/src/main/java/org/apache/stanbol/reengineer/base/api/datasources/RDB.java (original)
+++ incubator/stanbol/branches/http-endpoint-refactoring/kres/reengineer/base/src/main/java/org/apache/stanbol/reengineer/base/api/datasources/RDB.java Mon Mar 28 12:17:41 2011
@@ -3,8 +3,7 @@ package org.apache.stanbol.reengineer.ba
import org.apache.stanbol.reengineer.base.api.IdentifiedDataSource;
import org.apache.stanbol.reengineer.base.api.settings.ConnectionSettings;
import org.apache.stanbol.reengineer.base.api.util.ReengineerType;
-import org.apache.stanbol.rules.refactor.api.util.URIGenerator;
-
+import org.apache.stanbol.reengineer.base.api.util.URIGenerator;
/**
* An object representing a relational database in Semion.
Modified: incubator/stanbol/branches/http-endpoint-refactoring/kres/reengineer/db/pom.xml
URL: http://svn.apache.org/viewvc/incubator/stanbol/branches/http-endpoint-refactoring/kres/reengineer/db/pom.xml?rev=1086204&r1=1086203&r2=1086204&view=diff
==============================================================================
--- incubator/stanbol/branches/http-endpoint-refactoring/kres/reengineer/db/pom.xml (original)
+++ incubator/stanbol/branches/http-endpoint-refactoring/kres/reengineer/db/pom.xml Mon Mar 28 12:17:41 2011
@@ -110,11 +110,6 @@
<!-- Stanbol deps -->
<dependency>
<groupId>org.apache.stanbol</groupId>
- <artifactId>org.apache.stanbol.owlapi</artifactId>
- <version>${stanbol-version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.ontologymanager.ontonet</artifactId>
<version>${stanbol-version}</version>
</dependency>
@@ -124,7 +119,7 @@
<version>${stanbol-version}</version>
</dependency>
- <!-- Jena deps -->
+ <!-- OWL deps -->
<dependency>
<groupId>com.hp.hpl.jena</groupId>
<artifactId>iri</artifactId>
@@ -155,6 +150,11 @@
<version>0.8.5</version>
<scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>owlapi</groupId>
+ <artifactId>owlapi</artifactId>
+ <version>3.0.0</version>
+ </dependency>
<!-- Clerezza deps -->
<dependency>
Modified: incubator/stanbol/branches/http-endpoint-refactoring/kres/reengineer/db/src/main/java/org/apache/stanbol/reengineer/db/DBExtractor.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/branches/http-endpoint-refactoring/kres/reengineer/db/src/main/java/org/apache/stanbol/reengineer/db/DBExtractor.java?rev=1086204&r1=1086203&r2=1086204&view=diff
==============================================================================
--- incubator/stanbol/branches/http-endpoint-refactoring/kres/reengineer/db/src/main/java/org/apache/stanbol/reengineer/db/DBExtractor.java (original)
+++ incubator/stanbol/branches/http-endpoint-refactoring/kres/reengineer/db/src/main/java/org/apache/stanbol/reengineer/db/DBExtractor.java Mon Mar 28 12:17:41 2011
@@ -20,7 +20,7 @@ import org.apache.stanbol.ontologymanage
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.Session;
-import org.apache.stanbol.ontologymanager.ontonet.api.session.KReSSessionManager;
+import org.apache.stanbol.ontologymanager.ontonet.api.session.SessionManager;
import org.apache.stanbol.reengineer.base.api.DataSource;
import org.apache.stanbol.reengineer.base.api.ReengineeringException;
import org.apache.stanbol.reengineer.base.api.ReengineerManager;
@@ -197,7 +197,7 @@ public class DBExtractor implements Reen
reengineeringManager.bindReengineer(this);
- KReSSessionManager kReSSessionManager = onManager.getSessionManager();
+ SessionManager kReSSessionManager = onManager.getSessionManager();
Session kReSSession = kReSSessionManager.createSession();
kReSSessionID = kReSSession.getID();
Modified: incubator/stanbol/branches/http-endpoint-refactoring/kres/reengineer/web/pom.xml
URL: http://svn.apache.org/viewvc/incubator/stanbol/branches/http-endpoint-refactoring/kres/reengineer/web/pom.xml?rev=1086204&r1=1086203&r2=1086204&view=diff
==============================================================================
--- incubator/stanbol/branches/http-endpoint-refactoring/kres/reengineer/web/pom.xml (original)
+++ incubator/stanbol/branches/http-endpoint-refactoring/kres/reengineer/web/pom.xml Mon Mar 28 12:17:41 2011
@@ -208,60 +208,34 @@
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.apache.stanbol</groupId>
- <artifactId>org.apache.stanbol.ontologymanager.ontonet</artifactId>
- <version>${stanbol-version}</version>
- </dependency>
- <!--<dependency>
- <groupId>org.apache.stanbol</groupId>
- <artifactId>org.apache.stanbol.ontologymanager.store</artifactId>
- <version>${stanbol-version}</version>
- </dependency>-->
- <dependency>
- <groupId>org.apache.stanbol</groupId>
- <artifactId>org.apache.stanbol.reasoners.base</artifactId>
- <version>${stanbol-version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.stanbol</groupId>
- <artifactId>org.apache.stanbol.rules.base</artifactId>
- <version>${stanbol-version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.stanbol</groupId>
- <artifactId>org.apache.stanbol.reengineer.base</artifactId>
- <version>${stanbol-version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.stanbol</groupId>
- <artifactId>org.apache.stanbol.rules.manager</artifactId>
- <version>${stanbol-version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.stanbol</groupId>
- <artifactId>org.apache.stanbol.rules.refactor</artifactId>
- <version>${stanbol-version}</version>
- </dependency>
- <dependency>
+ <!-- Stanbol deps -->
+ <dependency>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.kres.jersey</artifactId>
<version>${stanbol-version}</version>
<scope>provided</scope>
</dependency>
- <dependency>
+ <dependency>
<groupId>org.apache.stanbol</groupId>
- <artifactId>org.apache.stanbol.owlapi</artifactId>
+ <artifactId>org.apache.stanbol.reengineer.base</artifactId>
<version>${stanbol-version}</version>
<scope>provided</scope>
- </dependency>
-
+ </dependency>
+
+ <!-- OWL deps -->
<dependency>
<groupId>com.hp.hpl.jena</groupId>
<artifactId>jena</artifactId>
<version>2.6.2</version>
<scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>owlapi</groupId>
+ <artifactId>owlapi</artifactId>
+ <version>3.0.0</version>
+ <scope>provided</scope>
+ </dependency>
+
</dependencies>
Modified: incubator/stanbol/branches/http-endpoint-refactoring/kres/reengineer/xml/pom.xml
URL: http://svn.apache.org/viewvc/incubator/stanbol/branches/http-endpoint-refactoring/kres/reengineer/xml/pom.xml?rev=1086204&r1=1086203&r2=1086204&view=diff
==============================================================================
--- incubator/stanbol/branches/http-endpoint-refactoring/kres/reengineer/xml/pom.xml (original)
+++ incubator/stanbol/branches/http-endpoint-refactoring/kres/reengineer/xml/pom.xml Mon Mar 28 12:17:41 2011
@@ -116,13 +116,8 @@
<artifactId>org.apache.stanbol.reengineer.base</artifactId>
<version>${stanbol-version}</version>
</dependency>
- <dependency>
- <groupId>org.apache.stanbol</groupId>
- <artifactId>org.apache.stanbol.owlapi</artifactId>
- <version>${stanbol-version}</version>
- </dependency>
- <!-- Jena deps -->
+ <!-- OWL deps -->
<dependency>
<groupId>com.hp.hpl.jena</groupId>
<artifactId>iri</artifactId>
@@ -153,6 +148,11 @@
<version>0.8.5</version>
<scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>owlapi</groupId>
+ <artifactId>owlapi</artifactId>
+ <version>3.0.0</version>
+ </dependency>
<!-- Clerezza deps -->
<dependency>
Modified: incubator/stanbol/branches/http-endpoint-refactoring/kres/reengineer/xml/src/main/java/org/apache/stanbol/reengineer/xml/XMLExtractor.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/branches/http-endpoint-refactoring/kres/reengineer/xml/src/main/java/org/apache/stanbol/reengineer/xml/XMLExtractor.java?rev=1086204&r1=1086203&r2=1086204&view=diff
==============================================================================
--- incubator/stanbol/branches/http-endpoint-refactoring/kres/reengineer/xml/src/main/java/org/apache/stanbol/reengineer/xml/XMLExtractor.java (original)
+++ incubator/stanbol/branches/http-endpoint-refactoring/kres/reengineer/xml/src/main/java/org/apache/stanbol/reengineer/xml/XMLExtractor.java Mon Mar 28 12:17:41 2011
@@ -29,7 +29,7 @@ import org.apache.stanbol.ontologymanage
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.Session;
-import org.apache.stanbol.ontologymanager.ontonet.api.session.KReSSessionManager;
+import org.apache.stanbol.ontologymanager.ontonet.api.session.SessionManager;
import org.apache.stanbol.reengineer.base.api.DataSource;
import org.apache.stanbol.reengineer.base.api.ReengineeringException;
import org.apache.stanbol.reengineer.base.api.ReengineerManager;
@@ -161,7 +161,7 @@ public class XMLExtractor extends Reengi
reengineeringManager.bindReengineer(this);
- KReSSessionManager kReSSessionManager = onManager.getSessionManager();
+ SessionManager kReSSessionManager = onManager.getSessionManager();
Session kReSSession = kReSSessionManager.createSession();
kReSSessionID = kReSSession.getID();
Modified: incubator/stanbol/branches/http-endpoint-refactoring/kres/reengineer/xml/src/main/java/org/apache/stanbol/reengineer/xml/vocab/XML.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/branches/http-endpoint-refactoring/kres/reengineer/xml/src/main/java/org/apache/stanbol/reengineer/xml/vocab/XML.java?rev=1086204&r1=1086203&r2=1086204&view=diff
==============================================================================
--- incubator/stanbol/branches/http-endpoint-refactoring/kres/reengineer/xml/src/main/java/org/apache/stanbol/reengineer/xml/vocab/XML.java (original)
+++ incubator/stanbol/branches/http-endpoint-refactoring/kres/reengineer/xml/src/main/java/org/apache/stanbol/reengineer/xml/vocab/XML.java Mon Mar 28 12:17:41 2011
@@ -3,8 +3,6 @@ package org.apache.stanbol.reengineer.xm
/* CVS $Id$ */
import org.apache.clerezza.rdf.core.UriRef;
-
-import com.hp.hpl.jena.rdf.model.*;
/**
* Vocabulary definitions from http://ontologydesignpatterns.org/ont/iks/xml.owl
Modified: incubator/stanbol/branches/http-endpoint-refactoring/kres/reengineer/xml/src/main/java/org/apache/stanbol/reengineer/xml/vocab/XSD.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/branches/http-endpoint-refactoring/kres/reengineer/xml/src/main/java/org/apache/stanbol/reengineer/xml/vocab/XSD.java?rev=1086204&r1=1086203&r2=1086204&view=diff
==============================================================================
--- incubator/stanbol/branches/http-endpoint-refactoring/kres/reengineer/xml/src/main/java/org/apache/stanbol/reengineer/xml/vocab/XSD.java (original)
+++ incubator/stanbol/branches/http-endpoint-refactoring/kres/reengineer/xml/src/main/java/org/apache/stanbol/reengineer/xml/vocab/XSD.java Mon Mar 28 12:17:41 2011
@@ -2,11 +2,7 @@ package org.apache.stanbol.reengineer.xm
/* CVS $Id$ */
-import org.apache.clerezza.rdf.core.MGraph;
import org.apache.clerezza.rdf.core.UriRef;
-import org.apache.clerezza.rdf.core.impl.SimpleMGraph;
-
-import com.hp.hpl.jena.rdf.model.*;
/**
* Vocabulary definitions from http://ontologydesignpatterns.org/ont/iks/xsd.owl
Modified: incubator/stanbol/branches/http-endpoint-refactoring/kres/rules/base/src/main/java/org/apache/stanbol/rules/base/api/Recipe.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/branches/http-endpoint-refactoring/kres/rules/base/src/main/java/org/apache/stanbol/rules/base/api/Recipe.java?rev=1086204&r1=1086203&r2=1086204&view=diff
==============================================================================
--- incubator/stanbol/branches/http-endpoint-refactoring/kres/rules/base/src/main/java/org/apache/stanbol/rules/base/api/Recipe.java (original)
+++ incubator/stanbol/branches/http-endpoint-refactoring/kres/rules/base/src/main/java/org/apache/stanbol/rules/base/api/Recipe.java Mon Mar 28 12:17:41 2011
@@ -1,10 +1,5 @@
package org.apache.stanbol.rules.base.api;
-import java.net.URI;
-import java.util.Collection;
-
-import org.apache.clerezza.rdf.core.MGraph;
-import org.apache.clerezza.rdf.core.sparql.ResultSet;
import org.apache.stanbol.rules.base.api.util.RuleList;
import org.semanticweb.owlapi.model.IRI;
Modified: incubator/stanbol/branches/http-endpoint-refactoring/kres/rules/base/src/main/java/org/apache/stanbol/rules/base/api/util/AtomIterator.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/branches/http-endpoint-refactoring/kres/rules/base/src/main/java/org/apache/stanbol/rules/base/api/util/AtomIterator.java?rev=1086204&r1=1086203&r2=1086204&view=diff
==============================================================================
--- incubator/stanbol/branches/http-endpoint-refactoring/kres/rules/base/src/main/java/org/apache/stanbol/rules/base/api/util/AtomIterator.java (original)
+++ incubator/stanbol/branches/http-endpoint-refactoring/kres/rules/base/src/main/java/org/apache/stanbol/rules/base/api/util/AtomIterator.java Mon Mar 28 12:17:41 2011
@@ -2,7 +2,6 @@ package org.apache.stanbol.rules.base.ap
import java.util.Iterator;
-import org.apache.stanbol.rules.base.api.Rule;
import org.apache.stanbol.rules.base.api.RuleAtom;
Modified: incubator/stanbol/branches/http-endpoint-refactoring/kres/rules/manager/pom.xml
URL: http://svn.apache.org/viewvc/incubator/stanbol/branches/http-endpoint-refactoring/kres/rules/manager/pom.xml?rev=1086204&r1=1086203&r2=1086204&view=diff
==============================================================================
--- incubator/stanbol/branches/http-endpoint-refactoring/kres/rules/manager/pom.xml (original)
+++ incubator/stanbol/branches/http-endpoint-refactoring/kres/rules/manager/pom.xml Mon Mar 28 12:17:41 2011
@@ -112,12 +112,14 @@
</dependency>
<!-- Stanbol deps -->
+ <!--
<dependency>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.owlapi</artifactId>
<version>${stanbol-version}</version>
<scope>provided</scope>
</dependency>
+ -->
<dependency>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.ontologymanager.ontonet</artifactId>
Modified: incubator/stanbol/branches/http-endpoint-refactoring/kres/rules/refactor/pom.xml
URL: http://svn.apache.org/viewvc/incubator/stanbol/branches/http-endpoint-refactoring/kres/rules/refactor/pom.xml?rev=1086204&r1=1086203&r2=1086204&view=diff
==============================================================================
--- incubator/stanbol/branches/http-endpoint-refactoring/kres/rules/refactor/pom.xml (original)
+++ incubator/stanbol/branches/http-endpoint-refactoring/kres/rules/refactor/pom.xml Mon Mar 28 12:17:41 2011
@@ -86,14 +86,6 @@
<version>${stanbol-version}</version>
<scope>provided</scope>
</dependency>
- <!--
- <dependency>
- <groupId>org.apache.stanbol</groupId>
- <artifactId>org.apache.stanbol.ontologymanager.store</artifactId>
- <version>${stanbol-version}</version>
- <scope>provided</scope>
- </dependency>
- -->
<dependency>
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.reasoners.base</artifactId>
Modified: incubator/stanbol/branches/http-endpoint-refactoring/kres/rules/refactor/src/main/java/org/apache/stanbol/rules/refactor/impl/RefactorerImpl.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/branches/http-endpoint-refactoring/kres/rules/refactor/src/main/java/org/apache/stanbol/rules/refactor/impl/RefactorerImpl.java?rev=1086204&r1=1086203&r2=1086204&view=diff
==============================================================================
--- incubator/stanbol/branches/http-endpoint-refactoring/kres/rules/refactor/src/main/java/org/apache/stanbol/rules/refactor/impl/RefactorerImpl.java (original)
+++ incubator/stanbol/branches/http-endpoint-refactoring/kres/rules/refactor/src/main/java/org/apache/stanbol/rules/refactor/impl/RefactorerImpl.java Mon Mar 28 12:17:41 2011
@@ -26,7 +26,7 @@ import org.apache.stanbol.ontologymanage
import org.apache.stanbol.ontologymanager.ontonet.api.ontology.ScopeRegistry;
import org.apache.stanbol.ontologymanager.ontonet.api.session.DuplicateSessionIDException;
import org.apache.stanbol.ontologymanager.ontonet.api.session.Session;
-import org.apache.stanbol.ontologymanager.ontonet.api.session.KReSSessionManager;
+import org.apache.stanbol.ontologymanager.ontonet.api.session.SessionManager;
import org.apache.stanbol.ontologymanager.ontonet.impl.io.ClerezzaOntologyStorage;
import org.apache.stanbol.reasoners.base.api.InconcistencyException;
import org.apache.stanbol.reasoners.base.api.Reasoner;
@@ -272,7 +272,7 @@ public class RefactorerImpl implements R
refactoringSpaceIRI = IRI.create(refactoringSpaceID);
defaultRefactoringIRI = IRI.create(defaultRefactoringID);
- KReSSessionManager kReSSessionManager = onManager.getSessionManager();
+ SessionManager kReSSessionManager = onManager.getSessionManager();
Session kReSSession = kReSSessionManager.getSession(kReSSessionID);
@@ -515,7 +515,7 @@ public class RefactorerImpl implements R
protected void deactivate(ComponentContext context) {
log.info("in " + RefactorerImpl.class + " deactivate with context " + context);
- KReSSessionManager kReSSessionManager = onManager.getSessionManager();
+ SessionManager kReSSessionManager = onManager.getSessionManager();
kReSSessionManager.destroySession(kReSSessionID);
// semionManager.unregisterRefactorer();
Modified: incubator/stanbol/branches/http-endpoint-refactoring/kres/rules/web/pom.xml
URL: http://svn.apache.org/viewvc/incubator/stanbol/branches/http-endpoint-refactoring/kres/rules/web/pom.xml?rev=1086204&r1=1086203&r2=1086204&view=diff
==============================================================================
--- incubator/stanbol/branches/http-endpoint-refactoring/kres/rules/web/pom.xml (original)
+++ incubator/stanbol/branches/http-endpoint-refactoring/kres/rules/web/pom.xml Mon Mar 28 12:17:41 2011
@@ -208,25 +208,22 @@
<version>${pax-exam-version}</version>
<scope>test</scope>
</dependency>
-
- <dependency>
- <groupId>org.apache.stanbol</groupId>
- <artifactId>org.apache.stanbol.ontologymanager.ontonet</artifactId>
- <version>${stanbol-version}</version>
- </dependency>
- <!--<dependency>
+
+ <!-- Stanbol deps -->
+ <dependency>
<groupId>org.apache.stanbol</groupId>
- <artifactId>org.apache.stanbol.ontologymanager.store</artifactId>
+ <artifactId>org.apache.stanbol.kres.jersey</artifactId>
<version>${stanbol-version}</version>
- </dependency>-->
+ <scope>provided</scope>
+ </dependency>
<dependency>
<groupId>org.apache.stanbol</groupId>
- <artifactId>org.apache.stanbol.reasoners.base</artifactId>
+ <artifactId>org.apache.stanbol.ontologymanager.ontonet</artifactId>
<version>${stanbol-version}</version>
</dependency>
<dependency>
<groupId>org.apache.stanbol</groupId>
- <artifactId>org.apache.stanbol.reengineer.base</artifactId>
+ <artifactId>org.apache.stanbol.reasoners.base</artifactId>
<version>${stanbol-version}</version>
</dependency>
<dependency>
@@ -244,25 +241,20 @@
<artifactId>org.apache.stanbol.rules.base</artifactId>
<version>${stanbol-version}</version>
</dependency>
- <dependency>
- <groupId>org.apache.stanbol</groupId>
- <artifactId>org.apache.stanbol.kres.jersey</artifactId>
- <version>${stanbol-version}</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.stanbol</groupId>
- <artifactId>org.apache.stanbol.owlapi</artifactId>
- <version>${stanbol-version}</version>
- <scope>provided</scope>
- </dependency>
+ <!-- OWL deps -->
<dependency>
<groupId>com.hp.hpl.jena</groupId>
<artifactId>jena</artifactId>
<version>2.6.2</version>
<scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>owlapi</groupId>
+ <artifactId>owlapi</artifactId>
+ <version>3.0.0</version>
+ </dependency>
+
</dependencies>
Modified: incubator/stanbol/branches/http-endpoint-refactoring/kres/rules/web/src/test/java/org/apache/stanbol/rules/web/RecipeTest.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/branches/http-endpoint-refactoring/kres/rules/web/src/test/java/org/apache/stanbol/rules/web/RecipeTest.java?rev=1086204&r1=1086203&r2=1086204&view=diff
==============================================================================
--- incubator/stanbol/branches/http-endpoint-refactoring/kres/rules/web/src/test/java/org/apache/stanbol/rules/web/RecipeTest.java (original)
+++ incubator/stanbol/branches/http-endpoint-refactoring/kres/rules/web/src/test/java/org/apache/stanbol/rules/web/RecipeTest.java Mon Mar 28 12:17:41 2011
@@ -5,17 +5,18 @@
package org.apache.stanbol.rules.web;
-import javax.ws.rs.core.MediaType;
-import com.sun.jersey.api.representation.Form;
-import com.sun.jersey.api.client.ClientResponse;
-import com.sun.jersey.api.client.WebResource;
-import com.sun.jersey.api.client.Client;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.fail;
+
import org.junit.After;
import org.junit.AfterClass;
import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.Test;
-import static org.junit.Assert.*;
+
+import com.sun.jersey.api.client.Client;
+import com.sun.jersey.api.client.ClientResponse;
+import com.sun.jersey.api.client.WebResource;
/**
*
Modified: incubator/stanbol/branches/http-endpoint-refactoring/kres/rules/web/src/test/java/org/apache/stanbol/rules/web/RuleTest.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/branches/http-endpoint-refactoring/kres/rules/web/src/test/java/org/apache/stanbol/rules/web/RuleTest.java?rev=1086204&r1=1086203&r2=1086204&view=diff
==============================================================================
--- incubator/stanbol/branches/http-endpoint-refactoring/kres/rules/web/src/test/java/org/apache/stanbol/rules/web/RuleTest.java (original)
+++ incubator/stanbol/branches/http-endpoint-refactoring/kres/rules/web/src/test/java/org/apache/stanbol/rules/web/RuleTest.java Mon Mar 28 12:17:41 2011
@@ -5,18 +5,17 @@
package org.apache.stanbol.rules.web;
-import javax.ws.rs.core.MediaType;
-import com.sun.jersey.api.representation.Form;
-import com.sun.jersey.api.client.ClientResponse;
-import com.sun.jersey.api.client.WebResource;
-import com.sun.jersey.api.client.Client;
-import javax.ws.rs.core.Response;
-import org.junit.After;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.fail;
+
import org.junit.AfterClass;
import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.Test;
-import static org.junit.Assert.*;
+
+import com.sun.jersey.api.client.Client;
+import com.sun.jersey.api.client.ClientResponse;
+import com.sun.jersey.api.client.WebResource;
/**
*