You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stanbol.apache.org by al...@apache.org on 2011/03/17 18:41:16 UTC
svn commit: r1082603 [1/2] - in /incubator/stanbol/trunk/kres:
eu.iksproject.kres.jersey/
eu.iksproject.kres.jersey/src/main/java/eu/iksproject/kres/jersey/
eu.iksproject.kres.jersey/src/main/java/eu/iksproject/kres/jersey/resource/
eu.iksproject.kres....
Author: alexdma
Date: Thu Mar 17 17:41:13 2011
New Revision: 1082603
URL: http://svn.apache.org/viewvc?rev=1082603&view=rev
Log:
STANBOL-39 :
- Moved kres.semion.reengineer.db to reenginer/db
- Moved kres.semion.reengineer.xml to reenginer/xml
- Moved kres.semion.reengineer.manager to reenginer/base
- Renamed packages containing classes from the old kres.ontologies bundle as ".vocab"
- Refactored POMs to use new packages
- Removed a cyclic dependency between reengineer/base and reengineer.db
Added:
incubator/stanbol/trunk/kres/reengineer/base/src/main/java/org/apache/stanbol/reengineer/base/api/
incubator/stanbol/trunk/kres/reengineer/base/src/main/java/org/apache/stanbol/reengineer/base/api/DataSource.java
- copied, changed from r1082537, incubator/stanbol/trunk/kres/reengineer/base/src/main/java/org/apache/stanbol/reengineer/base/DataSource.java
incubator/stanbol/trunk/kres/reengineer/base/src/main/java/org/apache/stanbol/reengineer/base/api/IdentifiedDataSource.java
- copied, changed from r1082537, incubator/stanbol/trunk/kres/reengineer/base/src/main/java/org/apache/stanbol/reengineer/base/IdentifiedDataSource.java
incubator/stanbol/trunk/kres/reengineer/base/src/main/java/org/apache/stanbol/reengineer/base/api/ReengineeringException.java
- copied, changed from r1082537, incubator/stanbol/trunk/kres/reengineer/base/src/main/java/org/apache/stanbol/reengineer/base/ReengineeringException.java
incubator/stanbol/trunk/kres/reengineer/base/src/main/java/org/apache/stanbol/reengineer/base/api/SemionManager.java
- copied, changed from r1082537, incubator/stanbol/trunk/kres/reengineer/base/src/main/java/org/apache/stanbol/reengineer/base/SemionManager.java
incubator/stanbol/trunk/kres/reengineer/base/src/main/java/org/apache/stanbol/reengineer/base/api/SemionReengineer.java
- copied, changed from r1082537, incubator/stanbol/trunk/kres/reengineer/base/src/main/java/org/apache/stanbol/reengineer/base/SemionReengineer.java
incubator/stanbol/trunk/kres/reengineer/base/src/main/java/org/apache/stanbol/reengineer/base/api/Semion_OWL.java
- copied, changed from r1082537, incubator/stanbol/trunk/kres/reengineer/base/src/main/java/org/apache/stanbol/reengineer/base/Semion_OWL.java
incubator/stanbol/trunk/kres/reengineer/base/src/main/java/org/apache/stanbol/reengineer/base/api/datasources/
- copied from r1082537, incubator/stanbol/trunk/kres/eu.iksproject.kres.semion.manager/src/main/java/eu/iksproject/kres/semion/manager/datasources/
incubator/stanbol/trunk/kres/reengineer/base/src/main/java/org/apache/stanbol/reengineer/base/api/impl/
incubator/stanbol/trunk/kres/reengineer/base/src/main/java/org/apache/stanbol/reengineer/base/api/impl/SemionManagerImpl.java (with props)
incubator/stanbol/trunk/kres/reengineer/base/src/main/java/org/apache/stanbol/reengineer/base/api/settings/
- copied from r1082537, incubator/stanbol/trunk/kres/reengineer/base/src/main/java/org/apache/stanbol/reengineer/base/settings/
incubator/stanbol/trunk/kres/reengineer/base/src/main/java/org/apache/stanbol/reengineer/base/api/util/
- copied from r1082537, incubator/stanbol/trunk/kres/reengineer/base/src/main/java/org/apache/stanbol/reengineer/base/util/
incubator/stanbol/trunk/kres/reengineer/base/src/main/resources/
incubator/stanbol/trunk/kres/reengineer/base/src/test/java/org/
incubator/stanbol/trunk/kres/reengineer/base/src/test/java/org/apache/
incubator/stanbol/trunk/kres/reengineer/base/src/test/java/org/apache/stanbol/
incubator/stanbol/trunk/kres/reengineer/base/src/test/java/org/apache/stanbol/rengineer/
incubator/stanbol/trunk/kres/reengineer/base/src/test/java/org/apache/stanbol/rengineer/base/
- copied from r1082537, incubator/stanbol/trunk/kres/eu.iksproject.kres.semion.manager/src/test/java/eu/iksproject/kres/semion/reengineer/
incubator/stanbol/trunk/kres/reengineer/db/src/main/java/org/apache/stanbol/reengineer/db/DBExtractor.java
- copied, changed from r1082537, incubator/stanbol/trunk/kres/eu.iksproject.kres.semion.reengineer.db/src/main/java/eu/iksproject/kres/semion/reengineer/db/DBExtractor.java
incubator/stanbol/trunk/kres/reengineer/db/src/main/java/org/apache/stanbol/reengineer/db/DataExtractionInfo.java
- copied, changed from r1082537, incubator/stanbol/trunk/kres/eu.iksproject.kres.semion.reengineer.db/src/main/java/eu/iksproject/kres/semion/reengineer/db/DataExtractionInfo.java
incubator/stanbol/trunk/kres/reengineer/db/src/main/java/org/apache/stanbol/reengineer/db/SemionDBDataTransformer.java
- copied, changed from r1082537, incubator/stanbol/trunk/kres/eu.iksproject.kres.semion.reengineer.db/src/main/java/eu/iksproject/kres/semion/reengineer/db/SemionDBDataTransformer.java
incubator/stanbol/trunk/kres/reengineer/db/src/main/java/org/apache/stanbol/reengineer/db/SemionDBSchemaGenerator.java
- copied, changed from r1082537, incubator/stanbol/trunk/kres/eu.iksproject.kres.semion.reengineer.db/src/main/java/eu/iksproject/kres/semion/reengineer/db/SemionDBSchemaGenerator.java
incubator/stanbol/trunk/kres/reengineer/db/src/main/java/org/apache/stanbol/reengineer/db/TablePKRelations.java
- copied, changed from r1082537, incubator/stanbol/trunk/kres/eu.iksproject.kres.semion.reengineer.db/src/main/java/eu/iksproject/kres/semion/reengineer/db/TablePKRelations.java
incubator/stanbol/trunk/kres/reengineer/db/src/main/java/org/apache/stanbol/reengineer/db/connection/
- copied from r1082537, incubator/stanbol/trunk/kres/eu.iksproject.kres.semion.reengineer.db/src/main/java/eu/iksproject/kres/semion/reengineer/db/connection/
incubator/stanbol/trunk/kres/reengineer/db/src/main/java/org/apache/stanbol/reengineer/db/ontology/
- copied from r1082537, incubator/stanbol/trunk/kres/eu.iksproject.kres.semion.reengineer.db/src/main/java/eu/iksproject/kres/semion/reengineer/db/ontology/
incubator/stanbol/trunk/kres/reengineer/db/src/main/java/org/apache/stanbol/reengineer/db/vocab/
incubator/stanbol/trunk/kres/reengineer/db/src/main/java/org/apache/stanbol/reengineer/db/vocab/DBS_L1.java
- copied, changed from r1082537, incubator/stanbol/trunk/kres/reengineer/db/src/main/java/org/apache/stanbol/reengineer/db/DBS_L1.java
incubator/stanbol/trunk/kres/reengineer/db/src/main/java/org/apache/stanbol/reengineer/db/vocab/DBS_L1_OWL.java
- copied, changed from r1082537, incubator/stanbol/trunk/kres/reengineer/db/src/main/java/org/apache/stanbol/reengineer/db/DBS_L1_OWL.java
incubator/stanbol/trunk/kres/reengineer/db/src/main/resources/
incubator/stanbol/trunk/kres/reengineer/db/src/main/resources/mysql-connector-java-5.1.10.jar
- copied unchanged from r1082537, incubator/stanbol/trunk/kres/eu.iksproject.kres.semion.reengineer.db/src/main/resources/mysql-connector-java-5.1.10.jar
incubator/stanbol/trunk/kres/reengineer/db/src/test/
incubator/stanbol/trunk/kres/reengineer/db/src/test/java/
incubator/stanbol/trunk/kres/reengineer/db/src/test/java/org/
incubator/stanbol/trunk/kres/reengineer/db/src/test/java/org/apache/
incubator/stanbol/trunk/kres/reengineer/db/src/test/java/org/apache/stanbol/
incubator/stanbol/trunk/kres/reengineer/db/src/test/java/org/apache/stanbol/reengineer/
incubator/stanbol/trunk/kres/reengineer/db/src/test/java/org/apache/stanbol/reengineer/db/
- copied from r1082537, incubator/stanbol/trunk/kres/eu.iksproject.kres.semion.reengineer.db/src/test/java/eu/iksproject/kres/semion/reengineer/db/
incubator/stanbol/trunk/kres/reengineer/xml/src/main/java/eu/
incubator/stanbol/trunk/kres/reengineer/xml/src/main/java/eu/iksproject/
incubator/stanbol/trunk/kres/reengineer/xml/src/main/java/eu/iksproject/kres/
incubator/stanbol/trunk/kres/reengineer/xml/src/main/java/eu/iksproject/kres/semion/
incubator/stanbol/trunk/kres/reengineer/xml/src/main/java/eu/iksproject/kres/semion/reengineer/
incubator/stanbol/trunk/kres/reengineer/xml/src/main/java/org/apache/stanbol/reengineer/xml/XMLExtractor.java
- copied, changed from r1082537, incubator/stanbol/trunk/kres/eu.iksproject.kres.semion.reengineer.xml/src/main/java/eu/iksproject/kres/semion/reengineer/xml/XMLExtractor.java
incubator/stanbol/trunk/kres/reengineer/xml/src/main/java/org/apache/stanbol/reengineer/xml/XSDExtractor.java
- copied, changed from r1082537, incubator/stanbol/trunk/kres/eu.iksproject.kres.semion.reengineer.xml/src/main/java/eu/iksproject/kres/semion/reengineer/xml/XSDExtractor.java
incubator/stanbol/trunk/kres/reengineer/xml/src/main/java/org/apache/stanbol/reengineer/xml/vocab/
incubator/stanbol/trunk/kres/reengineer/xml/src/main/java/org/apache/stanbol/reengineer/xml/vocab/XML.java
- copied, changed from r1082537, incubator/stanbol/trunk/kres/reengineer/xml/src/main/java/org/apache/stanbol/reengineer/xml/XML.java
incubator/stanbol/trunk/kres/reengineer/xml/src/main/java/org/apache/stanbol/reengineer/xml/vocab/XML_OWL.java
- copied, changed from r1082537, incubator/stanbol/trunk/kres/reengineer/xml/src/main/java/org/apache/stanbol/reengineer/xml/XML_OWL.java
incubator/stanbol/trunk/kres/reengineer/xml/src/main/java/org/apache/stanbol/reengineer/xml/vocab/XSD.java
- copied, changed from r1082537, incubator/stanbol/trunk/kres/reengineer/xml/src/main/java/org/apache/stanbol/reengineer/xml/XSD.java
incubator/stanbol/trunk/kres/reengineer/xml/src/main/java/org/apache/stanbol/reengineer/xml/vocab/XSD_OWL.java
- copied, changed from r1082537, incubator/stanbol/trunk/kres/reengineer/xml/src/main/java/org/apache/stanbol/reengineer/xml/XSD_OWL.java
incubator/stanbol/trunk/kres/reengineer/xml/src/main/resources/
incubator/stanbol/trunk/kres/reengineer/xml/src/main/resources/META-INF/
incubator/stanbol/trunk/kres/reengineer/xml/src/main/resources/META-INF/test/
incubator/stanbol/trunk/kres/reengineer/xml/src/main/resources/META-INF/test/weather.xml
- copied unchanged from r1082537, incubator/stanbol/trunk/kres/eu.iksproject.kres.semion.reengineer.xml/src/main/resources/META-INF/test/weather.xml
incubator/stanbol/trunk/kres/reengineer/xml/src/main/resources/xerces/
- copied from r1082537, incubator/stanbol/trunk/kres/eu.iksproject.kres.semion.reengineer.xml/src/main/resources/xerces/
incubator/stanbol/trunk/kres/reengineer/xml/src/test/
incubator/stanbol/trunk/kres/reengineer/xml/src/test/java/
incubator/stanbol/trunk/kres/reengineer/xml/src/test/java/org/
incubator/stanbol/trunk/kres/reengineer/xml/src/test/java/org/apache/
incubator/stanbol/trunk/kres/reengineer/xml/src/test/java/org/apache/stanbol/
incubator/stanbol/trunk/kres/reengineer/xml/src/test/java/org/apache/stanbol/reengineer/
incubator/stanbol/trunk/kres/reengineer/xml/src/test/java/org/apache/stanbol/reengineer/xml/
- copied from r1082537, incubator/stanbol/trunk/kres/eu.iksproject.kres.semion.reengineer.xml/src/test/java/eu/iksproject/kres/semion/reengineer/xml/
Removed:
incubator/stanbol/trunk/kres/reengineer/base/src/main/java/org/apache/stanbol/reengineer/base/DataSource.java
incubator/stanbol/trunk/kres/reengineer/base/src/main/java/org/apache/stanbol/reengineer/base/IdentifiedDataSource.java
incubator/stanbol/trunk/kres/reengineer/base/src/main/java/org/apache/stanbol/reengineer/base/ReengineeringException.java
incubator/stanbol/trunk/kres/reengineer/base/src/main/java/org/apache/stanbol/reengineer/base/SemionManager.java
incubator/stanbol/trunk/kres/reengineer/base/src/main/java/org/apache/stanbol/reengineer/base/SemionReengineer.java
incubator/stanbol/trunk/kres/reengineer/base/src/main/java/org/apache/stanbol/reengineer/base/Semion_OWL.java
incubator/stanbol/trunk/kres/reengineer/base/src/main/java/org/apache/stanbol/reengineer/base/settings/
incubator/stanbol/trunk/kres/reengineer/base/src/main/java/org/apache/stanbol/reengineer/base/util/
incubator/stanbol/trunk/kres/reengineer/db/src/main/java/org/apache/stanbol/reengineer/db/DBS_L1.java
incubator/stanbol/trunk/kres/reengineer/db/src/main/java/org/apache/stanbol/reengineer/db/DBS_L1_OWL.java
incubator/stanbol/trunk/kres/reengineer/xml/src/main/java/org/apache/stanbol/reengineer/xml/XML.java
incubator/stanbol/trunk/kres/reengineer/xml/src/main/java/org/apache/stanbol/reengineer/xml/XML_OWL.java
incubator/stanbol/trunk/kres/reengineer/xml/src/main/java/org/apache/stanbol/reengineer/xml/XSD.java
incubator/stanbol/trunk/kres/reengineer/xml/src/main/java/org/apache/stanbol/reengineer/xml/XSD_OWL.java
Modified:
incubator/stanbol/trunk/kres/eu.iksproject.kres.jersey/ (props changed)
incubator/stanbol/trunk/kres/eu.iksproject.kres.jersey/pom.xml
incubator/stanbol/trunk/kres/eu.iksproject.kres.jersey/src/main/java/eu/iksproject/kres/jersey/JerseyEndpoint.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.semion.refactorer/pom.xml
incubator/stanbol/trunk/kres/eu.iksproject.kres.semion.refactorer/src/main/java/eu/iksproject/kres/semion/refactorer/SemionRefactorerImpl.java
incubator/stanbol/trunk/kres/eu.iksproject.kres.semion.refactorer/src/test/java/eu/iksproject/kres/semion/refactorer/ClerezzaStorage.java
incubator/stanbol/trunk/kres/eu.iksproject.kres.semion.refactorer/src/test/java/eu/iksproject/kres/semion/refactorer/SemionRefactoringTest.java
incubator/stanbol/trunk/kres/reengineer/base/pom.xml
incubator/stanbol/trunk/kres/reengineer/base/src/main/java/org/apache/stanbol/reengineer/base/api/datasources/DataSourceFactory.java
incubator/stanbol/trunk/kres/reengineer/base/src/main/java/org/apache/stanbol/reengineer/base/api/datasources/InvalidDataSourceForTypeSelectedException.java
incubator/stanbol/trunk/kres/reengineer/base/src/main/java/org/apache/stanbol/reengineer/base/api/datasources/NoSuchDataSourceExpection.java
incubator/stanbol/trunk/kres/reengineer/base/src/main/java/org/apache/stanbol/reengineer/base/api/datasources/RDB.java
incubator/stanbol/trunk/kres/reengineer/base/src/main/java/org/apache/stanbol/reengineer/base/api/datasources/XML.java
incubator/stanbol/trunk/kres/reengineer/base/src/main/java/org/apache/stanbol/reengineer/base/api/settings/ConnectionSettings.java
incubator/stanbol/trunk/kres/reengineer/base/src/main/java/org/apache/stanbol/reengineer/base/api/settings/DBConnectionSettings.java
incubator/stanbol/trunk/kres/reengineer/base/src/main/java/org/apache/stanbol/reengineer/base/api/util/ReengineerType.java
incubator/stanbol/trunk/kres/reengineer/base/src/main/java/org/apache/stanbol/reengineer/base/api/util/SemionStructuredDataSource.java
incubator/stanbol/trunk/kres/reengineer/base/src/main/java/org/apache/stanbol/reengineer/base/api/util/SemionUriRefGenerator.java
incubator/stanbol/trunk/kres/reengineer/base/src/main/java/org/apache/stanbol/reengineer/base/api/util/UnsupportedReengineerException.java
incubator/stanbol/trunk/kres/reengineer/base/src/test/java/org/apache/stanbol/rengineer/base/SemionManagerTest.java
incubator/stanbol/trunk/kres/reengineer/db/ (props changed)
incubator/stanbol/trunk/kres/reengineer/db/pom.xml
incubator/stanbol/trunk/kres/reengineer/db/src/main/java/org/apache/stanbol/reengineer/db/connection/DatabaseConnection.java
incubator/stanbol/trunk/kres/reengineer/db/src/main/java/org/apache/stanbol/reengineer/db/ontology/Collectionentity.java
incubator/stanbol/trunk/kres/reengineer/db/src/main/java/org/apache/stanbol/reengineer/db/ontology/DBS_L1.java
incubator/stanbol/trunk/kres/reengineer/db/src/main/java/org/apache/stanbol/reengineer/db/ontology/ObjectRole.java
incubator/stanbol/trunk/kres/reengineer/db/src/main/java/org/apache/stanbol/reengineer/db/ontology/Schema.java
incubator/stanbol/trunk/kres/reengineer/db/src/test/java/org/apache/stanbol/reengineer/db/DBExtractorTest.java
incubator/stanbol/trunk/kres/reengineer/xml/ (props changed)
incubator/stanbol/trunk/kres/reengineer/xml/pom.xml
incubator/stanbol/trunk/kres/reengineer/xml/src/test/java/org/apache/stanbol/reengineer/xml/XMLReengineerTest.java
incubator/stanbol/trunk/kres/rules/manager/src/main/java/org/apache/stanbol/rules/manager/arqextention/CreateURI.java
Propchange: incubator/stanbol/trunk/kres/eu.iksproject.kres.jersey/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Thu Mar 17 17:41:13 2011
@@ -3,4 +3,4 @@ bin
.classpath
.project
.settings
-
+KReSConf
Modified: incubator/stanbol/trunk/kres/eu.iksproject.kres.jersey/pom.xml
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/eu.iksproject.kres.jersey/pom.xml?rev=1082603&r1=1082602&r2=1082603&view=diff
==============================================================================
--- incubator/stanbol/trunk/kres/eu.iksproject.kres.jersey/pom.xml (original)
+++ incubator/stanbol/trunk/kres/eu.iksproject.kres.jersey/pom.xml Thu Mar 17 17:41:13 2011
@@ -5,10 +5,10 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>eu.iksproject</groupId>
- <artifactId>eu.iksproject.kres.parent</artifactId>
- <version>0.7</version>
- <relativePath>../eu.iksproject.kres.parent</relativePath>
+ <groupId>org.apache.stanbol</groupId>
+ <artifactId>stanbol-parent</artifactId>
+ <version>0.9-SNAPSHOT</version>
+ <relativePath>../../parent</relativePath>
</parent>
<groupId>eu.iksproject</groupId>
@@ -20,10 +20,7 @@
<description></description>
<properties>
- <jersey-version>1.1.5.1</jersey-version>
- <pax-exam-version>1.2.0</pax-exam-version>
<kres-version>0.7</kres-version>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
<dependencies>
@@ -251,13 +248,13 @@
<version>${kres-version}</version>
<scope>provided</scope>
</dependency>
- -->
<dependency>
<groupId>eu.iksproject</groupId>
<artifactId>eu.iksproject.kres.semion.manager</artifactId>
<version>${kres-version}</version>
<scope>provided</scope>
</dependency>
+ -->
<dependency>
<groupId>eu.iksproject</groupId>
<artifactId>eu.iksproject.kres.semion.refactorer</artifactId>
Modified: incubator/stanbol/trunk/kres/eu.iksproject.kres.jersey/src/main/java/eu/iksproject/kres/jersey/JerseyEndpoint.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/eu.iksproject.kres.jersey/src/main/java/eu/iksproject/kres/jersey/JerseyEndpoint.java?rev=1082603&r1=1082602&r2=1082603&view=diff
==============================================================================
--- incubator/stanbol/trunk/kres/eu.iksproject.kres.jersey/src/main/java/eu/iksproject/kres/jersey/JerseyEndpoint.java (original)
+++ incubator/stanbol/trunk/kres/eu.iksproject.kres.jersey/src/main/java/eu/iksproject/kres/jersey/JerseyEndpoint.java Thu Mar 17 17:41:13 2011
@@ -14,8 +14,8 @@ import org.apache.felix.scr.annotations.
import org.apache.felix.scr.annotations.Reference;
import org.apache.stanbol.ontologymanager.ontonet.api.KReSONManager;
import org.apache.stanbol.ontologymanager.store.api.OntologyStoreProvider;
-import org.apache.stanbol.reengineer.base.SemionManager;
-import org.apache.stanbol.reengineer.base.SemionReengineer;
+import org.apache.stanbol.reengineer.base.api.SemionManager;
+import org.apache.stanbol.reengineer.base.api.SemionReengineer;
import org.apache.stanbol.rules.base.api.RuleStore;
import org.apache.stanbol.rules.refactor.api.SemionRefactorer;
import org.osgi.framework.BundleContext;
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=1082603&r1=1082602&r2=1082603&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 Thu Mar 17 17:41:13 2011
@@ -24,14 +24,18 @@ import org.apache.clerezza.rdf.core.acce
import org.apache.clerezza.rdf.core.impl.SimpleMGraph;
import org.apache.clerezza.rdf.core.impl.TripleImpl;
import org.apache.stanbol.ontologymanager.store.api.OntologyStoreProvider;
-import org.apache.stanbol.reengineer.base.DataSource;
-import org.apache.stanbol.reengineer.base.ReengineeringException;
-import org.apache.stanbol.reengineer.base.SemionManager;
-import org.apache.stanbol.reengineer.base.SemionReengineer;
-import org.apache.stanbol.reengineer.base.settings.ConnectionSettings;
-import org.apache.stanbol.reengineer.base.settings.DBConnectionSettings;
-import org.apache.stanbol.reengineer.base.util.ReengineerType;
-import org.apache.stanbol.reengineer.base.util.UnsupportedReengineerException;
+import org.apache.stanbol.reengineer.base.api.DataSource;
+import org.apache.stanbol.reengineer.base.api.ReengineeringException;
+import org.apache.stanbol.reengineer.base.api.SemionManager;
+import org.apache.stanbol.reengineer.base.api.SemionReengineer;
+import org.apache.stanbol.reengineer.base.api.datasources.DataSourceFactory;
+import org.apache.stanbol.reengineer.base.api.datasources.InvalidDataSourceForTypeSelectedException;
+import org.apache.stanbol.reengineer.base.api.datasources.NoSuchDataSourceExpection;
+import org.apache.stanbol.reengineer.base.api.datasources.RDB;
+import org.apache.stanbol.reengineer.base.api.settings.ConnectionSettings;
+import org.apache.stanbol.reengineer.base.api.settings.DBConnectionSettings;
+import org.apache.stanbol.reengineer.base.api.util.ReengineerType;
+import org.apache.stanbol.reengineer.base.api.util.UnsupportedReengineerException;
import org.semanticweb.owlapi.model.IRI;
import org.semanticweb.owlapi.model.OWLOntology;
import org.slf4j.Logger;
@@ -39,10 +43,6 @@ import org.slf4j.LoggerFactory;
import com.sun.jersey.api.view.ImplicitProduces;
-import eu.iksproject.kres.semion.manager.datasources.DataSourceFactory;
-import eu.iksproject.kres.semion.manager.datasources.InvalidDataSourceForTypeSelectedException;
-import eu.iksproject.kres.semion.manager.datasources.NoSuchDataSourceExpection;
-import eu.iksproject.kres.semion.manager.datasources.RDB;
@Path("/reengineer")
@ImplicitProduces("text/html")
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=1082603&r1=1082602&r2=1082603&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 Thu Mar 17 17:41:13 2011
@@ -17,7 +17,7 @@ import javax.ws.rs.core.Response;
import org.apache.clerezza.rdf.core.access.TcManager;
import org.apache.stanbol.ontologymanager.ontonet.api.KReSONManager;
import org.apache.stanbol.reasoners.base.api.InconcistencyException;
-import org.apache.stanbol.reengineer.base.SemionManager;
+import org.apache.stanbol.reengineer.base.api.SemionManager;
import org.apache.stanbol.rules.base.api.NoSuchRecipeException;
import org.apache.stanbol.rules.refactor.api.SemionRefactorer;
import org.apache.stanbol.rules.refactor.api.SemionRefactoringException;
Modified: incubator/stanbol/trunk/kres/eu.iksproject.kres.semion.refactorer/pom.xml
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/eu.iksproject.kres.semion.refactorer/pom.xml?rev=1082603&r1=1082602&r2=1082603&view=diff
==============================================================================
--- incubator/stanbol/trunk/kres/eu.iksproject.kres.semion.refactorer/pom.xml (original)
+++ incubator/stanbol/trunk/kres/eu.iksproject.kres.semion.refactorer/pom.xml Thu Mar 17 17:41:13 2011
@@ -253,12 +253,6 @@
<!-- Testing deps -->
<dependency>
- <groupId>eu.iksproject</groupId>
- <artifactId>eu.iksproject.kres.semion.manager</artifactId>
- <version>${kres-version}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.4</version>
Modified: incubator/stanbol/trunk/kres/eu.iksproject.kres.semion.refactorer/src/main/java/eu/iksproject/kres/semion/refactorer/SemionRefactorerImpl.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/eu.iksproject.kres.semion.refactorer/src/main/java/eu/iksproject/kres/semion/refactorer/SemionRefactorerImpl.java?rev=1082603&r1=1082602&r2=1082603&view=diff
==============================================================================
--- incubator/stanbol/trunk/kres/eu.iksproject.kres.semion.refactorer/src/main/java/eu/iksproject/kres/semion/refactorer/SemionRefactorerImpl.java (original)
+++ incubator/stanbol/trunk/kres/eu.iksproject.kres.semion.refactorer/src/main/java/eu/iksproject/kres/semion/refactorer/SemionRefactorerImpl.java Thu Mar 17 17:41:13 2011
@@ -30,7 +30,7 @@ import org.apache.stanbol.ontologymanage
import org.apache.stanbol.ontologymanager.store.api.OntologyStorage;
import org.apache.stanbol.reasoners.base.api.InconcistencyException;
import org.apache.stanbol.reasoners.base.api.KReSReasoner;
-import org.apache.stanbol.reengineer.base.SemionManager;
+import org.apache.stanbol.reengineer.base.api.SemionManager;
import org.apache.stanbol.rules.base.api.KReSRule;
import org.apache.stanbol.rules.base.api.NoSuchRecipeException;
import org.apache.stanbol.rules.base.api.Recipe;
Modified: incubator/stanbol/trunk/kres/eu.iksproject.kres.semion.refactorer/src/test/java/eu/iksproject/kres/semion/refactorer/ClerezzaStorage.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/eu.iksproject.kres.semion.refactorer/src/test/java/eu/iksproject/kres/semion/refactorer/ClerezzaStorage.java?rev=1082603&r1=1082602&r2=1082603&view=diff
==============================================================================
--- incubator/stanbol/trunk/kres/eu.iksproject.kres.semion.refactorer/src/test/java/eu/iksproject/kres/semion/refactorer/ClerezzaStorage.java (original)
+++ incubator/stanbol/trunk/kres/eu.iksproject.kres.semion.refactorer/src/test/java/eu/iksproject/kres/semion/refactorer/ClerezzaStorage.java Thu Mar 17 17:41:13 2011
@@ -22,7 +22,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.reengineer.xml.XML_OWL;
+import org.apache.stanbol.reengineer.xml.vocab.XML_OWL;
+
import eu.iksproject.kres.shared.transformation.JenaToClerezzaConverter;
import eu.iksproject.kres.shared.transformation.JenaToOwlConvert;
Modified: incubator/stanbol/trunk/kres/eu.iksproject.kres.semion.refactorer/src/test/java/eu/iksproject/kres/semion/refactorer/SemionRefactoringTest.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/eu.iksproject.kres.semion.refactorer/src/test/java/eu/iksproject/kres/semion/refactorer/SemionRefactoringTest.java?rev=1082603&r1=1082602&r2=1082603&view=diff
==============================================================================
--- incubator/stanbol/trunk/kres/eu.iksproject.kres.semion.refactorer/src/test/java/eu/iksproject/kres/semion/refactorer/SemionRefactoringTest.java (original)
+++ incubator/stanbol/trunk/kres/eu.iksproject.kres.semion.refactorer/src/test/java/eu/iksproject/kres/semion/refactorer/SemionRefactoringTest.java Thu Mar 17 17:41:13 2011
@@ -16,6 +16,7 @@ import org.apache.clerezza.rdf.simple.st
import org.apache.stanbol.ontologymanager.ontonet.api.KReSONManager;
import org.apache.stanbol.ontologymanager.ontonet.impl.ONManager;
import org.apache.stanbol.reasoners.base.impl.KReSReasonerImpl;
+import org.apache.stanbol.reengineer.base.api.impl.SemionManagerImpl;
import org.apache.stanbol.rules.base.api.KReSRule;
import org.apache.stanbol.rules.base.api.NoSuchRecipeException;
import org.apache.stanbol.rules.base.api.Recipe;
@@ -39,7 +40,6 @@ import org.semanticweb.owlapi.model.OWLO
import org.semanticweb.owlapi.model.OWLOntologyCreationException;
import org.semanticweb.owlapi.model.OWLOntologyStorageException;
-import eu.iksproject.kres.semion.manager.SemionManagerImpl;
public class SemionRefactoringTest {
Modified: incubator/stanbol/trunk/kres/reengineer/base/pom.xml
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/reengineer/base/pom.xml?rev=1082603&r1=1082602&r2=1082603&view=diff
==============================================================================
--- incubator/stanbol/trunk/kres/reengineer/base/pom.xml (original)
+++ incubator/stanbol/trunk/kres/reengineer/base/pom.xml Thu Mar 17 17:41:13 2011
@@ -1,20 +1,19 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!--
- Licensed to the Apache Software Foundation (ASF) under one or more
- contributor license agreements. See the NOTICE file distributed with
- this work for additional information regarding copyright ownership.
- The ASF licenses this file to You under the Apache License, Version 2.0
- (the "License"); you may not use this file except in compliance with
- the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
+ <!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version
+ 2.0 (the "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0 Unless required by
+ applicable law or agreed to in writing, software distributed under the
+ License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
+ CONDITIONS OF ANY KIND, either express or implied. See the License for
+ the specific language governing permissions and limitations under the
+ License.
+ -->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
@@ -64,23 +63,41 @@
</configuration>
</plugin>
<plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-scr-plugin</artifactId>
- </plugin>
- <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<source>1.6</source>
<target>1.6</target>
</configuration>
+ <dependencies>
+ <dependency>
+ <groupId>com.hp.hpl.jena</groupId>
+ <artifactId>jena</artifactId>
+ <version>2.6.2</version>
+ </dependency>
+ </dependencies>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-scr-plugin</artifactId>
+ <!--
+ <executions> <execution> <id>generate-scr-scrdescriptor</id>
+ <goals> <goal>scr</goal> </goals> </execution> </executions>
+ -->
+ <dependencies>
+ <dependency>
+ <groupId>com.hp.hpl.jena</groupId>
+ <artifactId>jena</artifactId>
+ <version>2.6.2</version>
+ </dependency>
+ </dependencies>
</plugin>
</plugins>
</build>
<dependencies>
- <!-- KReS deps -->
+ <!-- Stanbol deps -->
<dependency>
<groupId>eu.iksproject</groupId>
<artifactId>eu.iksproject.kres.shared.transformation</artifactId>
@@ -94,11 +111,6 @@
<!-- NEEDED FOR Semion refactorer -->
<dependency>
<groupId>org.apache.stanbol</groupId>
- <artifactId>org.apache.stanbol.reengineer.db</artifactId>
- <version>${stanbol-version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.rules.refactor</artifactId>
<version>${stanbol-version}</version>
</dependency>
@@ -128,6 +140,61 @@
<scope>provided</scope>
</dependency>
+ <!-- Jena deps -->
+ <dependency>
+ <groupId>com.ibm.icu</groupId>
+ <artifactId>icu4j</artifactId>
+ <version>3.4.4</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>com.hp.hpl.jena</groupId>
+ <artifactId>iri</artifactId>
+ <version>0.8</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>com.hp.hpl.jena</groupId>
+ <artifactId>jena</artifactId>
+ <version>2.6.2</version>
+ <scope>provided</scope>
+ <exclusions>
+ <exclusion>
+ <artifactId>slf4j-log4j12</artifactId>
+ <groupId>org.slf4j</groupId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>xerces</groupId>
+ <artifactId>xercesImpl</artifactId>
+ <version>2.7.1</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>stax</groupId>
+ <artifactId>stax-api</artifactId>
+ <version>1.0.1</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>com.hp.hpl.jena</groupId>
+ <artifactId>tdb</artifactId>
+ <version>0.8.5</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.woodstox</groupId>
+ <artifactId>wstx-asl</artifactId>
+ <version>3.9.9-3</version>
+ </dependency>
+ <dependency>
+ <groupId>com.hp.hpl.jena</groupId>
+ <artifactId>arq</artifactId>
+ <version>2.8.3</version>
+ <scope>provided</scope>
+ </dependency>
+
<!-- Persistence deps -->
<dependency>
<groupId>org.apache.clerezza</groupId>
@@ -144,12 +211,12 @@
<scope>provided</scope>
</dependency>
- <!-- Testing deps -->
+ <!-- Disgnostics deps -->
<dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <version>4.4</version>
- <scope>test</scope>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <version>1.2.13</version>
+ <scope>provided</scope>
</dependency>
<dependency>
<groupId>org.slf4j</groupId>
@@ -158,21 +225,34 @@
<type>jar</type>
<scope>provided</scope>
</dependency>
+
+ <!-- Testing deps -->
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.4</version>
+ <scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-simple</artifactId>
<version>1.5.2</version>
- <type>jar</type>
- <scope>provided</scope>
+ <scope>test</scope>
</dependency>
</dependencies>
<repositories>
- <repository>
- <id>stlab-cnr-repo</id>
- <url>http://stlab.istc.cnr.it/software/maven/repo</url>
- </repository>
- </repositories>
+ <repository>
+ <id>stlab-cnr-repo</id>
+ <url>http://stlab.istc.cnr.it/software/maven/repo</url>
+ </repository>
+ </repositories>
</project>
Copied: incubator/stanbol/trunk/kres/reengineer/base/src/main/java/org/apache/stanbol/reengineer/base/api/DataSource.java (from r1082537, incubator/stanbol/trunk/kres/reengineer/base/src/main/java/org/apache/stanbol/reengineer/base/DataSource.java)
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/reengineer/base/src/main/java/org/apache/stanbol/reengineer/base/api/DataSource.java?p2=incubator/stanbol/trunk/kres/reengineer/base/src/main/java/org/apache/stanbol/reengineer/base/api/DataSource.java&p1=incubator/stanbol/trunk/kres/reengineer/base/src/main/java/org/apache/stanbol/reengineer/base/DataSource.java&r1=1082537&r2=1082603&rev=1082603&view=diff
==============================================================================
--- incubator/stanbol/trunk/kres/reengineer/base/src/main/java/org/apache/stanbol/reengineer/base/DataSource.java (original)
+++ incubator/stanbol/trunk/kres/reengineer/base/src/main/java/org/apache/stanbol/reengineer/base/api/DataSource.java Thu Mar 17 17:41:13 2011
@@ -1,4 +1,4 @@
-package org.apache.stanbol.reengineer.base;
+package org.apache.stanbol.reengineer.base.api;
/**
* A {@code DataSource} object represents a physical non-RDF data source in Semion.
Copied: incubator/stanbol/trunk/kres/reengineer/base/src/main/java/org/apache/stanbol/reengineer/base/api/IdentifiedDataSource.java (from r1082537, incubator/stanbol/trunk/kres/reengineer/base/src/main/java/org/apache/stanbol/reengineer/base/IdentifiedDataSource.java)
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/reengineer/base/src/main/java/org/apache/stanbol/reengineer/base/api/IdentifiedDataSource.java?p2=incubator/stanbol/trunk/kres/reengineer/base/src/main/java/org/apache/stanbol/reengineer/base/api/IdentifiedDataSource.java&p1=incubator/stanbol/trunk/kres/reengineer/base/src/main/java/org/apache/stanbol/reengineer/base/IdentifiedDataSource.java&r1=1082537&r2=1082603&rev=1082603&view=diff
==============================================================================
--- incubator/stanbol/trunk/kres/reengineer/base/src/main/java/org/apache/stanbol/reengineer/base/IdentifiedDataSource.java (original)
+++ incubator/stanbol/trunk/kres/reengineer/base/src/main/java/org/apache/stanbol/reengineer/base/api/IdentifiedDataSource.java Thu Mar 17 17:41:13 2011
@@ -1,4 +1,4 @@
-package org.apache.stanbol.reengineer.base;
+package org.apache.stanbol.reengineer.base.api;
import java.io.ByteArrayInputStream;
import java.io.IOException;
Copied: incubator/stanbol/trunk/kres/reengineer/base/src/main/java/org/apache/stanbol/reengineer/base/api/ReengineeringException.java (from r1082537, incubator/stanbol/trunk/kres/reengineer/base/src/main/java/org/apache/stanbol/reengineer/base/ReengineeringException.java)
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/reengineer/base/src/main/java/org/apache/stanbol/reengineer/base/api/ReengineeringException.java?p2=incubator/stanbol/trunk/kres/reengineer/base/src/main/java/org/apache/stanbol/reengineer/base/api/ReengineeringException.java&p1=incubator/stanbol/trunk/kres/reengineer/base/src/main/java/org/apache/stanbol/reengineer/base/ReengineeringException.java&r1=1082537&r2=1082603&rev=1082603&view=diff
==============================================================================
--- incubator/stanbol/trunk/kres/reengineer/base/src/main/java/org/apache/stanbol/reengineer/base/ReengineeringException.java (original)
+++ incubator/stanbol/trunk/kres/reengineer/base/src/main/java/org/apache/stanbol/reengineer/base/api/ReengineeringException.java Thu Mar 17 17:41:13 2011
@@ -1,4 +1,4 @@
-package org.apache.stanbol.reengineer.base;
+package org.apache.stanbol.reengineer.base.api;
public class ReengineeringException extends Exception {
Copied: incubator/stanbol/trunk/kres/reengineer/base/src/main/java/org/apache/stanbol/reengineer/base/api/SemionManager.java (from r1082537, incubator/stanbol/trunk/kres/reengineer/base/src/main/java/org/apache/stanbol/reengineer/base/SemionManager.java)
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/reengineer/base/src/main/java/org/apache/stanbol/reengineer/base/api/SemionManager.java?p2=incubator/stanbol/trunk/kres/reengineer/base/src/main/java/org/apache/stanbol/reengineer/base/api/SemionManager.java&p1=incubator/stanbol/trunk/kres/reengineer/base/src/main/java/org/apache/stanbol/reengineer/base/SemionManager.java&r1=1082537&r2=1082603&rev=1082603&view=diff
==============================================================================
--- incubator/stanbol/trunk/kres/reengineer/base/src/main/java/org/apache/stanbol/reengineer/base/SemionManager.java (original)
+++ incubator/stanbol/trunk/kres/reengineer/base/src/main/java/org/apache/stanbol/reengineer/base/api/SemionManager.java Thu Mar 17 17:41:13 2011
@@ -1,4 +1,4 @@
-package org.apache.stanbol.reengineer.base;
+package org.apache.stanbol.reengineer.base.api;
import java.util.Collection;
Copied: incubator/stanbol/trunk/kres/reengineer/base/src/main/java/org/apache/stanbol/reengineer/base/api/SemionReengineer.java (from r1082537, incubator/stanbol/trunk/kres/reengineer/base/src/main/java/org/apache/stanbol/reengineer/base/SemionReengineer.java)
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/reengineer/base/src/main/java/org/apache/stanbol/reengineer/base/api/SemionReengineer.java?p2=incubator/stanbol/trunk/kres/reengineer/base/src/main/java/org/apache/stanbol/reengineer/base/api/SemionReengineer.java&p1=incubator/stanbol/trunk/kres/reengineer/base/src/main/java/org/apache/stanbol/reengineer/base/SemionReengineer.java&r1=1082537&r2=1082603&rev=1082603&view=diff
==============================================================================
--- incubator/stanbol/trunk/kres/reengineer/base/src/main/java/org/apache/stanbol/reengineer/base/SemionReengineer.java (original)
+++ incubator/stanbol/trunk/kres/reengineer/base/src/main/java/org/apache/stanbol/reengineer/base/api/SemionReengineer.java Thu Mar 17 17:41:13 2011
@@ -1,10 +1,10 @@
-package org.apache.stanbol.reengineer.base;
+package org.apache.stanbol.reengineer.base.api;
import java.util.Observer;
import org.apache.clerezza.rdf.core.MGraph;
import org.apache.clerezza.rdf.core.UriRef;
-import org.apache.stanbol.reengineer.base.util.UnsupportedReengineerException;
+import org.apache.stanbol.reengineer.base.api.util.UnsupportedReengineerException;
import org.semanticweb.owlapi.model.IRI;
import org.semanticweb.owlapi.model.OWLOntology;
Copied: incubator/stanbol/trunk/kres/reengineer/base/src/main/java/org/apache/stanbol/reengineer/base/api/Semion_OWL.java (from r1082537, incubator/stanbol/trunk/kres/reengineer/base/src/main/java/org/apache/stanbol/reengineer/base/Semion_OWL.java)
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/reengineer/base/src/main/java/org/apache/stanbol/reengineer/base/api/Semion_OWL.java?p2=incubator/stanbol/trunk/kres/reengineer/base/src/main/java/org/apache/stanbol/reengineer/base/api/Semion_OWL.java&p1=incubator/stanbol/trunk/kres/reengineer/base/src/main/java/org/apache/stanbol/reengineer/base/Semion_OWL.java&r1=1082537&r2=1082603&rev=1082603&view=diff
==============================================================================
--- incubator/stanbol/trunk/kres/reengineer/base/src/main/java/org/apache/stanbol/reengineer/base/Semion_OWL.java (original)
+++ incubator/stanbol/trunk/kres/reengineer/base/src/main/java/org/apache/stanbol/reengineer/base/api/Semion_OWL.java Thu Mar 17 17:41:13 2011
@@ -1,4 +1,4 @@
-package org.apache.stanbol.reengineer.base;
+package org.apache.stanbol.reengineer.base.api;
import org.semanticweb.owlapi.model.IRI;
Modified: incubator/stanbol/trunk/kres/reengineer/base/src/main/java/org/apache/stanbol/reengineer/base/api/datasources/DataSourceFactory.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/reengineer/base/src/main/java/org/apache/stanbol/reengineer/base/api/datasources/DataSourceFactory.java?rev=1082603&r1=1082537&r2=1082603&view=diff
==============================================================================
--- incubator/stanbol/trunk/kres/reengineer/base/src/main/java/org/apache/stanbol/reengineer/base/api/datasources/DataSourceFactory.java (original)
+++ incubator/stanbol/trunk/kres/reengineer/base/src/main/java/org/apache/stanbol/reengineer/base/api/datasources/DataSourceFactory.java Thu Mar 17 17:41:13 2011
@@ -1,9 +1,9 @@
-package eu.iksproject.kres.semion.manager.datasources;
+package org.apache.stanbol.reengineer.base.api.datasources;
import java.io.InputStream;
-import org.apache.stanbol.reengineer.base.DataSource;
-import org.apache.stanbol.reengineer.base.settings.ConnectionSettings;
+import org.apache.stanbol.reengineer.base.api.DataSource;
+import org.apache.stanbol.reengineer.base.api.settings.ConnectionSettings;
public class DataSourceFactory {
Modified: incubator/stanbol/trunk/kres/reengineer/base/src/main/java/org/apache/stanbol/reengineer/base/api/datasources/InvalidDataSourceForTypeSelectedException.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/reengineer/base/src/main/java/org/apache/stanbol/reengineer/base/api/datasources/InvalidDataSourceForTypeSelectedException.java?rev=1082603&r1=1082537&r2=1082603&view=diff
==============================================================================
--- incubator/stanbol/trunk/kres/reengineer/base/src/main/java/org/apache/stanbol/reengineer/base/api/datasources/InvalidDataSourceForTypeSelectedException.java (original)
+++ incubator/stanbol/trunk/kres/reengineer/base/src/main/java/org/apache/stanbol/reengineer/base/api/datasources/InvalidDataSourceForTypeSelectedException.java Thu Mar 17 17:41:13 2011
@@ -1,4 +1,4 @@
-package eu.iksproject.kres.semion.manager.datasources;
+package org.apache.stanbol.reengineer.base.api.datasources;
public class InvalidDataSourceForTypeSelectedException extends Exception {
Modified: incubator/stanbol/trunk/kres/reengineer/base/src/main/java/org/apache/stanbol/reengineer/base/api/datasources/NoSuchDataSourceExpection.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/reengineer/base/src/main/java/org/apache/stanbol/reengineer/base/api/datasources/NoSuchDataSourceExpection.java?rev=1082603&r1=1082537&r2=1082603&view=diff
==============================================================================
--- incubator/stanbol/trunk/kres/reengineer/base/src/main/java/org/apache/stanbol/reengineer/base/api/datasources/NoSuchDataSourceExpection.java (original)
+++ incubator/stanbol/trunk/kres/reengineer/base/src/main/java/org/apache/stanbol/reengineer/base/api/datasources/NoSuchDataSourceExpection.java Thu Mar 17 17:41:13 2011
@@ -1,4 +1,4 @@
-package eu.iksproject.kres.semion.manager.datasources;
+package org.apache.stanbol.reengineer.base.api.datasources;
public class NoSuchDataSourceExpection extends Exception {
Modified: incubator/stanbol/trunk/kres/reengineer/base/src/main/java/org/apache/stanbol/reengineer/base/api/datasources/RDB.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/reengineer/base/src/main/java/org/apache/stanbol/reengineer/base/api/datasources/RDB.java?rev=1082603&r1=1082537&r2=1082603&view=diff
==============================================================================
--- incubator/stanbol/trunk/kres/reengineer/base/src/main/java/org/apache/stanbol/reengineer/base/api/datasources/RDB.java (original)
+++ incubator/stanbol/trunk/kres/reengineer/base/src/main/java/org/apache/stanbol/reengineer/base/api/datasources/RDB.java Thu Mar 17 17:41:13 2011
@@ -1,8 +1,8 @@
-package eu.iksproject.kres.semion.manager.datasources;
+package org.apache.stanbol.reengineer.base.api.datasources;
-import org.apache.stanbol.reengineer.base.IdentifiedDataSource;
-import org.apache.stanbol.reengineer.base.settings.ConnectionSettings;
-import org.apache.stanbol.reengineer.base.util.ReengineerType;
+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;
Modified: incubator/stanbol/trunk/kres/reengineer/base/src/main/java/org/apache/stanbol/reengineer/base/api/datasources/XML.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/reengineer/base/src/main/java/org/apache/stanbol/reengineer/base/api/datasources/XML.java?rev=1082603&r1=1082537&r2=1082603&view=diff
==============================================================================
--- incubator/stanbol/trunk/kres/reengineer/base/src/main/java/org/apache/stanbol/reengineer/base/api/datasources/XML.java (original)
+++ incubator/stanbol/trunk/kres/reengineer/base/src/main/java/org/apache/stanbol/reengineer/base/api/datasources/XML.java Thu Mar 17 17:41:13 2011
@@ -1,9 +1,9 @@
-package eu.iksproject.kres.semion.manager.datasources;
+package org.apache.stanbol.reengineer.base.api.datasources;
import java.io.InputStream;
-import org.apache.stanbol.reengineer.base.IdentifiedDataSource;
-import org.apache.stanbol.reengineer.base.util.ReengineerType;
+import org.apache.stanbol.reengineer.base.api.IdentifiedDataSource;
+import org.apache.stanbol.reengineer.base.api.util.ReengineerType;
public class XML extends IdentifiedDataSource {
Added: incubator/stanbol/trunk/kres/reengineer/base/src/main/java/org/apache/stanbol/reengineer/base/api/impl/SemionManagerImpl.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/reengineer/base/src/main/java/org/apache/stanbol/reengineer/base/api/impl/SemionManagerImpl.java?rev=1082603&view=auto
==============================================================================
--- incubator/stanbol/trunk/kres/reengineer/base/src/main/java/org/apache/stanbol/reengineer/base/api/impl/SemionManagerImpl.java (added)
+++ incubator/stanbol/trunk/kres/reengineer/base/src/main/java/org/apache/stanbol/reengineer/base/api/impl/SemionManagerImpl.java Thu Mar 17 17:41:13 2011
@@ -0,0 +1,282 @@
+package org.apache.stanbol.reengineer.base.api.impl;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Dictionary;
+import java.util.Hashtable;
+import java.util.Iterator;
+
+import org.apache.felix.scr.annotations.Activate;
+import org.apache.felix.scr.annotations.Component;
+import org.apache.felix.scr.annotations.Deactivate;
+import org.apache.felix.scr.annotations.Reference;
+import org.apache.felix.scr.annotations.Service;
+import org.apache.stanbol.ontologymanager.ontonet.api.KReSONManager;
+import org.apache.stanbol.ontologymanager.store.api.NoSuchOntologyInStoreException;
+import org.apache.stanbol.ontologymanager.store.api.OntologyStorage;
+import org.apache.stanbol.reengineer.base.api.DataSource;
+import org.apache.stanbol.reengineer.base.api.ReengineeringException;
+import org.apache.stanbol.reengineer.base.api.SemionManager;
+import org.apache.stanbol.reengineer.base.api.SemionReengineer;
+import org.apache.stanbol.rules.refactor.api.SemionRefactorer;
+import org.osgi.service.component.ComponentContext;
+import org.semanticweb.owlapi.model.IRI;
+import org.semanticweb.owlapi.model.OWLOntology;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * Concrete implementation of the
+ * {@link eu.iksproject.kres.api.semion.SemionManager} interface defined in the
+ * KReS APIs.
+ *
+ * @author andrea.nuzzolese
+ *
+ */
+
+@Component(immediate = true, metatype = true)
+@Service(SemionManager.class)
+public class SemionManagerImpl implements SemionManager{
+
+ private final Logger log = LoggerFactory.getLogger(getClass());
+ @Reference
+ KReSONManager onManager;
+
+ private ArrayList<SemionReengineer> reengineers;
+
+ private SemionRefactorer semionRefactorer;
+
+ /**
+ * This default constructor is <b>only</b> intended to be used by the OSGI
+ * environment with Service Component Runtime support.
+ * <p>
+ * DO NOT USE to manually create instances - the SemionManagerImpl instances
+ * do need to be configured! YOU NEED TO USE
+ * {@link #SemionManagerImpl(KReSONManager)} or its overloads, to parse the
+ * configuration and then initialise the rule store if running outside a
+ * OSGI environment.
+ */
+ public SemionManagerImpl() {
+ reengineers = new ArrayList<SemionReengineer>();
+ }
+
+ /**
+ * Basic constructor to be used if outside of an OSGi environment. Invokes
+ * default constructor.
+ *
+ * @param onm
+ */
+ public SemionManagerImpl(KReSONManager onManager) {
+ this();
+ this.onManager = onManager;
+ activate(new Hashtable<String, Object>());
+ }
+
+ /**
+ * Used to configure an instance within an OSGi container.
+ *
+ * @throws IOException
+ */
+ @SuppressWarnings("unchecked")
+ @Activate
+ protected void activate(ComponentContext context) throws IOException {
+ log.info("in " + SemionManagerImpl.class + " activate with context "
+ + context);
+ if (context == null) {
+ throw new IllegalStateException("No valid" + ComponentContext.class
+ + " parsed in activate!");
+ }
+ activate((Dictionary<String, Object>) context.getProperties());
+ }
+
+ protected void activate(Dictionary<String, Object> configuration) {
+ reengineers = new ArrayList<SemionReengineer>();
+ }
+
+ /**
+ * @param semionReengineer
+ * {@link eu.iksproject.kres.api.semion.SemionReengineer}
+ * @return true if the reengineer is bound, false otherwise
+ */
+ @Override
+ public boolean bindReengineer(SemionReengineer semionReengineer) {
+ boolean found = false;
+ Iterator<SemionReengineer> it = reengineers.iterator();
+ while(it.hasNext() && !found){
+ SemionReengineer reengineer = it.next();
+ if (reengineer.getReengineerType() == semionReengineer
+ .getReengineerType()) {
+ found = true;
+ }
+ }
+
+ if(!found){
+ reengineers.add(semionReengineer);
+ String info = "Reengineering Manager : " + reengineers.size()
+ + " reengineers";
+ log.info(info);
+ return true;
+ } else {
+ log.info("Reengineer already existing");
+ return false;
+ }
+
+ }
+
+ @Override
+ public int countReengineers() {
+ return reengineers.size();
+ }
+
+ @Deactivate
+ protected void deactivate(ComponentContext context) {
+ log.info("in " + SemionManagerImpl.class + " deactivate with context "
+ + context);
+ reengineers = null;
+ }
+
+ @Override
+ public SemionRefactorer getRegisteredRefactorer() {
+ return semionRefactorer;
+ }
+
+ @Override
+ public Collection<SemionReengineer> listReengineers() {
+ return reengineers;
+ }
+
+ @Override
+ public OWLOntology performDataReengineering(String graphNS, IRI outputIRI,
+ DataSource dataSource, IRI schemaOntologyIRI)
+ throws ReengineeringException, NoSuchOntologyInStoreException {
+
+ OWLOntology reengineeredDataOntology = null;
+
+ OntologyStorage ontologyStorage = onManager.getOntologyStore();
+
+ OWLOntology schemaOntology = ontologyStorage.load(schemaOntologyIRI);
+
+ if(schemaOntology == null){
+ throw new NoSuchOntologyInStoreException(schemaOntologyIRI);
+ } else {
+
+ boolean reengineered = false;
+ Iterator<SemionReengineer> it = reengineers.iterator();
+ while(it.hasNext() && !reengineered){
+ SemionReengineer semionReengineer = it.next();
+ if(semionReengineer.canPerformReengineering(schemaOntology)){
+ reengineeredDataOntology = semionReengineer
+ .dataReengineering(graphNS, outputIRI, dataSource,
+ schemaOntology);
+ reengineered = true;
+ }
+ }
+ }
+
+ return reengineeredDataOntology;
+ }
+
+ @Override
+ public OWLOntology performDataReengineering(String graphNS, IRI outputIRI,
+ DataSource dataSource, OWLOntology schemaOntology)
+ throws ReengineeringException {
+
+ OWLOntology reengineeredDataOntology = null;
+
+ boolean reengineered = false;
+ Iterator<SemionReengineer> it = reengineers.iterator();
+ while(it.hasNext() && !reengineered){
+ SemionReengineer semionReengineer = it.next();
+ if(semionReengineer.canPerformReengineering(schemaOntology)){
+ reengineeredDataOntology = semionReengineer.dataReengineering(
+ graphNS, outputIRI, dataSource, schemaOntology);
+ reengineered = true;
+ }
+ }
+
+ return reengineeredDataOntology;
+ }
+
+ public OWLOntology performReengineering(String graphNS, IRI outputIRI,
+ DataSource dataSource) throws ReengineeringException {
+
+ OWLOntology reengineeredOntology = null;
+
+ boolean reengineered = false;
+ Iterator<SemionReengineer> it = reengineers.iterator();
+ while (it.hasNext() && !reengineered) {
+ SemionReengineer semionReengineer = it.next();
+ if (semionReengineer.canPerformReengineering(dataSource)) {
+ log.debug(semionReengineer.getClass().getCanonicalName()
+ + " can perform the reengineering");
+ reengineeredOntology = semionReengineer.reengineering(graphNS,
+ outputIRI, dataSource);
+ reengineered = true;
+ } else {
+ log.debug(semionReengineer.getClass().getCanonicalName()
+ + " cannot perform the reengineering");
+ }
+ }
+
+ return reengineeredOntology;
+ }
+
+ public OWLOntology performSchemaReengineering(String graphNS,
+ IRI outputIRI, DataSource dataSource) throws ReengineeringException {
+
+ OWLOntology reengineeredSchemaOntology = null;
+
+ boolean reengineered = false;
+ Iterator<SemionReengineer> it = reengineers.iterator();
+ while (it.hasNext() && !reengineered) {
+ SemionReengineer semionReengineer = it.next();
+ if (semionReengineer.canPerformReengineering(dataSource)) {
+ reengineeredSchemaOntology = semionReengineer
+ .schemaReengineering(graphNS, outputIRI, dataSource);
+ if (reengineeredSchemaOntology == null) {
+ throw new ReengineeringException();
+ }
+ reengineered = true;
+ }
+ }
+
+ return reengineeredSchemaOntology;
+ }
+
+ @Override
+ public void registerRefactorer(SemionRefactorer semionRefactorer) {
+ this.semionRefactorer = semionRefactorer;
+ }
+
+ @Override
+ public boolean unbindReengineer(int reenginnerType) {
+ boolean found = false;
+ for(int i=0, j=reengineers.size(); i<j && !found; i++){
+ SemionReengineer reengineer = reengineers.get(i);
+ if(reengineer.getReengineerType() == reenginnerType){
+ reengineers.remove(i);
+ found = true;
+ }
+ }
+ return found;
+ }
+
+ @Override
+ public boolean unbindReengineer(SemionReengineer semionReengineer) {
+ boolean found = false;
+ for (int i = 0, j = reengineers.size(); i < j && !found; i++) {
+ if (semionReengineer.equals(reengineers.get(i))) {
+ reengineers.remove(i);
+ found = true;
+ }
+ }
+ return found;
+ }
+
+ @Override
+ public void unregisterRefactorer() {
+ this.semionRefactorer = null;
+ }
+
+}
Propchange: incubator/stanbol/trunk/kres/reengineer/base/src/main/java/org/apache/stanbol/reengineer/base/api/impl/SemionManagerImpl.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/stanbol/trunk/kres/reengineer/base/src/main/java/org/apache/stanbol/reengineer/base/api/impl/SemionManagerImpl.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision Rev URL
Modified: incubator/stanbol/trunk/kres/reengineer/base/src/main/java/org/apache/stanbol/reengineer/base/api/settings/ConnectionSettings.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/reengineer/base/src/main/java/org/apache/stanbol/reengineer/base/api/settings/ConnectionSettings.java?rev=1082603&r1=1082537&r2=1082603&view=diff
==============================================================================
--- incubator/stanbol/trunk/kres/reengineer/base/src/main/java/org/apache/stanbol/reengineer/base/api/settings/ConnectionSettings.java (original)
+++ incubator/stanbol/trunk/kres/reengineer/base/src/main/java/org/apache/stanbol/reengineer/base/api/settings/ConnectionSettings.java Thu Mar 17 17:41:13 2011
@@ -1,4 +1,4 @@
-package org.apache.stanbol.reengineer.base.settings;
+package org.apache.stanbol.reengineer.base.api.settings;
import java.io.Serializable;
Modified: incubator/stanbol/trunk/kres/reengineer/base/src/main/java/org/apache/stanbol/reengineer/base/api/settings/DBConnectionSettings.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/reengineer/base/src/main/java/org/apache/stanbol/reengineer/base/api/settings/DBConnectionSettings.java?rev=1082603&r1=1082537&r2=1082603&view=diff
==============================================================================
--- incubator/stanbol/trunk/kres/reengineer/base/src/main/java/org/apache/stanbol/reengineer/base/api/settings/DBConnectionSettings.java (original)
+++ incubator/stanbol/trunk/kres/reengineer/base/src/main/java/org/apache/stanbol/reengineer/base/api/settings/DBConnectionSettings.java Thu Mar 17 17:41:13 2011
@@ -1,4 +1,4 @@
-package org.apache.stanbol.reengineer.base.settings;
+package org.apache.stanbol.reengineer.base.api.settings;
public class DBConnectionSettings implements ConnectionSettings {
Modified: incubator/stanbol/trunk/kres/reengineer/base/src/main/java/org/apache/stanbol/reengineer/base/api/util/ReengineerType.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/reengineer/base/src/main/java/org/apache/stanbol/reengineer/base/api/util/ReengineerType.java?rev=1082603&r1=1082537&r2=1082603&view=diff
==============================================================================
--- incubator/stanbol/trunk/kres/reengineer/base/src/main/java/org/apache/stanbol/reengineer/base/api/util/ReengineerType.java (original)
+++ incubator/stanbol/trunk/kres/reengineer/base/src/main/java/org/apache/stanbol/reengineer/base/api/util/ReengineerType.java Thu Mar 17 17:41:13 2011
@@ -1,4 +1,4 @@
-package org.apache.stanbol.reengineer.base.util;
+package org.apache.stanbol.reengineer.base.api.util;
/**
* The ReenginnerType class allows to declare the type of data source that a concrete SemionReengineer
Modified: incubator/stanbol/trunk/kres/reengineer/base/src/main/java/org/apache/stanbol/reengineer/base/api/util/SemionStructuredDataSource.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/reengineer/base/src/main/java/org/apache/stanbol/reengineer/base/api/util/SemionStructuredDataSource.java?rev=1082603&r1=1082537&r2=1082603&view=diff
==============================================================================
--- incubator/stanbol/trunk/kres/reengineer/base/src/main/java/org/apache/stanbol/reengineer/base/api/util/SemionStructuredDataSource.java (original)
+++ incubator/stanbol/trunk/kres/reengineer/base/src/main/java/org/apache/stanbol/reengineer/base/api/util/SemionStructuredDataSource.java Thu Mar 17 17:41:13 2011
@@ -1,4 +1,4 @@
-package org.apache.stanbol.reengineer.base.util;
+package org.apache.stanbol.reengineer.base.api.util;
import java.io.Serializable;
Modified: incubator/stanbol/trunk/kres/reengineer/base/src/main/java/org/apache/stanbol/reengineer/base/api/util/SemionUriRefGenerator.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/reengineer/base/src/main/java/org/apache/stanbol/reengineer/base/api/util/SemionUriRefGenerator.java?rev=1082603&r1=1082537&r2=1082603&view=diff
==============================================================================
--- incubator/stanbol/trunk/kres/reengineer/base/src/main/java/org/apache/stanbol/reengineer/base/api/util/SemionUriRefGenerator.java (original)
+++ incubator/stanbol/trunk/kres/reengineer/base/src/main/java/org/apache/stanbol/reengineer/base/api/util/SemionUriRefGenerator.java Thu Mar 17 17:41:13 2011
@@ -1,91 +1,105 @@
-package org.apache.stanbol.reengineer.base.util;
+package org.apache.stanbol.reengineer.base.api.util;
-import org.apache.clerezza.rdf.core.MGraph;
-import org.apache.clerezza.rdf.core.UriRef;
-import org.apache.clerezza.rdf.core.impl.TripleImpl;
import org.semanticweb.owlapi.model.IRI;
import org.semanticweb.owlapi.model.OWLClass;
import org.semanticweb.owlapi.model.OWLClassAssertionAxiom;
import org.semanticweb.owlapi.model.OWLDataFactory;
import org.semanticweb.owlapi.model.OWLDataProperty;
import org.semanticweb.owlapi.model.OWLDataPropertyAssertionAxiom;
-import org.semanticweb.owlapi.model.OWLIndividual;
import org.semanticweb.owlapi.model.OWLNamedIndividual;
import org.semanticweb.owlapi.model.OWLObjectProperty;
import org.semanticweb.owlapi.model.OWLObjectPropertyAssertionAxiom;
-import org.apache.stanbol.reengineer.db.DBS_L1;
-
public class SemionUriRefGenerator {
-
- protected UriRef createTypedResource(MGraph mGraph, String resourceURI, UriRef type){
- UriRef uriRef = new UriRef(resourceURI);
- if(type != null){
- mGraph.add(new TripleImpl(uriRef, DBS_L1.RDF_TYPE, type));
- }
-
- return uriRef;
- }
-
-
- protected OWLClassAssertionAxiom createOWLClassAssertionAxiom(OWLDataFactory factory, IRI owlClassIRI, IRI individualIRI){
-
- OWLClass owlClass = factory.getOWLClass(owlClassIRI);
- OWLNamedIndividual individual = factory.getOWLNamedIndividual(individualIRI);
-
- OWLClassAssertionAxiom classAssertion = factory.getOWLClassAssertionAxiom(owlClass, individual);
-
- return classAssertion;
- }
-
-
- protected OWLObjectPropertyAssertionAxiom createOWLObjectPropertyAssertionAxiom(OWLDataFactory factory, IRI objectPropertyIRI, IRI subjectIndividualIRI, IRI objectIndividualIRI){
-
- OWLObjectProperty objectProperty = factory.getOWLObjectProperty(objectPropertyIRI);
- OWLNamedIndividual subjectIndividual = factory.getOWLNamedIndividual(subjectIndividualIRI);
- OWLNamedIndividual objectIndividual = factory.getOWLNamedIndividual(objectIndividualIRI);
-
- return factory.getOWLObjectPropertyAssertionAxiom(objectProperty, subjectIndividual, objectIndividual);
- }
-
- protected OWLDataPropertyAssertionAxiom createOWLDataPropertyAssertionAxiom(OWLDataFactory factory, IRI dataPropertyIRI, IRI subjectIndividualIRI, int data){
-
- OWLDataProperty dataProperty = factory.getOWLDataProperty(dataPropertyIRI);
- OWLNamedIndividual subjectIndividual = factory.getOWLNamedIndividual(subjectIndividualIRI);
-
- return factory.getOWLDataPropertyAssertionAxiom(dataProperty, subjectIndividual, data);
- }
-
- protected OWLDataPropertyAssertionAxiom createOWLDataPropertyAssertionAxiom(OWLDataFactory factory, IRI dataPropertyIRI, IRI subjectIndividualIRI, double data){
-
- OWLDataProperty dataProperty = factory.getOWLDataProperty(dataPropertyIRI);
- OWLNamedIndividual subjectIndividual = factory.getOWLNamedIndividual(subjectIndividualIRI);
-
- return factory.getOWLDataPropertyAssertionAxiom(dataProperty, subjectIndividual, data);
- }
-
- protected OWLDataPropertyAssertionAxiom createOWLDataPropertyAssertionAxiom(OWLDataFactory factory, IRI dataPropertyIRI, IRI subjectIndividualIRI, float data){
-
- OWLDataProperty dataProperty = factory.getOWLDataProperty(dataPropertyIRI);
- OWLNamedIndividual subjectIndividual = factory.getOWLNamedIndividual(subjectIndividualIRI);
-
- return factory.getOWLDataPropertyAssertionAxiom(dataProperty, subjectIndividual, data);
- }
-
- protected OWLDataPropertyAssertionAxiom createOWLDataPropertyAssertionAxiom(OWLDataFactory factory, IRI dataPropertyIRI, IRI subjectIndividualIRI, boolean data){
-
- OWLDataProperty dataProperty = factory.getOWLDataProperty(dataPropertyIRI);
- OWLNamedIndividual subjectIndividual = factory.getOWLNamedIndividual(subjectIndividualIRI);
-
- return factory.getOWLDataPropertyAssertionAxiom(dataProperty, subjectIndividual, data);
- }
-
- protected OWLDataPropertyAssertionAxiom createOWLDataPropertyAssertionAxiom(OWLDataFactory factory, IRI dataPropertyIRI, IRI subjectIndividualIRI, String data){
-
- OWLDataProperty dataProperty = factory.getOWLDataProperty(dataPropertyIRI);
- OWLNamedIndividual subjectIndividual = factory.getOWLNamedIndividual(subjectIndividualIRI);
-
- return factory.getOWLDataPropertyAssertionAxiom(dataProperty, subjectIndividual, data);
- }
+
+ // // Unused protected method that relies on a specific reengineer implementation
+ // protected UriRef createTypedResource(MGraph mGraph, String resourceURI, UriRef type){
+ // UriRef uriRef = new UriRef(resourceURI);
+ // if(type != null){
+ // mGraph.add(new TripleImpl(uriRef, DBS_L1.RDF_TYPE, type));
+ // }
+ //
+ // return uriRef;
+ // }
+
+ protected OWLClassAssertionAxiom createOWLClassAssertionAxiom(OWLDataFactory factory,
+ IRI owlClassIRI,
+ IRI individualIRI) {
+
+ OWLClass owlClass = factory.getOWLClass(owlClassIRI);
+ OWLNamedIndividual individual = factory.getOWLNamedIndividual(individualIRI);
+
+ OWLClassAssertionAxiom classAssertion = factory.getOWLClassAssertionAxiom(owlClass, individual);
+
+ return classAssertion;
+ }
+
+ protected OWLObjectPropertyAssertionAxiom createOWLObjectPropertyAssertionAxiom(OWLDataFactory factory,
+ IRI objectPropertyIRI,
+ IRI subjectIndividualIRI,
+ IRI objectIndividualIRI) {
+
+ OWLObjectProperty objectProperty = factory.getOWLObjectProperty(objectPropertyIRI);
+ OWLNamedIndividual subjectIndividual = factory.getOWLNamedIndividual(subjectIndividualIRI);
+ OWLNamedIndividual objectIndividual = factory.getOWLNamedIndividual(objectIndividualIRI);
+
+ return factory
+ .getOWLObjectPropertyAssertionAxiom(objectProperty, subjectIndividual, objectIndividual);
+ }
+
+ protected OWLDataPropertyAssertionAxiom createOWLDataPropertyAssertionAxiom(OWLDataFactory factory,
+ IRI dataPropertyIRI,
+ IRI subjectIndividualIRI,
+ int data) {
+
+ OWLDataProperty dataProperty = factory.getOWLDataProperty(dataPropertyIRI);
+ OWLNamedIndividual subjectIndividual = factory.getOWLNamedIndividual(subjectIndividualIRI);
+
+ return factory.getOWLDataPropertyAssertionAxiom(dataProperty, subjectIndividual, data);
+ }
+
+ protected OWLDataPropertyAssertionAxiom createOWLDataPropertyAssertionAxiom(OWLDataFactory factory,
+ IRI dataPropertyIRI,
+ IRI subjectIndividualIRI,
+ double data) {
+
+ OWLDataProperty dataProperty = factory.getOWLDataProperty(dataPropertyIRI);
+ OWLNamedIndividual subjectIndividual = factory.getOWLNamedIndividual(subjectIndividualIRI);
+
+ return factory.getOWLDataPropertyAssertionAxiom(dataProperty, subjectIndividual, data);
+ }
+
+ protected OWLDataPropertyAssertionAxiom createOWLDataPropertyAssertionAxiom(OWLDataFactory factory,
+ IRI dataPropertyIRI,
+ IRI subjectIndividualIRI,
+ float data) {
+
+ OWLDataProperty dataProperty = factory.getOWLDataProperty(dataPropertyIRI);
+ OWLNamedIndividual subjectIndividual = factory.getOWLNamedIndividual(subjectIndividualIRI);
+
+ return factory.getOWLDataPropertyAssertionAxiom(dataProperty, subjectIndividual, data);
+ }
+
+ protected OWLDataPropertyAssertionAxiom createOWLDataPropertyAssertionAxiom(OWLDataFactory factory,
+ IRI dataPropertyIRI,
+ IRI subjectIndividualIRI,
+ boolean data) {
+
+ OWLDataProperty dataProperty = factory.getOWLDataProperty(dataPropertyIRI);
+ OWLNamedIndividual subjectIndividual = factory.getOWLNamedIndividual(subjectIndividualIRI);
+
+ return factory.getOWLDataPropertyAssertionAxiom(dataProperty, subjectIndividual, data);
+ }
+
+ protected OWLDataPropertyAssertionAxiom createOWLDataPropertyAssertionAxiom(OWLDataFactory factory,
+ IRI dataPropertyIRI,
+ IRI subjectIndividualIRI,
+ String data) {
+
+ OWLDataProperty dataProperty = factory.getOWLDataProperty(dataPropertyIRI);
+ OWLNamedIndividual subjectIndividual = factory.getOWLNamedIndividual(subjectIndividualIRI);
+
+ return factory.getOWLDataPropertyAssertionAxiom(dataProperty, subjectIndividual, data);
+ }
}
Modified: incubator/stanbol/trunk/kres/reengineer/base/src/main/java/org/apache/stanbol/reengineer/base/api/util/UnsupportedReengineerException.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/reengineer/base/src/main/java/org/apache/stanbol/reengineer/base/api/util/UnsupportedReengineerException.java?rev=1082603&r1=1082537&r2=1082603&view=diff
==============================================================================
--- incubator/stanbol/trunk/kres/reengineer/base/src/main/java/org/apache/stanbol/reengineer/base/api/util/UnsupportedReengineerException.java (original)
+++ incubator/stanbol/trunk/kres/reengineer/base/src/main/java/org/apache/stanbol/reengineer/base/api/util/UnsupportedReengineerException.java Thu Mar 17 17:41:13 2011
@@ -1,4 +1,4 @@
-package org.apache.stanbol.reengineer.base.util;
+package org.apache.stanbol.reengineer.base.api.util;
public class UnsupportedReengineerException extends Exception {
Modified: incubator/stanbol/trunk/kres/reengineer/base/src/test/java/org/apache/stanbol/rengineer/base/SemionManagerTest.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/reengineer/base/src/test/java/org/apache/stanbol/rengineer/base/SemionManagerTest.java?rev=1082603&r1=1082537&r2=1082603&view=diff
==============================================================================
--- incubator/stanbol/trunk/kres/reengineer/base/src/test/java/org/apache/stanbol/rengineer/base/SemionManagerTest.java (original)
+++ incubator/stanbol/trunk/kres/reengineer/base/src/test/java/org/apache/stanbol/rengineer/base/SemionManagerTest.java Thu Mar 17 17:41:13 2011
@@ -1,20 +1,19 @@
-package eu.iksproject.kres.semion.reengineer;
+package org.apache.stanbol.rengineer.base;
import static org.junit.Assert.fail;
-import org.apache.stanbol.reengineer.base.DataSource;
-import org.apache.stanbol.reengineer.base.ReengineeringException;
-import org.apache.stanbol.reengineer.base.SemionManager;
-import org.apache.stanbol.reengineer.base.SemionReengineer;
-import org.apache.stanbol.reengineer.base.util.ReengineerType;
-import org.apache.stanbol.reengineer.base.util.UnsupportedReengineerException;
+import org.apache.stanbol.reengineer.base.api.DataSource;
+import org.apache.stanbol.reengineer.base.api.ReengineeringException;
+import org.apache.stanbol.reengineer.base.api.SemionManager;
+import org.apache.stanbol.reengineer.base.api.SemionReengineer;
+import org.apache.stanbol.reengineer.base.api.impl.SemionManagerImpl;
+import org.apache.stanbol.reengineer.base.api.util.ReengineerType;
+import org.apache.stanbol.reengineer.base.api.util.UnsupportedReengineerException;
import org.junit.BeforeClass;
import org.junit.Test;
import org.semanticweb.owlapi.model.IRI;
import org.semanticweb.owlapi.model.OWLOntology;
-import eu.iksproject.kres.semion.manager.SemionManagerImpl;
-
public class SemionManagerTest {
Propchange: incubator/stanbol/trunk/kres/reengineer/db/
------------------------------------------------------------------------------
--- svn:ignore (original)
+++ svn:ignore Thu Mar 17 17:41:13 2011
@@ -1 +1,4 @@
target
+.settings
+.classpath
+.project
Modified: incubator/stanbol/trunk/kres/reengineer/db/pom.xml
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/reengineer/db/pom.xml?rev=1082603&r1=1082602&r2=1082603&view=diff
==============================================================================
--- incubator/stanbol/trunk/kres/reengineer/db/pom.xml (original)
+++ incubator/stanbol/trunk/kres/reengineer/db/pom.xml Thu Mar 17 17:41:13 2011
@@ -52,11 +52,20 @@
<extensions>true</extensions>
<configuration>
<instructions>
+ <Bundle-ClassPath>
+ .,
+ mysql-connector-java-5.1.10.jar,
+ OSGI-INF
+ </Bundle-ClassPath>
<Export-Package>
org.apache.stanbol.reengineer.db.*;version=${stanbol-version}
</Export-Package>
<Import-Package>
+ !org.jboss.resource.adapter.jdbc.*,
+ !com.mchange.*,
+ com.hp.hpl.jena.*,
org.slf4j.*;version=1.5.2,
+ org.xml.sax.*,
*
</Import-Package>
<_nouses>true</_nouses>
@@ -64,30 +73,71 @@
</configuration>
</plugin>
<plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-scr-plugin</artifactId>
- </plugin>
- <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<source>1.6</source>
<target>1.6</target>
</configuration>
+ <dependencies>
+ <dependency>
+ <groupId>com.hp.hpl.jena</groupId>
+ <artifactId>jena</artifactId>
+ <version>2.6.2</version>
+ </dependency>
+ </dependencies>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-scr-plugin</artifactId>
+ <dependencies>
+ <dependency>
+ <groupId>com.hp.hpl.jena</groupId>
+ <artifactId>jena</artifactId>
+ <version>2.6.2</version>
+ </dependency>
+ </dependencies>
</plugin>
</plugins>
</build>
<dependencies>
+
+ <!-- OSGi deps -->
<dependency>
<groupId>org.apache.felix</groupId>
<artifactId>org.apache.felix.scr.annotations</artifactId>
<version>1.2.0</version>
</dependency>
+
+
+ <!-- Stanbol deps -->
<dependency>
- <groupId>org.slf4j</groupId>
- <artifactId>slf4j-api</artifactId>
- <version>1.5.2</version>
+ <groupId>eu.iksproject</groupId>
+ <artifactId>eu.iksproject.kres.shared.dependency.owlapi</artifactId>
+ <version>${kres-version}</version>
+ </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.reengineer.base</artifactId>
+ <version>${stanbol-version}</version>
+ </dependency>
+ <dependency>
+ <groupId>eu.iksproject</groupId>
+ <artifactId>eu.iksproject.kres.shared.transformation</artifactId>
+ <version>${kres-version}</version>
+ </dependency>
+
+ <!-- Jena deps -->
+ <dependency>
+ <groupId>com.hp.hpl.jena</groupId>
+ <artifactId>iri</artifactId>
+ <version>0.8</version>
<scope>provided</scope>
</dependency>
<dependency>
@@ -95,6 +145,12 @@
<artifactId>jena</artifactId>
<version>2.6.2</version>
<scope>provided</scope>
+ <exclusions>
+ <exclusion>
+ <artifactId>slf4j-log4j12</artifactId>
+ <groupId>org.slf4j</groupId>
+ </exclusion>
+ </exclusions>
</dependency>
<dependency>
<groupId>com.hp.hpl.jena</groupId>
@@ -103,17 +159,87 @@
<scope>provided</scope>
</dependency>
<dependency>
+ <groupId>com.hp.hpl.jena</groupId>
+ <artifactId>tdb</artifactId>
+ <version>0.8.5</version>
+ <scope>provided</scope>
+ </dependency>
+
+ <!-- Clerezza deps -->
+ <dependency>
<groupId>org.apache.clerezza</groupId>
<artifactId>org.apache.clerezza.rdf.core</artifactId>
<version>0.12-incubating-SNAPSHOT</version>
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>eu.iksproject</groupId>
- <artifactId>eu.iksproject.kres.shared.dependency.owlapi</artifactId>
- <version>${kres-version}</version>
+ <groupId>org.apache.clerezza</groupId>
+ <artifactId>org.apache.clerezza.rdf.jena.serializer</artifactId>
+ <version>0.9-incubating-SNAPSHOT</version>
+ </dependency>
+
+ <!-- XML deps -->
+ <dependency>
+ <groupId>stax</groupId>
+ <artifactId>stax-api</artifactId>
+ <version>1.0.1</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.woodstox</groupId>
+ <artifactId>wstx-asl</artifactId>
+ <version>3.9.9-3</version>
+ </dependency>
+ <dependency>
+ <groupId>com.ibm.icu</groupId>
+ <artifactId>icu4j</artifactId>
+ <version>3.4.4</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>xerces</groupId>
+ <artifactId>xercesImpl</artifactId>
+ <version>2.7.1</version>
+ <scope>compile</scope>
+ </dependency>
+
+ <!-- Diagnostics deps -->
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ <version>1.5.2</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <version>1.2.13</version>
+ <scope>provided</scope>
+ </dependency>
+
+ <!-- Testing deps -->
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.4</version>
+ <scope>test</scope>
+ <exclusions>
+ <exclusion>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-api</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.slf4j</groupId>
+ <artifactId>slf4j-simple</artifactId>
+ <version>1.5.2</version>
+ <scope>test</scope>
</dependency>
+
</dependencies>
+
+
<repositories />
</project>
Copied: incubator/stanbol/trunk/kres/reengineer/db/src/main/java/org/apache/stanbol/reengineer/db/DBExtractor.java (from r1082537, incubator/stanbol/trunk/kres/eu.iksproject.kres.semion.reengineer.db/src/main/java/eu/iksproject/kres/semion/reengineer/db/DBExtractor.java)
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/reengineer/db/src/main/java/org/apache/stanbol/reengineer/db/DBExtractor.java?p2=incubator/stanbol/trunk/kres/reengineer/db/src/main/java/org/apache/stanbol/reengineer/db/DBExtractor.java&p1=incubator/stanbol/trunk/kres/eu.iksproject.kres.semion.reengineer.db/src/main/java/eu/iksproject/kres/semion/reengineer/db/DBExtractor.java&r1=1082537&r2=1082603&rev=1082603&view=diff
==============================================================================
--- incubator/stanbol/trunk/kres/eu.iksproject.kres.semion.reengineer.db/src/main/java/eu/iksproject/kres/semion/reengineer/db/DBExtractor.java (original)
+++ incubator/stanbol/trunk/kres/reengineer/db/src/main/java/org/apache/stanbol/reengineer/db/DBExtractor.java Thu Mar 17 17:41:13 2011
@@ -1,4 +1,4 @@
-package eu.iksproject.kres.semion.reengineer.db;
+package org.apache.stanbol.reengineer.db;
import java.io.IOException;
import java.util.Dictionary;
@@ -21,13 +21,14 @@ import org.apache.stanbol.ontologymanage
import org.apache.stanbol.ontologymanager.ontonet.api.ontology.ScopeRegistry;
import org.apache.stanbol.ontologymanager.ontonet.api.session.KReSSession;
import org.apache.stanbol.ontologymanager.ontonet.api.session.KReSSessionManager;
-import org.apache.stanbol.reengineer.base.DataSource;
-import org.apache.stanbol.reengineer.base.ReengineeringException;
-import org.apache.stanbol.reengineer.base.SemionManager;
-import org.apache.stanbol.reengineer.base.SemionReengineer;
-import org.apache.stanbol.reengineer.base.settings.ConnectionSettings;
-import org.apache.stanbol.reengineer.base.util.ReengineerType;
-import org.apache.stanbol.reengineer.base.util.UnsupportedReengineerException;
+import org.apache.stanbol.reengineer.base.api.DataSource;
+import org.apache.stanbol.reengineer.base.api.ReengineeringException;
+import org.apache.stanbol.reengineer.base.api.SemionManager;
+import org.apache.stanbol.reengineer.base.api.SemionReengineer;
+import org.apache.stanbol.reengineer.base.api.settings.ConnectionSettings;
+import org.apache.stanbol.reengineer.base.api.util.ReengineerType;
+import org.apache.stanbol.reengineer.base.api.util.UnsupportedReengineerException;
+import org.apache.stanbol.reengineer.db.vocab.DBS_L1;
import org.osgi.service.component.ComponentContext;
import org.semanticweb.owlapi.apibinding.OWLManager;
import org.semanticweb.owlapi.model.IRI;
@@ -38,8 +39,6 @@ import org.semanticweb.owlapi.model.OWLO
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.apache.stanbol.reengineer.db.DBS_L1;
-
/**
* The {@code DBExtractor} is an implementation of the {@link SemionReengineer} for relational databases.
*
Copied: incubator/stanbol/trunk/kres/reengineer/db/src/main/java/org/apache/stanbol/reengineer/db/DataExtractionInfo.java (from r1082537, incubator/stanbol/trunk/kres/eu.iksproject.kres.semion.reengineer.db/src/main/java/eu/iksproject/kres/semion/reengineer/db/DataExtractionInfo.java)
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/reengineer/db/src/main/java/org/apache/stanbol/reengineer/db/DataExtractionInfo.java?p2=incubator/stanbol/trunk/kres/reengineer/db/src/main/java/org/apache/stanbol/reengineer/db/DataExtractionInfo.java&p1=incubator/stanbol/trunk/kres/eu.iksproject.kres.semion.reengineer.db/src/main/java/eu/iksproject/kres/semion/reengineer/db/DataExtractionInfo.java&r1=1082537&r2=1082603&rev=1082603&view=diff
==============================================================================
--- incubator/stanbol/trunk/kres/eu.iksproject.kres.semion.reengineer.db/src/main/java/eu/iksproject/kres/semion/reengineer/db/DataExtractionInfo.java (original)
+++ incubator/stanbol/trunk/kres/reengineer/db/src/main/java/org/apache/stanbol/reengineer/db/DataExtractionInfo.java Thu Mar 17 17:41:13 2011
@@ -1,4 +1,4 @@
-package eu.iksproject.kres.semion.reengineer.db;
+package org.apache.stanbol.reengineer.db;
public class DataExtractionInfo {
Copied: incubator/stanbol/trunk/kres/reengineer/db/src/main/java/org/apache/stanbol/reengineer/db/SemionDBDataTransformer.java (from r1082537, incubator/stanbol/trunk/kres/eu.iksproject.kres.semion.reengineer.db/src/main/java/eu/iksproject/kres/semion/reengineer/db/SemionDBDataTransformer.java)
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/reengineer/db/src/main/java/org/apache/stanbol/reengineer/db/SemionDBDataTransformer.java?p2=incubator/stanbol/trunk/kres/reengineer/db/src/main/java/org/apache/stanbol/reengineer/db/SemionDBDataTransformer.java&p1=incubator/stanbol/trunk/kres/eu.iksproject.kres.semion.reengineer.db/src/main/java/eu/iksproject/kres/semion/reengineer/db/SemionDBDataTransformer.java&r1=1082537&r2=1082603&rev=1082603&view=diff
==============================================================================
--- incubator/stanbol/trunk/kres/eu.iksproject.kres.semion.reengineer.db/src/main/java/eu/iksproject/kres/semion/reengineer/db/SemionDBDataTransformer.java (original)
+++ incubator/stanbol/trunk/kres/reengineer/db/src/main/java/org/apache/stanbol/reengineer/db/SemionDBDataTransformer.java Thu Mar 17 17:41:13 2011
@@ -1,4 +1,4 @@
-package eu.iksproject.kres.semion.reengineer.db;
+package org.apache.stanbol.reengineer.db;
import java.sql.ResultSet;
import java.sql.SQLException;
@@ -7,8 +7,11 @@ import java.util.Hashtable;
import java.util.Set;
import org.apache.stanbol.ontologymanager.ontonet.api.KReSONManager;
-import org.apache.stanbol.reengineer.base.ReengineeringException;
-import org.apache.stanbol.reengineer.base.util.SemionUriRefGenerator;
+import org.apache.stanbol.reengineer.base.api.ReengineeringException;
+import org.apache.stanbol.reengineer.base.api.util.SemionUriRefGenerator;
+import org.apache.stanbol.reengineer.db.connection.DatabaseConnection;
+import org.apache.stanbol.reengineer.db.vocab.DBS_L1;
+import org.apache.stanbol.reengineer.db.vocab.DBS_L1_OWL;
import org.semanticweb.owlapi.model.AddAxiom;
import org.semanticweb.owlapi.model.IRI;
import org.semanticweb.owlapi.model.OWLClass;
@@ -31,9 +34,6 @@ 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.reengineer.db.DBS_L1;
-import org.apache.stanbol.reengineer.db.DBS_L1_OWL;
-import eu.iksproject.kres.semion.reengineer.db.connection.DatabaseConnection;
import eu.iksproject.kres.shared.transformation.JenaToOwlConvert;
public class SemionDBDataTransformer extends SemionUriRefGenerator {