You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stanbol.apache.org by co...@apache.org on 2011/03/31 13:50:46 UTC

svn commit: r1087260 - in /incubator/stanbol/trunk/kres: ./ jersey/ jersey/src/main/java/org/apache/stanbol/kres/jersey/ jersey/src/main/java/org/apache/stanbol/kres/jersey/writers/ ontologymanager/ontonet/ ontologymanager/ontonet/src/main/java/org/apa...

Author: concelvio
Date: Thu Mar 31 11:50:45 2011
New Revision: 1087260

URL: http://svn.apache.org/viewvc?rev=1087260&view=rev
Log:
STANBOL-133:
Whit this commit the point "* kres/jersey module should not have dependency to kres/owlapi in any way" can be checked out.
- renamed owlapi to owl;
- renamed artifact from org.apache.stanbol.owlapi to org.apache.stanbol.owl; renamed single packages;
- moved OWLOtnologyWriter.java from org.apache.stanbol.kres.jersey.writer to org.apache.stanbol.owl.web;
- copied KRFormat.java into org.apache.stanbol.owl.web;
- removed OWLmodelWriter.java from org.apache.stanbol.kres.jersey.writer (not used any more);
- refactoring where required imports and dependency in pom.xml files.

Removed:
    incubator/stanbol/trunk/kres/jersey/src/main/java/org/apache/stanbol/kres/jersey/writers/OWLOntologyWriter.java
    incubator/stanbol/trunk/kres/jersey/src/main/java/org/apache/stanbol/kres/jersey/writers/OwlModelWriter.java
Modified:
    incubator/stanbol/trunk/kres/jersey/pom.xml
    incubator/stanbol/trunk/kres/jersey/src/main/java/org/apache/stanbol/kres/jersey/JerseyEndpointApplication.java
    incubator/stanbol/trunk/kres/ontologymanager/ontonet/pom.xml
    incubator/stanbol/trunk/kres/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/impl/io/ClerezzaOntologyStorage.java
    incubator/stanbol/trunk/kres/ontologymanager/web/pom.xml
    incubator/stanbol/trunk/kres/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/JerseyEndpointApplication.java
    incubator/stanbol/trunk/kres/pom.xml
    incubator/stanbol/trunk/kres/reasoners/base/pom.xml
    incubator/stanbol/trunk/kres/reasoners/base/src/main/java/org/apache/stanbol/reasoners/base/commands/RunRules.java
    incubator/stanbol/trunk/kres/reasoners/base/src/main/java/org/apache/stanbol/reasoners/base/impl/ConsistentRefactorerImpl.java
    incubator/stanbol/trunk/kres/reasoners/web/pom.xml
    incubator/stanbol/trunk/kres/reasoners/web/src/main/java/org/apache/stanbol/reasoners/web/JerseyEndpointApplication.java
    incubator/stanbol/trunk/kres/reengineer/base/pom.xml
    incubator/stanbol/trunk/kres/reengineer/base/src/main/java/org/apache/stanbol/reengineer/base/impl/OntologyStorage.java
    incubator/stanbol/trunk/kres/reengineer/db/pom.xml
    incubator/stanbol/trunk/kres/reengineer/db/src/main/java/org/apache/stanbol/reengineer/db/DBDataTransformer.java
    incubator/stanbol/trunk/kres/reengineer/db/src/main/java/org/apache/stanbol/reengineer/db/connection/DatabaseConnection.java
    incubator/stanbol/trunk/kres/reengineer/web/pom.xml
    incubator/stanbol/trunk/kres/reengineer/web/src/main/java/org/apache/stanbol/reengineer/web/JerseyEndpointApplication.java
    incubator/stanbol/trunk/kres/rules/base/pom.xml
    incubator/stanbol/trunk/kres/rules/refactor/pom.xml
    incubator/stanbol/trunk/kres/rules/refactor/src/main/java/org/apache/stanbol/rules/refactor/impl/RefactorerImpl.java
    incubator/stanbol/trunk/kres/rules/web/pom.xml
    incubator/stanbol/trunk/kres/rules/web/src/main/java/org/apache/stanbol/rules/web/JerseyEndpointApplication.java

