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/25 15:01:55 UTC
svn commit: r1085376 - in /incubator/stanbol/trunk/kres/reengineer/db: ./
src/main/java/org/apache/stanbol/reengineer/db/
src/test/java/org/apache/stanbol/reengineer/db/
Author: concelvio
Date: Fri Mar 25 14:01:54 2011
New Revision: 1085376
URL: http://svn.apache.org/viewvc?rev=1085376&view=rev
Log:
STANBOL-39:
- changed parent version in pom.xml to ${stanbol-version}
- removed kres-version from pom.xml
- changed name SemionDBDataTransformer.java to DBDataTransformer.java
- changed name SemionDBSchemaGenerator.java to DBSchemaGenerator.java
Added:
incubator/stanbol/trunk/kres/reengineer/db/src/main/java/org/apache/stanbol/reengineer/db/DBDataTransformer.java
- copied, changed from r1085259, incubator/stanbol/trunk/kres/reengineer/db/src/main/java/org/apache/stanbol/reengineer/db/SemionDBDataTransformer.java
incubator/stanbol/trunk/kres/reengineer/db/src/main/java/org/apache/stanbol/reengineer/db/DBSchemaGenerator.java
- copied, changed from r1085259, incubator/stanbol/trunk/kres/reengineer/db/src/main/java/org/apache/stanbol/reengineer/db/SemionDBSchemaGenerator.java
Removed:
incubator/stanbol/trunk/kres/reengineer/db/src/main/java/org/apache/stanbol/reengineer/db/SemionDBDataTransformer.java
incubator/stanbol/trunk/kres/reengineer/db/src/main/java/org/apache/stanbol/reengineer/db/SemionDBSchemaGenerator.java
Modified:
incubator/stanbol/trunk/kres/reengineer/db/pom.xml
incubator/stanbol/trunk/kres/reengineer/db/src/main/java/org/apache/stanbol/reengineer/db/DBExtractor.java
incubator/stanbol/trunk/kres/reengineer/db/src/test/java/org/apache/stanbol/reengineer/db/DBExtractorTest.java
Modified: incubator/stanbol/trunk/kres/reengineer/db/pom.xml
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/reengineer/db/pom.xml?rev=1085376&r1=1085375&r2=1085376&view=diff
==============================================================================
--- incubator/stanbol/trunk/kres/reengineer/db/pom.xml (original)
+++ incubator/stanbol/trunk/kres/reengineer/db/pom.xml Fri Mar 25 14:01:54 2011
@@ -23,14 +23,10 @@
<parent>
<groupId>org.apache.stanbol</groupId>
<artifactId>stanbol-parent</artifactId>
- <version>0.9-SNAPSHOT</version>
+ <version>${stanbol-version}</version>
<relativePath>../../../parent</relativePath>
</parent>
- <properties>
- <kres-version>0.7</kres-version>
- </properties>
-
<groupId>org.apache.stanbol</groupId>
<artifactId>org.apache.stanbol.reengineer.db</artifactId>
<packaging>bundle</packaging>
@@ -127,11 +123,6 @@
<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>
Copied: incubator/stanbol/trunk/kres/reengineer/db/src/main/java/org/apache/stanbol/reengineer/db/DBDataTransformer.java (from r1085259, incubator/stanbol/trunk/kres/reengineer/db/src/main/java/org/apache/stanbol/reengineer/db/SemionDBDataTransformer.java)
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/reengineer/db/src/main/java/org/apache/stanbol/reengineer/db/DBDataTransformer.java?p2=incubator/stanbol/trunk/kres/reengineer/db/src/main/java/org/apache/stanbol/reengineer/db/DBDataTransformer.java&p1=incubator/stanbol/trunk/kres/reengineer/db/src/main/java/org/apache/stanbol/reengineer/db/SemionDBDataTransformer.java&r1=1085259&r2=1085376&rev=1085376&view=diff
==============================================================================
--- incubator/stanbol/trunk/kres/reengineer/db/src/main/java/org/apache/stanbol/reengineer/db/SemionDBDataTransformer.java (original)
+++ incubator/stanbol/trunk/kres/reengineer/db/src/main/java/org/apache/stanbol/reengineer/db/DBDataTransformer.java Fri Mar 25 14:01:54 2011
@@ -6,9 +6,9 @@ import java.util.ArrayList;
import java.util.Hashtable;
import java.util.Set;
-import org.apache.stanbol.ontologymanager.ontonet.api.KReSONManager;
+import org.apache.stanbol.ontologymanager.ontonet.api.ONManager;
import org.apache.stanbol.reengineer.base.api.ReengineeringException;
-import org.apache.stanbol.reengineer.base.api.util.SemionUriRefGenerator;
+import org.apache.stanbol.reengineer.base.api.util.ReengineerUriRefGenerator;
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;
@@ -36,14 +36,14 @@ import com.hp.hpl.jena.rdf.model.Resourc
import org.apache.stanbol.owlapi.trasformation.JenaToOwlConvert;
-public class SemionDBDataTransformer extends SemionUriRefGenerator {
+public class DBDataTransformer extends ReengineerUriRefGenerator {
- private KReSONManager onManager;
+ private ONManager onManager;
private OWLOntology schemaOntology;
private DatabaseConnection databaseConnection;
- public SemionDBDataTransformer(KReSONManager onManager, OWLOntology schemaOntology) {
+ public DBDataTransformer(ONManager onManager, OWLOntology schemaOntology) {
this.onManager = onManager;
this.schemaOntology = schemaOntology;
this.databaseConnection = new DatabaseConnection(schemaOntology);
Modified: incubator/stanbol/trunk/kres/reengineer/db/src/main/java/org/apache/stanbol/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?rev=1085376&r1=1085375&r2=1085376&view=diff
==============================================================================
--- incubator/stanbol/trunk/kres/reengineer/db/src/main/java/org/apache/stanbol/reengineer/db/DBExtractor.java (original)
+++ incubator/stanbol/trunk/kres/reengineer/db/src/main/java/org/apache/stanbol/reengineer/db/DBExtractor.java Fri Mar 25 14:01:54 2011
@@ -13,18 +13,18 @@ import org.apache.felix.scr.annotations.
import org.apache.felix.scr.annotations.Reference;
import org.apache.felix.scr.annotations.Service;
import org.apache.stanbol.ontologymanager.ontonet.api.DuplicateIDException;
-import org.apache.stanbol.ontologymanager.ontonet.api.KReSONManager;
+import org.apache.stanbol.ontologymanager.ontonet.api.ONManager;
import org.apache.stanbol.ontologymanager.ontonet.api.io.RootOntologyIRISource;
import org.apache.stanbol.ontologymanager.ontonet.api.ontology.OntologyScope;
import org.apache.stanbol.ontologymanager.ontonet.api.ontology.OntologyScopeFactory;
import org.apache.stanbol.ontologymanager.ontonet.api.ontology.OntologySpaceFactory;
import org.apache.stanbol.ontologymanager.ontonet.api.ontology.ScopeRegistry;
-import org.apache.stanbol.ontologymanager.ontonet.api.session.KReSSession;
+import org.apache.stanbol.ontologymanager.ontonet.api.session.Session;
import org.apache.stanbol.ontologymanager.ontonet.api.session.KReSSessionManager;
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.ReengineerManager;
+import org.apache.stanbol.reengineer.base.api.Reengineer;
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;
@@ -40,15 +40,15 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/**
- * The {@code DBExtractor} is an implementation of the {@link SemionReengineer} for relational databases.
+ * The {@code DBExtractor} is an implementation of the {@link Reengineer} for relational databases.
*
* @author andrea.nuzzolese
*
*/
@Component(immediate = true, metatype = true)
-@Service(SemionReengineer.class)
-public class DBExtractor implements SemionReengineer {
+@Service(Reengineer.class)
+public class DBExtractor implements Reengineer {
public static final String _DB_DATA_REENGINEERING_SESSION_DEFAULT = "/db-data-reengineering-session";
public static final String _DB_DATA_REENGINEERING_SESSION_SPACE_DEFAULT = "/db-data-reengineering-session-space";
@@ -59,19 +59,19 @@ public class DBExtractor implements Semi
public static final String _REENGINEERING_SCOPE_DEFAULT = "db_reengineering";
@Property(value = _DB_DATA_REENGINEERING_SESSION_DEFAULT)
- public static final String DB_DATA_REENGINEERING_SESSION = "eu.iksproject.kres.semion.reengineer.db.data";
+ public static final String DB_DATA_REENGINEERING_SESSION = "org.apache.stanbol.reengineer.db.data";
@Property(value = _DB_DATA_REENGINEERING_SESSION_SPACE_DEFAULT)
- public static final String DB_DATA_REENGINEERING_SESSION_SPACE = "eu.iksproject.kres.semion.reengineer.space.db.data";
+ public static final String DB_DATA_REENGINEERING_SESSION_SPACE = "org.apache.stanbol.reengineer.space.db.data";
@Property(value = _DB_REENGINEERING_SESSION_SPACE_DEFAULT)
public static final String DB_REENGINEERING_SESSION_SPACE = "http://kres.iks-project.eu/space/reengineering/db";
@Property(value = _DB_SCHEMA_REENGINEERING_ONTOLOGY_SPACE_DEFAULT)
- public static final String DB_SCHEMA_REENGINEERING_ONTOLOGY_SPACE = "eu.iksproject.kres.semion.reengineer.ontology.space.db";
+ public static final String DB_SCHEMA_REENGINEERING_ONTOLOGY_SPACE = "org.apache.stanbol.reengineer.ontology.space.db";
@Property(value = _DB_SCHEMA_REENGINEERING_SESSION_DEFAULT)
- public static final String DB_SCHEMA_REENGINEERING_SESSION = "eu.iksproject.kres.semion.reengineer.db.schema";
+ public static final String DB_SCHEMA_REENGINEERING_SESSION = "org.apache.stanbol.reengineer.db.schema";
@Property(value = _HOST_NAME_AND_PORT_DEFAULT)
public static final String HOST_NAME_AND_PORT = "host.name.port";
@@ -88,10 +88,10 @@ public class DBExtractor implements Semi
private final Logger log = LoggerFactory.getLogger(getClass());
@Reference
- KReSONManager onManager;
+ ONManager onManager;
@Reference
- SemionManager reengineeringManager;
+ ReengineerManager reengineeringManager;
private IRI reengineeringScopeIRI;
@@ -111,7 +111,7 @@ public class DBExtractor implements Semi
* Component Runtime support.
* <p>
* DO NOT USE to manually create instances - the DBExtractor instances do need to be configured! YOU NEED
- * TO USE {@link #DBExtractor(KReSONManager)} or its overloads, to parse the configuration and then
+ * TO USE {@link #DBExtractor(ONManager)} or its overloads, to parse the configuration and then
* initialise the rule store if running outside a OSGI environment.
*/
public DBExtractor() {
@@ -120,11 +120,11 @@ public class DBExtractor implements Semi
/**
*
- * Create a new {@link DBExtractor} that is formally a {@link SemionReengineer}.
+ * Create a new {@link DBExtractor} that is formally a {@link Reengineer}.
*
*/
- public DBExtractor(SemionManager reengineeringManager,
- KReSONManager onManager,
+ public DBExtractor(ReengineerManager reengineeringManager,
+ ONManager onManager,
TcManager tcManager,
WeightedTcProvider weightedTcProvider,
Dictionary<String,Object> configuration) {
@@ -137,7 +137,7 @@ public class DBExtractor implements Semi
}
/**
- * Create a new {@link DBExtractor} that is formally a {@link SemionReengineer}.
+ * Create a new {@link DBExtractor} that is formally a {@link Reengineer}.
*
* @param databaseURI
* {@link String}
@@ -146,8 +146,8 @@ public class DBExtractor implements Semi
* @param connectionSettings
* {@link ConnectionSettings}
*/
- public DBExtractor(SemionManager reengineeringManager,
- KReSONManager onManager,
+ public DBExtractor(ReengineerManager reengineeringManager,
+ ONManager onManager,
TcManager tcManager,
WeightedTcProvider weightedTcProvider,
Dictionary<String,Object> configuration,
@@ -192,13 +192,13 @@ public class DBExtractor implements Semi
hostNameAndPort = "http://" + hostNameAndPort;
- reengineeringScopeIRI = IRI.create(hostNameAndPort + "/kres/ontology/" + reengineeringScopeID);
+ reengineeringScopeIRI = IRI.create(hostNameAndPort + "/kres/ontoman/ontology/ontology/" + reengineeringScopeID);
reengineeringSpaceIRI = IRI.create(DB_REENGINEERING_SESSION_SPACE);
reengineeringManager.bindReengineer(this);
KReSSessionManager kReSSessionManager = onManager.getSessionManager();
- KReSSession kReSSession = kReSSessionManager.createSession();
+ Session kReSSession = kReSSessionManager.createSession();
kReSSessionID = kReSSession.getID();
@@ -279,7 +279,7 @@ public class DBExtractor implements Semi
DataSource dataSource,
OWLOntology schemaOntology) throws ReengineeringException {
- SemionDBDataTransformer semionDBDataTransformer = new SemionDBDataTransformer(onManager,
+ DBDataTransformer semionDBDataTransformer = new DBDataTransformer(onManager,
schemaOntology);
return semionDBDataTransformer.transformData(graphNS, outputIRI);
@@ -335,7 +335,7 @@ public class DBExtractor implements Semi
OntologyScope reengineeringScope = getScope();
if (reengineeringScope != null) {
ConnectionSettings connectionSettings = (ConnectionSettings) dataSource.getDataSource();
- SemionDBSchemaGenerator schemaGenerator = new SemionDBSchemaGenerator(outputIRI,
+ DBSchemaGenerator schemaGenerator = new DBSchemaGenerator(outputIRI,
connectionSettings);
System.out.println("OWL MANAGER IN SEMION: " + onManager);
Copied: incubator/stanbol/trunk/kres/reengineer/db/src/main/java/org/apache/stanbol/reengineer/db/DBSchemaGenerator.java (from r1085259, incubator/stanbol/trunk/kres/reengineer/db/src/main/java/org/apache/stanbol/reengineer/db/SemionDBSchemaGenerator.java)
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/reengineer/db/src/main/java/org/apache/stanbol/reengineer/db/DBSchemaGenerator.java?p2=incubator/stanbol/trunk/kres/reengineer/db/src/main/java/org/apache/stanbol/reengineer/db/DBSchemaGenerator.java&p1=incubator/stanbol/trunk/kres/reengineer/db/src/main/java/org/apache/stanbol/reengineer/db/SemionDBSchemaGenerator.java&r1=1085259&r2=1085376&rev=1085376&view=diff
==============================================================================
--- incubator/stanbol/trunk/kres/reengineer/db/src/main/java/org/apache/stanbol/reengineer/db/SemionDBSchemaGenerator.java (original)
+++ incubator/stanbol/trunk/kres/reengineer/db/src/main/java/org/apache/stanbol/reengineer/db/DBSchemaGenerator.java Fri Mar 25 14:01:54 2011
@@ -11,7 +11,7 @@ import java.util.Hashtable;
import org.apache.clerezza.rdf.core.MGraph;
import org.apache.stanbol.reengineer.base.api.settings.ConnectionSettings;
-import org.apache.stanbol.reengineer.base.api.util.SemionUriRefGenerator;
+import org.apache.stanbol.reengineer.base.api.util.ReengineerUriRefGenerator;
import org.apache.stanbol.reengineer.db.vocab.DBS_L1_OWL;
import org.semanticweb.owlapi.model.AddAxiom;
import org.semanticweb.owlapi.model.IRI;
@@ -23,13 +23,13 @@ import org.semanticweb.owlapi.model.OWLO
/**
- * The {@code SemionDBSchemaGenerator} is responsible of the generation of the RDF of the schema of a relational database.
+ * The {@code DBSchemaGenerator} is responsible of the generation of the RDF of the schema of a relational database.
*
* @author andrea.nuzzolese
*
*/
-public class SemionDBSchemaGenerator extends SemionUriRefGenerator implements Serializable {
+public class DBSchemaGenerator extends ReengineerUriRefGenerator implements Serializable {
private String graphNS;
private IRI outputIRI;
@@ -37,21 +37,21 @@ public class SemionDBSchemaGenerator ext
/**
- * Creates a new standard {@code SemionDBSchemaGenerator}
+ * Creates a new standard {@code DBSchemaGenerator}
*/
- public SemionDBSchemaGenerator() {
+ public DBSchemaGenerator() {
}
/**
- * Creates a new {@code SemionDBSchemaGenerator} that can generate the RDF of the database's schema. The database is available
+ * Creates a new {@code DBSchemaGenerator} that can generate the RDF of the database's schema. The database is available
* thanks to the {@code connectionSettings} passed as input. The URI of the RDF will be that one passed as actual parameter to the
* formal parameter {@code databaseURI}.
*
* @param databaseURI {@link String}
* @param connectionSettings {@link ConnectionSettings}
*/
- public SemionDBSchemaGenerator(IRI outputIRI, ConnectionSettings connectionSettings){
+ public DBSchemaGenerator(IRI outputIRI, ConnectionSettings connectionSettings){
this.connectionSettings = connectionSettings;
this.outputIRI = outputIRI;
Modified: incubator/stanbol/trunk/kres/reengineer/db/src/test/java/org/apache/stanbol/reengineer/db/DBExtractorTest.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/reengineer/db/src/test/java/org/apache/stanbol/reengineer/db/DBExtractorTest.java?rev=1085376&r1=1085375&r2=1085376&view=diff
==============================================================================
--- incubator/stanbol/trunk/kres/reengineer/db/src/test/java/org/apache/stanbol/reengineer/db/DBExtractorTest.java (original)
+++ incubator/stanbol/trunk/kres/reengineer/db/src/test/java/org/apache/stanbol/reengineer/db/DBExtractorTest.java Fri Mar 25 14:01:54 2011
@@ -8,9 +8,9 @@ import org.apache.clerezza.rdf.core.acce
import org.apache.clerezza.rdf.core.sparql.QueryEngine;
import org.apache.clerezza.rdf.jena.sparql.JenaSparqlEngine;
import org.apache.clerezza.rdf.simple.storage.SimpleTcProvider;
-import org.apache.stanbol.ontologymanager.ontonet.api.KReSONManager;
-import org.apache.stanbol.ontologymanager.ontonet.impl.ONManager;
-import org.apache.stanbol.reengineer.base.impl.SemionManagerImpl;
+import org.apache.stanbol.ontologymanager.ontonet.api.ONManager;
+import org.apache.stanbol.ontologymanager.ontonet.impl.ONManagerImpl;
+import org.apache.stanbol.reengineer.base.impl.ReengineerManagerImpl;
import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.Test;
@@ -20,7 +20,7 @@ public class DBExtractorTest {
static DBExtractor dbExtractor;
static String graphNS;
- static KReSONManager onManager;
+ static ONManager onManager;
static IRI outputIRI;
@BeforeClass
@@ -41,8 +41,8 @@ public class DBExtractorTest {
// Two different ontology storagez, the same sparql engine and tcprovider
- onManager = new ONManager(tcm, wtcp,emptyConf);
- dbExtractor = new DBExtractor(new SemionManagerImpl(tcm, wtcp),
+ onManager = new ONManagerImpl(tcm, wtcp,emptyConf);
+ dbExtractor = new DBExtractor(new ReengineerManagerImpl(tcm, wtcp),
onManager, tcm, wtcp, emptyConf);
graphNS = "http://kres.iks-project.eu/reengineering/test";
outputIRI = IRI.create(graphNS);