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 14:59:24 UTC
svn commit: r1085371 - in /incubator/stanbol/trunk/kres/reengineer/base: ./
src/main/java/org/apache/stanbol/reengineer/base/api/
src/main/java/org/apache/stanbol/reengineer/base/api/util/
src/main/java/org/apache/stanbol/reengineer/base/impl/ src/test...
Author: concelvio
Date: Fri Mar 25 13:59:23 2011
New Revision: 1085371
URL: http://svn.apache.org/viewvc?rev=1085371&view=rev
Log:
STANBOL-39:
- changed parent version in pom.xml to ${stanbol-version}
- removed kres-version from pom.xml
- changed name SemionManager.java to ReengineerManager.java
- changed name SemionReengineer.java to Reengineer.java
- changed name Semion_OWL.java to Reengineer_OWL.java
- changed name SemionStructuredDataSource.java to ReengineerStructuredDataSource.java
- changed name SemionUriRefGenerator.java to ReengineerUriRefGenerator.java
- changed name SemionManagerImpl.java to ReengineerManagerImpl.java
- changed name SemionManagerTest.java to ReengineerManagerTest.javaRuleList.java
Added:
incubator/stanbol/trunk/kres/reengineer/base/src/main/java/org/apache/stanbol/reengineer/base/api/Reengineer.java
- copied, changed from r1085259, incubator/stanbol/trunk/kres/reengineer/base/src/main/java/org/apache/stanbol/reengineer/base/api/SemionReengineer.java
incubator/stanbol/trunk/kres/reengineer/base/src/main/java/org/apache/stanbol/reengineer/base/api/ReengineerManager.java
- copied, changed from r1085259, incubator/stanbol/trunk/kres/reengineer/base/src/main/java/org/apache/stanbol/reengineer/base/api/SemionManager.java
incubator/stanbol/trunk/kres/reengineer/base/src/main/java/org/apache/stanbol/reengineer/base/api/Reengineer_OWL.java
- copied, changed from r1085259, incubator/stanbol/trunk/kres/reengineer/base/src/main/java/org/apache/stanbol/reengineer/base/api/Semion_OWL.java
incubator/stanbol/trunk/kres/reengineer/base/src/main/java/org/apache/stanbol/reengineer/base/api/util/ReengineerStructuredDataSource.java
- copied, changed from r1085259, 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/ReengineerUriRefGenerator.java
- copied, changed from r1085259, 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/impl/ReengineerManagerImpl.java
- copied, changed from r1085259, incubator/stanbol/trunk/kres/reengineer/base/src/main/java/org/apache/stanbol/reengineer/base/impl/SemionManagerImpl.java
incubator/stanbol/trunk/kres/reengineer/base/src/test/java/org/apache/stanbol/rengineer/base/ReengineerManagerTest.java
- copied, changed from r1085259, incubator/stanbol/trunk/kres/reengineer/base/src/test/java/org/apache/stanbol/rengineer/base/SemionManagerTest.java
Removed:
incubator/stanbol/trunk/kres/reengineer/base/src/main/java/org/apache/stanbol/reengineer/base/api/SemionManager.java
incubator/stanbol/trunk/kres/reengineer/base/src/main/java/org/apache/stanbol/reengineer/base/api/SemionReengineer.java
incubator/stanbol/trunk/kres/reengineer/base/src/main/java/org/apache/stanbol/reengineer/base/api/Semion_OWL.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/impl/SemionManagerImpl.java
incubator/stanbol/trunk/kres/reengineer/base/src/test/java/org/apache/stanbol/rengineer/base/SemionManagerTest.java
Modified:
incubator/stanbol/trunk/kres/reengineer/base/pom.xml
Modified: incubator/stanbol/trunk/kres/reengineer/base/pom.xml
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/reengineer/base/pom.xml?rev=1085371&r1=1085370&r2=1085371&view=diff
==============================================================================
--- incubator/stanbol/trunk/kres/reengineer/base/pom.xml (original)
+++ incubator/stanbol/trunk/kres/reengineer/base/pom.xml Fri Mar 25 13:59:23 2011
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.stanbol</groupId>
<artifactId>stanbol-parent</artifactId>
- <version>0.9-SNAPSHOT</version>
+ <version>${stanbol-version}</version>
<relativePath>../../../parent</relativePath>
</parent>
@@ -39,10 +39,6 @@
<inceptionYear>2010</inceptionYear>
- <properties>
- <kres-version>0.7</kres-version>
- </properties>
-
<build>
<plugins>
<plugin>
Copied: incubator/stanbol/trunk/kres/reengineer/base/src/main/java/org/apache/stanbol/reengineer/base/api/Reengineer.java (from r1085259, incubator/stanbol/trunk/kres/reengineer/base/src/main/java/org/apache/stanbol/reengineer/base/api/SemionReengineer.java)
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/reengineer/base/src/main/java/org/apache/stanbol/reengineer/base/api/Reengineer.java?p2=incubator/stanbol/trunk/kres/reengineer/base/src/main/java/org/apache/stanbol/reengineer/base/api/Reengineer.java&p1=incubator/stanbol/trunk/kres/reengineer/base/src/main/java/org/apache/stanbol/reengineer/base/api/SemionReengineer.java&r1=1085259&r2=1085371&rev=1085371&view=diff
==============================================================================
--- incubator/stanbol/trunk/kres/reengineer/base/src/main/java/org/apache/stanbol/reengineer/base/api/SemionReengineer.java (original)
+++ incubator/stanbol/trunk/kres/reengineer/base/src/main/java/org/apache/stanbol/reengineer/base/api/Reengineer.java Fri Mar 25 13:59:23 2011
@@ -7,7 +7,7 @@ import org.semanticweb.owlapi.model.OWLO
/**
*
- * A SemionReengineer provides methods for transforming in KReS both the schema and the data of a non-RDF data source into RDF.
+ * A Reengineer provides methods for transforming in KReS both the schema and the data of a non-RDF data source into RDF.
* <br>
* <br>
* Accepted data sources are:
@@ -22,7 +22,7 @@ import org.semanticweb.owlapi.model.OWLO
*
*/
-public interface SemionReengineer {
+public interface Reengineer {
/**
* The method returns one of the following values related to a particular data souce:
Copied: incubator/stanbol/trunk/kres/reengineer/base/src/main/java/org/apache/stanbol/reengineer/base/api/ReengineerManager.java (from r1085259, incubator/stanbol/trunk/kres/reengineer/base/src/main/java/org/apache/stanbol/reengineer/base/api/SemionManager.java)
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/reengineer/base/src/main/java/org/apache/stanbol/reengineer/base/api/ReengineerManager.java?p2=incubator/stanbol/trunk/kres/reengineer/base/src/main/java/org/apache/stanbol/reengineer/base/api/ReengineerManager.java&p1=incubator/stanbol/trunk/kres/reengineer/base/src/main/java/org/apache/stanbol/reengineer/base/api/SemionManager.java&r1=1085259&r2=1085371&rev=1085371&view=diff
==============================================================================
--- incubator/stanbol/trunk/kres/reengineer/base/src/main/java/org/apache/stanbol/reengineer/base/api/SemionManager.java (original)
+++ incubator/stanbol/trunk/kres/reengineer/base/src/main/java/org/apache/stanbol/reengineer/base/api/ReengineerManager.java Fri Mar 25 13:59:23 2011
@@ -8,34 +8,34 @@ import org.semanticweb.owlapi.model.OWLO
/**
*
- * The {@code SemionManager} is responsible of the coordination of all the tasks performed by Semion in KReS
+ * The {@code ReengineerManager} is responsible of the coordination of all the tasks performed by Semion in KReS
*
* @author andrea.nuzzolese
*
*/
-public interface SemionManager {
+public interface ReengineerManager {
/**
- * The {@link SemionManager} can add a new reengineer to the list of available reengineers. This is performed through the method
+ * The {@link ReengineerManager} can add a new reengineer to the list of available reengineers. This is performed through the method
* {@cod bindReengineer}.
*
- * @param semionReengineer {@link SemionReengineer}
+ * @param semionReengineer {@link Reengineer}
* @return true if the reengineer is bound, false otherwise
*/
- public boolean bindReengineer(SemionReengineer semionReengineer);
+ public boolean bindReengineer(Reengineer semionReengineer);
/**
- * The {@link SemionManager} can remove a reengineer from the list of available reengineers. This is performed through the method
+ * The {@link ReengineerManager} can remove a reengineer from the list of available reengineers. This is performed through the method
* {@cod unbindReengineer}.
*
- * @param semionReengineer {@link SemionReengineer}
+ * @param semionReengineer {@link Reengineer}
* @return true if the reengineer is unbound, false otherwise
*/
- public boolean unbindReengineer(SemionReengineer semionReengineer);
+ public boolean unbindReengineer(Reengineer semionReengineer);
/**
- * The {@link SemionManager} can remove a reengineer from the list of available reengineers. This is performed through the method
+ * The {@link ReengineerManager} can remove a reengineer from the list of available reengineers. This is performed through the method
* {@cod unbindReengineer}.
*
* @param reenginnerType {@code int}
@@ -45,7 +45,7 @@ public interface SemionManager {
// /**
-// * The {@link SemionManager} can register a single instance of {@link SemionRefactorer}.
+// * The {@link ReengineerManager} can register a single instance of {@link SemionRefactorer}.
// *
// * @param semionRefactorer {@link SemionRefactorer}
// */
@@ -68,9 +68,9 @@ public interface SemionManager {
/**
* Gets the active reengineers of KReS.
*
- * @return the {@link Collection< SemionReengineer >} of active reengineers.
+ * @return the {@link Collection< Reengineer >} of active reengineers.
*/
- public Collection<SemionReengineer> listReengineers();
+ public Collection<Reengineer> listReengineers();
/**
* Gets the number of active reengineers.
Copied: incubator/stanbol/trunk/kres/reengineer/base/src/main/java/org/apache/stanbol/reengineer/base/api/Reengineer_OWL.java (from r1085259, incubator/stanbol/trunk/kres/reengineer/base/src/main/java/org/apache/stanbol/reengineer/base/api/Semion_OWL.java)
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/reengineer/base/src/main/java/org/apache/stanbol/reengineer/base/api/Reengineer_OWL.java?p2=incubator/stanbol/trunk/kres/reengineer/base/src/main/java/org/apache/stanbol/reengineer/base/api/Reengineer_OWL.java&p1=incubator/stanbol/trunk/kres/reengineer/base/src/main/java/org/apache/stanbol/reengineer/base/api/Semion_OWL.java&r1=1085259&r2=1085371&rev=1085371&view=diff
==============================================================================
--- incubator/stanbol/trunk/kres/reengineer/base/src/main/java/org/apache/stanbol/reengineer/base/api/Semion_OWL.java (original)
+++ incubator/stanbol/trunk/kres/reengineer/base/src/main/java/org/apache/stanbol/reengineer/base/api/Reengineer_OWL.java Fri Mar 25 13:59:23 2011
@@ -4,7 +4,7 @@ import org.semanticweb.owlapi.model.IRI;
-public class Semion_OWL {
+public class Reengineer_OWL {
public static final String URI = "http://ontologydesignpatterns.org/ont/iks/semion.owl";
Copied: incubator/stanbol/trunk/kres/reengineer/base/src/main/java/org/apache/stanbol/reengineer/base/api/util/ReengineerStructuredDataSource.java (from r1085259, 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/ReengineerStructuredDataSource.java?p2=incubator/stanbol/trunk/kres/reengineer/base/src/main/java/org/apache/stanbol/reengineer/base/api/util/ReengineerStructuredDataSource.java&p1=incubator/stanbol/trunk/kres/reengineer/base/src/main/java/org/apache/stanbol/reengineer/base/api/util/SemionStructuredDataSource.java&r1=1085259&r2=1085371&rev=1085371&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/ReengineerStructuredDataSource.java Fri Mar 25 13:59:23 2011
@@ -7,7 +7,7 @@ import org.apache.clerezza.rdf.core.UriR
/**
*
- * A {@code SemionStructuredDataSource} is the representation of a data source after it has been reengineerd by Semion.
+ * A {@code ReengineerStructuredDataSource} is the representation of a data source after it has been reengineerd by Semion.
* Basically it is identified by two UriRefs (see {@link UriRef}:
* <ul>
* <li> {@code schemaUriRef} that identifies the {@link MGraph} generated by Semion from the original data source schema
@@ -18,7 +18,7 @@ import org.apache.clerezza.rdf.core.UriR
*
*/
-public class SemionStructuredDataSource implements Serializable {
+public class ReengineerStructuredDataSource implements Serializable {
/**
* Serial Version (generated)
@@ -31,15 +31,15 @@ public class SemionStructuredDataSource
/**
* Default constructor to be compliant with the Serializable interface.
*/
- public SemionStructuredDataSource() {
+ public ReengineerStructuredDataSource() {
}
/**
- * It creates a {@code SemionStructuredDataSource} with a {@link UriRef} both for the schema and the data of a reengineered
+ * It creates a {@code ReengineerStructuredDataSource} with a {@link UriRef} both for the schema and the data of a reengineered
* data source by Semion.
*/
- public SemionStructuredDataSource(UriRef schemaUriRef, UriRef dataUriRef) {
+ public ReengineerStructuredDataSource(UriRef schemaUriRef, UriRef dataUriRef) {
this.schemaUriRef = schemaUriRef;
this.dataUriRef = dataUriRef;
}
Copied: incubator/stanbol/trunk/kres/reengineer/base/src/main/java/org/apache/stanbol/reengineer/base/api/util/ReengineerUriRefGenerator.java (from r1085259, 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/ReengineerUriRefGenerator.java?p2=incubator/stanbol/trunk/kres/reengineer/base/src/main/java/org/apache/stanbol/reengineer/base/api/util/ReengineerUriRefGenerator.java&p1=incubator/stanbol/trunk/kres/reengineer/base/src/main/java/org/apache/stanbol/reengineer/base/api/util/SemionUriRefGenerator.java&r1=1085259&r2=1085371&rev=1085371&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/ReengineerUriRefGenerator.java Fri Mar 25 13:59:23 2011
@@ -10,7 +10,7 @@ import org.semanticweb.owlapi.model.OWLN
import org.semanticweb.owlapi.model.OWLObjectProperty;
import org.semanticweb.owlapi.model.OWLObjectPropertyAssertionAxiom;
-public class SemionUriRefGenerator {
+public class ReengineerUriRefGenerator {
// // Unused protected method that relies on a specific reengineer implementation
// protected UriRef createTypedResource(MGraph mGraph, String resourceURI, UriRef type){
Copied: incubator/stanbol/trunk/kres/reengineer/base/src/main/java/org/apache/stanbol/reengineer/base/impl/ReengineerManagerImpl.java (from r1085259, incubator/stanbol/trunk/kres/reengineer/base/src/main/java/org/apache/stanbol/reengineer/base/impl/SemionManagerImpl.java)
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/reengineer/base/src/main/java/org/apache/stanbol/reengineer/base/impl/ReengineerManagerImpl.java?p2=incubator/stanbol/trunk/kres/reengineer/base/src/main/java/org/apache/stanbol/reengineer/base/impl/ReengineerManagerImpl.java&p1=incubator/stanbol/trunk/kres/reengineer/base/src/main/java/org/apache/stanbol/reengineer/base/impl/SemionManagerImpl.java&r1=1085259&r2=1085371&rev=1085371&view=diff
==============================================================================
--- incubator/stanbol/trunk/kres/reengineer/base/src/main/java/org/apache/stanbol/reengineer/base/impl/SemionManagerImpl.java (original)
+++ incubator/stanbol/trunk/kres/reengineer/base/src/main/java/org/apache/stanbol/reengineer/base/impl/ReengineerManagerImpl.java Fri Mar 25 13:59:23 2011
@@ -14,12 +14,12 @@ import org.apache.felix.scr.annotations.
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.ontonet.api.ONManager;
import org.apache.stanbol.ontologymanager.ontonet.impl.ontology.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.reengineer.base.api.ReengineerManager;
+import org.apache.stanbol.reengineer.base.api.Reengineer;
import org.osgi.service.component.ComponentContext;
import org.semanticweb.owlapi.model.IRI;
import org.semanticweb.owlapi.model.OWLOntology;
@@ -28,7 +28,7 @@ import org.slf4j.LoggerFactory;
/**
* Concrete implementation of the
- * {@link eu.iksproject.kres.api.semion.SemionManager} interface defined in the
+ * {@link org.apache.stanbol.reengineer.base.api.ReengineerManager} interface defined in the
* KReS APIs.
*
* @author andrea.nuzzolese
@@ -36,8 +36,8 @@ import org.slf4j.LoggerFactory;
*/
@Component(immediate = true, metatype = true)
-@Service(SemionManager.class)
-public class SemionManagerImpl implements SemionManager{
+@Service(ReengineerManager.class)
+public class ReengineerManagerImpl implements ReengineerManager{
private final Logger log = LoggerFactory.getLogger(getClass());
@@ -49,7 +49,7 @@ public class SemionManagerImpl implement
private OntologyStorage storage;
- private ArrayList<SemionReengineer> reengineers;
+ private ArrayList<Reengineer> reengineers;
//
// private SemionRefactorer semionRefactorer;
@@ -57,14 +57,14 @@ public class SemionManagerImpl implement
* 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 NOT USE to manually create instances - the ReengineerManagerImpl instances
* do need to be configured! YOU NEED TO USE
- * {@link #SemionManagerImpl(KReSONManager)} or its overloads, to parse the
+ * {@link #ReengineerManagerImpl(ONManager)} 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>();
+ public ReengineerManagerImpl() {
+ reengineers = new ArrayList<Reengineer>();
}
/**
@@ -73,7 +73,7 @@ public class SemionManagerImpl implement
*
* @param onm
*/
- public SemionManagerImpl(TcManager tcm, WeightedTcProvider wtcp) {
+ public ReengineerManagerImpl(TcManager tcm, WeightedTcProvider wtcp) {
this();
storage = new OntologyStorage(tcm, wtcp);
activate(new Hashtable<String, Object>());
@@ -87,7 +87,7 @@ public class SemionManagerImpl implement
@SuppressWarnings("unchecked")
@Activate
protected void activate(ComponentContext context) throws IOException {
- log.info("in " + SemionManagerImpl.class + " activate with context "
+ log.info("in " + ReengineerManagerImpl.class + " activate with context "
+ context);
if (context == null) {
throw new IllegalStateException("No valid" + ComponentContext.class
@@ -98,20 +98,20 @@ public class SemionManagerImpl implement
protected void activate(Dictionary<String, Object> configuration) {
if (storage == null) storage = new OntologyStorage(this.tcm, this.wtcp);
- reengineers = new ArrayList<SemionReengineer>();
+ reengineers = new ArrayList<Reengineer>();
}
/**
* @param semionReengineer
- * {@link eu.iksproject.kres.api.semion.SemionReengineer}
+ * {@link org.apache.stanbol.reengineer.base.api.Reengineer}
* @return true if the reengineer is bound, false otherwise
*/
@Override
- public boolean bindReengineer(SemionReengineer semionReengineer) {
+ public boolean bindReengineer(Reengineer semionReengineer) {
boolean found = false;
- Iterator<SemionReengineer> it = reengineers.iterator();
+ Iterator<Reengineer> it = reengineers.iterator();
while(it.hasNext() && !found){
- SemionReengineer reengineer = it.next();
+ Reengineer reengineer = it.next();
if (reengineer.getReengineerType() == semionReengineer
.getReengineerType()) {
found = true;
@@ -138,7 +138,7 @@ public class SemionManagerImpl implement
@Deactivate
protected void deactivate(ComponentContext context) {
- log.info("in " + SemionManagerImpl.class + " deactivate with context "
+ log.info("in " + ReengineerManagerImpl.class + " deactivate with context "
+ context);
reengineers = null;
}
@@ -149,7 +149,7 @@ public class SemionManagerImpl implement
// }
@Override
- public Collection<SemionReengineer> listReengineers() {
+ public Collection<Reengineer> listReengineers() {
return reengineers;
}
@@ -169,9 +169,9 @@ public class SemionManagerImpl implement
} else {
boolean reengineered = false;
- Iterator<SemionReengineer> it = reengineers.iterator();
+ Iterator<Reengineer> it = reengineers.iterator();
while(it.hasNext() && !reengineered){
- SemionReengineer semionReengineer = it.next();
+ Reengineer semionReengineer = it.next();
if(semionReengineer.canPerformReengineering(schemaOntology)){
reengineeredDataOntology = semionReengineer
.dataReengineering(graphNS, outputIRI, dataSource,
@@ -192,9 +192,9 @@ public class SemionManagerImpl implement
OWLOntology reengineeredDataOntology = null;
boolean reengineered = false;
- Iterator<SemionReengineer> it = reengineers.iterator();
+ Iterator<Reengineer> it = reengineers.iterator();
while(it.hasNext() && !reengineered){
- SemionReengineer semionReengineer = it.next();
+ Reengineer semionReengineer = it.next();
if(semionReengineer.canPerformReengineering(schemaOntology)){
reengineeredDataOntology = semionReengineer.dataReengineering(
graphNS, outputIRI, dataSource, schemaOntology);
@@ -211,9 +211,9 @@ public class SemionManagerImpl implement
OWLOntology reengineeredOntology = null;
boolean reengineered = false;
- Iterator<SemionReengineer> it = reengineers.iterator();
+ Iterator<Reengineer> it = reengineers.iterator();
while (it.hasNext() && !reengineered) {
- SemionReengineer semionReengineer = it.next();
+ Reengineer semionReengineer = it.next();
if (semionReengineer.canPerformReengineering(dataSource)) {
log.debug(semionReengineer.getClass().getCanonicalName()
+ " can perform the reengineering");
@@ -235,9 +235,9 @@ public class SemionManagerImpl implement
OWLOntology reengineeredSchemaOntology = null;
boolean reengineered = false;
- Iterator<SemionReengineer> it = reengineers.iterator();
+ Iterator<Reengineer> it = reengineers.iterator();
while (it.hasNext() && !reengineered) {
- SemionReengineer semionReengineer = it.next();
+ Reengineer semionReengineer = it.next();
if (semionReengineer.canPerformReengineering(dataSource)) {
reengineeredSchemaOntology = semionReengineer
.schemaReengineering(graphNS, outputIRI, dataSource);
@@ -260,7 +260,7 @@ public class SemionManagerImpl implement
public boolean unbindReengineer(int reenginnerType) {
boolean found = false;
for(int i=0, j=reengineers.size(); i<j && !found; i++){
- SemionReengineer reengineer = reengineers.get(i);
+ Reengineer reengineer = reengineers.get(i);
if(reengineer.getReengineerType() == reenginnerType){
reengineers.remove(i);
found = true;
@@ -270,7 +270,7 @@ public class SemionManagerImpl implement
}
@Override
- public boolean unbindReengineer(SemionReengineer semionReengineer) {
+ public boolean unbindReengineer(Reengineer semionReengineer) {
boolean found = false;
for (int i = 0, j = reengineers.size(); i < j && !found; i++) {
if (semionReengineer.equals(reengineers.get(i))) {
Copied: incubator/stanbol/trunk/kres/reengineer/base/src/test/java/org/apache/stanbol/rengineer/base/ReengineerManagerTest.java (from r1085259, 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/ReengineerManagerTest.java?p2=incubator/stanbol/trunk/kres/reengineer/base/src/test/java/org/apache/stanbol/rengineer/base/ReengineerManagerTest.java&p1=incubator/stanbol/trunk/kres/reengineer/base/src/test/java/org/apache/stanbol/rengineer/base/SemionManagerTest.java&r1=1085259&r2=1085371&rev=1085371&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/ReengineerManagerTest.java Fri Mar 25 13:59:23 2011
@@ -4,24 +4,24 @@ import static org.junit.Assert.fail;
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.util.ReengineerType;
import org.apache.stanbol.reengineer.base.api.util.UnsupportedReengineerException;
-import org.apache.stanbol.reengineer.base.impl.SemionManagerImpl;
+import org.apache.stanbol.reengineer.base.impl.ReengineerManagerImpl;
import org.junit.BeforeClass;
import org.junit.Test;
import org.semanticweb.owlapi.model.IRI;
import org.semanticweb.owlapi.model.OWLOntology;
-public class SemionManagerTest {
+public class ReengineerManagerTest {
- public static SemionReengineer semionReengineer;
+ public static Reengineer semionReengineer;
@BeforeClass
public static void setup(){
- semionReengineer = new SemionReengineer() {
+ semionReengineer = new Reengineer() {
@Override
public OWLOntology schemaReengineering(String graphNS, IRI outputIRI,
@@ -82,7 +82,7 @@ public class SemionManagerTest {
@Test
public void bindTest(){
- SemionManager semionManager = new SemionManagerImpl();
+ ReengineerManager semionManager = new ReengineerManagerImpl();
if(!semionManager.bindReengineer(semionReengineer)){
fail("Bind test failed for SemionManager");
}
@@ -90,7 +90,7 @@ public class SemionManagerTest {
@Test
public void unbindByReengineerTypeTest(){
- SemionManager semionManager = new SemionManagerImpl();
+ ReengineerManager semionManager = new ReengineerManagerImpl();
semionManager.bindReengineer(semionReengineer);
if(!semionManager.unbindReengineer(ReengineerType.XML)){
fail("Unbind by reengineer type test failed for SemionManager");
@@ -99,7 +99,7 @@ public class SemionManagerTest {
@Test
public void unbindByReengineerInstanceTest(){
- SemionManager semionManager = new SemionManagerImpl();
+ ReengineerManager semionManager = new ReengineerManagerImpl();
semionManager.bindReengineer(semionReengineer);
if(!semionManager.unbindReengineer(semionReengineer)){
fail("Unbind by reengineer instance test failed for SemionManager");