Modified: incubator/stanbol/trunk/kres/jersey/pom.xml
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/jersey/pom.xml?rev=1087260&r1=1087259&r2=1087260&view=diff
==============================================================================
--- incubator/stanbol/trunk/kres/jersey/pom.xml (original)
+++ incubator/stanbol/trunk/kres/jersey/pom.xml Thu Mar 31 11:50:45 2011
@@ -169,6 +169,7 @@
 		<dependency>
 			<groupId>org.slf4j</groupId>
 			<artifactId>slf4j-simple</artifactId>
+                        <version>1.5.2</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
@@ -209,12 +210,6 @@
 		</dependency>
 		
 		<!-- Stanbol deps -->
-		<dependency>
-			<groupId>org.apache.stanbol</groupId>
-			<artifactId>org.apache.stanbol.owlapi</artifactId>
-			<version>${stanbol-version}</version>
-			<scope>provided</scope>
-		</dependency>
 		
 		<!-- OWL deps -->		
 		<dependency>

Modified: incubator/stanbol/trunk/kres/jersey/src/main/java/org/apache/stanbol/kres/jersey/JerseyEndpointApplication.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/jersey/src/main/java/org/apache/stanbol/kres/jersey/JerseyEndpointApplication.java?rev=1087260&r1=1087259&r2=1087260&view=diff
==============================================================================
--- incubator/stanbol/trunk/kres/jersey/src/main/java/org/apache/stanbol/kres/jersey/JerseyEndpointApplication.java (original)
+++ incubator/stanbol/trunk/kres/jersey/src/main/java/org/apache/stanbol/kres/jersey/JerseyEndpointApplication.java Thu Mar 31 11:50:45 2011
@@ -10,7 +10,6 @@ import org.apache.stanbol.kres.jersey.re
 import org.apache.stanbol.kres.jersey.resource.RESTfulResource;
 import org.apache.stanbol.kres.jersey.resource.RootResource;
 import org.apache.stanbol.kres.jersey.writers.GraphWriter;
