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 [2/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....
Copied: incubator/stanbol/trunk/kres/reengineer/db/src/main/java/org/apache/stanbol/reengineer/db/SemionDBSchemaGenerator.java (from r1082537, incubator/stanbol/trunk/kres/eu.iksproject.kres.semion.reengineer.db/src/main/java/eu/iksproject/kres/semion/reengineer/db/SemionDBSchemaGenerator.java)
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/reengineer/db/src/main/java/org/apache/stanbol/reengineer/db/SemionDBSchemaGenerator.java?p2=incubator/stanbol/trunk/kres/reengineer/db/src/main/java/org/apache/stanbol/reengineer/db/SemionDBSchemaGenerator.java&p1=incubator/stanbol/trunk/kres/eu.iksproject.kres.semion.reengineer.db/src/main/java/eu/iksproject/kres/semion/reengineer/db/SemionDBSchemaGenerator.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/SemionDBSchemaGenerator.java (original)
+++ incubator/stanbol/trunk/kres/reengineer/db/src/main/java/org/apache/stanbol/reengineer/db/SemionDBSchemaGenerator.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.Serializable;
import java.sql.Connection;
@@ -10,8 +10,9 @@ import java.util.ArrayList;
import java.util.Hashtable;
import org.apache.clerezza.rdf.core.MGraph;
-import org.apache.stanbol.reengineer.base.settings.ConnectionSettings;
-import org.apache.stanbol.reengineer.base.util.SemionUriRefGenerator;
+import org.apache.stanbol.reengineer.base.api.settings.ConnectionSettings;
+import org.apache.stanbol.reengineer.base.api.util.SemionUriRefGenerator;
+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.OWLClassAssertionAxiom;
@@ -20,8 +21,6 @@ import org.semanticweb.owlapi.model.OWLO
import org.semanticweb.owlapi.model.OWLOntologyCreationException;
import org.semanticweb.owlapi.model.OWLOntologyManager;
-import org.apache.stanbol.reengineer.db.DBS_L1_OWL;
-
/**
* The {@code SemionDBSchemaGenerator} is responsible of the generation of the RDF of the schema of a relational database.
Copied: incubator/stanbol/trunk/kres/reengineer/db/src/main/java/org/apache/stanbol/reengineer/db/TablePKRelations.java (from r1082537, incubator/stanbol/trunk/kres/eu.iksproject.kres.semion.reengineer.db/src/main/java/eu/iksproject/kres/semion/reengineer/db/TablePKRelations.java)
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/reengineer/db/src/main/java/org/apache/stanbol/reengineer/db/TablePKRelations.java?p2=incubator/stanbol/trunk/kres/reengineer/db/src/main/java/org/apache/stanbol/reengineer/db/TablePKRelations.java&p1=incubator/stanbol/trunk/kres/eu.iksproject.kres.semion.reengineer.db/src/main/java/eu/iksproject/kres/semion/reengineer/db/TablePKRelations.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/TablePKRelations.java (original)
+++ incubator/stanbol/trunk/kres/reengineer/db/src/main/java/org/apache/stanbol/reengineer/db/TablePKRelations.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.util.ArrayList;
Modified: incubator/stanbol/trunk/kres/reengineer/db/src/main/java/org/apache/stanbol/reengineer/db/connection/DatabaseConnection.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/reengineer/db/src/main/java/org/apache/stanbol/reengineer/db/connection/DatabaseConnection.java?rev=1082603&r1=1082537&r2=1082603&view=diff
==============================================================================
--- incubator/stanbol/trunk/kres/reengineer/db/src/main/java/org/apache/stanbol/reengineer/db/connection/DatabaseConnection.java (original)
+++ incubator/stanbol/trunk/kres/reengineer/db/src/main/java/org/apache/stanbol/reengineer/db/connection/DatabaseConnection.java Thu Mar 17 17:41:13 2011
@@ -1,4 +1,4 @@
-package eu.iksproject.kres.semion.reengineer.db.connection;
+package org.apache.stanbol.reengineer.db.connection;
import java.sql.Connection;
import java.sql.PreparedStatement;
@@ -21,7 +21,8 @@ import com.hp.hpl.jena.query.QuerySoluti
import com.hp.hpl.jena.vocabulary.RDF;
-import org.apache.stanbol.reengineer.db.DBS_L1;
+import org.apache.stanbol.reengineer.db.vocab.DBS_L1;
+
import eu.iksproject.kres.shared.transformation.JenaToOwlConvert;
public class DatabaseConnection {
Modified: incubator/stanbol/trunk/kres/reengineer/db/src/main/java/org/apache/stanbol/reengineer/db/ontology/Collectionentity.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/reengineer/db/src/main/java/org/apache/stanbol/reengineer/db/ontology/Collectionentity.java?rev=1082603&r1=1082537&r2=1082603&view=diff
==============================================================================
--- incubator/stanbol/trunk/kres/reengineer/db/src/main/java/org/apache/stanbol/reengineer/db/ontology/Collectionentity.java (original)
+++ incubator/stanbol/trunk/kres/reengineer/db/src/main/java/org/apache/stanbol/reengineer/db/ontology/Collectionentity.java Thu Mar 17 17:41:13 2011
@@ -1,4 +1,4 @@
-package eu.iksproject.kres.semion.reengineer.db.ontology;
+package org.apache.stanbol.reengineer.db.ontology;
import com.hp.hpl.jena.rdf.model.Model;
import com.hp.hpl.jena.rdf.model.ModelFactory;
Modified: incubator/stanbol/trunk/kres/reengineer/db/src/main/java/org/apache/stanbol/reengineer/db/ontology/DBS_L1.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/reengineer/db/src/main/java/org/apache/stanbol/reengineer/db/ontology/DBS_L1.java?rev=1082603&r1=1082537&r2=1082603&view=diff
==============================================================================
--- incubator/stanbol/trunk/kres/reengineer/db/src/main/java/org/apache/stanbol/reengineer/db/ontology/DBS_L1.java (original)
+++ incubator/stanbol/trunk/kres/reengineer/db/src/main/java/org/apache/stanbol/reengineer/db/ontology/DBS_L1.java Thu Mar 17 17:41:13 2011
@@ -1,4 +1,4 @@
-package eu.iksproject.kres.semion.reengineer.db.ontology;
+package org.apache.stanbol.reengineer.db.ontology;
import java.net.URI;
import java.net.URISyntaxException;
Modified: incubator/stanbol/trunk/kres/reengineer/db/src/main/java/org/apache/stanbol/reengineer/db/ontology/ObjectRole.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/reengineer/db/src/main/java/org/apache/stanbol/reengineer/db/ontology/ObjectRole.java?rev=1082603&r1=1082537&r2=1082603&view=diff
==============================================================================
--- incubator/stanbol/trunk/kres/reengineer/db/src/main/java/org/apache/stanbol/reengineer/db/ontology/ObjectRole.java (original)
+++ incubator/stanbol/trunk/kres/reengineer/db/src/main/java/org/apache/stanbol/reengineer/db/ontology/ObjectRole.java Thu Mar 17 17:41:13 2011
@@ -1,4 +1,4 @@
-package eu.iksproject.kres.semion.reengineer.db.ontology;
+package org.apache.stanbol.reengineer.db.ontology;
/* CVS $Id$ */
Modified: incubator/stanbol/trunk/kres/reengineer/db/src/main/java/org/apache/stanbol/reengineer/db/ontology/Schema.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/reengineer/db/src/main/java/org/apache/stanbol/reengineer/db/ontology/Schema.java?rev=1082603&r1=1082537&r2=1082603&view=diff
==============================================================================
--- incubator/stanbol/trunk/kres/reengineer/db/src/main/java/org/apache/stanbol/reengineer/db/ontology/Schema.java (original)
+++ incubator/stanbol/trunk/kres/reengineer/db/src/main/java/org/apache/stanbol/reengineer/db/ontology/Schema.java Thu Mar 17 17:41:13 2011
@@ -1,4 +1,4 @@
-package eu.iksproject.kres.semion.reengineer.db.ontology;
+package org.apache.stanbol.reengineer.db.ontology;
/* CVS $Id$ */
Copied: incubator/stanbol/trunk/kres/reengineer/db/src/main/java/org/apache/stanbol/reengineer/db/vocab/DBS_L1.java (from r1082537, incubator/stanbol/trunk/kres/reengineer/db/src/main/java/org/apache/stanbol/reengineer/db/DBS_L1.java)
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/reengineer/db/src/main/java/org/apache/stanbol/reengineer/db/vocab/DBS_L1.java?p2=incubator/stanbol/trunk/kres/reengineer/db/src/main/java/org/apache/stanbol/reengineer/db/vocab/DBS_L1.java&p1=incubator/stanbol/trunk/kres/reengineer/db/src/main/java/org/apache/stanbol/reengineer/db/DBS_L1.java&r1=1082537&r2=1082603&rev=1082603&view=diff
==============================================================================
--- incubator/stanbol/trunk/kres/reengineer/db/src/main/java/org/apache/stanbol/reengineer/db/DBS_L1.java (original)
+++ incubator/stanbol/trunk/kres/reengineer/db/src/main/java/org/apache/stanbol/reengineer/db/vocab/DBS_L1.java Thu Mar 17 17:41:13 2011
@@ -1,4 +1,4 @@
-package org.apache.stanbol.reengineer.db;
+package org.apache.stanbol.reengineer.db.vocab;
import java.net.URI;
import java.net.URISyntaxException;
Copied: incubator/stanbol/trunk/kres/reengineer/db/src/main/java/org/apache/stanbol/reengineer/db/vocab/DBS_L1_OWL.java (from r1082537, incubator/stanbol/trunk/kres/reengineer/db/src/main/java/org/apache/stanbol/reengineer/db/DBS_L1_OWL.java)
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/reengineer/db/src/main/java/org/apache/stanbol/reengineer/db/vocab/DBS_L1_OWL.java?p2=incubator/stanbol/trunk/kres/reengineer/db/src/main/java/org/apache/stanbol/reengineer/db/vocab/DBS_L1_OWL.java&p1=incubator/stanbol/trunk/kres/reengineer/db/src/main/java/org/apache/stanbol/reengineer/db/DBS_L1_OWL.java&r1=1082537&r2=1082603&rev=1082603&view=diff
==============================================================================
--- incubator/stanbol/trunk/kres/reengineer/db/src/main/java/org/apache/stanbol/reengineer/db/DBS_L1_OWL.java (original)
+++ incubator/stanbol/trunk/kres/reengineer/db/src/main/java/org/apache/stanbol/reengineer/db/vocab/DBS_L1_OWL.java Thu Mar 17 17:41:13 2011
@@ -1,4 +1,4 @@
-package org.apache.stanbol.reengineer.db;
+package org.apache.stanbol.reengineer.db.vocab;
import org.semanticweb.owlapi.model.IRI;
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=1082603&r1=1082537&r2=1082603&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 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.util.Dictionary;
import java.util.Hashtable;
@@ -6,13 +6,12 @@ import java.util.Hashtable;
import org.apache.clerezza.rdf.core.access.TcManager;
import org.apache.stanbol.ontologymanager.ontonet.api.KReSONManager;
import org.apache.stanbol.ontologymanager.ontonet.impl.ONManager;
+import org.apache.stanbol.reengineer.base.api.impl.SemionManagerImpl;
import org.junit.Before;
import org.junit.BeforeClass;
import org.junit.Test;
import org.semanticweb.owlapi.model.IRI;
-import eu.iksproject.kres.semion.manager.SemionManagerImpl;
-
public class DBExtractorTest {
static DBExtractor dbExtractor;
Propchange: incubator/stanbol/trunk/kres/reengineer/xml/
------------------------------------------------------------------------------
--- 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/xml/pom.xml
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/reengineer/xml/pom.xml?rev=1082603&r1=1082602&r2=1082603&view=diff
==============================================================================
--- incubator/stanbol/trunk/kres/reengineer/xml/pom.xml (original)
+++ incubator/stanbol/trunk/kres/reengineer/xml/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">
@@ -27,7 +26,7 @@
<relativePath>../../../parent</relativePath>
</parent>
- <properties>
+ <properties>
<kres-version>0.7</kres-version>
</properties>
@@ -52,11 +51,19 @@
<extensions>true</extensions>
<configuration>
<instructions>
+ <Bundle-ClassPath>
+ .,
+ xerces/xercesImpl-2.7.1.jar,
+ OSGI-INF
+ </Bundle-ClassPath>
<Export-Package>
- org.apache.stanbol.reengineer.db.*;version=${stanbol-version}
+ org.apache.stanbol.reengineer.xml.*;version=${stanbol-version}
</Export-Package>
<Import-Package>
+ !org.apache.xml.resolver.*,
+ !sun.io.*,
org.slf4j.*;version=1.5.2,
+ org.xml.sax.*,
*
</Import-Package>
<_nouses>true</_nouses>
@@ -66,6 +73,13 @@
<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>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
@@ -74,20 +88,54 @@
<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>
</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 +143,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 +157,93 @@
<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 />
+
+
+ <repositories>
+ <repository>
+ <id>codehaus</id>
+ <name>Maven Codehaus repository</name>
+ <url>http://repository.codehaus.org/</url>
+ </repository>
+ </repositories>
</project>
Copied: incubator/stanbol/trunk/kres/reengineer/xml/src/main/java/org/apache/stanbol/reengineer/xml/XMLExtractor.java (from r1082537, incubator/stanbol/trunk/kres/eu.iksproject.kres.semion.reengineer.xml/src/main/java/eu/iksproject/kres/semion/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?p2=incubator/stanbol/trunk/kres/reengineer/xml/src/main/java/org/apache/stanbol/reengineer/xml/XMLExtractor.java&p1=incubator/stanbol/trunk/kres/eu.iksproject.kres.semion.reengineer.xml/src/main/java/eu/iksproject/kres/semion/reengineer/xml/XMLExtractor.java&r1=1082537&r2=1082603&rev=1082603&view=diff
==============================================================================
--- incubator/stanbol/trunk/kres/eu.iksproject.kres.semion.reengineer.xml/src/main/java/eu/iksproject/kres/semion/reengineer/xml/XMLExtractor.java (original)
+++ incubator/stanbol/trunk/kres/reengineer/xml/src/main/java/org/apache/stanbol/reengineer/xml/XMLExtractor.java Thu Mar 17 17:41:13 2011
@@ -1,4 +1,4 @@
-package eu.iksproject.kres.semion.reengineer.xml;
+package org.apache.stanbol.reengineer.xml;
import java.io.BufferedReader;
import java.io.ByteArrayInputStream;
@@ -30,13 +30,16 @@ 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.util.ReengineerType;
-import org.apache.stanbol.reengineer.base.util.SemionUriRefGenerator;
-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.Semion_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.UnsupportedReengineerException;
+import org.apache.stanbol.reengineer.xml.vocab.XML_OWL;
+import org.apache.stanbol.reengineer.xml.vocab.XSD_OWL;
import org.osgi.service.component.ComponentContext;
import org.semanticweb.owlapi.apibinding.OWLManager;
import org.semanticweb.owlapi.model.AddAxiom;
@@ -64,10 +67,6 @@ import org.w3c.dom.Node;
import org.w3c.dom.NodeList;
import org.xml.sax.SAXException;
-import org.apache.stanbol.reengineer.base.Semion_OWL;
-import org.apache.stanbol.reengineer.xml.XML_OWL;
-import org.apache.stanbol.reengineer.xml.XSD_OWL;
-
/**
* The {@code XMLExtractor} extends of the {@link XSDExtractor} that implements
* the {@link SemionReengineer} for XML data sources.
Copied: incubator/stanbol/trunk/kres/reengineer/xml/src/main/java/org/apache/stanbol/reengineer/xml/XSDExtractor.java (from r1082537, incubator/stanbol/trunk/kres/eu.iksproject.kres.semion.reengineer.xml/src/main/java/eu/iksproject/kres/semion/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?p2=incubator/stanbol/trunk/kres/reengineer/xml/src/main/java/org/apache/stanbol/reengineer/xml/XSDExtractor.java&p1=incubator/stanbol/trunk/kres/eu.iksproject.kres.semion.reengineer.xml/src/main/java/eu/iksproject/kres/semion/reengineer/xml/XSDExtractor.java&r1=1082537&r2=1082603&rev=1082603&view=diff
==============================================================================
--- incubator/stanbol/trunk/kres/eu.iksproject.kres.semion.reengineer.xml/src/main/java/eu/iksproject/kres/semion/reengineer/xml/XSDExtractor.java (original)
+++ incubator/stanbol/trunk/kres/reengineer/xml/src/main/java/org/apache/stanbol/reengineer/xml/XSDExtractor.java Thu Mar 17 17:41:13 2011
@@ -1,4 +1,4 @@
-package eu.iksproject.kres.semion.reengineer.xml;
+package org.apache.stanbol.reengineer.xml;
import java.io.IOException;
@@ -10,8 +10,9 @@ import javax.xml.parsers.ParserConfigura
import org.apache.clerezza.rdf.core.access.WeightedTcProvider;
import org.apache.stanbol.ontologymanager.ontonet.api.KReSONManager;
-import org.apache.stanbol.reengineer.base.DataSource;
-import org.apache.stanbol.reengineer.base.util.SemionUriRefGenerator;
+import org.apache.stanbol.reengineer.base.api.DataSource;
+import org.apache.stanbol.reengineer.base.api.util.SemionUriRefGenerator;
+import org.apache.stanbol.reengineer.xml.vocab.XSD_OWL;
import org.apache.xerces.dom.PSVIDocumentImpl;
import org.apache.xerces.impl.dv.DatatypeException;
import org.apache.xerces.impl.dv.xs.XSSimpleTypeDecl;
@@ -58,7 +59,6 @@ import org.w3c.dom.traversal.NodeIterato
import org.w3c.dom.traversal.TreeWalker;
import org.xml.sax.SAXException;
-import org.apache.stanbol.reengineer.xml.XSD_OWL;
public class XSDExtractor extends SemionUriRefGenerator {
Copied: incubator/stanbol/trunk/kres/reengineer/xml/src/main/java/org/apache/stanbol/reengineer/xml/vocab/XML.java (from r1082537, incubator/stanbol/trunk/kres/reengineer/xml/src/main/java/org/apache/stanbol/reengineer/xml/XML.java)
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/reengineer/xml/src/main/java/org/apache/stanbol/reengineer/xml/vocab/XML.java?p2=incubator/stanbol/trunk/kres/reengineer/xml/src/main/java/org/apache/stanbol/reengineer/xml/vocab/XML.java&p1=incubator/stanbol/trunk/kres/reengineer/xml/src/main/java/org/apache/stanbol/reengineer/xml/XML.java&r1=1082537&r2=1082603&rev=1082603&view=diff
==============================================================================
--- incubator/stanbol/trunk/kres/reengineer/xml/src/main/java/org/apache/stanbol/reengineer/xml/XML.java (original)
+++ incubator/stanbol/trunk/kres/reengineer/xml/src/main/java/org/apache/stanbol/reengineer/xml/vocab/XML.java Thu Mar 17 17:41:13 2011
@@ -1,4 +1,4 @@
-package org.apache.stanbol.reengineer.xml;
+package org.apache.stanbol.reengineer.xml.vocab;
/* CVS $Id$ */
Copied: incubator/stanbol/trunk/kres/reengineer/xml/src/main/java/org/apache/stanbol/reengineer/xml/vocab/XML_OWL.java (from r1082537, incubator/stanbol/trunk/kres/reengineer/xml/src/main/java/org/apache/stanbol/reengineer/xml/XML_OWL.java)
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/reengineer/xml/src/main/java/org/apache/stanbol/reengineer/xml/vocab/XML_OWL.java?p2=incubator/stanbol/trunk/kres/reengineer/xml/src/main/java/org/apache/stanbol/reengineer/xml/vocab/XML_OWL.java&p1=incubator/stanbol/trunk/kres/reengineer/xml/src/main/java/org/apache/stanbol/reengineer/xml/XML_OWL.java&r1=1082537&r2=1082603&rev=1082603&view=diff
==============================================================================
--- incubator/stanbol/trunk/kres/reengineer/xml/src/main/java/org/apache/stanbol/reengineer/xml/XML_OWL.java (original)
+++ incubator/stanbol/trunk/kres/reengineer/xml/src/main/java/org/apache/stanbol/reengineer/xml/vocab/XML_OWL.java Thu Mar 17 17:41:13 2011
@@ -1,4 +1,4 @@
-package org.apache.stanbol.reengineer.xml;
+package org.apache.stanbol.reengineer.xml.vocab;
import org.semanticweb.owlapi.model.IRI;
Copied: incubator/stanbol/trunk/kres/reengineer/xml/src/main/java/org/apache/stanbol/reengineer/xml/vocab/XSD.java (from r1082537, incubator/stanbol/trunk/kres/reengineer/xml/src/main/java/org/apache/stanbol/reengineer/xml/XSD.java)
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/reengineer/xml/src/main/java/org/apache/stanbol/reengineer/xml/vocab/XSD.java?p2=incubator/stanbol/trunk/kres/reengineer/xml/src/main/java/org/apache/stanbol/reengineer/xml/vocab/XSD.java&p1=incubator/stanbol/trunk/kres/reengineer/xml/src/main/java/org/apache/stanbol/reengineer/xml/XSD.java&r1=1082537&r2=1082603&rev=1082603&view=diff
==============================================================================
--- incubator/stanbol/trunk/kres/reengineer/xml/src/main/java/org/apache/stanbol/reengineer/xml/XSD.java (original)
+++ incubator/stanbol/trunk/kres/reengineer/xml/src/main/java/org/apache/stanbol/reengineer/xml/vocab/XSD.java Thu Mar 17 17:41:13 2011
@@ -1,4 +1,4 @@
-package org.apache.stanbol.reengineer.xml;
+package org.apache.stanbol.reengineer.xml.vocab;
/* CVS $Id$ */
Copied: incubator/stanbol/trunk/kres/reengineer/xml/src/main/java/org/apache/stanbol/reengineer/xml/vocab/XSD_OWL.java (from r1082537, incubator/stanbol/trunk/kres/reengineer/xml/src/main/java/org/apache/stanbol/reengineer/xml/XSD_OWL.java)
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/reengineer/xml/src/main/java/org/apache/stanbol/reengineer/xml/vocab/XSD_OWL.java?p2=incubator/stanbol/trunk/kres/reengineer/xml/src/main/java/org/apache/stanbol/reengineer/xml/vocab/XSD_OWL.java&p1=incubator/stanbol/trunk/kres/reengineer/xml/src/main/java/org/apache/stanbol/reengineer/xml/XSD_OWL.java&r1=1082537&r2=1082603&rev=1082603&view=diff
==============================================================================
--- incubator/stanbol/trunk/kres/reengineer/xml/src/main/java/org/apache/stanbol/reengineer/xml/XSD_OWL.java (original)
+++ incubator/stanbol/trunk/kres/reengineer/xml/src/main/java/org/apache/stanbol/reengineer/xml/vocab/XSD_OWL.java Thu Mar 17 17:41:13 2011
@@ -1,4 +1,4 @@
-package org.apache.stanbol.reengineer.xml;
+package org.apache.stanbol.reengineer.xml.vocab;
import org.semanticweb.owlapi.model.IRI;
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=1082603&r1=1082537&r2=1082603&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 Thu Mar 17 17:41:13 2011
@@ -1,4 +1,4 @@
-package eu.iksproject.kres.semion.reengineer.xml;
+package org.apache.stanbol.reengineer.xml;
import java.io.InputStream;
import java.util.Dictionary;
@@ -6,17 +6,16 @@ import java.util.Hashtable;
import org.apache.stanbol.ontologymanager.ontonet.api.KReSONManager;
import org.apache.stanbol.ontologymanager.ontonet.impl.ONManager;
-import org.apache.stanbol.reengineer.base.DataSource;
-import org.apache.stanbol.reengineer.base.SemionReengineer;
-import org.apache.stanbol.reengineer.base.util.ReengineerType;
+import org.apache.stanbol.reengineer.base.api.DataSource;
+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.junit.Before;
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 XMLReengineerTest {
static DataSource dataSource;
Modified: incubator/stanbol/trunk/kres/rules/manager/src/main/java/org/apache/stanbol/rules/manager/arqextention/CreateURI.java
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/rules/manager/src/main/java/org/apache/stanbol/rules/manager/arqextention/CreateURI.java?rev=1082603&r1=1082602&r2=1082603&view=diff
==============================================================================
--- incubator/stanbol/trunk/kres/rules/manager/src/main/java/org/apache/stanbol/rules/manager/arqextention/CreateURI.java (original)
+++ incubator/stanbol/trunk/kres/rules/manager/src/main/java/org/apache/stanbol/rules/manager/arqextention/CreateURI.java Thu Mar 17 17:41:13 2011
@@ -1,6 +1,6 @@
package org.apache.stanbol.rules.manager.arqextention;
-import org.apache.stanbol.reengineer.xml.XML_OWL;
+import org.apache.stanbol.reengineer.xml.vocab.XML_OWL;
import com.hp.hpl.jena.graph.Node;
import com.hp.hpl.jena.rdf.model.Model;