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:31:12 UTC
svn commit: r1085400 - in /incubator/stanbol/trunk/kres/reengineer/xml: ./
src/main/java/org/apache/stanbol/reengineer/xml/
src/test/java/org/apache/stanbol/reengineer/xml/
Author: concelvio
Date: Fri Mar 25 14:31:12 2011
New Revision: 1085400
URL: http://svn.apache.org/viewvc?rev=1085400&view=rev
Log:
STANBOL-39:
- changed parent version in pom.xml to ${stanbol-version}
- removed kres-version from pom.xml
- change class reference where required
Modified:
incubator/stanbol/trunk/kres/reengineer/xml/pom.xml
incubator/stanbol/trunk/kres/reengineer/xml/src/main/java/org/apache/stanbol/reengineer/xml/XMLExtractor.java
incubator/stanbol/trunk/kres/reengineer/xml/src/main/java/org/apache/stanbol/reengineer/xml/XSDExtractor.java
incubator/stanbol/trunk/kres/reengineer/xml/src/test/java/org/apache/stanbol/reengineer/xml/XMLReengineerTest.java
Modified: incubator/stanbol/trunk/kres/reengineer/xml/pom.xml
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/reengineer/xml/pom.xml?rev=1085400&r1=1085399&r2=1085400&view=diff
==============================================================================
--- incubator/stanbol/trunk/kres/reengineer/xml/pom.xml (original)
+++ incubator/stanbol/trunk/kres/reengineer/xml/pom.xml Fri Mar 25 14:31:12 2011
@@ -22,14 +22,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.xml</artifactId>
<packaging>bundle</packaging>
Modified: incubator/stanbol/trunk/kres/reengineer/xml/src/main/java/org/apache/stanbol/reengineer/xml/XMLExtractor.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/reengineer/xml/src/main/java/org/apache/stanbol/reengineer/xml/XMLExtractor.java?rev=1085400&r1=1085399&r2=1085400&view=diff
==============================================================================
--- incubator/stanbol/trunk/kres/reengineer/xml/src/main/java/org/apache/stanbol/reengineer/xml/XMLExtractor.java (original)
+++ incubator/stanbol/trunk/kres/reengineer/xml/src/main/java/org/apache/stanbol/reengineer/xml/XMLExtractor.java Fri Mar 25 14:31:12 2011
@@ -22,21 +22,21 @@ 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.Semion_OWL;
+import org.apache.stanbol.reengineer.base.api.ReengineerManager;
+import org.apache.stanbol.reengineer.base.api.Reengineer;
+import org.apache.stanbol.reengineer.base.api.Reengineer_OWL;
import org.apache.stanbol.reengineer.base.api.util.ReengineerType;
-import org.apache.stanbol.reengineer.base.api.util.SemionUriRefGenerator;
+import org.apache.stanbol.reengineer.base.api.util.ReengineerUriRefGenerator;
import org.apache.stanbol.reengineer.base.api.util.UnsupportedReengineerException;
import org.apache.stanbol.reengineer.xml.vocab.XML_OWL;
import org.apache.stanbol.reengineer.xml.vocab.XSD_OWL;
@@ -69,16 +69,16 @@ import org.xml.sax.SAXException;
/**
* The {@code XMLExtractor} extends of the {@link XSDExtractor} that implements
- * the {@link SemionReengineer} for XML data sources.
+ * the {@link Reengineer} for XML data sources.
*
* @author andrea.nuzzolese
*
*/
@Component(immediate = true, metatype = true)
-@Service(SemionReengineer.class)
-public class XMLExtractor extends SemionUriRefGenerator implements
- SemionReengineer {
+@Service(Reengineer.class)
+public class XMLExtractor extends ReengineerUriRefGenerator implements
+ Reengineer {
public static final String _HOST_NAME_AND_PORT_DEFAULT = "localhost:8080";
public static final String _REENGINEERING_SCOPE_DEFAULT = "xml_reengineering";
@@ -98,10 +98,10 @@ public class XMLExtractor extends Semion
public final Logger log = LoggerFactory.getLogger(getClass());
@Reference
- KReSONManager onManager;
+ ONManager onManager;
@Reference
- SemionManager reengineeringManager;
+ ReengineerManager reengineeringManager;
private OntologyScope scope;
private IRI scopeIRI;
@@ -113,7 +113,7 @@ public class XMLExtractor extends Semion
* <p>
* DO NOT USE to manually create instances - the XMLExtractor instances do
* need to be configured! YOU NEED TO USE
- * {@link #XMLExtractor(KReSONManager)} or its overloads, to parse the
+ * {@link #XMLExtractor(ONManager)} or its overloads, to parse the
* configuration and then initialise the rule store if running outside a
* OSGI environment.
*/
@@ -121,8 +121,8 @@ public class XMLExtractor extends Semion
}
- public XMLExtractor(SemionManager reengineeringManager,
- KReSONManager onManager, Dictionary<String, Object> configuration) {
+ public XMLExtractor(ReengineerManager reengineeringManager,
+ ONManager onManager, Dictionary<String, Object> configuration) {
this();
this.reengineeringManager = reengineeringManager;
this.onManager = onManager;
@@ -162,7 +162,7 @@ public class XMLExtractor extends Semion
reengineeringManager.bindReengineer(this);
KReSSessionManager kReSSessionManager = onManager.getSessionManager();
- KReSSession kReSSession = kReSSessionManager.createSession();
+ Session kReSSession = kReSSessionManager.createSession();
kReSSessionID = kReSSession.getID();
@@ -237,7 +237,7 @@ public class XMLExtractor extends Semion
OWLDataFactory factory = onManager.getOwlFactory();
- OWLClass dataSourceClass = factory.getOWLClass(Semion_OWL.DataSource);
+ OWLClass dataSourceClass = factory.getOWLClass(Reengineer_OWL.DataSource);
Set<OWLIndividual> individuals = dataSourceClass
.getIndividuals(schemaOntology);
@@ -246,7 +246,7 @@ public class XMLExtractor extends Semion
if (individuals != null && individuals.size() == 1) {
for (OWLIndividual individual : individuals) {
OWLDataProperty hasDataSourceTypeProperty = factory
- .getOWLDataProperty(Semion_OWL.hasDataSourceType);
+ .getOWLDataProperty(Reengineer_OWL.hasDataSourceType);
Set<OWLLiteral> values = individual.getDataPropertyValues(
hasDataSourceTypeProperty, schemaOntology);
if (values != null && values.size() == 1) {
@@ -403,7 +403,7 @@ public class XMLExtractor extends Semion
String dataNS = graphNS + "#";
OWLClass dataSourceOwlClass = factory
- .getOWLClass(Semion_OWL.DataSource);
+ .getOWLClass(Reengineer_OWL.DataSource);
Set<OWLIndividual> individuals = dataSourceOwlClass
.getIndividuals(schemaOntology);
@@ -503,7 +503,7 @@ public class XMLExtractor extends Semion
;
OWLClass dataSourceOwlClass = factory
- .getOWLClass(Semion_OWL.DataSource);
+ .getOWLClass(Reengineer_OWL.DataSource);
Set<OWLIndividual> individuals = dataSourceOwlClass
.getIndividuals(schemaOntology);
Modified: incubator/stanbol/trunk/kres/reengineer/xml/src/main/java/org/apache/stanbol/reengineer/xml/XSDExtractor.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/reengineer/xml/src/main/java/org/apache/stanbol/reengineer/xml/XSDExtractor.java?rev=1085400&r1=1085399&r2=1085400&view=diff
==============================================================================
--- incubator/stanbol/trunk/kres/reengineer/xml/src/main/java/org/apache/stanbol/reengineer/xml/XSDExtractor.java (original)
+++ incubator/stanbol/trunk/kres/reengineer/xml/src/main/java/org/apache/stanbol/reengineer/xml/XSDExtractor.java Fri Mar 25 14:31:12 2011
@@ -9,9 +9,9 @@ import javax.xml.parsers.DocumentBuilder
import javax.xml.parsers.ParserConfigurationException;
import org.apache.clerezza.rdf.core.access.WeightedTcProvider;
-import org.apache.stanbol.ontologymanager.ontonet.api.KReSONManager;
+import org.apache.stanbol.ontologymanager.ontonet.api.ONManager;
import org.apache.stanbol.reengineer.base.api.DataSource;
-import org.apache.stanbol.reengineer.base.api.util.SemionUriRefGenerator;
+import org.apache.stanbol.reengineer.base.api.util.ReengineerUriRefGenerator;
import org.apache.stanbol.reengineer.xml.vocab.XSD_OWL;
import org.apache.xerces.dom.PSVIDocumentImpl;
import org.apache.xerces.impl.dv.DatatypeException;
@@ -60,12 +60,12 @@ import org.w3c.dom.traversal.TreeWalker;
import org.xml.sax.SAXException;
-public class XSDExtractor extends SemionUriRefGenerator {
+public class XSDExtractor extends ReengineerUriRefGenerator {
private WeightedTcProvider weightedTcProvider;
- private KReSONManager onManager;
+ private ONManager onManager;
public final Logger log = LoggerFactory.getLogger(getClass());
@@ -73,7 +73,7 @@ public class XSDExtractor extends Semion
this.weightedTcProvider = weightedTcProvider;
}
- public XSDExtractor(KReSONManager onManager) {
+ public XSDExtractor(ONManager onManager) {
this.onManager = onManager;
}
Modified: incubator/stanbol/trunk/kres/reengineer/xml/src/test/java/org/apache/stanbol/reengineer/xml/XMLReengineerTest.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/reengineer/xml/src/test/java/org/apache/stanbol/reengineer/xml/XMLReengineerTest.java?rev=1085400&r1=1085399&r2=1085400&view=diff
==============================================================================
--- incubator/stanbol/trunk/kres/reengineer/xml/src/test/java/org/apache/stanbol/reengineer/xml/XMLReengineerTest.java (original)
+++ incubator/stanbol/trunk/kres/reengineer/xml/src/test/java/org/apache/stanbol/reengineer/xml/XMLReengineerTest.java Fri Mar 25 14:31:12 2011
@@ -9,12 +9,12 @@ 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.ontologymanager.ontonet.api.ONManager;
+import org.apache.stanbol.ontologymanager.ontonet.impl.ONManagerImpl;
import org.apache.stanbol.reengineer.base.api.DataSource;
-import org.apache.stanbol.reengineer.base.api.SemionReengineer;
+import org.apache.stanbol.reengineer.base.api.Reengineer;
import org.apache.stanbol.reengineer.base.api.util.ReengineerType;
-import org.apache.stanbol.reengineer.base.impl.SemionManagerImpl;
+import org.apache.stanbol.reengineer.base.impl.ReengineerManagerImpl;
import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.Test;
@@ -26,7 +26,7 @@ public class XMLReengineerTest {
static DataSource dataSource;
static String graphNS;
static IRI outputIRI;
- static SemionReengineer xmlExtractor;
+ static Reengineer xmlExtractor;
@BeforeClass
public static void setupClass() {
@@ -89,8 +89,8 @@ public class XMLReengineerTest {
TcManager tcm = new SpecialTcManager(qe, wtcp);
// Two different ontology storagez, the same sparql engine and tcprovider
- KReSONManager onManager = new ONManager(tcm, wtcp ,emptyConf);
- xmlExtractor = new XMLExtractor(new SemionManagerImpl(tcm, wtcp),
+ ONManager onManager = new ONManagerImpl(tcm, wtcp ,emptyConf);
+ xmlExtractor = new XMLExtractor(new ReengineerManagerImpl(tcm, wtcp),
onManager, emptyConf);
}