-import org.apache.stanbol.kres.jersey.writers.OWLOntologyWriter;
 import org.apache.stanbol.kres.jersey.writers.ResultSetWriter;
 
 /**
@@ -42,7 +41,6 @@ public class JerseyEndpointApplication e
         classes.add(GraphWriter.class);
         classes.add(ResultSetWriter.class);
         // classes.add(OwlModelWriter.class);
-        classes.add(OWLOntologyWriter.class);
         return classes;
     }
 

Modified: incubator/stanbol/trunk/kres/ontologymanager/ontonet/pom.xml
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/ontologymanager/ontonet/pom.xml?rev=1087260&r1=1087259&r2=1087260&view=diff
==============================================================================
--- incubator/stanbol/trunk/kres/ontologymanager/ontonet/pom.xml (original)
+++ incubator/stanbol/trunk/kres/ontologymanager/ontonet/pom.xml Thu Mar 31 11:50:45 2011
@@ -143,7 +143,7 @@
 		<!-- Stanbol deps -->
 		<dependency>
 			<groupId>org.apache.stanbol</groupId>
-			<artifactId>org.apache.stanbol.owlapi</artifactId>
+			<artifactId>org.apache.stanbol.owl</artifactId>
 			<version>${stanbol-version}</version>
 		</dependency>
 		<!--

Modified: incubator/stanbol/trunk/kres/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/impl/io/ClerezzaOntologyStorage.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/impl/io/ClerezzaOntologyStorage.java?rev=1087260&r1=1087259&r2=1087260&view=diff
==============================================================================
--- incubator/stanbol/trunk/kres/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/impl/io/ClerezzaOntologyStorage.java (original)
+++ incubator/stanbol/trunk/kres/ontologymanager/ontonet/src/main/java/org/apache/stanbol/ontologymanager/ontonet/impl/io/ClerezzaOntologyStorage.java Thu Mar 31 11:50:45 2011
@@ -28,8 +28,8 @@ import com.hp.hpl.jena.rdf.model.ModelFa
 import com.hp.hpl.jena.util.FileManager;
 
 import org.apache.stanbol.ontologymanager.ontonet.impl.ontology.NoSuchStoreException;
-import org.apache.stanbol.owlapi.trasformation.JenaToClerezzaConverter;
-import org.apache.stanbol.owlapi.trasformation.JenaToOwlConvert;
+import org.apache.stanbol.owl.trasformation.JenaToClerezzaConverter;
+import org.apache.stanbol.owl.trasformation.JenaToOwlConvert;
 
 public class ClerezzaOntologyStorage {
 

Modified: incubator/stanbol/trunk/kres/ontologymanager/web/pom.xml
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/ontologymanager/web/pom.xml?rev=1087260&r1=1087259&r2=1087260&view=diff
==============================================================================
--- incubator/stanbol/trunk/kres/ontologymanager/web/pom.xml (original)
+++ incubator/stanbol/trunk/kres/ontologymanager/web/pom.xml Thu Mar 31 11:50:45 2011
@@ -130,6 +130,7 @@
 		<dependency>
 			<groupId>org.slf4j</groupId>
 			<artifactId>slf4j-api</artifactId>
+                        <version>1.5.2</version>
 			<scope>provided</scope>
 		</dependency>
 		<dependency>
@@ -178,11 +179,18 @@
 			<version>${stanbol-version}</version>
 			<scope>provided</scope>            
 		</dependency>
+                <dependency>
+			<groupId>org.apache.stanbol</groupId>
+			<artifactId>org.apache.stanbol.owl</artifactId>
+			<version>${stanbol-version}</version>
+			<scope>provided</scope>
+		</dependency>
 
 		<!-- for tests -->
 		<dependency>
 			<groupId>org.slf4j</groupId>
 			<artifactId>slf4j-simple</artifactId>
+                        <version>1.5.2</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>

Modified: incubator/stanbol/trunk/kres/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/JerseyEndpointApplication.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/JerseyEndpointApplication.java?rev=1087260&r1=1087259&r2=1087260&view=diff
==============================================================================
--- incubator/stanbol/trunk/kres/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/JerseyEndpointApplication.java (original)
+++ incubator/stanbol/trunk/kres/ontologymanager/web/src/main/java/org/apache/stanbol/ontologymanager/web/JerseyEndpointApplication.java Thu Mar 31 11:50:45 2011
@@ -7,7 +7,7 @@ import javax.ws.rs.core.Application;
 
 import org.apache.stanbol.kres.jersey.processors.ViewProcessorImpl;
 import org.apache.stanbol.kres.jersey.writers.GraphWriter;
-import org.apache.stanbol.kres.jersey.writers.OWLOntologyWriter;
+import org.apache.stanbol.owl.web.OWLOntologyWriter;
 import org.apache.stanbol.kres.jersey.writers.ResultSetWriter;
 import org.apache.stanbol.ontologymanager.web.resources.GraphsResource;
 import org.apache.stanbol.ontologymanager.web.resources.ONMOntResource;

Modified: incubator/stanbol/trunk/kres/pom.xml
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/pom.xml?rev=1087260&r1=1087259&r2=1087260&view=diff
==============================================================================
--- incubator/stanbol/trunk/kres/pom.xml (original)
+++ incubator/stanbol/trunk/kres/pom.xml Thu Mar 31 11:50:45 2011
@@ -42,7 +42,7 @@
   <modules>
 
     <!-- Jersey -->
-    <module>owlapi</module>
+    <module>owl</module>
 
     <module>jersey</module>
     

Modified: incubator/stanbol/trunk/kres/reasoners/base/pom.xml
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/reasoners/base/pom.xml?rev=1087260&r1=1087259&r2=1087260&view=diff
==============================================================================
--- incubator/stanbol/trunk/kres/reasoners/base/pom.xml (original)
+++ incubator/stanbol/trunk/kres/reasoners/base/pom.xml Thu Mar 31 11:50:45 2011
@@ -151,7 +151,7 @@
 		<!-- Stanbol deps -->
 		<dependency>
 			<groupId>org.apache.stanbol</groupId>
-			<artifactId>org.apache.stanbol.owlapi</artifactId>
+			<artifactId>org.apache.stanbol.owl</artifactId>
 			<version>${stanbol-version}</version>
 			<exclusions>
 				<exclusion>

Modified: incubator/stanbol/trunk/kres/reasoners/base/src/main/java/org/apache/stanbol/reasoners/base/commands/RunRules.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/reasoners/base/src/main/java/org/apache/stanbol/reasoners/base/commands/RunRules.java?rev=1087260&r1=1087259&r2=1087260&view=diff
==============================================================================
--- incubator/stanbol/trunk/kres/reasoners/base/src/main/java/org/apache/stanbol/reasoners/base/commands/RunRules.java (original)
+++ incubator/stanbol/trunk/kres/reasoners/base/src/main/java/org/apache/stanbol/reasoners/base/commands/RunRules.java Thu Mar 31 11:50:45 2011
@@ -29,7 +29,7 @@ import com.hp.hpl.jena.ontology.OntModel
 import com.hp.hpl.jena.rdf.model.Model;
 import com.hp.hpl.jena.rdf.model.ModelFactory;
 
-import org.apache.stanbol.owlapi.trasformation.JenaToOwlConvert;
+import org.apache.stanbol.owl.trasformation.JenaToOwlConvert;
 
 /**
  *

Modified: incubator/stanbol/trunk/kres/reasoners/base/src/main/java/org/apache/stanbol/reasoners/base/impl/ConsistentRefactorerImpl.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/reasoners/base/src/main/java/org/apache/stanbol/reasoners/base/impl/ConsistentRefactorerImpl.java?rev=1087260&r1=1087259&r2=1087260&view=diff
==============================================================================
--- incubator/stanbol/trunk/kres/reasoners/base/src/main/java/org/apache/stanbol/reasoners/base/impl/ConsistentRefactorerImpl.java (original)
+++ incubator/stanbol/trunk/kres/reasoners/base/src/main/java/org/apache/stanbol/reasoners/base/impl/ConsistentRefactorerImpl.java Thu Mar 31 11:50:45 2011
@@ -15,7 +15,7 @@ import org.apache.felix.scr.annotations.
 import org.apache.felix.scr.annotations.Service;
 import org.apache.stanbol.ontologymanager.ontonet.api.ONManager;
 import org.apache.stanbol.ontologymanager.ontonet.impl.io.ClerezzaOntologyStorage;
-import org.apache.stanbol.owlapi.trasformation.JenaToOwlConvert;
+import org.apache.stanbol.owl.trasformation.JenaToOwlConvert;
 import org.apache.stanbol.reasoners.base.api.ConsistentRefactorer;
 import org.apache.stanbol.reasoners.base.api.InconcistencyException;
 import org.apache.stanbol.reasoners.base.api.Reasoner;

Modified: incubator/stanbol/trunk/kres/reasoners/web/pom.xml
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/reasoners/web/pom.xml?rev=1087260&r1=1087259&r2=1087260&view=diff
==============================================================================
--- incubator/stanbol/trunk/kres/reasoners/web/pom.xml (original)
+++ incubator/stanbol/trunk/kres/reasoners/web/pom.xml Thu Mar 31 11:50:45 2011
@@ -130,6 +130,7 @@
 		<dependency>
 			<groupId>org.slf4j</groupId>
 			<artifactId>slf4j-api</artifactId>
+                        <version>1.5.2</version>
 			<scope>provided</scope>
 		</dependency>
 		<dependency>
@@ -169,6 +170,7 @@
 		<dependency>
 			<groupId>org.slf4j</groupId>
 			<artifactId>slf4j-simple</artifactId>
+                        <version>1.5.2</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
@@ -245,6 +247,12 @@
 			<version>${stanbol-version}</version>
 			<scope>provided</scope>
 		</dependency>
+                <dependency>
+			<groupId>org.apache.stanbol</groupId>
+			<artifactId>org.apache.stanbol.owl</artifactId>
+			<version>${stanbol-version}</version>
+			<scope>provided</scope>
+		</dependency>
 
 		<dependency>
 			<groupId>com.hp.hpl.jena</groupId>

Modified: incubator/stanbol/trunk/kres/reasoners/web/src/main/java/org/apache/stanbol/reasoners/web/JerseyEndpointApplication.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/reasoners/web/src/main/java/org/apache/stanbol/reasoners/web/JerseyEndpointApplication.java?rev=1087260&r1=1087259&r2=1087260&view=diff
==============================================================================
--- incubator/stanbol/trunk/kres/reasoners/web/src/main/java/org/apache/stanbol/reasoners/web/JerseyEndpointApplication.java (original)
+++ incubator/stanbol/trunk/kres/reasoners/web/src/main/java/org/apache/stanbol/reasoners/web/JerseyEndpointApplication.java Thu Mar 31 11:50:45 2011
@@ -7,7 +7,7 @@ import javax.ws.rs.core.Application;
 
 import org.apache.stanbol.kres.jersey.processors.ViewProcessorImpl;
 import org.apache.stanbol.kres.jersey.writers.GraphWriter;
-import org.apache.stanbol.kres.jersey.writers.OWLOntologyWriter;
+import org.apache.stanbol.owl.web.OWLOntologyWriter;
 import org.apache.stanbol.kres.jersey.writers.ResultSetWriter;
 import org.apache.stanbol.reasoners.web.resources.Classify;
 import org.apache.stanbol.reasoners.web.resources.ConsistencyCheck;

Modified: incubator/stanbol/trunk/kres/reengineer/base/pom.xml
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/reengineer/base/pom.xml?rev=1087260&r1=1087259&r2=1087260&view=diff
==============================================================================
--- incubator/stanbol/trunk/kres/reengineer/base/pom.xml (original)
+++ incubator/stanbol/trunk/kres/reengineer/base/pom.xml Thu Mar 31 11:50:45 2011
@@ -99,6 +99,11 @@
 			<artifactId>org.apache.stanbol.ontologymanager.ontonet</artifactId>
 			<version>${stanbol-version}</version>
 		</dependency>
+                <dependency>
+			<groupId>org.apache.stanbol</groupId>
+			<artifactId>org.apache.stanbol.owl</artifactId>
+			<version>${stanbol-version}</version>
+		</dependency>
 
 		<dependency>
 			<groupId>owlapi</groupId>

Modified: incubator/stanbol/trunk/kres/reengineer/base/src/main/java/org/apache/stanbol/reengineer/base/impl/OntologyStorage.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/reengineer/base/src/main/java/org/apache/stanbol/reengineer/base/impl/OntologyStorage.java?rev=1087260&r1=1087259&r2=1087260&view=diff
==============================================================================
--- incubator/stanbol/trunk/kres/reengineer/base/src/main/java/org/apache/stanbol/reengineer/base/impl/OntologyStorage.java (original)
+++ incubator/stanbol/trunk/kres/reengineer/base/src/main/java/org/apache/stanbol/reengineer/base/impl/OntologyStorage.java Thu Mar 31 11:50:45 2011
@@ -27,8 +27,8 @@ import com.hp.hpl.jena.rdf.model.Model;
 import com.hp.hpl.jena.rdf.model.ModelFactory;
 import com.hp.hpl.jena.util.FileManager;
 
-import org.apache.stanbol.owlapi.trasformation.JenaToClerezzaConverter;
-import org.apache.stanbol.owlapi.trasformation.JenaToOwlConvert;
+import org.apache.stanbol.owl.trasformation.JenaToClerezzaConverter;
+import org.apache.stanbol.owl.trasformation.JenaToOwlConvert;
 
 /**
  * Copied to avoid cross-dependencies

Modified: incubator/stanbol/trunk/kres/reengineer/db/pom.xml
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/reengineer/db/pom.xml?rev=1087260&r1=1087259&r2=1087260&view=diff
==============================================================================
--- incubator/stanbol/trunk/kres/reengineer/db/pom.xml (original)
+++ incubator/stanbol/trunk/kres/reengineer/db/pom.xml Thu Mar 31 11:50:45 2011
@@ -118,6 +118,11 @@
 			<artifactId>org.apache.stanbol.reengineer.base</artifactId>
 			<version>${stanbol-version}</version>
 		</dependency>
+                <dependency>
+			<groupId>org.apache.stanbol</groupId>
+			<artifactId>org.apache.stanbol.owl</artifactId>
+			<version>${stanbol-version}</version>
+		</dependency>
 
 		<!-- OWL deps -->
 		<dependency>

Modified: incubator/stanbol/trunk/kres/reengineer/db/src/main/java/org/apache/stanbol/reengineer/db/DBDataTransformer.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/reengineer/db/src/main/java/org/apache/stanbol/reengineer/db/DBDataTransformer.java?rev=1087260&r1=1087259&r2=1087260&view=diff
==============================================================================
--- incubator/stanbol/trunk/kres/reengineer/db/src/main/java/org/apache/stanbol/reengineer/db/DBDataTransformer.java (original)
+++ incubator/stanbol/trunk/kres/reengineer/db/src/main/java/org/apache/stanbol/reengineer/db/DBDataTransformer.java Thu Mar 31 11:50:45 2011
@@ -34,7 +34,7 @@ import com.hp.hpl.jena.query.QueryFactor
 import com.hp.hpl.jena.query.QuerySolution;
 import com.hp.hpl.jena.rdf.model.Resource;
 
-import org.apache.stanbol.owlapi.trasformation.JenaToOwlConvert;
+import org.apache.stanbol.owl.trasformation.JenaToOwlConvert;
 
 public class DBDataTransformer extends ReengineerUriRefGenerator {
 

Modified: incubator/stanbol/trunk/kres/reengineer/db/src/main/java/org/apache/stanbol/reengineer/db/connection/DatabaseConnection.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/reengineer/db/src/main/java/org/apache/stanbol/reengineer/db/connection/DatabaseConnection.java?rev=1087260&r1=1087259&r2=1087260&view=diff
==============================================================================
--- incubator/stanbol/trunk/kres/reengineer/db/src/main/java/org/apache/stanbol/reengineer/db/connection/DatabaseConnection.java (original)
+++ incubator/stanbol/trunk/kres/reengineer/db/src/main/java/org/apache/stanbol/reengineer/db/connection/DatabaseConnection.java Thu Mar 31 11:50:45 2011
@@ -23,7 +23,7 @@ import com.hp.hpl.jena.vocabulary.RDF;
 
 import org.apache.stanbol.reengineer.db.vocab.DBS_L1;
 
-import org.apache.stanbol.owlapi.trasformation.JenaToOwlConvert;
+import org.apache.stanbol.owl.trasformation.JenaToOwlConvert;
 
 public class DatabaseConnection {
 

Modified: incubator/stanbol/trunk/kres/reengineer/web/pom.xml
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/reengineer/web/pom.xml?rev=1087260&r1=1087259&r2=1087260&view=diff
==============================================================================
--- incubator/stanbol/trunk/kres/reengineer/web/pom.xml (original)
+++ incubator/stanbol/trunk/kres/reengineer/web/pom.xml Thu Mar 31 11:50:45 2011
@@ -130,6 +130,7 @@
 		<dependency>
 			<groupId>org.slf4j</groupId>
 			<artifactId>slf4j-api</artifactId>
+                        <version>1.5.2</version>
 			<scope>provided</scope>
 		</dependency>
 		<dependency>
@@ -220,7 +221,13 @@
 			<artifactId>org.apache.stanbol.reengineer.base</artifactId>
 			<version>${stanbol-version}</version>
 			<scope>provided</scope>
-		</dependency>		
+		</dependency>
+                <dependency>
+			<groupId>org.apache.stanbol</groupId>
+			<artifactId>org.apache.stanbol.owl</artifactId>
+			<version>${stanbol-version}</version>
+			<scope>provided</scope>
+		</dependency>
 		
 		<!-- OWL deps -->
 		<dependency>

Modified: incubator/stanbol/trunk/kres/reengineer/web/src/main/java/org/apache/stanbol/reengineer/web/JerseyEndpointApplication.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/reengineer/web/src/main/java/org/apache/stanbol/reengineer/web/JerseyEndpointApplication.java?rev=1087260&r1=1087259&r2=1087260&view=diff
==============================================================================
--- incubator/stanbol/trunk/kres/reengineer/web/src/main/java/org/apache/stanbol/reengineer/web/JerseyEndpointApplication.java (original)
+++ incubator/stanbol/trunk/kres/reengineer/web/src/main/java/org/apache/stanbol/reengineer/web/JerseyEndpointApplication.java Thu Mar 31 11:50:45 2011
@@ -7,7 +7,7 @@ import javax.ws.rs.core.Application;
 
 import org.apache.stanbol.kres.jersey.processors.ViewProcessorImpl;
 import org.apache.stanbol.kres.jersey.writers.GraphWriter;
-import org.apache.stanbol.kres.jersey.writers.OWLOntologyWriter;
+import org.apache.stanbol.owl.web.OWLOntologyWriter;
 import org.apache.stanbol.kres.jersey.writers.ResultSetWriter;
 
 /**

Modified: incubator/stanbol/trunk/kres/rules/base/pom.xml
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/rules/base/pom.xml?rev=1087260&r1=1087259&r2=1087260&view=diff
==============================================================================
--- incubator/stanbol/trunk/kres/rules/base/pom.xml (original)
+++ incubator/stanbol/trunk/kres/rules/base/pom.xml Thu Mar 31 11:50:45 2011
@@ -95,7 +95,7 @@
 		<!-- Stanbol deps -->
 		<dependency>
 			<groupId>org.apache.stanbol</groupId>
-			<artifactId>org.apache.stanbol.owlapi</artifactId>
+			<artifactId>org.apache.stanbol.owl</artifactId>
 			<version>${stanbol-version}</version>
 		</dependency>
 

Modified: incubator/stanbol/trunk/kres/rules/refactor/pom.xml
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/rules/refactor/pom.xml?rev=1087260&r1=1087259&r2=1087260&view=diff
==============================================================================
--- incubator/stanbol/trunk/kres/rules/refactor/pom.xml (original)
+++ incubator/stanbol/trunk/kres/rules/refactor/pom.xml Thu Mar 31 11:50:45 2011
@@ -141,7 +141,7 @@
 		<!-- Stanbol deps -->
 		<dependency>
 			<groupId>org.apache.stanbol</groupId>
-			<artifactId>org.apache.stanbol.owlapi</artifactId>
+			<artifactId>org.apache.stanbol.owl</artifactId>
 			<version>${stanbol-version}</version>
 			<scope>provided</scope>
 		</dependency>

Modified: incubator/stanbol/trunk/kres/rules/refactor/src/main/java/org/apache/stanbol/rules/refactor/impl/RefactorerImpl.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/rules/refactor/src/main/java/org/apache/stanbol/rules/refactor/impl/RefactorerImpl.java?rev=1087260&r1=1087259&r2=1087260&view=diff
==============================================================================
--- incubator/stanbol/trunk/kres/rules/refactor/src/main/java/org/apache/stanbol/rules/refactor/impl/RefactorerImpl.java (original)
+++ incubator/stanbol/trunk/kres/rules/refactor/src/main/java/org/apache/stanbol/rules/refactor/impl/RefactorerImpl.java Thu Mar 31 11:50:45 2011
@@ -28,8 +28,8 @@ import org.apache.stanbol.ontologymanage
 import org.apache.stanbol.ontologymanager.ontonet.api.session.Session;
 import org.apache.stanbol.ontologymanager.ontonet.api.session.SessionManager;
 import org.apache.stanbol.ontologymanager.ontonet.impl.io.ClerezzaOntologyStorage;
-import org.apache.stanbol.owlapi.trasformation.JenaToClerezzaConverter;
-import org.apache.stanbol.owlapi.trasformation.OWLAPIToClerezzaConverter;
+import org.apache.stanbol.owl.trasformation.JenaToClerezzaConverter;
+import org.apache.stanbol.owl.trasformation.OWLAPIToClerezzaConverter;
 import org.apache.stanbol.rules.base.api.NoSuchRecipeException;
 import org.apache.stanbol.rules.base.api.Recipe;
 import org.apache.stanbol.rules.base.api.Rule;

Modified: incubator/stanbol/trunk/kres/rules/web/pom.xml
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/rules/web/pom.xml?rev=1087260&r1=1087259&r2=1087260&view=diff
==============================================================================
--- incubator/stanbol/trunk/kres/rules/web/pom.xml (original)
+++ incubator/stanbol/trunk/kres/rules/web/pom.xml Thu Mar 31 11:50:45 2011
@@ -131,6 +131,7 @@
 		<dependency>
 			<groupId>org.slf4j</groupId>
 			<artifactId>slf4j-api</artifactId>
+                        <version>1.5.2</version>
 			<scope>provided</scope>
 		</dependency>
 		<dependency>
@@ -170,6 +171,7 @@
 		<dependency>
 			<groupId>org.slf4j</groupId>
 			<artifactId>slf4j-simple</artifactId>
+                        <version>1.5.2</version>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
@@ -236,6 +238,11 @@
 			<artifactId>org.apache.stanbol.rules.base</artifactId>
 			<version>${stanbol-version}</version>
 		</dependency>
+                <dependency>
+			<groupId>org.apache.stanbol</groupId>
+			<artifactId>org.apache.stanbol.owl</artifactId>
+			<version>${stanbol-version}</version>
+		</dependency>
                 
         <!-- OWL deps -->
 		<dependency>

Modified: incubator/stanbol/trunk/kres/rules/web/src/main/java/org/apache/stanbol/rules/web/JerseyEndpointApplication.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/rules/web/src/main/java/org/apache/stanbol/rules/web/JerseyEndpointApplication.java?rev=1087260&r1=1087259&r2=1087260&view=diff
==============================================================================
--- incubator/stanbol/trunk/kres/rules/web/src/main/java/org/apache/stanbol/rules/web/JerseyEndpointApplication.java (original)
+++ incubator/stanbol/trunk/kres/rules/web/src/main/java/org/apache/stanbol/rules/web/JerseyEndpointApplication.java Thu Mar 31 11:50:45 2011
@@ -7,7 +7,7 @@ import javax.ws.rs.core.Application;
 
 import org.apache.stanbol.kres.jersey.processors.ViewProcessorImpl;
 import org.apache.stanbol.kres.jersey.writers.GraphWriter;
-import org.apache.stanbol.kres.jersey.writers.OWLOntologyWriter;
+import org.apache.stanbol.owl.web.OWLOntologyWriter;
 import org.apache.stanbol.kres.jersey.writers.ResultSetWriter;
 
 /**