Author: anuzzolese
Date: Wed Apr 6 11:15:27 2011
New Revision: 1089402
URL: http://svn.apache.org/viewvc?rev=1089402&view=rev
Log:
STANBOL-148
Removed performDataReengineering(String graphNS, IRI outputIRI, DataSource
dataSource, IRI schemaOntologyIRI).
Only performDataReengineering(String graphNS, IRI outputIRI, DataSource
dataSource, OWLOntology schemaOntology) remains.
Modified:
incubator/stanbol/trunk/reengineer/base/src/main/java/org/apache/stanbol/reengineer/base/api/ReengineerManager.java
incubator/stanbol/trunk/reengineer/base/src/main/java/org/apache/stanbol/reengineer/base/impl/ReengineerManagerImpl.java
incubator/stanbol/trunk/reengineer/db/pom.xml
incubator/stanbol/trunk/reengineer/db/src/main/java/org/apache/stanbol/reengineer/db/DBExtractor.java
incubator/stanbol/trunk/reengineer/db/src/main/java/org/apache/stanbol/reengineer/db/DBSchemaGenerator.java
incubator/stanbol/trunk/reengineer/db/src/test/java/org/apache/stanbol/reengineer/db/DBExtractorTest.java
incubator/stanbol/trunk/reengineer/xml/src/main/java/org/apache/stanbol/reengineer/xml/XSDExtractor.java
Modified:
incubator/stanbol/trunk/reengineer/base/src/main/java/org/apache/stanbol/reengineer/base/api/ReengineerManager.java
URL:
http://svn.apache.org/viewvc/incubator/stanbol/trunk/reengineer/base/src/main/java/org/apache/stanbol/reengineer/base/api/ReengineerManager.java?rev=1089402&r1=1089401&r2=1089402&view=diff
==============================================================================
---
incubator/stanbol/trunk/reengineer/base/src/main/java/org/apache/stanbol/reengineer/base/api/ReengineerManager.java
(original)
+++
incubator/stanbol/trunk/reengineer/base/src/main/java/org/apache/stanbol/reengineer/base/api/ReengineerManager.java
Wed Apr 6 11:15:27 2011
@@ -83,8 +83,6 @@ public interface ReengineerManager {
OWLOntology performSchemaReengineering(String graphNS, IRI outputIRI,
DataSource dataSource) throws ReengineeringException;
- OWLOntology performDataReengineering(String graphNS, IRI outputIRI,
DataSource dataSource, IRI schemaOntologyIRI) throws ReengineeringException,
NoSuchOntologyInStoreException;
-
OWLOntology performDataReengineering(String graphNS, IRI outputIRI,
DataSource dataSource, OWLOntology schemaOntology) throws
ReengineeringException;
}
Modified:
incubator/stanbol/trunk/reengineer/base/src/main/java/org/apache/stanbol/reengineer/base/impl/ReengineerManagerImpl.java
URL:
http://svn.apache.org/viewvc/incubator/stanbol/trunk/reengineer/base/src/main/java/org/apache/stanbol/reengineer/base/impl/ReengineerManagerImpl.java?rev=1089402&r1=1089401&r2=1089402&view=diff
==============================================================================
---
incubator/stanbol/trunk/reengineer/base/src/main/java/org/apache/stanbol/reengineer/base/impl/ReengineerManagerImpl.java
(original)
+++
incubator/stanbol/trunk/reengineer/base/src/main/java/org/apache/stanbol/reengineer/base/impl/ReengineerManagerImpl.java
Wed Apr 6 11:15:27 2011
@@ -41,41 +41,17 @@ public class ReengineerManagerImpl imple
private final Logger log = LoggerFactory.getLogger(getClass());
- @Reference
- private TcManager tcm;
-
- @Reference
- private WeightedTcProvider wtcp;
-
- private ClerezzaOntologyStorage storage;
-
- private ArrayList<Reengineer> 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 ReengineerManagerImpl
instances
- * do need to be configured! YOU NEED TO USE
- * {@link #ReengineerManagerImpl(ONManager)} or its overloads, to parse
the
- * configuration and then initialise the rule store if running outside a
- * OSGI environment.
- */
- public ReengineerManagerImpl() {
- reengineers = new ArrayList<Reengineer>();
- }
+ private ArrayList<Reengineer> reengineers;
+
/**
* Basic constructor to be used if outside of an OSGi environment.
Invokes
* default constructor.
*
* @param onm
*/
- public ReengineerManagerImpl(TcManager tcm, WeightedTcProvider wtcp) {
- this();
- storage = new ClerezzaOntologyStorage(tcm, wtcp);
+ public ReengineerManagerImpl() {
+
activate(new Hashtable<String, Object>());
}
@@ -97,8 +73,9 @@ public class ReengineerManagerImpl imple
}
protected void activate(Dictionary<String, Object> configuration) {
- if (storage == null) storage = new ClerezzaOntologyStorage(this.tcm,
this.wtcp);
+
reengineers = new ArrayList<Reengineer>();
+
}
/**
@@ -153,36 +130,6 @@ public class ReengineerManagerImpl imple
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 = storage.load(schemaOntologyIRI);
-
- if(schemaOntology == null){
- throw new
NoSuchOntologyInStoreException(schemaOntologyIRI);
- } else {
-
- boolean reengineered = false;
- Iterator<Reengineer> it = reengineers.iterator();
- while(it.hasNext() && !reengineered){
- Reengineer 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,
Modified: incubator/stanbol/trunk/reengineer/db/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/stanbol/trunk/reengineer/db/pom.xml?rev=1089402&r1=1089401&r2=1089402&view=diff
==============================================================================
--- incubator/stanbol/trunk/reengineer/db/pom.xml (original)
+++ incubator/stanbol/trunk/reengineer/db/pom.xml Wed Apr 6 11:15:27 2011
@@ -160,56 +160,6 @@
<version>3.0.0</version>
</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>org.apache.clerezza</groupId>
-
<artifactId>org.apache.clerezza.rdf.jena.serializer</artifactId>
- <version>0.9-incubating-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.clerezza</groupId>
-
<artifactId>org.apache.clerezza.rdf.jena.sparql</artifactId>
- <version>0.5-incubating-SNAPSHOT</version>
- <scope>provided</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.clerezza</groupId>
-
<artifactId>org.apache.clerezza.rdf.simple.storage</artifactId>
- <version>0.7-incubating-SNAPSHOT</version>
- <scope>provided</scope>
- </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>
Modified:
incubator/stanbol/trunk/reengineer/db/src/main/java/org/apache/stanbol/reengineer/db/DBExtractor.java
URL:
http://svn.apache.org/viewvc/incubator/stanbol/trunk/reengineer/db/src/main/java/org/apache/stanbol/reengineer/db/DBExtractor.java?rev=1089402&r1=1089401&r2=1089402&view=diff
==============================================================================
---
incubator/stanbol/trunk/reengineer/db/src/main/java/org/apache/stanbol/reengineer/db/DBExtractor.java
(original)
+++
incubator/stanbol/trunk/reengineer/db/src/main/java/org/apache/stanbol/reengineer/db/DBExtractor.java
Wed Apr 6 11:15:27 2011
@@ -100,12 +100,7 @@ public class DBExtractor implements Reen
MGraph schemaGraph;
protected OntologyScope scope;
- @Reference
- TcManager tcManager;
-
- @Reference
- WeightedTcProvider weightedTcProvider;
-
+
/**
* This default constructor is <b>only</b> intended to be used by the OSGI
environment with Service
* Component Runtime support.
@@ -131,8 +126,6 @@ public class DBExtractor implements Reen
this();
this.reengineeringManager = reengineeringManager;
this.onManager = onManager;
- this.tcManager = tcManager;
- this.weightedTcProvider = weightedTcProvider;
activate(configuration);
}
@@ -159,8 +152,6 @@ public class DBExtractor implements Reen
this();
this.reengineeringManager = reengineeringManager;
this.onManager = onManager;
- this.tcManager = tcManager;
- this.weightedTcProvider = weightedTcProvider;
this.databaseURI = databaseURI;
this.schemaGraph = schemaGraph;
this.connectionSettings = connectionSettings;
@@ -332,6 +323,9 @@ public class DBExtractor implements Reen
log.info("Semion DBExtractor : starting to generate RDF graph of a
db schema ");
}
+ /*
+ * Fetch the reengineering scope.
+ */
OntologyScope reengineeringScope = getScope();
if (reengineeringScope != null) {
ConnectionSettings connectionSettings = (ConnectionSettings)
dataSource.getDataSource();
@@ -339,9 +333,11 @@ public class DBExtractor implements Reen
connectionSettings);
System.out.println("OWL MANAGER IN SEMION: " + onManager);
- OWLOntologyManager ontologyManager =
onManager.getOwlCacheManager();
- OWLDataFactory dataFactory = onManager.getOwlFactory();
- schemaOntology = schemaGenerator.getSchema(ontologyManager,
dataFactory);
+
+ /*
+ * Extract the schema from the source.
+ */
+ schemaOntology = schemaGenerator.getSchema();
if (outputIRI != null) {
log.info("Created graph with URI " + outputIRI.toString() + "
of DB Schema.");
Modified:
incubator/stanbol/trunk/reengineer/db/src/main/java/org/apache/stanbol/reengineer/db/DBSchemaGenerator.java
URL:
http://svn.apache.org/viewvc/incubator/stanbol/trunk/reengineer/db/src/main/java/org/apache/stanbol/reengineer/db/DBSchemaGenerator.java?rev=1089402&r1=1089401&r2=1089402&view=diff
==============================================================================
---
incubator/stanbol/trunk/reengineer/db/src/main/java/org/apache/stanbol/reengineer/db/DBSchemaGenerator.java
(original)
+++
incubator/stanbol/trunk/reengineer/db/src/main/java/org/apache/stanbol/reengineer/db/DBSchemaGenerator.java
Wed Apr 6 11:15:27 2011
@@ -9,10 +9,10 @@ import java.sql.SQLException;
import java.util.ArrayList;
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.ReengineerUriRefGenerator;
import org.apache.stanbol.reengineer.db.vocab.DBS_L1_OWL;
+import org.semanticweb.owlapi.apibinding.OWLManager;
import org.semanticweb.owlapi.model.AddAxiom;
import org.semanticweb.owlapi.model.IRI;
import org.semanticweb.owlapi.model.OWLClassAssertionAxiom;
@@ -57,10 +57,13 @@ public class DBSchemaGenerator extends R
* Performs the generation of the RDF of the database schema. The RDF
graph is added to the {@link MGraph} passed as input.
*
*
- * @param mGraph {@link MGraph}
+ * @param mGraph {@link OWLOntology}
* @return the {@link MGraph} containing the database schema into RDF.
*/
- public OWLOntology getSchema(OWLOntologyManager manager, OWLDataFactory
factory){
+ public OWLOntology getSchema(){
+
+ OWLOntologyManager manager =
OWLManager.createOWLOntologyManager();
+ OWLDataFactory factory = manager.getOWLDataFactory();
Connection con = openConnection(connectionSettings);
@@ -114,8 +117,6 @@ public class DBSchemaGenerator extends R
ResultSet rs = md.getTables(null, null, "%", null);
- String rdfs = "http://www.w3.org/2000/01/rdf-schema#";;
-
for(int k=0; rs.next(); k++) {
String table = rs.getString(3);
System.out.println("TABLE : "+table);
Modified:
incubator/stanbol/trunk/reengineer/db/src/test/java/org/apache/stanbol/reengineer/db/DBExtractorTest.java
URL:
http://svn.apache.org/viewvc/incubator/stanbol/trunk/reengineer/db/src/test/java/org/apache/stanbol/reengineer/db/DBExtractorTest.java?rev=1089402&r1=1089401&r2=1089402&view=diff
==============================================================================
---
incubator/stanbol/trunk/reengineer/db/src/test/java/org/apache/stanbol/reengineer/db/DBExtractorTest.java
(original)
+++
incubator/stanbol/trunk/reengineer/db/src/test/java/org/apache/stanbol/reengineer/db/DBExtractorTest.java
Wed Apr 6 11:15:27 2011
@@ -42,7 +42,7 @@ public class DBExtractorTest {
onManager = new ONManagerImpl(tcm, wtcp,emptyConf);
- dbExtractor = new DBExtractor(new ReengineerManagerImpl(tcm,
wtcp),
+ dbExtractor = new DBExtractor(new ReengineerManagerImpl(),
onManager, tcm, wtcp, emptyConf);
graphNS = "http://kres.iks-project.eu/reengineering/test";;
outputIRI = IRI.create(graphNS);
Modified:
incubator/stanbol/trunk/reengineer/xml/src/main/java/org/apache/stanbol/reengineer/xml/XSDExtractor.java
URL:
http://svn.apache.org/viewvc/incubator/stanbol/trunk/reengineer/xml/src/main/java/org/apache/stanbol/reengineer/xml/XSDExtractor.java?rev=1089402&r1=1089401&r2=1089402&view=diff
==============================================================================
---
incubator/stanbol/trunk/reengineer/xml/src/main/java/org/apache/stanbol/reengineer/xml/XSDExtractor.java
(original)
+++
incubator/stanbol/trunk/reengineer/xml/src/main/java/org/apache/stanbol/reengineer/xml/XSDExtractor.java
Wed Apr 6 11:15:27 2011
@@ -7,7 +7,6 @@ import javax.xml.parsers.DocumentBuilder
import javax.xml.parsers.DocumentBuilderFactory;
import javax.xml.parsers.ParserConfigurationException;
-import org.apache.clerezza.rdf.core.access.WeightedTcProvider;
import org.apache.stanbol.ontologymanager.ontonet.api.ONManager;
import org.apache.stanbol.reengineer.base.api.DataSource;
import org.apache.stanbol.reengineer.base.api.util.ReengineerUriRefGenerator;
@@ -60,16 +59,10 @@ import org.xml.sax.SAXException;
public class XSDExtractor extends ReengineerUriRefGenerator {
- private WeightedTcProvider weightedTcProvider;
-
private ONManager onManager;
public final Logger log = LoggerFactory.getLogger(getClass());
- public XSDExtractor(WeightedTcProvider weightedTcProvider) {
- this.weightedTcProvider = weightedTcProvider;
- }
-
public XSDExtractor(ONManager onManager) {
this.onManager = onManager;
}
