pageId
String size = "";
if (pageIds != null) {
- size = new Integer(pageIds.size()).toString();
+ size = Integer.valueOf(pageIds.size()).toString();
}
CategoryGraph catGraph;
diff --git a/de.tudarmstadt.ukp.wikipedia.api/src/main/java/de/tudarmstadt/ukp/wikipedia/api/CategoryIterable.java b/dkpro-jwpl-api/src/main/java/org/dkpro/jwpl/api/CategoryIterable.java
similarity index 97%
rename from de.tudarmstadt.ukp.wikipedia.api/src/main/java/de/tudarmstadt/ukp/wikipedia/api/CategoryIterable.java
rename to dkpro-jwpl-api/src/main/java/org/dkpro/jwpl/api/CategoryIterable.java
index a09b87d9b..dc11312aa 100644
--- a/de.tudarmstadt.ukp.wikipedia.api/src/main/java/de/tudarmstadt/ukp/wikipedia/api/CategoryIterable.java
+++ b/dkpro-jwpl-api/src/main/java/org/dkpro/jwpl/api/CategoryIterable.java
@@ -15,7 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package de.tudarmstadt.ukp.wikipedia.api;
+package org.dkpro.jwpl.api;
import java.util.Iterator;
diff --git a/de.tudarmstadt.ukp.wikipedia.api/src/main/java/de/tudarmstadt/ukp/wikipedia/api/CategoryIterator.java b/dkpro-jwpl-api/src/main/java/org/dkpro/jwpl/api/CategoryIterator.java
similarity index 96%
rename from de.tudarmstadt.ukp.wikipedia.api/src/main/java/de/tudarmstadt/ukp/wikipedia/api/CategoryIterator.java
rename to dkpro-jwpl-api/src/main/java/org/dkpro/jwpl/api/CategoryIterator.java
index b23b4b689..d62d4d576 100644
--- a/de.tudarmstadt.ukp.wikipedia.api/src/main/java/de/tudarmstadt/ukp/wikipedia/api/CategoryIterator.java
+++ b/dkpro-jwpl-api/src/main/java/org/dkpro/jwpl/api/CategoryIterator.java
@@ -15,7 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package de.tudarmstadt.ukp.wikipedia.api;
+package org.dkpro.jwpl.api;
import java.lang.invoke.MethodHandles;
import java.util.ArrayList;
@@ -24,7 +24,7 @@
import org.hibernate.Session;
-import de.tudarmstadt.ukp.wikipedia.api.exception.WikiApiException;
+import org.dkpro.jwpl.api.exception.WikiApiException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -140,7 +140,7 @@ private boolean fillBuffer() {
if(o==null) {
return false;
} else {
- de.tudarmstadt.ukp.wikipedia.api.hibernate.Category hibernateCategory = (de.tudarmstadt.ukp.wikipedia.api.hibernate.Category) o;
+ org.dkpro.jwpl.api.hibernate.Category hibernateCategory = (org.dkpro.jwpl.api.hibernate.Category) o;
long id = hibernateCategory.getId();
try {
apiCategory= new Category(this.wiki, id);
diff --git a/de.tudarmstadt.ukp.wikipedia.api/src/main/java/de/tudarmstadt/ukp/wikipedia/api/CategoryTitleComparator.java b/dkpro-jwpl-api/src/main/java/org/dkpro/jwpl/api/CategoryTitleComparator.java
similarity index 91%
rename from de.tudarmstadt.ukp.wikipedia.api/src/main/java/de/tudarmstadt/ukp/wikipedia/api/CategoryTitleComparator.java
rename to dkpro-jwpl-api/src/main/java/org/dkpro/jwpl/api/CategoryTitleComparator.java
index 79b7c5a29..3bcea6124 100644
--- a/de.tudarmstadt.ukp.wikipedia.api/src/main/java/de/tudarmstadt/ukp/wikipedia/api/CategoryTitleComparator.java
+++ b/dkpro-jwpl-api/src/main/java/org/dkpro/jwpl/api/CategoryTitleComparator.java
@@ -15,11 +15,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package de.tudarmstadt.ukp.wikipedia.api;
+package org.dkpro.jwpl.api;
import java.util.Comparator;
-import de.tudarmstadt.ukp.wikipedia.api.exception.WikiTitleParsingException;
+import org.dkpro.jwpl.api.exception.WikiTitleParsingException;
/**
* Compares two categories based on the lexicographic ordering of their titles.
diff --git a/de.tudarmstadt.ukp.wikipedia.api/src/main/java/de/tudarmstadt/ukp/wikipedia/api/CycleHandler.java b/dkpro-jwpl-api/src/main/java/org/dkpro/jwpl/api/CycleHandler.java
similarity index 99%
rename from de.tudarmstadt.ukp.wikipedia.api/src/main/java/de/tudarmstadt/ukp/wikipedia/api/CycleHandler.java
rename to dkpro-jwpl-api/src/main/java/org/dkpro/jwpl/api/CycleHandler.java
index 8e5ee1e1b..83032652c 100644
--- a/de.tudarmstadt.ukp.wikipedia.api/src/main/java/de/tudarmstadt/ukp/wikipedia/api/CycleHandler.java
+++ b/dkpro-jwpl-api/src/main/java/org/dkpro/jwpl/api/CycleHandler.java
@@ -15,7 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package de.tudarmstadt.ukp.wikipedia.api;
+package org.dkpro.jwpl.api;
import java.lang.invoke.MethodHandles;
import java.util.HashMap;
@@ -24,7 +24,7 @@
import org.jgrapht.graph.DefaultEdge;
-import de.tudarmstadt.ukp.wikipedia.api.exception.WikiApiException;
+import org.dkpro.jwpl.api.exception.WikiApiException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/de.tudarmstadt.ukp.wikipedia.api/src/main/java/de/tudarmstadt/ukp/wikipedia/api/DatabaseConfiguration.java b/dkpro-jwpl-api/src/main/java/org/dkpro/jwpl/api/DatabaseConfiguration.java
similarity index 90%
rename from de.tudarmstadt.ukp.wikipedia.api/src/main/java/de/tudarmstadt/ukp/wikipedia/api/DatabaseConfiguration.java
rename to dkpro-jwpl-api/src/main/java/org/dkpro/jwpl/api/DatabaseConfiguration.java
index 988c2756c..9c73f63e4 100644
--- a/de.tudarmstadt.ukp.wikipedia.api/src/main/java/de/tudarmstadt/ukp/wikipedia/api/DatabaseConfiguration.java
+++ b/dkpro-jwpl-api/src/main/java/org/dkpro/jwpl/api/DatabaseConfiguration.java
@@ -15,9 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package de.tudarmstadt.ukp.wikipedia.api;
-
-import de.tudarmstadt.ukp.wikipedia.api.WikiConstants.Language;
+package org.dkpro.jwpl.api;
/**
* An instance of {@link DatabaseConfiguration} is used to establish a database connection and set various parameters.
@@ -28,7 +26,7 @@ public class DatabaseConfiguration {
private String database;
private String user;
private String password;
- private Language language;
+ private WikiConstants.Language language;
private String jdbcURL;
private String databaseDriver;
@@ -41,9 +39,9 @@ public DatabaseConfiguration() {}
* @param database The name of the database to connect to.
* @param user The username as part of the credentials used for authentication.
* @param password The password as part of the credentials used for authentication.
- * @param language The {@link Language} used for the underlying connection.
+ * @param language The {@link WikiConstants.Language} used for the underlying connection.
*/
- public DatabaseConfiguration(String host, String database, String user, String password, Language language) {
+ public DatabaseConfiguration(String host, String database, String user, String password, WikiConstants.Language language) {
this("com.mysql.jdbc.Driver", "jdbc:mysql://" + host + "/" + database,
host, database, user, password, language);
@@ -58,10 +56,10 @@ public DatabaseConfiguration(String host, String database, String user, String p
* @param database The name of the database to connect to.
* @param user The username as part of the credentials used for authentication.
* @param password The password as part of the credentials used for authentication.
- * @param language The {@link Language} used for the underlying connection.
+ * @param language The {@link WikiConstants.Language} used for the underlying connection.
*/
public DatabaseConfiguration(String databaseDriver, String jdbcURL, String host, String database, String user,
- String password, Language language) {
+ String password, WikiConstants.Language language) {
this.host = host;
this.database = database;
this.user = user;
@@ -110,7 +108,7 @@ public void setUser(String user) {
/**
* @param language The language of the Wikipedia data.
*/
- public void setLanguage(Language language) {
+ public void setLanguage(WikiConstants.Language language) {
this.language = language;
}
/**
@@ -140,7 +138,7 @@ public String getUser() {
/**
* @return The language of the Wikipedia data.
*/
- public Language getLanguage() {
+ public WikiConstants.Language getLanguage() {
return language;
}
/**
diff --git a/de.tudarmstadt.ukp.wikipedia.api/src/main/java/de/tudarmstadt/ukp/wikipedia/api/MetaData.java b/dkpro-jwpl-api/src/main/java/org/dkpro/jwpl/api/MetaData.java
similarity index 94%
rename from de.tudarmstadt.ukp.wikipedia.api/src/main/java/de/tudarmstadt/ukp/wikipedia/api/MetaData.java
rename to dkpro-jwpl-api/src/main/java/org/dkpro/jwpl/api/MetaData.java
index a0d8098ea..bf5eed19c 100644
--- a/de.tudarmstadt.ukp.wikipedia.api/src/main/java/de/tudarmstadt/ukp/wikipedia/api/MetaData.java
+++ b/dkpro-jwpl-api/src/main/java/org/dkpro/jwpl/api/MetaData.java
@@ -15,12 +15,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package de.tudarmstadt.ukp.wikipedia.api;
+package org.dkpro.jwpl.api;
import org.hibernate.LockMode;
import org.hibernate.Session;
-import de.tudarmstadt.ukp.wikipedia.api.exception.WikiApiException;
+import org.dkpro.jwpl.api.exception.WikiApiException;
/**
* Provides access to meta data about a certain instance of Wikipedia.
@@ -28,7 +28,7 @@
public class MetaData implements WikiConstants
{
// private MetaDataDAO metaDAO;
- private de.tudarmstadt.ukp.wikipedia.api.hibernate.MetaData hibernateMetaData;
+ private org.dkpro.jwpl.api.hibernate.MetaData hibernateMetaData;
private Wikipedia wiki;
/**
@@ -40,7 +40,7 @@ protected MetaData(Wikipedia wiki)
// this.metaDAO = new MetaDataDAO(wiki);
Session session = this.wiki.__getHibernateSession();
session.beginTransaction();
- hibernateMetaData = (de.tudarmstadt.ukp.wikipedia.api.hibernate.MetaData) session
+ hibernateMetaData = (org.dkpro.jwpl.api.hibernate.MetaData) session
.createQuery("from MetaData").uniqueResult();
session.getTransaction().commit();
};
diff --git a/de.tudarmstadt.ukp.wikipedia.api/src/main/java/de/tudarmstadt/ukp/wikipedia/api/Page.java b/dkpro-jwpl-api/src/main/java/org/dkpro/jwpl/api/Page.java
similarity index 91%
rename from de.tudarmstadt.ukp.wikipedia.api/src/main/java/de/tudarmstadt/ukp/wikipedia/api/Page.java
rename to dkpro-jwpl-api/src/main/java/org/dkpro/jwpl/api/Page.java
index 2d3db269e..508033afd 100644
--- a/de.tudarmstadt.ukp.wikipedia.api/src/main/java/de/tudarmstadt/ukp/wikipedia/api/Page.java
+++ b/dkpro-jwpl-api/src/main/java/org/dkpro/jwpl/api/Page.java
@@ -15,7 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package de.tudarmstadt.ukp.wikipedia.api;
+package org.dkpro.jwpl.api;
import java.util.HashSet;
import java.util.Set;
@@ -29,12 +29,12 @@
import org.sweble.wikitext.engine.nodes.EngProcessedPage;
import de.fau.cs.osr.ptk.common.AstVisitor;
-import de.tudarmstadt.ukp.wikipedia.api.exception.WikiApiException;
-import de.tudarmstadt.ukp.wikipedia.api.exception.WikiPageNotFoundException;
-import de.tudarmstadt.ukp.wikipedia.api.exception.WikiTitleParsingException;
-import de.tudarmstadt.ukp.wikipedia.api.hibernate.PageDAO;
-import de.tudarmstadt.ukp.wikipedia.api.sweble.PlainTextConverter;
-import de.tudarmstadt.ukp.wikipedia.util.UnmodifiableArraySet;
+import org.dkpro.jwpl.api.exception.WikiApiException;
+import org.dkpro.jwpl.api.exception.WikiPageNotFoundException;
+import org.dkpro.jwpl.api.exception.WikiTitleParsingException;
+import org.dkpro.jwpl.api.hibernate.PageDAO;
+import org.dkpro.jwpl.api.sweble.PlainTextConverter;
+import org.dkpro.jwpl.util.UnmodifiableArraySet;
/**
* Represents a Wikipedia article page.
@@ -50,7 +50,7 @@ public class Page implements WikiConstants
// The hibernatePage that is represented by this WikiAPI page.
// The indirection is necessary to shield the user from Hibernate sessions.
- private de.tudarmstadt.ukp.wikipedia.api.hibernate.Page hibernatePage;
+ private org.dkpro.jwpl.api.hibernate.Page hibernatePage;
// If we search for a redirect, the corresponding page is delivered transparently.
// In that case, isRedirect is set to true, to indicate that.
@@ -142,7 +142,7 @@ public Page(Wikipedia wiki, String pName, boolean useExactTitle)
* @throws WikiApiException Thrown if errors occurred.
*/
protected Page(Wikipedia wiki, long id,
- de.tudarmstadt.ukp.wikipedia.api.hibernate.Page hibernatePage)
+ org.dkpro.jwpl.api.hibernate.Page hibernatePage)
throws WikiApiException
{
this.wiki = wiki;
@@ -152,7 +152,7 @@ protected Page(Wikipedia wiki, long id,
/**
* @throws WikiApiException Thrown if errors occurred.
- * @see de.tudarmstadt.ukp.wikipedia.api.Page
+ * @see Page
*/
private void fetchByHibernateId(long id)
throws WikiApiException
@@ -172,7 +172,7 @@ private void fetchByPageId(int pageID)
{
Session session = this.wiki.__getHibernateSession();
session.beginTransaction();
- hibernatePage = (de.tudarmstadt.ukp.wikipedia.api.hibernate.Page) session
+ hibernatePage = (org.dkpro.jwpl.api.hibernate.Page) session
.createQuery("from Page where pageId = :id").setParameter("id", pageID, StandardBasicTypes.INTEGER).uniqueResult();
session.getTransaction().commit();
@@ -554,22 +554,23 @@ public boolean isDiscussion() throws WikiTitleParsingException
}
/**
- * Returns the Wikipedia article as plain text using the SwebleParser with
- * a SimpleWikiConfiguration and the PlainTextConverter.
- * If you have different needs regarding the plain text, you can use
- * getParsedPage(Visitor v) and provide your own Sweble-Visitor. Examples
- * are in the de.tudarmstadt.ukp.wikipedia.api.sweble package
- * or on http://www.sweble.org
- *
- * Alternatively, use Page.getText() to return the Wikipedia article
- * with all Wiki markup. You can then use the old JWPL MediaWiki parser for
- * creating a plain text version. The JWPL parser is now located in a
- * separate project de.tudarmstad.ukp.wikipedia.parser.
- * Please refer to the JWPL Google Code project page for further reference.
- *
- * @return The plain text of a Wikipedia article
- * @throws WikiApiException Thrown if errors occurred.
- */
+ * Returns the Wikipedia article as plain text using the SwebleParser with
+ * a SimpleWikiConfiguration and the PlainTextConverter.
+ * If you have different needs regarding the plain text, you can use
+ * getParsedPage(Visitor v) and provide your own Sweble-Visitor. Examples
+ * are in the {@code org.dkpro.jwpl.api.sweble} package
+ * or on http://www.sweble.org
+ *
+ *
+ * Alternatively, use {@link Page#getText()} to return the Wikipedia article
+ * with all Wiki markup. You can then use the old JWPL MediaWiki parser for
+ * creating a plain text version. The JWPL parser is now located in a
+ * separate project {@code org.dkpro.jwpl.api.parser}.
+ * Please refer to the JWPL Google Code project page for further reference.
+ *
+ * @return The plain text of a Wikipedia article
+ * @throws WikiApiException Thrown if errors occurred.
+ */
public String getPlainText()
throws WikiApiException
{
@@ -581,8 +582,8 @@ public String getPlainText()
* Parses the page with the Sweble parser using a SimpleWikiConfiguration
* and the provided visitor. For further information about the visitor
* concept, look at the examples in the
- * de.tudarmstadt.ukp.wikipedia.api.sweble package, or on
- * http://www.sweble.org or on the JWPL Google Code project
+ * {@code org.dkpro.jwpl.api.sweble} package, or on
+ * https://www.sweble.org or on the JWPL Google Code project
* page.
*
* @return the parsed page. The actual return type depends on the provided
@@ -625,7 +626,7 @@ private EngProcessedPage getCompiledPage() throws WikiApiException
* The methods getInlinkAnchors() and getOutLinkAnchors() have not yet been
* migrated to the SWEBLE parser. The original versions based on the
* JWPL MediaWikiParser can be found in
- * de.tudarmstadt.ukp.wikipedia.parser.LinkAnchorExtractor
+ * org.dkpro.jwpl.parser.LinkAnchorExtractor
*/
///////////////////////////////////////////////////////////////////
diff --git a/de.tudarmstadt.ukp.wikipedia.api/src/main/java/de/tudarmstadt/ukp/wikipedia/api/PageIterable.java b/dkpro-jwpl-api/src/main/java/org/dkpro/jwpl/api/PageIterable.java
similarity index 97%
rename from de.tudarmstadt.ukp.wikipedia.api/src/main/java/de/tudarmstadt/ukp/wikipedia/api/PageIterable.java
rename to dkpro-jwpl-api/src/main/java/org/dkpro/jwpl/api/PageIterable.java
index 33b1b4672..9bfa8a23a 100644
--- a/de.tudarmstadt.ukp.wikipedia.api/src/main/java/de/tudarmstadt/ukp/wikipedia/api/PageIterable.java
+++ b/dkpro-jwpl-api/src/main/java/org/dkpro/jwpl/api/PageIterable.java
@@ -15,7 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package de.tudarmstadt.ukp.wikipedia.api;
+package org.dkpro.jwpl.api;
import java.util.Iterator;
diff --git a/de.tudarmstadt.ukp.wikipedia.api/src/main/java/de/tudarmstadt/ukp/wikipedia/api/PageIterator.java b/dkpro-jwpl-api/src/main/java/org/dkpro/jwpl/api/PageIterator.java
similarity index 97%
rename from de.tudarmstadt.ukp.wikipedia.api/src/main/java/de/tudarmstadt/ukp/wikipedia/api/PageIterator.java
rename to dkpro-jwpl-api/src/main/java/org/dkpro/jwpl/api/PageIterator.java
index 72fe18196..6982913ee 100644
--- a/de.tudarmstadt.ukp.wikipedia.api/src/main/java/de/tudarmstadt/ukp/wikipedia/api/PageIterator.java
+++ b/dkpro-jwpl-api/src/main/java/org/dkpro/jwpl/api/PageIterator.java
@@ -15,7 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package de.tudarmstadt.ukp.wikipedia.api;
+package org.dkpro.jwpl.api;
import java.lang.invoke.MethodHandles;
import java.util.ArrayList;
@@ -26,7 +26,7 @@
import org.hibernate.Session;
-import de.tudarmstadt.ukp.wikipedia.api.exception.WikiApiException;
+import org.dkpro.jwpl.api.exception.WikiApiException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -228,7 +228,7 @@ private boolean fillBuffer() {
if(o==null) {
return false;
} else {
- de.tudarmstadt.ukp.wikipedia.api.hibernate.Page hibernatePage = (de.tudarmstadt.ukp.wikipedia.api.hibernate.Page) o;
+ org.dkpro.jwpl.api.hibernate.Page hibernatePage = (org.dkpro.jwpl.api.hibernate.Page) o;
long id = hibernatePage.getId();
try {
apiPage = new Page(this.wiki, id, hibernatePage);
diff --git a/de.tudarmstadt.ukp.wikipedia.api/src/main/java/de/tudarmstadt/ukp/wikipedia/api/PageQuery.java b/dkpro-jwpl-api/src/main/java/org/dkpro/jwpl/api/PageQuery.java
similarity index 99%
rename from de.tudarmstadt.ukp.wikipedia.api/src/main/java/de/tudarmstadt/ukp/wikipedia/api/PageQuery.java
rename to dkpro-jwpl-api/src/main/java/org/dkpro/jwpl/api/PageQuery.java
index d1c5ad3dc..9d91505fc 100644
--- a/de.tudarmstadt.ukp.wikipedia.api/src/main/java/de/tudarmstadt/ukp/wikipedia/api/PageQuery.java
+++ b/dkpro-jwpl-api/src/main/java/org/dkpro/jwpl/api/PageQuery.java
@@ -15,7 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package de.tudarmstadt.ukp.wikipedia.api;
+package org.dkpro.jwpl.api;
/**
* Represents a query for retrieving pages that meet the given conditions.
diff --git a/de.tudarmstadt.ukp.wikipedia.api/src/main/java/de/tudarmstadt/ukp/wikipedia/api/PageQueryIterable.java b/dkpro-jwpl-api/src/main/java/org/dkpro/jwpl/api/PageQueryIterable.java
similarity index 95%
rename from de.tudarmstadt.ukp.wikipedia.api/src/main/java/de/tudarmstadt/ukp/wikipedia/api/PageQueryIterable.java
rename to dkpro-jwpl-api/src/main/java/org/dkpro/jwpl/api/PageQueryIterable.java
index c29e8c7a9..78177930e 100644
--- a/de.tudarmstadt.ukp.wikipedia.api/src/main/java/de/tudarmstadt/ukp/wikipedia/api/PageQueryIterable.java
+++ b/dkpro-jwpl-api/src/main/java/org/dkpro/jwpl/api/PageQueryIterable.java
@@ -15,7 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package de.tudarmstadt.ukp.wikipedia.api;
+package org.dkpro.jwpl.api;
import java.lang.invoke.MethodHandles;
import java.util.ArrayList;
@@ -24,10 +24,10 @@
import org.hibernate.Session;
-import de.tudarmstadt.ukp.wikipedia.api.exception.WikiApiException;
-import de.tudarmstadt.ukp.wikipedia.api.exception.WikiPageNotFoundException;
-import de.tudarmstadt.ukp.wikipedia.util.ApiUtilities;
-import de.tudarmstadt.ukp.wikipedia.util.StringUtils;
+import org.dkpro.jwpl.api.exception.WikiApiException;
+import org.dkpro.jwpl.api.exception.WikiPageNotFoundException;
+import org.dkpro.jwpl.util.ApiUtilities;
+import org.dkpro.jwpl.util.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/de.tudarmstadt.ukp.wikipedia.api/src/main/java/de/tudarmstadt/ukp/wikipedia/api/PageQueryIterator.java b/dkpro-jwpl-api/src/main/java/org/dkpro/jwpl/api/PageQueryIterator.java
similarity index 94%
rename from de.tudarmstadt.ukp.wikipedia.api/src/main/java/de/tudarmstadt/ukp/wikipedia/api/PageQueryIterator.java
rename to dkpro-jwpl-api/src/main/java/org/dkpro/jwpl/api/PageQueryIterator.java
index eebeb035d..7a7468877 100644
--- a/de.tudarmstadt.ukp.wikipedia.api/src/main/java/de/tudarmstadt/ukp/wikipedia/api/PageQueryIterator.java
+++ b/dkpro-jwpl-api/src/main/java/org/dkpro/jwpl/api/PageQueryIterator.java
@@ -15,13 +15,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package de.tudarmstadt.ukp.wikipedia.api;
+package org.dkpro.jwpl.api;
import java.lang.invoke.MethodHandles;
import java.util.Iterator;
import java.util.List;
-import de.tudarmstadt.ukp.wikipedia.api.exception.WikiApiException;
+import org.dkpro.jwpl.api.exception.WikiApiException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/de.tudarmstadt.ukp.wikipedia.api/src/main/java/de/tudarmstadt/ukp/wikipedia/api/PageTitleComparator.java b/dkpro-jwpl-api/src/main/java/org/dkpro/jwpl/api/PageTitleComparator.java
similarity index 91%
rename from de.tudarmstadt.ukp.wikipedia.api/src/main/java/de/tudarmstadt/ukp/wikipedia/api/PageTitleComparator.java
rename to dkpro-jwpl-api/src/main/java/org/dkpro/jwpl/api/PageTitleComparator.java
index 47a935c76..00d295ffd 100644
--- a/de.tudarmstadt.ukp.wikipedia.api/src/main/java/de/tudarmstadt/ukp/wikipedia/api/PageTitleComparator.java
+++ b/dkpro-jwpl-api/src/main/java/org/dkpro/jwpl/api/PageTitleComparator.java
@@ -15,11 +15,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package de.tudarmstadt.ukp.wikipedia.api;
+package org.dkpro.jwpl.api;
import java.util.Comparator;
-import de.tudarmstadt.ukp.wikipedia.api.exception.WikiTitleParsingException;
+import org.dkpro.jwpl.api.exception.WikiTitleParsingException;
/**
* Compares two pages based on the lexicographic ordering of their titles.
diff --git a/de.tudarmstadt.ukp.wikipedia.api/src/main/java/de/tudarmstadt/ukp/wikipedia/api/Title.java b/dkpro-jwpl-api/src/main/java/org/dkpro/jwpl/api/Title.java
similarity index 98%
rename from de.tudarmstadt.ukp.wikipedia.api/src/main/java/de/tudarmstadt/ukp/wikipedia/api/Title.java
rename to dkpro-jwpl-api/src/main/java/org/dkpro/jwpl/api/Title.java
index 4a786a78c..9280ccfb6 100644
--- a/de.tudarmstadt.ukp.wikipedia.api/src/main/java/de/tudarmstadt/ukp/wikipedia/api/Title.java
+++ b/dkpro-jwpl-api/src/main/java/org/dkpro/jwpl/api/Title.java
@@ -15,12 +15,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package de.tudarmstadt.ukp.wikipedia.api;
+package org.dkpro.jwpl.api;
import java.util.regex.Matcher;
import java.util.regex.Pattern;
-import de.tudarmstadt.ukp.wikipedia.api.exception.WikiTitleParsingException;
+import org.dkpro.jwpl.api.exception.WikiTitleParsingException;
import org.apache.commons.lang3.StringUtils;
/**
diff --git a/de.tudarmstadt.ukp.wikipedia.api/src/main/java/de/tudarmstadt/ukp/wikipedia/api/TitleIterable.java b/dkpro-jwpl-api/src/main/java/org/dkpro/jwpl/api/TitleIterable.java
similarity index 97%
rename from de.tudarmstadt.ukp.wikipedia.api/src/main/java/de/tudarmstadt/ukp/wikipedia/api/TitleIterable.java
rename to dkpro-jwpl-api/src/main/java/org/dkpro/jwpl/api/TitleIterable.java
index e6014429a..b32e10f43 100644
--- a/de.tudarmstadt.ukp.wikipedia.api/src/main/java/de/tudarmstadt/ukp/wikipedia/api/TitleIterable.java
+++ b/dkpro-jwpl-api/src/main/java/org/dkpro/jwpl/api/TitleIterable.java
@@ -15,7 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package de.tudarmstadt.ukp.wikipedia.api;
+package org.dkpro.jwpl.api;
import java.util.Iterator;
diff --git a/de.tudarmstadt.ukp.wikipedia.api/src/main/java/de/tudarmstadt/ukp/wikipedia/api/TitleIterator.java b/dkpro-jwpl-api/src/main/java/org/dkpro/jwpl/api/TitleIterator.java
similarity index 97%
rename from de.tudarmstadt.ukp.wikipedia.api/src/main/java/de/tudarmstadt/ukp/wikipedia/api/TitleIterator.java
rename to dkpro-jwpl-api/src/main/java/org/dkpro/jwpl/api/TitleIterator.java
index 96ad110d6..5b5dc283c 100644
--- a/de.tudarmstadt.ukp.wikipedia.api/src/main/java/de/tudarmstadt/ukp/wikipedia/api/TitleIterator.java
+++ b/dkpro-jwpl-api/src/main/java/org/dkpro/jwpl/api/TitleIterator.java
@@ -15,7 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package de.tudarmstadt.ukp.wikipedia.api;
+package org.dkpro.jwpl.api;
import java.util.ArrayList;
import java.util.Iterator;
@@ -23,7 +23,7 @@
import org.hibernate.Session;
-import de.tudarmstadt.ukp.wikipedia.api.exception.WikiTitleParsingException;
+import org.dkpro.jwpl.api.exception.WikiTitleParsingException;
/**
* An iterator over category objects.
diff --git a/de.tudarmstadt.ukp.wikipedia.api/src/main/java/de/tudarmstadt/ukp/wikipedia/api/WikiConstants.java b/dkpro-jwpl-api/src/main/java/org/dkpro/jwpl/api/WikiConstants.java
similarity index 99%
rename from de.tudarmstadt.ukp.wikipedia.api/src/main/java/de/tudarmstadt/ukp/wikipedia/api/WikiConstants.java
rename to dkpro-jwpl-api/src/main/java/org/dkpro/jwpl/api/WikiConstants.java
index 9abc3c600..a34bea469 100644
--- a/de.tudarmstadt.ukp.wikipedia.api/src/main/java/de/tudarmstadt/ukp/wikipedia/api/WikiConstants.java
+++ b/dkpro-jwpl-api/src/main/java/org/dkpro/jwpl/api/WikiConstants.java
@@ -15,7 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package de.tudarmstadt.ukp.wikipedia.api;
+package org.dkpro.jwpl.api;
import com.neovisionaries.i18n.LanguageCode;
import org.sweble.wikitext.engine.config.WikiConfig;
diff --git a/de.tudarmstadt.ukp.wikipedia.api/src/main/java/de/tudarmstadt/ukp/wikipedia/api/Wikipedia.java b/dkpro-jwpl-api/src/main/java/org/dkpro/jwpl/api/Wikipedia.java
similarity index 98%
rename from de.tudarmstadt.ukp.wikipedia.api/src/main/java/de/tudarmstadt/ukp/wikipedia/api/Wikipedia.java
rename to dkpro-jwpl-api/src/main/java/org/dkpro/jwpl/api/Wikipedia.java
index ea0e2cc7a..34531aaef 100644
--- a/de.tudarmstadt.ukp.wikipedia.api/src/main/java/de/tudarmstadt/ukp/wikipedia/api/Wikipedia.java
+++ b/dkpro-jwpl-api/src/main/java/org/dkpro/jwpl/api/Wikipedia.java
@@ -15,7 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package de.tudarmstadt.ukp.wikipedia.api;
+package org.dkpro.jwpl.api;
import java.lang.invoke.MethodHandles;
import java.util.*;
@@ -24,12 +24,12 @@
import org.hibernate.Session;
import org.hibernate.query.Query;
-import de.tudarmstadt.ukp.wikipedia.api.exception.WikiApiException;
-import de.tudarmstadt.ukp.wikipedia.api.exception.WikiInitializationException;
-import de.tudarmstadt.ukp.wikipedia.api.exception.WikiPageNotFoundException;
-import de.tudarmstadt.ukp.wikipedia.api.exception.WikiTitleParsingException;
-import de.tudarmstadt.ukp.wikipedia.api.hibernate.WikiHibernateUtil;
-import de.tudarmstadt.ukp.wikipedia.util.distance.LevenshteinStringDistance;
+import org.dkpro.jwpl.api.exception.WikiApiException;
+import org.dkpro.jwpl.api.exception.WikiInitializationException;
+import org.dkpro.jwpl.api.exception.WikiPageNotFoundException;
+import org.dkpro.jwpl.api.exception.WikiTitleParsingException;
+import org.dkpro.jwpl.api.hibernate.WikiHibernateUtil;
+import org.dkpro.jwpl.util.distance.LevenshteinStringDistance;
import org.hibernate.type.StandardBasicTypes;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/de.tudarmstadt.ukp.wikipedia.api/src/main/java/de/tudarmstadt/ukp/wikipedia/api/WikipediaInfo.java b/dkpro-jwpl-api/src/main/java/org/dkpro/jwpl/api/WikipediaInfo.java
similarity index 98%
rename from de.tudarmstadt.ukp.wikipedia.api/src/main/java/de/tudarmstadt/ukp/wikipedia/api/WikipediaInfo.java
rename to dkpro-jwpl-api/src/main/java/org/dkpro/jwpl/api/WikipediaInfo.java
index f5d0b1316..c6728d081 100644
--- a/de.tudarmstadt.ukp.wikipedia.api/src/main/java/de/tudarmstadt/ukp/wikipedia/api/WikipediaInfo.java
+++ b/dkpro-jwpl-api/src/main/java/org/dkpro/jwpl/api/WikipediaInfo.java
@@ -15,7 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package de.tudarmstadt.ukp.wikipedia.api;
+package org.dkpro.jwpl.api;
import java.lang.invoke.MethodHandles;
import java.util.ArrayList;
@@ -29,9 +29,9 @@
import org.hibernate.Session;
-import de.tudarmstadt.ukp.wikipedia.api.exception.WikiApiException;
-import de.tudarmstadt.ukp.wikipedia.api.exception.WikiPageNotFoundException;
-import de.tudarmstadt.ukp.wikipedia.util.ApiUtilities;
+import org.dkpro.jwpl.api.exception.WikiApiException;
+import org.dkpro.jwpl.api.exception.WikiPageNotFoundException;
+import org.dkpro.jwpl.util.ApiUtilities;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/de.tudarmstadt.ukp.wikipedia.api/src/main/java/de/tudarmstadt/ukp/wikipedia/api/exception/WikiApiException.java b/dkpro-jwpl-api/src/main/java/org/dkpro/jwpl/api/exception/WikiApiException.java
similarity index 95%
rename from de.tudarmstadt.ukp.wikipedia.api/src/main/java/de/tudarmstadt/ukp/wikipedia/api/exception/WikiApiException.java
rename to dkpro-jwpl-api/src/main/java/org/dkpro/jwpl/api/exception/WikiApiException.java
index 404deebbd..53711828c 100644
--- a/de.tudarmstadt.ukp.wikipedia.api/src/main/java/de/tudarmstadt/ukp/wikipedia/api/exception/WikiApiException.java
+++ b/dkpro-jwpl-api/src/main/java/org/dkpro/jwpl/api/exception/WikiApiException.java
@@ -15,7 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package de.tudarmstadt.ukp.wikipedia.api.exception;
+package org.dkpro.jwpl.api.exception;
public class WikiApiException extends WikiException {
diff --git a/de.tudarmstadt.ukp.wikipedia.api/src/main/java/de/tudarmstadt/ukp/wikipedia/api/exception/WikiException.java b/dkpro-jwpl-api/src/main/java/org/dkpro/jwpl/api/exception/WikiException.java
similarity index 95%
rename from de.tudarmstadt.ukp.wikipedia.api/src/main/java/de/tudarmstadt/ukp/wikipedia/api/exception/WikiException.java
rename to dkpro-jwpl-api/src/main/java/org/dkpro/jwpl/api/exception/WikiException.java
index 19d84ef09..bab1cfeae 100644
--- a/de.tudarmstadt.ukp.wikipedia.api/src/main/java/de/tudarmstadt/ukp/wikipedia/api/exception/WikiException.java
+++ b/dkpro-jwpl-api/src/main/java/org/dkpro/jwpl/api/exception/WikiException.java
@@ -15,7 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package de.tudarmstadt.ukp.wikipedia.api.exception;
+package org.dkpro.jwpl.api.exception;
public class WikiException extends Exception {
diff --git a/de.tudarmstadt.ukp.wikipedia.api/src/main/java/de/tudarmstadt/ukp/wikipedia/api/exception/WikiInitializationException.java b/dkpro-jwpl-api/src/main/java/org/dkpro/jwpl/api/exception/WikiInitializationException.java
similarity index 96%
rename from de.tudarmstadt.ukp.wikipedia.api/src/main/java/de/tudarmstadt/ukp/wikipedia/api/exception/WikiInitializationException.java
rename to dkpro-jwpl-api/src/main/java/org/dkpro/jwpl/api/exception/WikiInitializationException.java
index 30119cbd3..b60d04b71 100644
--- a/de.tudarmstadt.ukp.wikipedia.api/src/main/java/de/tudarmstadt/ukp/wikipedia/api/exception/WikiInitializationException.java
+++ b/dkpro-jwpl-api/src/main/java/org/dkpro/jwpl/api/exception/WikiInitializationException.java
@@ -15,7 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package de.tudarmstadt.ukp.wikipedia.api.exception;
+package org.dkpro.jwpl.api.exception;
/**
diff --git a/de.tudarmstadt.ukp.wikipedia.api/src/main/java/de/tudarmstadt/ukp/wikipedia/api/exception/WikiPageNotFoundException.java b/dkpro-jwpl-api/src/main/java/org/dkpro/jwpl/api/exception/WikiPageNotFoundException.java
similarity index 96%
rename from de.tudarmstadt.ukp.wikipedia.api/src/main/java/de/tudarmstadt/ukp/wikipedia/api/exception/WikiPageNotFoundException.java
rename to dkpro-jwpl-api/src/main/java/org/dkpro/jwpl/api/exception/WikiPageNotFoundException.java
index b9521662f..74a033fb9 100644
--- a/de.tudarmstadt.ukp.wikipedia.api/src/main/java/de/tudarmstadt/ukp/wikipedia/api/exception/WikiPageNotFoundException.java
+++ b/dkpro-jwpl-api/src/main/java/org/dkpro/jwpl/api/exception/WikiPageNotFoundException.java
@@ -15,7 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package de.tudarmstadt.ukp.wikipedia.api.exception;
+package org.dkpro.jwpl.api.exception;
/**
diff --git a/de.tudarmstadt.ukp.wikipedia.api/src/main/java/de/tudarmstadt/ukp/wikipedia/api/exception/WikiRelatednessException.java b/dkpro-jwpl-api/src/main/java/org/dkpro/jwpl/api/exception/WikiRelatednessException.java
similarity index 95%
rename from de.tudarmstadt.ukp.wikipedia.api/src/main/java/de/tudarmstadt/ukp/wikipedia/api/exception/WikiRelatednessException.java
rename to dkpro-jwpl-api/src/main/java/org/dkpro/jwpl/api/exception/WikiRelatednessException.java
index 47fe74b99..3889f0fc3 100644
--- a/de.tudarmstadt.ukp.wikipedia.api/src/main/java/de/tudarmstadt/ukp/wikipedia/api/exception/WikiRelatednessException.java
+++ b/dkpro-jwpl-api/src/main/java/org/dkpro/jwpl/api/exception/WikiRelatednessException.java
@@ -15,7 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package de.tudarmstadt.ukp.wikipedia.api.exception;
+package org.dkpro.jwpl.api.exception;
public class WikiRelatednessException extends WikiException {
diff --git a/de.tudarmstadt.ukp.wikipedia.api/src/main/java/de/tudarmstadt/ukp/wikipedia/api/exception/WikiTitleParsingException.java b/dkpro-jwpl-api/src/main/java/org/dkpro/jwpl/api/exception/WikiTitleParsingException.java
similarity index 96%
rename from de.tudarmstadt.ukp.wikipedia.api/src/main/java/de/tudarmstadt/ukp/wikipedia/api/exception/WikiTitleParsingException.java
rename to dkpro-jwpl-api/src/main/java/org/dkpro/jwpl/api/exception/WikiTitleParsingException.java
index 34164f041..c29462e18 100644
--- a/de.tudarmstadt.ukp.wikipedia.api/src/main/java/de/tudarmstadt/ukp/wikipedia/api/exception/WikiTitleParsingException.java
+++ b/dkpro-jwpl-api/src/main/java/org/dkpro/jwpl/api/exception/WikiTitleParsingException.java
@@ -15,7 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package de.tudarmstadt.ukp.wikipedia.api.exception;
+package org.dkpro.jwpl.api.exception;
/**
diff --git a/de.tudarmstadt.ukp.wikipedia.api/src/main/java/de/tudarmstadt/ukp/wikipedia/api/hibernate/Category.java b/dkpro-jwpl-api/src/main/java/org/dkpro/jwpl/api/hibernate/Category.java
similarity index 97%
rename from de.tudarmstadt.ukp.wikipedia.api/src/main/java/de/tudarmstadt/ukp/wikipedia/api/hibernate/Category.java
rename to dkpro-jwpl-api/src/main/java/org/dkpro/jwpl/api/hibernate/Category.java
index 6fed6db42..6a6c35eb6 100644
--- a/de.tudarmstadt.ukp.wikipedia.api/src/main/java/de/tudarmstadt/ukp/wikipedia/api/hibernate/Category.java
+++ b/dkpro-jwpl-api/src/main/java/org/dkpro/jwpl/api/hibernate/Category.java
@@ -15,7 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package de.tudarmstadt.ukp.wikipedia.api.hibernate;
+package org.dkpro.jwpl.api.hibernate;
import java.util.HashSet;
import java.util.Set;
diff --git a/de.tudarmstadt.ukp.wikipedia.api/src/main/java/de/tudarmstadt/ukp/wikipedia/api/hibernate/CategoryDAO.java b/dkpro-jwpl-api/src/main/java/org/dkpro/jwpl/api/hibernate/CategoryDAO.java
similarity index 93%
rename from de.tudarmstadt.ukp.wikipedia.api/src/main/java/de/tudarmstadt/ukp/wikipedia/api/hibernate/CategoryDAO.java
rename to dkpro-jwpl-api/src/main/java/org/dkpro/jwpl/api/hibernate/CategoryDAO.java
index e436b747f..372101560 100644
--- a/de.tudarmstadt.ukp.wikipedia.api/src/main/java/de/tudarmstadt/ukp/wikipedia/api/hibernate/CategoryDAO.java
+++ b/dkpro-jwpl-api/src/main/java/org/dkpro/jwpl/api/hibernate/CategoryDAO.java
@@ -15,9 +15,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package de.tudarmstadt.ukp.wikipedia.api.hibernate;
+package org.dkpro.jwpl.api.hibernate;
-import de.tudarmstadt.ukp.wikipedia.api.Wikipedia;
+import org.dkpro.jwpl.api.Wikipedia;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -26,7 +26,7 @@
/**
* Data access object for class {@link Category}
*
- * @see de.tudarmstadt.ukp.wikipedia.api.Category
+ * @see org.dkpro.jwpl.api.Category
* @author Hibernate Tools
*/
public class CategoryDAO extends GenericDAO {
diff --git a/de.tudarmstadt.ukp.wikipedia.api/src/main/java/de/tudarmstadt/ukp/wikipedia/api/hibernate/GenericDAO.java b/dkpro-jwpl-api/src/main/java/org/dkpro/jwpl/api/hibernate/GenericDAO.java
similarity index 97%
rename from de.tudarmstadt.ukp.wikipedia.api/src/main/java/de/tudarmstadt/ukp/wikipedia/api/hibernate/GenericDAO.java
rename to dkpro-jwpl-api/src/main/java/org/dkpro/jwpl/api/hibernate/GenericDAO.java
index 6c342c469..468181fcd 100644
--- a/de.tudarmstadt.ukp.wikipedia.api/src/main/java/de/tudarmstadt/ukp/wikipedia/api/hibernate/GenericDAO.java
+++ b/dkpro-jwpl-api/src/main/java/org/dkpro/jwpl/api/hibernate/GenericDAO.java
@@ -15,9 +15,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package de.tudarmstadt.ukp.wikipedia.api.hibernate;
+package org.dkpro.jwpl.api.hibernate;
-import de.tudarmstadt.ukp.wikipedia.api.Wikipedia;
+import org.dkpro.jwpl.api.Wikipedia;
import org.hibernate.LockOptions;
import org.hibernate.Session;
import org.hibernate.SessionFactory;
diff --git a/de.tudarmstadt.ukp.wikipedia.api/src/main/java/de/tudarmstadt/ukp/wikipedia/api/hibernate/MetaData.java b/dkpro-jwpl-api/src/main/java/org/dkpro/jwpl/api/hibernate/MetaData.java
similarity index 98%
rename from de.tudarmstadt.ukp.wikipedia.api/src/main/java/de/tudarmstadt/ukp/wikipedia/api/hibernate/MetaData.java
rename to dkpro-jwpl-api/src/main/java/org/dkpro/jwpl/api/hibernate/MetaData.java
index c67e1f0f6..8629ce0f8 100644
--- a/de.tudarmstadt.ukp.wikipedia.api/src/main/java/de/tudarmstadt/ukp/wikipedia/api/hibernate/MetaData.java
+++ b/dkpro-jwpl-api/src/main/java/org/dkpro/jwpl/api/hibernate/MetaData.java
@@ -15,7 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package de.tudarmstadt.ukp.wikipedia.api.hibernate;
+package org.dkpro.jwpl.api.hibernate;
public class MetaData {
diff --git a/de.tudarmstadt.ukp.wikipedia.api/src/main/java/de/tudarmstadt/ukp/wikipedia/api/hibernate/MetaDataDAO.java b/dkpro-jwpl-api/src/main/java/org/dkpro/jwpl/api/hibernate/MetaDataDAO.java
similarity index 91%
rename from de.tudarmstadt.ukp.wikipedia.api/src/main/java/de/tudarmstadt/ukp/wikipedia/api/hibernate/MetaDataDAO.java
rename to dkpro-jwpl-api/src/main/java/org/dkpro/jwpl/api/hibernate/MetaDataDAO.java
index 16ad894b1..c6a95957d 100644
--- a/de.tudarmstadt.ukp.wikipedia.api/src/main/java/de/tudarmstadt/ukp/wikipedia/api/hibernate/MetaDataDAO.java
+++ b/dkpro-jwpl-api/src/main/java/org/dkpro/jwpl/api/hibernate/MetaDataDAO.java
@@ -15,10 +15,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package de.tudarmstadt.ukp.wikipedia.api.hibernate;
+package org.dkpro.jwpl.api.hibernate;
-import de.tudarmstadt.ukp.wikipedia.api.WikiConstants;
-import de.tudarmstadt.ukp.wikipedia.api.Wikipedia;
+import org.dkpro.jwpl.api.WikiConstants;
+import org.dkpro.jwpl.api.Wikipedia;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -27,7 +27,7 @@
/**
* Data access object for class {@link MetaData}.
*
- * @see de.tudarmstadt.ukp.wikipedia.api.MetaData
+ * @see org.dkpro.jwpl.api.MetaData
* @author Hibernate Tools
*/
public class MetaDataDAO extends GenericDAO implements WikiConstants {
diff --git a/de.tudarmstadt.ukp.wikipedia.api/src/main/java/de/tudarmstadt/ukp/wikipedia/api/hibernate/Page.java b/dkpro-jwpl-api/src/main/java/org/dkpro/jwpl/api/hibernate/Page.java
similarity index 98%
rename from de.tudarmstadt.ukp.wikipedia.api/src/main/java/de/tudarmstadt/ukp/wikipedia/api/hibernate/Page.java
rename to dkpro-jwpl-api/src/main/java/org/dkpro/jwpl/api/hibernate/Page.java
index be61eaec4..166957d0c 100644
--- a/de.tudarmstadt.ukp.wikipedia.api/src/main/java/de/tudarmstadt/ukp/wikipedia/api/hibernate/Page.java
+++ b/dkpro-jwpl-api/src/main/java/org/dkpro/jwpl/api/hibernate/Page.java
@@ -15,7 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package de.tudarmstadt.ukp.wikipedia.api.hibernate;
+package org.dkpro.jwpl.api.hibernate;
import java.util.HashSet;
import java.util.Set;
diff --git a/de.tudarmstadt.ukp.wikipedia.api/src/main/java/de/tudarmstadt/ukp/wikipedia/api/hibernate/PageDAO.java b/dkpro-jwpl-api/src/main/java/org/dkpro/jwpl/api/hibernate/PageDAO.java
similarity index 93%
rename from de.tudarmstadt.ukp.wikipedia.api/src/main/java/de/tudarmstadt/ukp/wikipedia/api/hibernate/PageDAO.java
rename to dkpro-jwpl-api/src/main/java/org/dkpro/jwpl/api/hibernate/PageDAO.java
index b6b7baaca..140d4f769 100644
--- a/de.tudarmstadt.ukp.wikipedia.api/src/main/java/de/tudarmstadt/ukp/wikipedia/api/hibernate/PageDAO.java
+++ b/dkpro-jwpl-api/src/main/java/org/dkpro/jwpl/api/hibernate/PageDAO.java
@@ -15,9 +15,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package de.tudarmstadt.ukp.wikipedia.api.hibernate;
+package org.dkpro.jwpl.api.hibernate;
-import de.tudarmstadt.ukp.wikipedia.api.Wikipedia;
+import org.dkpro.jwpl.api.Wikipedia;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -26,7 +26,7 @@
/**
* Data access object for class {@link Page}.
*
- * @see de.tudarmstadt.ukp.wikipedia.api.Page
+ * @see org.dkpro.jwpl.api.Page
* @author Hibernate Tools
*/
public class PageDAO extends GenericDAO {
diff --git a/de.tudarmstadt.ukp.wikipedia.api/src/main/java/de/tudarmstadt/ukp/wikipedia/api/hibernate/PageMapLine.java b/dkpro-jwpl-api/src/main/java/org/dkpro/jwpl/api/hibernate/PageMapLine.java
similarity index 97%
rename from de.tudarmstadt.ukp.wikipedia.api/src/main/java/de/tudarmstadt/ukp/wikipedia/api/hibernate/PageMapLine.java
rename to dkpro-jwpl-api/src/main/java/org/dkpro/jwpl/api/hibernate/PageMapLine.java
index d0cb35055..9ea1a7058 100644
--- a/de.tudarmstadt.ukp.wikipedia.api/src/main/java/de/tudarmstadt/ukp/wikipedia/api/hibernate/PageMapLine.java
+++ b/dkpro-jwpl-api/src/main/java/org/dkpro/jwpl/api/hibernate/PageMapLine.java
@@ -15,7 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package de.tudarmstadt.ukp.wikipedia.api.hibernate;
+package org.dkpro.jwpl.api.hibernate;
public class PageMapLine {
private long id;
diff --git a/de.tudarmstadt.ukp.wikipedia.api/src/main/java/de/tudarmstadt/ukp/wikipedia/api/hibernate/WikiHibernateUtil.java b/dkpro-jwpl-api/src/main/java/org/dkpro/jwpl/api/hibernate/WikiHibernateUtil.java
similarity index 97%
rename from de.tudarmstadt.ukp.wikipedia.api/src/main/java/de/tudarmstadt/ukp/wikipedia/api/hibernate/WikiHibernateUtil.java
rename to dkpro-jwpl-api/src/main/java/org/dkpro/jwpl/api/hibernate/WikiHibernateUtil.java
index 55b85933f..fa33da8e0 100644
--- a/de.tudarmstadt.ukp.wikipedia.api/src/main/java/de/tudarmstadt/ukp/wikipedia/api/hibernate/WikiHibernateUtil.java
+++ b/dkpro-jwpl-api/src/main/java/org/dkpro/jwpl/api/hibernate/WikiHibernateUtil.java
@@ -15,19 +15,18 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package de.tudarmstadt.ukp.wikipedia.api.hibernate;
+package org.dkpro.jwpl.api.hibernate;
import java.util.HashMap;
import java.util.Map;
import java.util.Properties;
+import org.dkpro.jwpl.api.DatabaseConfiguration;
+import org.dkpro.jwpl.api.WikiConstants;
import org.hibernate.SessionFactory;
import org.hibernate.boot.registry.StandardServiceRegistryBuilder;
import org.hibernate.cfg.Configuration;
-import de.tudarmstadt.ukp.wikipedia.api.DatabaseConfiguration;
-import de.tudarmstadt.ukp.wikipedia.api.WikiConstants;
-
public class WikiHibernateUtil implements WikiConstants {
private static Map sessionFactoryMap = new HashMap();
diff --git a/de.tudarmstadt.ukp.wikipedia.api/src/main/java/de/tudarmstadt/ukp/wikipedia/api/sweble/PlainTextConverter.java b/dkpro-jwpl-api/src/main/java/org/dkpro/jwpl/api/sweble/PlainTextConverter.java
similarity index 99%
rename from de.tudarmstadt.ukp.wikipedia.api/src/main/java/de/tudarmstadt/ukp/wikipedia/api/sweble/PlainTextConverter.java
rename to dkpro-jwpl-api/src/main/java/org/dkpro/jwpl/api/sweble/PlainTextConverter.java
index 80d759cd7..0dd1c70f0 100644
--- a/de.tudarmstadt.ukp.wikipedia.api/src/main/java/de/tudarmstadt/ukp/wikipedia/api/sweble/PlainTextConverter.java
+++ b/dkpro-jwpl-api/src/main/java/org/dkpro/jwpl/api/sweble/PlainTextConverter.java
@@ -15,7 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package de.tudarmstadt.ukp.wikipedia.api.sweble;
+package org.dkpro.jwpl.api.sweble;
/**
* Derived from the TextConverter class which was published in the
diff --git a/de.tudarmstadt.ukp.wikipedia.api/src/main/java/de/tudarmstadt/ukp/wikipedia/api/sweble/TemplateNameExtractor.java b/dkpro-jwpl-api/src/main/java/org/dkpro/jwpl/api/sweble/TemplateNameExtractor.java
similarity index 94%
rename from de.tudarmstadt.ukp.wikipedia.api/src/main/java/de/tudarmstadt/ukp/wikipedia/api/sweble/TemplateNameExtractor.java
rename to dkpro-jwpl-api/src/main/java/org/dkpro/jwpl/api/sweble/TemplateNameExtractor.java
index ee664007b..2cc4934dd 100644
--- a/de.tudarmstadt.ukp.wikipedia.api/src/main/java/de/tudarmstadt/ukp/wikipedia/api/sweble/TemplateNameExtractor.java
+++ b/dkpro-jwpl-api/src/main/java/org/dkpro/jwpl/api/sweble/TemplateNameExtractor.java
@@ -1,114 +1,114 @@
-/*
- * Licensed to the Technische Universität Darmstadt under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The Technische Universität Darmstadt
- * 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.
- *
- * 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.
- */
-package de.tudarmstadt.ukp.wikipedia.api.sweble;
-
-/**
- * Derived from the TextConverter class which was published in the
- * Sweble example project provided on
- * http://http://sweble.org by the Open Source Research Group,
- * University of Erlangen-Nürnberg under the Apache License, Version 2.0
- * (http://www.apache.org/licenses/LICENSE-2.0)
- */
-
-import java.io.IOException;
-import java.util.LinkedList;
-import java.util.List;
-
-import de.fau.cs.osr.ptk.common.AstVisitor;
-import de.fau.cs.osr.ptk.common.ast.AstNode;
-import de.fau.cs.osr.ptk.common.ast.AstText;
-import org.sweble.wikitext.engine.config.WikiConfig;
-import org.sweble.wikitext.engine.utils.DefaultConfigEnWp;
-import org.sweble.wikitext.parser.nodes.WtNode;
-import org.sweble.wikitext.parser.nodes.WtTemplate;
-
-/**
- * A visitor that extracts template names (no parameters) from an article AST.
- *
- */
-public class TemplateNameExtractor extends AstVisitor
-{
- private final WikiConfig config;
-
-
- private List templates;
-
- // =========================================================================
-
-
- /**
- * Creates a new visitor that extracts anchors of internal links from a
- * parsed Wikipedia article using the default Sweble config as defined
- * in WikiConstants.SWEBLE_CONFIG.
- */
- public TemplateNameExtractor()
- {
- this.config = DefaultConfigEnWp.generate();
- }
-
- /**
- * Creates a new visitor that extracts anchors of internal links from a
- * parsed Wikipedia article.
- *
- * @param config the Sweble configuration
- */
- public TemplateNameExtractor(WikiConfig config)
- {
- this.config = config;
- }
-
- @Override
- protected WtNode before(WtNode node)
- {
- // This method is called by go() before visitation starts
- templates = new LinkedList();
- return super.before(node);
- }
-
- @Override
- protected Object after(WtNode node, Object result)
- {
- return templates;
- }
-
- // =========================================================================
-
- public void visit(WtNode n)
- {
- iterate(n);
- }
-
- public void visit(WtTemplate tmpl) throws IOException
- {
- for(AstNode n:tmpl.getName()){
- if(n instanceof AstText){
- add(((AstText)n).getContent());
- }
- }
- }
-
- private void add(String s)
- {
- s=s.replace("\n", "").replace("\r", "");
- if (s.trim().isEmpty()) {
- return;
- }
- templates.add(s);
- }
-
-}
+/*
+ * Licensed to the Technische Universität Darmstadt under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The Technische Universität Darmstadt
+ * 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.
+ *
+ * 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.
+ */
+package org.dkpro.jwpl.api.sweble;
+
+/**
+ * Derived from the TextConverter class which was published in the
+ * Sweble example project provided on
+ * http://http://sweble.org by the Open Source Research Group,
+ * University of Erlangen-Nürnberg under the Apache License, Version 2.0
+ * (http://www.apache.org/licenses/LICENSE-2.0)
+ */
+
+import java.io.IOException;
+import java.util.LinkedList;
+import java.util.List;
+
+import de.fau.cs.osr.ptk.common.AstVisitor;
+import de.fau.cs.osr.ptk.common.ast.AstNode;
+import de.fau.cs.osr.ptk.common.ast.AstText;
+import org.sweble.wikitext.engine.config.WikiConfig;
+import org.sweble.wikitext.engine.utils.DefaultConfigEnWp;
+import org.sweble.wikitext.parser.nodes.WtNode;
+import org.sweble.wikitext.parser.nodes.WtTemplate;
+
+/**
+ * A visitor that extracts template names (no parameters) from an article AST.
+ *
+ */
+public class TemplateNameExtractor extends AstVisitor
+{
+ private final WikiConfig config;
+
+
+ private List templates;
+
+ // =========================================================================
+
+
+ /**
+ * Creates a new visitor that extracts anchors of internal links from a
+ * parsed Wikipedia article using the default Sweble config as defined
+ * in WikiConstants.SWEBLE_CONFIG.
+ */
+ public TemplateNameExtractor()
+ {
+ this.config = DefaultConfigEnWp.generate();
+ }
+
+ /**
+ * Creates a new visitor that extracts anchors of internal links from a
+ * parsed Wikipedia article.
+ *
+ * @param config the Sweble configuration
+ */
+ public TemplateNameExtractor(WikiConfig config)
+ {
+ this.config = config;
+ }
+
+ @Override
+ protected WtNode before(WtNode node)
+ {
+ // This method is called by go() before visitation starts
+ templates = new LinkedList();
+ return super.before(node);
+ }
+
+ @Override
+ protected Object after(WtNode node, Object result)
+ {
+ return templates;
+ }
+
+ // =========================================================================
+
+ public void visit(WtNode n)
+ {
+ iterate(n);
+ }
+
+ public void visit(WtTemplate tmpl) throws IOException
+ {
+ for(AstNode n:tmpl.getName()){
+ if(n instanceof AstText){
+ add(((AstText)n).getContent());
+ }
+ }
+ }
+
+ private void add(String s)
+ {
+ s=s.replace("\n", "").replace("\r", "");
+ if (s.trim().isEmpty()) {
+ return;
+ }
+ templates.add(s);
+ }
+
+}
diff --git a/de.tudarmstadt.ukp.wikipedia.api/src/main/java/de/tudarmstadt/ukp/wikipedia/api/util/GraphSerialization.java b/dkpro-jwpl-api/src/main/java/org/dkpro/jwpl/api/util/GraphSerialization.java
similarity index 98%
rename from de.tudarmstadt.ukp.wikipedia.api/src/main/java/de/tudarmstadt/ukp/wikipedia/api/util/GraphSerialization.java
rename to dkpro-jwpl-api/src/main/java/org/dkpro/jwpl/api/util/GraphSerialization.java
index 8a42be2c7..ba2733bb2 100644
--- a/de.tudarmstadt.ukp.wikipedia.api/src/main/java/de/tudarmstadt/ukp/wikipedia/api/util/GraphSerialization.java
+++ b/dkpro-jwpl-api/src/main/java/org/dkpro/jwpl/api/util/GraphSerialization.java
@@ -15,7 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package de.tudarmstadt.ukp.wikipedia.api.util;
+package org.dkpro.jwpl.api.util;
import java.io.BufferedInputStream;
import java.io.BufferedOutputStream;
diff --git a/de.tudarmstadt.ukp.wikipedia.api/src/main/java/de/tudarmstadt/ukp/wikipedia/api/util/SerializableDirectedGraph.java b/dkpro-jwpl-api/src/main/java/org/dkpro/jwpl/api/util/SerializableDirectedGraph.java
similarity index 97%
rename from de.tudarmstadt.ukp.wikipedia.api/src/main/java/de/tudarmstadt/ukp/wikipedia/api/util/SerializableDirectedGraph.java
rename to dkpro-jwpl-api/src/main/java/org/dkpro/jwpl/api/util/SerializableDirectedGraph.java
index 2905bc685..2c7b4054e 100644
--- a/de.tudarmstadt.ukp.wikipedia.api/src/main/java/de/tudarmstadt/ukp/wikipedia/api/util/SerializableDirectedGraph.java
+++ b/dkpro-jwpl-api/src/main/java/org/dkpro/jwpl/api/util/SerializableDirectedGraph.java
@@ -15,7 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package de.tudarmstadt.ukp.wikipedia.api.util;
+package org.dkpro.jwpl.api.util;
import java.io.Serializable;
diff --git a/de.tudarmstadt.ukp.wikipedia.api/src/main/java/de/tudarmstadt/ukp/wikipedia/util/ApiUtilities.java b/dkpro-jwpl-api/src/main/java/org/dkpro/jwpl/util/ApiUtilities.java
similarity index 98%
rename from de.tudarmstadt.ukp.wikipedia.api/src/main/java/de/tudarmstadt/ukp/wikipedia/util/ApiUtilities.java
rename to dkpro-jwpl-api/src/main/java/org/dkpro/jwpl/util/ApiUtilities.java
index a0963f5aa..b81f96dc2 100644
--- a/de.tudarmstadt.ukp.wikipedia.api/src/main/java/de/tudarmstadt/ukp/wikipedia/util/ApiUtilities.java
+++ b/dkpro-jwpl-api/src/main/java/org/dkpro/jwpl/util/ApiUtilities.java
@@ -15,7 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package de.tudarmstadt.ukp.wikipedia.util;
+package org.dkpro.jwpl.util;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/de.tudarmstadt.ukp.wikipedia.api/src/main/java/de/tudarmstadt/ukp/wikipedia/util/CommonUtilities.java b/dkpro-jwpl-api/src/main/java/org/dkpro/jwpl/util/CommonUtilities.java
similarity index 98%
rename from de.tudarmstadt.ukp.wikipedia.api/src/main/java/de/tudarmstadt/ukp/wikipedia/util/CommonUtilities.java
rename to dkpro-jwpl-api/src/main/java/org/dkpro/jwpl/util/CommonUtilities.java
index 70f5aa6b4..442a9bec0 100644
--- a/de.tudarmstadt.ukp.wikipedia.api/src/main/java/de/tudarmstadt/ukp/wikipedia/util/CommonUtilities.java
+++ b/dkpro-jwpl-api/src/main/java/org/dkpro/jwpl/util/CommonUtilities.java
@@ -15,7 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package de.tudarmstadt.ukp.wikipedia.util;
+package org.dkpro.jwpl.util;
import java.util.Arrays;
import java.util.Map;
diff --git a/de.tudarmstadt.ukp.wikipedia.api/src/main/java/de/tudarmstadt/ukp/wikipedia/util/DbUtilities.java b/dkpro-jwpl-api/src/main/java/org/dkpro/jwpl/util/DbUtilities.java
similarity index 97%
rename from de.tudarmstadt.ukp.wikipedia.api/src/main/java/de/tudarmstadt/ukp/wikipedia/util/DbUtilities.java
rename to dkpro-jwpl-api/src/main/java/org/dkpro/jwpl/util/DbUtilities.java
index dff5bc59a..3c36c0989 100644
--- a/de.tudarmstadt.ukp.wikipedia.api/src/main/java/de/tudarmstadt/ukp/wikipedia/util/DbUtilities.java
+++ b/dkpro-jwpl-api/src/main/java/org/dkpro/jwpl/util/DbUtilities.java
@@ -15,7 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package de.tudarmstadt.ukp.wikipedia.util;
+package org.dkpro.jwpl.util;
import java.lang.invoke.MethodHandles;
import java.sql.Connection;
diff --git a/de.tudarmstadt.ukp.wikipedia.api/src/main/java/de/tudarmstadt/ukp/wikipedia/util/GraphUtilities.java b/dkpro-jwpl-api/src/main/java/org/dkpro/jwpl/util/GraphUtilities.java
similarity index 97%
rename from de.tudarmstadt.ukp.wikipedia.api/src/main/java/de/tudarmstadt/ukp/wikipedia/util/GraphUtilities.java
rename to dkpro-jwpl-api/src/main/java/org/dkpro/jwpl/util/GraphUtilities.java
index 28b87434c..997683ddf 100644
--- a/de.tudarmstadt.ukp.wikipedia.api/src/main/java/de/tudarmstadt/ukp/wikipedia/util/GraphUtilities.java
+++ b/dkpro-jwpl-api/src/main/java/org/dkpro/jwpl/util/GraphUtilities.java
@@ -15,14 +15,14 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package de.tudarmstadt.ukp.wikipedia.util;
+package org.dkpro.jwpl.util;
import java.lang.invoke.MethodHandles;
import java.util.HashSet;
import java.util.Random;
import java.util.Set;
-import de.tudarmstadt.ukp.wikipedia.api.Page;
+import org.dkpro.jwpl.api.Page;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/de.tudarmstadt.ukp.wikipedia.api/src/main/java/de/tudarmstadt/ukp/wikipedia/util/HibernateUtilities.java b/dkpro-jwpl-api/src/main/java/org/dkpro/jwpl/util/HibernateUtilities.java
similarity index 92%
rename from de.tudarmstadt.ukp.wikipedia.api/src/main/java/de/tudarmstadt/ukp/wikipedia/util/HibernateUtilities.java
rename to dkpro-jwpl-api/src/main/java/org/dkpro/jwpl/util/HibernateUtilities.java
index c105aab41..7205576e2 100644
--- a/de.tudarmstadt.ukp.wikipedia.api/src/main/java/de/tudarmstadt/ukp/wikipedia/util/HibernateUtilities.java
+++ b/dkpro-jwpl-api/src/main/java/org/dkpro/jwpl/util/HibernateUtilities.java
@@ -15,17 +15,17 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package de.tudarmstadt.ukp.wikipedia.util;
+package org.dkpro.jwpl.util;
import java.util.HashMap;
import java.util.Iterator;
import java.util.Map;
+import org.dkpro.jwpl.api.WikiConstants;
import org.hibernate.Session;
-import de.tudarmstadt.ukp.wikipedia.api.DatabaseConfiguration;
-import de.tudarmstadt.ukp.wikipedia.api.WikiConstants;
-import de.tudarmstadt.ukp.wikipedia.api.hibernate.WikiHibernateUtil;
+import org.dkpro.jwpl.api.DatabaseConfiguration;
+import org.dkpro.jwpl.api.hibernate.WikiHibernateUtil;
public class HibernateUtilities implements WikiConstants {
diff --git a/de.tudarmstadt.ukp.wikipedia.api/src/main/java/de/tudarmstadt/ukp/wikipedia/util/OS.java b/dkpro-jwpl-api/src/main/java/org/dkpro/jwpl/util/OS.java
similarity index 97%
rename from de.tudarmstadt.ukp.wikipedia.api/src/main/java/de/tudarmstadt/ukp/wikipedia/util/OS.java
rename to dkpro-jwpl-api/src/main/java/org/dkpro/jwpl/util/OS.java
index 8133adcb8..8414341f1 100644
--- a/de.tudarmstadt.ukp.wikipedia.api/src/main/java/de/tudarmstadt/ukp/wikipedia/util/OS.java
+++ b/dkpro-jwpl-api/src/main/java/org/dkpro/jwpl/util/OS.java
@@ -15,7 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package de.tudarmstadt.ukp.wikipedia.util;
+package org.dkpro.jwpl.util;
public class OS {
diff --git a/de.tudarmstadt.ukp.wikipedia.api/src/main/java/de/tudarmstadt/ukp/wikipedia/util/StringUtils.java b/dkpro-jwpl-api/src/main/java/org/dkpro/jwpl/util/StringUtils.java
similarity index 98%
rename from de.tudarmstadt.ukp.wikipedia.api/src/main/java/de/tudarmstadt/ukp/wikipedia/util/StringUtils.java
rename to dkpro-jwpl-api/src/main/java/org/dkpro/jwpl/util/StringUtils.java
index b1bcc1856..90e33e6de 100644
--- a/de.tudarmstadt.ukp.wikipedia.api/src/main/java/de/tudarmstadt/ukp/wikipedia/util/StringUtils.java
+++ b/dkpro-jwpl-api/src/main/java/org/dkpro/jwpl/util/StringUtils.java
@@ -15,7 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package de.tudarmstadt.ukp.wikipedia.util;
+package org.dkpro.jwpl.util;
import java.io.File;
import java.io.IOException;
diff --git a/de.tudarmstadt.ukp.wikipedia.api/src/main/java/de/tudarmstadt/ukp/wikipedia/util/UnmodifiableArraySet.java b/dkpro-jwpl-api/src/main/java/org/dkpro/jwpl/util/UnmodifiableArraySet.java
similarity index 98%
rename from de.tudarmstadt.ukp.wikipedia.api/src/main/java/de/tudarmstadt/ukp/wikipedia/util/UnmodifiableArraySet.java
rename to dkpro-jwpl-api/src/main/java/org/dkpro/jwpl/util/UnmodifiableArraySet.java
index 55505753e..05dab93cb 100644
--- a/de.tudarmstadt.ukp.wikipedia.api/src/main/java/de/tudarmstadt/ukp/wikipedia/util/UnmodifiableArraySet.java
+++ b/dkpro-jwpl-api/src/main/java/org/dkpro/jwpl/util/UnmodifiableArraySet.java
@@ -15,7 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package de.tudarmstadt.ukp.wikipedia.util;
+package org.dkpro.jwpl.util;
import java.util.Arrays;
import java.util.Collection;
diff --git a/de.tudarmstadt.ukp.wikipedia.api/src/main/java/de/tudarmstadt/ukp/wikipedia/util/distance/LevenshteinStringDistance.java b/dkpro-jwpl-api/src/main/java/org/dkpro/jwpl/util/distance/LevenshteinStringDistance.java
similarity index 95%
rename from de.tudarmstadt.ukp.wikipedia.api/src/main/java/de/tudarmstadt/ukp/wikipedia/util/distance/LevenshteinStringDistance.java
rename to dkpro-jwpl-api/src/main/java/org/dkpro/jwpl/util/distance/LevenshteinStringDistance.java
index 24766e540..1ab80e2e1 100644
--- a/de.tudarmstadt.ukp.wikipedia.api/src/main/java/de/tudarmstadt/ukp/wikipedia/util/distance/LevenshteinStringDistance.java
+++ b/dkpro-jwpl-api/src/main/java/org/dkpro/jwpl/util/distance/LevenshteinStringDistance.java
@@ -15,7 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package de.tudarmstadt.ukp.wikipedia.util.distance;
+package org.dkpro.jwpl.util.distance;
public class LevenshteinStringDistance implements StringDistance {
@@ -65,7 +65,7 @@ public double distance(String s, String t) {
}
}
// Step 7
- return new Integer(d[n][m]).doubleValue();
+ return Integer.valueOf(d[n][m]).doubleValue();
}
private int Minimum(int a, int b, int c) {
diff --git a/de.tudarmstadt.ukp.wikipedia.api/src/main/java/de/tudarmstadt/ukp/wikipedia/util/distance/StringDistance.java b/dkpro-jwpl-api/src/main/java/org/dkpro/jwpl/util/distance/StringDistance.java
similarity index 94%
rename from de.tudarmstadt.ukp.wikipedia.api/src/main/java/de/tudarmstadt/ukp/wikipedia/util/distance/StringDistance.java
rename to dkpro-jwpl-api/src/main/java/org/dkpro/jwpl/util/distance/StringDistance.java
index 3a0b4f70b..a550545bc 100644
--- a/de.tudarmstadt.ukp.wikipedia.api/src/main/java/de/tudarmstadt/ukp/wikipedia/util/distance/StringDistance.java
+++ b/dkpro-jwpl-api/src/main/java/org/dkpro/jwpl/util/distance/StringDistance.java
@@ -15,7 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package de.tudarmstadt.ukp.wikipedia.util.distance;
+package org.dkpro.jwpl.util.distance;
public interface StringDistance {
diff --git a/de.tudarmstadt.ukp.wikipedia.api/src/main/resources/de/tudarmstadt/ukp/wikipedia/api/hibernate/Category.hbm.xml b/dkpro-jwpl-api/src/main/resources/org/dkpro/jwpl/api/hibernate/Category.hbm.xml
similarity index 95%
rename from de.tudarmstadt.ukp.wikipedia.api/src/main/resources/de/tudarmstadt/ukp/wikipedia/api/hibernate/Category.hbm.xml
rename to dkpro-jwpl-api/src/main/resources/org/dkpro/jwpl/api/hibernate/Category.hbm.xml
index 083634d1a..793474367 100644
--- a/de.tudarmstadt.ukp.wikipedia.api/src/main/resources/de/tudarmstadt/ukp/wikipedia/api/hibernate/Category.hbm.xml
+++ b/dkpro-jwpl-api/src/main/resources/org/dkpro/jwpl/api/hibernate/Category.hbm.xml
@@ -21,7 +21,7 @@
"http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
-
+
diff --git a/de.tudarmstadt.ukp.wikipedia.api/src/main/resources/de/tudarmstadt/ukp/wikipedia/api/hibernate/MetaData.hbm.xml b/dkpro-jwpl-api/src/main/resources/org/dkpro/jwpl/api/hibernate/MetaData.hbm.xml
similarity index 94%
rename from de.tudarmstadt.ukp.wikipedia.api/src/main/resources/de/tudarmstadt/ukp/wikipedia/api/hibernate/MetaData.hbm.xml
rename to dkpro-jwpl-api/src/main/resources/org/dkpro/jwpl/api/hibernate/MetaData.hbm.xml
index 94fe30e6c..3daf7720d 100644
--- a/de.tudarmstadt.ukp.wikipedia.api/src/main/resources/de/tudarmstadt/ukp/wikipedia/api/hibernate/MetaData.hbm.xml
+++ b/dkpro-jwpl-api/src/main/resources/org/dkpro/jwpl/api/hibernate/MetaData.hbm.xml
@@ -22,7 +22,7 @@
"http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
-
+
diff --git a/de.tudarmstadt.ukp.wikipedia.api/src/main/resources/de/tudarmstadt/ukp/wikipedia/api/hibernate/Page.hbm.xml b/dkpro-jwpl-api/src/main/resources/org/dkpro/jwpl/api/hibernate/Page.hbm.xml
similarity index 96%
rename from de.tudarmstadt.ukp.wikipedia.api/src/main/resources/de/tudarmstadt/ukp/wikipedia/api/hibernate/Page.hbm.xml
rename to dkpro-jwpl-api/src/main/resources/org/dkpro/jwpl/api/hibernate/Page.hbm.xml
index 26b5f1e58..019bf7a83 100644
--- a/de.tudarmstadt.ukp.wikipedia.api/src/main/resources/de/tudarmstadt/ukp/wikipedia/api/hibernate/Page.hbm.xml
+++ b/dkpro-jwpl-api/src/main/resources/org/dkpro/jwpl/api/hibernate/Page.hbm.xml
@@ -22,7 +22,7 @@
"http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
-
+
diff --git a/de.tudarmstadt.ukp.wikipedia.api/src/main/resources/de/tudarmstadt/ukp/wikipedia/api/hibernate/PageMapLine.hbm.xml b/dkpro-jwpl-api/src/main/resources/org/dkpro/jwpl/api/hibernate/PageMapLine.hbm.xml
similarity index 92%
rename from de.tudarmstadt.ukp.wikipedia.api/src/main/resources/de/tudarmstadt/ukp/wikipedia/api/hibernate/PageMapLine.hbm.xml
rename to dkpro-jwpl-api/src/main/resources/org/dkpro/jwpl/api/hibernate/PageMapLine.hbm.xml
index a5bcdfd21..3f4b70c85 100644
--- a/de.tudarmstadt.ukp.wikipedia.api/src/main/resources/de/tudarmstadt/ukp/wikipedia/api/hibernate/PageMapLine.hbm.xml
+++ b/dkpro-jwpl-api/src/main/resources/org/dkpro/jwpl/api/hibernate/PageMapLine.hbm.xml
@@ -22,7 +22,7 @@
"http://www.hibernate.org/dtd/hibernate-mapping-3.0.dtd">
-
+
diff --git a/de.tudarmstadt.ukp.wikipedia.api/src/main/resources/de/tudarmstadt/ukp/wikipedia/api/hibernate/RelatednessCacheLine.hbm.xml b/dkpro-jwpl-api/src/main/resources/org/dkpro/jwpl/api/hibernate/RelatednessCacheLine.hbm.xml
similarity index 59%
rename from de.tudarmstadt.ukp.wikipedia.api/src/main/resources/de/tudarmstadt/ukp/wikipedia/api/hibernate/RelatednessCacheLine.hbm.xml
rename to dkpro-jwpl-api/src/main/resources/org/dkpro/jwpl/api/hibernate/RelatednessCacheLine.hbm.xml
index 39b5123a0..62e1830ed 100644
--- a/de.tudarmstadt.ukp.wikipedia.api/src/main/resources/de/tudarmstadt/ukp/wikipedia/api/hibernate/RelatednessCacheLine.hbm.xml
+++ b/dkpro-jwpl-api/src/main/resources/org/dkpro/jwpl/api/hibernate/RelatednessCacheLine.hbm.xml
@@ -21,31 +21,31 @@
-->
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/de.tudarmstadt.ukp.wikipedia.api/src/test/java/de/tudarmstadt/ukp/wikipedia/api/BaseJWPLTest.java b/dkpro-jwpl-api/src/test/java/org/dkpro/jwpl/api/BaseJWPLTest.java
similarity index 91%
rename from de.tudarmstadt.ukp.wikipedia.api/src/test/java/de/tudarmstadt/ukp/wikipedia/api/BaseJWPLTest.java
rename to dkpro-jwpl-api/src/test/java/org/dkpro/jwpl/api/BaseJWPLTest.java
index 00980a2ac..b5ce7ee3b 100644
--- a/de.tudarmstadt.ukp.wikipedia.api/src/test/java/de/tudarmstadt/ukp/wikipedia/api/BaseJWPLTest.java
+++ b/dkpro-jwpl-api/src/test/java/org/dkpro/jwpl/api/BaseJWPLTest.java
@@ -15,9 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package de.tudarmstadt.ukp.wikipedia.api;
-
-import de.tudarmstadt.ukp.wikipedia.api.WikiConstants.Language;
+package org.dkpro.jwpl.api;
/**
* Simple test base class to inject the same hsqldb test context into every test
@@ -36,7 +34,7 @@ protected static final DatabaseConfiguration obtainHSDLDBConfiguration() {
db.setHost("localhost");
db.setUser("sa");
db.setPassword("");
- db.setLanguage(Language._test);
+ db.setLanguage(WikiConstants.Language._test);
db.setJdbcURL("jdbc:hsqldb:file:./src/test/resources/db/wikiapi_test");
db.setDatabaseDriver("org.hsqldb.jdbcDriver");
return db;
diff --git a/de.tudarmstadt.ukp.wikipedia.api/src/test/java/de/tudarmstadt/ukp/wikipedia/api/CategoryDescendantsIteratorTest.java b/dkpro-jwpl-api/src/test/java/org/dkpro/jwpl/api/CategoryDescendantsIteratorTest.java
similarity index 97%
rename from de.tudarmstadt.ukp.wikipedia.api/src/test/java/de/tudarmstadt/ukp/wikipedia/api/CategoryDescendantsIteratorTest.java
rename to dkpro-jwpl-api/src/test/java/org/dkpro/jwpl/api/CategoryDescendantsIteratorTest.java
index c3e09eaf9..887c17aaa 100644
--- a/de.tudarmstadt.ukp.wikipedia.api/src/test/java/de/tudarmstadt/ukp/wikipedia/api/CategoryDescendantsIteratorTest.java
+++ b/dkpro-jwpl-api/src/test/java/org/dkpro/jwpl/api/CategoryDescendantsIteratorTest.java
@@ -15,7 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package de.tudarmstadt.ukp.wikipedia.api;
+package org.dkpro.jwpl.api;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.fail;
@@ -28,7 +28,7 @@
import org.junit.BeforeClass;
import org.junit.Test;
-import de.tudarmstadt.ukp.wikipedia.api.exception.WikiApiException;
+import org.dkpro.jwpl.api.exception.WikiApiException;
public class CategoryDescendantsIteratorTest extends BaseJWPLTest{
diff --git a/de.tudarmstadt.ukp.wikipedia.api/src/test/java/de/tudarmstadt/ukp/wikipedia/api/CategoryGraphTest.java b/dkpro-jwpl-api/src/test/java/org/dkpro/jwpl/api/CategoryGraphTest.java
similarity index 97%
rename from de.tudarmstadt.ukp.wikipedia.api/src/test/java/de/tudarmstadt/ukp/wikipedia/api/CategoryGraphTest.java
rename to dkpro-jwpl-api/src/test/java/org/dkpro/jwpl/api/CategoryGraphTest.java
index a5432e822..c289d9a76 100644
--- a/de.tudarmstadt.ukp.wikipedia.api/src/test/java/de/tudarmstadt/ukp/wikipedia/api/CategoryGraphTest.java
+++ b/dkpro-jwpl-api/src/test/java/org/dkpro/jwpl/api/CategoryGraphTest.java
@@ -15,7 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package de.tudarmstadt.ukp.wikipedia.api;
+package org.dkpro.jwpl.api;
import static org.junit.Assert.assertEquals;
@@ -28,7 +28,7 @@
import org.junit.BeforeClass;
import org.junit.Test;
-import de.tudarmstadt.ukp.wikipedia.api.exception.WikiApiException;
+import org.dkpro.jwpl.api.exception.WikiApiException;
public class CategoryGraphTest extends BaseJWPLTest{
diff --git a/de.tudarmstadt.ukp.wikipedia.api/src/test/java/de/tudarmstadt/ukp/wikipedia/api/CategoryIteratorTest.java b/dkpro-jwpl-api/src/test/java/org/dkpro/jwpl/api/CategoryIteratorTest.java
similarity index 92%
rename from de.tudarmstadt.ukp.wikipedia.api/src/test/java/de/tudarmstadt/ukp/wikipedia/api/CategoryIteratorTest.java
rename to dkpro-jwpl-api/src/test/java/org/dkpro/jwpl/api/CategoryIteratorTest.java
index b678e6822..2e06e38a6 100644
--- a/de.tudarmstadt.ukp.wikipedia.api/src/test/java/de/tudarmstadt/ukp/wikipedia/api/CategoryIteratorTest.java
+++ b/dkpro-jwpl-api/src/test/java/org/dkpro/jwpl/api/CategoryIteratorTest.java
@@ -15,7 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package de.tudarmstadt.ukp.wikipedia.api;
+package org.dkpro.jwpl.api;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.fail;
@@ -25,9 +25,6 @@
import org.junit.BeforeClass;
import org.junit.Test;
-import de.tudarmstadt.ukp.wikipedia.api.WikiConstants.Language;
-import de.tudarmstadt.ukp.wikipedia.api.exception.WikiInitializationException;
-
public class CategoryIteratorTest extends BaseJWPLTest {
/**
diff --git a/de.tudarmstadt.ukp.wikipedia.api/src/test/java/de/tudarmstadt/ukp/wikipedia/api/CategoryTest.java b/dkpro-jwpl-api/src/test/java/org/dkpro/jwpl/api/CategoryTest.java
similarity index 98%
rename from de.tudarmstadt.ukp.wikipedia.api/src/test/java/de/tudarmstadt/ukp/wikipedia/api/CategoryTest.java
rename to dkpro-jwpl-api/src/test/java/org/dkpro/jwpl/api/CategoryTest.java
index 64a41bd1e..74e12c60b 100644
--- a/de.tudarmstadt.ukp.wikipedia.api/src/test/java/de/tudarmstadt/ukp/wikipedia/api/CategoryTest.java
+++ b/dkpro-jwpl-api/src/test/java/org/dkpro/jwpl/api/CategoryTest.java
@@ -15,14 +15,14 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package de.tudarmstadt.ukp.wikipedia.api;
+package org.dkpro.jwpl.api;
-import de.tudarmstadt.ukp.wikipedia.api.exception.WikiPageNotFoundException;
+import org.dkpro.jwpl.api.exception.WikiPageNotFoundException;
import org.junit.BeforeClass;
import org.junit.Test;
-import de.tudarmstadt.ukp.wikipedia.api.exception.WikiApiException;
-import de.tudarmstadt.ukp.wikipedia.api.exception.WikiTitleParsingException;
+import org.dkpro.jwpl.api.exception.WikiApiException;
+import org.dkpro.jwpl.api.exception.WikiTitleParsingException;
import java.util.ArrayList;
import java.util.Collections;
diff --git a/de.tudarmstadt.ukp.wikipedia.api/src/test/java/de/tudarmstadt/ukp/wikipedia/api/MetaDataTest.java b/dkpro-jwpl-api/src/test/java/org/dkpro/jwpl/api/MetaDataTest.java
similarity index 97%
rename from de.tudarmstadt.ukp.wikipedia.api/src/test/java/de/tudarmstadt/ukp/wikipedia/api/MetaDataTest.java
rename to dkpro-jwpl-api/src/test/java/org/dkpro/jwpl/api/MetaDataTest.java
index ed577d12c..31a321e6e 100644
--- a/de.tudarmstadt.ukp.wikipedia.api/src/test/java/de/tudarmstadt/ukp/wikipedia/api/MetaDataTest.java
+++ b/dkpro-jwpl-api/src/test/java/org/dkpro/jwpl/api/MetaDataTest.java
@@ -15,9 +15,9 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package de.tudarmstadt.ukp.wikipedia.api;
+package org.dkpro.jwpl.api;
-import de.tudarmstadt.ukp.wikipedia.api.exception.WikiApiException;
+import org.dkpro.jwpl.api.exception.WikiApiException;
import org.junit.After;
import org.junit.Before;
import org.junit.BeforeClass;
diff --git a/de.tudarmstadt.ukp.wikipedia.api/src/test/java/de/tudarmstadt/ukp/wikipedia/api/PageIteratorTest.java b/dkpro-jwpl-api/src/test/java/org/dkpro/jwpl/api/PageIteratorTest.java
similarity index 98%
rename from de.tudarmstadt.ukp.wikipedia.api/src/test/java/de/tudarmstadt/ukp/wikipedia/api/PageIteratorTest.java
rename to dkpro-jwpl-api/src/test/java/org/dkpro/jwpl/api/PageIteratorTest.java
index d4f7749c6..5df7e8897 100644
--- a/de.tudarmstadt.ukp.wikipedia.api/src/test/java/de/tudarmstadt/ukp/wikipedia/api/PageIteratorTest.java
+++ b/dkpro-jwpl-api/src/test/java/org/dkpro/jwpl/api/PageIteratorTest.java
@@ -15,7 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package de.tudarmstadt.ukp.wikipedia.api;
+package org.dkpro.jwpl.api;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
diff --git a/de.tudarmstadt.ukp.wikipedia.api/src/test/java/de/tudarmstadt/ukp/wikipedia/api/PageTest.java b/dkpro-jwpl-api/src/test/java/org/dkpro/jwpl/api/PageTest.java
similarity index 98%
rename from de.tudarmstadt.ukp.wikipedia.api/src/test/java/de/tudarmstadt/ukp/wikipedia/api/PageTest.java
rename to dkpro-jwpl-api/src/test/java/org/dkpro/jwpl/api/PageTest.java
index f544fa23d..6ce20b927 100644
--- a/de.tudarmstadt.ukp.wikipedia.api/src/test/java/de/tudarmstadt/ukp/wikipedia/api/PageTest.java
+++ b/dkpro-jwpl-api/src/test/java/org/dkpro/jwpl/api/PageTest.java
@@ -15,13 +15,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package de.tudarmstadt.ukp.wikipedia.api;
+package org.dkpro.jwpl.api;
-import de.tudarmstadt.ukp.wikipedia.api.exception.WikiPageNotFoundException;
-import de.tudarmstadt.ukp.wikipedia.api.exception.WikiTitleParsingException;
+import org.dkpro.jwpl.api.exception.WikiPageNotFoundException;
+import org.dkpro.jwpl.api.exception.WikiTitleParsingException;
import org.junit.*;
-import de.tudarmstadt.ukp.wikipedia.api.exception.WikiApiException;
+import org.dkpro.jwpl.api.exception.WikiApiException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/de.tudarmstadt.ukp.wikipedia.api/src/test/java/de/tudarmstadt/ukp/wikipedia/api/TitleIteratorTest.java b/dkpro-jwpl-api/src/test/java/org/dkpro/jwpl/api/TitleIteratorTest.java
similarity index 97%
rename from de.tudarmstadt.ukp.wikipedia.api/src/test/java/de/tudarmstadt/ukp/wikipedia/api/TitleIteratorTest.java
rename to dkpro-jwpl-api/src/test/java/org/dkpro/jwpl/api/TitleIteratorTest.java
index a10a5001b..795f5f71b 100644
--- a/de.tudarmstadt.ukp.wikipedia.api/src/test/java/de/tudarmstadt/ukp/wikipedia/api/TitleIteratorTest.java
+++ b/dkpro-jwpl-api/src/test/java/org/dkpro/jwpl/api/TitleIteratorTest.java
@@ -15,7 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package de.tudarmstadt.ukp.wikipedia.api;
+package org.dkpro.jwpl.api;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
diff --git a/de.tudarmstadt.ukp.wikipedia.api/src/test/java/de/tudarmstadt/ukp/wikipedia/api/TitleTest.java b/dkpro-jwpl-api/src/test/java/org/dkpro/jwpl/api/TitleTest.java
similarity index 94%
rename from de.tudarmstadt.ukp.wikipedia.api/src/test/java/de/tudarmstadt/ukp/wikipedia/api/TitleTest.java
rename to dkpro-jwpl-api/src/test/java/org/dkpro/jwpl/api/TitleTest.java
index 6090c041f..24fe077e4 100644
--- a/de.tudarmstadt.ukp.wikipedia.api/src/test/java/de/tudarmstadt/ukp/wikipedia/api/TitleTest.java
+++ b/dkpro-jwpl-api/src/test/java/org/dkpro/jwpl/api/TitleTest.java
@@ -1,124 +1,124 @@
-/*
- * Licensed to the Technische Universität Darmstadt under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The Technische Universität Darmstadt
- * 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.
- *
- * 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.
- */
-package de.tudarmstadt.ukp.wikipedia.api;
-
-import static org.junit.Assert.assertEquals;
-
-import org.junit.Test;
-
-import de.tudarmstadt.ukp.wikipedia.api.exception.WikiTitleParsingException;
-
-public class TitleTest {
-
- @Test
- public void titleTest1() throws WikiTitleParsingException {
-
- Title t = new Title("Car");
- assertEquals("Car", t.getEntity());
- assertEquals("Car", t.getPlainTitle());
- assertEquals("Car", t.getRawTitleText());
- assertEquals(null, t.getDisambiguationText());
- assertEquals(null, t.getSectionText());
- assertEquals("Car", t.getWikiStyleTitle());
- }
-
- @Test
- public void titleTest2() throws WikiTitleParsingException {
-
- Title t = new Title("Car_(automobile)");
- assertEquals("Car", t.getEntity());
- assertEquals("Car (automobile)", t.getPlainTitle());
- assertEquals("Car_(automobile)", t.getRawTitleText());
- assertEquals("automobile", t.getDisambiguationText());
- assertEquals(null, t.getSectionText());
- assertEquals("Car_(automobile)", t.getWikiStyleTitle());
- }
-
- @Test
- public void titleTest3() throws WikiTitleParsingException {
-
- Title t = new Title("Car (automobile)");
- assertEquals("Car", t.getEntity());
- assertEquals("Car (automobile)", t.getPlainTitle());
- assertEquals("Car (automobile)", t.getRawTitleText());
- assertEquals("automobile", t.getDisambiguationText());
- assertEquals(null, t.getSectionText());
- assertEquals("Car_(automobile)", t.getWikiStyleTitle());
- }
-
- @Test
- public void titleTest4() throws WikiTitleParsingException {
-
- Title t = new Title("Car (automobile)#Introduction");
- assertEquals("Car", t.getEntity());
- assertEquals("Car (automobile)", t.getPlainTitle());
- assertEquals("Car (automobile)#Introduction", t.getRawTitleText());
- assertEquals("automobile", t.getDisambiguationText());
- assertEquals("Introduction", t.getSectionText());
- assertEquals("Car_(automobile)", t.getWikiStyleTitle());
- }
-
- @Test
- public void titleTest5() throws WikiTitleParsingException {
-
- Title t = new Title("Car_(automobile)#Introduction");
- assertEquals("Car", t.getEntity());
- assertEquals("Car (automobile)", t.getPlainTitle());
- assertEquals("Car_(automobile)#Introduction", t.getRawTitleText());
- assertEquals("automobile", t.getDisambiguationText());
- assertEquals("Introduction", t.getSectionText());
- assertEquals("Car_(automobile)", t.getWikiStyleTitle());
- }
-
- @Test
- public void titleTest6() throws WikiTitleParsingException {
-
- Title t = new Title("Car#Introduction");
- assertEquals("Car", t.getEntity());
- assertEquals("Car", t.getPlainTitle());
- assertEquals("Car#Introduction", t.getRawTitleText());
- assertEquals(null, t.getDisambiguationText());
- assertEquals("Introduction", t.getSectionText());
- assertEquals("Car", t.getWikiStyleTitle());
- }
-
- @Test
- public void titleTest7() throws WikiTitleParsingException {
-
- Title t = new Title("401(k)");
- assertEquals("401(k)", t.getEntity());
- assertEquals("401(k)", t.getPlainTitle());
- assertEquals("401(k)", t.getRawTitleText());
- assertEquals(null, t.getDisambiguationText());
- assertEquals(null, t.getSectionText());
- assertEquals("401(k)", t.getWikiStyleTitle());
- }
-
- @Test
- public void titleTest8() throws WikiTitleParsingException {
-
- Title t = new Title("Ytterbium(III)_chloride_(data_page)");
- assertEquals("Ytterbium(III) chloride", t.getEntity());
- assertEquals("Ytterbium(III) chloride (data page)", t.getPlainTitle());
- assertEquals("Ytterbium(III)_chloride_(data_page)", t.getRawTitleText());
- assertEquals("data page", t.getDisambiguationText());
- assertEquals(null, t.getSectionText());
- assertEquals("Ytterbium(III)_chloride_(data_page)", t.getWikiStyleTitle());
- }
-
-}
+/*
+ * Licensed to the Technische Universität Darmstadt under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The Technische Universität Darmstadt
+ * 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.
+ *
+ * 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.
+ */
+package org.dkpro.jwpl.api;
+
+import static org.junit.Assert.assertEquals;
+
+import org.junit.Test;
+
+import org.dkpro.jwpl.api.exception.WikiTitleParsingException;
+
+public class TitleTest {
+
+ @Test
+ public void titleTest1() throws WikiTitleParsingException {
+
+ Title t = new Title("Car");
+ assertEquals("Car", t.getEntity());
+ assertEquals("Car", t.getPlainTitle());
+ assertEquals("Car", t.getRawTitleText());
+ assertEquals(null, t.getDisambiguationText());
+ assertEquals(null, t.getSectionText());
+ assertEquals("Car", t.getWikiStyleTitle());
+ }
+
+ @Test
+ public void titleTest2() throws WikiTitleParsingException {
+
+ Title t = new Title("Car_(automobile)");
+ assertEquals("Car", t.getEntity());
+ assertEquals("Car (automobile)", t.getPlainTitle());
+ assertEquals("Car_(automobile)", t.getRawTitleText());
+ assertEquals("automobile", t.getDisambiguationText());
+ assertEquals(null, t.getSectionText());
+ assertEquals("Car_(automobile)", t.getWikiStyleTitle());
+ }
+
+ @Test
+ public void titleTest3() throws WikiTitleParsingException {
+
+ Title t = new Title("Car (automobile)");
+ assertEquals("Car", t.getEntity());
+ assertEquals("Car (automobile)", t.getPlainTitle());
+ assertEquals("Car (automobile)", t.getRawTitleText());
+ assertEquals("automobile", t.getDisambiguationText());
+ assertEquals(null, t.getSectionText());
+ assertEquals("Car_(automobile)", t.getWikiStyleTitle());
+ }
+
+ @Test
+ public void titleTest4() throws WikiTitleParsingException {
+
+ Title t = new Title("Car (automobile)#Introduction");
+ assertEquals("Car", t.getEntity());
+ assertEquals("Car (automobile)", t.getPlainTitle());
+ assertEquals("Car (automobile)#Introduction", t.getRawTitleText());
+ assertEquals("automobile", t.getDisambiguationText());
+ assertEquals("Introduction", t.getSectionText());
+ assertEquals("Car_(automobile)", t.getWikiStyleTitle());
+ }
+
+ @Test
+ public void titleTest5() throws WikiTitleParsingException {
+
+ Title t = new Title("Car_(automobile)#Introduction");
+ assertEquals("Car", t.getEntity());
+ assertEquals("Car (automobile)", t.getPlainTitle());
+ assertEquals("Car_(automobile)#Introduction", t.getRawTitleText());
+ assertEquals("automobile", t.getDisambiguationText());
+ assertEquals("Introduction", t.getSectionText());
+ assertEquals("Car_(automobile)", t.getWikiStyleTitle());
+ }
+
+ @Test
+ public void titleTest6() throws WikiTitleParsingException {
+
+ Title t = new Title("Car#Introduction");
+ assertEquals("Car", t.getEntity());
+ assertEquals("Car", t.getPlainTitle());
+ assertEquals("Car#Introduction", t.getRawTitleText());
+ assertEquals(null, t.getDisambiguationText());
+ assertEquals("Introduction", t.getSectionText());
+ assertEquals("Car", t.getWikiStyleTitle());
+ }
+
+ @Test
+ public void titleTest7() throws WikiTitleParsingException {
+
+ Title t = new Title("401(k)");
+ assertEquals("401(k)", t.getEntity());
+ assertEquals("401(k)", t.getPlainTitle());
+ assertEquals("401(k)", t.getRawTitleText());
+ assertEquals(null, t.getDisambiguationText());
+ assertEquals(null, t.getSectionText());
+ assertEquals("401(k)", t.getWikiStyleTitle());
+ }
+
+ @Test
+ public void titleTest8() throws WikiTitleParsingException {
+
+ Title t = new Title("Ytterbium(III)_chloride_(data_page)");
+ assertEquals("Ytterbium(III) chloride", t.getEntity());
+ assertEquals("Ytterbium(III) chloride (data page)", t.getPlainTitle());
+ assertEquals("Ytterbium(III)_chloride_(data_page)", t.getRawTitleText());
+ assertEquals("data page", t.getDisambiguationText());
+ assertEquals(null, t.getSectionText());
+ assertEquals("Ytterbium(III)_chloride_(data_page)", t.getWikiStyleTitle());
+ }
+
+}
diff --git a/de.tudarmstadt.ukp.wikipedia.api/src/test/java/de/tudarmstadt/ukp/wikipedia/api/WikiConfigTest.java b/dkpro-jwpl-api/src/test/java/org/dkpro/jwpl/api/WikiConfigTest.java
similarity index 97%
rename from de.tudarmstadt.ukp.wikipedia.api/src/test/java/de/tudarmstadt/ukp/wikipedia/api/WikiConfigTest.java
rename to dkpro-jwpl-api/src/test/java/org/dkpro/jwpl/api/WikiConfigTest.java
index e35705e2f..a843ea098 100644
--- a/de.tudarmstadt.ukp.wikipedia.api/src/test/java/de/tudarmstadt/ukp/wikipedia/api/WikiConfigTest.java
+++ b/dkpro-jwpl-api/src/test/java/org/dkpro/jwpl/api/WikiConfigTest.java
@@ -15,7 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package de.tudarmstadt.ukp.wikipedia.api;
+package org.dkpro.jwpl.api;
import org.junit.Test;
import org.sweble.wikitext.engine.config.WikiConfig;
diff --git a/de.tudarmstadt.ukp.wikipedia.api/src/test/java/de/tudarmstadt/ukp/wikipedia/api/WikipediaTest.java b/dkpro-jwpl-api/src/test/java/org/dkpro/jwpl/api/WikipediaTest.java
similarity index 98%
rename from de.tudarmstadt.ukp.wikipedia.api/src/test/java/de/tudarmstadt/ukp/wikipedia/api/WikipediaTest.java
rename to dkpro-jwpl-api/src/test/java/org/dkpro/jwpl/api/WikipediaTest.java
index f8a63fa24..15e35c60d 100644
--- a/de.tudarmstadt.ukp.wikipedia.api/src/test/java/de/tudarmstadt/ukp/wikipedia/api/WikipediaTest.java
+++ b/dkpro-jwpl-api/src/test/java/org/dkpro/jwpl/api/WikipediaTest.java
@@ -15,15 +15,15 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package de.tudarmstadt.ukp.wikipedia.api;
+package org.dkpro.jwpl.api;
-import de.tudarmstadt.ukp.wikipedia.api.exception.WikiPageNotFoundException;
+import org.dkpro.jwpl.api.exception.WikiPageNotFoundException;
import org.junit.BeforeClass;
import org.junit.Test;
-import de.tudarmstadt.ukp.wikipedia.api.exception.WikiApiException;
-import de.tudarmstadt.ukp.wikipedia.api.exception.WikiTitleParsingException;
+import org.dkpro.jwpl.api.exception.WikiApiException;
+import org.dkpro.jwpl.api.exception.WikiTitleParsingException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/de.tudarmstadt.ukp.wikipedia.api/src/test/java/de/tudarmstadt/ukp/wikipedia/api/util/GraphSerializationTest.java b/dkpro-jwpl-api/src/test/java/org/dkpro/jwpl/api/util/GraphSerializationTest.java
similarity index 95%
rename from de.tudarmstadt.ukp.wikipedia.api/src/test/java/de/tudarmstadt/ukp/wikipedia/api/util/GraphSerializationTest.java
rename to dkpro-jwpl-api/src/test/java/org/dkpro/jwpl/api/util/GraphSerializationTest.java
index bca6edc31..b8a222184 100644
--- a/de.tudarmstadt.ukp.wikipedia.api/src/test/java/de/tudarmstadt/ukp/wikipedia/api/util/GraphSerializationTest.java
+++ b/dkpro-jwpl-api/src/test/java/org/dkpro/jwpl/api/util/GraphSerializationTest.java
@@ -15,7 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package de.tudarmstadt.ukp.wikipedia.api.util;
+package org.dkpro.jwpl.api.util;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.fail;
@@ -23,7 +23,11 @@
import java.io.File;
-import de.tudarmstadt.ukp.wikipedia.api.*;
+import org.dkpro.jwpl.api.BaseJWPLTest;
+import org.dkpro.jwpl.api.CategoryGraph;
+import org.dkpro.jwpl.api.CategoryGraphManager;
+import org.dkpro.jwpl.api.DatabaseConfiguration;
+import org.dkpro.jwpl.api.Wikipedia;
import org.jgrapht.graph.DefaultDirectedGraph;
import org.jgrapht.graph.DefaultEdge;
import org.junit.After;
diff --git a/de.tudarmstadt.ukp.wikipedia.api/src/test/resources/db/wikiapi_test.properties b/dkpro-jwpl-api/src/test/resources/db/wikiapi_test.properties
similarity index 100%
rename from de.tudarmstadt.ukp.wikipedia.api/src/test/resources/db/wikiapi_test.properties
rename to dkpro-jwpl-api/src/test/resources/db/wikiapi_test.properties
diff --git a/de.tudarmstadt.ukp.wikipedia.api/src/test/resources/db/wikiapi_test.script b/dkpro-jwpl-api/src/test/resources/db/wikiapi_test.script
similarity index 100%
rename from de.tudarmstadt.ukp.wikipedia.api/src/test/resources/db/wikiapi_test.script
rename to dkpro-jwpl-api/src/test/resources/db/wikiapi_test.script
diff --git a/de.tudarmstadt.ukp.wikipedia.api/src/it/resources/log4j2.xml b/dkpro-jwpl-api/src/test/resources/log4j2.xml
similarity index 87%
rename from de.tudarmstadt.ukp.wikipedia.api/src/it/resources/log4j2.xml
rename to dkpro-jwpl-api/src/test/resources/log4j2.xml
index c924a1c67..2830fa654 100644
--- a/de.tudarmstadt.ukp.wikipedia.api/src/it/resources/log4j2.xml
+++ b/dkpro-jwpl-api/src/test/resources/log4j2.xml
@@ -24,11 +24,11 @@
-
+
-
+
diff --git a/de.tudarmstadt.ukp.wikipedia.datamachine/.activate_rat-check b/dkpro-jwpl-datamachine/.activate_rat-check
similarity index 100%
rename from de.tudarmstadt.ukp.wikipedia.datamachine/.activate_rat-check
rename to dkpro-jwpl-datamachine/.activate_rat-check
diff --git a/de.tudarmstadt.ukp.wikipedia.datamachine/CHANGES b/dkpro-jwpl-datamachine/CHANGES
similarity index 100%
rename from de.tudarmstadt.ukp.wikipedia.datamachine/CHANGES
rename to dkpro-jwpl-datamachine/CHANGES
diff --git a/de.tudarmstadt.ukp.wikipedia.datamachine/LICENSE.txt b/dkpro-jwpl-datamachine/LICENSE.txt
similarity index 100%
rename from de.tudarmstadt.ukp.wikipedia.datamachine/LICENSE.txt
rename to dkpro-jwpl-datamachine/LICENSE.txt
diff --git a/de.tudarmstadt.ukp.wikipedia.datamachine/NOTICE.txt b/dkpro-jwpl-datamachine/NOTICE.txt
similarity index 70%
rename from de.tudarmstadt.ukp.wikipedia.datamachine/NOTICE.txt
rename to dkpro-jwpl-datamachine/NOTICE.txt
index 3bfddb415..0423a5aab 100644
--- a/de.tudarmstadt.ukp.wikipedia.datamachine/NOTICE.txt
+++ b/dkpro-jwpl-datamachine/NOTICE.txt
@@ -2,5 +2,5 @@ Some classes in this module are taken from third parties and may
be licensed differently, as indicated in the respective class
headers.
-de.tudarmstadt.ukp.wikipedia.datamachine.dump.xml.SimpleXmlDumpReader:
+xml.dump.datamachine.org.dkpro.jwpl.SimpleXmlDumpReader:
Copyright 2005 by Brion Vibber
\ No newline at end of file
diff --git a/de.tudarmstadt.ukp.wikipedia.datamachine/pom.xml b/dkpro-jwpl-datamachine/pom.xml
similarity index 83%
rename from de.tudarmstadt.ukp.wikipedia.datamachine/pom.xml
rename to dkpro-jwpl-datamachine/pom.xml
index b96a05f12..bc97c9035 100644
--- a/de.tudarmstadt.ukp.wikipedia.datamachine/pom.xml
+++ b/dkpro-jwpl-datamachine/pom.xml
@@ -17,22 +17,22 @@
-->
+ 4.0.0
- de.tudarmstadt.ukp.wikipedia
- de.tudarmstadt.ukp.wikipedia
+ org.dkpro.jwpl
+ dkpro-jwpl
2.0.0-SNAPSHOT
- 4.0.0
- de.tudarmstadt.ukp.wikipedia.datamachine
+ dkpro-jwpl-datamachine
DataMachine
- de.tudarmstadt.ukp.wikipedia
- de.tudarmstadt.ukp.wikipedia.wikimachine
+ org.dkpro.jwpl
+ dkpro-jwpl-wikimachine
- de.tudarmstadt.ukp.wikipedia
- de.tudarmstadt.ukp.wikipedia.mwdumper
+ org.dkpro.jwpl
+ dkpro-jwpl-mwdumper
it.unimi.dsi
@@ -68,7 +68,7 @@
- de.tudarmstadt.ukp.wikipedia.datamachine.domain.JWPLDataMachine
+ org.dkpro.jwpl.datamachine.domain.JWPLDataMachine
diff --git a/de.tudarmstadt.ukp.wikipedia.datamachine/src/main/assembly/assembly.xml b/dkpro-jwpl-datamachine/src/main/assembly/assembly.xml
similarity index 100%
rename from de.tudarmstadt.ukp.wikipedia.datamachine/src/main/assembly/assembly.xml
rename to dkpro-jwpl-datamachine/src/main/assembly/assembly.xml
diff --git a/de.tudarmstadt.ukp.wikipedia.datamachine/src/main/java/de/tudarmstadt/ukp/wikipedia/datamachine/domain/DataMachineFiles.java b/dkpro-jwpl-datamachine/src/main/java/org/dkpro/jwpl/datamachine/domain/DataMachineFiles.java
similarity index 96%
rename from de.tudarmstadt.ukp.wikipedia.datamachine/src/main/java/de/tudarmstadt/ukp/wikipedia/datamachine/domain/DataMachineFiles.java
rename to dkpro-jwpl-datamachine/src/main/java/org/dkpro/jwpl/datamachine/domain/DataMachineFiles.java
index 9682dbf77..ff29b706c 100644
--- a/de.tudarmstadt.ukp.wikipedia.datamachine/src/main/java/de/tudarmstadt/ukp/wikipedia/datamachine/domain/DataMachineFiles.java
+++ b/dkpro-jwpl-datamachine/src/main/java/org/dkpro/jwpl/datamachine/domain/DataMachineFiles.java
@@ -15,12 +15,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package de.tudarmstadt.ukp.wikipedia.datamachine.domain;
+package org.dkpro.jwpl.datamachine.domain;
import java.io.File;
-import de.tudarmstadt.ukp.wikipedia.wikimachine.debug.ILogger;
-import de.tudarmstadt.ukp.wikipedia.wikimachine.domain.Files;
+import org.dkpro.jwpl.wikimachine.debug.ILogger;
+import org.dkpro.jwpl.wikimachine.domain.Files;
public class DataMachineFiles extends Files {
private final static String INPUT_PAGELINKS = "pagelinks.sql";
@@ -166,7 +166,7 @@ public boolean isCompressGeneratedFiles() {
* For UKP-Developers: you can save much more disk space if you'll parse the
* page-articles XML Dump every time you need it: during processPage(),
* processRevision() and processText(). See TimeMachine solution especially
- * the package de.tudarmstadt.ukp.wikipedia.timemachine.dump.xml
+ * the package org.dkpro.jwpl.timemachine.dump.xml
*
* @param compressGeneratedFiles
*/
diff --git a/de.tudarmstadt.ukp.wikipedia.datamachine/src/main/java/de/tudarmstadt/ukp/wikipedia/datamachine/domain/DataMachineGenerator.java b/dkpro-jwpl-datamachine/src/main/java/org/dkpro/jwpl/datamachine/domain/DataMachineGenerator.java
similarity index 83%
rename from de.tudarmstadt.ukp.wikipedia.datamachine/src/main/java/de/tudarmstadt/ukp/wikipedia/datamachine/domain/DataMachineGenerator.java
rename to dkpro-jwpl-datamachine/src/main/java/org/dkpro/jwpl/datamachine/domain/DataMachineGenerator.java
index d64af5f76..16d4e049d 100644
--- a/de.tudarmstadt.ukp.wikipedia.datamachine/src/main/java/de/tudarmstadt/ukp/wikipedia/datamachine/domain/DataMachineGenerator.java
+++ b/dkpro-jwpl-datamachine/src/main/java/org/dkpro/jwpl/datamachine/domain/DataMachineGenerator.java
@@ -15,23 +15,23 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package de.tudarmstadt.ukp.wikipedia.datamachine.domain;
+package org.dkpro.jwpl.datamachine.domain;
import java.io.IOException;
-import de.tudarmstadt.ukp.wikipedia.datamachine.dump.xml.XML2Binary;
-import de.tudarmstadt.ukp.wikipedia.wikimachine.domain.AbstractSnapshotGenerator;
-import de.tudarmstadt.ukp.wikipedia.wikimachine.domain.Files;
-import de.tudarmstadt.ukp.wikipedia.wikimachine.domain.MetaData;
-import de.tudarmstadt.ukp.wikipedia.wikimachine.dump.sql.CategorylinksParser;
-import de.tudarmstadt.ukp.wikipedia.wikimachine.dump.sql.PagelinksParser;
-import de.tudarmstadt.ukp.wikipedia.wikimachine.dump.version.IDumpVersion;
-import de.tudarmstadt.ukp.wikipedia.wikimachine.dump.xml.DumpTableEnum;
-import de.tudarmstadt.ukp.wikipedia.wikimachine.dump.xml.DumpTableInputStream;
-import de.tudarmstadt.ukp.wikipedia.wikimachine.dump.xml.PageParser;
-import de.tudarmstadt.ukp.wikipedia.wikimachine.dump.xml.RevisionParser;
-import de.tudarmstadt.ukp.wikipedia.wikimachine.dump.xml.TextParser;
-import de.tudarmstadt.ukp.wikipedia.wikimachine.factory.IEnvironmentFactory;
+import org.dkpro.jwpl.datamachine.dump.xml.XML2Binary;
+import org.dkpro.jwpl.wikimachine.domain.AbstractSnapshotGenerator;
+import org.dkpro.jwpl.wikimachine.domain.Files;
+import org.dkpro.jwpl.wikimachine.domain.MetaData;
+import org.dkpro.jwpl.wikimachine.dump.sql.CategorylinksParser;
+import org.dkpro.jwpl.wikimachine.dump.sql.PagelinksParser;
+import org.dkpro.jwpl.wikimachine.dump.version.IDumpVersion;
+import org.dkpro.jwpl.wikimachine.dump.xml.DumpTableEnum;
+import org.dkpro.jwpl.wikimachine.dump.xml.DumpTableInputStream;
+import org.dkpro.jwpl.wikimachine.dump.xml.PageParser;
+import org.dkpro.jwpl.wikimachine.dump.xml.RevisionParser;
+import org.dkpro.jwpl.wikimachine.dump.xml.TextParser;
+import org.dkpro.jwpl.wikimachine.factory.IEnvironmentFactory;
/**
* Transforms a database from mediawiki format to JWPL format.
diff --git a/de.tudarmstadt.ukp.wikipedia.datamachine/src/main/java/de/tudarmstadt/ukp/wikipedia/datamachine/domain/JWPLDataMachine.java b/dkpro-jwpl-datamachine/src/main/java/org/dkpro/jwpl/datamachine/domain/JWPLDataMachine.java
similarity index 87%
rename from de.tudarmstadt.ukp.wikipedia.datamachine/src/main/java/de/tudarmstadt/ukp/wikipedia/datamachine/domain/JWPLDataMachine.java
rename to dkpro-jwpl-datamachine/src/main/java/org/dkpro/jwpl/datamachine/domain/JWPLDataMachine.java
index de5348985..ba6fe7c15 100644
--- a/de.tudarmstadt.ukp.wikipedia.datamachine/src/main/java/de/tudarmstadt/ukp/wikipedia/datamachine/domain/JWPLDataMachine.java
+++ b/dkpro-jwpl-datamachine/src/main/java/org/dkpro/jwpl/datamachine/domain/JWPLDataMachine.java
@@ -15,13 +15,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package de.tudarmstadt.ukp.wikipedia.datamachine.domain;
+package org.dkpro.jwpl.datamachine.domain;
-import de.tudarmstadt.ukp.wikipedia.wikimachine.debug.ILogger;
-import de.tudarmstadt.ukp.wikipedia.wikimachine.domain.Configuration;
-import de.tudarmstadt.ukp.wikipedia.wikimachine.domain.ISnapshotGenerator;
-import de.tudarmstadt.ukp.wikipedia.wikimachine.factory.IEnvironmentFactory;
-import de.tudarmstadt.ukp.wikipedia.wikimachine.factory.SpringFactory;
+import org.dkpro.jwpl.wikimachine.debug.ILogger;
+import org.dkpro.jwpl.wikimachine.domain.Configuration;
+import org.dkpro.jwpl.wikimachine.domain.ISnapshotGenerator;
+import org.dkpro.jwpl.wikimachine.factory.IEnvironmentFactory;
+import org.dkpro.jwpl.wikimachine.factory.SpringFactory;
/**
* Starts the transformation from Mediawiki dump format to JWPL dump format.
diff --git a/de.tudarmstadt.ukp.wikipedia.datamachine/src/main/java/de/tudarmstadt/ukp/wikipedia/datamachine/dump/version/SingleDumpVersionJDKGeneric.java b/dkpro-jwpl-datamachine/src/main/java/org/dkpro/jwpl/datamachine/dump/version/SingleDumpVersionJDKGeneric.java
similarity index 92%
rename from de.tudarmstadt.ukp.wikipedia.datamachine/src/main/java/de/tudarmstadt/ukp/wikipedia/datamachine/dump/version/SingleDumpVersionJDKGeneric.java
rename to dkpro-jwpl-datamachine/src/main/java/org/dkpro/jwpl/datamachine/dump/version/SingleDumpVersionJDKGeneric.java
index a6fd2b5ee..825fc0785 100644
--- a/de.tudarmstadt.ukp.wikipedia.datamachine/src/main/java/de/tudarmstadt/ukp/wikipedia/datamachine/dump/version/SingleDumpVersionJDKGeneric.java
+++ b/dkpro-jwpl-datamachine/src/main/java/org/dkpro/jwpl/datamachine/dump/version/SingleDumpVersionJDKGeneric.java
@@ -15,7 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package de.tudarmstadt.ukp.wikipedia.datamachine.dump.version;
+package org.dkpro.jwpl.datamachine.dump.version;
import java.io.IOException;
import java.sql.Timestamp;
@@ -24,15 +24,15 @@
import java.util.Map;
import java.util.Set;
-import de.tudarmstadt.ukp.wikipedia.wikimachine.dump.sql.CategorylinksParser;
-import de.tudarmstadt.ukp.wikipedia.wikimachine.dump.sql.PagelinksParser;
-import de.tudarmstadt.ukp.wikipedia.wikimachine.dump.version.AbstractDumpVersion;
-import de.tudarmstadt.ukp.wikipedia.wikimachine.dump.xml.PageParser;
-import de.tudarmstadt.ukp.wikipedia.wikimachine.dump.xml.RevisionParser;
-import de.tudarmstadt.ukp.wikipedia.wikimachine.dump.xml.TextParser;
-import de.tudarmstadt.ukp.wikipedia.wikimachine.hashing.IStringHashCode;
-import de.tudarmstadt.ukp.wikipedia.wikimachine.util.Redirects;
-import de.tudarmstadt.ukp.wikipedia.wikimachine.util.TxtFileWriter;
+import org.dkpro.jwpl.wikimachine.dump.sql.CategorylinksParser;
+import org.dkpro.jwpl.wikimachine.dump.sql.PagelinksParser;
+import org.dkpro.jwpl.wikimachine.dump.version.AbstractDumpVersion;
+import org.dkpro.jwpl.wikimachine.dump.xml.PageParser;
+import org.dkpro.jwpl.wikimachine.dump.xml.RevisionParser;
+import org.dkpro.jwpl.wikimachine.dump.xml.TextParser;
+import org.dkpro.jwpl.wikimachine.hashing.IStringHashCode;
+import org.dkpro.jwpl.wikimachine.util.Redirects;
+import org.dkpro.jwpl.wikimachine.util.TxtFileWriter;
public class SingleDumpVersionJDKGeneric
extends AbstractDumpVersion {
diff --git a/de.tudarmstadt.ukp.wikipedia.datamachine/src/main/java/de/tudarmstadt/ukp/wikipedia/datamachine/dump/version/SingleDumpVersionJDKIntKeyFactory.java b/dkpro-jwpl-datamachine/src/main/java/org/dkpro/jwpl/datamachine/dump/version/SingleDumpVersionJDKIntKeyFactory.java
similarity index 79%
rename from de.tudarmstadt.ukp.wikipedia.datamachine/src/main/java/de/tudarmstadt/ukp/wikipedia/datamachine/dump/version/SingleDumpVersionJDKIntKeyFactory.java
rename to dkpro-jwpl-datamachine/src/main/java/org/dkpro/jwpl/datamachine/dump/version/SingleDumpVersionJDKIntKeyFactory.java
index b90344288..0ad13323a 100644
--- a/de.tudarmstadt.ukp.wikipedia.datamachine/src/main/java/de/tudarmstadt/ukp/wikipedia/datamachine/dump/version/SingleDumpVersionJDKIntKeyFactory.java
+++ b/dkpro-jwpl-datamachine/src/main/java/org/dkpro/jwpl/datamachine/dump/version/SingleDumpVersionJDKIntKeyFactory.java
@@ -15,11 +15,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package de.tudarmstadt.ukp.wikipedia.datamachine.dump.version;
+package org.dkpro.jwpl.datamachine.dump.version;
-import de.tudarmstadt.ukp.wikipedia.wikimachine.dump.version.IDumpVersion;
-import de.tudarmstadt.ukp.wikipedia.wikimachine.dump.version.IDumpVersionFactory;
-import de.tudarmstadt.ukp.wikipedia.wikimachine.hashing.StringHashCodeJDK;
+import org.dkpro.jwpl.wikimachine.dump.version.IDumpVersion;
+import org.dkpro.jwpl.wikimachine.dump.version.IDumpVersionFactory;
+import org.dkpro.jwpl.wikimachine.hashing.StringHashCodeJDK;
public class SingleDumpVersionJDKIntKeyFactory implements IDumpVersionFactory {
diff --git a/de.tudarmstadt.ukp.wikipedia.datamachine/src/main/java/de/tudarmstadt/ukp/wikipedia/datamachine/dump/version/SingleDumpVersionJDKLongKeyFactory.java b/dkpro-jwpl-datamachine/src/main/java/org/dkpro/jwpl/datamachine/dump/version/SingleDumpVersionJDKLongKeyFactory.java
similarity index 79%
rename from de.tudarmstadt.ukp.wikipedia.datamachine/src/main/java/de/tudarmstadt/ukp/wikipedia/datamachine/dump/version/SingleDumpVersionJDKLongKeyFactory.java
rename to dkpro-jwpl-datamachine/src/main/java/org/dkpro/jwpl/datamachine/dump/version/SingleDumpVersionJDKLongKeyFactory.java
index 48ac52e2c..5ff8e824b 100644
--- a/de.tudarmstadt.ukp.wikipedia.datamachine/src/main/java/de/tudarmstadt/ukp/wikipedia/datamachine/dump/version/SingleDumpVersionJDKLongKeyFactory.java
+++ b/dkpro-jwpl-datamachine/src/main/java/org/dkpro/jwpl/datamachine/dump/version/SingleDumpVersionJDKLongKeyFactory.java
@@ -15,11 +15,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package de.tudarmstadt.ukp.wikipedia.datamachine.dump.version;
+package org.dkpro.jwpl.datamachine.dump.version;
-import de.tudarmstadt.ukp.wikipedia.wikimachine.dump.version.IDumpVersion;
-import de.tudarmstadt.ukp.wikipedia.wikimachine.dump.version.IDumpVersionFactory;
-import de.tudarmstadt.ukp.wikipedia.wikimachine.hashing.StringHashCodeJBoss;
+import org.dkpro.jwpl.wikimachine.dump.version.IDumpVersion;
+import org.dkpro.jwpl.wikimachine.dump.version.IDumpVersionFactory;
+import org.dkpro.jwpl.wikimachine.hashing.StringHashCodeJBoss;
public class SingleDumpVersionJDKLongKeyFactory implements IDumpVersionFactory {
diff --git a/de.tudarmstadt.ukp.wikipedia.datamachine/src/main/java/de/tudarmstadt/ukp/wikipedia/datamachine/dump/version/SingleDumpVersionJDKStringKeyFactory.java b/dkpro-jwpl-datamachine/src/main/java/org/dkpro/jwpl/datamachine/dump/version/SingleDumpVersionJDKStringKeyFactory.java
similarity index 79%
rename from de.tudarmstadt.ukp.wikipedia.datamachine/src/main/java/de/tudarmstadt/ukp/wikipedia/datamachine/dump/version/SingleDumpVersionJDKStringKeyFactory.java
rename to dkpro-jwpl-datamachine/src/main/java/org/dkpro/jwpl/datamachine/dump/version/SingleDumpVersionJDKStringKeyFactory.java
index 13a7ac2bc..0bda563d6 100644
--- a/de.tudarmstadt.ukp.wikipedia.datamachine/src/main/java/de/tudarmstadt/ukp/wikipedia/datamachine/dump/version/SingleDumpVersionJDKStringKeyFactory.java
+++ b/dkpro-jwpl-datamachine/src/main/java/org/dkpro/jwpl/datamachine/dump/version/SingleDumpVersionJDKStringKeyFactory.java
@@ -15,11 +15,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package de.tudarmstadt.ukp.wikipedia.datamachine.dump.version;
+package org.dkpro.jwpl.datamachine.dump.version;
-import de.tudarmstadt.ukp.wikipedia.wikimachine.dump.version.IDumpVersion;
-import de.tudarmstadt.ukp.wikipedia.wikimachine.dump.version.IDumpVersionFactory;
-import de.tudarmstadt.ukp.wikipedia.wikimachine.hashing.StringHashCodeDisabled;
+import org.dkpro.jwpl.wikimachine.dump.version.IDumpVersion;
+import org.dkpro.jwpl.wikimachine.dump.version.IDumpVersionFactory;
+import org.dkpro.jwpl.wikimachine.hashing.StringHashCodeDisabled;
public class SingleDumpVersionJDKStringKeyFactory implements
IDumpVersionFactory {
diff --git a/de.tudarmstadt.ukp.wikipedia.datamachine/src/main/java/de/tudarmstadt/ukp/wikipedia/datamachine/dump/version/SingleDumpVersionOriginal.java b/dkpro-jwpl-datamachine/src/main/java/org/dkpro/jwpl/datamachine/dump/version/SingleDumpVersionOriginal.java
similarity index 92%
rename from de.tudarmstadt.ukp.wikipedia.datamachine/src/main/java/de/tudarmstadt/ukp/wikipedia/datamachine/dump/version/SingleDumpVersionOriginal.java
rename to dkpro-jwpl-datamachine/src/main/java/org/dkpro/jwpl/datamachine/dump/version/SingleDumpVersionOriginal.java
index be9b24994..87d316d7e 100644
--- a/de.tudarmstadt.ukp.wikipedia.datamachine/src/main/java/de/tudarmstadt/ukp/wikipedia/datamachine/dump/version/SingleDumpVersionOriginal.java
+++ b/dkpro-jwpl-datamachine/src/main/java/org/dkpro/jwpl/datamachine/dump/version/SingleDumpVersionOriginal.java
@@ -15,27 +15,25 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package de.tudarmstadt.ukp.wikipedia.datamachine.dump.version;
+package org.dkpro.jwpl.datamachine.dump.version;
import java.io.File;
import java.io.IOException;
import java.sql.Timestamp;
import java.util.HashMap;
-import java.util.HashSet;
import java.util.Map;
-import java.util.Set;
-
-import de.tudarmstadt.ukp.wikipedia.wikimachine.debug.ILogger;
-import de.tudarmstadt.ukp.wikipedia.wikimachine.domain.Files;
-import de.tudarmstadt.ukp.wikipedia.wikimachine.domain.MetaData;
-import de.tudarmstadt.ukp.wikipedia.wikimachine.dump.sql.CategorylinksParser;
-import de.tudarmstadt.ukp.wikipedia.wikimachine.dump.sql.PagelinksParser;
-import de.tudarmstadt.ukp.wikipedia.wikimachine.dump.version.IDumpVersion;
-import de.tudarmstadt.ukp.wikipedia.wikimachine.dump.xml.PageParser;
-import de.tudarmstadt.ukp.wikipedia.wikimachine.dump.xml.RevisionParser;
-import de.tudarmstadt.ukp.wikipedia.wikimachine.dump.xml.TextParser;
-import de.tudarmstadt.ukp.wikipedia.wikimachine.util.Redirects;
-import de.tudarmstadt.ukp.wikipedia.wikimachine.util.TxtFileWriter;
+
+import org.dkpro.jwpl.wikimachine.debug.ILogger;
+import org.dkpro.jwpl.wikimachine.domain.Files;
+import org.dkpro.jwpl.wikimachine.domain.MetaData;
+import org.dkpro.jwpl.wikimachine.dump.sql.CategorylinksParser;
+import org.dkpro.jwpl.wikimachine.dump.sql.PagelinksParser;
+import org.dkpro.jwpl.wikimachine.dump.version.IDumpVersion;
+import org.dkpro.jwpl.wikimachine.dump.xml.PageParser;
+import org.dkpro.jwpl.wikimachine.dump.xml.RevisionParser;
+import org.dkpro.jwpl.wikimachine.dump.xml.TextParser;
+import org.dkpro.jwpl.wikimachine.util.Redirects;
+import org.dkpro.jwpl.wikimachine.util.TxtFileWriter;
import it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap;
import it.unimi.dsi.fastutil.ints.IntArraySet;
import it.unimi.dsi.fastutil.ints.IntSet;
diff --git a/de.tudarmstadt.ukp.wikipedia.datamachine/src/main/java/de/tudarmstadt/ukp/wikipedia/datamachine/dump/xml/BinaryDumpTableInputStream.java b/dkpro-jwpl-datamachine/src/main/java/org/dkpro/jwpl/datamachine/dump/xml/BinaryDumpTableInputStream.java
similarity index 85%
rename from de.tudarmstadt.ukp.wikipedia.datamachine/src/main/java/de/tudarmstadt/ukp/wikipedia/datamachine/dump/xml/BinaryDumpTableInputStream.java
rename to dkpro-jwpl-datamachine/src/main/java/org/dkpro/jwpl/datamachine/dump/xml/BinaryDumpTableInputStream.java
index 7ecd05a4e..d006f1102 100644
--- a/de.tudarmstadt.ukp.wikipedia.datamachine/src/main/java/de/tudarmstadt/ukp/wikipedia/datamachine/dump/xml/BinaryDumpTableInputStream.java
+++ b/dkpro-jwpl-datamachine/src/main/java/org/dkpro/jwpl/datamachine/dump/xml/BinaryDumpTableInputStream.java
@@ -15,13 +15,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package de.tudarmstadt.ukp.wikipedia.datamachine.dump.xml;
+package org.dkpro.jwpl.datamachine.dump.xml;
import java.io.IOException;
import java.io.InputStream;
-import de.tudarmstadt.ukp.wikipedia.wikimachine.dump.xml.DumpTableEnum;
-import de.tudarmstadt.ukp.wikipedia.wikimachine.dump.xml.DumpTableInputStream;
+import org.dkpro.jwpl.wikimachine.dump.xml.DumpTableEnum;
+import org.dkpro.jwpl.wikimachine.dump.xml.DumpTableInputStream;
public class BinaryDumpTableInputStream extends DumpTableInputStream {
diff --git a/de.tudarmstadt.ukp.wikipedia.datamachine/src/main/java/de/tudarmstadt/ukp/wikipedia/datamachine/dump/xml/DataMachineRevisionParser.java b/dkpro-jwpl-datamachine/src/main/java/org/dkpro/jwpl/datamachine/dump/xml/DataMachineRevisionParser.java
similarity index 89%
rename from de.tudarmstadt.ukp.wikipedia.datamachine/src/main/java/de/tudarmstadt/ukp/wikipedia/datamachine/dump/xml/DataMachineRevisionParser.java
rename to dkpro-jwpl-datamachine/src/main/java/org/dkpro/jwpl/datamachine/dump/xml/DataMachineRevisionParser.java
index ff8097140..790132d4e 100755
--- a/de.tudarmstadt.ukp.wikipedia.datamachine/src/main/java/de/tudarmstadt/ukp/wikipedia/datamachine/dump/xml/DataMachineRevisionParser.java
+++ b/dkpro-jwpl-datamachine/src/main/java/org/dkpro/jwpl/datamachine/dump/xml/DataMachineRevisionParser.java
@@ -15,12 +15,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package de.tudarmstadt.ukp.wikipedia.datamachine.dump.xml;
+package org.dkpro.jwpl.datamachine.dump.xml;
import java.io.EOFException;
import java.io.IOException;
-import de.tudarmstadt.ukp.wikipedia.wikimachine.dump.xml.RevisionParser;
+import org.dkpro.jwpl.wikimachine.dump.xml.RevisionParser;
public class DataMachineRevisionParser extends RevisionParser {
diff --git a/de.tudarmstadt.ukp.wikipedia.datamachine/src/main/java/de/tudarmstadt/ukp/wikipedia/datamachine/dump/xml/SimpleBinaryDumpWriter.java b/dkpro-jwpl-datamachine/src/main/java/org/dkpro/jwpl/datamachine/dump/xml/SimpleBinaryDumpWriter.java
similarity index 86%
rename from de.tudarmstadt.ukp.wikipedia.datamachine/src/main/java/de/tudarmstadt/ukp/wikipedia/datamachine/dump/xml/SimpleBinaryDumpWriter.java
rename to dkpro-jwpl-datamachine/src/main/java/org/dkpro/jwpl/datamachine/dump/xml/SimpleBinaryDumpWriter.java
index 1eed02ce9..6526c6049 100644
--- a/de.tudarmstadt.ukp.wikipedia.datamachine/src/main/java/de/tudarmstadt/ukp/wikipedia/datamachine/dump/xml/SimpleBinaryDumpWriter.java
+++ b/dkpro-jwpl-datamachine/src/main/java/org/dkpro/jwpl/datamachine/dump/xml/SimpleBinaryDumpWriter.java
@@ -15,7 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package de.tudarmstadt.ukp.wikipedia.datamachine.dump.xml;
+package org.dkpro.jwpl.datamachine.dump.xml;
import java.io.BufferedOutputStream;
import java.io.IOException;
@@ -25,15 +25,15 @@
import java.nio.file.Paths;
import java.util.zip.GZIPOutputStream;
-import de.tudarmstadt.ukp.wikipedia.datamachine.domain.DataMachineFiles;
-import de.tudarmstadt.ukp.wikipedia.datamachine.file.DeleteFilesAtShutdown;
-import de.tudarmstadt.ukp.wikipedia.mwdumper.importer.DumpWriter;
-import de.tudarmstadt.ukp.wikipedia.mwdumper.importer.Page;
-import de.tudarmstadt.ukp.wikipedia.mwdumper.importer.Revision;
-import de.tudarmstadt.ukp.wikipedia.mwdumper.importer.Siteinfo;
-import de.tudarmstadt.ukp.wikipedia.wikimachine.dump.sql.SQLEscape;
-import de.tudarmstadt.ukp.wikipedia.wikimachine.util.Redirects;
-import de.tudarmstadt.ukp.wikipedia.wikimachine.util.UTFDataOutputStream;
+import org.dkpro.jwpl.datamachine.domain.DataMachineFiles;
+import org.dkpro.jwpl.datamachine.file.DeleteFilesAtShutdown;
+import org.dkpro.jwpl.mwdumper.importer.DumpWriter;
+import org.dkpro.jwpl.mwdumper.importer.Page;
+import org.dkpro.jwpl.mwdumper.importer.Revision;
+import org.dkpro.jwpl.mwdumper.importer.Siteinfo;
+import org.dkpro.jwpl.wikimachine.dump.sql.SQLEscape;
+import org.dkpro.jwpl.wikimachine.util.Redirects;
+import org.dkpro.jwpl.wikimachine.util.UTFDataOutputStream;
public class SimpleBinaryDumpWriter implements DumpWriter {
diff --git a/de.tudarmstadt.ukp.wikipedia.datamachine/src/main/java/de/tudarmstadt/ukp/wikipedia/datamachine/dump/xml/SimpleXmlDumpReader.java b/dkpro-jwpl-datamachine/src/main/java/org/dkpro/jwpl/datamachine/dump/xml/SimpleXmlDumpReader.java
similarity index 92%
rename from de.tudarmstadt.ukp.wikipedia.datamachine/src/main/java/de/tudarmstadt/ukp/wikipedia/datamachine/dump/xml/SimpleXmlDumpReader.java
rename to dkpro-jwpl-datamachine/src/main/java/org/dkpro/jwpl/datamachine/dump/xml/SimpleXmlDumpReader.java
index 4711192d5..97dd92324 100644
--- a/de.tudarmstadt.ukp.wikipedia.datamachine/src/main/java/de/tudarmstadt/ukp/wikipedia/datamachine/dump/xml/SimpleXmlDumpReader.java
+++ b/dkpro-jwpl-datamachine/src/main/java/org/dkpro/jwpl/datamachine/dump/xml/SimpleXmlDumpReader.java
@@ -22,12 +22,12 @@
*
* $Id$
*******************************************************************************/
-package de.tudarmstadt.ukp.wikipedia.datamachine.dump.xml;
+package org.dkpro.jwpl.datamachine.dump.xml;
import java.io.InputStream;
-import de.tudarmstadt.ukp.wikipedia.mwdumper.importer.DumpWriter;
-import de.tudarmstadt.ukp.wikipedia.wikimachine.dump.xml.AbstractXmlDumpReader;
+import org.dkpro.jwpl.mwdumper.importer.DumpWriter;
+import org.dkpro.jwpl.wikimachine.dump.xml.AbstractXmlDumpReader;
/**
* This class is a specified variant of XmlDumpReader. Please see its source for more
diff --git a/de.tudarmstadt.ukp.wikipedia.datamachine/src/main/java/de/tudarmstadt/ukp/wikipedia/datamachine/dump/xml/XML2Binary.java b/dkpro-jwpl-datamachine/src/main/java/org/dkpro/jwpl/datamachine/dump/xml/XML2Binary.java
similarity index 86%
rename from de.tudarmstadt.ukp.wikipedia.datamachine/src/main/java/de/tudarmstadt/ukp/wikipedia/datamachine/dump/xml/XML2Binary.java
rename to dkpro-jwpl-datamachine/src/main/java/org/dkpro/jwpl/datamachine/dump/xml/XML2Binary.java
index f1ca25386..20f8a4a7b 100644
--- a/de.tudarmstadt.ukp.wikipedia.datamachine/src/main/java/de/tudarmstadt/ukp/wikipedia/datamachine/dump/xml/XML2Binary.java
+++ b/dkpro-jwpl-datamachine/src/main/java/org/dkpro/jwpl/datamachine/dump/xml/XML2Binary.java
@@ -15,14 +15,14 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package de.tudarmstadt.ukp.wikipedia.datamachine.dump.xml;
+package org.dkpro.jwpl.datamachine.dump.xml;
import java.io.IOException;
import java.io.InputStream;
-import de.tudarmstadt.ukp.wikipedia.datamachine.domain.DataMachineFiles;
-import de.tudarmstadt.ukp.wikipedia.mwdumper.importer.NamespaceFilter;
-import de.tudarmstadt.ukp.wikipedia.mwdumper.importer.XmlDumpReader;
+import org.dkpro.jwpl.datamachine.domain.DataMachineFiles;
+import org.dkpro.jwpl.mwdumper.importer.NamespaceFilter;
+import org.dkpro.jwpl.mwdumper.importer.XmlDumpReader;
/**
*
diff --git a/de.tudarmstadt.ukp.wikipedia.datamachine/src/main/java/de/tudarmstadt/ukp/wikipedia/datamachine/file/DeleteFilesAtShutdown.java b/dkpro-jwpl-datamachine/src/main/java/org/dkpro/jwpl/datamachine/file/DeleteFilesAtShutdown.java
similarity index 97%
rename from de.tudarmstadt.ukp.wikipedia.datamachine/src/main/java/de/tudarmstadt/ukp/wikipedia/datamachine/file/DeleteFilesAtShutdown.java
rename to dkpro-jwpl-datamachine/src/main/java/org/dkpro/jwpl/datamachine/file/DeleteFilesAtShutdown.java
index 4c08fc656..276160cc2 100644
--- a/de.tudarmstadt.ukp.wikipedia.datamachine/src/main/java/de/tudarmstadt/ukp/wikipedia/datamachine/file/DeleteFilesAtShutdown.java
+++ b/dkpro-jwpl-datamachine/src/main/java/org/dkpro/jwpl/datamachine/file/DeleteFilesAtShutdown.java
@@ -15,7 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package de.tudarmstadt.ukp.wikipedia.datamachine.file;
+package org.dkpro.jwpl.datamachine.file;
import java.io.IOException;
import java.nio.file.Files;
diff --git a/dkpro-jwpl-datamachine/src/main/resources/context/applicationContext.xml b/dkpro-jwpl-datamachine/src/main/resources/context/applicationContext.xml
new file mode 100644
index 000000000..9941cac93
--- /dev/null
+++ b/dkpro-jwpl-datamachine/src/main/resources/context/applicationContext.xml
@@ -0,0 +1,139 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/de.tudarmstadt.ukp.wikipedia.revisionmachine/src/main/java/de/tudarmstadt/ukp/wikipedia/revisionmachine/difftool/consumer/article/reader/InputFactory.java b/dkpro-jwpl-revisionmachine/src/main/java/org/dkpro/jwpl/revisionmachine/difftool/consumer/article/reader/InputFactory.java
similarity index 87%
rename from de.tudarmstadt.ukp.wikipedia.revisionmachine/src/main/java/de/tudarmstadt/ukp/wikipedia/revisionmachine/difftool/consumer/article/reader/InputFactory.java
rename to dkpro-jwpl-revisionmachine/src/main/java/org/dkpro/jwpl/revisionmachine/difftool/consumer/article/reader/InputFactory.java
index e56c24e0c..894e69a8f 100644
--- a/de.tudarmstadt.ukp.wikipedia.revisionmachine/src/main/java/de/tudarmstadt/ukp/wikipedia/revisionmachine/difftool/consumer/article/reader/InputFactory.java
+++ b/dkpro-jwpl-revisionmachine/src/main/java/org/dkpro/jwpl/revisionmachine/difftool/consumer/article/reader/InputFactory.java
@@ -15,7 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package de.tudarmstadt.ukp.wikipedia.revisionmachine.difftool.consumer.article.reader;
+package org.dkpro.jwpl.revisionmachine.difftool.consumer.article.reader;
import java.io.BufferedInputStream;
import java.io.FileInputStream;
@@ -23,15 +23,15 @@
import java.io.InputStreamReader;
import java.io.Reader;
-import de.tudarmstadt.ukp.wikipedia.revisionmachine.archivers.Bzip2Archiver;
-import de.tudarmstadt.ukp.wikipedia.revisionmachine.common.exceptions.ArticleReaderException;
-import de.tudarmstadt.ukp.wikipedia.revisionmachine.common.exceptions.ConfigurationException;
-import de.tudarmstadt.ukp.wikipedia.revisionmachine.common.exceptions.ErrorFactory;
-import de.tudarmstadt.ukp.wikipedia.revisionmachine.common.exceptions.ErrorKeys;
-import de.tudarmstadt.ukp.wikipedia.revisionmachine.difftool.config.ConfigurationKeys;
-import de.tudarmstadt.ukp.wikipedia.revisionmachine.difftool.config.ConfigurationManager;
-import de.tudarmstadt.ukp.wikipedia.revisionmachine.difftool.consumer.article.ArticleReaderInterface;
-import de.tudarmstadt.ukp.wikipedia.revisionmachine.difftool.data.archive.ArchiveDescription;
+import org.dkpro.jwpl.revisionmachine.archivers.Bzip2Archiver;
+import org.dkpro.jwpl.revisionmachine.common.exceptions.ArticleReaderException;
+import org.dkpro.jwpl.revisionmachine.common.exceptions.ConfigurationException;
+import org.dkpro.jwpl.revisionmachine.common.exceptions.ErrorFactory;
+import org.dkpro.jwpl.revisionmachine.common.exceptions.ErrorKeys;
+import org.dkpro.jwpl.revisionmachine.difftool.config.ConfigurationKeys;
+import org.dkpro.jwpl.revisionmachine.difftool.config.ConfigurationManager;
+import org.dkpro.jwpl.revisionmachine.difftool.consumer.article.ArticleReaderInterface;
+import org.dkpro.jwpl.revisionmachine.difftool.data.archive.ArchiveDescription;
/**
* This factory class contains methods to access a input medium.
diff --git a/de.tudarmstadt.ukp.wikipedia.revisionmachine/src/main/java/de/tudarmstadt/ukp/wikipedia/revisionmachine/difftool/consumer/article/reader/TimedWikipediaXMLReader.java b/dkpro-jwpl-revisionmachine/src/main/java/org/dkpro/jwpl/revisionmachine/difftool/consumer/article/reader/TimedWikipediaXMLReader.java
similarity index 89%
rename from de.tudarmstadt.ukp.wikipedia.revisionmachine/src/main/java/de/tudarmstadt/ukp/wikipedia/revisionmachine/difftool/consumer/article/reader/TimedWikipediaXMLReader.java
rename to dkpro-jwpl-revisionmachine/src/main/java/org/dkpro/jwpl/revisionmachine/difftool/consumer/article/reader/TimedWikipediaXMLReader.java
index 13297adf8..17a941d68 100644
--- a/de.tudarmstadt.ukp.wikipedia.revisionmachine/src/main/java/de/tudarmstadt/ukp/wikipedia/revisionmachine/difftool/consumer/article/reader/TimedWikipediaXMLReader.java
+++ b/dkpro-jwpl-revisionmachine/src/main/java/org/dkpro/jwpl/revisionmachine/difftool/consumer/article/reader/TimedWikipediaXMLReader.java
@@ -15,17 +15,17 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package de.tudarmstadt.ukp.wikipedia.revisionmachine.difftool.consumer.article.reader;
+package org.dkpro.jwpl.revisionmachine.difftool.consumer.article.reader;
import java.io.IOException;
import java.io.Reader;
-import de.tudarmstadt.ukp.wikipedia.revisionmachine.api.Revision;
-import de.tudarmstadt.ukp.wikipedia.revisionmachine.common.exceptions.ArticleReaderException;
-import de.tudarmstadt.ukp.wikipedia.revisionmachine.common.exceptions.ConfigurationException;
-import de.tudarmstadt.ukp.wikipedia.revisionmachine.difftool.data.tasks.Task;
-import de.tudarmstadt.ukp.wikipedia.revisionmachine.difftool.data.tasks.TaskTypes;
-import de.tudarmstadt.ukp.wikipedia.revisionmachine.difftool.data.tasks.info.ArticleInformation;
+import org.dkpro.jwpl.revisionmachine.api.Revision;
+import org.dkpro.jwpl.revisionmachine.common.exceptions.ArticleReaderException;
+import org.dkpro.jwpl.revisionmachine.common.exceptions.ConfigurationException;
+import org.dkpro.jwpl.revisionmachine.difftool.data.tasks.Task;
+import org.dkpro.jwpl.revisionmachine.difftool.data.tasks.TaskTypes;
+import org.dkpro.jwpl.revisionmachine.difftool.data.tasks.info.ArticleInformation;
/**
* This version of the WikipediaXMLReader collects statistical information
diff --git a/de.tudarmstadt.ukp.wikipedia.revisionmachine/src/main/java/de/tudarmstadt/ukp/wikipedia/revisionmachine/difftool/consumer/article/reader/WikipediaXMLReader.java b/dkpro-jwpl-revisionmachine/src/main/java/org/dkpro/jwpl/revisionmachine/difftool/consumer/article/reader/WikipediaXMLReader.java
similarity index 93%
rename from de.tudarmstadt.ukp.wikipedia.revisionmachine/src/main/java/de/tudarmstadt/ukp/wikipedia/revisionmachine/difftool/consumer/article/reader/WikipediaXMLReader.java
rename to dkpro-jwpl-revisionmachine/src/main/java/org/dkpro/jwpl/revisionmachine/difftool/consumer/article/reader/WikipediaXMLReader.java
index d4dc7e2a2..22aac718b 100644
--- a/de.tudarmstadt.ukp.wikipedia.revisionmachine/src/main/java/de/tudarmstadt/ukp/wikipedia/revisionmachine/difftool/consumer/article/reader/WikipediaXMLReader.java
+++ b/dkpro-jwpl-revisionmachine/src/main/java/org/dkpro/jwpl/revisionmachine/difftool/consumer/article/reader/WikipediaXMLReader.java
@@ -15,7 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package de.tudarmstadt.ukp.wikipedia.revisionmachine.difftool.consumer.article.reader;
+package org.dkpro.jwpl.revisionmachine.difftool.consumer.article.reader;
import java.io.IOException;
import java.io.Reader;
@@ -33,20 +33,20 @@
import org.xml.sax.InputSource;
import org.xml.sax.SAXException;
-import de.tudarmstadt.ukp.wikipedia.revisionmachine.api.Revision;
-import de.tudarmstadt.ukp.wikipedia.revisionmachine.common.exceptions.ArticleReaderException;
-import de.tudarmstadt.ukp.wikipedia.revisionmachine.common.exceptions.ConfigurationException;
-import de.tudarmstadt.ukp.wikipedia.revisionmachine.common.exceptions.ErrorFactory;
-import de.tudarmstadt.ukp.wikipedia.revisionmachine.common.exceptions.ErrorKeys;
-import de.tudarmstadt.ukp.wikipedia.revisionmachine.common.util.SingleKeywordTree;
-import de.tudarmstadt.ukp.wikipedia.revisionmachine.common.util.WikipediaXMLKeys;
-import de.tudarmstadt.ukp.wikipedia.revisionmachine.difftool.config.ConfigurationKeys;
-import de.tudarmstadt.ukp.wikipedia.revisionmachine.difftool.config.ConfigurationManager;
-import de.tudarmstadt.ukp.wikipedia.revisionmachine.difftool.consumer.article.ArticleReaderInterface;
-import de.tudarmstadt.ukp.wikipedia.revisionmachine.difftool.consumer.dump.SQLEscape;
-import de.tudarmstadt.ukp.wikipedia.revisionmachine.difftool.data.tasks.Task;
-import de.tudarmstadt.ukp.wikipedia.revisionmachine.difftool.data.tasks.TaskTypes;
-import de.tudarmstadt.ukp.wikipedia.revisionmachine.difftool.data.tasks.info.ArticleInformation;
+import org.dkpro.jwpl.revisionmachine.api.Revision;
+import org.dkpro.jwpl.revisionmachine.common.exceptions.ArticleReaderException;
+import org.dkpro.jwpl.revisionmachine.common.exceptions.ConfigurationException;
+import org.dkpro.jwpl.revisionmachine.common.exceptions.ErrorFactory;
+import org.dkpro.jwpl.revisionmachine.common.exceptions.ErrorKeys;
+import org.dkpro.jwpl.revisionmachine.common.util.SingleKeywordTree;
+import org.dkpro.jwpl.revisionmachine.common.util.WikipediaXMLKeys;
+import org.dkpro.jwpl.revisionmachine.difftool.config.ConfigurationKeys;
+import org.dkpro.jwpl.revisionmachine.difftool.config.ConfigurationManager;
+import org.dkpro.jwpl.revisionmachine.difftool.consumer.article.ArticleReaderInterface;
+import org.dkpro.jwpl.revisionmachine.difftool.consumer.dump.SQLEscape;
+import org.dkpro.jwpl.revisionmachine.difftool.data.tasks.Task;
+import org.dkpro.jwpl.revisionmachine.difftool.data.tasks.TaskTypes;
+import org.dkpro.jwpl.revisionmachine.difftool.data.tasks.info.ArticleInformation;
/**
* This class parses the wikipedia xml format.
diff --git a/de.tudarmstadt.ukp.wikipedia.revisionmachine/src/main/java/de/tudarmstadt/ukp/wikipedia/revisionmachine/difftool/consumer/diff/DiffCalculatorInterface.java b/dkpro-jwpl-revisionmachine/src/main/java/org/dkpro/jwpl/revisionmachine/difftool/consumer/diff/DiffCalculatorInterface.java
similarity index 85%
rename from de.tudarmstadt.ukp.wikipedia.revisionmachine/src/main/java/de/tudarmstadt/ukp/wikipedia/revisionmachine/difftool/consumer/diff/DiffCalculatorInterface.java
rename to dkpro-jwpl-revisionmachine/src/main/java/org/dkpro/jwpl/revisionmachine/difftool/consumer/diff/DiffCalculatorInterface.java
index aee0427df..0af0cb27b 100644
--- a/de.tudarmstadt.ukp.wikipedia.revisionmachine/src/main/java/de/tudarmstadt/ukp/wikipedia/revisionmachine/difftool/consumer/diff/DiffCalculatorInterface.java
+++ b/dkpro-jwpl-revisionmachine/src/main/java/org/dkpro/jwpl/revisionmachine/difftool/consumer/diff/DiffCalculatorInterface.java
@@ -15,16 +15,16 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package de.tudarmstadt.ukp.wikipedia.revisionmachine.difftool.consumer.diff;
+package org.dkpro.jwpl.revisionmachine.difftool.consumer.diff;
import java.io.IOException;
import java.io.UnsupportedEncodingException;
import java.sql.SQLException;
-import de.tudarmstadt.ukp.wikipedia.revisionmachine.api.Revision;
-import de.tudarmstadt.ukp.wikipedia.revisionmachine.common.exceptions.DiffException;
-import de.tudarmstadt.ukp.wikipedia.revisionmachine.common.exceptions.TimeoutException;
-import de.tudarmstadt.ukp.wikipedia.revisionmachine.difftool.data.tasks.Task;
+import org.dkpro.jwpl.revisionmachine.api.Revision;
+import org.dkpro.jwpl.revisionmachine.common.exceptions.DiffException;
+import org.dkpro.jwpl.revisionmachine.common.exceptions.TimeoutException;
+import org.dkpro.jwpl.revisionmachine.difftool.data.tasks.Task;
/**
* The DiffCalculatorInterface represents the interface to the diff processing
diff --git a/de.tudarmstadt.ukp.wikipedia.revisionmachine/src/main/java/de/tudarmstadt/ukp/wikipedia/revisionmachine/difftool/consumer/diff/TaskTransmitterInterface.java b/dkpro-jwpl-revisionmachine/src/main/java/org/dkpro/jwpl/revisionmachine/difftool/consumer/diff/TaskTransmitterInterface.java
similarity index 85%
rename from de.tudarmstadt.ukp.wikipedia.revisionmachine/src/main/java/de/tudarmstadt/ukp/wikipedia/revisionmachine/difftool/consumer/diff/TaskTransmitterInterface.java
rename to dkpro-jwpl-revisionmachine/src/main/java/org/dkpro/jwpl/revisionmachine/difftool/consumer/diff/TaskTransmitterInterface.java
index 463047d65..5963a21d2 100644
--- a/de.tudarmstadt.ukp.wikipedia.revisionmachine/src/main/java/de/tudarmstadt/ukp/wikipedia/revisionmachine/difftool/consumer/diff/TaskTransmitterInterface.java
+++ b/dkpro-jwpl-revisionmachine/src/main/java/org/dkpro/jwpl/revisionmachine/difftool/consumer/diff/TaskTransmitterInterface.java
@@ -15,14 +15,14 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package de.tudarmstadt.ukp.wikipedia.revisionmachine.difftool.consumer.diff;
+package org.dkpro.jwpl.revisionmachine.difftool.consumer.diff;
import java.io.IOException;
import java.sql.SQLException;
-import de.tudarmstadt.ukp.wikipedia.revisionmachine.common.exceptions.TimeoutException;
-import de.tudarmstadt.ukp.wikipedia.revisionmachine.difftool.data.tasks.Task;
-import de.tudarmstadt.ukp.wikipedia.revisionmachine.difftool.data.tasks.content.Diff;
+import org.dkpro.jwpl.revisionmachine.common.exceptions.TimeoutException;
+import org.dkpro.jwpl.revisionmachine.difftool.data.tasks.Task;
+import org.dkpro.jwpl.revisionmachine.difftool.data.tasks.content.Diff;
/**
* The TaskTransmitterInterface handles the transmission of DiffTasks to the
diff --git a/de.tudarmstadt.ukp.wikipedia.revisionmachine/src/main/java/de/tudarmstadt/ukp/wikipedia/revisionmachine/difftool/consumer/diff/calculation/BlockManagement.java b/dkpro-jwpl-revisionmachine/src/main/java/org/dkpro/jwpl/revisionmachine/difftool/consumer/diff/calculation/BlockManagement.java
similarity index 91%
rename from de.tudarmstadt.ukp.wikipedia.revisionmachine/src/main/java/de/tudarmstadt/ukp/wikipedia/revisionmachine/difftool/consumer/diff/calculation/BlockManagement.java
rename to dkpro-jwpl-revisionmachine/src/main/java/org/dkpro/jwpl/revisionmachine/difftool/consumer/diff/calculation/BlockManagement.java
index 8ceeb5881..028d1db52 100644
--- a/de.tudarmstadt.ukp.wikipedia.revisionmachine/src/main/java/de/tudarmstadt/ukp/wikipedia/revisionmachine/difftool/consumer/diff/calculation/BlockManagement.java
+++ b/dkpro-jwpl-revisionmachine/src/main/java/org/dkpro/jwpl/revisionmachine/difftool/consumer/diff/calculation/BlockManagement.java
@@ -15,20 +15,20 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package de.tudarmstadt.ukp.wikipedia.revisionmachine.difftool.consumer.diff.calculation;
+package org.dkpro.jwpl.revisionmachine.difftool.consumer.diff.calculation;
import java.io.UnsupportedEncodingException;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.Map;
-import de.tudarmstadt.ukp.wikipedia.revisionmachine.common.exceptions.ConfigurationException;
-import de.tudarmstadt.ukp.wikipedia.revisionmachine.difftool.config.ConfigurationKeys;
-import de.tudarmstadt.ukp.wikipedia.revisionmachine.difftool.config.ConfigurationManager;
-import de.tudarmstadt.ukp.wikipedia.revisionmachine.difftool.data.codec.RevisionCodecData;
-import de.tudarmstadt.ukp.wikipedia.revisionmachine.difftool.data.tasks.content.Diff;
-import de.tudarmstadt.ukp.wikipedia.revisionmachine.difftool.data.tasks.content.DiffAction;
-import de.tudarmstadt.ukp.wikipedia.revisionmachine.difftool.data.tasks.content.DiffPart;
+import org.dkpro.jwpl.revisionmachine.common.exceptions.ConfigurationException;
+import org.dkpro.jwpl.revisionmachine.difftool.config.ConfigurationKeys;
+import org.dkpro.jwpl.revisionmachine.difftool.config.ConfigurationManager;
+import org.dkpro.jwpl.revisionmachine.difftool.data.codec.RevisionCodecData;
+import org.dkpro.jwpl.revisionmachine.difftool.data.tasks.content.Diff;
+import org.dkpro.jwpl.revisionmachine.difftool.data.tasks.content.DiffAction;
+import org.dkpro.jwpl.revisionmachine.difftool.data.tasks.content.DiffPart;
/**
* The BlockManagement class is used to calculate the diff operations using the
diff --git a/de.tudarmstadt.ukp.wikipedia.revisionmachine/src/main/java/de/tudarmstadt/ukp/wikipedia/revisionmachine/difftool/consumer/diff/calculation/BlockManagementInterface.java b/dkpro-jwpl-revisionmachine/src/main/java/org/dkpro/jwpl/revisionmachine/difftool/consumer/diff/calculation/BlockManagementInterface.java
similarity index 89%
rename from de.tudarmstadt.ukp.wikipedia.revisionmachine/src/main/java/de/tudarmstadt/ukp/wikipedia/revisionmachine/difftool/consumer/diff/calculation/BlockManagementInterface.java
rename to dkpro-jwpl-revisionmachine/src/main/java/org/dkpro/jwpl/revisionmachine/difftool/consumer/diff/calculation/BlockManagementInterface.java
index 76b0c285b..548009cb9 100644
--- a/de.tudarmstadt.ukp.wikipedia.revisionmachine/src/main/java/de/tudarmstadt/ukp/wikipedia/revisionmachine/difftool/consumer/diff/calculation/BlockManagementInterface.java
+++ b/dkpro-jwpl-revisionmachine/src/main/java/org/dkpro/jwpl/revisionmachine/difftool/consumer/diff/calculation/BlockManagementInterface.java
@@ -15,12 +15,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package de.tudarmstadt.ukp.wikipedia.revisionmachine.difftool.consumer.diff.calculation;
+package org.dkpro.jwpl.revisionmachine.difftool.consumer.diff.calculation;
import java.io.UnsupportedEncodingException;
import java.util.ArrayList;
-import de.tudarmstadt.ukp.wikipedia.revisionmachine.difftool.data.tasks.content.Diff;
+import org.dkpro.jwpl.revisionmachine.difftool.data.tasks.content.Diff;
/**
* Interface of the BlockManagement
diff --git a/de.tudarmstadt.ukp.wikipedia.revisionmachine/src/main/java/de/tudarmstadt/ukp/wikipedia/revisionmachine/difftool/consumer/diff/calculation/DiffBlock.java b/dkpro-jwpl-revisionmachine/src/main/java/org/dkpro/jwpl/revisionmachine/difftool/consumer/diff/calculation/DiffBlock.java
similarity index 97%
rename from de.tudarmstadt.ukp.wikipedia.revisionmachine/src/main/java/de/tudarmstadt/ukp/wikipedia/revisionmachine/difftool/consumer/diff/calculation/DiffBlock.java
rename to dkpro-jwpl-revisionmachine/src/main/java/org/dkpro/jwpl/revisionmachine/difftool/consumer/diff/calculation/DiffBlock.java
index f2df40c69..b1e683cac 100644
--- a/de.tudarmstadt.ukp.wikipedia.revisionmachine/src/main/java/de/tudarmstadt/ukp/wikipedia/revisionmachine/difftool/consumer/diff/calculation/DiffBlock.java
+++ b/dkpro-jwpl-revisionmachine/src/main/java/org/dkpro/jwpl/revisionmachine/difftool/consumer/diff/calculation/DiffBlock.java
@@ -15,7 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package de.tudarmstadt.ukp.wikipedia.revisionmachine.difftool.consumer.diff.calculation;
+package org.dkpro.jwpl.revisionmachine.difftool.consumer.diff.calculation;
/**
* Contains the information for a block. Used for the Diff Calculation.
diff --git a/de.tudarmstadt.ukp.wikipedia.revisionmachine/src/main/java/de/tudarmstadt/ukp/wikipedia/revisionmachine/difftool/consumer/diff/calculation/DiffCalculator.java b/dkpro-jwpl-revisionmachine/src/main/java/org/dkpro/jwpl/revisionmachine/difftool/consumer/diff/calculation/DiffCalculator.java
similarity index 91%
rename from de.tudarmstadt.ukp.wikipedia.revisionmachine/src/main/java/de/tudarmstadt/ukp/wikipedia/revisionmachine/difftool/consumer/diff/calculation/DiffCalculator.java
rename to dkpro-jwpl-revisionmachine/src/main/java/org/dkpro/jwpl/revisionmachine/difftool/consumer/diff/calculation/DiffCalculator.java
index a08d2fa86..e9a5fd878 100644
--- a/de.tudarmstadt.ukp.wikipedia.revisionmachine/src/main/java/de/tudarmstadt/ukp/wikipedia/revisionmachine/difftool/consumer/diff/calculation/DiffCalculator.java
+++ b/dkpro-jwpl-revisionmachine/src/main/java/org/dkpro/jwpl/revisionmachine/difftool/consumer/diff/calculation/DiffCalculator.java
@@ -15,7 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package de.tudarmstadt.ukp.wikipedia.revisionmachine.difftool.consumer.diff.calculation;
+package org.dkpro.jwpl.revisionmachine.difftool.consumer.diff.calculation;
import java.io.IOException;
import java.io.UnsupportedEncodingException;
@@ -24,25 +24,25 @@
import java.util.Collections;
import java.util.HashMap;
-import de.tudarmstadt.ukp.wikipedia.revisionmachine.api.Revision;
-import de.tudarmstadt.ukp.wikipedia.revisionmachine.common.exceptions.ConfigurationException;
-import de.tudarmstadt.ukp.wikipedia.revisionmachine.common.exceptions.DiffException;
-import de.tudarmstadt.ukp.wikipedia.revisionmachine.common.exceptions.ErrorFactory;
-import de.tudarmstadt.ukp.wikipedia.revisionmachine.common.exceptions.ErrorKeys;
-import de.tudarmstadt.ukp.wikipedia.revisionmachine.common.exceptions.TimeoutException;
-import de.tudarmstadt.ukp.wikipedia.revisionmachine.common.util.Surrogates;
-import de.tudarmstadt.ukp.wikipedia.revisionmachine.common.util.WikipediaXMLWriter;
-import de.tudarmstadt.ukp.wikipedia.revisionmachine.difftool.config.ConfigurationKeys;
-import de.tudarmstadt.ukp.wikipedia.revisionmachine.difftool.config.ConfigurationManager;
-import de.tudarmstadt.ukp.wikipedia.revisionmachine.difftool.consumer.diff.DiffCalculatorInterface;
-import de.tudarmstadt.ukp.wikipedia.revisionmachine.difftool.consumer.diff.TaskTransmitterInterface;
-import de.tudarmstadt.ukp.wikipedia.revisionmachine.difftool.data.SurrogateModes;
-import de.tudarmstadt.ukp.wikipedia.revisionmachine.difftool.data.codec.RevisionCodecData;
-import de.tudarmstadt.ukp.wikipedia.revisionmachine.difftool.data.tasks.Task;
-import de.tudarmstadt.ukp.wikipedia.revisionmachine.difftool.data.tasks.TaskTypes;
-import de.tudarmstadt.ukp.wikipedia.revisionmachine.difftool.data.tasks.content.Diff;
-import de.tudarmstadt.ukp.wikipedia.revisionmachine.difftool.data.tasks.content.DiffAction;
-import de.tudarmstadt.ukp.wikipedia.revisionmachine.difftool.data.tasks.content.DiffPart;
+import org.dkpro.jwpl.revisionmachine.api.Revision;
+import org.dkpro.jwpl.revisionmachine.common.exceptions.ConfigurationException;
+import org.dkpro.jwpl.revisionmachine.common.exceptions.DiffException;
+import org.dkpro.jwpl.revisionmachine.common.exceptions.ErrorFactory;
+import org.dkpro.jwpl.revisionmachine.common.exceptions.ErrorKeys;
+import org.dkpro.jwpl.revisionmachine.common.exceptions.TimeoutException;
+import org.dkpro.jwpl.revisionmachine.common.util.Surrogates;
+import org.dkpro.jwpl.revisionmachine.common.util.WikipediaXMLWriter;
+import org.dkpro.jwpl.revisionmachine.difftool.config.ConfigurationKeys;
+import org.dkpro.jwpl.revisionmachine.difftool.config.ConfigurationManager;
+import org.dkpro.jwpl.revisionmachine.difftool.consumer.diff.DiffCalculatorInterface;
+import org.dkpro.jwpl.revisionmachine.difftool.consumer.diff.TaskTransmitterInterface;
+import org.dkpro.jwpl.revisionmachine.difftool.data.SurrogateModes;
+import org.dkpro.jwpl.revisionmachine.difftool.data.codec.RevisionCodecData;
+import org.dkpro.jwpl.revisionmachine.difftool.data.tasks.Task;
+import org.dkpro.jwpl.revisionmachine.difftool.data.tasks.TaskTypes;
+import org.dkpro.jwpl.revisionmachine.difftool.data.tasks.content.Diff;
+import org.dkpro.jwpl.revisionmachine.difftool.data.tasks.content.DiffAction;
+import org.dkpro.jwpl.revisionmachine.difftool.data.tasks.content.DiffPart;
/**
* Calculates the Diff.
diff --git a/de.tudarmstadt.ukp.wikipedia.revisionmachine/src/main/java/de/tudarmstadt/ukp/wikipedia/revisionmachine/difftool/consumer/diff/calculation/TimedDiffCalculator.java b/dkpro-jwpl-revisionmachine/src/main/java/org/dkpro/jwpl/revisionmachine/difftool/consumer/diff/calculation/TimedDiffCalculator.java
similarity index 84%
rename from de.tudarmstadt.ukp.wikipedia.revisionmachine/src/main/java/de/tudarmstadt/ukp/wikipedia/revisionmachine/difftool/consumer/diff/calculation/TimedDiffCalculator.java
rename to dkpro-jwpl-revisionmachine/src/main/java/org/dkpro/jwpl/revisionmachine/difftool/consumer/diff/calculation/TimedDiffCalculator.java
index d3ce5d055..872e90a56 100644
--- a/de.tudarmstadt.ukp.wikipedia.revisionmachine/src/main/java/de/tudarmstadt/ukp/wikipedia/revisionmachine/difftool/consumer/diff/calculation/TimedDiffCalculator.java
+++ b/dkpro-jwpl-revisionmachine/src/main/java/org/dkpro/jwpl/revisionmachine/difftool/consumer/diff/calculation/TimedDiffCalculator.java
@@ -15,19 +15,19 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package de.tudarmstadt.ukp.wikipedia.revisionmachine.difftool.consumer.diff.calculation;
+package org.dkpro.jwpl.revisionmachine.difftool.consumer.diff.calculation;
import java.io.UnsupportedEncodingException;
-import de.tudarmstadt.ukp.wikipedia.revisionmachine.api.Revision;
-import de.tudarmstadt.ukp.wikipedia.revisionmachine.common.exceptions.ConfigurationException;
-import de.tudarmstadt.ukp.wikipedia.revisionmachine.common.exceptions.DiffException;
-import de.tudarmstadt.ukp.wikipedia.revisionmachine.common.exceptions.TimeoutException;
-import de.tudarmstadt.ukp.wikipedia.revisionmachine.difftool.consumer.diff.TaskTransmitterInterface;
-import de.tudarmstadt.ukp.wikipedia.revisionmachine.difftool.data.tasks.Task;
-import de.tudarmstadt.ukp.wikipedia.revisionmachine.difftool.data.tasks.TaskTypes;
-import de.tudarmstadt.ukp.wikipedia.revisionmachine.difftool.data.tasks.content.Diff;
-import de.tudarmstadt.ukp.wikipedia.revisionmachine.difftool.data.tasks.info.ArticleInformation;
+import org.dkpro.jwpl.revisionmachine.api.Revision;
+import org.dkpro.jwpl.revisionmachine.common.exceptions.ConfigurationException;
+import org.dkpro.jwpl.revisionmachine.common.exceptions.DiffException;
+import org.dkpro.jwpl.revisionmachine.common.exceptions.TimeoutException;
+import org.dkpro.jwpl.revisionmachine.difftool.consumer.diff.TaskTransmitterInterface;
+import org.dkpro.jwpl.revisionmachine.difftool.data.tasks.Task;
+import org.dkpro.jwpl.revisionmachine.difftool.data.tasks.TaskTypes;
+import org.dkpro.jwpl.revisionmachine.difftool.data.tasks.content.Diff;
+import org.dkpro.jwpl.revisionmachine.difftool.data.tasks.info.ArticleInformation;
/**
* Calculates the Diff while collecting statistical data.
diff --git a/de.tudarmstadt.ukp.wikipedia.revisionmachine/src/main/java/de/tudarmstadt/ukp/wikipedia/revisionmachine/difftool/consumer/dump/SQLEscape.java b/dkpro-jwpl-revisionmachine/src/main/java/org/dkpro/jwpl/revisionmachine/difftool/consumer/dump/SQLEscape.java
similarity index 96%
rename from de.tudarmstadt.ukp.wikipedia.revisionmachine/src/main/java/de/tudarmstadt/ukp/wikipedia/revisionmachine/difftool/consumer/dump/SQLEscape.java
rename to dkpro-jwpl-revisionmachine/src/main/java/org/dkpro/jwpl/revisionmachine/difftool/consumer/dump/SQLEscape.java
index e9aa4dc8b..d49979b94 100644
--- a/de.tudarmstadt.ukp.wikipedia.revisionmachine/src/main/java/de/tudarmstadt/ukp/wikipedia/revisionmachine/difftool/consumer/dump/SQLEscape.java
+++ b/dkpro-jwpl-revisionmachine/src/main/java/org/dkpro/jwpl/revisionmachine/difftool/consumer/dump/SQLEscape.java
@@ -15,7 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package de.tudarmstadt.ukp.wikipedia.revisionmachine.difftool.consumer.dump;
+package org.dkpro.jwpl.revisionmachine.difftool.consumer.dump;
/**
* The single method {@link SQLEscape#escape(String)} removes all unwished escape
diff --git a/de.tudarmstadt.ukp.wikipedia.revisionmachine/src/main/java/de/tudarmstadt/ukp/wikipedia/revisionmachine/difftool/consumer/dump/WriterInterface.java b/dkpro-jwpl-revisionmachine/src/main/java/org/dkpro/jwpl/revisionmachine/difftool/consumer/dump/WriterInterface.java
similarity index 82%
rename from de.tudarmstadt.ukp.wikipedia.revisionmachine/src/main/java/de/tudarmstadt/ukp/wikipedia/revisionmachine/difftool/consumer/dump/WriterInterface.java
rename to dkpro-jwpl-revisionmachine/src/main/java/org/dkpro/jwpl/revisionmachine/difftool/consumer/dump/WriterInterface.java
index ba1710787..3ec82caa0 100644
--- a/de.tudarmstadt.ukp.wikipedia.revisionmachine/src/main/java/de/tudarmstadt/ukp/wikipedia/revisionmachine/difftool/consumer/dump/WriterInterface.java
+++ b/dkpro-jwpl-revisionmachine/src/main/java/org/dkpro/jwpl/revisionmachine/difftool/consumer/dump/WriterInterface.java
@@ -15,15 +15,15 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package de.tudarmstadt.ukp.wikipedia.revisionmachine.difftool.consumer.dump;
+package org.dkpro.jwpl.revisionmachine.difftool.consumer.dump;
import java.io.IOException;
import java.sql.SQLException;
-import de.tudarmstadt.ukp.wikipedia.revisionmachine.common.exceptions.ConfigurationException;
-import de.tudarmstadt.ukp.wikipedia.revisionmachine.common.exceptions.SQLConsumerException;
-import de.tudarmstadt.ukp.wikipedia.revisionmachine.difftool.data.tasks.Task;
-import de.tudarmstadt.ukp.wikipedia.revisionmachine.difftool.data.tasks.content.Diff;
+import org.dkpro.jwpl.revisionmachine.common.exceptions.ConfigurationException;
+import org.dkpro.jwpl.revisionmachine.common.exceptions.SQLConsumerException;
+import org.dkpro.jwpl.revisionmachine.difftool.data.tasks.Task;
+import org.dkpro.jwpl.revisionmachine.difftool.data.tasks.content.Diff;
/**
* The WriterInterface symbolizes the link to the output writer.
diff --git a/de.tudarmstadt.ukp.wikipedia.revisionmachine/src/main/java/de/tudarmstadt/ukp/wikipedia/revisionmachine/difftool/consumer/dump/codec/DataFileEncoder.java b/dkpro-jwpl-revisionmachine/src/main/java/org/dkpro/jwpl/revisionmachine/difftool/consumer/dump/codec/DataFileEncoder.java
similarity index 81%
rename from de.tudarmstadt.ukp.wikipedia.revisionmachine/src/main/java/de/tudarmstadt/ukp/wikipedia/revisionmachine/difftool/consumer/dump/codec/DataFileEncoder.java
rename to dkpro-jwpl-revisionmachine/src/main/java/org/dkpro/jwpl/revisionmachine/difftool/consumer/dump/codec/DataFileEncoder.java
index f47a712c5..dcd20e860 100644
--- a/de.tudarmstadt.ukp.wikipedia.revisionmachine/src/main/java/de/tudarmstadt/ukp/wikipedia/revisionmachine/difftool/consumer/dump/codec/DataFileEncoder.java
+++ b/dkpro-jwpl-revisionmachine/src/main/java/org/dkpro/jwpl/revisionmachine/difftool/consumer/dump/codec/DataFileEncoder.java
@@ -15,22 +15,22 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package de.tudarmstadt.ukp.wikipedia.revisionmachine.difftool.consumer.dump.codec;
+package org.dkpro.jwpl.revisionmachine.difftool.consumer.dump.codec;
import java.io.UnsupportedEncodingException;
import java.util.ArrayList;
import java.util.List;
-import de.tudarmstadt.ukp.wikipedia.revisionmachine.common.exceptions.ConfigurationException;
-import de.tudarmstadt.ukp.wikipedia.revisionmachine.common.exceptions.DecodingException;
-import de.tudarmstadt.ukp.wikipedia.revisionmachine.common.exceptions.EncodingException;
-import de.tudarmstadt.ukp.wikipedia.revisionmachine.common.exceptions.SQLConsumerException;
-import de.tudarmstadt.ukp.wikipedia.revisionmachine.difftool.data.codec.RevisionCodecData;
-import de.tudarmstadt.ukp.wikipedia.revisionmachine.difftool.data.codec.RevisionEncoder;
-import de.tudarmstadt.ukp.wikipedia.revisionmachine.difftool.data.codec.RevisionEncoderInterface;
-import de.tudarmstadt.ukp.wikipedia.revisionmachine.difftool.data.tasks.Task;
-import de.tudarmstadt.ukp.wikipedia.revisionmachine.difftool.data.tasks.TaskTypes;
-import de.tudarmstadt.ukp.wikipedia.revisionmachine.difftool.data.tasks.content.Diff;
+import org.dkpro.jwpl.revisionmachine.common.exceptions.ConfigurationException;
+import org.dkpro.jwpl.revisionmachine.common.exceptions.DecodingException;
+import org.dkpro.jwpl.revisionmachine.common.exceptions.EncodingException;
+import org.dkpro.jwpl.revisionmachine.common.exceptions.SQLConsumerException;
+import org.dkpro.jwpl.revisionmachine.difftool.data.codec.RevisionCodecData;
+import org.dkpro.jwpl.revisionmachine.difftool.data.codec.RevisionEncoder;
+import org.dkpro.jwpl.revisionmachine.difftool.data.codec.RevisionEncoderInterface;
+import org.dkpro.jwpl.revisionmachine.difftool.data.tasks.Task;
+import org.dkpro.jwpl.revisionmachine.difftool.data.tasks.TaskTypes;
+import org.dkpro.jwpl.revisionmachine.difftool.data.tasks.content.Diff;
/**
* Alternative to the SQLEncoder - writes data files instead of UNCOMPRESSED dumps
@@ -106,7 +106,7 @@ protected String encodeDiff(final Task task, final Diff diff)
}
/* (non-Javadoc)
- * @see de.tudarmstadt.ukp.wikipedia.revisionmachine.difftool.consumer.dump.codec.SQLEncoderInterface#encodeTask(de.tudarmstadt.ukp.wikipedia.revisionmachine.difftool.data.tasks.Task)
+ * @see org.dkpro.jwpl.revisionmachine.difftool.consumer.dump.codec.SQLEncoderInterface#encodeTask(org.dkpro.jwpl.revisionmachine.difftool.data.tasks.Task)
*/
public List encodeTask(final Task task)
throws ConfigurationException, UnsupportedEncodingException,
diff --git a/de.tudarmstadt.ukp.wikipedia.revisionmachine/src/main/java/de/tudarmstadt/ukp/wikipedia/revisionmachine/difftool/consumer/dump/codec/SQLEncoder.java b/dkpro-jwpl-revisionmachine/src/main/java/org/dkpro/jwpl/revisionmachine/difftool/consumer/dump/codec/SQLEncoder.java
similarity index 85%
rename from de.tudarmstadt.ukp.wikipedia.revisionmachine/src/main/java/de/tudarmstadt/ukp/wikipedia/revisionmachine/difftool/consumer/dump/codec/SQLEncoder.java
rename to dkpro-jwpl-revisionmachine/src/main/java/org/dkpro/jwpl/revisionmachine/difftool/consumer/dump/codec/SQLEncoder.java
index 4845ecc0e..788ea10ff 100644
--- a/de.tudarmstadt.ukp.wikipedia.revisionmachine/src/main/java/de/tudarmstadt/ukp/wikipedia/revisionmachine/difftool/consumer/dump/codec/SQLEncoder.java
+++ b/dkpro-jwpl-revisionmachine/src/main/java/org/dkpro/jwpl/revisionmachine/difftool/consumer/dump/codec/SQLEncoder.java
@@ -15,33 +15,33 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package de.tudarmstadt.ukp.wikipedia.revisionmachine.difftool.consumer.dump.codec;
+package org.dkpro.jwpl.revisionmachine.difftool.consumer.dump.codec;
import java.io.IOException;
import java.io.UnsupportedEncodingException;
import java.util.ArrayList;
-import de.tudarmstadt.ukp.wikipedia.revisionmachine.common.exceptions.ConfigurationException;
-import de.tudarmstadt.ukp.wikipedia.revisionmachine.common.exceptions.DecodingException;
-import de.tudarmstadt.ukp.wikipedia.revisionmachine.common.exceptions.EncodingException;
-import de.tudarmstadt.ukp.wikipedia.revisionmachine.common.exceptions.ErrorFactory;
-import de.tudarmstadt.ukp.wikipedia.revisionmachine.common.exceptions.ErrorKeys;
-import de.tudarmstadt.ukp.wikipedia.revisionmachine.common.exceptions.LoggingException;
-import de.tudarmstadt.ukp.wikipedia.revisionmachine.common.exceptions.SQLConsumerException;
-import de.tudarmstadt.ukp.wikipedia.revisionmachine.common.logging.Logger;
-import de.tudarmstadt.ukp.wikipedia.revisionmachine.common.logging.messages.consumer.ConsumerLogMessages;
-import de.tudarmstadt.ukp.wikipedia.revisionmachine.common.util.Surrogates;
-import de.tudarmstadt.ukp.wikipedia.revisionmachine.common.util.WikipediaXMLWriter;
-import de.tudarmstadt.ukp.wikipedia.revisionmachine.difftool.config.ConfigurationKeys;
-import de.tudarmstadt.ukp.wikipedia.revisionmachine.difftool.config.ConfigurationManager;
-import de.tudarmstadt.ukp.wikipedia.revisionmachine.difftool.data.SurrogateModes;
-import de.tudarmstadt.ukp.wikipedia.revisionmachine.difftool.data.codec.RevisionCodecData;
-import de.tudarmstadt.ukp.wikipedia.revisionmachine.difftool.data.codec.RevisionDecoder;
-import de.tudarmstadt.ukp.wikipedia.revisionmachine.difftool.data.codec.RevisionEncoder;
-import de.tudarmstadt.ukp.wikipedia.revisionmachine.difftool.data.codec.RevisionEncoderInterface;
-import de.tudarmstadt.ukp.wikipedia.revisionmachine.difftool.data.tasks.Task;
-import de.tudarmstadt.ukp.wikipedia.revisionmachine.difftool.data.tasks.TaskTypes;
-import de.tudarmstadt.ukp.wikipedia.revisionmachine.difftool.data.tasks.content.Diff;
+import org.dkpro.jwpl.revisionmachine.common.exceptions.ConfigurationException;
+import org.dkpro.jwpl.revisionmachine.common.exceptions.DecodingException;
+import org.dkpro.jwpl.revisionmachine.common.exceptions.EncodingException;
+import org.dkpro.jwpl.revisionmachine.common.exceptions.ErrorFactory;
+import org.dkpro.jwpl.revisionmachine.common.exceptions.ErrorKeys;
+import org.dkpro.jwpl.revisionmachine.common.exceptions.LoggingException;
+import org.dkpro.jwpl.revisionmachine.common.exceptions.SQLConsumerException;
+import org.dkpro.jwpl.revisionmachine.common.logging.Logger;
+import org.dkpro.jwpl.revisionmachine.common.logging.messages.consumer.ConsumerLogMessages;
+import org.dkpro.jwpl.revisionmachine.common.util.Surrogates;
+import org.dkpro.jwpl.revisionmachine.common.util.WikipediaXMLWriter;
+import org.dkpro.jwpl.revisionmachine.difftool.config.ConfigurationKeys;
+import org.dkpro.jwpl.revisionmachine.difftool.config.ConfigurationManager;
+import org.dkpro.jwpl.revisionmachine.difftool.data.SurrogateModes;
+import org.dkpro.jwpl.revisionmachine.difftool.data.codec.RevisionCodecData;
+import org.dkpro.jwpl.revisionmachine.difftool.data.codec.RevisionDecoder;
+import org.dkpro.jwpl.revisionmachine.difftool.data.codec.RevisionEncoder;
+import org.dkpro.jwpl.revisionmachine.difftool.data.codec.RevisionEncoderInterface;
+import org.dkpro.jwpl.revisionmachine.difftool.data.tasks.Task;
+import org.dkpro.jwpl.revisionmachine.difftool.data.tasks.TaskTypes;
+import org.dkpro.jwpl.revisionmachine.difftool.data.tasks.content.Diff;
/**
* This creates the SQL statements
@@ -200,7 +200,7 @@ protected byte[] binaryDiff(final Task task, final Diff diff)
}
/* (non-Javadoc)
- * @see de.tudarmstadt.ukp.wikipedia.revisionmachine.difftool.consumer.dump.codec.SQLEncoderInterface#binaryTask(de.tudarmstadt.ukp.wikipedia.revisionmachine.difftool.data.tasks.Task)
+ * @see org.dkpro.jwpl.revisionmachine.difftool.consumer.dump.codec.SQLEncoderInterface#binaryTask(org.dkpro.jwpl.revisionmachine.difftool.data.tasks.Task)
*/
@Override
public SQLEncoding[] binaryTask(final Task task)
@@ -323,7 +323,7 @@ protected String encodeDiff(final Task task, final Diff diff)
}
/* (non-Javadoc)
- * @see de.tudarmstadt.ukp.wikipedia.revisionmachine.difftool.consumer.dump.codec.SQLEncoderInterface#encodeTask(de.tudarmstadt.ukp.wikipedia.revisionmachine.difftool.data.tasks.Task)
+ * @see org.dkpro.jwpl.revisionmachine.difftool.consumer.dump.codec.SQLEncoderInterface#encodeTask(org.dkpro.jwpl.revisionmachine.difftool.data.tasks.Task)
*/
@Override
public SQLEncoding[] encodeTask(final Task task)
@@ -402,7 +402,7 @@ public SQLEncoding[] encodeTask(final Task task)
}
/* (non-Javadoc)
- * @see de.tudarmstadt.ukp.wikipedia.revisionmachine.difftool.consumer.dump.codec.SQLEncoderInterface#getBinaryTable()
+ * @see org.dkpro.jwpl.revisionmachine.difftool.consumer.dump.codec.SQLEncoderInterface#getBinaryTable()
*/
@Override
public String[] getBinaryTable()
@@ -411,7 +411,7 @@ public String[] getBinaryTable()
}
/* (non-Javadoc)
- * @see de.tudarmstadt.ukp.wikipedia.revisionmachine.difftool.consumer.dump.codec.SQLEncoderInterface#getTable()
+ * @see org.dkpro.jwpl.revisionmachine.difftool.consumer.dump.codec.SQLEncoderInterface#getTable()
*/
@Override
public String[] getTable()
diff --git a/de.tudarmstadt.ukp.wikipedia.revisionmachine/src/main/java/de/tudarmstadt/ukp/wikipedia/revisionmachine/difftool/consumer/dump/codec/SQLEncoderInterface.java b/dkpro-jwpl-revisionmachine/src/main/java/org/dkpro/jwpl/revisionmachine/difftool/consumer/dump/codec/SQLEncoderInterface.java
similarity index 84%
rename from de.tudarmstadt.ukp.wikipedia.revisionmachine/src/main/java/de/tudarmstadt/ukp/wikipedia/revisionmachine/difftool/consumer/dump/codec/SQLEncoderInterface.java
rename to dkpro-jwpl-revisionmachine/src/main/java/org/dkpro/jwpl/revisionmachine/difftool/consumer/dump/codec/SQLEncoderInterface.java
index 334fb6260..ca48fe7c1 100644
--- a/de.tudarmstadt.ukp.wikipedia.revisionmachine/src/main/java/de/tudarmstadt/ukp/wikipedia/revisionmachine/difftool/consumer/dump/codec/SQLEncoderInterface.java
+++ b/dkpro-jwpl-revisionmachine/src/main/java/org/dkpro/jwpl/revisionmachine/difftool/consumer/dump/codec/SQLEncoderInterface.java
@@ -15,16 +15,16 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package de.tudarmstadt.ukp.wikipedia.revisionmachine.difftool.consumer.dump.codec;
+package org.dkpro.jwpl.revisionmachine.difftool.consumer.dump.codec;
import java.io.UnsupportedEncodingException;
-import de.tudarmstadt.ukp.wikipedia.revisionmachine.common.exceptions.ConfigurationException;
-import de.tudarmstadt.ukp.wikipedia.revisionmachine.common.exceptions.DecodingException;
-import de.tudarmstadt.ukp.wikipedia.revisionmachine.common.exceptions.EncodingException;
-import de.tudarmstadt.ukp.wikipedia.revisionmachine.common.exceptions.SQLConsumerException;
-import de.tudarmstadt.ukp.wikipedia.revisionmachine.difftool.data.tasks.Task;
-import de.tudarmstadt.ukp.wikipedia.revisionmachine.difftool.data.tasks.content.Diff;
+import org.dkpro.jwpl.revisionmachine.common.exceptions.ConfigurationException;
+import org.dkpro.jwpl.revisionmachine.common.exceptions.DecodingException;
+import org.dkpro.jwpl.revisionmachine.common.exceptions.EncodingException;
+import org.dkpro.jwpl.revisionmachine.common.exceptions.SQLConsumerException;
+import org.dkpro.jwpl.revisionmachine.difftool.data.tasks.Task;
+import org.dkpro.jwpl.revisionmachine.difftool.data.tasks.content.Diff;
/**
* The SQLEncoderInterface provides the link to the SQLEncoder who will define
diff --git a/de.tudarmstadt.ukp.wikipedia.revisionmachine/src/main/java/de/tudarmstadt/ukp/wikipedia/revisionmachine/difftool/consumer/dump/codec/SQLEncoding.java b/dkpro-jwpl-revisionmachine/src/main/java/org/dkpro/jwpl/revisionmachine/difftool/consumer/dump/codec/SQLEncoding.java
similarity index 97%
rename from de.tudarmstadt.ukp.wikipedia.revisionmachine/src/main/java/de/tudarmstadt/ukp/wikipedia/revisionmachine/difftool/consumer/dump/codec/SQLEncoding.java
rename to dkpro-jwpl-revisionmachine/src/main/java/org/dkpro/jwpl/revisionmachine/difftool/consumer/dump/codec/SQLEncoding.java
index 65f374264..46dd027c6 100644
--- a/de.tudarmstadt.ukp.wikipedia.revisionmachine/src/main/java/de/tudarmstadt/ukp/wikipedia/revisionmachine/difftool/consumer/dump/codec/SQLEncoding.java
+++ b/dkpro-jwpl-revisionmachine/src/main/java/org/dkpro/jwpl/revisionmachine/difftool/consumer/dump/codec/SQLEncoding.java
@@ -15,7 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package de.tudarmstadt.ukp.wikipedia.revisionmachine.difftool.consumer.dump.codec;
+package org.dkpro.jwpl.revisionmachine.difftool.consumer.dump.codec;
import java.util.ArrayList;
import java.util.List;
diff --git a/de.tudarmstadt.ukp.wikipedia.revisionmachine/src/main/java/de/tudarmstadt/ukp/wikipedia/revisionmachine/difftool/consumer/dump/codec/TimedSQLEncoder.java b/dkpro-jwpl-revisionmachine/src/main/java/org/dkpro/jwpl/revisionmachine/difftool/consumer/dump/codec/TimedSQLEncoder.java
similarity index 84%
rename from de.tudarmstadt.ukp.wikipedia.revisionmachine/src/main/java/de/tudarmstadt/ukp/wikipedia/revisionmachine/difftool/consumer/dump/codec/TimedSQLEncoder.java
rename to dkpro-jwpl-revisionmachine/src/main/java/org/dkpro/jwpl/revisionmachine/difftool/consumer/dump/codec/TimedSQLEncoder.java
index 810d39cdd..5ee8df511 100644
--- a/de.tudarmstadt.ukp.wikipedia.revisionmachine/src/main/java/de/tudarmstadt/ukp/wikipedia/revisionmachine/difftool/consumer/dump/codec/TimedSQLEncoder.java
+++ b/dkpro-jwpl-revisionmachine/src/main/java/org/dkpro/jwpl/revisionmachine/difftool/consumer/dump/codec/TimedSQLEncoder.java
@@ -15,18 +15,18 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package de.tudarmstadt.ukp.wikipedia.revisionmachine.difftool.consumer.dump.codec;
+package org.dkpro.jwpl.revisionmachine.difftool.consumer.dump.codec;
import java.io.UnsupportedEncodingException;
-import de.tudarmstadt.ukp.wikipedia.revisionmachine.common.exceptions.ConfigurationException;
-import de.tudarmstadt.ukp.wikipedia.revisionmachine.common.exceptions.DecodingException;
-import de.tudarmstadt.ukp.wikipedia.revisionmachine.common.exceptions.EncodingException;
-import de.tudarmstadt.ukp.wikipedia.revisionmachine.common.exceptions.LoggingException;
-import de.tudarmstadt.ukp.wikipedia.revisionmachine.common.exceptions.SQLConsumerException;
-import de.tudarmstadt.ukp.wikipedia.revisionmachine.common.logging.Logger;
-import de.tudarmstadt.ukp.wikipedia.revisionmachine.difftool.data.tasks.Task;
-import de.tudarmstadt.ukp.wikipedia.revisionmachine.difftool.data.tasks.content.Diff;
+import org.dkpro.jwpl.revisionmachine.common.exceptions.ConfigurationException;
+import org.dkpro.jwpl.revisionmachine.common.exceptions.DecodingException;
+import org.dkpro.jwpl.revisionmachine.common.exceptions.EncodingException;
+import org.dkpro.jwpl.revisionmachine.common.exceptions.LoggingException;
+import org.dkpro.jwpl.revisionmachine.common.exceptions.SQLConsumerException;
+import org.dkpro.jwpl.revisionmachine.common.logging.Logger;
+import org.dkpro.jwpl.revisionmachine.difftool.data.tasks.Task;
+import org.dkpro.jwpl.revisionmachine.difftool.data.tasks.content.Diff;
/**
* This class encodes the diffs while collecting statistical information.
diff --git a/de.tudarmstadt.ukp.wikipedia.revisionmachine/src/main/java/de/tudarmstadt/ukp/wikipedia/revisionmachine/difftool/consumer/dump/writer/DataFileArchiveWriter.java b/dkpro-jwpl-revisionmachine/src/main/java/org/dkpro/jwpl/revisionmachine/difftool/consumer/dump/writer/DataFileArchiveWriter.java
similarity index 81%
rename from de.tudarmstadt.ukp.wikipedia.revisionmachine/src/main/java/de/tudarmstadt/ukp/wikipedia/revisionmachine/difftool/consumer/dump/writer/DataFileArchiveWriter.java
rename to dkpro-jwpl-revisionmachine/src/main/java/org/dkpro/jwpl/revisionmachine/difftool/consumer/dump/writer/DataFileArchiveWriter.java
index 64b01cbc2..fb64d1439 100644
--- a/de.tudarmstadt.ukp.wikipedia.revisionmachine/src/main/java/de/tudarmstadt/ukp/wikipedia/revisionmachine/difftool/consumer/dump/writer/DataFileArchiveWriter.java
+++ b/dkpro-jwpl-revisionmachine/src/main/java/org/dkpro/jwpl/revisionmachine/difftool/consumer/dump/writer/DataFileArchiveWriter.java
@@ -15,27 +15,27 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package de.tudarmstadt.ukp.wikipedia.revisionmachine.difftool.consumer.dump.writer;
+package org.dkpro.jwpl.revisionmachine.difftool.consumer.dump.writer;
import java.io.File;
import java.io.IOException;
import java.io.OutputStream;
import java.util.List;
-import de.tudarmstadt.ukp.wikipedia.revisionmachine.common.exceptions.ConfigurationException;
-import de.tudarmstadt.ukp.wikipedia.revisionmachine.common.exceptions.DecodingException;
-import de.tudarmstadt.ukp.wikipedia.revisionmachine.common.exceptions.EncodingException;
-import de.tudarmstadt.ukp.wikipedia.revisionmachine.common.exceptions.ErrorFactory;
-import de.tudarmstadt.ukp.wikipedia.revisionmachine.common.exceptions.ErrorKeys;
-import de.tudarmstadt.ukp.wikipedia.revisionmachine.common.exceptions.LoggingException;
-import de.tudarmstadt.ukp.wikipedia.revisionmachine.common.exceptions.SQLConsumerException;
-import de.tudarmstadt.ukp.wikipedia.revisionmachine.difftool.config.ConfigurationKeys;
-import de.tudarmstadt.ukp.wikipedia.revisionmachine.difftool.config.ConfigurationManager;
-import de.tudarmstadt.ukp.wikipedia.revisionmachine.difftool.consumer.dump.WriterInterface;
-import de.tudarmstadt.ukp.wikipedia.revisionmachine.difftool.consumer.dump.codec.DataFileEncoder;
-import de.tudarmstadt.ukp.wikipedia.revisionmachine.difftool.data.tasks.Task;
-import de.tudarmstadt.ukp.wikipedia.revisionmachine.difftool.data.tasks.TaskTypes;
-import de.tudarmstadt.ukp.wikipedia.revisionmachine.difftool.data.tasks.content.Diff;
+import org.dkpro.jwpl.revisionmachine.common.exceptions.ConfigurationException;
+import org.dkpro.jwpl.revisionmachine.common.exceptions.DecodingException;
+import org.dkpro.jwpl.revisionmachine.common.exceptions.EncodingException;
+import org.dkpro.jwpl.revisionmachine.common.exceptions.ErrorFactory;
+import org.dkpro.jwpl.revisionmachine.common.exceptions.ErrorKeys;
+import org.dkpro.jwpl.revisionmachine.common.exceptions.LoggingException;
+import org.dkpro.jwpl.revisionmachine.common.exceptions.SQLConsumerException;
+import org.dkpro.jwpl.revisionmachine.difftool.config.ConfigurationKeys;
+import org.dkpro.jwpl.revisionmachine.difftool.config.ConfigurationManager;
+import org.dkpro.jwpl.revisionmachine.difftool.consumer.dump.WriterInterface;
+import org.dkpro.jwpl.revisionmachine.difftool.consumer.dump.codec.DataFileEncoder;
+import org.dkpro.jwpl.revisionmachine.difftool.data.tasks.Task;
+import org.dkpro.jwpl.revisionmachine.difftool.data.tasks.TaskTypes;
+import org.dkpro.jwpl.revisionmachine.difftool.data.tasks.content.Diff;
/**
* This class writes the output to an archive.
diff --git a/de.tudarmstadt.ukp.wikipedia.revisionmachine/src/main/java/de/tudarmstadt/ukp/wikipedia/revisionmachine/difftool/consumer/dump/writer/DataFileWriter.java b/dkpro-jwpl-revisionmachine/src/main/java/org/dkpro/jwpl/revisionmachine/difftool/consumer/dump/writer/DataFileWriter.java
similarity index 82%
rename from de.tudarmstadt.ukp.wikipedia.revisionmachine/src/main/java/de/tudarmstadt/ukp/wikipedia/revisionmachine/difftool/consumer/dump/writer/DataFileWriter.java
rename to dkpro-jwpl-revisionmachine/src/main/java/org/dkpro/jwpl/revisionmachine/difftool/consumer/dump/writer/DataFileWriter.java
index b3ddc1e43..b144e519d 100644
--- a/de.tudarmstadt.ukp.wikipedia.revisionmachine/src/main/java/de/tudarmstadt/ukp/wikipedia/revisionmachine/difftool/consumer/dump/writer/DataFileWriter.java
+++ b/dkpro-jwpl-revisionmachine/src/main/java/org/dkpro/jwpl/revisionmachine/difftool/consumer/dump/writer/DataFileWriter.java
@@ -15,7 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package de.tudarmstadt.ukp.wikipedia.revisionmachine.difftool.consumer.dump.writer;
+package org.dkpro.jwpl.revisionmachine.difftool.consumer.dump.writer;
import java.io.BufferedOutputStream;
import java.io.BufferedWriter;
@@ -26,20 +26,20 @@
import java.io.Writer;
import java.util.List;
-import de.tudarmstadt.ukp.wikipedia.revisionmachine.common.exceptions.ConfigurationException;
-import de.tudarmstadt.ukp.wikipedia.revisionmachine.common.exceptions.DecodingException;
-import de.tudarmstadt.ukp.wikipedia.revisionmachine.common.exceptions.EncodingException;
-import de.tudarmstadt.ukp.wikipedia.revisionmachine.common.exceptions.ErrorFactory;
-import de.tudarmstadt.ukp.wikipedia.revisionmachine.common.exceptions.ErrorKeys;
-import de.tudarmstadt.ukp.wikipedia.revisionmachine.common.exceptions.LoggingException;
-import de.tudarmstadt.ukp.wikipedia.revisionmachine.common.exceptions.SQLConsumerException;
-import de.tudarmstadt.ukp.wikipedia.revisionmachine.difftool.config.ConfigurationKeys;
-import de.tudarmstadt.ukp.wikipedia.revisionmachine.difftool.config.ConfigurationManager;
-import de.tudarmstadt.ukp.wikipedia.revisionmachine.difftool.consumer.dump.WriterInterface;
-import de.tudarmstadt.ukp.wikipedia.revisionmachine.difftool.consumer.dump.codec.DataFileEncoder;
-import de.tudarmstadt.ukp.wikipedia.revisionmachine.difftool.data.tasks.Task;
-import de.tudarmstadt.ukp.wikipedia.revisionmachine.difftool.data.tasks.TaskTypes;
-import de.tudarmstadt.ukp.wikipedia.revisionmachine.difftool.data.tasks.content.Diff;
+import org.dkpro.jwpl.revisionmachine.common.exceptions.ConfigurationException;
+import org.dkpro.jwpl.revisionmachine.common.exceptions.DecodingException;
+import org.dkpro.jwpl.revisionmachine.common.exceptions.EncodingException;
+import org.dkpro.jwpl.revisionmachine.common.exceptions.ErrorFactory;
+import org.dkpro.jwpl.revisionmachine.common.exceptions.ErrorKeys;
+import org.dkpro.jwpl.revisionmachine.common.exceptions.LoggingException;
+import org.dkpro.jwpl.revisionmachine.common.exceptions.SQLConsumerException;
+import org.dkpro.jwpl.revisionmachine.difftool.config.ConfigurationKeys;
+import org.dkpro.jwpl.revisionmachine.difftool.config.ConfigurationManager;
+import org.dkpro.jwpl.revisionmachine.difftool.consumer.dump.WriterInterface;
+import org.dkpro.jwpl.revisionmachine.difftool.consumer.dump.codec.DataFileEncoder;
+import org.dkpro.jwpl.revisionmachine.difftool.data.tasks.Task;
+import org.dkpro.jwpl.revisionmachine.difftool.data.tasks.TaskTypes;
+import org.dkpro.jwpl.revisionmachine.difftool.data.tasks.content.Diff;
/**
* This class writes the output to a data file (not an sql file)
diff --git a/de.tudarmstadt.ukp.wikipedia.revisionmachine/src/main/java/de/tudarmstadt/ukp/wikipedia/revisionmachine/difftool/consumer/dump/writer/OutputFactory.java b/dkpro-jwpl-revisionmachine/src/main/java/org/dkpro/jwpl/revisionmachine/difftool/consumer/dump/writer/OutputFactory.java
similarity index 81%
rename from de.tudarmstadt.ukp.wikipedia.revisionmachine/src/main/java/de/tudarmstadt/ukp/wikipedia/revisionmachine/difftool/consumer/dump/writer/OutputFactory.java
rename to dkpro-jwpl-revisionmachine/src/main/java/org/dkpro/jwpl/revisionmachine/difftool/consumer/dump/writer/OutputFactory.java
index 252f4fafe..40a686618 100644
--- a/de.tudarmstadt.ukp.wikipedia.revisionmachine/src/main/java/de/tudarmstadt/ukp/wikipedia/revisionmachine/difftool/consumer/dump/writer/OutputFactory.java
+++ b/dkpro-jwpl-revisionmachine/src/main/java/org/dkpro/jwpl/revisionmachine/difftool/consumer/dump/writer/OutputFactory.java
@@ -15,18 +15,18 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package de.tudarmstadt.ukp.wikipedia.revisionmachine.difftool.consumer.dump.writer;
+package org.dkpro.jwpl.revisionmachine.difftool.consumer.dump.writer;
import java.io.IOException;
import java.io.OutputStream;
-import de.tudarmstadt.ukp.wikipedia.revisionmachine.archivers.Bzip2Archiver;
-import de.tudarmstadt.ukp.wikipedia.revisionmachine.common.exceptions.ConfigurationException;
-import de.tudarmstadt.ukp.wikipedia.revisionmachine.common.exceptions.ErrorFactory;
-import de.tudarmstadt.ukp.wikipedia.revisionmachine.common.exceptions.ErrorKeys;
-import de.tudarmstadt.ukp.wikipedia.revisionmachine.difftool.config.ConfigurationKeys;
-import de.tudarmstadt.ukp.wikipedia.revisionmachine.difftool.config.ConfigurationManager;
-import de.tudarmstadt.ukp.wikipedia.revisionmachine.difftool.data.OutputType;
+import org.dkpro.jwpl.revisionmachine.archivers.Bzip2Archiver;
+import org.dkpro.jwpl.revisionmachine.common.exceptions.ConfigurationException;
+import org.dkpro.jwpl.revisionmachine.common.exceptions.ErrorFactory;
+import org.dkpro.jwpl.revisionmachine.common.exceptions.ErrorKeys;
+import org.dkpro.jwpl.revisionmachine.difftool.config.ConfigurationKeys;
+import org.dkpro.jwpl.revisionmachine.difftool.config.ConfigurationManager;
+import org.dkpro.jwpl.revisionmachine.difftool.data.OutputType;
public class OutputFactory
{
diff --git a/de.tudarmstadt.ukp.wikipedia.revisionmachine/src/main/java/de/tudarmstadt/ukp/wikipedia/revisionmachine/difftool/consumer/dump/writer/SQLArchiveWriter.java b/dkpro-jwpl-revisionmachine/src/main/java/org/dkpro/jwpl/revisionmachine/difftool/consumer/dump/writer/SQLArchiveWriter.java
similarity index 79%
rename from de.tudarmstadt.ukp.wikipedia.revisionmachine/src/main/java/de/tudarmstadt/ukp/wikipedia/revisionmachine/difftool/consumer/dump/writer/SQLArchiveWriter.java
rename to dkpro-jwpl-revisionmachine/src/main/java/org/dkpro/jwpl/revisionmachine/difftool/consumer/dump/writer/SQLArchiveWriter.java
index 690627bb6..8e08ba0a7 100644
--- a/de.tudarmstadt.ukp.wikipedia.revisionmachine/src/main/java/de/tudarmstadt/ukp/wikipedia/revisionmachine/difftool/consumer/dump/writer/SQLArchiveWriter.java
+++ b/dkpro-jwpl-revisionmachine/src/main/java/org/dkpro/jwpl/revisionmachine/difftool/consumer/dump/writer/SQLArchiveWriter.java
@@ -15,30 +15,30 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package de.tudarmstadt.ukp.wikipedia.revisionmachine.difftool.consumer.dump.writer;
+package org.dkpro.jwpl.revisionmachine.difftool.consumer.dump.writer;
import java.io.File;
import java.io.IOException;
import java.io.OutputStream;
-import de.tudarmstadt.ukp.wikipedia.revisionmachine.common.exceptions.ConfigurationException;
-import de.tudarmstadt.ukp.wikipedia.revisionmachine.common.exceptions.DecodingException;
-import de.tudarmstadt.ukp.wikipedia.revisionmachine.common.exceptions.EncodingException;
-import de.tudarmstadt.ukp.wikipedia.revisionmachine.common.exceptions.ErrorFactory;
-import de.tudarmstadt.ukp.wikipedia.revisionmachine.common.exceptions.ErrorKeys;
-import de.tudarmstadt.ukp.wikipedia.revisionmachine.common.exceptions.LoggingException;
-import de.tudarmstadt.ukp.wikipedia.revisionmachine.common.exceptions.SQLConsumerException;
-import de.tudarmstadt.ukp.wikipedia.revisionmachine.common.logging.Logger;
-import de.tudarmstadt.ukp.wikipedia.revisionmachine.common.logging.messages.consumer.SQLConsumerLogMessages;
-import de.tudarmstadt.ukp.wikipedia.revisionmachine.difftool.config.ConfigurationKeys;
-import de.tudarmstadt.ukp.wikipedia.revisionmachine.difftool.config.ConfigurationManager;
-import de.tudarmstadt.ukp.wikipedia.revisionmachine.difftool.consumer.dump.WriterInterface;
-import de.tudarmstadt.ukp.wikipedia.revisionmachine.difftool.consumer.dump.codec.SQLEncoder;
-import de.tudarmstadt.ukp.wikipedia.revisionmachine.difftool.consumer.dump.codec.SQLEncoderInterface;
-import de.tudarmstadt.ukp.wikipedia.revisionmachine.difftool.consumer.dump.codec.SQLEncoding;
-import de.tudarmstadt.ukp.wikipedia.revisionmachine.difftool.data.tasks.Task;
-import de.tudarmstadt.ukp.wikipedia.revisionmachine.difftool.data.tasks.TaskTypes;
-import de.tudarmstadt.ukp.wikipedia.revisionmachine.difftool.data.tasks.content.Diff;
+import org.dkpro.jwpl.revisionmachine.common.exceptions.ConfigurationException;
+import org.dkpro.jwpl.revisionmachine.common.exceptions.DecodingException;
+import org.dkpro.jwpl.revisionmachine.common.exceptions.EncodingException;
+import org.dkpro.jwpl.revisionmachine.common.exceptions.ErrorFactory;
+import org.dkpro.jwpl.revisionmachine.common.exceptions.ErrorKeys;
+import org.dkpro.jwpl.revisionmachine.common.exceptions.LoggingException;
+import org.dkpro.jwpl.revisionmachine.common.exceptions.SQLConsumerException;
+import org.dkpro.jwpl.revisionmachine.common.logging.Logger;
+import org.dkpro.jwpl.revisionmachine.common.logging.messages.consumer.SQLConsumerLogMessages;
+import org.dkpro.jwpl.revisionmachine.difftool.config.ConfigurationKeys;
+import org.dkpro.jwpl.revisionmachine.difftool.config.ConfigurationManager;
+import org.dkpro.jwpl.revisionmachine.difftool.consumer.dump.WriterInterface;
+import org.dkpro.jwpl.revisionmachine.difftool.consumer.dump.codec.SQLEncoder;
+import org.dkpro.jwpl.revisionmachine.difftool.consumer.dump.codec.SQLEncoderInterface;
+import org.dkpro.jwpl.revisionmachine.difftool.consumer.dump.codec.SQLEncoding;
+import org.dkpro.jwpl.revisionmachine.difftool.data.tasks.Task;
+import org.dkpro.jwpl.revisionmachine.difftool.data.tasks.TaskTypes;
+import org.dkpro.jwpl.revisionmachine.difftool.data.tasks.content.Diff;
/**
* This class writes the output to an archive.
diff --git a/de.tudarmstadt.ukp.wikipedia.revisionmachine/src/main/java/de/tudarmstadt/ukp/wikipedia/revisionmachine/difftool/consumer/dump/writer/SQLDatabaseWriter.java b/dkpro-jwpl-revisionmachine/src/main/java/org/dkpro/jwpl/revisionmachine/difftool/consumer/dump/writer/SQLDatabaseWriter.java
similarity index 78%
rename from de.tudarmstadt.ukp.wikipedia.revisionmachine/src/main/java/de/tudarmstadt/ukp/wikipedia/revisionmachine/difftool/consumer/dump/writer/SQLDatabaseWriter.java
rename to dkpro-jwpl-revisionmachine/src/main/java/org/dkpro/jwpl/revisionmachine/difftool/consumer/dump/writer/SQLDatabaseWriter.java
index 1596c2664..cb873e64e 100644
--- a/de.tudarmstadt.ukp.wikipedia.revisionmachine/src/main/java/de/tudarmstadt/ukp/wikipedia/revisionmachine/difftool/consumer/dump/writer/SQLDatabaseWriter.java
+++ b/dkpro-jwpl-revisionmachine/src/main/java/org/dkpro/jwpl/revisionmachine/difftool/consumer/dump/writer/SQLDatabaseWriter.java
@@ -15,7 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package de.tudarmstadt.ukp.wikipedia.revisionmachine.difftool.consumer.dump.writer;
+package org.dkpro.jwpl.revisionmachine.difftool.consumer.dump.writer;
import java.io.IOException;
import java.sql.Connection;
@@ -23,22 +23,22 @@
import java.sql.SQLException;
import java.sql.Statement;
-import de.tudarmstadt.ukp.wikipedia.revisionmachine.common.exceptions.ConfigurationException;
-import de.tudarmstadt.ukp.wikipedia.revisionmachine.common.exceptions.DecodingException;
-import de.tudarmstadt.ukp.wikipedia.revisionmachine.common.exceptions.EncodingException;
-import de.tudarmstadt.ukp.wikipedia.revisionmachine.common.exceptions.ErrorFactory;
-import de.tudarmstadt.ukp.wikipedia.revisionmachine.common.exceptions.ErrorKeys;
-import de.tudarmstadt.ukp.wikipedia.revisionmachine.common.exceptions.LoggingException;
-import de.tudarmstadt.ukp.wikipedia.revisionmachine.common.exceptions.SQLConsumerException;
-import de.tudarmstadt.ukp.wikipedia.revisionmachine.common.logging.Logger;
-import de.tudarmstadt.ukp.wikipedia.revisionmachine.difftool.config.ConfigurationKeys;
-import de.tudarmstadt.ukp.wikipedia.revisionmachine.difftool.config.ConfigurationManager;
-import de.tudarmstadt.ukp.wikipedia.revisionmachine.difftool.consumer.dump.WriterInterface;
-import de.tudarmstadt.ukp.wikipedia.revisionmachine.difftool.consumer.dump.codec.SQLEncoder;
-import de.tudarmstadt.ukp.wikipedia.revisionmachine.difftool.consumer.dump.codec.SQLEncoderInterface;
-import de.tudarmstadt.ukp.wikipedia.revisionmachine.difftool.consumer.dump.codec.SQLEncoding;
-import de.tudarmstadt.ukp.wikipedia.revisionmachine.difftool.data.tasks.Task;
-import de.tudarmstadt.ukp.wikipedia.revisionmachine.difftool.data.tasks.content.Diff;
+import org.dkpro.jwpl.revisionmachine.common.exceptions.ConfigurationException;
+import org.dkpro.jwpl.revisionmachine.common.exceptions.DecodingException;
+import org.dkpro.jwpl.revisionmachine.common.exceptions.EncodingException;
+import org.dkpro.jwpl.revisionmachine.common.exceptions.ErrorFactory;
+import org.dkpro.jwpl.revisionmachine.common.exceptions.ErrorKeys;
+import org.dkpro.jwpl.revisionmachine.common.exceptions.LoggingException;
+import org.dkpro.jwpl.revisionmachine.common.exceptions.SQLConsumerException;
+import org.dkpro.jwpl.revisionmachine.common.logging.Logger;
+import org.dkpro.jwpl.revisionmachine.difftool.config.ConfigurationKeys;
+import org.dkpro.jwpl.revisionmachine.difftool.config.ConfigurationManager;
+import org.dkpro.jwpl.revisionmachine.difftool.consumer.dump.WriterInterface;
+import org.dkpro.jwpl.revisionmachine.difftool.consumer.dump.codec.SQLEncoder;
+import org.dkpro.jwpl.revisionmachine.difftool.consumer.dump.codec.SQLEncoderInterface;
+import org.dkpro.jwpl.revisionmachine.difftool.consumer.dump.codec.SQLEncoding;
+import org.dkpro.jwpl.revisionmachine.difftool.data.tasks.Task;
+import org.dkpro.jwpl.revisionmachine.difftool.data.tasks.content.Diff;
/**
* This class writes the output to a database.
diff --git a/de.tudarmstadt.ukp.wikipedia.revisionmachine/src/main/java/de/tudarmstadt/ukp/wikipedia/revisionmachine/difftool/consumer/dump/writer/SQLFileWriter.java b/dkpro-jwpl-revisionmachine/src/main/java/org/dkpro/jwpl/revisionmachine/difftool/consumer/dump/writer/SQLFileWriter.java
similarity index 79%
rename from de.tudarmstadt.ukp.wikipedia.revisionmachine/src/main/java/de/tudarmstadt/ukp/wikipedia/revisionmachine/difftool/consumer/dump/writer/SQLFileWriter.java
rename to dkpro-jwpl-revisionmachine/src/main/java/org/dkpro/jwpl/revisionmachine/difftool/consumer/dump/writer/SQLFileWriter.java
index 7c656fb95..6b74ba2e7 100644
--- a/de.tudarmstadt.ukp.wikipedia.revisionmachine/src/main/java/de/tudarmstadt/ukp/wikipedia/revisionmachine/difftool/consumer/dump/writer/SQLFileWriter.java
+++ b/dkpro-jwpl-revisionmachine/src/main/java/org/dkpro/jwpl/revisionmachine/difftool/consumer/dump/writer/SQLFileWriter.java
@@ -15,7 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package de.tudarmstadt.ukp.wikipedia.revisionmachine.difftool.consumer.dump.writer;
+package org.dkpro.jwpl.revisionmachine.difftool.consumer.dump.writer;
import java.io.BufferedOutputStream;
import java.io.BufferedWriter;
@@ -25,24 +25,24 @@
import java.io.OutputStreamWriter;
import java.io.Writer;
-import de.tudarmstadt.ukp.wikipedia.revisionmachine.common.exceptions.ConfigurationException;
-import de.tudarmstadt.ukp.wikipedia.revisionmachine.common.exceptions.DecodingException;
-import de.tudarmstadt.ukp.wikipedia.revisionmachine.common.exceptions.EncodingException;
-import de.tudarmstadt.ukp.wikipedia.revisionmachine.common.exceptions.ErrorFactory;
-import de.tudarmstadt.ukp.wikipedia.revisionmachine.common.exceptions.ErrorKeys;
-import de.tudarmstadt.ukp.wikipedia.revisionmachine.common.exceptions.LoggingException;
-import de.tudarmstadt.ukp.wikipedia.revisionmachine.common.exceptions.SQLConsumerException;
-import de.tudarmstadt.ukp.wikipedia.revisionmachine.common.logging.Logger;
-import de.tudarmstadt.ukp.wikipedia.revisionmachine.common.logging.messages.consumer.SQLConsumerLogMessages;
-import de.tudarmstadt.ukp.wikipedia.revisionmachine.difftool.config.ConfigurationKeys;
-import de.tudarmstadt.ukp.wikipedia.revisionmachine.difftool.config.ConfigurationManager;
-import de.tudarmstadt.ukp.wikipedia.revisionmachine.difftool.consumer.dump.WriterInterface;
-import de.tudarmstadt.ukp.wikipedia.revisionmachine.difftool.consumer.dump.codec.SQLEncoder;
-import de.tudarmstadt.ukp.wikipedia.revisionmachine.difftool.consumer.dump.codec.SQLEncoderInterface;
-import de.tudarmstadt.ukp.wikipedia.revisionmachine.difftool.consumer.dump.codec.SQLEncoding;
-import de.tudarmstadt.ukp.wikipedia.revisionmachine.difftool.data.tasks.Task;
-import de.tudarmstadt.ukp.wikipedia.revisionmachine.difftool.data.tasks.TaskTypes;
-import de.tudarmstadt.ukp.wikipedia.revisionmachine.difftool.data.tasks.content.Diff;
+import org.dkpro.jwpl.revisionmachine.common.exceptions.ConfigurationException;
+import org.dkpro.jwpl.revisionmachine.common.exceptions.DecodingException;
+import org.dkpro.jwpl.revisionmachine.common.exceptions.EncodingException;
+import org.dkpro.jwpl.revisionmachine.common.exceptions.ErrorFactory;
+import org.dkpro.jwpl.revisionmachine.common.exceptions.ErrorKeys;
+import org.dkpro.jwpl.revisionmachine.common.exceptions.LoggingException;
+import org.dkpro.jwpl.revisionmachine.common.exceptions.SQLConsumerException;
+import org.dkpro.jwpl.revisionmachine.common.logging.Logger;
+import org.dkpro.jwpl.revisionmachine.common.logging.messages.consumer.SQLConsumerLogMessages;
+import org.dkpro.jwpl.revisionmachine.difftool.config.ConfigurationKeys;
+import org.dkpro.jwpl.revisionmachine.difftool.config.ConfigurationManager;
+import org.dkpro.jwpl.revisionmachine.difftool.consumer.dump.WriterInterface;
+import org.dkpro.jwpl.revisionmachine.difftool.consumer.dump.codec.SQLEncoder;
+import org.dkpro.jwpl.revisionmachine.difftool.consumer.dump.codec.SQLEncoderInterface;
+import org.dkpro.jwpl.revisionmachine.difftool.consumer.dump.codec.SQLEncoding;
+import org.dkpro.jwpl.revisionmachine.difftool.data.tasks.Task;
+import org.dkpro.jwpl.revisionmachine.difftool.data.tasks.TaskTypes;
+import org.dkpro.jwpl.revisionmachine.difftool.data.tasks.content.Diff;
/**
* This class writes the output to a file.
diff --git a/de.tudarmstadt.ukp.wikipedia.revisionmachine/src/main/java/de/tudarmstadt/ukp/wikipedia/revisionmachine/difftool/consumer/dump/writer/TimedSQLArchiveWriter.java b/dkpro-jwpl-revisionmachine/src/main/java/org/dkpro/jwpl/revisionmachine/difftool/consumer/dump/writer/TimedSQLArchiveWriter.java
similarity index 81%
rename from de.tudarmstadt.ukp.wikipedia.revisionmachine/src/main/java/de/tudarmstadt/ukp/wikipedia/revisionmachine/difftool/consumer/dump/writer/TimedSQLArchiveWriter.java
rename to dkpro-jwpl-revisionmachine/src/main/java/org/dkpro/jwpl/revisionmachine/difftool/consumer/dump/writer/TimedSQLArchiveWriter.java
index 262501f5d..595a1a295 100644
--- a/de.tudarmstadt.ukp.wikipedia.revisionmachine/src/main/java/de/tudarmstadt/ukp/wikipedia/revisionmachine/difftool/consumer/dump/writer/TimedSQLArchiveWriter.java
+++ b/dkpro-jwpl-revisionmachine/src/main/java/org/dkpro/jwpl/revisionmachine/difftool/consumer/dump/writer/TimedSQLArchiveWriter.java
@@ -15,20 +15,20 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package de.tudarmstadt.ukp.wikipedia.revisionmachine.difftool.consumer.dump.writer;
+package org.dkpro.jwpl.revisionmachine.difftool.consumer.dump.writer;
import java.io.IOException;
-import de.tudarmstadt.ukp.wikipedia.revisionmachine.common.exceptions.ConfigurationException;
-import de.tudarmstadt.ukp.wikipedia.revisionmachine.common.exceptions.LoggingException;
-import de.tudarmstadt.ukp.wikipedia.revisionmachine.common.exceptions.SQLConsumerException;
-import de.tudarmstadt.ukp.wikipedia.revisionmachine.common.logging.Logger;
-import de.tudarmstadt.ukp.wikipedia.revisionmachine.common.logging.LoggingFactory;
-import de.tudarmstadt.ukp.wikipedia.revisionmachine.difftool.consumer.dump.codec.TimedSQLEncoder;
-import de.tudarmstadt.ukp.wikipedia.revisionmachine.difftool.data.tasks.Task;
-import de.tudarmstadt.ukp.wikipedia.revisionmachine.difftool.data.tasks.TaskTypes;
-import de.tudarmstadt.ukp.wikipedia.revisionmachine.difftool.data.tasks.content.Diff;
-import de.tudarmstadt.ukp.wikipedia.revisionmachine.difftool.data.tasks.info.ArticleInformation;
+import org.dkpro.jwpl.revisionmachine.common.exceptions.ConfigurationException;
+import org.dkpro.jwpl.revisionmachine.common.exceptions.LoggingException;
+import org.dkpro.jwpl.revisionmachine.common.exceptions.SQLConsumerException;
+import org.dkpro.jwpl.revisionmachine.common.logging.Logger;
+import org.dkpro.jwpl.revisionmachine.common.logging.LoggingFactory;
+import org.dkpro.jwpl.revisionmachine.difftool.consumer.dump.codec.TimedSQLEncoder;
+import org.dkpro.jwpl.revisionmachine.difftool.data.tasks.Task;
+import org.dkpro.jwpl.revisionmachine.difftool.data.tasks.TaskTypes;
+import org.dkpro.jwpl.revisionmachine.difftool.data.tasks.content.Diff;
+import org.dkpro.jwpl.revisionmachine.difftool.data.tasks.info.ArticleInformation;
import org.slf4j.event.Level;
/**
diff --git a/de.tudarmstadt.ukp.wikipedia.revisionmachine/src/main/java/de/tudarmstadt/ukp/wikipedia/revisionmachine/difftool/consumer/dump/writer/TimedSQLDatabaseWriter.java b/dkpro-jwpl-revisionmachine/src/main/java/org/dkpro/jwpl/revisionmachine/difftool/consumer/dump/writer/TimedSQLDatabaseWriter.java
similarity index 81%
rename from de.tudarmstadt.ukp.wikipedia.revisionmachine/src/main/java/de/tudarmstadt/ukp/wikipedia/revisionmachine/difftool/consumer/dump/writer/TimedSQLDatabaseWriter.java
rename to dkpro-jwpl-revisionmachine/src/main/java/org/dkpro/jwpl/revisionmachine/difftool/consumer/dump/writer/TimedSQLDatabaseWriter.java
index 2da212cd4..407a4233b 100644
--- a/de.tudarmstadt.ukp.wikipedia.revisionmachine/src/main/java/de/tudarmstadt/ukp/wikipedia/revisionmachine/difftool/consumer/dump/writer/TimedSQLDatabaseWriter.java
+++ b/dkpro-jwpl-revisionmachine/src/main/java/org/dkpro/jwpl/revisionmachine/difftool/consumer/dump/writer/TimedSQLDatabaseWriter.java
@@ -15,21 +15,21 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package de.tudarmstadt.ukp.wikipedia.revisionmachine.difftool.consumer.dump.writer;
+package org.dkpro.jwpl.revisionmachine.difftool.consumer.dump.writer;
import java.io.IOException;
import java.sql.SQLException;
-import de.tudarmstadt.ukp.wikipedia.revisionmachine.common.exceptions.ConfigurationException;
-import de.tudarmstadt.ukp.wikipedia.revisionmachine.common.exceptions.LoggingException;
-import de.tudarmstadt.ukp.wikipedia.revisionmachine.common.exceptions.SQLConsumerException;
-import de.tudarmstadt.ukp.wikipedia.revisionmachine.common.logging.Logger;
-import de.tudarmstadt.ukp.wikipedia.revisionmachine.common.logging.LoggingFactory;
-import de.tudarmstadt.ukp.wikipedia.revisionmachine.difftool.consumer.dump.codec.TimedSQLEncoder;
-import de.tudarmstadt.ukp.wikipedia.revisionmachine.difftool.data.tasks.Task;
-import de.tudarmstadt.ukp.wikipedia.revisionmachine.difftool.data.tasks.TaskTypes;
-import de.tudarmstadt.ukp.wikipedia.revisionmachine.difftool.data.tasks.content.Diff;
-import de.tudarmstadt.ukp.wikipedia.revisionmachine.difftool.data.tasks.info.ArticleInformation;
+import org.dkpro.jwpl.revisionmachine.common.exceptions.ConfigurationException;
+import org.dkpro.jwpl.revisionmachine.common.exceptions.LoggingException;
+import org.dkpro.jwpl.revisionmachine.common.exceptions.SQLConsumerException;
+import org.dkpro.jwpl.revisionmachine.common.logging.Logger;
+import org.dkpro.jwpl.revisionmachine.common.logging.LoggingFactory;
+import org.dkpro.jwpl.revisionmachine.difftool.consumer.dump.codec.TimedSQLEncoder;
+import org.dkpro.jwpl.revisionmachine.difftool.data.tasks.Task;
+import org.dkpro.jwpl.revisionmachine.difftool.data.tasks.TaskTypes;
+import org.dkpro.jwpl.revisionmachine.difftool.data.tasks.content.Diff;
+import org.dkpro.jwpl.revisionmachine.difftool.data.tasks.info.ArticleInformation;
import org.slf4j.event.Level;
/**
diff --git a/de.tudarmstadt.ukp.wikipedia.revisionmachine/src/main/java/de/tudarmstadt/ukp/wikipedia/revisionmachine/difftool/consumer/dump/writer/TimedSQLFileWriter.java b/dkpro-jwpl-revisionmachine/src/main/java/org/dkpro/jwpl/revisionmachine/difftool/consumer/dump/writer/TimedSQLFileWriter.java
similarity index 81%
rename from de.tudarmstadt.ukp.wikipedia.revisionmachine/src/main/java/de/tudarmstadt/ukp/wikipedia/revisionmachine/difftool/consumer/dump/writer/TimedSQLFileWriter.java
rename to dkpro-jwpl-revisionmachine/src/main/java/org/dkpro/jwpl/revisionmachine/difftool/consumer/dump/writer/TimedSQLFileWriter.java
index ff4f2eaa9..5b61ffd8e 100644
--- a/de.tudarmstadt.ukp.wikipedia.revisionmachine/src/main/java/de/tudarmstadt/ukp/wikipedia/revisionmachine/difftool/consumer/dump/writer/TimedSQLFileWriter.java
+++ b/dkpro-jwpl-revisionmachine/src/main/java/org/dkpro/jwpl/revisionmachine/difftool/consumer/dump/writer/TimedSQLFileWriter.java
@@ -15,20 +15,20 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package de.tudarmstadt.ukp.wikipedia.revisionmachine.difftool.consumer.dump.writer;
+package org.dkpro.jwpl.revisionmachine.difftool.consumer.dump.writer;
import java.io.IOException;
-import de.tudarmstadt.ukp.wikipedia.revisionmachine.common.exceptions.ConfigurationException;
-import de.tudarmstadt.ukp.wikipedia.revisionmachine.common.exceptions.LoggingException;
-import de.tudarmstadt.ukp.wikipedia.revisionmachine.common.exceptions.SQLConsumerException;
-import de.tudarmstadt.ukp.wikipedia.revisionmachine.common.logging.Logger;
-import de.tudarmstadt.ukp.wikipedia.revisionmachine.common.logging.LoggingFactory;
-import de.tudarmstadt.ukp.wikipedia.revisionmachine.difftool.consumer.dump.codec.TimedSQLEncoder;
-import de.tudarmstadt.ukp.wikipedia.revisionmachine.difftool.data.tasks.Task;
-import de.tudarmstadt.ukp.wikipedia.revisionmachine.difftool.data.tasks.TaskTypes;
-import de.tudarmstadt.ukp.wikipedia.revisionmachine.difftool.data.tasks.content.Diff;
-import de.tudarmstadt.ukp.wikipedia.revisionmachine.difftool.data.tasks.info.ArticleInformation;
+import org.dkpro.jwpl.revisionmachine.common.exceptions.ConfigurationException;
+import org.dkpro.jwpl.revisionmachine.common.exceptions.LoggingException;
+import org.dkpro.jwpl.revisionmachine.common.exceptions.SQLConsumerException;
+import org.dkpro.jwpl.revisionmachine.common.logging.Logger;
+import org.dkpro.jwpl.revisionmachine.common.logging.LoggingFactory;
+import org.dkpro.jwpl.revisionmachine.difftool.consumer.dump.codec.TimedSQLEncoder;
+import org.dkpro.jwpl.revisionmachine.difftool.data.tasks.Task;
+import org.dkpro.jwpl.revisionmachine.difftool.data.tasks.TaskTypes;
+import org.dkpro.jwpl.revisionmachine.difftool.data.tasks.content.Diff;
+import org.dkpro.jwpl.revisionmachine.difftool.data.tasks.info.ArticleInformation;
import org.slf4j.event.Level;
/**
diff --git a/de.tudarmstadt.ukp.wikipedia.revisionmachine/src/main/java/de/tudarmstadt/ukp/wikipedia/revisionmachine/difftool/data/OutputType.java b/dkpro-jwpl-revisionmachine/src/main/java/org/dkpro/jwpl/revisionmachine/difftool/data/OutputType.java
similarity index 96%
rename from de.tudarmstadt.ukp.wikipedia.revisionmachine/src/main/java/de/tudarmstadt/ukp/wikipedia/revisionmachine/difftool/data/OutputType.java
rename to dkpro-jwpl-revisionmachine/src/main/java/org/dkpro/jwpl/revisionmachine/difftool/data/OutputType.java
index ad19b787f..9dbea61e0 100644
--- a/de.tudarmstadt.ukp.wikipedia.revisionmachine/src/main/java/de/tudarmstadt/ukp/wikipedia/revisionmachine/difftool/data/OutputType.java
+++ b/dkpro-jwpl-revisionmachine/src/main/java/org/dkpro/jwpl/revisionmachine/difftool/data/OutputType.java
@@ -15,7 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package de.tudarmstadt.ukp.wikipedia.revisionmachine.difftool.data;
+package org.dkpro.jwpl.revisionmachine.difftool.data;
/**
* This Enumerator list the possible output values.
diff --git a/de.tudarmstadt.ukp.wikipedia.revisionmachine/src/main/java/de/tudarmstadt/ukp/wikipedia/revisionmachine/difftool/data/SurrogateModes.java b/dkpro-jwpl-revisionmachine/src/main/java/org/dkpro/jwpl/revisionmachine/difftool/data/SurrogateModes.java
similarity index 97%
rename from de.tudarmstadt.ukp.wikipedia.revisionmachine/src/main/java/de/tudarmstadt/ukp/wikipedia/revisionmachine/difftool/data/SurrogateModes.java
rename to dkpro-jwpl-revisionmachine/src/main/java/org/dkpro/jwpl/revisionmachine/difftool/data/SurrogateModes.java
index e84c912c4..3c508cb7c 100644
--- a/de.tudarmstadt.ukp.wikipedia.revisionmachine/src/main/java/de/tudarmstadt/ukp/wikipedia/revisionmachine/difftool/data/SurrogateModes.java
+++ b/dkpro-jwpl-revisionmachine/src/main/java/org/dkpro/jwpl/revisionmachine/difftool/data/SurrogateModes.java
@@ -15,7 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package de.tudarmstadt.ukp.wikipedia.revisionmachine.difftool.data;
+package org.dkpro.jwpl.revisionmachine.difftool.data;
/**
* This Enumerator lists the different method of how to handle surrogates.
diff --git a/de.tudarmstadt.ukp.wikipedia.revisionmachine/src/main/java/de/tudarmstadt/ukp/wikipedia/revisionmachine/difftool/data/archive/ArchiveDescription.java b/dkpro-jwpl-revisionmachine/src/main/java/org/dkpro/jwpl/revisionmachine/difftool/data/archive/ArchiveDescription.java
similarity index 96%
rename from de.tudarmstadt.ukp.wikipedia.revisionmachine/src/main/java/de/tudarmstadt/ukp/wikipedia/revisionmachine/difftool/data/archive/ArchiveDescription.java
rename to dkpro-jwpl-revisionmachine/src/main/java/org/dkpro/jwpl/revisionmachine/difftool/data/archive/ArchiveDescription.java
index b7cc31283..9eec8a56e 100644
--- a/de.tudarmstadt.ukp.wikipedia.revisionmachine/src/main/java/de/tudarmstadt/ukp/wikipedia/revisionmachine/difftool/data/archive/ArchiveDescription.java
+++ b/dkpro-jwpl-revisionmachine/src/main/java/org/dkpro/jwpl/revisionmachine/difftool/data/archive/ArchiveDescription.java
@@ -15,7 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package de.tudarmstadt.ukp.wikipedia.revisionmachine.difftool.data.archive;
+package org.dkpro.jwpl.revisionmachine.difftool.data.archive;
/**
* This class represents a description of an input file.
diff --git a/de.tudarmstadt.ukp.wikipedia.revisionmachine/src/main/java/de/tudarmstadt/ukp/wikipedia/revisionmachine/difftool/data/archive/ArchiveManager.java b/dkpro-jwpl-revisionmachine/src/main/java/org/dkpro/jwpl/revisionmachine/difftool/data/archive/ArchiveManager.java
similarity index 89%
rename from de.tudarmstadt.ukp.wikipedia.revisionmachine/src/main/java/de/tudarmstadt/ukp/wikipedia/revisionmachine/difftool/data/archive/ArchiveManager.java
rename to dkpro-jwpl-revisionmachine/src/main/java/org/dkpro/jwpl/revisionmachine/difftool/data/archive/ArchiveManager.java
index 17d1cccc4..c86e1be0a 100644
--- a/de.tudarmstadt.ukp.wikipedia.revisionmachine/src/main/java/de/tudarmstadt/ukp/wikipedia/revisionmachine/difftool/data/archive/ArchiveManager.java
+++ b/dkpro-jwpl-revisionmachine/src/main/java/org/dkpro/jwpl/revisionmachine/difftool/data/archive/ArchiveManager.java
@@ -15,12 +15,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package de.tudarmstadt.ukp.wikipedia.revisionmachine.difftool.data.archive;
+package org.dkpro.jwpl.revisionmachine.difftool.data.archive;
import java.util.List;
-import de.tudarmstadt.ukp.wikipedia.revisionmachine.common.exceptions.ConfigurationException;
-import de.tudarmstadt.ukp.wikipedia.revisionmachine.difftool.config.ConfigurationManager;
+import org.dkpro.jwpl.revisionmachine.common.exceptions.ConfigurationException;
+import org.dkpro.jwpl.revisionmachine.difftool.config.ConfigurationManager;
/**
* DiffManager Manages the data contained by the ArchiveProducer
diff --git a/de.tudarmstadt.ukp.wikipedia.revisionmachine/src/main/java/de/tudarmstadt/ukp/wikipedia/revisionmachine/difftool/data/archive/InputType.java b/dkpro-jwpl-revisionmachine/src/main/java/org/dkpro/jwpl/revisionmachine/difftool/data/archive/InputType.java
similarity index 95%
rename from de.tudarmstadt.ukp.wikipedia.revisionmachine/src/main/java/de/tudarmstadt/ukp/wikipedia/revisionmachine/difftool/data/archive/InputType.java
rename to dkpro-jwpl-revisionmachine/src/main/java/org/dkpro/jwpl/revisionmachine/difftool/data/archive/InputType.java
index cfc96d28f..369f5df47 100644
--- a/de.tudarmstadt.ukp.wikipedia.revisionmachine/src/main/java/de/tudarmstadt/ukp/wikipedia/revisionmachine/difftool/data/archive/InputType.java
+++ b/dkpro-jwpl-revisionmachine/src/main/java/org/dkpro/jwpl/revisionmachine/difftool/data/archive/InputType.java
@@ -15,7 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package de.tudarmstadt.ukp.wikipedia.revisionmachine.difftool.data.archive;
+package org.dkpro.jwpl.revisionmachine.difftool.data.archive;
/**
* This class represents an enumeration of the input type.
diff --git a/de.tudarmstadt.ukp.wikipedia.revisionmachine/src/main/java/de/tudarmstadt/ukp/wikipedia/revisionmachine/difftool/data/codec/BitReader.java b/dkpro-jwpl-revisionmachine/src/main/java/org/dkpro/jwpl/revisionmachine/difftool/data/codec/BitReader.java
similarity index 91%
rename from de.tudarmstadt.ukp.wikipedia.revisionmachine/src/main/java/de/tudarmstadt/ukp/wikipedia/revisionmachine/difftool/data/codec/BitReader.java
rename to dkpro-jwpl-revisionmachine/src/main/java/org/dkpro/jwpl/revisionmachine/difftool/data/codec/BitReader.java
index e5a5b8fb5..0fd794d8e 100644
--- a/de.tudarmstadt.ukp.wikipedia.revisionmachine/src/main/java/de/tudarmstadt/ukp/wikipedia/revisionmachine/difftool/data/codec/BitReader.java
+++ b/dkpro-jwpl-revisionmachine/src/main/java/org/dkpro/jwpl/revisionmachine/difftool/data/codec/BitReader.java
@@ -15,11 +15,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package de.tudarmstadt.ukp.wikipedia.revisionmachine.difftool.data.codec;
+package org.dkpro.jwpl.revisionmachine.difftool.data.codec;
-import de.tudarmstadt.ukp.wikipedia.revisionmachine.common.exceptions.DecodingException;
-import de.tudarmstadt.ukp.wikipedia.revisionmachine.common.exceptions.ErrorFactory;
-import de.tudarmstadt.ukp.wikipedia.revisionmachine.common.exceptions.ErrorKeys;
+import org.dkpro.jwpl.revisionmachine.common.exceptions.DecodingException;
+import org.dkpro.jwpl.revisionmachine.common.exceptions.ErrorFactory;
+import org.dkpro.jwpl.revisionmachine.common.exceptions.ErrorKeys;
/**
* The BitReader buffers a byte-array.
diff --git a/de.tudarmstadt.ukp.wikipedia.revisionmachine/src/main/java/de/tudarmstadt/ukp/wikipedia/revisionmachine/difftool/data/codec/BitWriter.java b/dkpro-jwpl-revisionmachine/src/main/java/org/dkpro/jwpl/revisionmachine/difftool/data/codec/BitWriter.java
similarity index 92%
rename from de.tudarmstadt.ukp.wikipedia.revisionmachine/src/main/java/de/tudarmstadt/ukp/wikipedia/revisionmachine/difftool/data/codec/BitWriter.java
rename to dkpro-jwpl-revisionmachine/src/main/java/org/dkpro/jwpl/revisionmachine/difftool/data/codec/BitWriter.java
index 60df54eb3..9dc62a904 100644
--- a/de.tudarmstadt.ukp.wikipedia.revisionmachine/src/main/java/de/tudarmstadt/ukp/wikipedia/revisionmachine/difftool/data/codec/BitWriter.java
+++ b/dkpro-jwpl-revisionmachine/src/main/java/org/dkpro/jwpl/revisionmachine/difftool/data/codec/BitWriter.java
@@ -15,13 +15,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package de.tudarmstadt.ukp.wikipedia.revisionmachine.difftool.data.codec;
+package org.dkpro.jwpl.revisionmachine.difftool.data.codec;
import java.io.ByteArrayOutputStream;
-import de.tudarmstadt.ukp.wikipedia.revisionmachine.common.exceptions.EncodingException;
-import de.tudarmstadt.ukp.wikipedia.revisionmachine.common.exceptions.ErrorFactory;
-import de.tudarmstadt.ukp.wikipedia.revisionmachine.common.exceptions.ErrorKeys;
+import org.dkpro.jwpl.revisionmachine.common.exceptions.EncodingException;
+import org.dkpro.jwpl.revisionmachine.common.exceptions.ErrorFactory;
+import org.dkpro.jwpl.revisionmachine.common.exceptions.ErrorKeys;
/**
* The BitWriter buffers bit that will be written byte-by-byte to an output
diff --git a/de.tudarmstadt.ukp.wikipedia.revisionmachine/src/main/java/de/tudarmstadt/ukp/wikipedia/revisionmachine/difftool/data/codec/RevisionCodecData.java b/dkpro-jwpl-revisionmachine/src/main/java/org/dkpro/jwpl/revisionmachine/difftool/data/codec/RevisionCodecData.java
similarity index 98%
rename from de.tudarmstadt.ukp.wikipedia.revisionmachine/src/main/java/de/tudarmstadt/ukp/wikipedia/revisionmachine/difftool/data/codec/RevisionCodecData.java
rename to dkpro-jwpl-revisionmachine/src/main/java/org/dkpro/jwpl/revisionmachine/difftool/data/codec/RevisionCodecData.java
index 4b8860ac5..9a5f1cebc 100644
--- a/de.tudarmstadt.ukp.wikipedia.revisionmachine/src/main/java/de/tudarmstadt/ukp/wikipedia/revisionmachine/difftool/data/codec/RevisionCodecData.java
+++ b/dkpro-jwpl-revisionmachine/src/main/java/org/dkpro/jwpl/revisionmachine/difftool/data/codec/RevisionCodecData.java
@@ -15,7 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package de.tudarmstadt.ukp.wikipedia.revisionmachine.difftool.data.codec;
+package org.dkpro.jwpl.revisionmachine.difftool.data.codec;
/**
* The RevisionCodecData class contains all necessary information to encode the
diff --git a/de.tudarmstadt.ukp.wikipedia.revisionmachine/src/main/java/de/tudarmstadt/ukp/wikipedia/revisionmachine/difftool/data/codec/RevisionDecoder.java b/dkpro-jwpl-revisionmachine/src/main/java/org/dkpro/jwpl/revisionmachine/difftool/data/codec/RevisionDecoder.java
similarity index 95%
rename from de.tudarmstadt.ukp.wikipedia.revisionmachine/src/main/java/de/tudarmstadt/ukp/wikipedia/revisionmachine/difftool/data/codec/RevisionDecoder.java
rename to dkpro-jwpl-revisionmachine/src/main/java/org/dkpro/jwpl/revisionmachine/difftool/data/codec/RevisionDecoder.java
index 169bc31d4..f8d716828 100644
--- a/de.tudarmstadt.ukp.wikipedia.revisionmachine/src/main/java/de/tudarmstadt/ukp/wikipedia/revisionmachine/difftool/data/codec/RevisionDecoder.java
+++ b/dkpro-jwpl-revisionmachine/src/main/java/org/dkpro/jwpl/revisionmachine/difftool/data/codec/RevisionDecoder.java
@@ -15,7 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package de.tudarmstadt.ukp.wikipedia.revisionmachine.difftool.data.codec;
+package org.dkpro.jwpl.revisionmachine.difftool.data.codec;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
@@ -26,13 +26,13 @@
import org.apache.commons.codec.binary.Base64;
-import de.tudarmstadt.ukp.wikipedia.revisionmachine.common.exceptions.ConfigurationException;
-import de.tudarmstadt.ukp.wikipedia.revisionmachine.common.exceptions.DecodingException;
-import de.tudarmstadt.ukp.wikipedia.revisionmachine.difftool.config.ConfigurationKeys;
-import de.tudarmstadt.ukp.wikipedia.revisionmachine.difftool.config.ConfigurationManager;
-import de.tudarmstadt.ukp.wikipedia.revisionmachine.difftool.data.tasks.content.Diff;
-import de.tudarmstadt.ukp.wikipedia.revisionmachine.difftool.data.tasks.content.DiffAction;
-import de.tudarmstadt.ukp.wikipedia.revisionmachine.difftool.data.tasks.content.DiffPart;
+import org.dkpro.jwpl.revisionmachine.common.exceptions.ConfigurationException;
+import org.dkpro.jwpl.revisionmachine.common.exceptions.DecodingException;
+import org.dkpro.jwpl.revisionmachine.difftool.config.ConfigurationKeys;
+import org.dkpro.jwpl.revisionmachine.difftool.config.ConfigurationManager;
+import org.dkpro.jwpl.revisionmachine.difftool.data.tasks.content.Diff;
+import org.dkpro.jwpl.revisionmachine.difftool.data.tasks.content.DiffAction;
+import org.dkpro.jwpl.revisionmachine.difftool.data.tasks.content.DiffPart;
/**
* The RevisionDecoder class contains methods to decode an encoded diff
diff --git a/de.tudarmstadt.ukp.wikipedia.revisionmachine/src/main/java/de/tudarmstadt/ukp/wikipedia/revisionmachine/difftool/data/codec/RevisionEncoder.java b/dkpro-jwpl-revisionmachine/src/main/java/org/dkpro/jwpl/revisionmachine/difftool/data/codec/RevisionEncoder.java
similarity index 94%
rename from de.tudarmstadt.ukp.wikipedia.revisionmachine/src/main/java/de/tudarmstadt/ukp/wikipedia/revisionmachine/difftool/data/codec/RevisionEncoder.java
rename to dkpro-jwpl-revisionmachine/src/main/java/org/dkpro/jwpl/revisionmachine/difftool/data/codec/RevisionEncoder.java
index 55bd9639b..223c0698c 100644
--- a/de.tudarmstadt.ukp.wikipedia.revisionmachine/src/main/java/de/tudarmstadt/ukp/wikipedia/revisionmachine/difftool/data/codec/RevisionEncoder.java
+++ b/dkpro-jwpl-revisionmachine/src/main/java/org/dkpro/jwpl/revisionmachine/difftool/data/codec/RevisionEncoder.java
@@ -15,7 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package de.tudarmstadt.ukp.wikipedia.revisionmachine.difftool.data.codec;
+package org.dkpro.jwpl.revisionmachine.difftool.data.codec;
import java.io.ByteArrayOutputStream;
import java.io.UnsupportedEncodingException;
@@ -24,12 +24,12 @@
import org.apache.commons.codec.binary.Base64;
-import de.tudarmstadt.ukp.wikipedia.revisionmachine.common.exceptions.ConfigurationException;
-import de.tudarmstadt.ukp.wikipedia.revisionmachine.common.exceptions.EncodingException;
-import de.tudarmstadt.ukp.wikipedia.revisionmachine.difftool.config.ConfigurationKeys;
-import de.tudarmstadt.ukp.wikipedia.revisionmachine.difftool.config.ConfigurationManager;
-import de.tudarmstadt.ukp.wikipedia.revisionmachine.difftool.data.tasks.content.Diff;
-import de.tudarmstadt.ukp.wikipedia.revisionmachine.difftool.data.tasks.content.DiffPart;
+import org.dkpro.jwpl.revisionmachine.common.exceptions.ConfigurationException;
+import org.dkpro.jwpl.revisionmachine.common.exceptions.EncodingException;
+import org.dkpro.jwpl.revisionmachine.difftool.config.ConfigurationKeys;
+import org.dkpro.jwpl.revisionmachine.difftool.config.ConfigurationManager;
+import org.dkpro.jwpl.revisionmachine.difftool.data.tasks.content.Diff;
+import org.dkpro.jwpl.revisionmachine.difftool.data.tasks.content.DiffPart;
/**
* The RevisionApi class contains methods to encode the diff information.
diff --git a/de.tudarmstadt.ukp.wikipedia.revisionmachine/src/main/java/de/tudarmstadt/ukp/wikipedia/revisionmachine/difftool/data/codec/RevisionEncoderInterface.java b/dkpro-jwpl-revisionmachine/src/main/java/org/dkpro/jwpl/revisionmachine/difftool/data/codec/RevisionEncoderInterface.java
similarity index 89%
rename from de.tudarmstadt.ukp.wikipedia.revisionmachine/src/main/java/de/tudarmstadt/ukp/wikipedia/revisionmachine/difftool/data/codec/RevisionEncoderInterface.java
rename to dkpro-jwpl-revisionmachine/src/main/java/org/dkpro/jwpl/revisionmachine/difftool/data/codec/RevisionEncoderInterface.java
index f4005f168..6695d6bad 100644
--- a/de.tudarmstadt.ukp.wikipedia.revisionmachine/src/main/java/de/tudarmstadt/ukp/wikipedia/revisionmachine/difftool/data/codec/RevisionEncoderInterface.java
+++ b/dkpro-jwpl-revisionmachine/src/main/java/org/dkpro/jwpl/revisionmachine/difftool/data/codec/RevisionEncoderInterface.java
@@ -15,12 +15,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package de.tudarmstadt.ukp.wikipedia.revisionmachine.difftool.data.codec;
+package org.dkpro.jwpl.revisionmachine.difftool.data.codec;
import java.io.UnsupportedEncodingException;
-import de.tudarmstadt.ukp.wikipedia.revisionmachine.common.exceptions.EncodingException;
-import de.tudarmstadt.ukp.wikipedia.revisionmachine.difftool.data.tasks.content.Diff;
+import org.dkpro.jwpl.revisionmachine.common.exceptions.EncodingException;
+import org.dkpro.jwpl.revisionmachine.difftool.data.tasks.content.Diff;
/**
* The RevisionApi Interface describes the link to the diff encoding unit.
diff --git a/de.tudarmstadt.ukp.wikipedia.revisionmachine/src/main/java/de/tudarmstadt/ukp/wikipedia/revisionmachine/difftool/data/tasks/ISizeable.java b/dkpro-jwpl-revisionmachine/src/main/java/org/dkpro/jwpl/revisionmachine/difftool/data/tasks/ISizeable.java
similarity index 93%
rename from de.tudarmstadt.ukp.wikipedia.revisionmachine/src/main/java/de/tudarmstadt/ukp/wikipedia/revisionmachine/difftool/data/tasks/ISizeable.java
rename to dkpro-jwpl-revisionmachine/src/main/java/org/dkpro/jwpl/revisionmachine/difftool/data/tasks/ISizeable.java
index 5131c0dcd..3e44d131d 100644
--- a/de.tudarmstadt.ukp.wikipedia.revisionmachine/src/main/java/de/tudarmstadt/ukp/wikipedia/revisionmachine/difftool/data/tasks/ISizeable.java
+++ b/dkpro-jwpl-revisionmachine/src/main/java/org/dkpro/jwpl/revisionmachine/difftool/data/tasks/ISizeable.java
@@ -15,7 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package de.tudarmstadt.ukp.wikipedia.revisionmachine.difftool.data.tasks;
+package org.dkpro.jwpl.revisionmachine.difftool.data.tasks;
/**
* This interface defines a method for size estimations.
diff --git a/de.tudarmstadt.ukp.wikipedia.revisionmachine/src/main/java/de/tudarmstadt/ukp/wikipedia/revisionmachine/difftool/data/tasks/Task.java b/dkpro-jwpl-revisionmachine/src/main/java/org/dkpro/jwpl/revisionmachine/difftool/data/tasks/Task.java
similarity index 97%
rename from de.tudarmstadt.ukp.wikipedia.revisionmachine/src/main/java/de/tudarmstadt/ukp/wikipedia/revisionmachine/difftool/data/tasks/Task.java
rename to dkpro-jwpl-revisionmachine/src/main/java/org/dkpro/jwpl/revisionmachine/difftool/data/tasks/Task.java
index dc5cc916f..1607e4a46 100644
--- a/de.tudarmstadt.ukp.wikipedia.revisionmachine/src/main/java/de/tudarmstadt/ukp/wikipedia/revisionmachine/difftool/data/tasks/Task.java
+++ b/dkpro-jwpl-revisionmachine/src/main/java/org/dkpro/jwpl/revisionmachine/difftool/data/tasks/Task.java
@@ -15,12 +15,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package de.tudarmstadt.ukp.wikipedia.revisionmachine.difftool.data.tasks;
+package org.dkpro.jwpl.revisionmachine.difftool.data.tasks;
import java.util.ArrayList;
import java.util.Iterator;
-import de.tudarmstadt.ukp.wikipedia.revisionmachine.difftool.data.tasks.info.ArticleInformation;
+import org.dkpro.jwpl.revisionmachine.difftool.data.tasks.info.ArticleInformation;
/**
* The task class contains the information of a task.
diff --git a/de.tudarmstadt.ukp.wikipedia.revisionmachine/src/main/java/de/tudarmstadt/ukp/wikipedia/revisionmachine/difftool/data/tasks/TaskTypes.java b/dkpro-jwpl-revisionmachine/src/main/java/org/dkpro/jwpl/revisionmachine/difftool/data/tasks/TaskTypes.java
similarity index 94%
rename from de.tudarmstadt.ukp.wikipedia.revisionmachine/src/main/java/de/tudarmstadt/ukp/wikipedia/revisionmachine/difftool/data/tasks/TaskTypes.java
rename to dkpro-jwpl-revisionmachine/src/main/java/org/dkpro/jwpl/revisionmachine/difftool/data/tasks/TaskTypes.java
index d5813edc7..88e208b92 100644
--- a/de.tudarmstadt.ukp.wikipedia.revisionmachine/src/main/java/de/tudarmstadt/ukp/wikipedia/revisionmachine/difftool/data/tasks/TaskTypes.java
+++ b/dkpro-jwpl-revisionmachine/src/main/java/org/dkpro/jwpl/revisionmachine/difftool/data/tasks/TaskTypes.java
@@ -15,7 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package de.tudarmstadt.ukp.wikipedia.revisionmachine.difftool.data.tasks;
+package org.dkpro.jwpl.revisionmachine.difftool.data.tasks;
/**
* This Enumerator lists the different types of tasks.
diff --git a/de.tudarmstadt.ukp.wikipedia.revisionmachine/src/main/java/de/tudarmstadt/ukp/wikipedia/revisionmachine/difftool/data/tasks/content/Diff.java b/dkpro-jwpl-revisionmachine/src/main/java/org/dkpro/jwpl/revisionmachine/difftool/data/tasks/content/Diff.java
similarity index 96%
rename from de.tudarmstadt.ukp.wikipedia.revisionmachine/src/main/java/de/tudarmstadt/ukp/wikipedia/revisionmachine/difftool/data/tasks/content/Diff.java
rename to dkpro-jwpl-revisionmachine/src/main/java/org/dkpro/jwpl/revisionmachine/difftool/data/tasks/content/Diff.java
index 3f9b3948a..384ed1785 100644
--- a/de.tudarmstadt.ukp.wikipedia.revisionmachine/src/main/java/de/tudarmstadt/ukp/wikipedia/revisionmachine/difftool/data/tasks/content/Diff.java
+++ b/dkpro-jwpl-revisionmachine/src/main/java/org/dkpro/jwpl/revisionmachine/difftool/data/tasks/content/Diff.java
@@ -15,7 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package de.tudarmstadt.ukp.wikipedia.revisionmachine.difftool.data.tasks.content;
+package org.dkpro.jwpl.revisionmachine.difftool.data.tasks.content;
import java.sql.Timestamp;
import java.util.ArrayList;
@@ -23,8 +23,8 @@
import java.util.Iterator;
import java.util.List;
-import de.tudarmstadt.ukp.wikipedia.revisionmachine.difftool.data.codec.RevisionCodecData;
-import de.tudarmstadt.ukp.wikipedia.revisionmachine.difftool.data.tasks.ISizeable;
+import org.dkpro.jwpl.revisionmachine.difftool.data.codec.RevisionCodecData;
+import org.dkpro.jwpl.revisionmachine.difftool.data.tasks.ISizeable;
/**
* This class contains the diff information used to create single revision.
diff --git a/de.tudarmstadt.ukp.wikipedia.revisionmachine/src/main/java/de/tudarmstadt/ukp/wikipedia/revisionmachine/difftool/data/tasks/content/DiffAction.java b/dkpro-jwpl-revisionmachine/src/main/java/org/dkpro/jwpl/revisionmachine/difftool/data/tasks/content/DiffAction.java
similarity index 87%
rename from de.tudarmstadt.ukp.wikipedia.revisionmachine/src/main/java/de/tudarmstadt/ukp/wikipedia/revisionmachine/difftool/data/tasks/content/DiffAction.java
rename to dkpro-jwpl-revisionmachine/src/main/java/org/dkpro/jwpl/revisionmachine/difftool/data/tasks/content/DiffAction.java
index 7659506a5..02256bd26 100644
--- a/de.tudarmstadt.ukp.wikipedia.revisionmachine/src/main/java/de/tudarmstadt/ukp/wikipedia/revisionmachine/difftool/data/tasks/content/DiffAction.java
+++ b/dkpro-jwpl-revisionmachine/src/main/java/org/dkpro/jwpl/revisionmachine/difftool/data/tasks/content/DiffAction.java
@@ -15,13 +15,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package de.tudarmstadt.ukp.wikipedia.revisionmachine.difftool.data.tasks.content;
+package org.dkpro.jwpl.revisionmachine.difftool.data.tasks.content;
import java.io.Serializable;
-import de.tudarmstadt.ukp.wikipedia.revisionmachine.common.exceptions.DecodingException;
-import de.tudarmstadt.ukp.wikipedia.revisionmachine.common.exceptions.ErrorFactory;
-import de.tudarmstadt.ukp.wikipedia.revisionmachine.common.exceptions.ErrorKeys;
+import org.dkpro.jwpl.revisionmachine.common.exceptions.DecodingException;
+import org.dkpro.jwpl.revisionmachine.common.exceptions.ErrorFactory;
+import org.dkpro.jwpl.revisionmachine.common.exceptions.ErrorKeys;
/**
* This class contains the constants for the DiffActions.
diff --git a/de.tudarmstadt.ukp.wikipedia.revisionmachine/src/main/java/de/tudarmstadt/ukp/wikipedia/revisionmachine/difftool/data/tasks/content/DiffPart.java b/dkpro-jwpl-revisionmachine/src/main/java/org/dkpro/jwpl/revisionmachine/difftool/data/tasks/content/DiffPart.java
similarity index 97%
rename from de.tudarmstadt.ukp.wikipedia.revisionmachine/src/main/java/de/tudarmstadt/ukp/wikipedia/revisionmachine/difftool/data/tasks/content/DiffPart.java
rename to dkpro-jwpl-revisionmachine/src/main/java/org/dkpro/jwpl/revisionmachine/difftool/data/tasks/content/DiffPart.java
index 8f795f4fe..7a18a6f81 100644
--- a/de.tudarmstadt.ukp.wikipedia.revisionmachine/src/main/java/de/tudarmstadt/ukp/wikipedia/revisionmachine/difftool/data/tasks/content/DiffPart.java
+++ b/dkpro-jwpl-revisionmachine/src/main/java/org/dkpro/jwpl/revisionmachine/difftool/data/tasks/content/DiffPart.java
@@ -15,7 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package de.tudarmstadt.ukp.wikipedia.revisionmachine.difftool.data.tasks.content;
+package org.dkpro.jwpl.revisionmachine.difftool.data.tasks.content;
import java.io.Serializable;
diff --git a/de.tudarmstadt.ukp.wikipedia.revisionmachine/src/main/java/de/tudarmstadt/ukp/wikipedia/revisionmachine/difftool/data/tasks/info/ArticleInformation.java b/dkpro-jwpl-revisionmachine/src/main/java/org/dkpro/jwpl/revisionmachine/difftool/data/tasks/info/ArticleInformation.java
similarity index 97%
rename from de.tudarmstadt.ukp.wikipedia.revisionmachine/src/main/java/de/tudarmstadt/ukp/wikipedia/revisionmachine/difftool/data/tasks/info/ArticleInformation.java
rename to dkpro-jwpl-revisionmachine/src/main/java/org/dkpro/jwpl/revisionmachine/difftool/data/tasks/info/ArticleInformation.java
index 4a8081475..eb0edd0f7 100644
--- a/de.tudarmstadt.ukp.wikipedia.revisionmachine/src/main/java/de/tudarmstadt/ukp/wikipedia/revisionmachine/difftool/data/tasks/info/ArticleInformation.java
+++ b/dkpro-jwpl-revisionmachine/src/main/java/org/dkpro/jwpl/revisionmachine/difftool/data/tasks/info/ArticleInformation.java
@@ -15,10 +15,10 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package de.tudarmstadt.ukp.wikipedia.revisionmachine.difftool.data.tasks.info;
+package org.dkpro.jwpl.revisionmachine.difftool.data.tasks.info;
-import de.tudarmstadt.ukp.wikipedia.revisionmachine.common.util.MathUtilities;
-import de.tudarmstadt.ukp.wikipedia.revisionmachine.common.util.Time;
+import org.dkpro.jwpl.revisionmachine.common.util.MathUtilities;
+import org.dkpro.jwpl.revisionmachine.common.util.Time;
/**
* This class contains all statistical information related to one article.
diff --git a/de.tudarmstadt.ukp.wikipedia.revisionmachine/src/main/java/de/tudarmstadt/ukp/wikipedia/revisionmachine/index/IndexGenerator.java b/dkpro-jwpl-revisionmachine/src/main/java/org/dkpro/jwpl/revisionmachine/index/IndexGenerator.java
similarity index 93%
rename from de.tudarmstadt.ukp.wikipedia.revisionmachine/src/main/java/de/tudarmstadt/ukp/wikipedia/revisionmachine/index/IndexGenerator.java
rename to dkpro-jwpl-revisionmachine/src/main/java/org/dkpro/jwpl/revisionmachine/index/IndexGenerator.java
index b0a48e8b4..b7cd64b0d 100644
--- a/de.tudarmstadt.ukp.wikipedia.revisionmachine/src/main/java/de/tudarmstadt/ukp/wikipedia/revisionmachine/index/IndexGenerator.java
+++ b/dkpro-jwpl-revisionmachine/src/main/java/org/dkpro/jwpl/revisionmachine/index/IndexGenerator.java
@@ -15,7 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package de.tudarmstadt.ukp.wikipedia.revisionmachine.index;
+package org.dkpro.jwpl.revisionmachine.index;
import java.io.BufferedInputStream;
import java.io.File;
@@ -24,11 +24,11 @@
import java.util.Iterator;
import java.util.Properties;
-import de.tudarmstadt.ukp.wikipedia.api.exception.WikiApiException;
-import de.tudarmstadt.ukp.wikipedia.revisionmachine.api.Revision;
-import de.tudarmstadt.ukp.wikipedia.revisionmachine.api.RevisionAPIConfiguration;
-import de.tudarmstadt.ukp.wikipedia.revisionmachine.common.util.Time;
-import de.tudarmstadt.ukp.wikipedia.revisionmachine.difftool.config.OutputTypes;
+import org.dkpro.jwpl.api.exception.WikiApiException;
+import org.dkpro.jwpl.revisionmachine.api.Revision;
+import org.dkpro.jwpl.revisionmachine.api.RevisionAPIConfiguration;
+import org.dkpro.jwpl.revisionmachine.common.util.Time;
+import org.dkpro.jwpl.revisionmachine.difftool.config.OutputTypes;
/**
* Generates the indices for the database.
diff --git a/de.tudarmstadt.ukp.wikipedia.revisionmachine/src/main/java/de/tudarmstadt/ukp/wikipedia/revisionmachine/index/IndexIterator.java b/dkpro-jwpl-revisionmachine/src/main/java/org/dkpro/jwpl/revisionmachine/index/IndexIterator.java
similarity index 94%
rename from de.tudarmstadt.ukp.wikipedia.revisionmachine/src/main/java/de/tudarmstadt/ukp/wikipedia/revisionmachine/index/IndexIterator.java
rename to dkpro-jwpl-revisionmachine/src/main/java/org/dkpro/jwpl/revisionmachine/index/IndexIterator.java
index 38deee8fd..0399e48d0 100644
--- a/de.tudarmstadt.ukp.wikipedia.revisionmachine/src/main/java/de/tudarmstadt/ukp/wikipedia/revisionmachine/index/IndexIterator.java
+++ b/dkpro-jwpl-revisionmachine/src/main/java/org/dkpro/jwpl/revisionmachine/index/IndexIterator.java
@@ -15,7 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package de.tudarmstadt.ukp.wikipedia.revisionmachine.index;
+package org.dkpro.jwpl.revisionmachine.index;
import java.sql.Connection;
import java.sql.DriverManager;
@@ -25,9 +25,9 @@
import java.sql.Timestamp;
import java.util.Iterator;
-import de.tudarmstadt.ukp.wikipedia.api.exception.WikiApiException;
-import de.tudarmstadt.ukp.wikipedia.revisionmachine.api.Revision;
-import de.tudarmstadt.ukp.wikipedia.revisionmachine.api.RevisionAPIConfiguration;
+import org.dkpro.jwpl.api.exception.WikiApiException;
+import org.dkpro.jwpl.revisionmachine.api.Revision;
+import org.dkpro.jwpl.revisionmachine.api.RevisionAPIConfiguration;
/**
* Iterates over the database to retrieve the necessary information for the
diff --git a/de.tudarmstadt.ukp.wikipedia.revisionmachine/src/main/java/de/tudarmstadt/ukp/wikipedia/revisionmachine/index/Indexer.java b/dkpro-jwpl-revisionmachine/src/main/java/org/dkpro/jwpl/revisionmachine/index/Indexer.java
similarity index 88%
rename from de.tudarmstadt.ukp.wikipedia.revisionmachine/src/main/java/de/tudarmstadt/ukp/wikipedia/revisionmachine/index/Indexer.java
rename to dkpro-jwpl-revisionmachine/src/main/java/org/dkpro/jwpl/revisionmachine/index/Indexer.java
index 5526486ef..798005a29 100644
--- a/de.tudarmstadt.ukp.wikipedia.revisionmachine/src/main/java/de/tudarmstadt/ukp/wikipedia/revisionmachine/index/Indexer.java
+++ b/dkpro-jwpl-revisionmachine/src/main/java/org/dkpro/jwpl/revisionmachine/index/Indexer.java
@@ -15,7 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package de.tudarmstadt.ukp.wikipedia.revisionmachine.index;
+package org.dkpro.jwpl.revisionmachine.index;
import java.io.IOException;
import java.sql.Connection;
@@ -23,17 +23,17 @@
import java.util.ArrayList;
import java.util.List;
-import de.tudarmstadt.ukp.wikipedia.api.exception.WikiApiException;
-import de.tudarmstadt.ukp.wikipedia.revisionmachine.api.Revision;
-import de.tudarmstadt.ukp.wikipedia.revisionmachine.api.RevisionAPIConfiguration;
-import de.tudarmstadt.ukp.wikipedia.revisionmachine.index.indices.ArticleIndex;
-import de.tudarmstadt.ukp.wikipedia.revisionmachine.index.indices.ArticleIndexData;
-import de.tudarmstadt.ukp.wikipedia.revisionmachine.index.indices.ChronoIndex;
-import de.tudarmstadt.ukp.wikipedia.revisionmachine.index.indices.RevisionIndex;
-import de.tudarmstadt.ukp.wikipedia.revisionmachine.index.writer.DataFileWriter;
-import de.tudarmstadt.ukp.wikipedia.revisionmachine.index.writer.DatabaseWriter;
-import de.tudarmstadt.ukp.wikipedia.revisionmachine.index.writer.IndexWriterInterface;
-import de.tudarmstadt.ukp.wikipedia.revisionmachine.index.writer.SQLFileWriter;
+import org.dkpro.jwpl.api.exception.WikiApiException;
+import org.dkpro.jwpl.revisionmachine.api.Revision;
+import org.dkpro.jwpl.revisionmachine.api.RevisionAPIConfiguration;
+import org.dkpro.jwpl.revisionmachine.index.indices.ArticleIndex;
+import org.dkpro.jwpl.revisionmachine.index.indices.ArticleIndexData;
+import org.dkpro.jwpl.revisionmachine.index.indices.ChronoIndex;
+import org.dkpro.jwpl.revisionmachine.index.indices.RevisionIndex;
+import org.dkpro.jwpl.revisionmachine.index.writer.DataFileWriter;
+import org.dkpro.jwpl.revisionmachine.index.writer.DatabaseWriter;
+import org.dkpro.jwpl.revisionmachine.index.writer.IndexWriterInterface;
+import org.dkpro.jwpl.revisionmachine.index.writer.SQLFileWriter;
/**
* Forwards the necessary information to the AbstractIndex classes and controls
diff --git a/de.tudarmstadt.ukp.wikipedia.revisionmachine/src/main/java/de/tudarmstadt/ukp/wikipedia/revisionmachine/index/indices/AbstractIndex.java b/dkpro-jwpl-revisionmachine/src/main/java/org/dkpro/jwpl/revisionmachine/index/indices/AbstractIndex.java
similarity index 97%
rename from de.tudarmstadt.ukp.wikipedia.revisionmachine/src/main/java/de/tudarmstadt/ukp/wikipedia/revisionmachine/index/indices/AbstractIndex.java
rename to dkpro-jwpl-revisionmachine/src/main/java/org/dkpro/jwpl/revisionmachine/index/indices/AbstractIndex.java
index 22d6da93d..adc4ece55 100644
--- a/de.tudarmstadt.ukp.wikipedia.revisionmachine/src/main/java/de/tudarmstadt/ukp/wikipedia/revisionmachine/index/indices/AbstractIndex.java
+++ b/dkpro-jwpl-revisionmachine/src/main/java/org/dkpro/jwpl/revisionmachine/index/indices/AbstractIndex.java
@@ -15,7 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package de.tudarmstadt.ukp.wikipedia.revisionmachine.index.indices;
+package org.dkpro.jwpl.revisionmachine.index.indices;
import java.util.ArrayList;
import java.util.List;
diff --git a/de.tudarmstadt.ukp.wikipedia.revisionmachine/src/main/java/de/tudarmstadt/ukp/wikipedia/revisionmachine/index/indices/ArticleIndex.java b/dkpro-jwpl-revisionmachine/src/main/java/org/dkpro/jwpl/revisionmachine/index/indices/ArticleIndex.java
similarity index 97%
rename from de.tudarmstadt.ukp.wikipedia.revisionmachine/src/main/java/de/tudarmstadt/ukp/wikipedia/revisionmachine/index/indices/ArticleIndex.java
rename to dkpro-jwpl-revisionmachine/src/main/java/org/dkpro/jwpl/revisionmachine/index/indices/ArticleIndex.java
index cbc0e64e6..9e4d02cba 100644
--- a/de.tudarmstadt.ukp.wikipedia.revisionmachine/src/main/java/de/tudarmstadt/ukp/wikipedia/revisionmachine/index/indices/ArticleIndex.java
+++ b/dkpro-jwpl-revisionmachine/src/main/java/org/dkpro/jwpl/revisionmachine/index/indices/ArticleIndex.java
@@ -15,7 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package de.tudarmstadt.ukp.wikipedia.revisionmachine.index.indices;
+package org.dkpro.jwpl.revisionmachine.index.indices;
import java.util.List;
diff --git a/de.tudarmstadt.ukp.wikipedia.revisionmachine/src/main/java/de/tudarmstadt/ukp/wikipedia/revisionmachine/index/indices/ArticleIndexData.java b/dkpro-jwpl-revisionmachine/src/main/java/org/dkpro/jwpl/revisionmachine/index/indices/ArticleIndexData.java
similarity index 97%
rename from de.tudarmstadt.ukp.wikipedia.revisionmachine/src/main/java/de/tudarmstadt/ukp/wikipedia/revisionmachine/index/indices/ArticleIndexData.java
rename to dkpro-jwpl-revisionmachine/src/main/java/org/dkpro/jwpl/revisionmachine/index/indices/ArticleIndexData.java
index e1a905311..503b31d7e 100644
--- a/de.tudarmstadt.ukp.wikipedia.revisionmachine/src/main/java/de/tudarmstadt/ukp/wikipedia/revisionmachine/index/indices/ArticleIndexData.java
+++ b/dkpro-jwpl-revisionmachine/src/main/java/org/dkpro/jwpl/revisionmachine/index/indices/ArticleIndexData.java
@@ -15,7 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package de.tudarmstadt.ukp.wikipedia.revisionmachine.index.indices;
+package org.dkpro.jwpl.revisionmachine.index.indices;
/**
* This class represents the data used by the ArticleIndex. One objects
diff --git a/de.tudarmstadt.ukp.wikipedia.revisionmachine/src/main/java/de/tudarmstadt/ukp/wikipedia/revisionmachine/index/indices/ChronoIndex.java b/dkpro-jwpl-revisionmachine/src/main/java/org/dkpro/jwpl/revisionmachine/index/indices/ChronoIndex.java
similarity index 98%
rename from de.tudarmstadt.ukp.wikipedia.revisionmachine/src/main/java/de/tudarmstadt/ukp/wikipedia/revisionmachine/index/indices/ChronoIndex.java
rename to dkpro-jwpl-revisionmachine/src/main/java/org/dkpro/jwpl/revisionmachine/index/indices/ChronoIndex.java
index 6412554e9..249377acd 100644
--- a/de.tudarmstadt.ukp.wikipedia.revisionmachine/src/main/java/de/tudarmstadt/ukp/wikipedia/revisionmachine/index/indices/ChronoIndex.java
+++ b/dkpro-jwpl-revisionmachine/src/main/java/org/dkpro/jwpl/revisionmachine/index/indices/ChronoIndex.java
@@ -15,7 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package de.tudarmstadt.ukp.wikipedia.revisionmachine.index.indices;
+package org.dkpro.jwpl.revisionmachine.index.indices;
import java.util.ArrayList;
import java.util.Collections;
diff --git a/de.tudarmstadt.ukp.wikipedia.revisionmachine/src/main/java/de/tudarmstadt/ukp/wikipedia/revisionmachine/index/indices/ChronoIndexData.java b/dkpro-jwpl-revisionmachine/src/main/java/org/dkpro/jwpl/revisionmachine/index/indices/ChronoIndexData.java
similarity index 97%
rename from de.tudarmstadt.ukp.wikipedia.revisionmachine/src/main/java/de/tudarmstadt/ukp/wikipedia/revisionmachine/index/indices/ChronoIndexData.java
rename to dkpro-jwpl-revisionmachine/src/main/java/org/dkpro/jwpl/revisionmachine/index/indices/ChronoIndexData.java
index 614b0926d..6b50ed978 100644
--- a/de.tudarmstadt.ukp.wikipedia.revisionmachine/src/main/java/de/tudarmstadt/ukp/wikipedia/revisionmachine/index/indices/ChronoIndexData.java
+++ b/dkpro-jwpl-revisionmachine/src/main/java/org/dkpro/jwpl/revisionmachine/index/indices/ChronoIndexData.java
@@ -15,7 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package de.tudarmstadt.ukp.wikipedia.revisionmachine.index.indices;
+package org.dkpro.jwpl.revisionmachine.index.indices;
/**
* This class represents the data used by the ChronoIndex.
diff --git a/de.tudarmstadt.ukp.wikipedia.revisionmachine/src/main/java/de/tudarmstadt/ukp/wikipedia/revisionmachine/index/indices/RevisionIndex.java b/dkpro-jwpl-revisionmachine/src/main/java/org/dkpro/jwpl/revisionmachine/index/indices/RevisionIndex.java
similarity index 96%
rename from de.tudarmstadt.ukp.wikipedia.revisionmachine/src/main/java/de/tudarmstadt/ukp/wikipedia/revisionmachine/index/indices/RevisionIndex.java
rename to dkpro-jwpl-revisionmachine/src/main/java/org/dkpro/jwpl/revisionmachine/index/indices/RevisionIndex.java
index b83eb2ebb..a5306aca2 100644
--- a/de.tudarmstadt.ukp.wikipedia.revisionmachine/src/main/java/de/tudarmstadt/ukp/wikipedia/revisionmachine/index/indices/RevisionIndex.java
+++ b/dkpro-jwpl-revisionmachine/src/main/java/org/dkpro/jwpl/revisionmachine/index/indices/RevisionIndex.java
@@ -15,7 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package de.tudarmstadt.ukp.wikipedia.revisionmachine.index.indices;
+package org.dkpro.jwpl.revisionmachine.index.indices;
/**
* Index for revision information.
diff --git a/de.tudarmstadt.ukp.wikipedia.revisionmachine/src/main/java/de/tudarmstadt/ukp/wikipedia/revisionmachine/index/writer/DataFileWriter.java b/dkpro-jwpl-revisionmachine/src/main/java/org/dkpro/jwpl/revisionmachine/index/writer/DataFileWriter.java
similarity index 90%
rename from de.tudarmstadt.ukp.wikipedia.revisionmachine/src/main/java/de/tudarmstadt/ukp/wikipedia/revisionmachine/index/writer/DataFileWriter.java
rename to dkpro-jwpl-revisionmachine/src/main/java/org/dkpro/jwpl/revisionmachine/index/writer/DataFileWriter.java
index 3d4714439..6a81abde1 100644
--- a/de.tudarmstadt.ukp.wikipedia.revisionmachine/src/main/java/de/tudarmstadt/ukp/wikipedia/revisionmachine/index/writer/DataFileWriter.java
+++ b/dkpro-jwpl-revisionmachine/src/main/java/org/dkpro/jwpl/revisionmachine/index/writer/DataFileWriter.java
@@ -15,7 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package de.tudarmstadt.ukp.wikipedia.revisionmachine.index.writer;
+package org.dkpro.jwpl.revisionmachine.index.writer;
import java.io.BufferedWriter;
import java.io.File;
@@ -23,11 +23,11 @@
import java.io.IOException;
import java.io.Writer;
-import de.tudarmstadt.ukp.wikipedia.revisionmachine.api.RevisionAPIConfiguration;
-import de.tudarmstadt.ukp.wikipedia.revisionmachine.index.indices.AbstractIndex;
-import de.tudarmstadt.ukp.wikipedia.revisionmachine.index.indices.ArticleIndex;
-import de.tudarmstadt.ukp.wikipedia.revisionmachine.index.indices.ChronoIndex;
-import de.tudarmstadt.ukp.wikipedia.revisionmachine.index.indices.RevisionIndex;
+import org.dkpro.jwpl.revisionmachine.api.RevisionAPIConfiguration;
+import org.dkpro.jwpl.revisionmachine.index.indices.AbstractIndex;
+import org.dkpro.jwpl.revisionmachine.index.indices.ArticleIndex;
+import org.dkpro.jwpl.revisionmachine.index.indices.ChronoIndex;
+import org.dkpro.jwpl.revisionmachine.index.indices.RevisionIndex;
/**
* This class writes the output of the index generator to an sql file.
diff --git a/de.tudarmstadt.ukp.wikipedia.revisionmachine/src/main/java/de/tudarmstadt/ukp/wikipedia/revisionmachine/index/writer/DatabaseWriter.java b/dkpro-jwpl-revisionmachine/src/main/java/org/dkpro/jwpl/revisionmachine/index/writer/DatabaseWriter.java
similarity index 95%
rename from de.tudarmstadt.ukp.wikipedia.revisionmachine/src/main/java/de/tudarmstadt/ukp/wikipedia/revisionmachine/index/writer/DatabaseWriter.java
rename to dkpro-jwpl-revisionmachine/src/main/java/org/dkpro/jwpl/revisionmachine/index/writer/DatabaseWriter.java
index 0f0a81df0..cd7ee7655 100644
--- a/de.tudarmstadt.ukp.wikipedia.revisionmachine/src/main/java/de/tudarmstadt/ukp/wikipedia/revisionmachine/index/writer/DatabaseWriter.java
+++ b/dkpro-jwpl-revisionmachine/src/main/java/org/dkpro/jwpl/revisionmachine/index/writer/DatabaseWriter.java
@@ -15,15 +15,15 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package de.tudarmstadt.ukp.wikipedia.revisionmachine.index.writer;
+package org.dkpro.jwpl.revisionmachine.index.writer;
import java.sql.Connection;
import java.sql.DriverManager;
import java.sql.SQLException;
import java.sql.Statement;
-import de.tudarmstadt.ukp.wikipedia.revisionmachine.api.RevisionAPIConfiguration;
-import de.tudarmstadt.ukp.wikipedia.revisionmachine.index.indices.AbstractIndex;
+import org.dkpro.jwpl.revisionmachine.api.RevisionAPIConfiguration;
+import org.dkpro.jwpl.revisionmachine.index.indices.AbstractIndex;
/**
* This class writes the output of the index generator to a database.
diff --git a/de.tudarmstadt.ukp.wikipedia.revisionmachine/src/main/java/de/tudarmstadt/ukp/wikipedia/revisionmachine/index/writer/IndexWriterInterface.java b/dkpro-jwpl-revisionmachine/src/main/java/org/dkpro/jwpl/revisionmachine/index/writer/IndexWriterInterface.java
similarity index 93%
rename from de.tudarmstadt.ukp.wikipedia.revisionmachine/src/main/java/de/tudarmstadt/ukp/wikipedia/revisionmachine/index/writer/IndexWriterInterface.java
rename to dkpro-jwpl-revisionmachine/src/main/java/org/dkpro/jwpl/revisionmachine/index/writer/IndexWriterInterface.java
index 5b39ac461..cab601b71 100644
--- a/de.tudarmstadt.ukp.wikipedia.revisionmachine/src/main/java/de/tudarmstadt/ukp/wikipedia/revisionmachine/index/writer/IndexWriterInterface.java
+++ b/dkpro-jwpl-revisionmachine/src/main/java/org/dkpro/jwpl/revisionmachine/index/writer/IndexWriterInterface.java
@@ -15,12 +15,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package de.tudarmstadt.ukp.wikipedia.revisionmachine.index.writer;
+package org.dkpro.jwpl.revisionmachine.index.writer;
import java.io.IOException;
import java.sql.SQLException;
-import de.tudarmstadt.ukp.wikipedia.revisionmachine.index.indices.AbstractIndex;
+import org.dkpro.jwpl.revisionmachine.index.indices.AbstractIndex;
/**
* Interface for the IndexWriter
diff --git a/de.tudarmstadt.ukp.wikipedia.revisionmachine/src/main/java/de/tudarmstadt/ukp/wikipedia/revisionmachine/index/writer/SQLFileWriter.java b/dkpro-jwpl-revisionmachine/src/main/java/org/dkpro/jwpl/revisionmachine/index/writer/SQLFileWriter.java
similarity index 94%
rename from de.tudarmstadt.ukp.wikipedia.revisionmachine/src/main/java/de/tudarmstadt/ukp/wikipedia/revisionmachine/index/writer/SQLFileWriter.java
rename to dkpro-jwpl-revisionmachine/src/main/java/org/dkpro/jwpl/revisionmachine/index/writer/SQLFileWriter.java
index 02c376a40..e64728ae6 100644
--- a/de.tudarmstadt.ukp.wikipedia.revisionmachine/src/main/java/de/tudarmstadt/ukp/wikipedia/revisionmachine/index/writer/SQLFileWriter.java
+++ b/dkpro-jwpl-revisionmachine/src/main/java/org/dkpro/jwpl/revisionmachine/index/writer/SQLFileWriter.java
@@ -15,7 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package de.tudarmstadt.ukp.wikipedia.revisionmachine.index.writer;
+package org.dkpro.jwpl.revisionmachine.index.writer;
import java.io.BufferedWriter;
import java.io.File;
@@ -23,8 +23,8 @@
import java.io.IOException;
import java.io.Writer;
-import de.tudarmstadt.ukp.wikipedia.revisionmachine.api.RevisionAPIConfiguration;
-import de.tudarmstadt.ukp.wikipedia.revisionmachine.index.indices.AbstractIndex;
+import org.dkpro.jwpl.revisionmachine.api.RevisionAPIConfiguration;
+import org.dkpro.jwpl.revisionmachine.index.indices.AbstractIndex;
/**
* This class writes the output of the index generator to an sql file.
diff --git a/de.tudarmstadt.ukp.wikipedia.revisionmachine/src/main/resources/configSamples/diffTool_config_sample.xml b/dkpro-jwpl-revisionmachine/src/main/resources/configSamples/diffTool_config_sample.xml
similarity index 100%
rename from de.tudarmstadt.ukp.wikipedia.revisionmachine/src/main/resources/configSamples/diffTool_config_sample.xml
rename to dkpro-jwpl-revisionmachine/src/main/resources/configSamples/diffTool_config_sample.xml
diff --git a/de.tudarmstadt.ukp.wikipedia.revisionmachine/src/main/resources/configSamples/indexGenerator_config_sample b/dkpro-jwpl-revisionmachine/src/main/resources/configSamples/indexGenerator_config_sample
similarity index 95%
rename from de.tudarmstadt.ukp.wikipedia.revisionmachine/src/main/resources/configSamples/indexGenerator_config_sample
rename to dkpro-jwpl-revisionmachine/src/main/resources/configSamples/indexGenerator_config_sample
index 334a1f511..5f1de8156 100644
--- a/de.tudarmstadt.ukp.wikipedia.revisionmachine/src/main/resources/configSamples/indexGenerator_config_sample
+++ b/dkpro-jwpl-revisionmachine/src/main/resources/configSamples/indexGenerator_config_sample
@@ -1,10 +1,10 @@
-host=localhost
-db=wiki_en_20110405_rev
-user=student
-password=student
-output=target
-outputDatabase=false
-outputDatafile=false
-charset=UTF8
-buffer=15000
+host=localhost
+db=wiki_en_20110405_rev
+user=student
+password=student
+output=target
+outputDatabase=false
+outputDatafile=false
+charset=UTF8
+buffer=15000
maxAllowedPackets=16760832
\ No newline at end of file
diff --git a/de.tudarmstadt.ukp.wikipedia.revisionmachine/src/main/resources/log4j2.xml b/dkpro-jwpl-revisionmachine/src/main/resources/log4j2.xml
similarity index 93%
rename from de.tudarmstadt.ukp.wikipedia.revisionmachine/src/main/resources/log4j2.xml
rename to dkpro-jwpl-revisionmachine/src/main/resources/log4j2.xml
index 4c602230a..dbf42f091 100644
--- a/de.tudarmstadt.ukp.wikipedia.revisionmachine/src/main/resources/log4j2.xml
+++ b/dkpro-jwpl-revisionmachine/src/main/resources/log4j2.xml
@@ -26,11 +26,11 @@
-
+
-
+
diff --git a/de.tudarmstadt.ukp.wikipedia.revisionmachine/src/test/java/de/tudarmstadt/ukp/wikipedia/revisionmachine/BaseJWPLTest.java b/dkpro-jwpl-revisionmachine/src/test/java/org/dkpro/jwpl/revisionmachine/BaseJWPLTest.java
similarity index 85%
rename from de.tudarmstadt.ukp.wikipedia.revisionmachine/src/test/java/de/tudarmstadt/ukp/wikipedia/revisionmachine/BaseJWPLTest.java
rename to dkpro-jwpl-revisionmachine/src/test/java/org/dkpro/jwpl/revisionmachine/BaseJWPLTest.java
index 308efc215..5c4f89da6 100644
--- a/de.tudarmstadt.ukp.wikipedia.revisionmachine/src/test/java/de/tudarmstadt/ukp/wikipedia/revisionmachine/BaseJWPLTest.java
+++ b/dkpro-jwpl-revisionmachine/src/test/java/org/dkpro/jwpl/revisionmachine/BaseJWPLTest.java
@@ -15,11 +15,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package de.tudarmstadt.ukp.wikipedia.revisionmachine;
+package org.dkpro.jwpl.revisionmachine;
-import de.tudarmstadt.ukp.wikipedia.api.DatabaseConfiguration;
-import de.tudarmstadt.ukp.wikipedia.api.WikiConstants.Language;
-import de.tudarmstadt.ukp.wikipedia.api.Wikipedia;
+import org.dkpro.jwpl.api.DatabaseConfiguration;
+import org.dkpro.jwpl.api.WikiConstants.Language;
+import org.dkpro.jwpl.api.Wikipedia;
/**
* Simple test base class to inject the same hsqldb test context into every test
diff --git a/de.tudarmstadt.ukp.wikipedia.revisionmachine/src/test/java/de/tudarmstadt/ukp/wikipedia/revisionmachine/RevisionApiTest.java b/dkpro-jwpl-revisionmachine/src/test/java/org/dkpro/jwpl/revisionmachine/RevisionApiTest.java
similarity index 94%
rename from de.tudarmstadt.ukp.wikipedia.revisionmachine/src/test/java/de/tudarmstadt/ukp/wikipedia/revisionmachine/RevisionApiTest.java
rename to dkpro-jwpl-revisionmachine/src/test/java/org/dkpro/jwpl/revisionmachine/RevisionApiTest.java
index cf8022438..980c2f9b4 100644
--- a/de.tudarmstadt.ukp.wikipedia.revisionmachine/src/test/java/de/tudarmstadt/ukp/wikipedia/revisionmachine/RevisionApiTest.java
+++ b/dkpro-jwpl-revisionmachine/src/test/java/org/dkpro/jwpl/revisionmachine/RevisionApiTest.java
@@ -15,7 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package de.tudarmstadt.ukp.wikipedia.revisionmachine;
+package org.dkpro.jwpl.revisionmachine;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
@@ -28,14 +28,17 @@
import java.time.ZoneOffset;
import java.util.Calendar;
-import org.junit.*;
-
-import de.tudarmstadt.ukp.wikipedia.api.DatabaseConfiguration;
-import de.tudarmstadt.ukp.wikipedia.api.WikiConstants.Language;
-import de.tudarmstadt.ukp.wikipedia.api.Wikipedia;
-import de.tudarmstadt.ukp.wikipedia.api.exception.WikiApiException;
-import de.tudarmstadt.ukp.wikipedia.revisionmachine.api.Revision;
-import de.tudarmstadt.ukp.wikipedia.revisionmachine.api.RevisionApi;
+import org.dkpro.jwpl.api.DatabaseConfiguration;
+import org.dkpro.jwpl.api.WikiConstants.Language;
+import org.dkpro.jwpl.api.Wikipedia;
+import org.dkpro.jwpl.api.exception.WikiApiException;
+import org.dkpro.jwpl.revisionmachine.api.Revision;
+import org.dkpro.jwpl.revisionmachine.api.RevisionApi;
+import org.junit.After;
+import org.junit.Assert;
+import org.junit.Before;
+import org.junit.BeforeClass;
+import org.junit.Test;
public class RevisionApiTest extends BaseJWPLTest {
diff --git a/de.tudarmstadt.ukp.wikipedia.revisionmachine/src/test/java/de/tudarmstadt/ukp/wikipedia/revisionmachine/RevisionIteratorTest.java b/dkpro-jwpl-revisionmachine/src/test/java/org/dkpro/jwpl/revisionmachine/RevisionIteratorTest.java
similarity index 88%
rename from de.tudarmstadt.ukp.wikipedia.revisionmachine/src/test/java/de/tudarmstadt/ukp/wikipedia/revisionmachine/RevisionIteratorTest.java
rename to dkpro-jwpl-revisionmachine/src/test/java/org/dkpro/jwpl/revisionmachine/RevisionIteratorTest.java
index b2242c28b..958cc7972 100644
--- a/de.tudarmstadt.ukp.wikipedia.revisionmachine/src/test/java/de/tudarmstadt/ukp/wikipedia/revisionmachine/RevisionIteratorTest.java
+++ b/dkpro-jwpl-revisionmachine/src/test/java/org/dkpro/jwpl/revisionmachine/RevisionIteratorTest.java
@@ -15,22 +15,24 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package de.tudarmstadt.ukp.wikipedia.revisionmachine;
+package org.dkpro.jwpl.revisionmachine;
import static org.junit.Assert.*;
import java.sql.SQLException;
import java.util.ArrayList;
-import org.junit.*;
-
-import de.tudarmstadt.ukp.wikipedia.api.DatabaseConfiguration;
-import de.tudarmstadt.ukp.wikipedia.api.WikiConstants.Language;
-import de.tudarmstadt.ukp.wikipedia.api.Wikipedia;
-import de.tudarmstadt.ukp.wikipedia.api.exception.WikiApiException;
-import de.tudarmstadt.ukp.wikipedia.revisionmachine.api.Revision;
-import de.tudarmstadt.ukp.wikipedia.revisionmachine.api.RevisionAPIConfiguration;
-import de.tudarmstadt.ukp.wikipedia.revisionmachine.api.RevisionIterator;
+import org.dkpro.jwpl.api.DatabaseConfiguration;
+import org.dkpro.jwpl.api.WikiConstants.Language;
+import org.dkpro.jwpl.api.Wikipedia;
+import org.dkpro.jwpl.api.exception.WikiApiException;
+import org.dkpro.jwpl.revisionmachine.api.Revision;
+import org.dkpro.jwpl.revisionmachine.api.RevisionAPIConfiguration;
+import org.dkpro.jwpl.revisionmachine.api.RevisionIterator;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.BeforeClass;
+import org.junit.Test;
public class RevisionIteratorTest extends BaseJWPLTest {
diff --git a/de.tudarmstadt.ukp.wikipedia.revisionmachine/src/test/resources/db/wikiapi_simple_20090119_stripped.script b/dkpro-jwpl-revisionmachine/src/test/resources/db/wikiapi_simple_20090119_stripped.script
similarity index 99%
rename from de.tudarmstadt.ukp.wikipedia.revisionmachine/src/test/resources/db/wikiapi_simple_20090119_stripped.script
rename to dkpro-jwpl-revisionmachine/src/test/resources/db/wikiapi_simple_20090119_stripped.script
index fc22988a8..34dc9e851 100644
--- a/de.tudarmstadt.ukp.wikipedia.revisionmachine/src/test/resources/db/wikiapi_simple_20090119_stripped.script
+++ b/dkpro-jwpl-revisionmachine/src/test/resources/db/wikiapi_simple_20090119_stripped.script
@@ -29,7 +29,7 @@ SET FILES NIO TRUE
SET FILES NIO SIZE 256
SET FILES LOG TRUE
SET FILES LOG SIZE 200
-SET FILES CHECK 229
+SET FILES CHECK 1512
SET DATABASE COLLATION "German" NO PAD
CREATE USER SA PASSWORD DIGEST 'd41d8cd98f00b204e9800998ecf8427e'
CREATE SCHEMA PUBLIC AUTHORIZATION DBA
diff --git a/de.tudarmstadt.ukp.wikipedia.revisionmachine/src/test/resources/log4j2.xml b/dkpro-jwpl-revisionmachine/src/test/resources/log4j2.xml
similarity index 100%
rename from de.tudarmstadt.ukp.wikipedia.revisionmachine/src/test/resources/log4j2.xml
rename to dkpro-jwpl-revisionmachine/src/test/resources/log4j2.xml
diff --git a/de.tudarmstadt.ukp.wikipedia.timemachine/.activate_rat-check b/dkpro-jwpl-timemachine/.activate_rat-check
similarity index 100%
rename from de.tudarmstadt.ukp.wikipedia.timemachine/.activate_rat-check
rename to dkpro-jwpl-timemachine/.activate_rat-check
diff --git a/de.tudarmstadt.ukp.wikipedia.timemachine/CHANGES b/dkpro-jwpl-timemachine/CHANGES
similarity index 100%
rename from de.tudarmstadt.ukp.wikipedia.timemachine/CHANGES
rename to dkpro-jwpl-timemachine/CHANGES
diff --git a/de.tudarmstadt.ukp.wikipedia.tutorial/LICENSE.txt b/dkpro-jwpl-timemachine/LICENSE.txt
similarity index 100%
rename from de.tudarmstadt.ukp.wikipedia.tutorial/LICENSE.txt
rename to dkpro-jwpl-timemachine/LICENSE.txt
diff --git a/de.tudarmstadt.ukp.wikipedia.timemachine/README.TXT b/dkpro-jwpl-timemachine/README.TXT
similarity index 100%
rename from de.tudarmstadt.ukp.wikipedia.timemachine/README.TXT
rename to dkpro-jwpl-timemachine/README.TXT
diff --git a/de.tudarmstadt.ukp.wikipedia.timemachine/config_file_arabic_one_snapshot.xml b/dkpro-jwpl-timemachine/config_file_arabic_one_snapshot.xml
similarity index 100%
rename from de.tudarmstadt.ukp.wikipedia.timemachine/config_file_arabic_one_snapshot.xml
rename to dkpro-jwpl-timemachine/config_file_arabic_one_snapshot.xml
diff --git a/de.tudarmstadt.ukp.wikipedia.timemachine/config_file_greek_one_snapshot.xml b/dkpro-jwpl-timemachine/config_file_greek_one_snapshot.xml
similarity index 100%
rename from de.tudarmstadt.ukp.wikipedia.timemachine/config_file_greek_one_snapshot.xml
rename to dkpro-jwpl-timemachine/config_file_greek_one_snapshot.xml
diff --git a/de.tudarmstadt.ukp.wikipedia.timemachine/pom.xml b/dkpro-jwpl-timemachine/pom.xml
similarity index 82%
rename from de.tudarmstadt.ukp.wikipedia.timemachine/pom.xml
rename to dkpro-jwpl-timemachine/pom.xml
index 14d9c23a9..cf2b1c41c 100644
--- a/de.tudarmstadt.ukp.wikipedia.timemachine/pom.xml
+++ b/dkpro-jwpl-timemachine/pom.xml
@@ -17,22 +17,23 @@
-->
+ 4.0.0
- de.tudarmstadt.ukp.wikipedia
- de.tudarmstadt.ukp.wikipedia
+ org.dkpro.jwpl
+ dkpro-jwpl
2.0.0-SNAPSHOT
- 4.0.0
- de.tudarmstadt.ukp.wikipedia.timemachine
+ dkpro-jwpl-timemachine
TimeMachine
+
- de.tudarmstadt.ukp.wikipedia
- de.tudarmstadt.ukp.wikipedia.wikimachine
+ org.dkpro.jwpl
+ dkpro-jwpl-wikimachine
- de.tudarmstadt.ukp.wikipedia
- de.tudarmstadt.ukp.wikipedia.mwdumper
+ org.dkpro.jwpl
+ dkpro-jwpl-mwdumper
it.unimi.dsi
@@ -72,7 +73,7 @@
- de.tudarmstadt.ukp.wikipedia.timemachine.domain.JWPLTimeMachine
+ org.dkpro.jwpl.timemachine.domain.JWPLTimeMachine
diff --git a/de.tudarmstadt.ukp.wikipedia.timemachine/src/main/assembly/assembly.xml b/dkpro-jwpl-timemachine/src/main/assembly/assembly.xml
similarity index 100%
rename from de.tudarmstadt.ukp.wikipedia.timemachine/src/main/assembly/assembly.xml
rename to dkpro-jwpl-timemachine/src/main/assembly/assembly.xml
diff --git a/de.tudarmstadt.ukp.wikipedia.timemachine/src/main/java/de/tudarmstadt/ukp/wikipedia/timemachine/domain/JWPLTimeMachine.java b/dkpro-jwpl-timemachine/src/main/java/org/dkpro/jwpl/timemachine/domain/JWPLTimeMachine.java
similarity index 86%
rename from de.tudarmstadt.ukp.wikipedia.timemachine/src/main/java/de/tudarmstadt/ukp/wikipedia/timemachine/domain/JWPLTimeMachine.java
rename to dkpro-jwpl-timemachine/src/main/java/org/dkpro/jwpl/timemachine/domain/JWPLTimeMachine.java
index 7ba1f87ea..6638a26eb 100755
--- a/de.tudarmstadt.ukp.wikipedia.timemachine/src/main/java/de/tudarmstadt/ukp/wikipedia/timemachine/domain/JWPLTimeMachine.java
+++ b/dkpro-jwpl-timemachine/src/main/java/org/dkpro/jwpl/timemachine/domain/JWPLTimeMachine.java
@@ -15,13 +15,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package de.tudarmstadt.ukp.wikipedia.timemachine.domain;
+package org.dkpro.jwpl.timemachine.domain;
-import de.tudarmstadt.ukp.wikipedia.wikimachine.debug.ILogger;
-import de.tudarmstadt.ukp.wikipedia.wikimachine.domain.Configuration;
-import de.tudarmstadt.ukp.wikipedia.wikimachine.domain.ISnapshotGenerator;
-import de.tudarmstadt.ukp.wikipedia.wikimachine.factory.IEnvironmentFactory;
-import de.tudarmstadt.ukp.wikipedia.wikimachine.factory.SpringFactory;
+import org.dkpro.jwpl.wikimachine.debug.ILogger;
+import org.dkpro.jwpl.wikimachine.domain.Configuration;
+import org.dkpro.jwpl.wikimachine.domain.ISnapshotGenerator;
+import org.dkpro.jwpl.wikimachine.factory.IEnvironmentFactory;
+import org.dkpro.jwpl.wikimachine.factory.SpringFactory;
/**
* This is the main class of the DBMapping Tool of the JWPL.
diff --git a/de.tudarmstadt.ukp.wikipedia.timemachine/src/main/java/de/tudarmstadt/ukp/wikipedia/timemachine/domain/Revision.java b/dkpro-jwpl-timemachine/src/main/java/org/dkpro/jwpl/timemachine/domain/Revision.java
similarity index 92%
rename from de.tudarmstadt.ukp.wikipedia.timemachine/src/main/java/de/tudarmstadt/ukp/wikipedia/timemachine/domain/Revision.java
rename to dkpro-jwpl-timemachine/src/main/java/org/dkpro/jwpl/timemachine/domain/Revision.java
index 8d84f007a..2ded53201 100755
--- a/de.tudarmstadt.ukp.wikipedia.timemachine/src/main/java/de/tudarmstadt/ukp/wikipedia/timemachine/domain/Revision.java
+++ b/dkpro-jwpl-timemachine/src/main/java/org/dkpro/jwpl/timemachine/domain/Revision.java
@@ -15,7 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package de.tudarmstadt.ukp.wikipedia.timemachine.domain;
+package org.dkpro.jwpl.timemachine.domain;
/**
* Routines for the conversion of the Wikipedia revisions
@@ -46,7 +46,7 @@ private Revision() {
* @return date/time in the compressed integer format
*/
public static int compressTime(long date) {
- Long lowResolutionDate = new Long((date - TIME_ZERO) / MS_IN_SEC);
+ Long lowResolutionDate = (date - TIME_ZERO) / MS_IN_SEC;
return lowResolutionDate.intValue();
}
@@ -59,7 +59,7 @@ public static int compressTime(long date) {
* @return date/time in the long format
*/
public static long extractTime(int compressedDate) {
- return new Long(compressedDate) * MS_IN_SEC + TIME_ZERO;
+ return (long) compressedDate * MS_IN_SEC + TIME_ZERO;
}
/**
diff --git a/de.tudarmstadt.ukp.wikipedia.timemachine/src/main/java/de/tudarmstadt/ukp/wikipedia/timemachine/domain/SettingsXML.java b/dkpro-jwpl-timemachine/src/main/java/org/dkpro/jwpl/timemachine/domain/SettingsXML.java
similarity index 94%
rename from de.tudarmstadt.ukp.wikipedia.timemachine/src/main/java/de/tudarmstadt/ukp/wikipedia/timemachine/domain/SettingsXML.java
rename to dkpro-jwpl-timemachine/src/main/java/org/dkpro/jwpl/timemachine/domain/SettingsXML.java
index 5de05ee23..9980f8fe3 100755
--- a/de.tudarmstadt.ukp.wikipedia.timemachine/src/main/java/de/tudarmstadt/ukp/wikipedia/timemachine/domain/SettingsXML.java
+++ b/dkpro-jwpl-timemachine/src/main/java/org/dkpro/jwpl/timemachine/domain/SettingsXML.java
@@ -15,7 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package de.tudarmstadt.ukp.wikipedia.timemachine.domain;
+package org.dkpro.jwpl.timemachine.domain;
import java.io.BufferedInputStream;
import java.io.BufferedOutputStream;
@@ -24,9 +24,9 @@
import java.io.IOException;
import java.util.Properties;
-import de.tudarmstadt.ukp.wikipedia.wikimachine.debug.ILogger;
-import de.tudarmstadt.ukp.wikipedia.wikimachine.domain.Configuration;
-import de.tudarmstadt.ukp.wikipedia.wikimachine.util.TimestampUtil;
+import org.dkpro.jwpl.wikimachine.debug.ILogger;
+import org.dkpro.jwpl.wikimachine.domain.Configuration;
+import org.dkpro.jwpl.wikimachine.util.TimestampUtil;
/**
* This is a utility class that generates a template for the configuration file
diff --git a/de.tudarmstadt.ukp.wikipedia.timemachine/src/main/java/de/tudarmstadt/ukp/wikipedia/timemachine/domain/TimeMachineFiles.java b/dkpro-jwpl-timemachine/src/main/java/org/dkpro/jwpl/timemachine/domain/TimeMachineFiles.java
similarity index 92%
rename from de.tudarmstadt.ukp.wikipedia.timemachine/src/main/java/de/tudarmstadt/ukp/wikipedia/timemachine/domain/TimeMachineFiles.java
rename to dkpro-jwpl-timemachine/src/main/java/org/dkpro/jwpl/timemachine/domain/TimeMachineFiles.java
index 470ea8ed2..caf2ede98 100644
--- a/de.tudarmstadt.ukp.wikipedia.timemachine/src/main/java/de/tudarmstadt/ukp/wikipedia/timemachine/domain/TimeMachineFiles.java
+++ b/dkpro-jwpl-timemachine/src/main/java/org/dkpro/jwpl/timemachine/domain/TimeMachineFiles.java
@@ -15,14 +15,14 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package de.tudarmstadt.ukp.wikipedia.timemachine.domain;
+package org.dkpro.jwpl.timemachine.domain;
import java.io.File;
import java.sql.Timestamp;
-import de.tudarmstadt.ukp.wikipedia.wikimachine.debug.ILogger;
-import de.tudarmstadt.ukp.wikipedia.wikimachine.domain.Files;
-import de.tudarmstadt.ukp.wikipedia.wikimachine.util.TimestampUtil;
+import org.dkpro.jwpl.wikimachine.debug.ILogger;
+import org.dkpro.jwpl.wikimachine.domain.Files;
+import org.dkpro.jwpl.wikimachine.util.TimestampUtil;
public class TimeMachineFiles extends Files {
diff --git a/de.tudarmstadt.ukp.wikipedia.timemachine/src/main/java/de/tudarmstadt/ukp/wikipedia/timemachine/domain/TimeMachineGenerator.java b/dkpro-jwpl-timemachine/src/main/java/org/dkpro/jwpl/timemachine/domain/TimeMachineGenerator.java
similarity index 84%
rename from de.tudarmstadt.ukp.wikipedia.timemachine/src/main/java/de/tudarmstadt/ukp/wikipedia/timemachine/domain/TimeMachineGenerator.java
rename to dkpro-jwpl-timemachine/src/main/java/org/dkpro/jwpl/timemachine/domain/TimeMachineGenerator.java
index 58e6ecd17..b2e69ca2e 100755
--- a/de.tudarmstadt.ukp.wikipedia.timemachine/src/main/java/de/tudarmstadt/ukp/wikipedia/timemachine/domain/TimeMachineGenerator.java
+++ b/dkpro-jwpl-timemachine/src/main/java/org/dkpro/jwpl/timemachine/domain/TimeMachineGenerator.java
@@ -15,25 +15,25 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package de.tudarmstadt.ukp.wikipedia.timemachine.domain;
+package org.dkpro.jwpl.timemachine.domain;
import java.io.IOException;
import java.io.InputStream;
import java.sql.Timestamp;
-import de.tudarmstadt.ukp.wikipedia.wikimachine.domain.AbstractSnapshotGenerator;
-import de.tudarmstadt.ukp.wikipedia.wikimachine.domain.Files;
-import de.tudarmstadt.ukp.wikipedia.wikimachine.domain.MetaData;
-import de.tudarmstadt.ukp.wikipedia.wikimachine.dump.sql.CategorylinksParser;
-import de.tudarmstadt.ukp.wikipedia.wikimachine.dump.sql.PagelinksParser;
-import de.tudarmstadt.ukp.wikipedia.wikimachine.dump.version.IDumpVersion;
-import de.tudarmstadt.ukp.wikipedia.wikimachine.dump.xml.DumpTableEnum;
-import de.tudarmstadt.ukp.wikipedia.wikimachine.dump.xml.DumpTableInputStream;
-import de.tudarmstadt.ukp.wikipedia.wikimachine.dump.xml.PageParser;
-import de.tudarmstadt.ukp.wikipedia.wikimachine.dump.xml.RevisionParser;
-import de.tudarmstadt.ukp.wikipedia.wikimachine.dump.xml.TextParser;
-import de.tudarmstadt.ukp.wikipedia.wikimachine.factory.IEnvironmentFactory;
-import de.tudarmstadt.ukp.wikipedia.wikimachine.util.TimestampUtil;
+import org.dkpro.jwpl.wikimachine.domain.AbstractSnapshotGenerator;
+import org.dkpro.jwpl.wikimachine.domain.Files;
+import org.dkpro.jwpl.wikimachine.domain.MetaData;
+import org.dkpro.jwpl.wikimachine.dump.sql.CategorylinksParser;
+import org.dkpro.jwpl.wikimachine.dump.sql.PagelinksParser;
+import org.dkpro.jwpl.wikimachine.dump.version.IDumpVersion;
+import org.dkpro.jwpl.wikimachine.dump.xml.DumpTableEnum;
+import org.dkpro.jwpl.wikimachine.dump.xml.DumpTableInputStream;
+import org.dkpro.jwpl.wikimachine.dump.xml.PageParser;
+import org.dkpro.jwpl.wikimachine.dump.xml.RevisionParser;
+import org.dkpro.jwpl.wikimachine.dump.xml.TextParser;
+import org.dkpro.jwpl.wikimachine.factory.IEnvironmentFactory;
+import org.dkpro.jwpl.wikimachine.util.TimestampUtil;
/**
* Generate dumps as .txt files for the JWPL database from given MediaWiki dump
diff --git a/de.tudarmstadt.ukp.wikipedia.timemachine/src/main/java/de/tudarmstadt/ukp/wikipedia/timemachine/dump/version/DumpVersionFastUtilIntKey.java b/dkpro-jwpl-timemachine/src/main/java/org/dkpro/jwpl/timemachine/dump/version/DumpVersionFastUtilIntKey.java
similarity index 91%
rename from de.tudarmstadt.ukp.wikipedia.timemachine/src/main/java/de/tudarmstadt/ukp/wikipedia/timemachine/dump/version/DumpVersionFastUtilIntKey.java
rename to dkpro-jwpl-timemachine/src/main/java/org/dkpro/jwpl/timemachine/dump/version/DumpVersionFastUtilIntKey.java
index 06427ed3e..156c303e0 100644
--- a/de.tudarmstadt.ukp.wikipedia.timemachine/src/main/java/de/tudarmstadt/ukp/wikipedia/timemachine/dump/version/DumpVersionFastUtilIntKey.java
+++ b/dkpro-jwpl-timemachine/src/main/java/org/dkpro/jwpl/timemachine/dump/version/DumpVersionFastUtilIntKey.java
@@ -15,25 +15,23 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package de.tudarmstadt.ukp.wikipedia.timemachine.dump.version;
+package org.dkpro.jwpl.timemachine.dump.version;
import java.io.IOException;
import java.sql.Timestamp;
import java.util.HashMap;
-import java.util.HashSet;
import java.util.Map;
-import java.util.Set;
-
-import de.tudarmstadt.ukp.wikipedia.timemachine.domain.Revision;
-import de.tudarmstadt.ukp.wikipedia.wikimachine.dump.sql.CategorylinksParser;
-import de.tudarmstadt.ukp.wikipedia.wikimachine.dump.sql.PagelinksParser;
-import de.tudarmstadt.ukp.wikipedia.wikimachine.dump.version.AbstractDumpVersion;
-import de.tudarmstadt.ukp.wikipedia.wikimachine.dump.xml.PageParser;
-import de.tudarmstadt.ukp.wikipedia.wikimachine.dump.xml.RevisionParser;
-import de.tudarmstadt.ukp.wikipedia.wikimachine.dump.xml.TextParser;
-import de.tudarmstadt.ukp.wikipedia.wikimachine.util.Redirects;
-import de.tudarmstadt.ukp.wikipedia.wikimachine.util.TimestampUtil;
-import de.tudarmstadt.ukp.wikipedia.wikimachine.util.TxtFileWriter;
+
+import org.dkpro.jwpl.timemachine.domain.Revision;
+import org.dkpro.jwpl.wikimachine.dump.sql.CategorylinksParser;
+import org.dkpro.jwpl.wikimachine.dump.sql.PagelinksParser;
+import org.dkpro.jwpl.wikimachine.dump.version.AbstractDumpVersion;
+import org.dkpro.jwpl.wikimachine.dump.xml.PageParser;
+import org.dkpro.jwpl.wikimachine.dump.xml.RevisionParser;
+import org.dkpro.jwpl.wikimachine.dump.xml.TextParser;
+import org.dkpro.jwpl.wikimachine.util.Redirects;
+import org.dkpro.jwpl.wikimachine.util.TimestampUtil;
+import org.dkpro.jwpl.wikimachine.util.TxtFileWriter;
import it.unimi.dsi.fastutil.ints.Int2IntOpenHashMap;
import it.unimi.dsi.fastutil.ints.IntArraySet;
import it.unimi.dsi.fastutil.ints.IntSet;
@@ -104,7 +102,7 @@ public void freeAfterPageParsing() {
@Override
public void freeAfterRevisonParsing() {
pageIdRevList = new IntArraySet(pageIdRevMap.keySet().size());
- for (Integer key : pageIdRevMap.keySet()) {
+ for (int key : pageIdRevMap.keySet()) {
pageIdRevList.add(key);
}
@@ -178,7 +176,7 @@ private void processCategoryLinksRowPageExists(Integer cl_from,
categoryPages.addRow(cl_to, cl_from);
pageCategories.addRow(cl_from, cl_to);
if (cl_to_text.equals(metaData.getDisambiguationCategory())) {
- disambiguations.add(cl_from);
+ disambiguations.add(cl_from.intValue());
metaData.addDisamb();
}
}
@@ -186,7 +184,7 @@ private void processCategoryLinksRowPageExists(Integer cl_from,
private void processCateforyLinksRowPageMiss(Integer cl_from, Integer cl_to)
throws IOException {
// if category page id exists
- if (cNamePageIdMap.containsValue(cl_from)) {
+ if (cNamePageIdMap.containsValue(cl_from.intValue())) {
categoryOutlinks.addRow(cl_to, cl_from);
categoryInlinks.addRow(cl_from, cl_to);
}
diff --git a/de.tudarmstadt.ukp.wikipedia.timemachine/src/main/java/de/tudarmstadt/ukp/wikipedia/timemachine/dump/version/DumpVersionJDKGeneric.java b/dkpro-jwpl-timemachine/src/main/java/org/dkpro/jwpl/timemachine/dump/version/DumpVersionJDKGeneric.java
similarity index 93%
rename from de.tudarmstadt.ukp.wikipedia.timemachine/src/main/java/de/tudarmstadt/ukp/wikipedia/timemachine/dump/version/DumpVersionJDKGeneric.java
rename to dkpro-jwpl-timemachine/src/main/java/org/dkpro/jwpl/timemachine/dump/version/DumpVersionJDKGeneric.java
index 2aee86aad..a71a85083 100644
--- a/de.tudarmstadt.ukp.wikipedia.timemachine/src/main/java/de/tudarmstadt/ukp/wikipedia/timemachine/dump/version/DumpVersionJDKGeneric.java
+++ b/dkpro-jwpl-timemachine/src/main/java/org/dkpro/jwpl/timemachine/dump/version/DumpVersionJDKGeneric.java
@@ -15,7 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package de.tudarmstadt.ukp.wikipedia.timemachine.dump.version;
+package org.dkpro.jwpl.timemachine.dump.version;
import java.io.IOException;
import java.sql.Timestamp;
@@ -24,17 +24,17 @@
import java.util.Map;
import java.util.Set;
-import de.tudarmstadt.ukp.wikipedia.timemachine.domain.Revision;
-import de.tudarmstadt.ukp.wikipedia.wikimachine.dump.sql.CategorylinksParser;
-import de.tudarmstadt.ukp.wikipedia.wikimachine.dump.sql.PagelinksParser;
-import de.tudarmstadt.ukp.wikipedia.wikimachine.dump.version.AbstractDumpVersion;
-import de.tudarmstadt.ukp.wikipedia.wikimachine.dump.xml.PageParser;
-import de.tudarmstadt.ukp.wikipedia.wikimachine.dump.xml.RevisionParser;
-import de.tudarmstadt.ukp.wikipedia.wikimachine.dump.xml.TextParser;
-import de.tudarmstadt.ukp.wikipedia.wikimachine.hashing.IStringHashCode;
-import de.tudarmstadt.ukp.wikipedia.wikimachine.util.Redirects;
-import de.tudarmstadt.ukp.wikipedia.wikimachine.util.TimestampUtil;
-import de.tudarmstadt.ukp.wikipedia.wikimachine.util.TxtFileWriter;
+import org.dkpro.jwpl.timemachine.domain.Revision;
+import org.dkpro.jwpl.wikimachine.dump.sql.CategorylinksParser;
+import org.dkpro.jwpl.wikimachine.dump.sql.PagelinksParser;
+import org.dkpro.jwpl.wikimachine.dump.version.AbstractDumpVersion;
+import org.dkpro.jwpl.wikimachine.dump.xml.PageParser;
+import org.dkpro.jwpl.wikimachine.dump.xml.RevisionParser;
+import org.dkpro.jwpl.wikimachine.dump.xml.TextParser;
+import org.dkpro.jwpl.wikimachine.hashing.IStringHashCode;
+import org.dkpro.jwpl.wikimachine.util.Redirects;
+import org.dkpro.jwpl.wikimachine.util.TimestampUtil;
+import org.dkpro.jwpl.wikimachine.util.TxtFileWriter;
/**
* Please be sure, that {@code hashCode(String)} of the provided HashAlgorithm type returns the
diff --git a/de.tudarmstadt.ukp.wikipedia.timemachine/src/main/java/de/tudarmstadt/ukp/wikipedia/timemachine/dump/version/DumpVersionJDKIntKeyFactory.java b/dkpro-jwpl-timemachine/src/main/java/org/dkpro/jwpl/timemachine/dump/version/DumpVersionJDKIntKeyFactory.java
similarity index 79%
rename from de.tudarmstadt.ukp.wikipedia.timemachine/src/main/java/de/tudarmstadt/ukp/wikipedia/timemachine/dump/version/DumpVersionJDKIntKeyFactory.java
rename to dkpro-jwpl-timemachine/src/main/java/org/dkpro/jwpl/timemachine/dump/version/DumpVersionJDKIntKeyFactory.java
index 61f7517b8..2932ebe43 100644
--- a/de.tudarmstadt.ukp.wikipedia.timemachine/src/main/java/de/tudarmstadt/ukp/wikipedia/timemachine/dump/version/DumpVersionJDKIntKeyFactory.java
+++ b/dkpro-jwpl-timemachine/src/main/java/org/dkpro/jwpl/timemachine/dump/version/DumpVersionJDKIntKeyFactory.java
@@ -15,11 +15,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package de.tudarmstadt.ukp.wikipedia.timemachine.dump.version;
+package org.dkpro.jwpl.timemachine.dump.version;
-import de.tudarmstadt.ukp.wikipedia.wikimachine.dump.version.IDumpVersion;
-import de.tudarmstadt.ukp.wikipedia.wikimachine.dump.version.IDumpVersionFactory;
-import de.tudarmstadt.ukp.wikipedia.wikimachine.hashing.StringHashCodeJDK;
+import org.dkpro.jwpl.wikimachine.dump.version.IDumpVersion;
+import org.dkpro.jwpl.wikimachine.dump.version.IDumpVersionFactory;
+import org.dkpro.jwpl.wikimachine.hashing.StringHashCodeJDK;
public class DumpVersionJDKIntKeyFactory implements IDumpVersionFactory {
diff --git a/de.tudarmstadt.ukp.wikipedia.timemachine/src/main/java/de/tudarmstadt/ukp/wikipedia/timemachine/dump/version/DumpVersionJDKLongKeyFactory.java b/dkpro-jwpl-timemachine/src/main/java/org/dkpro/jwpl/timemachine/dump/version/DumpVersionJDKLongKeyFactory.java
similarity index 79%
rename from de.tudarmstadt.ukp.wikipedia.timemachine/src/main/java/de/tudarmstadt/ukp/wikipedia/timemachine/dump/version/DumpVersionJDKLongKeyFactory.java
rename to dkpro-jwpl-timemachine/src/main/java/org/dkpro/jwpl/timemachine/dump/version/DumpVersionJDKLongKeyFactory.java
index 11d1b9016..b28f3295f 100644
--- a/de.tudarmstadt.ukp.wikipedia.timemachine/src/main/java/de/tudarmstadt/ukp/wikipedia/timemachine/dump/version/DumpVersionJDKLongKeyFactory.java
+++ b/dkpro-jwpl-timemachine/src/main/java/org/dkpro/jwpl/timemachine/dump/version/DumpVersionJDKLongKeyFactory.java
@@ -15,11 +15,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package de.tudarmstadt.ukp.wikipedia.timemachine.dump.version;
+package org.dkpro.jwpl.timemachine.dump.version;
-import de.tudarmstadt.ukp.wikipedia.wikimachine.dump.version.IDumpVersion;
-import de.tudarmstadt.ukp.wikipedia.wikimachine.dump.version.IDumpVersionFactory;
-import de.tudarmstadt.ukp.wikipedia.wikimachine.hashing.StringHashCodeJBoss;
+import org.dkpro.jwpl.wikimachine.dump.version.IDumpVersion;
+import org.dkpro.jwpl.wikimachine.dump.version.IDumpVersionFactory;
+import org.dkpro.jwpl.wikimachine.hashing.StringHashCodeJBoss;
public class DumpVersionJDKLongKeyFactory implements IDumpVersionFactory {
diff --git a/de.tudarmstadt.ukp.wikipedia.timemachine/src/main/java/de/tudarmstadt/ukp/wikipedia/timemachine/dump/version/DumpVersionJDKStringKeyFactory.java b/dkpro-jwpl-timemachine/src/main/java/org/dkpro/jwpl/timemachine/dump/version/DumpVersionJDKStringKeyFactory.java
similarity index 79%
rename from de.tudarmstadt.ukp.wikipedia.timemachine/src/main/java/de/tudarmstadt/ukp/wikipedia/timemachine/dump/version/DumpVersionJDKStringKeyFactory.java
rename to dkpro-jwpl-timemachine/src/main/java/org/dkpro/jwpl/timemachine/dump/version/DumpVersionJDKStringKeyFactory.java
index 4afac4f07..07e6d687a 100644
--- a/de.tudarmstadt.ukp.wikipedia.timemachine/src/main/java/de/tudarmstadt/ukp/wikipedia/timemachine/dump/version/DumpVersionJDKStringKeyFactory.java
+++ b/dkpro-jwpl-timemachine/src/main/java/org/dkpro/jwpl/timemachine/dump/version/DumpVersionJDKStringKeyFactory.java
@@ -15,11 +15,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package de.tudarmstadt.ukp.wikipedia.timemachine.dump.version;
+package org.dkpro.jwpl.timemachine.dump.version;
-import de.tudarmstadt.ukp.wikipedia.wikimachine.dump.version.IDumpVersion;
-import de.tudarmstadt.ukp.wikipedia.wikimachine.dump.version.IDumpVersionFactory;
-import de.tudarmstadt.ukp.wikipedia.wikimachine.hashing.StringHashCodeDisabled;
+import org.dkpro.jwpl.wikimachine.dump.version.IDumpVersion;
+import org.dkpro.jwpl.wikimachine.dump.version.IDumpVersionFactory;
+import org.dkpro.jwpl.wikimachine.hashing.StringHashCodeDisabled;
public class DumpVersionJDKStringKeyFactory implements IDumpVersionFactory {
diff --git a/de.tudarmstadt.ukp.wikipedia.timemachine/src/main/java/de/tudarmstadt/ukp/wikipedia/timemachine/dump/version/OriginalDumpVersion.java b/dkpro-jwpl-timemachine/src/main/java/org/dkpro/jwpl/timemachine/dump/version/OriginalDumpVersion.java
similarity index 94%
rename from de.tudarmstadt.ukp.wikipedia.timemachine/src/main/java/de/tudarmstadt/ukp/wikipedia/timemachine/dump/version/OriginalDumpVersion.java
rename to dkpro-jwpl-timemachine/src/main/java/org/dkpro/jwpl/timemachine/dump/version/OriginalDumpVersion.java
index aa2fc52ee..49320ad7d 100644
--- a/de.tudarmstadt.ukp.wikipedia.timemachine/src/main/java/de/tudarmstadt/ukp/wikipedia/timemachine/dump/version/OriginalDumpVersion.java
+++ b/dkpro-jwpl-timemachine/src/main/java/org/dkpro/jwpl/timemachine/dump/version/OriginalDumpVersion.java
@@ -15,7 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package de.tudarmstadt.ukp.wikipedia.timemachine.dump.version;
+package org.dkpro.jwpl.timemachine.dump.version;
import java.io.File;
import java.io.IOException;
@@ -25,19 +25,19 @@
import java.util.Map;
import java.util.Set;
-import de.tudarmstadt.ukp.wikipedia.timemachine.domain.Revision;
-import de.tudarmstadt.ukp.wikipedia.wikimachine.debug.ILogger;
-import de.tudarmstadt.ukp.wikipedia.wikimachine.domain.Files;
-import de.tudarmstadt.ukp.wikipedia.wikimachine.domain.MetaData;
-import de.tudarmstadt.ukp.wikipedia.wikimachine.dump.sql.CategorylinksParser;
-import de.tudarmstadt.ukp.wikipedia.wikimachine.dump.sql.PagelinksParser;
-import de.tudarmstadt.ukp.wikipedia.wikimachine.dump.version.IDumpVersion;
-import de.tudarmstadt.ukp.wikipedia.wikimachine.dump.xml.PageParser;
-import de.tudarmstadt.ukp.wikipedia.wikimachine.dump.xml.RevisionParser;
-import de.tudarmstadt.ukp.wikipedia.wikimachine.dump.xml.TextParser;
-import de.tudarmstadt.ukp.wikipedia.wikimachine.util.Redirects;
-import de.tudarmstadt.ukp.wikipedia.wikimachine.util.TimestampUtil;
-import de.tudarmstadt.ukp.wikipedia.wikimachine.util.TxtFileWriter;
+import org.dkpro.jwpl.timemachine.domain.Revision;
+import org.dkpro.jwpl.wikimachine.debug.ILogger;
+import org.dkpro.jwpl.wikimachine.domain.Files;
+import org.dkpro.jwpl.wikimachine.domain.MetaData;
+import org.dkpro.jwpl.wikimachine.dump.sql.CategorylinksParser;
+import org.dkpro.jwpl.wikimachine.dump.sql.PagelinksParser;
+import org.dkpro.jwpl.wikimachine.dump.version.IDumpVersion;
+import org.dkpro.jwpl.wikimachine.dump.xml.PageParser;
+import org.dkpro.jwpl.wikimachine.dump.xml.RevisionParser;
+import org.dkpro.jwpl.wikimachine.dump.xml.TextParser;
+import org.dkpro.jwpl.wikimachine.util.Redirects;
+import org.dkpro.jwpl.wikimachine.util.TimestampUtil;
+import org.dkpro.jwpl.wikimachine.util.TxtFileWriter;
/**
* This class holds the data for a specific dump version.
diff --git a/de.tudarmstadt.ukp.wikipedia.timemachine/src/main/java/de/tudarmstadt/ukp/wikipedia/timemachine/dump/xml/PageReader.java b/dkpro-jwpl-timemachine/src/main/java/org/dkpro/jwpl/timemachine/dump/xml/PageReader.java
similarity index 90%
rename from de.tudarmstadt.ukp.wikipedia.timemachine/src/main/java/de/tudarmstadt/ukp/wikipedia/timemachine/dump/xml/PageReader.java
rename to dkpro-jwpl-timemachine/src/main/java/org/dkpro/jwpl/timemachine/dump/xml/PageReader.java
index 836a458c4..ad6ccc298 100644
--- a/de.tudarmstadt.ukp.wikipedia.timemachine/src/main/java/de/tudarmstadt/ukp/wikipedia/timemachine/dump/xml/PageReader.java
+++ b/dkpro-jwpl-timemachine/src/main/java/org/dkpro/jwpl/timemachine/dump/xml/PageReader.java
@@ -15,12 +15,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package de.tudarmstadt.ukp.wikipedia.timemachine.dump.xml;
+package org.dkpro.jwpl.timemachine.dump.xml;
import java.io.InputStream;
-import de.tudarmstadt.ukp.wikipedia.mwdumper.importer.DumpWriter;
-import de.tudarmstadt.ukp.wikipedia.wikimachine.dump.xml.AbstractXmlDumpReader;
+import org.dkpro.jwpl.mwdumper.importer.DumpWriter;
+import org.dkpro.jwpl.wikimachine.dump.xml.AbstractXmlDumpReader;
/**
* This class is a specified variant of XmlDumpReader. Please see its source for more
diff --git a/de.tudarmstadt.ukp.wikipedia.timemachine/src/main/java/de/tudarmstadt/ukp/wikipedia/timemachine/dump/xml/PageWriter.java b/dkpro-jwpl-timemachine/src/main/java/org/dkpro/jwpl/timemachine/dump/xml/PageWriter.java
similarity index 81%
rename from de.tudarmstadt.ukp.wikipedia.timemachine/src/main/java/de/tudarmstadt/ukp/wikipedia/timemachine/dump/xml/PageWriter.java
rename to dkpro-jwpl-timemachine/src/main/java/org/dkpro/jwpl/timemachine/dump/xml/PageWriter.java
index 83fc91277..5ab3a2ff2 100755
--- a/de.tudarmstadt.ukp.wikipedia.timemachine/src/main/java/de/tudarmstadt/ukp/wikipedia/timemachine/dump/xml/PageWriter.java
+++ b/dkpro-jwpl-timemachine/src/main/java/org/dkpro/jwpl/timemachine/dump/xml/PageWriter.java
@@ -15,18 +15,18 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package de.tudarmstadt.ukp.wikipedia.timemachine.dump.xml;
+package org.dkpro.jwpl.timemachine.dump.xml;
import java.io.IOException;
import java.io.OutputStream;
-import de.tudarmstadt.ukp.wikipedia.mwdumper.importer.DumpWriter;
-import de.tudarmstadt.ukp.wikipedia.mwdumper.importer.Page;
-import de.tudarmstadt.ukp.wikipedia.mwdumper.importer.Revision;
-import de.tudarmstadt.ukp.wikipedia.mwdumper.importer.Siteinfo;
-import de.tudarmstadt.ukp.wikipedia.wikimachine.dump.sql.SQLEscape;
-import de.tudarmstadt.ukp.wikipedia.wikimachine.util.Redirects;
-import de.tudarmstadt.ukp.wikipedia.wikimachine.util.UTFDataOutputStream;
+import org.dkpro.jwpl.mwdumper.importer.DumpWriter;
+import org.dkpro.jwpl.mwdumper.importer.Page;
+import org.dkpro.jwpl.mwdumper.importer.Revision;
+import org.dkpro.jwpl.mwdumper.importer.Siteinfo;
+import org.dkpro.jwpl.wikimachine.dump.sql.SQLEscape;
+import org.dkpro.jwpl.wikimachine.util.Redirects;
+import org.dkpro.jwpl.wikimachine.util.UTFDataOutputStream;
public class PageWriter implements DumpWriter {
diff --git a/de.tudarmstadt.ukp.wikipedia.timemachine/src/main/java/de/tudarmstadt/ukp/wikipedia/timemachine/dump/xml/RevisionReader.java b/dkpro-jwpl-timemachine/src/main/java/org/dkpro/jwpl/timemachine/dump/xml/RevisionReader.java
similarity index 90%
rename from de.tudarmstadt.ukp.wikipedia.timemachine/src/main/java/de/tudarmstadt/ukp/wikipedia/timemachine/dump/xml/RevisionReader.java
rename to dkpro-jwpl-timemachine/src/main/java/org/dkpro/jwpl/timemachine/dump/xml/RevisionReader.java
index 48c433f59..9d7044f4f 100644
--- a/de.tudarmstadt.ukp.wikipedia.timemachine/src/main/java/de/tudarmstadt/ukp/wikipedia/timemachine/dump/xml/RevisionReader.java
+++ b/dkpro-jwpl-timemachine/src/main/java/org/dkpro/jwpl/timemachine/dump/xml/RevisionReader.java
@@ -15,12 +15,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package de.tudarmstadt.ukp.wikipedia.timemachine.dump.xml;
+package org.dkpro.jwpl.timemachine.dump.xml;
import java.io.InputStream;
-import de.tudarmstadt.ukp.wikipedia.mwdumper.importer.DumpWriter;
-import de.tudarmstadt.ukp.wikipedia.wikimachine.dump.xml.AbstractXmlDumpReader;
+import org.dkpro.jwpl.mwdumper.importer.DumpWriter;
+import org.dkpro.jwpl.wikimachine.dump.xml.AbstractXmlDumpReader;
/**
* This class is a specified variant of XmlDumpReader. Please see its source for more
diff --git a/de.tudarmstadt.ukp.wikipedia.timemachine/src/main/java/de/tudarmstadt/ukp/wikipedia/timemachine/dump/xml/RevisionWriter.java b/dkpro-jwpl-timemachine/src/main/java/org/dkpro/jwpl/timemachine/dump/xml/RevisionWriter.java
similarity index 85%
rename from de.tudarmstadt.ukp.wikipedia.timemachine/src/main/java/de/tudarmstadt/ukp/wikipedia/timemachine/dump/xml/RevisionWriter.java
rename to dkpro-jwpl-timemachine/src/main/java/org/dkpro/jwpl/timemachine/dump/xml/RevisionWriter.java
index 909914384..46f29935e 100755
--- a/de.tudarmstadt.ukp.wikipedia.timemachine/src/main/java/de/tudarmstadt/ukp/wikipedia/timemachine/dump/xml/RevisionWriter.java
+++ b/dkpro-jwpl-timemachine/src/main/java/org/dkpro/jwpl/timemachine/dump/xml/RevisionWriter.java
@@ -15,16 +15,16 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package de.tudarmstadt.ukp.wikipedia.timemachine.dump.xml;
+package org.dkpro.jwpl.timemachine.dump.xml;
import java.io.DataOutputStream;
import java.io.IOException;
import java.io.OutputStream;
-import de.tudarmstadt.ukp.wikipedia.mwdumper.importer.DumpWriter;
-import de.tudarmstadt.ukp.wikipedia.mwdumper.importer.Page;
-import de.tudarmstadt.ukp.wikipedia.mwdumper.importer.Revision;
-import de.tudarmstadt.ukp.wikipedia.mwdumper.importer.Siteinfo;
+import org.dkpro.jwpl.mwdumper.importer.DumpWriter;
+import org.dkpro.jwpl.mwdumper.importer.Page;
+import org.dkpro.jwpl.mwdumper.importer.Revision;
+import org.dkpro.jwpl.mwdumper.importer.Siteinfo;
public class RevisionWriter implements DumpWriter {
diff --git a/de.tudarmstadt.ukp.wikipedia.timemachine/src/main/java/de/tudarmstadt/ukp/wikipedia/timemachine/dump/xml/TextReader.java b/dkpro-jwpl-timemachine/src/main/java/org/dkpro/jwpl/timemachine/dump/xml/TextReader.java
similarity index 90%
rename from de.tudarmstadt.ukp.wikipedia.timemachine/src/main/java/de/tudarmstadt/ukp/wikipedia/timemachine/dump/xml/TextReader.java
rename to dkpro-jwpl-timemachine/src/main/java/org/dkpro/jwpl/timemachine/dump/xml/TextReader.java
index 69c1c7f17..3203de4c1 100644
--- a/de.tudarmstadt.ukp.wikipedia.timemachine/src/main/java/de/tudarmstadt/ukp/wikipedia/timemachine/dump/xml/TextReader.java
+++ b/dkpro-jwpl-timemachine/src/main/java/org/dkpro/jwpl/timemachine/dump/xml/TextReader.java
@@ -15,12 +15,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package de.tudarmstadt.ukp.wikipedia.timemachine.dump.xml;
+package org.dkpro.jwpl.timemachine.dump.xml;
import java.io.InputStream;
-import de.tudarmstadt.ukp.wikipedia.mwdumper.importer.DumpWriter;
-import de.tudarmstadt.ukp.wikipedia.wikimachine.dump.xml.AbstractXmlDumpReader;
+import org.dkpro.jwpl.mwdumper.importer.DumpWriter;
+import org.dkpro.jwpl.wikimachine.dump.xml.AbstractXmlDumpReader;
/**
* This class is a specified variant of XmlDumpReader. Please see its source for more
diff --git a/de.tudarmstadt.ukp.wikipedia.timemachine/src/main/java/de/tudarmstadt/ukp/wikipedia/timemachine/dump/xml/TextWriter.java b/dkpro-jwpl-timemachine/src/main/java/org/dkpro/jwpl/timemachine/dump/xml/TextWriter.java
similarity index 78%
rename from de.tudarmstadt.ukp.wikipedia.timemachine/src/main/java/de/tudarmstadt/ukp/wikipedia/timemachine/dump/xml/TextWriter.java
rename to dkpro-jwpl-timemachine/src/main/java/org/dkpro/jwpl/timemachine/dump/xml/TextWriter.java
index c9cdfb565..26ec10568 100755
--- a/de.tudarmstadt.ukp.wikipedia.timemachine/src/main/java/de/tudarmstadt/ukp/wikipedia/timemachine/dump/xml/TextWriter.java
+++ b/dkpro-jwpl-timemachine/src/main/java/org/dkpro/jwpl/timemachine/dump/xml/TextWriter.java
@@ -15,17 +15,17 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package de.tudarmstadt.ukp.wikipedia.timemachine.dump.xml;
+package org.dkpro.jwpl.timemachine.dump.xml;
import java.io.IOException;
import java.io.OutputStream;
-import de.tudarmstadt.ukp.wikipedia.mwdumper.importer.DumpWriter;
-import de.tudarmstadt.ukp.wikipedia.mwdumper.importer.Page;
-import de.tudarmstadt.ukp.wikipedia.mwdumper.importer.Revision;
-import de.tudarmstadt.ukp.wikipedia.mwdumper.importer.Siteinfo;
-import de.tudarmstadt.ukp.wikipedia.wikimachine.dump.sql.SQLEscape;
-import de.tudarmstadt.ukp.wikipedia.wikimachine.util.UTFDataOutputStream;
+import org.dkpro.jwpl.mwdumper.importer.DumpWriter;
+import org.dkpro.jwpl.mwdumper.importer.Page;
+import org.dkpro.jwpl.mwdumper.importer.Revision;
+import org.dkpro.jwpl.mwdumper.importer.Siteinfo;
+import org.dkpro.jwpl.wikimachine.dump.sql.SQLEscape;
+import org.dkpro.jwpl.wikimachine.util.UTFDataOutputStream;
public class TextWriter implements DumpWriter {
diff --git a/de.tudarmstadt.ukp.wikipedia.timemachine/src/main/java/de/tudarmstadt/ukp/wikipedia/timemachine/dump/xml/TimeMachineRevisionParser.java b/dkpro-jwpl-timemachine/src/main/java/org/dkpro/jwpl/timemachine/dump/xml/TimeMachineRevisionParser.java
similarity index 85%
rename from de.tudarmstadt.ukp.wikipedia.timemachine/src/main/java/de/tudarmstadt/ukp/wikipedia/timemachine/dump/xml/TimeMachineRevisionParser.java
rename to dkpro-jwpl-timemachine/src/main/java/org/dkpro/jwpl/timemachine/dump/xml/TimeMachineRevisionParser.java
index 428a05aa1..672bbba15 100755
--- a/de.tudarmstadt.ukp.wikipedia.timemachine/src/main/java/de/tudarmstadt/ukp/wikipedia/timemachine/dump/xml/TimeMachineRevisionParser.java
+++ b/dkpro-jwpl-timemachine/src/main/java/org/dkpro/jwpl/timemachine/dump/xml/TimeMachineRevisionParser.java
@@ -15,13 +15,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package de.tudarmstadt.ukp.wikipedia.timemachine.dump.xml;
+package org.dkpro.jwpl.timemachine.dump.xml;
import java.io.EOFException;
import java.io.IOException;
-import de.tudarmstadt.ukp.wikipedia.timemachine.domain.Revision;
-import de.tudarmstadt.ukp.wikipedia.wikimachine.dump.xml.RevisionParser;
+import org.dkpro.jwpl.timemachine.domain.Revision;
+import org.dkpro.jwpl.wikimachine.dump.xml.RevisionParser;
public class TimeMachineRevisionParser extends RevisionParser {
diff --git a/de.tudarmstadt.ukp.wikipedia.timemachine/src/main/java/de/tudarmstadt/ukp/wikipedia/timemachine/dump/xml/XMLDumpTableInputStream.java b/dkpro-jwpl-timemachine/src/main/java/org/dkpro/jwpl/timemachine/dump/xml/XMLDumpTableInputStream.java
similarity index 93%
rename from de.tudarmstadt.ukp.wikipedia.timemachine/src/main/java/de/tudarmstadt/ukp/wikipedia/timemachine/dump/xml/XMLDumpTableInputStream.java
rename to dkpro-jwpl-timemachine/src/main/java/org/dkpro/jwpl/timemachine/dump/xml/XMLDumpTableInputStream.java
index cb8b011f8..0863d7f2a 100755
--- a/de.tudarmstadt.ukp.wikipedia.timemachine/src/main/java/de/tudarmstadt/ukp/wikipedia/timemachine/dump/xml/XMLDumpTableInputStream.java
+++ b/dkpro-jwpl-timemachine/src/main/java/org/dkpro/jwpl/timemachine/dump/xml/XMLDumpTableInputStream.java
@@ -15,7 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package de.tudarmstadt.ukp.wikipedia.timemachine.dump.xml;
+package org.dkpro.jwpl.timemachine.dump.xml;
import java.io.BufferedInputStream;
import java.io.IOException;
@@ -23,8 +23,8 @@
import java.io.PipedInputStream;
import java.io.PipedOutputStream;
-import de.tudarmstadt.ukp.wikipedia.wikimachine.dump.xml.DumpTableEnum;
-import de.tudarmstadt.ukp.wikipedia.wikimachine.dump.xml.DumpTableInputStream;
+import org.dkpro.jwpl.wikimachine.dump.xml.DumpTableEnum;
+import org.dkpro.jwpl.wikimachine.dump.xml.DumpTableInputStream;
/**
* Decorator for an InputStream. Converts an XML source to SQL
diff --git a/de.tudarmstadt.ukp.wikipedia.timemachine/src/main/java/de/tudarmstadt/ukp/wikipedia/timemachine/dump/xml/XMLDumpTableInputStreamThread.java b/dkpro-jwpl-timemachine/src/main/java/org/dkpro/jwpl/timemachine/dump/xml/XMLDumpTableInputStreamThread.java
similarity index 87%
rename from de.tudarmstadt.ukp.wikipedia.timemachine/src/main/java/de/tudarmstadt/ukp/wikipedia/timemachine/dump/xml/XMLDumpTableInputStreamThread.java
rename to dkpro-jwpl-timemachine/src/main/java/org/dkpro/jwpl/timemachine/dump/xml/XMLDumpTableInputStreamThread.java
index f37b2d367..b17101da0 100755
--- a/de.tudarmstadt.ukp.wikipedia.timemachine/src/main/java/de/tudarmstadt/ukp/wikipedia/timemachine/dump/xml/XMLDumpTableInputStreamThread.java
+++ b/dkpro-jwpl-timemachine/src/main/java/org/dkpro/jwpl/timemachine/dump/xml/XMLDumpTableInputStreamThread.java
@@ -15,16 +15,16 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package de.tudarmstadt.ukp.wikipedia.timemachine.dump.xml;
+package org.dkpro.jwpl.timemachine.dump.xml;
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
import java.lang.invoke.MethodHandles;
-import de.tudarmstadt.ukp.wikipedia.mwdumper.importer.NamespaceFilter;
-import de.tudarmstadt.ukp.wikipedia.wikimachine.dump.xml.AbstractXmlDumpReader;
-import de.tudarmstadt.ukp.wikipedia.wikimachine.dump.xml.DumpTableEnum;
+import org.dkpro.jwpl.mwdumper.importer.NamespaceFilter;
+import org.dkpro.jwpl.wikimachine.dump.xml.AbstractXmlDumpReader;
+import org.dkpro.jwpl.wikimachine.dump.xml.DumpTableEnum;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -41,7 +41,7 @@ class XMLDumpTableInputStreamThread extends Thread {
private static final String ENABLED_NAMESPACES = "NS_MAIN,NS_TALK,NS_CATEGORY";
/**
- * Generalization {@link de.tudarmstadt.ukp.wikipedia.mwdumper.importer.XmlDumpReader}
+ * Generalization {@link org.dkpro.jwpl.mwdumper.importer.XmlDumpReader}
* that parses the XML dump
*/
private AbstractXmlDumpReader xmlReader;
diff --git a/dkpro-jwpl-timemachine/src/main/resources/context/applicationContext.xml b/dkpro-jwpl-timemachine/src/main/resources/context/applicationContext.xml
new file mode 100644
index 000000000..8199efbb5
--- /dev/null
+++ b/dkpro-jwpl-timemachine/src/main/resources/context/applicationContext.xml
@@ -0,0 +1,133 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/de.tudarmstadt.ukp.wikipedia.tutorial/src/main/java/de/tudarmstadt/ukp/wikipedia/tutorial/parser/T3_LinkContexts.java b/dkpro-jwpl-tutorial/src/main/java/org/dkpro/jwpl/tutorial/parser/T3_LinkContexts.java
similarity index 84%
rename from de.tudarmstadt.ukp.wikipedia.tutorial/src/main/java/de/tudarmstadt/ukp/wikipedia/tutorial/parser/T3_LinkContexts.java
rename to dkpro-jwpl-tutorial/src/main/java/org/dkpro/jwpl/tutorial/parser/T3_LinkContexts.java
index fbc74ba5c..97739c8b7 100644
--- a/de.tudarmstadt.ukp.wikipedia.tutorial/src/main/java/de/tudarmstadt/ukp/wikipedia/tutorial/parser/T3_LinkContexts.java
+++ b/dkpro-jwpl-tutorial/src/main/java/org/dkpro/jwpl/tutorial/parser/T3_LinkContexts.java
@@ -15,12 +15,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package de.tudarmstadt.ukp.wikipedia.tutorial.parser;
+package org.dkpro.jwpl.tutorial.parser;
-import de.tudarmstadt.ukp.wikipedia.parser.Link;
-import de.tudarmstadt.ukp.wikipedia.parser.ParsedPage;
-import de.tudarmstadt.ukp.wikipedia.parser.mediawiki.MediaWikiParser;
-import de.tudarmstadt.ukp.wikipedia.parser.mediawiki.MediaWikiParserFactory;
+import org.dkpro.jwpl.parser.Link;
+import org.dkpro.jwpl.parser.ParsedPage;
+import org.dkpro.jwpl.parser.mediawiki.MediaWikiParser;
+import org.dkpro.jwpl.parser.mediawiki.MediaWikiParserFactory;
/**
* This is a little demo, to show how the parsedpage and parsedpage.parser package
diff --git a/de.tudarmstadt.ukp.wikipedia.tutorial/src/main/java/de/tudarmstadt/ukp/wikipedia/tutorial/parser/T4_InterfacingWithWikipedia.java b/dkpro-jwpl-tutorial/src/main/java/org/dkpro/jwpl/tutorial/parser/T4_InterfacingWithWikipedia.java
similarity index 74%
rename from de.tudarmstadt.ukp.wikipedia.tutorial/src/main/java/de/tudarmstadt/ukp/wikipedia/tutorial/parser/T4_InterfacingWithWikipedia.java
rename to dkpro-jwpl-tutorial/src/main/java/org/dkpro/jwpl/tutorial/parser/T4_InterfacingWithWikipedia.java
index 2aae3afd7..5afc84d64 100644
--- a/de.tudarmstadt.ukp.wikipedia.tutorial/src/main/java/de/tudarmstadt/ukp/wikipedia/tutorial/parser/T4_InterfacingWithWikipedia.java
+++ b/dkpro-jwpl-tutorial/src/main/java/org/dkpro/jwpl/tutorial/parser/T4_InterfacingWithWikipedia.java
@@ -15,19 +15,19 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package de.tudarmstadt.ukp.wikipedia.tutorial.parser;
+package org.dkpro.jwpl.tutorial.parser;
import java.util.List;
-import de.tudarmstadt.ukp.wikipedia.api.DatabaseConfiguration;
-import de.tudarmstadt.ukp.wikipedia.api.Page;
-import de.tudarmstadt.ukp.wikipedia.api.WikiConstants.Language;
-import de.tudarmstadt.ukp.wikipedia.api.Wikipedia;
-import de.tudarmstadt.ukp.wikipedia.api.exception.WikiApiException;
-import de.tudarmstadt.ukp.wikipedia.parser.ParsedPage;
-import de.tudarmstadt.ukp.wikipedia.parser.Section;
-import de.tudarmstadt.ukp.wikipedia.parser.mediawiki.MediaWikiParser;
-import de.tudarmstadt.ukp.wikipedia.parser.mediawiki.MediaWikiParserFactory;
+import org.dkpro.jwpl.api.DatabaseConfiguration;
+import org.dkpro.jwpl.api.Page;
+import org.dkpro.jwpl.api.WikiConstants.Language;
+import org.dkpro.jwpl.api.Wikipedia;
+import org.dkpro.jwpl.api.exception.WikiApiException;
+import org.dkpro.jwpl.parser.ParsedPage;
+import org.dkpro.jwpl.parser.Section;
+import org.dkpro.jwpl.parser.mediawiki.MediaWikiParser;
+import org.dkpro.jwpl.parser.mediawiki.MediaWikiParserFactory;
/**
* Displays the titles of the sections found in the page Dog.
diff --git a/de.tudarmstadt.ukp.wikipedia.tutorial/src/main/java/de/tudarmstadt/ukp/wikipedia/tutorial/parser/T5_CleaningTemplateImage.java b/dkpro-jwpl-tutorial/src/main/java/org/dkpro/jwpl/tutorial/parser/T5_CleaningTemplateImage.java
similarity index 75%
rename from de.tudarmstadt.ukp.wikipedia.tutorial/src/main/java/de/tudarmstadt/ukp/wikipedia/tutorial/parser/T5_CleaningTemplateImage.java
rename to dkpro-jwpl-tutorial/src/main/java/org/dkpro/jwpl/tutorial/parser/T5_CleaningTemplateImage.java
index 67aa8cda8..069c629fc 100644
--- a/de.tudarmstadt.ukp.wikipedia.tutorial/src/main/java/de/tudarmstadt/ukp/wikipedia/tutorial/parser/T5_CleaningTemplateImage.java
+++ b/dkpro-jwpl-tutorial/src/main/java/org/dkpro/jwpl/tutorial/parser/T5_CleaningTemplateImage.java
@@ -15,17 +15,17 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package de.tudarmstadt.ukp.wikipedia.tutorial.parser;
+package org.dkpro.jwpl.tutorial.parser;
-import de.tudarmstadt.ukp.wikipedia.api.DatabaseConfiguration;
-import de.tudarmstadt.ukp.wikipedia.api.Page;
-import de.tudarmstadt.ukp.wikipedia.api.WikiConstants.Language;
-import de.tudarmstadt.ukp.wikipedia.api.Wikipedia;
-import de.tudarmstadt.ukp.wikipedia.api.exception.WikiApiException;
-import de.tudarmstadt.ukp.wikipedia.parser.ParsedPage;
-import de.tudarmstadt.ukp.wikipedia.parser.mediawiki.FlushTemplates;
-import de.tudarmstadt.ukp.wikipedia.parser.mediawiki.MediaWikiParser;
-import de.tudarmstadt.ukp.wikipedia.parser.mediawiki.MediaWikiParserFactory;
+import org.dkpro.jwpl.api.DatabaseConfiguration;
+import org.dkpro.jwpl.api.Page;
+import org.dkpro.jwpl.api.WikiConstants.Language;
+import org.dkpro.jwpl.api.Wikipedia;
+import org.dkpro.jwpl.api.exception.WikiApiException;
+import org.dkpro.jwpl.parser.ParsedPage;
+import org.dkpro.jwpl.parser.mediawiki.FlushTemplates;
+import org.dkpro.jwpl.parser.mediawiki.MediaWikiParser;
+import org.dkpro.jwpl.parser.mediawiki.MediaWikiParserFactory;
/**
* Shows how to clean an article text from "TEMPLATE" and "Image" elements
diff --git a/de.tudarmstadt.ukp.wikipedia.tutorial/src/main/java/de/tudarmstadt/ukp/wikipedia/tutorial/parser/T6_NestedLists.java b/dkpro-jwpl-tutorial/src/main/java/org/dkpro/jwpl/tutorial/parser/T6_NestedLists.java
similarity index 79%
rename from de.tudarmstadt.ukp.wikipedia.tutorial/src/main/java/de/tudarmstadt/ukp/wikipedia/tutorial/parser/T6_NestedLists.java
rename to dkpro-jwpl-tutorial/src/main/java/org/dkpro/jwpl/tutorial/parser/T6_NestedLists.java
index 57eefd19c..be866c303 100644
--- a/de.tudarmstadt.ukp.wikipedia.tutorial/src/main/java/de/tudarmstadt/ukp/wikipedia/tutorial/parser/T6_NestedLists.java
+++ b/dkpro-jwpl-tutorial/src/main/java/org/dkpro/jwpl/tutorial/parser/T6_NestedLists.java
@@ -15,18 +15,18 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package de.tudarmstadt.ukp.wikipedia.tutorial.parser;
+package org.dkpro.jwpl.tutorial.parser;
-import de.tudarmstadt.ukp.wikipedia.api.DatabaseConfiguration;
-import de.tudarmstadt.ukp.wikipedia.api.WikiConstants.Language;
-import de.tudarmstadt.ukp.wikipedia.api.Wikipedia;
-import de.tudarmstadt.ukp.wikipedia.api.exception.WikiApiException;
-import de.tudarmstadt.ukp.wikipedia.parser.NestedList;
-import de.tudarmstadt.ukp.wikipedia.parser.NestedListContainer;
-import de.tudarmstadt.ukp.wikipedia.parser.NestedListElement;
-import de.tudarmstadt.ukp.wikipedia.parser.ParsedPage;
-import de.tudarmstadt.ukp.wikipedia.parser.mediawiki.MediaWikiParser;
-import de.tudarmstadt.ukp.wikipedia.parser.mediawiki.MediaWikiParserFactory;
+import org.dkpro.jwpl.api.DatabaseConfiguration;
+import org.dkpro.jwpl.api.WikiConstants.Language;
+import org.dkpro.jwpl.api.Wikipedia;
+import org.dkpro.jwpl.api.exception.WikiApiException;
+import org.dkpro.jwpl.parser.NestedList;
+import org.dkpro.jwpl.parser.NestedListContainer;
+import org.dkpro.jwpl.parser.NestedListElement;
+import org.dkpro.jwpl.parser.ParsedPage;
+import org.dkpro.jwpl.parser.mediawiki.MediaWikiParser;
+import org.dkpro.jwpl.parser.mediawiki.MediaWikiParserFactory;
/**
* Displays all nested lists of a page.
diff --git a/de.tudarmstadt.ukp.wikipedia.tutorial/src/main/java/de/tudarmstadt/ukp/wikipedia/tutorial/parser/T7_HtmlFileDemo.java b/dkpro-jwpl-tutorial/src/main/java/org/dkpro/jwpl/tutorial/parser/T7_HtmlFileDemo.java
similarity index 83%
rename from de.tudarmstadt.ukp.wikipedia.tutorial/src/main/java/de/tudarmstadt/ukp/wikipedia/tutorial/parser/T7_HtmlFileDemo.java
rename to dkpro-jwpl-tutorial/src/main/java/org/dkpro/jwpl/tutorial/parser/T7_HtmlFileDemo.java
index 7398a182f..1fc4fa1dc 100644
--- a/de.tudarmstadt.ukp.wikipedia.tutorial/src/main/java/de/tudarmstadt/ukp/wikipedia/tutorial/parser/T7_HtmlFileDemo.java
+++ b/dkpro-jwpl-tutorial/src/main/java/org/dkpro/jwpl/tutorial/parser/T7_HtmlFileDemo.java
@@ -15,12 +15,12 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package de.tudarmstadt.ukp.wikipedia.tutorial.parser;
+package org.dkpro.jwpl.tutorial.parser;
-import de.tudarmstadt.ukp.wikipedia.parser.ParsedPage;
-import de.tudarmstadt.ukp.wikipedia.parser.mediawiki.MediaWikiParser;
-import de.tudarmstadt.ukp.wikipedia.parser.mediawiki.MediaWikiParserFactory;
-import de.tudarmstadt.ukp.wikipedia.parser.html.HtmlWriter;
+import org.dkpro.jwpl.parser.ParsedPage;
+import org.dkpro.jwpl.parser.mediawiki.MediaWikiParser;
+import org.dkpro.jwpl.parser.mediawiki.MediaWikiParserFactory;
+import org.dkpro.jwpl.parser.html.HtmlWriter;
/**
* This class shows how to use the HtmlTools.class...
diff --git a/de.tudarmstadt.ukp.wikipedia.tutorial/src/main/java/de/tudarmstadt/ukp/wikipedia/tutorial/parser/TestFile.java b/dkpro-jwpl-tutorial/src/main/java/org/dkpro/jwpl/tutorial/parser/TestFile.java
similarity index 99%
rename from de.tudarmstadt.ukp.wikipedia.tutorial/src/main/java/de/tudarmstadt/ukp/wikipedia/tutorial/parser/TestFile.java
rename to dkpro-jwpl-tutorial/src/main/java/org/dkpro/jwpl/tutorial/parser/TestFile.java
index c3ed00371..2c5ee4586 100644
--- a/de.tudarmstadt.ukp.wikipedia.tutorial/src/main/java/de/tudarmstadt/ukp/wikipedia/tutorial/parser/TestFile.java
+++ b/dkpro-jwpl-tutorial/src/main/java/org/dkpro/jwpl/tutorial/parser/TestFile.java
@@ -15,7 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package de.tudarmstadt.ukp.wikipedia.tutorial.parser;
+package org.dkpro.jwpl.tutorial.parser;
public class TestFile {
diff --git a/de.tudarmstadt.ukp.wikipedia.util/.activate_rat-check b/dkpro-jwpl-util/.activate_rat-check
similarity index 100%
rename from de.tudarmstadt.ukp.wikipedia.util/.activate_rat-check
rename to dkpro-jwpl-util/.activate_rat-check
diff --git a/de.tudarmstadt.ukp.wikipedia.util/CHANGES b/dkpro-jwpl-util/CHANGES
similarity index 100%
rename from de.tudarmstadt.ukp.wikipedia.util/CHANGES
rename to dkpro-jwpl-util/CHANGES
diff --git a/de.tudarmstadt.ukp.wikipedia.mwdumper/LICENCE.txt b/dkpro-jwpl-util/LICENSE.txt
similarity index 98%
rename from de.tudarmstadt.ukp.wikipedia.mwdumper/LICENCE.txt
rename to dkpro-jwpl-util/LICENSE.txt
index b1fac45f0..989e2c59e 100644
--- a/de.tudarmstadt.ukp.wikipedia.mwdumper/LICENCE.txt
+++ b/dkpro-jwpl-util/LICENSE.txt
@@ -1,201 +1,201 @@
-Apache License
- Version 2.0, January 2004
- http://www.apache.org/licenses/
-
- TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
- 1. Definitions.
-
- "License" shall mean the terms and conditions for use, reproduction,
- and distribution as defined by Sections 1 through 9 of this document.
-
- "Licensor" shall mean the copyright owner or entity authorized by
- the copyright owner that is granting the License.
-
- "Legal Entity" shall mean the union of the acting entity and all
- other entities that control, are controlled by, or are under common
- control with that entity. For the purposes of this definition,
- "control" means (i) the power, direct or indirect, to cause the
- direction or management of such entity, whether by contract or
- otherwise, or (ii) ownership of fifty percent (50%) or more of the
- outstanding shares, or (iii) beneficial ownership of such entity.
-
- "You" (or "Your") shall mean an individual or Legal Entity
- exercising permissions granted by this License.
-
- "Source" form shall mean the preferred form for making modifications,
- including but not limited to software source code, documentation
- source, and configuration files.
-
- "Object" form shall mean any form resulting from mechanical
- transformation or translation of a Source form, including but
- not limited to compiled object code, generated documentation,
- and conversions to other media types.
-
- "Work" shall mean the work of authorship, whether in Source or
- Object form, made available under the License, as indicated by a
- copyright notice that is included in or attached to the work
- (an example is provided in the Appendix below).
-
- "Derivative Works" shall mean any work, whether in Source or Object
- form, that is based on (or derived from) the Work and for which the
- editorial revisions, annotations, elaborations, or other modifications
- represent, as a whole, an original work of authorship. For the purposes
- of this License, Derivative Works shall not include works that remain
- separable from, or merely link (or bind by name) to the interfaces of,
- the Work and Derivative Works thereof.
-
- "Contribution" shall mean any work of authorship, including
- the original version of the Work and any modifications or additions
- to that Work or Derivative Works thereof, that is intentionally
- submitted to Licensor for inclusion in the Work by the copyright owner
- or by an individual or Legal Entity authorized to submit on behalf of
- the copyright owner. For the purposes of this definition, "submitted"
- means any form of electronic, verbal, or written communication sent
- to the Licensor or its representatives, including but not limited to
- communication on electronic mailing lists, source code control systems,
- and issue tracking systems that are managed by, or on behalf of, the
- Licensor for the purpose of discussing and improving the Work, but
- excluding communication that is conspicuously marked or otherwise
- designated in writing by the copyright owner as "Not a Contribution."
-
- "Contributor" shall mean Licensor and any individual or Legal Entity
- on behalf of whom a Contribution has been received by Licensor and
- subsequently incorporated within the Work.
-
- 2. Grant of Copyright License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- copyright license to reproduce, prepare Derivative Works of,
- publicly display, publicly perform, sublicense, and distribute the
- Work and such Derivative Works in Source or Object form.
-
- 3. Grant of Patent License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- (except as stated in this section) patent license to make, have made,
- use, offer to sell, sell, import, and otherwise transfer the Work,
- where such license applies only to those patent claims licensable
- by such Contributor that are necessarily infringed by their
- Contribution(s) alone or by combination of their Contribution(s)
- with the Work to which such Contribution(s) was submitted. If You
- institute patent litigation against any entity (including a
- cross-claim or counterclaim in a lawsuit) alleging that the Work
- or a Contribution incorporated within the Work constitutes direct
- or contributory patent infringement, then any patent licenses
- granted to You under this License for that Work shall terminate
- as of the date such litigation is filed.
-
- 4. Redistribution. You may reproduce and distribute copies of the
- Work or Derivative Works thereof in any medium, with or without
- modifications, and in Source or Object form, provided that You
- meet the following conditions:
-
- (a) You must give any other recipients of the Work or
- Derivative Works a copy of this License; and
-
- (b) You must cause any modified files to carry prominent notices
- stating that You changed the files; and
-
- (c) You must retain, in the Source form of any Derivative Works
- that You distribute, all copyright, patent, trademark, and
- attribution notices from the Source form of the Work,
- excluding those notices that do not pertain to any part of
- the Derivative Works; and
-
- (d) If the Work includes a "NOTICE" text file as part of its
- distribution, then any Derivative Works that You distribute must
- include a readable copy of the attribution notices contained
- within such NOTICE file, excluding those notices that do not
- pertain to any part of the Derivative Works, in at least one
- of the following places: within a NOTICE text file distributed
- as part of the Derivative Works; within the Source form or
- documentation, if provided along with the Derivative Works; or,
- within a display generated by the Derivative Works, if and
- wherever such third-party notices normally appear. The contents
- of the NOTICE file are for informational purposes only and
- do not modify the License. You may add Your own attribution
- notices within Derivative Works that You distribute, alongside
- or as an addendum to the NOTICE text from the Work, provided
- that such additional attribution notices cannot be construed
- as modifying the License.
-
- You may add Your own copyright statement to Your modifications and
- may provide additional or different license terms and conditions
- for use, reproduction, or distribution of Your modifications, or
- for any such Derivative Works as a whole, provided Your use,
- reproduction, and distribution of the Work otherwise complies with
- the conditions stated in this License.
-
- 5. Submission of Contributions. Unless You explicitly state otherwise,
- any Contribution intentionally submitted for inclusion in the Work
- by You to the Licensor shall be under the terms and conditions of
- this License, without any additional terms or conditions.
- Notwithstanding the above, nothing herein shall supersede or modify
- the terms of any separate license agreement you may have executed
- with Licensor regarding such Contributions.
-
- 6. Trademarks. This License does not grant permission to use the trade
- names, trademarks, service marks, or product names of the Licensor,
- except as required for reasonable and customary use in describing the
- origin of the Work and reproducing the content of the NOTICE file.
-
- 7. Disclaimer of Warranty. Unless required by applicable law or
- agreed to in writing, Licensor provides the Work (and each
- Contributor provides its Contributions) on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- implied, including, without limitation, any warranties or conditions
- of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
- PARTICULAR PURPOSE. You are solely responsible for determining the
- appropriateness of using or redistributing the Work and assume any
- risks associated with Your exercise of permissions under this License.
-
- 8. Limitation of Liability. In no event and under no legal theory,
- whether in tort (including negligence), contract, or otherwise,
- unless required by applicable law (such as deliberate and grossly
- negligent acts) or agreed to in writing, shall any Contributor be
- liable to You for damages, including any direct, indirect, special,
- incidental, or consequential damages of any character arising as a
- result of this License or out of the use or inability to use the
- Work (including but not limited to damages for loss of goodwill,
- work stoppage, computer failure or malfunction, or any and all
- other commercial damages or losses), even if such Contributor
- has been advised of the possibility of such damages.
-
- 9. Accepting Warranty or Additional Liability. While redistributing
- the Work or Derivative Works thereof, You may choose to offer,
- and charge a fee for, acceptance of support, warranty, indemnity,
- or other liability obligations and/or rights consistent with this
- License. However, in accepting such obligations, You may act only
- on Your own behalf and on Your sole responsibility, not on behalf
- of any other Contributor, and only if You agree to indemnify,
- defend, and hold each Contributor harmless for any liability
- incurred by, or claims asserted against, such Contributor by reason
- of your accepting any such warranty or additional liability.
-
- END OF TERMS AND CONDITIONS
-
- APPENDIX: How to apply the Apache License to your work.
-
- To apply the Apache License to your work, attach the following
- boilerplate notice, with the fields enclosed by brackets "[]"
- replaced with your own identifying information. (Don't include
- the brackets!) The text should be enclosed in the appropriate
- comment syntax for the file format. We also recommend that a
- file or class name and description of purpose be included on the
- same "printed page" as the copyright notice for easier
- identification within third-party archives.
-
- Copyright [yyyy] [name of copyright owner]
-
- Licensed 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
+Apache License
+ Version 2.0, January 2004
+ http://www.apache.org/licenses/
+
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+ 1. Definitions.
+
+ "License" shall mean the terms and conditions for use, reproduction,
+ and distribution as defined by Sections 1 through 9 of this document.
+
+ "Licensor" shall mean the copyright owner or entity authorized by
+ the copyright owner that is granting the License.
+
+ "Legal Entity" shall mean the union of the acting entity and all
+ other entities that control, are controlled by, or are under common
+ control with that entity. For the purposes of this definition,
+ "control" means (i) the power, direct or indirect, to cause the
+ direction or management of such entity, whether by contract or
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ outstanding shares, or (iii) beneficial ownership of such entity.
+
+ "You" (or "Your") shall mean an individual or Legal Entity
+ exercising permissions granted by this License.
+
+ "Source" form shall mean the preferred form for making modifications,
+ including but not limited to software source code, documentation
+ source, and configuration files.
+
+ "Object" form shall mean any form resulting from mechanical
+ transformation or translation of a Source form, including but
+ not limited to compiled object code, generated documentation,
+ and conversions to other media types.
+
+ "Work" shall mean the work of authorship, whether in Source or
+ Object form, made available under the License, as indicated by a
+ copyright notice that is included in or attached to the work
+ (an example is provided in the Appendix below).
+
+ "Derivative Works" shall mean any work, whether in Source or Object
+ form, that is based on (or derived from) the Work and for which the
+ editorial revisions, annotations, elaborations, or other modifications
+ represent, as a whole, an original work of authorship. For the purposes
+ of this License, Derivative Works shall not include works that remain
+ separable from, or merely link (or bind by name) to the interfaces of,
+ the Work and Derivative Works thereof.
+
+ "Contribution" shall mean any work of authorship, including
+ the original version of the Work and any modifications or additions
+ to that Work or Derivative Works thereof, that is intentionally
+ submitted to Licensor for inclusion in the Work by the copyright owner
+ or by an individual or Legal Entity authorized to submit on behalf of
+ the copyright owner. For the purposes of this definition, "submitted"
+ means any form of electronic, verbal, or written communication sent
+ to the Licensor or its representatives, including but not limited to
+ communication on electronic mailing lists, source code control systems,
+ and issue tracking systems that are managed by, or on behalf of, the
+ Licensor for the purpose of discussing and improving the Work, but
+ excluding communication that is conspicuously marked or otherwise
+ designated in writing by the copyright owner as "Not a Contribution."
+
+ "Contributor" shall mean Licensor and any individual or Legal Entity
+ on behalf of whom a Contribution has been received by Licensor and
+ subsequently incorporated within the Work.
+
+ 2. Grant of Copyright License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ copyright license to reproduce, prepare Derivative Works of,
+ publicly display, publicly perform, sublicense, and distribute the
+ Work and such Derivative Works in Source or Object form.
+
+ 3. Grant of Patent License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ (except as stated in this section) patent license to make, have made,
+ use, offer to sell, sell, import, and otherwise transfer the Work,
+ where such license applies only to those patent claims licensable
+ by such Contributor that are necessarily infringed by their
+ Contribution(s) alone or by combination of their Contribution(s)
+ with the Work to which such Contribution(s) was submitted. If You
+ institute patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
+ or a Contribution incorporated within the Work constitutes direct
+ or contributory patent infringement, then any patent licenses
+ granted to You under this License for that Work shall terminate
+ as of the date such litigation is filed.
+
+ 4. Redistribution. You may reproduce and distribute copies of the
+ Work or Derivative Works thereof in any medium, with or without
+ modifications, and in Source or Object form, provided that You
+ meet the following conditions:
+
+ (a) You must give any other recipients of the Work or
+ Derivative Works a copy of this License; and
+
+ (b) You must cause any modified files to carry prominent notices
+ stating that You changed the files; and
+
+ (c) You must retain, in the Source form of any Derivative Works
+ that You distribute, all copyright, patent, trademark, and
+ attribution notices from the Source form of the Work,
+ excluding those notices that do not pertain to any part of
+ the Derivative Works; and
+
+ (d) If the Work includes a "NOTICE" text file as part of its
+ distribution, then any Derivative Works that You distribute must
+ include a readable copy of the attribution notices contained
+ within such NOTICE file, excluding those notices that do not
+ pertain to any part of the Derivative Works, in at least one
+ of the following places: within a NOTICE text file distributed
+ as part of the Derivative Works; within the Source form or
+ documentation, if provided along with the Derivative Works; or,
+ within a display generated by the Derivative Works, if and
+ wherever such third-party notices normally appear. The contents
+ of the NOTICE file are for informational purposes only and
+ do not modify the License. You may add Your own attribution
+ notices within Derivative Works that You distribute, alongside
+ or as an addendum to the NOTICE text from the Work, provided
+ that such additional attribution notices cannot be construed
+ as modifying the License.
+
+ You may add Your own copyright statement to Your modifications and
+ may provide additional or different license terms and conditions
+ for use, reproduction, or distribution of Your modifications, or
+ for any such Derivative Works as a whole, provided Your use,
+ reproduction, and distribution of the Work otherwise complies with
+ the conditions stated in this License.
+
+ 5. Submission of Contributions. Unless You explicitly state otherwise,
+ any Contribution intentionally submitted for inclusion in the Work
+ by You to the Licensor shall be under the terms and conditions of
+ this License, without any additional terms or conditions.
+ Notwithstanding the above, nothing herein shall supersede or modify
+ the terms of any separate license agreement you may have executed
+ with Licensor regarding such Contributions.
+
+ 6. Trademarks. This License does not grant permission to use the trade
+ names, trademarks, service marks, or product names of the Licensor,
+ except as required for reasonable and customary use in describing the
+ origin of the Work and reproducing the content of the NOTICE file.
+
+ 7. Disclaimer of Warranty. Unless required by applicable law or
+ agreed to in writing, Licensor provides the Work (and each
+ Contributor provides its Contributions) on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied, including, without limitation, any warranties or conditions
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ PARTICULAR PURPOSE. You are solely responsible for determining the
+ appropriateness of using or redistributing the Work and assume any
+ risks associated with Your exercise of permissions under this License.
+
+ 8. Limitation of Liability. In no event and under no legal theory,
+ whether in tort (including negligence), contract, or otherwise,
+ unless required by applicable law (such as deliberate and grossly
+ negligent acts) or agreed to in writing, shall any Contributor be
+ liable to You for damages, including any direct, indirect, special,
+ incidental, or consequential damages of any character arising as a
+ result of this License or out of the use or inability to use the
+ Work (including but not limited to damages for loss of goodwill,
+ work stoppage, computer failure or malfunction, or any and all
+ other commercial damages or losses), even if such Contributor
+ has been advised of the possibility of such damages.
+
+ 9. Accepting Warranty or Additional Liability. While redistributing
+ the Work or Derivative Works thereof, You may choose to offer,
+ and charge a fee for, acceptance of support, warranty, indemnity,
+ or other liability obligations and/or rights consistent with this
+ License. However, in accepting such obligations, You may act only
+ on Your own behalf and on Your sole responsibility, not on behalf
+ of any other Contributor, and only if You agree to indemnify,
+ defend, and hold each Contributor harmless for any liability
+ incurred by, or claims asserted against, such Contributor by reason
+ of your accepting any such warranty or additional liability.
+
+ END OF TERMS AND CONDITIONS
+
+ APPENDIX: How to apply the Apache License to your work.
+
+ To apply the Apache License to your work, attach the following
+ boilerplate notice, with the fields enclosed by brackets "[]"
+ replaced with your own identifying information. (Don't include
+ the brackets!) The text should be enclosed in the appropriate
+ comment syntax for the file format. We also recommend that a
+ file or class name and description of purpose be included on the
+ same "printed page" as the copyright notice for easier
+ identification within third-party archives.
+
+ Copyright [yyyy] [name of copyright owner]
+
+ Licensed 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.
\ No newline at end of file
diff --git a/de.tudarmstadt.ukp.wikipedia.util/NOTICE.txt b/dkpro-jwpl-util/NOTICE.txt
similarity index 82%
rename from de.tudarmstadt.ukp.wikipedia.util/NOTICE.txt
rename to dkpro-jwpl-util/NOTICE.txt
index dd0b95eb0..a2a524b15 100644
--- a/de.tudarmstadt.ukp.wikipedia.util/NOTICE.txt
+++ b/dkpro-jwpl-util/NOTICE.txt
@@ -1,6 +1,6 @@
Some classes in this module are taken from third parties:
-de.tudarmstadt.ukp.wikipedia.util.templates.parser.SectionExtractor:
+parser.templates.util.org.dkpro.jwpl.SectionExtractor:
Derived from the TextConverter class which was published in the
Sweble example project provided on http://http://sweble.org
diff --git a/de.tudarmstadt.ukp.wikipedia.util/pom.xml b/dkpro-jwpl-util/pom.xml
similarity index 71%
rename from de.tudarmstadt.ukp.wikipedia.util/pom.xml
rename to dkpro-jwpl-util/pom.xml
index 96604e53b..7c387616f 100644
--- a/de.tudarmstadt.ukp.wikipedia.util/pom.xml
+++ b/dkpro-jwpl-util/pom.xml
@@ -17,41 +17,40 @@
-->
4.0.0
-
- de.tudarmstadt.ukp.wikipedia
- de.tudarmstadt.ukp.wikipedia
- 2.0.0-SNAPSHOT
-
- de.tudarmstadt.ukp.wikipedia.util
- JWPL API and RevisionAPI Utilities
- Utilities for the JWPL API and the RevisionAPI
+
+ org.dkpro.jwpl
+ dkpro-jwpl
+ 2.0.0-SNAPSHOT
+
+ dkpro-jwpl-util
+ API Utils
+ Utilities for the JWPL API and the Revision-API
+
- de.tudarmstadt.ukp.wikipedia
- de.tudarmstadt.ukp.wikipedia.api
- jar
- compile
+ org.dkpro.jwpl
+ dkpro-jwpl-api
- de.tudarmstadt.ukp.wikipedia
- de.tudarmstadt.ukp.wikipedia.revisionmachine
+ org.dkpro.jwpl
+ dkpro-jwpl-revisionmachine
- de.tudarmstadt.ukp.wikipedia
- de.tudarmstadt.ukp.wikipedia.parser
+ org.dkpro.jwpl
+ dkpro-jwpl-parser
- com.googlecode.java-diff-utils
- diffutils
- 1.2.1
-
+ com.googlecode.java-diff-utils
+ diffutils
+ 1.2.1
+
commons-logging
commons-logging
- de.tudarmstadt.ukp.wikipedia
- jwpl-swc-engine-shade
+ org.dkpro.jwpl
+ dkpro-jwpl-swc-engine-shade
${project.version}
diff --git a/de.tudarmstadt.ukp.wikipedia.util/src/main/java/de/tudarmstadt/ukp/wikipedia/util/revisions/RevisionUtils.java b/dkpro-jwpl-util/src/main/java/org/dkpro/jwpl/util/revisions/RevisionUtils.java
similarity index 88%
rename from de.tudarmstadt.ukp.wikipedia.util/src/main/java/de/tudarmstadt/ukp/wikipedia/util/revisions/RevisionUtils.java
rename to dkpro-jwpl-util/src/main/java/org/dkpro/jwpl/util/revisions/RevisionUtils.java
index c388363db..f880d09ce 100644
--- a/de.tudarmstadt.ukp.wikipedia.util/src/main/java/de/tudarmstadt/ukp/wikipedia/util/revisions/RevisionUtils.java
+++ b/dkpro-jwpl-util/src/main/java/org/dkpro/jwpl/util/revisions/RevisionUtils.java
@@ -1,142 +1,142 @@
-/*
- * Licensed to the Technische Universität Darmstadt under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The Technische Universität Darmstadt
- * 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.
- *
- * 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.
- */
-package de.tudarmstadt.ukp.wikipedia.util.revisions;
-
-import java.sql.Timestamp;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.LinkedList;
-import java.util.List;
-
-import de.tudarmstadt.ukp.wikipedia.api.DatabaseConfiguration;
-import de.tudarmstadt.ukp.wikipedia.api.Page;
-import de.tudarmstadt.ukp.wikipedia.api.Wikipedia;
-import de.tudarmstadt.ukp.wikipedia.api.exception.WikiApiException;
-import de.tudarmstadt.ukp.wikipedia.api.exception.WikiPageNotFoundException;
-import de.tudarmstadt.ukp.wikipedia.revisionmachine.api.Revision;
-import de.tudarmstadt.ukp.wikipedia.revisionmachine.api.RevisionApi;
-
-/**
- * Provides several revision-related utilities that should not be part of the RevisionMachine
- * package because of dependencies to the JWPL API. RevisionMachine should stay independent
- * from the RevisionMachine
- *
- *
- */
-public class RevisionUtils {
- RevisionApi revApi;
- Wikipedia wiki;
-
- public RevisionUtils(DatabaseConfiguration conf) throws WikiApiException{
- wiki = new Wikipedia(conf);
- revApi = new RevisionApi(conf);
- }
-
- public RevisionUtils(Wikipedia wiki, RevisionApi revApi) throws WikiApiException{
- this.revApi=revApi;
- this.wiki=wiki;
- }
-
- /**
- * For a given article revision, the method returns the revision of the article discussion
- * page which was current at the time the revision was created.
- *
- * @param revisionId revision of the article for which the talk page revision should be retrieved
- * @return the revision of the talk page that was current at the creation time of the given article revision
- * @throws WikiApiException if any error occurred accessing the Wiki db
- * @throws WikiPageNotFoundException if no discussion page was available at the time of the given article revision
- */
- public Revision getDiscussionRevisionForArticleRevision(int revisionId) throws WikiApiException, WikiPageNotFoundException{
- //get article revision
- Revision rev = revApi.getRevision(revisionId);
- Timestamp revTime = rev.getTimeStamp();
-
- //get corresponding discussion page
- Page discussion = wiki.getDiscussionPage(rev.getArticleID());
-
- /*
- * find correct revision of discussion page
- */
- List discussionTs = revApi.getRevisionTimestamps(discussion.getPageId());
-
- // sort in reverse order - newest first
- Collections.sort(discussionTs, new Comparator()
- {
- public int compare(Timestamp ts1, Timestamp ts2)
- {
- return ts2.compareTo(ts1);
- }
- });
-
- //find first timestamp equal to or before the article revision timestamp
- for(Timestamp curDiscTime:discussionTs){
- if(curDiscTime==revTime||curDiscTime.before(revTime)){
- return revApi.getRevision(discussion.getPageId(), curDiscTime);
- }
- }
-
- throw new WikiPageNotFoundException("Not discussion page was available at the time of the given article revision");
- }
-
-
- /**
- * For a given article revision, the method returns the revisions of the archived article discussion
- * pages which were available at the time of the article revision
- *
- * @param revisionId revision of the article for which the talk page archive revisions should be retrieved
- * @return the revisions of the talk page archives that were available at the time of the article revision
- */
- public List getDiscussionArchiveRevisionsForArticleRevision(int revisionId) throws WikiApiException, WikiPageNotFoundException{
- List result = new LinkedList();
-
- //get article revision
- Revision rev = revApi.getRevision(revisionId);
- Timestamp revTime = rev.getTimeStamp();
-
- //get corresponding discussion archives
- Iterable discArchives = wiki.getDiscussionArchives(rev.getArticleID());
-
- /*
- * for each discussion archive, find correct revision of discussion page
- */
- for(Page discArchive:discArchives){
- //get revision timestamps for the current discussion archive
- List discussionTs = revApi.getRevisionTimestamps(discArchive.getPageId());
-
- // sort in reverse order - newest first
- Collections.sort(discussionTs, new Comparator()
- {
- public int compare(Timestamp ts1, Timestamp ts2)
- {
- return ts2.compareTo(ts1);
- }
- });
-
- //find first timestamp equal to or before the article revision timestamp
- for(Timestamp curDiscTime:discussionTs){
- if(curDiscTime==revTime||curDiscTime.before(revTime)){
- result.add(revApi.getRevision(discArchive.getPageId(), curDiscTime));
- break;
- }
- }
- }
-
- return result;
- }
-
-}
+/*
+ * Licensed to the Technische Universität Darmstadt under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The Technische Universität Darmstadt
+ * 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.
+ *
+ * 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.
+ */
+package org.dkpro.jwpl.util.revisions;
+
+import java.sql.Timestamp;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.LinkedList;
+import java.util.List;
+
+import org.dkpro.jwpl.api.DatabaseConfiguration;
+import org.dkpro.jwpl.api.Page;
+import org.dkpro.jwpl.api.Wikipedia;
+import org.dkpro.jwpl.api.exception.WikiApiException;
+import org.dkpro.jwpl.api.exception.WikiPageNotFoundException;
+import org.dkpro.jwpl.revisionmachine.api.Revision;
+import org.dkpro.jwpl.revisionmachine.api.RevisionApi;
+
+/**
+ * Provides several revision-related utilities that should not be part of the RevisionMachine
+ * package because of dependencies to the JWPL API. RevisionMachine should stay independent
+ * from the RevisionMachine
+ *
+ *
+ */
+public class RevisionUtils {
+ RevisionApi revApi;
+ Wikipedia wiki;
+
+ public RevisionUtils(DatabaseConfiguration conf) throws WikiApiException{
+ wiki = new Wikipedia(conf);
+ revApi = new RevisionApi(conf);
+ }
+
+ public RevisionUtils(Wikipedia wiki, RevisionApi revApi) throws WikiApiException{
+ this.revApi=revApi;
+ this.wiki=wiki;
+ }
+
+ /**
+ * For a given article revision, the method returns the revision of the article discussion
+ * page which was current at the time the revision was created.
+ *
+ * @param revisionId revision of the article for which the talk page revision should be retrieved
+ * @return the revision of the talk page that was current at the creation time of the given article revision
+ * @throws WikiApiException if any error occurred accessing the Wiki db
+ * @throws WikiPageNotFoundException if no discussion page was available at the time of the given article revision
+ */
+ public Revision getDiscussionRevisionForArticleRevision(int revisionId) throws WikiApiException, WikiPageNotFoundException{
+ //get article revision
+ Revision rev = revApi.getRevision(revisionId);
+ Timestamp revTime = rev.getTimeStamp();
+
+ //get corresponding discussion page
+ Page discussion = wiki.getDiscussionPage(rev.getArticleID());
+
+ /*
+ * find correct revision of discussion page
+ */
+ List discussionTs = revApi.getRevisionTimestamps(discussion.getPageId());
+
+ // sort in reverse order - newest first
+ Collections.sort(discussionTs, new Comparator()
+ {
+ public int compare(Timestamp ts1, Timestamp ts2)
+ {
+ return ts2.compareTo(ts1);
+ }
+ });
+
+ //find first timestamp equal to or before the article revision timestamp
+ for(Timestamp curDiscTime:discussionTs){
+ if(curDiscTime==revTime||curDiscTime.before(revTime)){
+ return revApi.getRevision(discussion.getPageId(), curDiscTime);
+ }
+ }
+
+ throw new WikiPageNotFoundException("Not discussion page was available at the time of the given article revision");
+ }
+
+
+ /**
+ * For a given article revision, the method returns the revisions of the archived article discussion
+ * pages which were available at the time of the article revision
+ *
+ * @param revisionId revision of the article for which the talk page archive revisions should be retrieved
+ * @return the revisions of the talk page archives that were available at the time of the article revision
+ */
+ public List getDiscussionArchiveRevisionsForArticleRevision(int revisionId) throws WikiApiException, WikiPageNotFoundException{
+ List result = new LinkedList();
+
+ //get article revision
+ Revision rev = revApi.getRevision(revisionId);
+ Timestamp revTime = rev.getTimeStamp();
+
+ //get corresponding discussion archives
+ Iterable discArchives = wiki.getDiscussionArchives(rev.getArticleID());
+
+ /*
+ * for each discussion archive, find correct revision of discussion page
+ */
+ for(Page discArchive:discArchives){
+ //get revision timestamps for the current discussion archive
+ List discussionTs = revApi.getRevisionTimestamps(discArchive.getPageId());
+
+ // sort in reverse order - newest first
+ Collections.sort(discussionTs, new Comparator()
+ {
+ public int compare(Timestamp ts1, Timestamp ts2)
+ {
+ return ts2.compareTo(ts1);
+ }
+ });
+
+ //find first timestamp equal to or before the article revision timestamp
+ for(Timestamp curDiscTime:discussionTs){
+ if(curDiscTime==revTime||curDiscTime.before(revTime)){
+ result.add(revApi.getRevision(discArchive.getPageId(), curDiscTime));
+ break;
+ }
+ }
+ }
+
+ return result;
+ }
+
+}
diff --git a/de.tudarmstadt.ukp.wikipedia.util/src/main/java/de/tudarmstadt/ukp/wikipedia/util/templates/RevisionPair.java b/dkpro-jwpl-util/src/main/java/org/dkpro/jwpl/util/templates/RevisionPair.java
similarity index 93%
rename from de.tudarmstadt.ukp.wikipedia.util/src/main/java/de/tudarmstadt/ukp/wikipedia/util/templates/RevisionPair.java
rename to dkpro-jwpl-util/src/main/java/org/dkpro/jwpl/util/templates/RevisionPair.java
index e817c290e..6b30d12f4 100644
--- a/de.tudarmstadt.ukp.wikipedia.util/src/main/java/de/tudarmstadt/ukp/wikipedia/util/templates/RevisionPair.java
+++ b/dkpro-jwpl-util/src/main/java/org/dkpro/jwpl/util/templates/RevisionPair.java
@@ -1,186 +1,186 @@
-/*
- * Licensed to the Technische Universität Darmstadt under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The Technische Universität Darmstadt
- * 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.
- *
- * 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.
- */
-package de.tudarmstadt.ukp.wikipedia.util.templates;
-
-import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-import de.tudarmstadt.ukp.wikipedia.revisionmachine.api.Revision;
-import de.tudarmstadt.ukp.wikipedia.util.templates.parser.ParseUtils;
-import de.tudarmstadt.ukp.wikipedia.util.templates.parser.SectionExtractor.ExtractedSection;
-
-/**
- * Represents a pair of (adjacent) revisions. In the second pair part (=after) a
- * template has been added or removed (depending on the mode).
- *
- *
- */
-public class RevisionPair implements Serializable{
-
- private static final long serialVersionUID = -428550315195347191L;
-
- private Revision before;
- private Revision after;
- private String template;
- private RevisionPairType revPairType;
-
- public RevisionPair(Revision before, Revision after, String template,
- RevisionPairType revPairType) {
- this.before = before;
- this.after = after;
- this.template = template;
- this.revPairType = revPairType;
- }
-
- /**
- * @return revision before the template change
- */
- public Revision getBeforeRevision() {
- return before;
- }
-
- /**
- * @return revision after the template change
- */
- public Revision getAfterRevision() {
- return after;
- }
-
- /**
- * @return the template that has been added or removed
- */
- public String getTemplate() {
- return template;
- }
-
- /**
- * @return the type of template change
- */
- public RevisionPairType getType() {
- return revPairType;
- }
-
- /**
- * Returns the text "around the given template" and returns the corresponding
- * text in the other pair part of the RevisionPair.
- *
- * Currently, this is done section-based. On TextPairPart contains a section
- * with a template and the other contains the corresponding section
- * after the template has been deleted (in deleteTemplate mode) or before
- * it has been added (in addTemplate mode).
- *
- * Note that this only makes sense for inline- or section-templates.
- *
- * The section-matching is currently done simply by matching section titles.
- * If the title has changed, no match will be found.
- *
- * @param markTemplates sets whether to add an inline marker for the template
- *
- * @return a pair of strings corresponding to the before-revision and
- * after-revision
- */
- public List getInlineTextPairs(boolean markTemplates) {
- List pairList = new ArrayList();
-
- try {
- //extract sections
- List beforeSections=null;
- List afterSections=null;
- if(markTemplates){
- //add inline marker for the template
- beforeSections = ParseUtils.getSections(before.getRevisionText(), before.getRevisionID() + "",before.getRevisionID(), Arrays.asList(new String[]{template}));
- afterSections = ParseUtils.getSections(after.getRevisionText(), after.getRevisionID() + "", after.getRevisionID(), Arrays.asList(new String[]{template}));
- }else{
- //no inline markers
- beforeSections = ParseUtils.getSections(before.getRevisionText(), before.getRevisionID() + "",before.getRevisionID());
- afterSections = ParseUtils.getSections(after.getRevisionText(), after.getRevisionID() + "", after.getRevisionID());
- }
- for (ExtractedSection tplSect : revPairType == RevisionPairType.deleteTemplate ? beforeSections : afterSections) {
- // in DELETE-mode, the "before" revision contain the templates
- // in ADD-mode, the "after" revision contains the templates
- if (containsIgnoreCase(tplSect.getTemplates(), template)) {
- // the current sect contains the template we're looking for
- // now find the corresponding tpl in the other revisions
- for (ExtractedSection nonTplSect : revPairType == RevisionPairType.deleteTemplate ? afterSections: beforeSections) {
- // TODO how do we match the sections?
- // currently only by title - we could do fuzzy matching
- // of the section body
- if (tplSect.getTitle()!=null&&nonTplSect.getTitle()!=null&&tplSect.getTitle().equalsIgnoreCase(nonTplSect.getTitle())) {
- if (revPairType == RevisionPairType.deleteTemplate) {
- pairList.add(new TextPair(tplSect.getBody(), nonTplSect.getBody()));
- } else {
- pairList.add(new TextPair(nonTplSect.getBody(), tplSect.getBody()));
- }
- }
- }
- }
- }
- } catch (Exception ex) {
- //This happends if a (SWEBLE-)compiler exception occurs.S
- //Sometimes, malformed xml items seem to cause class cast exceptions
- //in the parser, which is not wrapped in a Compiler exception.
- //Therefore, we should catch all exceptions here and return the
- //TextPairs identified so far (if any)
- System.err.println(ex.getMessage());
- //TODO use logger!!
- }
- return pairList;
- }
-
- /**
- * Checks if a list of string contains a String while ignoring case
- *
- * @param stringlist a list of string
- * @param match the string to look for
- * @return true, if the list contains the string, false else
- */
- private boolean containsIgnoreCase(List stringlist, String match) {
- for (String s : stringlist) {
- if (s.equalsIgnoreCase(match)) {
- return true;
- }
- }
- return false;
- }
-
- public enum RevisionPairType {
- deleteTemplate, addTemplate
- }
-
-
- @Override
- public boolean equals(Object anObject) {
- if(!(anObject instanceof RevisionPair)){
- return false;
- }else{
- RevisionPair otherPair = (RevisionPair)anObject;
- if (this.getBeforeRevision().getRevisionID() ==
- otherPair.getBeforeRevision().getRevisionID()
- && this.getAfterRevision().getRevisionID() ==
- otherPair.getAfterRevision().getRevisionID()
- && this.getTemplate().equals(otherPair.getTemplate())&&
- this.getType()==otherPair.getType()) {
- return true;
- }else{
- return false;
- }
- }
- }
-}
+/*
+ * Licensed to the Technische Universität Darmstadt under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The Technische Universität Darmstadt
+ * 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.
+ *
+ * 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.
+ */
+package org.dkpro.jwpl.util.templates;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+import org.dkpro.jwpl.revisionmachine.api.Revision;
+import org.dkpro.jwpl.util.templates.parser.ParseUtils;
+import org.dkpro.jwpl.util.templates.parser.SectionExtractor.ExtractedSection;
+
+/**
+ * Represents a pair of (adjacent) revisions. In the second pair part (=after) a
+ * template has been added or removed (depending on the mode).
+ *
+ *
+ */
+public class RevisionPair implements Serializable{
+
+ private static final long serialVersionUID = -428550315195347191L;
+
+ private Revision before;
+ private Revision after;
+ private String template;
+ private RevisionPairType revPairType;
+
+ public RevisionPair(Revision before, Revision after, String template,
+ RevisionPairType revPairType) {
+ this.before = before;
+ this.after = after;
+ this.template = template;
+ this.revPairType = revPairType;
+ }
+
+ /**
+ * @return revision before the template change
+ */
+ public Revision getBeforeRevision() {
+ return before;
+ }
+
+ /**
+ * @return revision after the template change
+ */
+ public Revision getAfterRevision() {
+ return after;
+ }
+
+ /**
+ * @return the template that has been added or removed
+ */
+ public String getTemplate() {
+ return template;
+ }
+
+ /**
+ * @return the type of template change
+ */
+ public RevisionPairType getType() {
+ return revPairType;
+ }
+
+ /**
+ * Returns the text "around the given template" and returns the corresponding
+ * text in the other pair part of the RevisionPair.
+ *
+ * Currently, this is done section-based. On TextPairPart contains a section
+ * with a template and the other contains the corresponding section
+ * after the template has been deleted (in deleteTemplate mode) or before
+ * it has been added (in addTemplate mode).
+ *
+ * Note that this only makes sense for inline- or section-templates.
+ *
+ * The section-matching is currently done simply by matching section titles.
+ * If the title has changed, no match will be found.
+ *
+ * @param markTemplates sets whether to add an inline marker for the template
+ *
+ * @return a pair of strings corresponding to the before-revision and
+ * after-revision
+ */
+ public List getInlineTextPairs(boolean markTemplates) {
+ List pairList = new ArrayList();
+
+ try {
+ //extract sections
+ List beforeSections=null;
+ List afterSections=null;
+ if(markTemplates){
+ //add inline marker for the template
+ beforeSections = ParseUtils.getSections(before.getRevisionText(), before.getRevisionID() + "",before.getRevisionID(), Arrays.asList(new String[]{template}));
+ afterSections = ParseUtils.getSections(after.getRevisionText(), after.getRevisionID() + "", after.getRevisionID(), Arrays.asList(new String[]{template}));
+ }else{
+ //no inline markers
+ beforeSections = ParseUtils.getSections(before.getRevisionText(), before.getRevisionID() + "",before.getRevisionID());
+ afterSections = ParseUtils.getSections(after.getRevisionText(), after.getRevisionID() + "", after.getRevisionID());
+ }
+ for (ExtractedSection tplSect : revPairType == RevisionPairType.deleteTemplate ? beforeSections : afterSections) {
+ // in DELETE-mode, the "before" revision contain the templates
+ // in ADD-mode, the "after" revision contains the templates
+ if (containsIgnoreCase(tplSect.getTemplates(), template)) {
+ // the current sect contains the template we're looking for
+ // now find the corresponding tpl in the other revisions
+ for (ExtractedSection nonTplSect : revPairType == RevisionPairType.deleteTemplate ? afterSections: beforeSections) {
+ // TODO how do we match the sections?
+ // currently only by title - we could do fuzzy matching
+ // of the section body
+ if (tplSect.getTitle()!=null&&nonTplSect.getTitle()!=null&&tplSect.getTitle().equalsIgnoreCase(nonTplSect.getTitle())) {
+ if (revPairType == RevisionPairType.deleteTemplate) {
+ pairList.add(new TextPair(tplSect.getBody(), nonTplSect.getBody()));
+ } else {
+ pairList.add(new TextPair(nonTplSect.getBody(), tplSect.getBody()));
+ }
+ }
+ }
+ }
+ }
+ } catch (Exception ex) {
+ //This happends if a (SWEBLE-)compiler exception occurs.S
+ //Sometimes, malformed xml items seem to cause class cast exceptions
+ //in the parser, which is not wrapped in a Compiler exception.
+ //Therefore, we should catch all exceptions here and return the
+ //TextPairs identified so far (if any)
+ System.err.println(ex.getMessage());
+ //TODO use logger!!
+ }
+ return pairList;
+ }
+
+ /**
+ * Checks if a list of string contains a String while ignoring case
+ *
+ * @param stringlist a list of string
+ * @param match the string to look for
+ * @return true, if the list contains the string, false else
+ */
+ private boolean containsIgnoreCase(List stringlist, String match) {
+ for (String s : stringlist) {
+ if (s.equalsIgnoreCase(match)) {
+ return true;
+ }
+ }
+ return false;
+ }
+
+ public enum RevisionPairType {
+ deleteTemplate, addTemplate
+ }
+
+
+ @Override
+ public boolean equals(Object anObject) {
+ if(!(anObject instanceof RevisionPair)){
+ return false;
+ }else{
+ RevisionPair otherPair = (RevisionPair)anObject;
+ if (this.getBeforeRevision().getRevisionID() ==
+ otherPair.getBeforeRevision().getRevisionID()
+ && this.getAfterRevision().getRevisionID() ==
+ otherPair.getAfterRevision().getRevisionID()
+ && this.getTemplate().equals(otherPair.getTemplate())&&
+ this.getType()==otherPair.getType()) {
+ return true;
+ }else{
+ return false;
+ }
+ }
+ }
+}
diff --git a/de.tudarmstadt.ukp.wikipedia.util/src/main/java/de/tudarmstadt/ukp/wikipedia/util/templates/TextPair.java b/dkpro-jwpl-util/src/main/java/org/dkpro/jwpl/util/templates/TextPair.java
similarity index 99%
rename from de.tudarmstadt.ukp.wikipedia.util/src/main/java/de/tudarmstadt/ukp/wikipedia/util/templates/TextPair.java
rename to dkpro-jwpl-util/src/main/java/org/dkpro/jwpl/util/templates/TextPair.java
index 1905b27e7..15e81edd0 100644
--- a/de.tudarmstadt.ukp.wikipedia.util/src/main/java/de/tudarmstadt/ukp/wikipedia/util/templates/TextPair.java
+++ b/dkpro-jwpl-util/src/main/java/org/dkpro/jwpl/util/templates/TextPair.java
@@ -15,7 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package de.tudarmstadt.ukp.wikipedia.util.templates;
+package org.dkpro.jwpl.util.templates;
import java.text.BreakIterator;
import java.util.ArrayList;
diff --git a/de.tudarmstadt.ukp.wikipedia.util/src/main/java/de/tudarmstadt/ukp/wikipedia/util/templates/WikipediaTemplateInfo.java b/dkpro-jwpl-util/src/main/java/org/dkpro/jwpl/util/templates/WikipediaTemplateInfo.java
similarity index 98%
rename from de.tudarmstadt.ukp.wikipedia.util/src/main/java/de/tudarmstadt/ukp/wikipedia/util/templates/WikipediaTemplateInfo.java
rename to dkpro-jwpl-util/src/main/java/org/dkpro/jwpl/util/templates/WikipediaTemplateInfo.java
index d52a0944b..2746af463 100644
--- a/de.tudarmstadt.ukp.wikipedia.util/src/main/java/de/tudarmstadt/ukp/wikipedia/util/templates/WikipediaTemplateInfo.java
+++ b/dkpro-jwpl-util/src/main/java/org/dkpro/jwpl/util/templates/WikipediaTemplateInfo.java
@@ -15,7 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package de.tudarmstadt.ukp.wikipedia.util.templates;
+package org.dkpro.jwpl.util.templates;
import java.sql.Connection;
import java.sql.DriverManager;
@@ -37,20 +37,20 @@
import java.util.SortedSet;
import java.util.TreeSet;
-import de.tudarmstadt.ukp.wikipedia.api.DatabaseConfiguration;
-import de.tudarmstadt.ukp.wikipedia.api.Page;
-import de.tudarmstadt.ukp.wikipedia.api.Wikipedia;
-import de.tudarmstadt.ukp.wikipedia.api.exception.WikiApiException;
-import de.tudarmstadt.ukp.wikipedia.api.exception.WikiPageNotFoundException;
-import de.tudarmstadt.ukp.wikipedia.parser.ParsedPage;
-import de.tudarmstadt.ukp.wikipedia.parser.Template;
-import de.tudarmstadt.ukp.wikipedia.parser.mediawiki.MediaWikiParser;
-import de.tudarmstadt.ukp.wikipedia.parser.mediawiki.MediaWikiParserFactory;
-import de.tudarmstadt.ukp.wikipedia.parser.mediawiki.ShowTemplateNamesAndParameters;
-import de.tudarmstadt.ukp.wikipedia.revisionmachine.api.Revision;
-import de.tudarmstadt.ukp.wikipedia.revisionmachine.api.RevisionApi;
-import de.tudarmstadt.ukp.wikipedia.util.templates.RevisionPair.RevisionPairType;
-import de.tudarmstadt.ukp.wikipedia.util.templates.generator.GeneratorConstants;
+import org.dkpro.jwpl.api.DatabaseConfiguration;
+import org.dkpro.jwpl.api.Page;
+import org.dkpro.jwpl.api.Wikipedia;
+import org.dkpro.jwpl.api.exception.WikiApiException;
+import org.dkpro.jwpl.api.exception.WikiPageNotFoundException;
+import org.dkpro.jwpl.parser.ParsedPage;
+import org.dkpro.jwpl.parser.Template;
+import org.dkpro.jwpl.parser.mediawiki.MediaWikiParser;
+import org.dkpro.jwpl.parser.mediawiki.MediaWikiParserFactory;
+import org.dkpro.jwpl.parser.mediawiki.ShowTemplateNamesAndParameters;
+import org.dkpro.jwpl.revisionmachine.api.Revision;
+import org.dkpro.jwpl.revisionmachine.api.RevisionApi;
+import org.dkpro.jwpl.util.templates.RevisionPair.RevisionPairType;
+import org.dkpro.jwpl.util.templates.generator.GeneratorConstants;
/**
* This class gives access to the additional information created by
diff --git a/de.tudarmstadt.ukp.wikipedia.util/src/main/java/de/tudarmstadt/ukp/wikipedia/util/templates/generator/GeneratorConstants.java b/dkpro-jwpl-util/src/main/java/org/dkpro/jwpl/util/templates/generator/GeneratorConstants.java
similarity index 94%
rename from de.tudarmstadt.ukp.wikipedia.util/src/main/java/de/tudarmstadt/ukp/wikipedia/util/templates/generator/GeneratorConstants.java
rename to dkpro-jwpl-util/src/main/java/org/dkpro/jwpl/util/templates/generator/GeneratorConstants.java
index 51a00b725..aff40d794 100644
--- a/de.tudarmstadt.ukp.wikipedia.util/src/main/java/de/tudarmstadt/ukp/wikipedia/util/templates/generator/GeneratorConstants.java
+++ b/dkpro-jwpl-util/src/main/java/org/dkpro/jwpl/util/templates/generator/GeneratorConstants.java
@@ -15,7 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package de.tudarmstadt.ukp.wikipedia.util.templates.generator;
+package org.dkpro.jwpl.util.templates.generator;
public class GeneratorConstants
{
diff --git a/de.tudarmstadt.ukp.wikipedia.util/src/main/java/de/tudarmstadt/ukp/wikipedia/util/templates/generator/simple/GeneratorMode.java b/dkpro-jwpl-util/src/main/java/org/dkpro/jwpl/util/templates/generator/simple/GeneratorMode.java
similarity index 94%
rename from de.tudarmstadt.ukp.wikipedia.util/src/main/java/de/tudarmstadt/ukp/wikipedia/util/templates/generator/simple/GeneratorMode.java
rename to dkpro-jwpl-util/src/main/java/org/dkpro/jwpl/util/templates/generator/simple/GeneratorMode.java
index 2b6f47a1e..dcc247515 100644
--- a/de.tudarmstadt.ukp.wikipedia.util/src/main/java/de/tudarmstadt/ukp/wikipedia/util/templates/generator/simple/GeneratorMode.java
+++ b/dkpro-jwpl-util/src/main/java/org/dkpro/jwpl/util/templates/generator/simple/GeneratorMode.java
@@ -15,7 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package de.tudarmstadt.ukp.wikipedia.util.templates.generator.simple;
+package org.dkpro.jwpl.util.templates.generator.simple;
import java.util.Map;
import java.util.Set;
diff --git a/de.tudarmstadt.ukp.wikipedia.util/src/main/java/de/tudarmstadt/ukp/wikipedia/util/templates/generator/simple/TemplateFilter.java b/dkpro-jwpl-util/src/main/java/org/dkpro/jwpl/util/templates/generator/simple/TemplateFilter.java
similarity index 98%
rename from de.tudarmstadt.ukp.wikipedia.util/src/main/java/de/tudarmstadt/ukp/wikipedia/util/templates/generator/simple/TemplateFilter.java
rename to dkpro-jwpl-util/src/main/java/org/dkpro/jwpl/util/templates/generator/simple/TemplateFilter.java
index 14d9387e1..19e8bf1f5 100644
--- a/de.tudarmstadt.ukp.wikipedia.util/src/main/java/de/tudarmstadt/ukp/wikipedia/util/templates/generator/simple/TemplateFilter.java
+++ b/dkpro-jwpl-util/src/main/java/org/dkpro/jwpl/util/templates/generator/simple/TemplateFilter.java
@@ -15,7 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package de.tudarmstadt.ukp.wikipedia.util.templates.generator.simple;
+package org.dkpro.jwpl.util.templates.generator.simple;
import java.util.HashSet;
diff --git a/de.tudarmstadt.ukp.wikipedia.util/src/main/java/de/tudarmstadt/ukp/wikipedia/util/templates/generator/simple/TemplateInfoGeneratorStarter.java b/dkpro-jwpl-util/src/main/java/org/dkpro/jwpl/util/templates/generator/simple/TemplateInfoGeneratorStarter.java
similarity index 97%
rename from de.tudarmstadt.ukp.wikipedia.util/src/main/java/de/tudarmstadt/ukp/wikipedia/util/templates/generator/simple/TemplateInfoGeneratorStarter.java
rename to dkpro-jwpl-util/src/main/java/org/dkpro/jwpl/util/templates/generator/simple/TemplateInfoGeneratorStarter.java
index 4e5369a0f..bf6373540 100644
--- a/de.tudarmstadt.ukp.wikipedia.util/src/main/java/de/tudarmstadt/ukp/wikipedia/util/templates/generator/simple/TemplateInfoGeneratorStarter.java
+++ b/dkpro-jwpl-util/src/main/java/org/dkpro/jwpl/util/templates/generator/simple/TemplateInfoGeneratorStarter.java
@@ -15,7 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package de.tudarmstadt.ukp.wikipedia.util.templates.generator.simple;
+package org.dkpro.jwpl.util.templates.generator.simple;
import java.io.BufferedInputStream;
import java.io.File;
@@ -26,8 +26,8 @@
import java.util.regex.Matcher;
import java.util.regex.Pattern;
-import de.tudarmstadt.ukp.wikipedia.api.DatabaseConfiguration;
-import de.tudarmstadt.ukp.wikipedia.api.WikiConstants.Language;
+import org.dkpro.jwpl.api.DatabaseConfiguration;
+import org.dkpro.jwpl.api.WikiConstants.Language;
/**
* Starter, which parsed configuration properties file and starts
diff --git a/de.tudarmstadt.ukp.wikipedia.util/src/main/java/de/tudarmstadt/ukp/wikipedia/util/templates/generator/simple/WikipediaTemplateInfoDumpWriter.java b/dkpro-jwpl-util/src/main/java/org/dkpro/jwpl/util/templates/generator/simple/WikipediaTemplateInfoDumpWriter.java
similarity index 98%
rename from de.tudarmstadt.ukp.wikipedia.util/src/main/java/de/tudarmstadt/ukp/wikipedia/util/templates/generator/simple/WikipediaTemplateInfoDumpWriter.java
rename to dkpro-jwpl-util/src/main/java/org/dkpro/jwpl/util/templates/generator/simple/WikipediaTemplateInfoDumpWriter.java
index 5245a4c1c..19e5e8695 100644
--- a/de.tudarmstadt.ukp.wikipedia.util/src/main/java/de/tudarmstadt/ukp/wikipedia/util/templates/generator/simple/WikipediaTemplateInfoDumpWriter.java
+++ b/dkpro-jwpl-util/src/main/java/org/dkpro/jwpl/util/templates/generator/simple/WikipediaTemplateInfoDumpWriter.java
@@ -15,7 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package de.tudarmstadt.ukp.wikipedia.util.templates.generator.simple;
+package org.dkpro.jwpl.util.templates.generator.simple;
import java.io.BufferedOutputStream;
import java.io.BufferedWriter;
@@ -28,7 +28,7 @@
import java.util.Map.Entry;
import java.util.Set;
-import de.tudarmstadt.ukp.wikipedia.util.templates.generator.GeneratorConstants;
+import org.dkpro.jwpl.util.templates.generator.GeneratorConstants;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/de.tudarmstadt.ukp.wikipedia.util/src/main/java/de/tudarmstadt/ukp/wikipedia/util/templates/generator/simple/WikipediaTemplateInfoGenerator.java b/dkpro-jwpl-util/src/main/java/org/dkpro/jwpl/util/templates/generator/simple/WikipediaTemplateInfoGenerator.java
similarity index 89%
rename from de.tudarmstadt.ukp.wikipedia.util/src/main/java/de/tudarmstadt/ukp/wikipedia/util/templates/generator/simple/WikipediaTemplateInfoGenerator.java
rename to dkpro-jwpl-util/src/main/java/org/dkpro/jwpl/util/templates/generator/simple/WikipediaTemplateInfoGenerator.java
index 00f6de75d..346b1355f 100644
--- a/de.tudarmstadt.ukp.wikipedia.util/src/main/java/de/tudarmstadt/ukp/wikipedia/util/templates/generator/simple/WikipediaTemplateInfoGenerator.java
+++ b/dkpro-jwpl-util/src/main/java/org/dkpro/jwpl/util/templates/generator/simple/WikipediaTemplateInfoGenerator.java
@@ -15,7 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package de.tudarmstadt.ukp.wikipedia.util.templates.generator.simple;
+package org.dkpro.jwpl.util.templates.generator.simple;
import java.lang.invoke.MethodHandles;
import java.sql.SQLException;
@@ -26,23 +26,23 @@
import java.util.Map;
import java.util.Set;
-import de.tudarmstadt.ukp.wikipedia.api.DatabaseConfiguration;
-import de.tudarmstadt.ukp.wikipedia.api.Page;
-import de.tudarmstadt.ukp.wikipedia.api.PageIterator;
-import de.tudarmstadt.ukp.wikipedia.api.Wikipedia;
-import de.tudarmstadt.ukp.wikipedia.api.exception.WikiApiException;
-import de.tudarmstadt.ukp.wikipedia.api.exception.WikiInitializationException;
-import de.tudarmstadt.ukp.wikipedia.parser.ParsedPage;
-import de.tudarmstadt.ukp.wikipedia.parser.Template;
-import de.tudarmstadt.ukp.wikipedia.parser.mediawiki.MediaWikiParser;
-import de.tudarmstadt.ukp.wikipedia.parser.mediawiki.MediaWikiParserFactory;
-import de.tudarmstadt.ukp.wikipedia.parser.mediawiki.ShowTemplateNamesAndParameters;
-import de.tudarmstadt.ukp.wikipedia.revisionmachine.api.Revision;
-import de.tudarmstadt.ukp.wikipedia.revisionmachine.api.RevisionApi;
-import de.tudarmstadt.ukp.wikipedia.revisionmachine.api.RevisionIterator;
-import de.tudarmstadt.ukp.wikipedia.util.StringUtils;
-import de.tudarmstadt.ukp.wikipedia.util.templates.WikipediaTemplateInfo;
-import de.tudarmstadt.ukp.wikipedia.util.templates.generator.GeneratorConstants;
+import org.dkpro.jwpl.api.DatabaseConfiguration;
+import org.dkpro.jwpl.api.Page;
+import org.dkpro.jwpl.api.PageIterator;
+import org.dkpro.jwpl.api.Wikipedia;
+import org.dkpro.jwpl.api.exception.WikiApiException;
+import org.dkpro.jwpl.api.exception.WikiInitializationException;
+import org.dkpro.jwpl.parser.ParsedPage;
+import org.dkpro.jwpl.parser.Template;
+import org.dkpro.jwpl.parser.mediawiki.MediaWikiParser;
+import org.dkpro.jwpl.parser.mediawiki.MediaWikiParserFactory;
+import org.dkpro.jwpl.parser.mediawiki.ShowTemplateNamesAndParameters;
+import org.dkpro.jwpl.revisionmachine.api.Revision;
+import org.dkpro.jwpl.revisionmachine.api.RevisionApi;
+import org.dkpro.jwpl.revisionmachine.api.RevisionIterator;
+import org.dkpro.jwpl.util.StringUtils;
+import org.dkpro.jwpl.util.templates.WikipediaTemplateInfo;
+import org.dkpro.jwpl.util.templates.generator.GeneratorConstants;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/de.tudarmstadt.ukp.wikipedia.util/src/main/java/de/tudarmstadt/ukp/wikipedia/util/templates/parser/ParseUtils.java b/dkpro-jwpl-util/src/main/java/org/dkpro/jwpl/util/templates/parser/ParseUtils.java
similarity index 96%
rename from de.tudarmstadt.ukp.wikipedia.util/src/main/java/de/tudarmstadt/ukp/wikipedia/util/templates/parser/ParseUtils.java
rename to dkpro-jwpl-util/src/main/java/org/dkpro/jwpl/util/templates/parser/ParseUtils.java
index 89b451a52..e792e0ae3 100644
--- a/de.tudarmstadt.ukp.wikipedia.util/src/main/java/de/tudarmstadt/ukp/wikipedia/util/templates/parser/ParseUtils.java
+++ b/dkpro-jwpl-util/src/main/java/org/dkpro/jwpl/util/templates/parser/ParseUtils.java
@@ -15,7 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package de.tudarmstadt.ukp.wikipedia.util.templates.parser;
+package org.dkpro.jwpl.util.templates.parser;
import java.io.FileNotFoundException;
import java.util.List;
@@ -33,8 +33,8 @@
import org.sweble.wikitext.parser.parser.LinkTargetException;
import de.fau.cs.osr.ptk.common.AstVisitor;
-import de.tudarmstadt.ukp.wikipedia.api.sweble.TemplateNameExtractor;
-import de.tudarmstadt.ukp.wikipedia.util.templates.parser.SectionExtractor.ExtractedSection;
+import org.dkpro.jwpl.api.sweble.TemplateNameExtractor;
+import org.dkpro.jwpl.util.templates.parser.SectionExtractor.ExtractedSection;
public class ParseUtils
{
diff --git a/de.tudarmstadt.ukp.wikipedia.util/src/main/java/de/tudarmstadt/ukp/wikipedia/util/templates/parser/SectionExtractionTest.java b/dkpro-jwpl-util/src/main/java/org/dkpro/jwpl/util/templates/parser/SectionExtractionTest.java
similarity index 80%
rename from de.tudarmstadt.ukp.wikipedia.util/src/main/java/de/tudarmstadt/ukp/wikipedia/util/templates/parser/SectionExtractionTest.java
rename to dkpro-jwpl-util/src/main/java/org/dkpro/jwpl/util/templates/parser/SectionExtractionTest.java
index 401306a8f..84c9bb113 100644
--- a/de.tudarmstadt.ukp.wikipedia.util/src/main/java/de/tudarmstadt/ukp/wikipedia/util/templates/parser/SectionExtractionTest.java
+++ b/dkpro-jwpl-util/src/main/java/org/dkpro/jwpl/util/templates/parser/SectionExtractionTest.java
@@ -15,15 +15,15 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package de.tudarmstadt.ukp.wikipedia.util.templates.parser;
+package org.dkpro.jwpl.util.templates.parser;
import java.util.List;
-import de.tudarmstadt.ukp.wikipedia.api.DatabaseConfiguration;
-import de.tudarmstadt.ukp.wikipedia.api.Page;
-import de.tudarmstadt.ukp.wikipedia.api.WikiConstants;
-import de.tudarmstadt.ukp.wikipedia.api.Wikipedia;
-import de.tudarmstadt.ukp.wikipedia.util.templates.parser.SectionExtractor.ExtractedSection;
+import org.dkpro.jwpl.api.DatabaseConfiguration;
+import org.dkpro.jwpl.api.Page;
+import org.dkpro.jwpl.api.WikiConstants;
+import org.dkpro.jwpl.api.Wikipedia;
+import org.dkpro.jwpl.util.templates.parser.SectionExtractor.ExtractedSection;
public class SectionExtractionTest
{
diff --git a/de.tudarmstadt.ukp.wikipedia.util/src/main/java/de/tudarmstadt/ukp/wikipedia/util/templates/parser/SectionExtractor.java b/dkpro-jwpl-util/src/main/java/org/dkpro/jwpl/util/templates/parser/SectionExtractor.java
similarity index 99%
rename from de.tudarmstadt.ukp.wikipedia.util/src/main/java/de/tudarmstadt/ukp/wikipedia/util/templates/parser/SectionExtractor.java
rename to dkpro-jwpl-util/src/main/java/org/dkpro/jwpl/util/templates/parser/SectionExtractor.java
index ab68f10a5..a92d79f73 100644
--- a/de.tudarmstadt.ukp.wikipedia.util/src/main/java/de/tudarmstadt/ukp/wikipedia/util/templates/parser/SectionExtractor.java
+++ b/dkpro-jwpl-util/src/main/java/org/dkpro/jwpl/util/templates/parser/SectionExtractor.java
@@ -38,7 +38,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package de.tudarmstadt.ukp.wikipedia.util.templates.parser;
+package org.dkpro.jwpl.util.templates.parser;
import java.io.IOException;
import java.util.ArrayList;
diff --git a/de.tudarmstadt.ukp.wikipedia.util/src/main/resources/create_tpltables_simplegenerator.sql b/dkpro-jwpl-util/src/main/resources/create_tpltables_simplegenerator.sql
similarity index 99%
rename from de.tudarmstadt.ukp.wikipedia.util/src/main/resources/create_tpltables_simplegenerator.sql
rename to dkpro-jwpl-util/src/main/resources/create_tpltables_simplegenerator.sql
index 051abdc41..50f193065 100644
--- a/de.tudarmstadt.ukp.wikipedia.util/src/main/resources/create_tpltables_simplegenerator.sql
+++ b/dkpro-jwpl-util/src/main/resources/create_tpltables_simplegenerator.sql
@@ -1,3 +1,3 @@
-CREATE TABLE IF NOT EXISTS templateId_pageId (templateId INTEGER UNSIGNED NOT NULL,pageId INTEGER UNSIGNED NOT NULL, UNIQUE(templateId, pageId)) ENGINE = MYISAM;
-CREATE TABLE IF NOT EXISTS templates (templateId INTEGER NOT NULL AUTO_INCREMENT,templateName TEXT NOT NULL,PRIMARY KEY(templateId)) ENGINE = MYISAM;
-CREATE TABLE IF NOT EXISTS templateId_revisionId(templateId INTEGER UNSIGNED NOT NULL,revisionId INTEGER UNSIGNED NOT NULL, UNIQUE(templateId, revisionId)) ENGINE = MYISAM;
+CREATE TABLE IF NOT EXISTS templateId_pageId (templateId INTEGER UNSIGNED NOT NULL,pageId INTEGER UNSIGNED NOT NULL, UNIQUE(templateId, pageId)) ENGINE = MYISAM;
+CREATE TABLE IF NOT EXISTS templates (templateId INTEGER NOT NULL AUTO_INCREMENT,templateName TEXT NOT NULL,PRIMARY KEY(templateId)) ENGINE = MYISAM;
+CREATE TABLE IF NOT EXISTS templateId_revisionId(templateId INTEGER UNSIGNED NOT NULL,revisionId INTEGER UNSIGNED NOT NULL, UNIQUE(templateId, revisionId)) ENGINE = MYISAM;
diff --git a/de.tudarmstadt.ukp.wikipedia.util/src/main/resources/templategen.properties.sample b/dkpro-jwpl-util/src/main/resources/templategen.properties.sample
similarity index 100%
rename from de.tudarmstadt.ukp.wikipedia.util/src/main/resources/templategen.properties.sample
rename to dkpro-jwpl-util/src/main/resources/templategen.properties.sample
diff --git a/de.tudarmstadt.ukp.wikipedia.wikimachine/.activate_rat-check b/dkpro-jwpl-wikimachine/.activate_rat-check
similarity index 100%
rename from de.tudarmstadt.ukp.wikipedia.wikimachine/.activate_rat-check
rename to dkpro-jwpl-wikimachine/.activate_rat-check
diff --git a/de.tudarmstadt.ukp.wikipedia.wikimachine/CHANGES b/dkpro-jwpl-wikimachine/CHANGES
similarity index 100%
rename from de.tudarmstadt.ukp.wikipedia.wikimachine/CHANGES
rename to dkpro-jwpl-wikimachine/CHANGES
diff --git a/de.tudarmstadt.ukp.wikipedia.wikimachine/LICENCE.txt b/dkpro-jwpl-wikimachine/LICENCE.txt
similarity index 98%
rename from de.tudarmstadt.ukp.wikipedia.wikimachine/LICENCE.txt
rename to dkpro-jwpl-wikimachine/LICENCE.txt
index b1fac45f0..989e2c59e 100644
--- a/de.tudarmstadt.ukp.wikipedia.wikimachine/LICENCE.txt
+++ b/dkpro-jwpl-wikimachine/LICENCE.txt
@@ -1,201 +1,201 @@
-Apache License
- Version 2.0, January 2004
- http://www.apache.org/licenses/
-
- TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
- 1. Definitions.
-
- "License" shall mean the terms and conditions for use, reproduction,
- and distribution as defined by Sections 1 through 9 of this document.
-
- "Licensor" shall mean the copyright owner or entity authorized by
- the copyright owner that is granting the License.
-
- "Legal Entity" shall mean the union of the acting entity and all
- other entities that control, are controlled by, or are under common
- control with that entity. For the purposes of this definition,
- "control" means (i) the power, direct or indirect, to cause the
- direction or management of such entity, whether by contract or
- otherwise, or (ii) ownership of fifty percent (50%) or more of the
- outstanding shares, or (iii) beneficial ownership of such entity.
-
- "You" (or "Your") shall mean an individual or Legal Entity
- exercising permissions granted by this License.
-
- "Source" form shall mean the preferred form for making modifications,
- including but not limited to software source code, documentation
- source, and configuration files.
-
- "Object" form shall mean any form resulting from mechanical
- transformation or translation of a Source form, including but
- not limited to compiled object code, generated documentation,
- and conversions to other media types.
-
- "Work" shall mean the work of authorship, whether in Source or
- Object form, made available under the License, as indicated by a
- copyright notice that is included in or attached to the work
- (an example is provided in the Appendix below).
-
- "Derivative Works" shall mean any work, whether in Source or Object
- form, that is based on (or derived from) the Work and for which the
- editorial revisions, annotations, elaborations, or other modifications
- represent, as a whole, an original work of authorship. For the purposes
- of this License, Derivative Works shall not include works that remain
- separable from, or merely link (or bind by name) to the interfaces of,
- the Work and Derivative Works thereof.
-
- "Contribution" shall mean any work of authorship, including
- the original version of the Work and any modifications or additions
- to that Work or Derivative Works thereof, that is intentionally
- submitted to Licensor for inclusion in the Work by the copyright owner
- or by an individual or Legal Entity authorized to submit on behalf of
- the copyright owner. For the purposes of this definition, "submitted"
- means any form of electronic, verbal, or written communication sent
- to the Licensor or its representatives, including but not limited to
- communication on electronic mailing lists, source code control systems,
- and issue tracking systems that are managed by, or on behalf of, the
- Licensor for the purpose of discussing and improving the Work, but
- excluding communication that is conspicuously marked or otherwise
- designated in writing by the copyright owner as "Not a Contribution."
-
- "Contributor" shall mean Licensor and any individual or Legal Entity
- on behalf of whom a Contribution has been received by Licensor and
- subsequently incorporated within the Work.
-
- 2. Grant of Copyright License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- copyright license to reproduce, prepare Derivative Works of,
- publicly display, publicly perform, sublicense, and distribute the
- Work and such Derivative Works in Source or Object form.
-
- 3. Grant of Patent License. Subject to the terms and conditions of
- this License, each Contributor hereby grants to You a perpetual,
- worldwide, non-exclusive, no-charge, royalty-free, irrevocable
- (except as stated in this section) patent license to make, have made,
- use, offer to sell, sell, import, and otherwise transfer the Work,
- where such license applies only to those patent claims licensable
- by such Contributor that are necessarily infringed by their
- Contribution(s) alone or by combination of their Contribution(s)
- with the Work to which such Contribution(s) was submitted. If You
- institute patent litigation against any entity (including a
- cross-claim or counterclaim in a lawsuit) alleging that the Work
- or a Contribution incorporated within the Work constitutes direct
- or contributory patent infringement, then any patent licenses
- granted to You under this License for that Work shall terminate
- as of the date such litigation is filed.
-
- 4. Redistribution. You may reproduce and distribute copies of the
- Work or Derivative Works thereof in any medium, with or without
- modifications, and in Source or Object form, provided that You
- meet the following conditions:
-
- (a) You must give any other recipients of the Work or
- Derivative Works a copy of this License; and
-
- (b) You must cause any modified files to carry prominent notices
- stating that You changed the files; and
-
- (c) You must retain, in the Source form of any Derivative Works
- that You distribute, all copyright, patent, trademark, and
- attribution notices from the Source form of the Work,
- excluding those notices that do not pertain to any part of
- the Derivative Works; and
-
- (d) If the Work includes a "NOTICE" text file as part of its
- distribution, then any Derivative Works that You distribute must
- include a readable copy of the attribution notices contained
- within such NOTICE file, excluding those notices that do not
- pertain to any part of the Derivative Works, in at least one
- of the following places: within a NOTICE text file distributed
- as part of the Derivative Works; within the Source form or
- documentation, if provided along with the Derivative Works; or,
- within a display generated by the Derivative Works, if and
- wherever such third-party notices normally appear. The contents
- of the NOTICE file are for informational purposes only and
- do not modify the License. You may add Your own attribution
- notices within Derivative Works that You distribute, alongside
- or as an addendum to the NOTICE text from the Work, provided
- that such additional attribution notices cannot be construed
- as modifying the License.
-
- You may add Your own copyright statement to Your modifications and
- may provide additional or different license terms and conditions
- for use, reproduction, or distribution of Your modifications, or
- for any such Derivative Works as a whole, provided Your use,
- reproduction, and distribution of the Work otherwise complies with
- the conditions stated in this License.
-
- 5. Submission of Contributions. Unless You explicitly state otherwise,
- any Contribution intentionally submitted for inclusion in the Work
- by You to the Licensor shall be under the terms and conditions of
- this License, without any additional terms or conditions.
- Notwithstanding the above, nothing herein shall supersede or modify
- the terms of any separate license agreement you may have executed
- with Licensor regarding such Contributions.
-
- 6. Trademarks. This License does not grant permission to use the trade
- names, trademarks, service marks, or product names of the Licensor,
- except as required for reasonable and customary use in describing the
- origin of the Work and reproducing the content of the NOTICE file.
-
- 7. Disclaimer of Warranty. Unless required by applicable law or
- agreed to in writing, Licensor provides the Work (and each
- Contributor provides its Contributions) on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
- implied, including, without limitation, any warranties or conditions
- of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
- PARTICULAR PURPOSE. You are solely responsible for determining the
- appropriateness of using or redistributing the Work and assume any
- risks associated with Your exercise of permissions under this License.
-
- 8. Limitation of Liability. In no event and under no legal theory,
- whether in tort (including negligence), contract, or otherwise,
- unless required by applicable law (such as deliberate and grossly
- negligent acts) or agreed to in writing, shall any Contributor be
- liable to You for damages, including any direct, indirect, special,
- incidental, or consequential damages of any character arising as a
- result of this License or out of the use or inability to use the
- Work (including but not limited to damages for loss of goodwill,
- work stoppage, computer failure or malfunction, or any and all
- other commercial damages or losses), even if such Contributor
- has been advised of the possibility of such damages.
-
- 9. Accepting Warranty or Additional Liability. While redistributing
- the Work or Derivative Works thereof, You may choose to offer,
- and charge a fee for, acceptance of support, warranty, indemnity,
- or other liability obligations and/or rights consistent with this
- License. However, in accepting such obligations, You may act only
- on Your own behalf and on Your sole responsibility, not on behalf
- of any other Contributor, and only if You agree to indemnify,
- defend, and hold each Contributor harmless for any liability
- incurred by, or claims asserted against, such Contributor by reason
- of your accepting any such warranty or additional liability.
-
- END OF TERMS AND CONDITIONS
-
- APPENDIX: How to apply the Apache License to your work.
-
- To apply the Apache License to your work, attach the following
- boilerplate notice, with the fields enclosed by brackets "[]"
- replaced with your own identifying information. (Don't include
- the brackets!) The text should be enclosed in the appropriate
- comment syntax for the file format. We also recommend that a
- file or class name and description of purpose be included on the
- same "printed page" as the copyright notice for easier
- identification within third-party archives.
-
- Copyright [yyyy] [name of copyright owner]
-
- Licensed 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
+Apache License
+ Version 2.0, January 2004
+ http://www.apache.org/licenses/
+
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+ 1. Definitions.
+
+ "License" shall mean the terms and conditions for use, reproduction,
+ and distribution as defined by Sections 1 through 9 of this document.
+
+ "Licensor" shall mean the copyright owner or entity authorized by
+ the copyright owner that is granting the License.
+
+ "Legal Entity" shall mean the union of the acting entity and all
+ other entities that control, are controlled by, or are under common
+ control with that entity. For the purposes of this definition,
+ "control" means (i) the power, direct or indirect, to cause the
+ direction or management of such entity, whether by contract or
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ outstanding shares, or (iii) beneficial ownership of such entity.
+
+ "You" (or "Your") shall mean an individual or Legal Entity
+ exercising permissions granted by this License.
+
+ "Source" form shall mean the preferred form for making modifications,
+ including but not limited to software source code, documentation
+ source, and configuration files.
+
+ "Object" form shall mean any form resulting from mechanical
+ transformation or translation of a Source form, including but
+ not limited to compiled object code, generated documentation,
+ and conversions to other media types.
+
+ "Work" shall mean the work of authorship, whether in Source or
+ Object form, made available under the License, as indicated by a
+ copyright notice that is included in or attached to the work
+ (an example is provided in the Appendix below).
+
+ "Derivative Works" shall mean any work, whether in Source or Object
+ form, that is based on (or derived from) the Work and for which the
+ editorial revisions, annotations, elaborations, or other modifications
+ represent, as a whole, an original work of authorship. For the purposes
+ of this License, Derivative Works shall not include works that remain
+ separable from, or merely link (or bind by name) to the interfaces of,
+ the Work and Derivative Works thereof.
+
+ "Contribution" shall mean any work of authorship, including
+ the original version of the Work and any modifications or additions
+ to that Work or Derivative Works thereof, that is intentionally
+ submitted to Licensor for inclusion in the Work by the copyright owner
+ or by an individual or Legal Entity authorized to submit on behalf of
+ the copyright owner. For the purposes of this definition, "submitted"
+ means any form of electronic, verbal, or written communication sent
+ to the Licensor or its representatives, including but not limited to
+ communication on electronic mailing lists, source code control systems,
+ and issue tracking systems that are managed by, or on behalf of, the
+ Licensor for the purpose of discussing and improving the Work, but
+ excluding communication that is conspicuously marked or otherwise
+ designated in writing by the copyright owner as "Not a Contribution."
+
+ "Contributor" shall mean Licensor and any individual or Legal Entity
+ on behalf of whom a Contribution has been received by Licensor and
+ subsequently incorporated within the Work.
+
+ 2. Grant of Copyright License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ copyright license to reproduce, prepare Derivative Works of,
+ publicly display, publicly perform, sublicense, and distribute the
+ Work and such Derivative Works in Source or Object form.
+
+ 3. Grant of Patent License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ (except as stated in this section) patent license to make, have made,
+ use, offer to sell, sell, import, and otherwise transfer the Work,
+ where such license applies only to those patent claims licensable
+ by such Contributor that are necessarily infringed by their
+ Contribution(s) alone or by combination of their Contribution(s)
+ with the Work to which such Contribution(s) was submitted. If You
+ institute patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
+ or a Contribution incorporated within the Work constitutes direct
+ or contributory patent infringement, then any patent licenses
+ granted to You under this License for that Work shall terminate
+ as of the date such litigation is filed.
+
+ 4. Redistribution. You may reproduce and distribute copies of the
+ Work or Derivative Works thereof in any medium, with or without
+ modifications, and in Source or Object form, provided that You
+ meet the following conditions:
+
+ (a) You must give any other recipients of the Work or
+ Derivative Works a copy of this License; and
+
+ (b) You must cause any modified files to carry prominent notices
+ stating that You changed the files; and
+
+ (c) You must retain, in the Source form of any Derivative Works
+ that You distribute, all copyright, patent, trademark, and
+ attribution notices from the Source form of the Work,
+ excluding those notices that do not pertain to any part of
+ the Derivative Works; and
+
+ (d) If the Work includes a "NOTICE" text file as part of its
+ distribution, then any Derivative Works that You distribute must
+ include a readable copy of the attribution notices contained
+ within such NOTICE file, excluding those notices that do not
+ pertain to any part of the Derivative Works, in at least one
+ of the following places: within a NOTICE text file distributed
+ as part of the Derivative Works; within the Source form or
+ documentation, if provided along with the Derivative Works; or,
+ within a display generated by the Derivative Works, if and
+ wherever such third-party notices normally appear. The contents
+ of the NOTICE file are for informational purposes only and
+ do not modify the License. You may add Your own attribution
+ notices within Derivative Works that You distribute, alongside
+ or as an addendum to the NOTICE text from the Work, provided
+ that such additional attribution notices cannot be construed
+ as modifying the License.
+
+ You may add Your own copyright statement to Your modifications and
+ may provide additional or different license terms and conditions
+ for use, reproduction, or distribution of Your modifications, or
+ for any such Derivative Works as a whole, provided Your use,
+ reproduction, and distribution of the Work otherwise complies with
+ the conditions stated in this License.
+
+ 5. Submission of Contributions. Unless You explicitly state otherwise,
+ any Contribution intentionally submitted for inclusion in the Work
+ by You to the Licensor shall be under the terms and conditions of
+ this License, without any additional terms or conditions.
+ Notwithstanding the above, nothing herein shall supersede or modify
+ the terms of any separate license agreement you may have executed
+ with Licensor regarding such Contributions.
+
+ 6. Trademarks. This License does not grant permission to use the trade
+ names, trademarks, service marks, or product names of the Licensor,
+ except as required for reasonable and customary use in describing the
+ origin of the Work and reproducing the content of the NOTICE file.
+
+ 7. Disclaimer of Warranty. Unless required by applicable law or
+ agreed to in writing, Licensor provides the Work (and each
+ Contributor provides its Contributions) on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied, including, without limitation, any warranties or conditions
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ PARTICULAR PURPOSE. You are solely responsible for determining the
+ appropriateness of using or redistributing the Work and assume any
+ risks associated with Your exercise of permissions under this License.
+
+ 8. Limitation of Liability. In no event and under no legal theory,
+ whether in tort (including negligence), contract, or otherwise,
+ unless required by applicable law (such as deliberate and grossly
+ negligent acts) or agreed to in writing, shall any Contributor be
+ liable to You for damages, including any direct, indirect, special,
+ incidental, or consequential damages of any character arising as a
+ result of this License or out of the use or inability to use the
+ Work (including but not limited to damages for loss of goodwill,
+ work stoppage, computer failure or malfunction, or any and all
+ other commercial damages or losses), even if such Contributor
+ has been advised of the possibility of such damages.
+
+ 9. Accepting Warranty or Additional Liability. While redistributing
+ the Work or Derivative Works thereof, You may choose to offer,
+ and charge a fee for, acceptance of support, warranty, indemnity,
+ or other liability obligations and/or rights consistent with this
+ License. However, in accepting such obligations, You may act only
+ on Your own behalf and on Your sole responsibility, not on behalf
+ of any other Contributor, and only if You agree to indemnify,
+ defend, and hold each Contributor harmless for any liability
+ incurred by, or claims asserted against, such Contributor by reason
+ of your accepting any such warranty or additional liability.
+
+ END OF TERMS AND CONDITIONS
+
+ APPENDIX: How to apply the Apache License to your work.
+
+ To apply the Apache License to your work, attach the following
+ boilerplate notice, with the fields enclosed by brackets "[]"
+ replaced with your own identifying information. (Don't include
+ the brackets!) The text should be enclosed in the appropriate
+ comment syntax for the file format. We also recommend that a
+ file or class name and description of purpose be included on the
+ same "printed page" as the copyright notice for easier
+ identification within third-party archives.
+
+ Copyright [yyyy] [name of copyright owner]
+
+ Licensed 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.
\ No newline at end of file
diff --git a/de.tudarmstadt.ukp.wikipedia.wikimachine/NOTICE.txt b/dkpro-jwpl-wikimachine/NOTICE.txt
similarity index 78%
rename from de.tudarmstadt.ukp.wikipedia.wikimachine/NOTICE.txt
rename to dkpro-jwpl-wikimachine/NOTICE.txt
index dbb234b1e..52a34c248 100644
--- a/de.tudarmstadt.ukp.wikipedia.wikimachine/NOTICE.txt
+++ b/dkpro-jwpl-wikimachine/NOTICE.txt
@@ -3,6 +3,6 @@ be licensed differently, as indicated in the respective class
headers.
*****************************************************************
-de.tudarmstadt.ukp.wikipedia.wikimachine.dump.xml.AbstractXmlDumpReader:
+xml.dump.wikimachine.org.dkpro.jwpl.AbstractXmlDumpReader:
MediaWiki import/export processing tools
Copyright 2005 by Brion Vibber
\ No newline at end of file
diff --git a/de.tudarmstadt.ukp.wikipedia.wikimachine/jwpl_tables.sql b/dkpro-jwpl-wikimachine/jwpl_tables.sql
similarity index 96%
rename from de.tudarmstadt.ukp.wikipedia.wikimachine/jwpl_tables.sql
rename to dkpro-jwpl-wikimachine/jwpl_tables.sql
index 8cc0376c0..2135f53b6 100644
--- a/de.tudarmstadt.ukp.wikipedia.wikimachine/jwpl_tables.sql
+++ b/dkpro-jwpl-wikimachine/jwpl_tables.sql
@@ -1,288 +1,288 @@
-/*
- * Licensed to the Technische Universität Darmstadt under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The Technische Universität Darmstadt
- * 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.
- *
- * 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.
- */
--- MySQL dump 10.11
---
--- Host: localhost Database: jwpl_tables
--- ------------------------------------------------------
--- Server version 5.0.37-community-nt
-
-/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
-/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
-/*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */;
-/*!40101 SET NAMES utf8 */;
-/*!40103 SET @OLD_TIME_ZONE=@@TIME_ZONE */;
-/*!40103 SET TIME_ZONE='+00:00' */;
-/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;
-/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
-/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
-/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
-
---
--- Table structure for table `Category`
---
-
-DROP TABLE IF EXISTS `Category`;
-CREATE TABLE `Category` (
- `id` bigint(20) NOT NULL auto_increment,
- `pageId` int(11) default NULL,
- `name` varchar(255) default NULL,
- PRIMARY KEY (`id`),
- UNIQUE KEY `pageId` (`pageId`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8;
-
---
--- Dumping data for table `Category`
---
-
-LOCK TABLES `Category` WRITE;
-/*!40000 ALTER TABLE `Category` DISABLE KEYS */;
-/*!40000 ALTER TABLE `Category` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `category_inlinks`
---
-
-DROP TABLE IF EXISTS `category_inlinks`;
-CREATE TABLE `category_inlinks` (
- `id` bigint(20) NOT NULL,
- `inLinks` int(11) default NULL,
- KEY `FK3F433773E46A97CC` (`id`),
- KEY `FK3F433773BB482769` (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8;
-
---
--- Dumping data for table `category_inlinks`
---
-
-LOCK TABLES `category_inlinks` WRITE;
-/*!40000 ALTER TABLE `category_inlinks` DISABLE KEYS */;
-/*!40000 ALTER TABLE `category_inlinks` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `category_outlinks`
---
-
-DROP TABLE IF EXISTS `category_outlinks`;
-CREATE TABLE `category_outlinks` (
- `id` bigint(20) NOT NULL,
- `outLinks` int(11) default NULL,
- KEY `FK9885334CE46A97CC` (`id`),
- KEY `FK9885334CBB482769` (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8;
-
---
--- Dumping data for table `category_outlinks`
---
-
-LOCK TABLES `category_outlinks` WRITE;
-/*!40000 ALTER TABLE `category_outlinks` DISABLE KEYS */;
-/*!40000 ALTER TABLE `category_outlinks` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `category_pages`
---
-
-DROP TABLE IF EXISTS `category_pages`;
-CREATE TABLE `category_pages` (
- `id` bigint(20) NOT NULL,
- `pages` int(11) default NULL,
- KEY `FK71E8D943E46A97CC` (`id`),
- KEY `FK71E8D943BB482769` (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8;
-
---
--- Dumping data for table `category_pages`
---
-
-LOCK TABLES `category_pages` WRITE;
-/*!40000 ALTER TABLE `category_pages` DISABLE KEYS */;
-/*!40000 ALTER TABLE `category_pages` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `MetaData`
---
-
-DROP TABLE IF EXISTS `MetaData`;
-CREATE TABLE `MetaData` (
- `id` bigint(20) NOT NULL auto_increment,
- `language` varchar(255) default NULL,
- `disambiguationCategory` varchar(255) default NULL,
- `mainCategory` varchar(255) default NULL,
- `nrofPages` bigint(20) default NULL,
- `nrofRedirects` bigint(20) default NULL,
- `nrofDisambiguationPages` bigint(20) default NULL,
- `nrofCategories` bigint(20) default NULL,
- `version` varchar(255) default NULL,
- PRIMARY KEY (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8;
-
---
--- Dumping data for table `MetaData`
---
-
-LOCK TABLES `MetaData` WRITE;
-/*!40000 ALTER TABLE `MetaData` DISABLE KEYS */;
-/*!40000 ALTER TABLE `MetaData` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `Page`
---
-
-DROP TABLE IF EXISTS `Page`;
-CREATE TABLE `Page` (
- `id` bigint(20) NOT NULL auto_increment,
- `pageId` int(11) default NULL,
- `name` varchar(255) default NULL,
- `text` longtext,
- `isDisambiguation` bit(1) default NULL,
- PRIMARY KEY (`id`),
- UNIQUE KEY `pageId` (`pageId`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8;
-
---
--- Dumping data for table `Page`
---
-
-LOCK TABLES `Page` WRITE;
-/*!40000 ALTER TABLE `Page` DISABLE KEYS */;
-/*!40000 ALTER TABLE `Page` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `page_categories`
---
-
-DROP TABLE IF EXISTS `page_categories`;
-CREATE TABLE `page_categories` (
- `id` bigint(20) NOT NULL,
- `pages` int(11) default NULL,
- KEY `FK72FB59CC1E350EDD` (`id`),
- KEY `FK72FB59CC75DCF4FA` (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8;
-
---
--- Dumping data for table `page_categories`
---
-
-LOCK TABLES `page_categories` WRITE;
-/*!40000 ALTER TABLE `page_categories` DISABLE KEYS */;
-/*!40000 ALTER TABLE `page_categories` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `page_inlinks`
---
-
-DROP TABLE IF EXISTS `page_inlinks`;
-CREATE TABLE `page_inlinks` (
- `id` bigint(20) NOT NULL,
- `inLinks` int(11) default NULL,
- KEY `FK91C2BC041E350EDD` (`id`),
- KEY `FK91C2BC0475DCF4FA` (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8;
-
---
--- Dumping data for table `page_inlinks`
---
-
-LOCK TABLES `page_inlinks` WRITE;
-/*!40000 ALTER TABLE `page_inlinks` DISABLE KEYS */;
-/*!40000 ALTER TABLE `page_inlinks` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `page_outlinks`
---
-
-DROP TABLE IF EXISTS `page_outlinks`;
-CREATE TABLE `page_outlinks` (
- `id` bigint(20) NOT NULL,
- `outLinks` int(11) default NULL,
- KEY `FK95F640DB1E350EDD` (`id`),
- KEY `FK95F640DB75DCF4FA` (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8;
-
---
--- Dumping data for table `page_outlinks`
---
-
-LOCK TABLES `page_outlinks` WRITE;
-/*!40000 ALTER TABLE `page_outlinks` DISABLE KEYS */;
-/*!40000 ALTER TABLE `page_outlinks` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `page_redirects`
---
-
-DROP TABLE IF EXISTS `page_redirects`;
-CREATE TABLE `page_redirects` (
- `id` bigint(20) NOT NULL,
- `redirects` varchar(255) default NULL,
- KEY `FK1484BA671E350EDD` (`id`),
- KEY `FK1484BA6775DCF4FA` (`id`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8;
-
---
--- Dumping data for table `page_redirects`
---
-
-LOCK TABLES `page_redirects` WRITE;
-/*!40000 ALTER TABLE `page_redirects` DISABLE KEYS */;
-/*!40000 ALTER TABLE `page_redirects` ENABLE KEYS */;
-UNLOCK TABLES;
-
---
--- Table structure for table `PageMapLine`
---
-
-DROP TABLE IF EXISTS `PageMapLine`;
-CREATE TABLE `PageMapLine` (
- `id` bigint(20) NOT NULL auto_increment,
- `name` varchar(255) default NULL,
- `pageID` int(11) default NULL,
- `stem` varchar(255) default NULL,
- `lemma` varchar(255) default NULL,
- PRIMARY KEY (`id`),
- KEY `name` (`name`)
-) ENGINE=MyISAM DEFAULT CHARSET=utf8;
-
---
--- Dumping data for table `PageMapLine`
---
-
-LOCK TABLES `PageMapLine` WRITE;
-/*!40000 ALTER TABLE `PageMapLine` DISABLE KEYS */;
-/*!40000 ALTER TABLE `PageMapLine` ENABLE KEYS */;
-UNLOCK TABLES;
-/*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */;
-
-/*!40101 SET SQL_MODE=@OLD_SQL_MODE */;
-/*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */;
-/*!40014 SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS */;
-/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;
-/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */;
-/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
-/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
-
--- Dump completed on 2008-02-11 12:33:30
+/*
+ * Licensed to the Technische Universität Darmstadt under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The Technische Universität Darmstadt
+ * 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.
+ *
+ * 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.
+ */
+-- MySQL dump 10.11
+--
+-- Host: localhost Database: jwpl_tables
+-- ------------------------------------------------------
+-- Server version 5.0.37-community-nt
+
+/*!40101 SET @OLD_CHARACTER_SET_CLIENT=@@CHARACTER_SET_CLIENT */;
+/*!40101 SET @OLD_CHARACTER_SET_RESULTS=@@CHARACTER_SET_RESULTS */;
+/*!40101 SET @OLD_COLLATION_CONNECTION=@@COLLATION_CONNECTION */;
+/*!40101 SET NAMES utf8 */;
+/*!40103 SET @OLD_TIME_ZONE=@@TIME_ZONE */;
+/*!40103 SET TIME_ZONE='+00:00' */;
+/*!40014 SET @OLD_UNIQUE_CHECKS=@@UNIQUE_CHECKS, UNIQUE_CHECKS=0 */;
+/*!40014 SET @OLD_FOREIGN_KEY_CHECKS=@@FOREIGN_KEY_CHECKS, FOREIGN_KEY_CHECKS=0 */;
+/*!40101 SET @OLD_SQL_MODE=@@SQL_MODE, SQL_MODE='NO_AUTO_VALUE_ON_ZERO' */;
+/*!40111 SET @OLD_SQL_NOTES=@@SQL_NOTES, SQL_NOTES=0 */;
+
+--
+-- Table structure for table `Category`
+--
+
+DROP TABLE IF EXISTS `Category`;
+CREATE TABLE `Category` (
+ `id` bigint(20) NOT NULL auto_increment,
+ `pageId` int(11) default NULL,
+ `name` varchar(255) default NULL,
+ PRIMARY KEY (`id`),
+ UNIQUE KEY `pageId` (`pageId`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+
+--
+-- Dumping data for table `Category`
+--
+
+LOCK TABLES `Category` WRITE;
+/*!40000 ALTER TABLE `Category` DISABLE KEYS */;
+/*!40000 ALTER TABLE `Category` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `category_inlinks`
+--
+
+DROP TABLE IF EXISTS `category_inlinks`;
+CREATE TABLE `category_inlinks` (
+ `id` bigint(20) NOT NULL,
+ `inLinks` int(11) default NULL,
+ KEY `FK3F433773E46A97CC` (`id`),
+ KEY `FK3F433773BB482769` (`id`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+
+--
+-- Dumping data for table `category_inlinks`
+--
+
+LOCK TABLES `category_inlinks` WRITE;
+/*!40000 ALTER TABLE `category_inlinks` DISABLE KEYS */;
+/*!40000 ALTER TABLE `category_inlinks` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `category_outlinks`
+--
+
+DROP TABLE IF EXISTS `category_outlinks`;
+CREATE TABLE `category_outlinks` (
+ `id` bigint(20) NOT NULL,
+ `outLinks` int(11) default NULL,
+ KEY `FK9885334CE46A97CC` (`id`),
+ KEY `FK9885334CBB482769` (`id`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+
+--
+-- Dumping data for table `category_outlinks`
+--
+
+LOCK TABLES `category_outlinks` WRITE;
+/*!40000 ALTER TABLE `category_outlinks` DISABLE KEYS */;
+/*!40000 ALTER TABLE `category_outlinks` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `category_pages`
+--
+
+DROP TABLE IF EXISTS `category_pages`;
+CREATE TABLE `category_pages` (
+ `id` bigint(20) NOT NULL,
+ `pages` int(11) default NULL,
+ KEY `FK71E8D943E46A97CC` (`id`),
+ KEY `FK71E8D943BB482769` (`id`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+
+--
+-- Dumping data for table `category_pages`
+--
+
+LOCK TABLES `category_pages` WRITE;
+/*!40000 ALTER TABLE `category_pages` DISABLE KEYS */;
+/*!40000 ALTER TABLE `category_pages` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `MetaData`
+--
+
+DROP TABLE IF EXISTS `MetaData`;
+CREATE TABLE `MetaData` (
+ `id` bigint(20) NOT NULL auto_increment,
+ `language` varchar(255) default NULL,
+ `disambiguationCategory` varchar(255) default NULL,
+ `mainCategory` varchar(255) default NULL,
+ `nrofPages` bigint(20) default NULL,
+ `nrofRedirects` bigint(20) default NULL,
+ `nrofDisambiguationPages` bigint(20) default NULL,
+ `nrofCategories` bigint(20) default NULL,
+ `version` varchar(255) default NULL,
+ PRIMARY KEY (`id`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+
+--
+-- Dumping data for table `MetaData`
+--
+
+LOCK TABLES `MetaData` WRITE;
+/*!40000 ALTER TABLE `MetaData` DISABLE KEYS */;
+/*!40000 ALTER TABLE `MetaData` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `Page`
+--
+
+DROP TABLE IF EXISTS `Page`;
+CREATE TABLE `Page` (
+ `id` bigint(20) NOT NULL auto_increment,
+ `pageId` int(11) default NULL,
+ `name` varchar(255) default NULL,
+ `text` longtext,
+ `isDisambiguation` bit(1) default NULL,
+ PRIMARY KEY (`id`),
+ UNIQUE KEY `pageId` (`pageId`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+
+--
+-- Dumping data for table `Page`
+--
+
+LOCK TABLES `Page` WRITE;
+/*!40000 ALTER TABLE `Page` DISABLE KEYS */;
+/*!40000 ALTER TABLE `Page` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `page_categories`
+--
+
+DROP TABLE IF EXISTS `page_categories`;
+CREATE TABLE `page_categories` (
+ `id` bigint(20) NOT NULL,
+ `pages` int(11) default NULL,
+ KEY `FK72FB59CC1E350EDD` (`id`),
+ KEY `FK72FB59CC75DCF4FA` (`id`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+
+--
+-- Dumping data for table `page_categories`
+--
+
+LOCK TABLES `page_categories` WRITE;
+/*!40000 ALTER TABLE `page_categories` DISABLE KEYS */;
+/*!40000 ALTER TABLE `page_categories` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `page_inlinks`
+--
+
+DROP TABLE IF EXISTS `page_inlinks`;
+CREATE TABLE `page_inlinks` (
+ `id` bigint(20) NOT NULL,
+ `inLinks` int(11) default NULL,
+ KEY `FK91C2BC041E350EDD` (`id`),
+ KEY `FK91C2BC0475DCF4FA` (`id`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+
+--
+-- Dumping data for table `page_inlinks`
+--
+
+LOCK TABLES `page_inlinks` WRITE;
+/*!40000 ALTER TABLE `page_inlinks` DISABLE KEYS */;
+/*!40000 ALTER TABLE `page_inlinks` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `page_outlinks`
+--
+
+DROP TABLE IF EXISTS `page_outlinks`;
+CREATE TABLE `page_outlinks` (
+ `id` bigint(20) NOT NULL,
+ `outLinks` int(11) default NULL,
+ KEY `FK95F640DB1E350EDD` (`id`),
+ KEY `FK95F640DB75DCF4FA` (`id`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+
+--
+-- Dumping data for table `page_outlinks`
+--
+
+LOCK TABLES `page_outlinks` WRITE;
+/*!40000 ALTER TABLE `page_outlinks` DISABLE KEYS */;
+/*!40000 ALTER TABLE `page_outlinks` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `page_redirects`
+--
+
+DROP TABLE IF EXISTS `page_redirects`;
+CREATE TABLE `page_redirects` (
+ `id` bigint(20) NOT NULL,
+ `redirects` varchar(255) default NULL,
+ KEY `FK1484BA671E350EDD` (`id`),
+ KEY `FK1484BA6775DCF4FA` (`id`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+
+--
+-- Dumping data for table `page_redirects`
+--
+
+LOCK TABLES `page_redirects` WRITE;
+/*!40000 ALTER TABLE `page_redirects` DISABLE KEYS */;
+/*!40000 ALTER TABLE `page_redirects` ENABLE KEYS */;
+UNLOCK TABLES;
+
+--
+-- Table structure for table `PageMapLine`
+--
+
+DROP TABLE IF EXISTS `PageMapLine`;
+CREATE TABLE `PageMapLine` (
+ `id` bigint(20) NOT NULL auto_increment,
+ `name` varchar(255) default NULL,
+ `pageID` int(11) default NULL,
+ `stem` varchar(255) default NULL,
+ `lemma` varchar(255) default NULL,
+ PRIMARY KEY (`id`),
+ KEY `name` (`name`)
+) ENGINE=MyISAM DEFAULT CHARSET=utf8;
+
+--
+-- Dumping data for table `PageMapLine`
+--
+
+LOCK TABLES `PageMapLine` WRITE;
+/*!40000 ALTER TABLE `PageMapLine` DISABLE KEYS */;
+/*!40000 ALTER TABLE `PageMapLine` ENABLE KEYS */;
+UNLOCK TABLES;
+/*!40103 SET TIME_ZONE=@OLD_TIME_ZONE */;
+
+/*!40101 SET SQL_MODE=@OLD_SQL_MODE */;
+/*!40014 SET FOREIGN_KEY_CHECKS=@OLD_FOREIGN_KEY_CHECKS */;
+/*!40014 SET UNIQUE_CHECKS=@OLD_UNIQUE_CHECKS */;
+/*!40101 SET CHARACTER_SET_CLIENT=@OLD_CHARACTER_SET_CLIENT */;
+/*!40101 SET CHARACTER_SET_RESULTS=@OLD_CHARACTER_SET_RESULTS */;
+/*!40101 SET COLLATION_CONNECTION=@OLD_COLLATION_CONNECTION */;
+/*!40111 SET SQL_NOTES=@OLD_SQL_NOTES */;
+
+-- Dump completed on 2008-02-11 12:33:30
diff --git a/de.tudarmstadt.ukp.wikipedia.wikimachine/pom.xml b/dkpro-jwpl-wikimachine/pom.xml
similarity index 83%
rename from de.tudarmstadt.ukp.wikipedia.wikimachine/pom.xml
rename to dkpro-jwpl-wikimachine/pom.xml
index 021d17778..7fb3ecc9f 100644
--- a/de.tudarmstadt.ukp.wikipedia.wikimachine/pom.xml
+++ b/dkpro-jwpl-wikimachine/pom.xml
@@ -17,13 +17,13 @@
-->
+ 4.0.0
- de.tudarmstadt.ukp.wikipedia
- de.tudarmstadt.ukp.wikipedia
+ org.dkpro.jwpl
+ dkpro-jwpl
2.0.0-SNAPSHOT
- 4.0.0
- de.tudarmstadt.ukp.wikipedia.wikimachine
+ dkpro-jwpl-wikimachine
WikiMachine
@@ -35,8 +35,8 @@
spring-beans
- de.tudarmstadt.ukp.wikipedia
- de.tudarmstadt.ukp.wikipedia.mwdumper
+ org.dkpro.jwpl
+ dkpro-jwpl-mwdumper
diff --git a/dkpro-jwpl-wikimachine/src/main/java/context/applicationContextTemplate.xml b/dkpro-jwpl-wikimachine/src/main/java/context/applicationContextTemplate.xml
new file mode 100644
index 000000000..c48ce7ffb
--- /dev/null
+++ b/dkpro-jwpl-wikimachine/src/main/java/context/applicationContextTemplate.xml
@@ -0,0 +1,149 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ Configuration class wraps all the parameters for the
diff --git a/de.tudarmstadt.ukp.wikipedia.wikimachine/src/main/java/de/tudarmstadt/ukp/wikipedia/wikimachine/domain/DumpVersionProcessor.java b/dkpro-jwpl-wikimachine/src/main/java/org/dkpro/jwpl/wikimachine/domain/DumpVersionProcessor.java
similarity index 88%
rename from de.tudarmstadt.ukp.wikipedia.wikimachine/src/main/java/de/tudarmstadt/ukp/wikipedia/wikimachine/domain/DumpVersionProcessor.java
rename to dkpro-jwpl-wikimachine/src/main/java/org/dkpro/jwpl/wikimachine/domain/DumpVersionProcessor.java
index abc9dab17..bab9117b8 100644
--- a/de.tudarmstadt.ukp.wikipedia.wikimachine/src/main/java/de/tudarmstadt/ukp/wikipedia/wikimachine/domain/DumpVersionProcessor.java
+++ b/dkpro-jwpl-wikimachine/src/main/java/org/dkpro/jwpl/wikimachine/domain/DumpVersionProcessor.java
@@ -15,17 +15,17 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package de.tudarmstadt.ukp.wikipedia.wikimachine.domain;
+package org.dkpro.jwpl.wikimachine.domain;
import java.io.IOException;
-import de.tudarmstadt.ukp.wikipedia.wikimachine.debug.ILogger;
-import de.tudarmstadt.ukp.wikipedia.wikimachine.dump.sql.CategorylinksParser;
-import de.tudarmstadt.ukp.wikipedia.wikimachine.dump.sql.PagelinksParser;
-import de.tudarmstadt.ukp.wikipedia.wikimachine.dump.version.IDumpVersion;
-import de.tudarmstadt.ukp.wikipedia.wikimachine.dump.xml.PageParser;
-import de.tudarmstadt.ukp.wikipedia.wikimachine.dump.xml.RevisionParser;
-import de.tudarmstadt.ukp.wikipedia.wikimachine.dump.xml.TextParser;
+import org.dkpro.jwpl.wikimachine.debug.ILogger;
+import org.dkpro.jwpl.wikimachine.dump.sql.CategorylinksParser;
+import org.dkpro.jwpl.wikimachine.dump.sql.PagelinksParser;
+import org.dkpro.jwpl.wikimachine.dump.version.IDumpVersion;
+import org.dkpro.jwpl.wikimachine.dump.xml.PageParser;
+import org.dkpro.jwpl.wikimachine.dump.xml.RevisionParser;
+import org.dkpro.jwpl.wikimachine.dump.xml.TextParser;
public class DumpVersionProcessor {
diff --git a/de.tudarmstadt.ukp.wikipedia.wikimachine/src/main/java/de/tudarmstadt/ukp/wikipedia/wikimachine/domain/Files.java b/dkpro-jwpl-wikimachine/src/main/java/org/dkpro/jwpl/wikimachine/domain/Files.java
similarity index 96%
rename from de.tudarmstadt.ukp.wikipedia.wikimachine/src/main/java/de/tudarmstadt/ukp/wikipedia/wikimachine/domain/Files.java
rename to dkpro-jwpl-wikimachine/src/main/java/org/dkpro/jwpl/wikimachine/domain/Files.java
index d2c66d33e..5afb882f0 100644
--- a/de.tudarmstadt.ukp.wikipedia.wikimachine/src/main/java/de/tudarmstadt/ukp/wikipedia/wikimachine/domain/Files.java
+++ b/dkpro-jwpl-wikimachine/src/main/java/org/dkpro/jwpl/wikimachine/domain/Files.java
@@ -15,11 +15,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package de.tudarmstadt.ukp.wikipedia.wikimachine.domain;
+package org.dkpro.jwpl.wikimachine.domain;
import java.io.File;
-import de.tudarmstadt.ukp.wikipedia.wikimachine.debug.ILogger;
+import org.dkpro.jwpl.wikimachine.debug.ILogger;
/**
* File name constants and with the simple input/output directory building
diff --git a/de.tudarmstadt.ukp.wikipedia.wikimachine/src/main/java/de/tudarmstadt/ukp/wikipedia/wikimachine/domain/ISnapshotGenerator.java b/dkpro-jwpl-wikimachine/src/main/java/org/dkpro/jwpl/wikimachine/domain/ISnapshotGenerator.java
similarity index 94%
rename from de.tudarmstadt.ukp.wikipedia.wikimachine/src/main/java/de/tudarmstadt/ukp/wikipedia/wikimachine/domain/ISnapshotGenerator.java
rename to dkpro-jwpl-wikimachine/src/main/java/org/dkpro/jwpl/wikimachine/domain/ISnapshotGenerator.java
index 3eec6916e..10f0faa90 100644
--- a/de.tudarmstadt.ukp.wikipedia.wikimachine/src/main/java/de/tudarmstadt/ukp/wikipedia/wikimachine/domain/ISnapshotGenerator.java
+++ b/dkpro-jwpl-wikimachine/src/main/java/org/dkpro/jwpl/wikimachine/domain/ISnapshotGenerator.java
@@ -15,7 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package de.tudarmstadt.ukp.wikipedia.wikimachine.domain;
+package org.dkpro.jwpl.wikimachine.domain;
public interface ISnapshotGenerator {
public void setFiles(Files files);
diff --git a/de.tudarmstadt.ukp.wikipedia.wikimachine/src/main/java/de/tudarmstadt/ukp/wikipedia/wikimachine/domain/MetaData.java b/dkpro-jwpl-wikimachine/src/main/java/org/dkpro/jwpl/wikimachine/domain/MetaData.java
similarity index 98%
rename from de.tudarmstadt.ukp.wikipedia.wikimachine/src/main/java/de/tudarmstadt/ukp/wikipedia/wikimachine/domain/MetaData.java
rename to dkpro-jwpl-wikimachine/src/main/java/org/dkpro/jwpl/wikimachine/domain/MetaData.java
index e5fae3856..20eb0d9f8 100644
--- a/de.tudarmstadt.ukp.wikipedia.wikimachine/src/main/java/de/tudarmstadt/ukp/wikipedia/wikimachine/domain/MetaData.java
+++ b/dkpro-jwpl-wikimachine/src/main/java/org/dkpro/jwpl/wikimachine/domain/MetaData.java
@@ -15,7 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package de.tudarmstadt.ukp.wikipedia.wikimachine.domain;
+package org.dkpro.jwpl.wikimachine.domain;
import java.sql.Timestamp;
diff --git a/de.tudarmstadt.ukp.wikipedia.wikimachine/src/main/java/de/tudarmstadt/ukp/wikipedia/wikimachine/dump/sql/CategorylinksParser.java b/dkpro-jwpl-wikimachine/src/main/java/org/dkpro/jwpl/wikimachine/dump/sql/CategorylinksParser.java
similarity index 97%
rename from de.tudarmstadt.ukp.wikipedia.wikimachine/src/main/java/de/tudarmstadt/ukp/wikipedia/wikimachine/dump/sql/CategorylinksParser.java
rename to dkpro-jwpl-wikimachine/src/main/java/org/dkpro/jwpl/wikimachine/dump/sql/CategorylinksParser.java
index a8d97b007..b72b5f29c 100644
--- a/de.tudarmstadt.ukp.wikipedia.wikimachine/src/main/java/de/tudarmstadt/ukp/wikipedia/wikimachine/dump/sql/CategorylinksParser.java
+++ b/dkpro-jwpl-wikimachine/src/main/java/org/dkpro/jwpl/wikimachine/dump/sql/CategorylinksParser.java
@@ -15,7 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package de.tudarmstadt.ukp.wikipedia.wikimachine.dump.sql;
+package org.dkpro.jwpl.wikimachine.dump.sql;
import java.io.IOException;
import java.io.InputStream;
diff --git a/de.tudarmstadt.ukp.wikipedia.wikimachine/src/main/java/de/tudarmstadt/ukp/wikipedia/wikimachine/dump/sql/PagelinksParser.java b/dkpro-jwpl-wikimachine/src/main/java/org/dkpro/jwpl/wikimachine/dump/sql/PagelinksParser.java
similarity index 97%
rename from de.tudarmstadt.ukp.wikipedia.wikimachine/src/main/java/de/tudarmstadt/ukp/wikipedia/wikimachine/dump/sql/PagelinksParser.java
rename to dkpro-jwpl-wikimachine/src/main/java/org/dkpro/jwpl/wikimachine/dump/sql/PagelinksParser.java
index 836aaff1f..a325ca112 100644
--- a/de.tudarmstadt.ukp.wikipedia.wikimachine/src/main/java/de/tudarmstadt/ukp/wikipedia/wikimachine/dump/sql/PagelinksParser.java
+++ b/dkpro-jwpl-wikimachine/src/main/java/org/dkpro/jwpl/wikimachine/dump/sql/PagelinksParser.java
@@ -15,7 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package de.tudarmstadt.ukp.wikipedia.wikimachine.dump.sql;
+package org.dkpro.jwpl.wikimachine.dump.sql;
import java.io.IOException;
import java.io.InputStream;
diff --git a/de.tudarmstadt.ukp.wikipedia.wikimachine/src/main/java/de/tudarmstadt/ukp/wikipedia/wikimachine/dump/sql/SQLEscape.java b/dkpro-jwpl-wikimachine/src/main/java/org/dkpro/jwpl/wikimachine/dump/sql/SQLEscape.java
similarity index 97%
rename from de.tudarmstadt.ukp.wikipedia.wikimachine/src/main/java/de/tudarmstadt/ukp/wikipedia/wikimachine/dump/sql/SQLEscape.java
rename to dkpro-jwpl-wikimachine/src/main/java/org/dkpro/jwpl/wikimachine/dump/sql/SQLEscape.java
index e891954da..cb66ec035 100644
--- a/de.tudarmstadt.ukp.wikipedia.wikimachine/src/main/java/de/tudarmstadt/ukp/wikipedia/wikimachine/dump/sql/SQLEscape.java
+++ b/dkpro-jwpl-wikimachine/src/main/java/org/dkpro/jwpl/wikimachine/dump/sql/SQLEscape.java
@@ -15,7 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package de.tudarmstadt.ukp.wikipedia.wikimachine.dump.sql;
+package org.dkpro.jwpl.wikimachine.dump.sql;
/**
diff --git a/de.tudarmstadt.ukp.wikipedia.wikimachine/src/main/java/de/tudarmstadt/ukp/wikipedia/wikimachine/dump/sql/SQLFileParser.java b/dkpro-jwpl-wikimachine/src/main/java/org/dkpro/jwpl/wikimachine/dump/sql/SQLFileParser.java
similarity index 97%
rename from de.tudarmstadt.ukp.wikipedia.wikimachine/src/main/java/de/tudarmstadt/ukp/wikipedia/wikimachine/dump/sql/SQLFileParser.java
rename to dkpro-jwpl-wikimachine/src/main/java/org/dkpro/jwpl/wikimachine/dump/sql/SQLFileParser.java
index a5b37c5c7..4cc9cff83 100644
--- a/de.tudarmstadt.ukp.wikipedia.wikimachine/src/main/java/de/tudarmstadt/ukp/wikipedia/wikimachine/dump/sql/SQLFileParser.java
+++ b/dkpro-jwpl-wikimachine/src/main/java/org/dkpro/jwpl/wikimachine/dump/sql/SQLFileParser.java
@@ -15,7 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package de.tudarmstadt.ukp.wikipedia.wikimachine.dump.sql;
+package org.dkpro.jwpl.wikimachine.dump.sql;
import java.io.BufferedReader;
import java.io.IOException;
diff --git a/de.tudarmstadt.ukp.wikipedia.wikimachine/src/main/java/de/tudarmstadt/ukp/wikipedia/wikimachine/dump/version/AbstractDumpVersion.java b/dkpro-jwpl-wikimachine/src/main/java/org/dkpro/jwpl/wikimachine/dump/version/AbstractDumpVersion.java
similarity index 94%
rename from de.tudarmstadt.ukp.wikipedia.wikimachine/src/main/java/de/tudarmstadt/ukp/wikipedia/wikimachine/dump/version/AbstractDumpVersion.java
rename to dkpro-jwpl-wikimachine/src/main/java/org/dkpro/jwpl/wikimachine/dump/version/AbstractDumpVersion.java
index 342215dc4..70f99f00d 100644
--- a/de.tudarmstadt.ukp.wikipedia.wikimachine/src/main/java/de/tudarmstadt/ukp/wikipedia/wikimachine/dump/version/AbstractDumpVersion.java
+++ b/dkpro-jwpl-wikimachine/src/main/java/org/dkpro/jwpl/wikimachine/dump/version/AbstractDumpVersion.java
@@ -15,14 +15,14 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package de.tudarmstadt.ukp.wikipedia.wikimachine.dump.version;
+package org.dkpro.jwpl.wikimachine.dump.version;
import java.io.IOException;
-import de.tudarmstadt.ukp.wikipedia.wikimachine.debug.ILogger;
-import de.tudarmstadt.ukp.wikipedia.wikimachine.domain.Files;
-import de.tudarmstadt.ukp.wikipedia.wikimachine.domain.MetaData;
-import de.tudarmstadt.ukp.wikipedia.wikimachine.util.TxtFileWriter;
+import org.dkpro.jwpl.wikimachine.debug.ILogger;
+import org.dkpro.jwpl.wikimachine.domain.Files;
+import org.dkpro.jwpl.wikimachine.domain.MetaData;
+import org.dkpro.jwpl.wikimachine.util.TxtFileWriter;
public abstract class AbstractDumpVersion implements IDumpVersion {
diff --git a/de.tudarmstadt.ukp.wikipedia.wikimachine/src/main/java/de/tudarmstadt/ukp/wikipedia/wikimachine/dump/version/IDumpVersion.java b/dkpro-jwpl-wikimachine/src/main/java/org/dkpro/jwpl/wikimachine/dump/version/IDumpVersion.java
similarity index 79%
rename from de.tudarmstadt.ukp.wikipedia.wikimachine/src/main/java/de/tudarmstadt/ukp/wikipedia/wikimachine/dump/version/IDumpVersion.java
rename to dkpro-jwpl-wikimachine/src/main/java/org/dkpro/jwpl/wikimachine/dump/version/IDumpVersion.java
index c5c03e8d1..dad69dd8e 100644
--- a/de.tudarmstadt.ukp.wikipedia.wikimachine/src/main/java/de/tudarmstadt/ukp/wikipedia/wikimachine/dump/version/IDumpVersion.java
+++ b/dkpro-jwpl-wikimachine/src/main/java/org/dkpro/jwpl/wikimachine/dump/version/IDumpVersion.java
@@ -15,19 +15,19 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package de.tudarmstadt.ukp.wikipedia.wikimachine.dump.version;
+package org.dkpro.jwpl.wikimachine.dump.version;
import java.io.IOException;
import java.sql.Timestamp;
-import de.tudarmstadt.ukp.wikipedia.wikimachine.debug.ILogger;
-import de.tudarmstadt.ukp.wikipedia.wikimachine.domain.Files;
-import de.tudarmstadt.ukp.wikipedia.wikimachine.domain.MetaData;
-import de.tudarmstadt.ukp.wikipedia.wikimachine.dump.sql.CategorylinksParser;
-import de.tudarmstadt.ukp.wikipedia.wikimachine.dump.sql.PagelinksParser;
-import de.tudarmstadt.ukp.wikipedia.wikimachine.dump.xml.PageParser;
-import de.tudarmstadt.ukp.wikipedia.wikimachine.dump.xml.RevisionParser;
-import de.tudarmstadt.ukp.wikipedia.wikimachine.dump.xml.TextParser;
+import org.dkpro.jwpl.wikimachine.debug.ILogger;
+import org.dkpro.jwpl.wikimachine.domain.Files;
+import org.dkpro.jwpl.wikimachine.domain.MetaData;
+import org.dkpro.jwpl.wikimachine.dump.sql.CategorylinksParser;
+import org.dkpro.jwpl.wikimachine.dump.sql.PagelinksParser;
+import org.dkpro.jwpl.wikimachine.dump.xml.PageParser;
+import org.dkpro.jwpl.wikimachine.dump.xml.RevisionParser;
+import org.dkpro.jwpl.wikimachine.dump.xml.TextParser;
/**
* An interface to abstract from DumpVersion realization
diff --git a/de.tudarmstadt.ukp.wikipedia.wikimachine/src/main/java/de/tudarmstadt/ukp/wikipedia/wikimachine/dump/version/IDumpVersionFactory.java b/dkpro-jwpl-wikimachine/src/main/java/org/dkpro/jwpl/wikimachine/dump/version/IDumpVersionFactory.java
similarity index 93%
rename from de.tudarmstadt.ukp.wikipedia.wikimachine/src/main/java/de/tudarmstadt/ukp/wikipedia/wikimachine/dump/version/IDumpVersionFactory.java
rename to dkpro-jwpl-wikimachine/src/main/java/org/dkpro/jwpl/wikimachine/dump/version/IDumpVersionFactory.java
index c0742c917..9e887b835 100644
--- a/de.tudarmstadt.ukp.wikipedia.wikimachine/src/main/java/de/tudarmstadt/ukp/wikipedia/wikimachine/dump/version/IDumpVersionFactory.java
+++ b/dkpro-jwpl-wikimachine/src/main/java/org/dkpro/jwpl/wikimachine/dump/version/IDumpVersionFactory.java
@@ -15,7 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package de.tudarmstadt.ukp.wikipedia.wikimachine.dump.version;
+package org.dkpro.jwpl.wikimachine.dump.version;
public interface IDumpVersionFactory {
diff --git a/de.tudarmstadt.ukp.wikipedia.wikimachine/src/main/java/de/tudarmstadt/ukp/wikipedia/wikimachine/dump/xml/AbstractXmlDumpReader.java b/dkpro-jwpl-wikimachine/src/main/java/org/dkpro/jwpl/wikimachine/dump/xml/AbstractXmlDumpReader.java
similarity index 96%
rename from de.tudarmstadt.ukp.wikipedia.wikimachine/src/main/java/de/tudarmstadt/ukp/wikipedia/wikimachine/dump/xml/AbstractXmlDumpReader.java
rename to dkpro-jwpl-wikimachine/src/main/java/org/dkpro/jwpl/wikimachine/dump/xml/AbstractXmlDumpReader.java
index 7b5482a5b..dd242f34f 100644
--- a/de.tudarmstadt.ukp.wikipedia.wikimachine/src/main/java/de/tudarmstadt/ukp/wikipedia/wikimachine/dump/xml/AbstractXmlDumpReader.java
+++ b/dkpro-jwpl-wikimachine/src/main/java/org/dkpro/jwpl/wikimachine/dump/xml/AbstractXmlDumpReader.java
@@ -22,7 +22,7 @@
*
* $Id: XmlDumpReader.java 59325 2009-11-22 01:21:03Z rainman $
*******************************************************************************/
-package de.tudarmstadt.ukp.wikipedia.wikimachine.dump.xml;
+package org.dkpro.jwpl.wikimachine.dump.xml;
import java.io.IOException;
import java.io.InputStream;
@@ -41,13 +41,13 @@
import org.xml.sax.SAXException;
import org.xml.sax.helpers.DefaultHandler;
-import de.tudarmstadt.ukp.wikipedia.mwdumper.importer.Contributor;
-import de.tudarmstadt.ukp.wikipedia.mwdumper.importer.DumpWriter;
-import de.tudarmstadt.ukp.wikipedia.mwdumper.importer.NamespaceSet;
-import de.tudarmstadt.ukp.wikipedia.mwdumper.importer.Page;
-import de.tudarmstadt.ukp.wikipedia.mwdumper.importer.Revision;
-import de.tudarmstadt.ukp.wikipedia.mwdumper.importer.Siteinfo;
-import de.tudarmstadt.ukp.wikipedia.mwdumper.importer.Title;
+import org.dkpro.jwpl.mwdumper.importer.Contributor;
+import org.dkpro.jwpl.mwdumper.importer.DumpWriter;
+import org.dkpro.jwpl.mwdumper.importer.NamespaceSet;
+import org.dkpro.jwpl.mwdumper.importer.Page;
+import org.dkpro.jwpl.mwdumper.importer.Revision;
+import org.dkpro.jwpl.mwdumper.importer.Siteinfo;
+import org.dkpro.jwpl.mwdumper.importer.Title;
/**
* Parser of WikiMedia XML dumps. Modification of XmlDumpReader with some enhanced error
@@ -56,7 +56,7 @@
*
* Modifications done by Ivan Galkin
*
- * See {@link de.tudarmstadt.ukp.wikipedia.mwdumper.importer.XmlDumpReader}.
+ * See {@link org.dkpro.jwpl.mwdumper.importer.XmlDumpReader}.
*/
public abstract class AbstractXmlDumpReader extends DefaultHandler {
diff --git a/de.tudarmstadt.ukp.wikipedia.wikimachine/src/main/java/de/tudarmstadt/ukp/wikipedia/wikimachine/dump/xml/DumpTableEnum.java b/dkpro-jwpl-wikimachine/src/main/java/org/dkpro/jwpl/wikimachine/dump/xml/DumpTableEnum.java
similarity index 94%
rename from de.tudarmstadt.ukp.wikipedia.wikimachine/src/main/java/de/tudarmstadt/ukp/wikipedia/wikimachine/dump/xml/DumpTableEnum.java
rename to dkpro-jwpl-wikimachine/src/main/java/org/dkpro/jwpl/wikimachine/dump/xml/DumpTableEnum.java
index 620429e80..4490154ab 100644
--- a/de.tudarmstadt.ukp.wikipedia.wikimachine/src/main/java/de/tudarmstadt/ukp/wikipedia/wikimachine/dump/xml/DumpTableEnum.java
+++ b/dkpro-jwpl-wikimachine/src/main/java/org/dkpro/jwpl/wikimachine/dump/xml/DumpTableEnum.java
@@ -15,7 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package de.tudarmstadt.ukp.wikipedia.wikimachine.dump.xml;
+package org.dkpro.jwpl.wikimachine.dump.xml;
/**
* Three possible tables, which can be parsed from the Wikimedia-Dump
diff --git a/de.tudarmstadt.ukp.wikipedia.wikimachine/src/main/java/de/tudarmstadt/ukp/wikipedia/wikimachine/dump/xml/DumpTableInputStream.java b/dkpro-jwpl-wikimachine/src/main/java/org/dkpro/jwpl/wikimachine/dump/xml/DumpTableInputStream.java
similarity index 94%
rename from de.tudarmstadt.ukp.wikipedia.wikimachine/src/main/java/de/tudarmstadt/ukp/wikipedia/wikimachine/dump/xml/DumpTableInputStream.java
rename to dkpro-jwpl-wikimachine/src/main/java/org/dkpro/jwpl/wikimachine/dump/xml/DumpTableInputStream.java
index bdc81c6fe..04ccb3c3f 100644
--- a/de.tudarmstadt.ukp.wikipedia.wikimachine/src/main/java/de/tudarmstadt/ukp/wikipedia/wikimachine/dump/xml/DumpTableInputStream.java
+++ b/dkpro-jwpl-wikimachine/src/main/java/org/dkpro/jwpl/wikimachine/dump/xml/DumpTableInputStream.java
@@ -15,7 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package de.tudarmstadt.ukp.wikipedia.wikimachine.dump.xml;
+package org.dkpro.jwpl.wikimachine.dump.xml;
import java.io.IOException;
import java.io.InputStream;
diff --git a/de.tudarmstadt.ukp.wikipedia.wikimachine/src/main/java/de/tudarmstadt/ukp/wikipedia/wikimachine/dump/xml/PageParser.java b/dkpro-jwpl-wikimachine/src/main/java/org/dkpro/jwpl/wikimachine/dump/xml/PageParser.java
similarity index 94%
rename from de.tudarmstadt.ukp.wikipedia.wikimachine/src/main/java/de/tudarmstadt/ukp/wikipedia/wikimachine/dump/xml/PageParser.java
rename to dkpro-jwpl-wikimachine/src/main/java/org/dkpro/jwpl/wikimachine/dump/xml/PageParser.java
index dbebf76a4..bf13b4388 100644
--- a/de.tudarmstadt.ukp.wikipedia.wikimachine/src/main/java/de/tudarmstadt/ukp/wikipedia/wikimachine/dump/xml/PageParser.java
+++ b/dkpro-jwpl-wikimachine/src/main/java/org/dkpro/jwpl/wikimachine/dump/xml/PageParser.java
@@ -15,13 +15,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package de.tudarmstadt.ukp.wikipedia.wikimachine.dump.xml;
+package org.dkpro.jwpl.wikimachine.dump.xml;
import java.io.EOFException;
import java.io.IOException;
import java.io.InputStream;
-import de.tudarmstadt.ukp.wikipedia.wikimachine.util.UTFDataInputStream;
+import org.dkpro.jwpl.wikimachine.util.UTFDataInputStream;
public class PageParser {
/**
diff --git a/de.tudarmstadt.ukp.wikipedia.wikimachine/src/main/java/de/tudarmstadt/ukp/wikipedia/wikimachine/dump/xml/RevisionParser.java b/dkpro-jwpl-wikimachine/src/main/java/org/dkpro/jwpl/wikimachine/dump/xml/RevisionParser.java
similarity index 96%
rename from de.tudarmstadt.ukp.wikipedia.wikimachine/src/main/java/de/tudarmstadt/ukp/wikipedia/wikimachine/dump/xml/RevisionParser.java
rename to dkpro-jwpl-wikimachine/src/main/java/org/dkpro/jwpl/wikimachine/dump/xml/RevisionParser.java
index 7e170082f..3e5e0a1ec 100644
--- a/de.tudarmstadt.ukp.wikipedia.wikimachine/src/main/java/de/tudarmstadt/ukp/wikipedia/wikimachine/dump/xml/RevisionParser.java
+++ b/dkpro-jwpl-wikimachine/src/main/java/org/dkpro/jwpl/wikimachine/dump/xml/RevisionParser.java
@@ -15,7 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package de.tudarmstadt.ukp.wikipedia.wikimachine.dump.xml;
+package org.dkpro.jwpl.wikimachine.dump.xml;
import java.io.DataInputStream;
import java.io.IOException;
diff --git a/de.tudarmstadt.ukp.wikipedia.wikimachine/src/main/java/de/tudarmstadt/ukp/wikipedia/wikimachine/dump/xml/TextParser.java b/dkpro-jwpl-wikimachine/src/main/java/org/dkpro/jwpl/wikimachine/dump/xml/TextParser.java
similarity index 93%
rename from de.tudarmstadt.ukp.wikipedia.wikimachine/src/main/java/de/tudarmstadt/ukp/wikipedia/wikimachine/dump/xml/TextParser.java
rename to dkpro-jwpl-wikimachine/src/main/java/org/dkpro/jwpl/wikimachine/dump/xml/TextParser.java
index 34e9e1898..967b5ecbb 100644
--- a/de.tudarmstadt.ukp.wikipedia.wikimachine/src/main/java/de/tudarmstadt/ukp/wikipedia/wikimachine/dump/xml/TextParser.java
+++ b/dkpro-jwpl-wikimachine/src/main/java/org/dkpro/jwpl/wikimachine/dump/xml/TextParser.java
@@ -15,13 +15,13 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package de.tudarmstadt.ukp.wikipedia.wikimachine.dump.xml;
+package org.dkpro.jwpl.wikimachine.dump.xml;
import java.io.EOFException;
import java.io.IOException;
import java.io.InputStream;
-import de.tudarmstadt.ukp.wikipedia.wikimachine.util.UTFDataInputStream;
+import org.dkpro.jwpl.wikimachine.util.UTFDataInputStream;
public class TextParser {
diff --git a/de.tudarmstadt.ukp.wikipedia.wikimachine/src/main/java/de/tudarmstadt/ukp/wikipedia/wikimachine/dump/xml/WikiXMLDumpReader.java b/dkpro-jwpl-wikimachine/src/main/java/org/dkpro/jwpl/wikimachine/dump/xml/WikiXMLDumpReader.java
similarity index 95%
rename from de.tudarmstadt.ukp.wikipedia.wikimachine/src/main/java/de/tudarmstadt/ukp/wikipedia/wikimachine/dump/xml/WikiXMLDumpReader.java
rename to dkpro-jwpl-wikimachine/src/main/java/org/dkpro/jwpl/wikimachine/dump/xml/WikiXMLDumpReader.java
index 547ed49cc..380583b2e 100644
--- a/de.tudarmstadt.ukp.wikipedia.wikimachine/src/main/java/de/tudarmstadt/ukp/wikipedia/wikimachine/dump/xml/WikiXMLDumpReader.java
+++ b/dkpro-jwpl-wikimachine/src/main/java/org/dkpro/jwpl/wikimachine/dump/xml/WikiXMLDumpReader.java
@@ -15,11 +15,11 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package de.tudarmstadt.ukp.wikipedia.wikimachine.dump.xml;
+package org.dkpro.jwpl.wikimachine.dump.xml;
import java.io.InputStream;
-import de.tudarmstadt.ukp.wikipedia.mwdumper.importer.DumpWriter;
+import org.dkpro.jwpl.mwdumper.importer.DumpWriter;
/**
* Universal XML Dump Parser. Set of start and end xml tags comply with XmlDumpReader.
diff --git a/de.tudarmstadt.ukp.wikipedia.wikimachine/src/main/java/de/tudarmstadt/ukp/wikipedia/wikimachine/factory/IEnvironmentFactory.java b/dkpro-jwpl-wikimachine/src/main/java/org/dkpro/jwpl/wikimachine/factory/IEnvironmentFactory.java
similarity index 63%
rename from de.tudarmstadt.ukp.wikipedia.wikimachine/src/main/java/de/tudarmstadt/ukp/wikipedia/wikimachine/factory/IEnvironmentFactory.java
rename to dkpro-jwpl-wikimachine/src/main/java/org/dkpro/jwpl/wikimachine/factory/IEnvironmentFactory.java
index 67cda1266..724706311 100644
--- a/de.tudarmstadt.ukp.wikipedia.wikimachine/src/main/java/de/tudarmstadt/ukp/wikipedia/wikimachine/factory/IEnvironmentFactory.java
+++ b/dkpro-jwpl-wikimachine/src/main/java/org/dkpro/jwpl/wikimachine/factory/IEnvironmentFactory.java
@@ -15,17 +15,17 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package de.tudarmstadt.ukp.wikipedia.wikimachine.factory;
-
-import de.tudarmstadt.ukp.wikipedia.wikimachine.debug.ILogger;
-import de.tudarmstadt.ukp.wikipedia.wikimachine.decompression.IDecompressor;
-import de.tudarmstadt.ukp.wikipedia.wikimachine.domain.DumpVersionProcessor;
-import de.tudarmstadt.ukp.wikipedia.wikimachine.domain.ISnapshotGenerator;
-import de.tudarmstadt.ukp.wikipedia.wikimachine.dump.version.IDumpVersion;
-import de.tudarmstadt.ukp.wikipedia.wikimachine.dump.xml.DumpTableInputStream;
-import de.tudarmstadt.ukp.wikipedia.wikimachine.dump.xml.PageParser;
-import de.tudarmstadt.ukp.wikipedia.wikimachine.dump.xml.RevisionParser;
-import de.tudarmstadt.ukp.wikipedia.wikimachine.dump.xml.TextParser;
+package org.dkpro.jwpl.wikimachine.factory;
+
+import org.dkpro.jwpl.wikimachine.debug.ILogger;
+import org.dkpro.jwpl.wikimachine.decompression.IDecompressor;
+import org.dkpro.jwpl.wikimachine.domain.DumpVersionProcessor;
+import org.dkpro.jwpl.wikimachine.domain.ISnapshotGenerator;
+import org.dkpro.jwpl.wikimachine.dump.version.IDumpVersion;
+import org.dkpro.jwpl.wikimachine.dump.xml.DumpTableInputStream;
+import org.dkpro.jwpl.wikimachine.dump.xml.PageParser;
+import org.dkpro.jwpl.wikimachine.dump.xml.RevisionParser;
+import org.dkpro.jwpl.wikimachine.dump.xml.TextParser;
public interface IEnvironmentFactory {
public ILogger getLogger();
diff --git a/de.tudarmstadt.ukp.wikipedia.wikimachine/src/main/java/de/tudarmstadt/ukp/wikipedia/wikimachine/factory/SpringFactory.java b/dkpro-jwpl-wikimachine/src/main/java/org/dkpro/jwpl/wikimachine/factory/SpringFactory.java
similarity index 83%
rename from de.tudarmstadt.ukp.wikipedia.wikimachine/src/main/java/de/tudarmstadt/ukp/wikipedia/wikimachine/factory/SpringFactory.java
rename to dkpro-jwpl-wikimachine/src/main/java/org/dkpro/jwpl/wikimachine/factory/SpringFactory.java
index 2e9a32a3c..f7831b109 100644
--- a/de.tudarmstadt.ukp.wikipedia.wikimachine/src/main/java/de/tudarmstadt/ukp/wikipedia/wikimachine/factory/SpringFactory.java
+++ b/dkpro-jwpl-wikimachine/src/main/java/org/dkpro/jwpl/wikimachine/factory/SpringFactory.java
@@ -15,7 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package de.tudarmstadt.ukp.wikipedia.wikimachine.factory;
+package org.dkpro.jwpl.wikimachine.factory;
import java.io.File;
@@ -24,15 +24,15 @@
import org.springframework.core.io.FileSystemResource;
import org.springframework.core.io.Resource;
-import de.tudarmstadt.ukp.wikipedia.wikimachine.debug.ILogger;
-import de.tudarmstadt.ukp.wikipedia.wikimachine.decompression.IDecompressor;
-import de.tudarmstadt.ukp.wikipedia.wikimachine.domain.DumpVersionProcessor;
-import de.tudarmstadt.ukp.wikipedia.wikimachine.domain.ISnapshotGenerator;
-import de.tudarmstadt.ukp.wikipedia.wikimachine.dump.version.IDumpVersion;
-import de.tudarmstadt.ukp.wikipedia.wikimachine.dump.xml.DumpTableInputStream;
-import de.tudarmstadt.ukp.wikipedia.wikimachine.dump.xml.PageParser;
-import de.tudarmstadt.ukp.wikipedia.wikimachine.dump.xml.RevisionParser;
-import de.tudarmstadt.ukp.wikipedia.wikimachine.dump.xml.TextParser;
+import org.dkpro.jwpl.wikimachine.debug.ILogger;
+import org.dkpro.jwpl.wikimachine.decompression.IDecompressor;
+import org.dkpro.jwpl.wikimachine.domain.DumpVersionProcessor;
+import org.dkpro.jwpl.wikimachine.domain.ISnapshotGenerator;
+import org.dkpro.jwpl.wikimachine.dump.version.IDumpVersion;
+import org.dkpro.jwpl.wikimachine.dump.xml.DumpTableInputStream;
+import org.dkpro.jwpl.wikimachine.dump.xml.PageParser;
+import org.dkpro.jwpl.wikimachine.dump.xml.RevisionParser;
+import org.dkpro.jwpl.wikimachine.dump.xml.TextParser;
public class SpringFactory implements IEnvironmentFactory {
diff --git a/de.tudarmstadt.ukp.wikipedia.wikimachine/src/main/java/de/tudarmstadt/ukp/wikipedia/wikimachine/hashing/IStringHashCode.java b/dkpro-jwpl-wikimachine/src/main/java/org/dkpro/jwpl/wikimachine/hashing/IStringHashCode.java
similarity index 93%
rename from de.tudarmstadt.ukp.wikipedia.wikimachine/src/main/java/de/tudarmstadt/ukp/wikipedia/wikimachine/hashing/IStringHashCode.java
rename to dkpro-jwpl-wikimachine/src/main/java/org/dkpro/jwpl/wikimachine/hashing/IStringHashCode.java
index 5184ebe3f..8fe92e42e 100644
--- a/de.tudarmstadt.ukp.wikipedia.wikimachine/src/main/java/de/tudarmstadt/ukp/wikipedia/wikimachine/hashing/IStringHashCode.java
+++ b/dkpro-jwpl-wikimachine/src/main/java/org/dkpro/jwpl/wikimachine/hashing/IStringHashCode.java
@@ -15,7 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package de.tudarmstadt.ukp.wikipedia.wikimachine.hashing;
+package org.dkpro.jwpl.wikimachine.hashing;
public interface IStringHashCode {
public Object hashCode(String string);
diff --git a/de.tudarmstadt.ukp.wikipedia.wikimachine/src/main/java/de/tudarmstadt/ukp/wikipedia/wikimachine/hashing/StringHashCodeDisabled.java b/dkpro-jwpl-wikimachine/src/main/java/org/dkpro/jwpl/wikimachine/hashing/StringHashCodeDisabled.java
similarity index 94%
rename from de.tudarmstadt.ukp.wikipedia.wikimachine/src/main/java/de/tudarmstadt/ukp/wikipedia/wikimachine/hashing/StringHashCodeDisabled.java
rename to dkpro-jwpl-wikimachine/src/main/java/org/dkpro/jwpl/wikimachine/hashing/StringHashCodeDisabled.java
index a04faeb54..27894d9b8 100644
--- a/de.tudarmstadt.ukp.wikipedia.wikimachine/src/main/java/de/tudarmstadt/ukp/wikipedia/wikimachine/hashing/StringHashCodeDisabled.java
+++ b/dkpro-jwpl-wikimachine/src/main/java/org/dkpro/jwpl/wikimachine/hashing/StringHashCodeDisabled.java
@@ -15,7 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package de.tudarmstadt.ukp.wikipedia.wikimachine.hashing;
+package org.dkpro.jwpl.wikimachine.hashing;
public class StringHashCodeDisabled implements IStringHashCode {
diff --git a/de.tudarmstadt.ukp.wikipedia.wikimachine/src/main/java/de/tudarmstadt/ukp/wikipedia/wikimachine/hashing/StringHashCodeJBoss.java b/dkpro-jwpl-wikimachine/src/main/java/org/dkpro/jwpl/wikimachine/hashing/StringHashCodeJBoss.java
similarity index 97%
rename from de.tudarmstadt.ukp.wikipedia.wikimachine/src/main/java/de/tudarmstadt/ukp/wikipedia/wikimachine/hashing/StringHashCodeJBoss.java
rename to dkpro-jwpl-wikimachine/src/main/java/org/dkpro/jwpl/wikimachine/hashing/StringHashCodeJBoss.java
index 62cce0093..1d05468c4 100644
--- a/de.tudarmstadt.ukp.wikipedia.wikimachine/src/main/java/de/tudarmstadt/ukp/wikipedia/wikimachine/hashing/StringHashCodeJBoss.java
+++ b/dkpro-jwpl-wikimachine/src/main/java/org/dkpro/jwpl/wikimachine/hashing/StringHashCodeJBoss.java
@@ -15,7 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package de.tudarmstadt.ukp.wikipedia.wikimachine.hashing;
+package org.dkpro.jwpl.wikimachine.hashing;
import java.io.ByteArrayOutputStream;
import java.io.DataOutputStream;
diff --git a/de.tudarmstadt.ukp.wikipedia.wikimachine/src/main/java/de/tudarmstadt/ukp/wikipedia/wikimachine/hashing/StringHashCodeJDK.java b/dkpro-jwpl-wikimachine/src/main/java/org/dkpro/jwpl/wikimachine/hashing/StringHashCodeJDK.java
similarity index 94%
rename from de.tudarmstadt.ukp.wikipedia.wikimachine/src/main/java/de/tudarmstadt/ukp/wikipedia/wikimachine/hashing/StringHashCodeJDK.java
rename to dkpro-jwpl-wikimachine/src/main/java/org/dkpro/jwpl/wikimachine/hashing/StringHashCodeJDK.java
index 871b84d4e..76caad6a9 100644
--- a/de.tudarmstadt.ukp.wikipedia.wikimachine/src/main/java/de/tudarmstadt/ukp/wikipedia/wikimachine/hashing/StringHashCodeJDK.java
+++ b/dkpro-jwpl-wikimachine/src/main/java/org/dkpro/jwpl/wikimachine/hashing/StringHashCodeJDK.java
@@ -15,7 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package de.tudarmstadt.ukp.wikipedia.wikimachine.hashing;
+package org.dkpro.jwpl.wikimachine.hashing;
public class StringHashCodeJDK implements IStringHashCode {
diff --git a/de.tudarmstadt.ukp.wikipedia.wikimachine/src/main/java/de/tudarmstadt/ukp/wikipedia/wikimachine/util/Redirects.java b/dkpro-jwpl-wikimachine/src/main/java/org/dkpro/jwpl/wikimachine/util/Redirects.java
similarity index 98%
rename from de.tudarmstadt.ukp.wikipedia.wikimachine/src/main/java/de/tudarmstadt/ukp/wikipedia/wikimachine/util/Redirects.java
rename to dkpro-jwpl-wikimachine/src/main/java/org/dkpro/jwpl/wikimachine/util/Redirects.java
index 29e330cb4..ab7b8ebab 100644
--- a/de.tudarmstadt.ukp.wikipedia.wikimachine/src/main/java/de/tudarmstadt/ukp/wikipedia/wikimachine/util/Redirects.java
+++ b/dkpro-jwpl-wikimachine/src/main/java/org/dkpro/jwpl/wikimachine/util/Redirects.java
@@ -15,7 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package de.tudarmstadt.ukp.wikipedia.wikimachine.util;
+package org.dkpro.jwpl.wikimachine.util;
import java.lang.invoke.MethodHandles;
import java.util.ArrayList;
diff --git a/de.tudarmstadt.ukp.wikipedia.wikimachine/src/main/java/de/tudarmstadt/ukp/wikipedia/wikimachine/util/Strings.java b/dkpro-jwpl-wikimachine/src/main/java/org/dkpro/jwpl/wikimachine/util/Strings.java
similarity index 98%
rename from de.tudarmstadt.ukp.wikipedia.wikimachine/src/main/java/de/tudarmstadt/ukp/wikipedia/wikimachine/util/Strings.java
rename to dkpro-jwpl-wikimachine/src/main/java/org/dkpro/jwpl/wikimachine/util/Strings.java
index 47804e144..ac5bec436 100644
--- a/de.tudarmstadt.ukp.wikipedia.wikimachine/src/main/java/de/tudarmstadt/ukp/wikipedia/wikimachine/util/Strings.java
+++ b/dkpro-jwpl-wikimachine/src/main/java/org/dkpro/jwpl/wikimachine/util/Strings.java
@@ -15,7 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package de.tudarmstadt.ukp.wikipedia.wikimachine.util;
+package org.dkpro.jwpl.wikimachine.util;
import java.util.Collection;
diff --git a/de.tudarmstadt.ukp.wikipedia.wikimachine/src/main/java/de/tudarmstadt/ukp/wikipedia/wikimachine/util/TimestampUtil.java b/dkpro-jwpl-wikimachine/src/main/java/org/dkpro/jwpl/wikimachine/util/TimestampUtil.java
similarity index 97%
rename from de.tudarmstadt.ukp.wikipedia.wikimachine/src/main/java/de/tudarmstadt/ukp/wikipedia/wikimachine/util/TimestampUtil.java
rename to dkpro-jwpl-wikimachine/src/main/java/org/dkpro/jwpl/wikimachine/util/TimestampUtil.java
index c1a16a8b1..d16b8137e 100644
--- a/de.tudarmstadt.ukp.wikipedia.wikimachine/src/main/java/de/tudarmstadt/ukp/wikipedia/wikimachine/util/TimestampUtil.java
+++ b/dkpro-jwpl-wikimachine/src/main/java/org/dkpro/jwpl/wikimachine/util/TimestampUtil.java
@@ -15,7 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package de.tudarmstadt.ukp.wikipedia.wikimachine.util;
+package org.dkpro.jwpl.wikimachine.util;
import java.sql.Timestamp;
import java.text.ParseException;
diff --git a/de.tudarmstadt.ukp.wikipedia.wikimachine/src/main/java/de/tudarmstadt/ukp/wikipedia/wikimachine/util/TxtFileWriter.java b/dkpro-jwpl-wikimachine/src/main/java/org/dkpro/jwpl/wikimachine/util/TxtFileWriter.java
similarity index 96%
rename from de.tudarmstadt.ukp.wikipedia.wikimachine/src/main/java/de/tudarmstadt/ukp/wikipedia/wikimachine/util/TxtFileWriter.java
rename to dkpro-jwpl-wikimachine/src/main/java/org/dkpro/jwpl/wikimachine/util/TxtFileWriter.java
index 5f32f4a50..34376111a 100644
--- a/de.tudarmstadt.ukp.wikipedia.wikimachine/src/main/java/de/tudarmstadt/ukp/wikipedia/wikimachine/util/TxtFileWriter.java
+++ b/dkpro-jwpl-wikimachine/src/main/java/org/dkpro/jwpl/wikimachine/util/TxtFileWriter.java
@@ -15,7 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package de.tudarmstadt.ukp.wikipedia.wikimachine.util;
+package org.dkpro.jwpl.wikimachine.util;
import java.io.BufferedOutputStream;
import java.io.FileOutputStream;
diff --git a/de.tudarmstadt.ukp.wikipedia.wikimachine/src/main/java/de/tudarmstadt/ukp/wikipedia/wikimachine/util/UTFDataInputStream.java b/dkpro-jwpl-wikimachine/src/main/java/org/dkpro/jwpl/wikimachine/util/UTFDataInputStream.java
similarity index 97%
rename from de.tudarmstadt.ukp.wikipedia.wikimachine/src/main/java/de/tudarmstadt/ukp/wikipedia/wikimachine/util/UTFDataInputStream.java
rename to dkpro-jwpl-wikimachine/src/main/java/org/dkpro/jwpl/wikimachine/util/UTFDataInputStream.java
index 5b59c0cac..f3512ef7f 100644
--- a/de.tudarmstadt.ukp.wikipedia.wikimachine/src/main/java/de/tudarmstadt/ukp/wikipedia/wikimachine/util/UTFDataInputStream.java
+++ b/dkpro-jwpl-wikimachine/src/main/java/org/dkpro/jwpl/wikimachine/util/UTFDataInputStream.java
@@ -15,7 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package de.tudarmstadt.ukp.wikipedia.wikimachine.util;
+package org.dkpro.jwpl.wikimachine.util;
import java.io.DataInputStream;
import java.io.IOException;
diff --git a/de.tudarmstadt.ukp.wikipedia.wikimachine/src/main/java/de/tudarmstadt/ukp/wikipedia/wikimachine/util/UTFDataOutputStream.java b/dkpro-jwpl-wikimachine/src/main/java/org/dkpro/jwpl/wikimachine/util/UTFDataOutputStream.java
similarity index 98%
rename from de.tudarmstadt.ukp.wikipedia.wikimachine/src/main/java/de/tudarmstadt/ukp/wikipedia/wikimachine/util/UTFDataOutputStream.java
rename to dkpro-jwpl-wikimachine/src/main/java/org/dkpro/jwpl/wikimachine/util/UTFDataOutputStream.java
index fdbf07dd5..403ca692c 100644
--- a/de.tudarmstadt.ukp.wikipedia.wikimachine/src/main/java/de/tudarmstadt/ukp/wikipedia/wikimachine/util/UTFDataOutputStream.java
+++ b/dkpro-jwpl-wikimachine/src/main/java/org/dkpro/jwpl/wikimachine/util/UTFDataOutputStream.java
@@ -15,7 +15,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package de.tudarmstadt.ukp.wikipedia.wikimachine.util;
+package org.dkpro.jwpl.wikimachine.util;
import java.io.DataOutputStream;
import java.io.IOException;
diff --git a/de.tudarmstadt.ukp.wikipedia.wikimachine/src/test/resources/log4j2.xml b/dkpro-jwpl-wikimachine/src/test/resources/log4j2.xml
similarity index 100%
rename from de.tudarmstadt.ukp.wikipedia.wikimachine/src/test/resources/log4j2.xml
rename to dkpro-jwpl-wikimachine/src/test/resources/log4j2.xml
diff --git a/pom.xml b/pom.xml
index 829ba42ae..6f8aa912d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -18,17 +18,18 @@
4.0.0
- pom
- JWPL
- A free, Java-based application programming interface that allows to access all information contained in Wikipedia.
- de.tudarmstadt.ukp.wikipedia
- de.tudarmstadt.ukp.wikipedia
- 2.0.0-SNAPSHOT
org.dkpro
dkpro-parent-pom
29
+ pom
+ JWPL
+ A free, Java-based application programming interface that allows to access all information contained in Wikipedia.
+ org.dkpro.jwpl
+ dkpro-jwpl
+ 2.0.0-SNAPSHOT
+
UTF-8
2.0.0-SNAPSHOT
@@ -63,7 +64,7 @@
The Apache Software License, Version 2.0
- http://www.apache.org/licenses/LICENSE-2.0.txt
+ https://www.apache.org/licenses/LICENSE-2.0.txt
repo
@@ -181,43 +182,43 @@
8.5.12
- de.tudarmstadt.ukp.wikipedia
- de.tudarmstadt.ukp.wikipedia.api
+ org.dkpro.jwpl
+ dkpro-jwpl-api
${ukp.wikipedia.version}
- de.tudarmstadt.ukp.wikipedia
- de.tudarmstadt.ukp.wikipedia.datamachine
+ org.dkpro.jwpl
+ dkpro-jwpl-datamachine
${ukp.wikipedia.version}
- de.tudarmstadt.ukp.wikipedia
- de.tudarmstadt.ukp.wikipedia.mwdumper
+ org.dkpro.jwpl
+ dkpro-jwpl-mwdumper
${ukp.wikipedia.version}
- de.tudarmstadt.ukp.wikipedia
- de.tudarmstadt.ukp.wikipedia.timemachine
+ org.dkpro.jwpl
+ dkpro-jwpl-timemachine
${ukp.wikipedia.version}
- de.tudarmstadt.ukp.wikipedia
- de.tudarmstadt.ukp.wikipedia.revisionmachine
+ org.dkpro.jwpl
+ dkpro-jwpl-revisionmachine
${ukp.wikipedia.version}
- de.tudarmstadt.ukp.wikipedia
- de.tudarmstadt.ukp.wikipedia.util
+ org.dkpro.jwpl
+ dkpro-jwpl-util
${ukp.wikipedia.version}
- de.tudarmstadt.ukp.wikipedia
- de.tudarmstadt.ukp.wikipedia.wikimachine
+ org.dkpro.jwpl
+ dkpro-jwpl-wikimachine
${ukp.wikipedia.version}
- de.tudarmstadt.ukp.wikipedia
- de.tudarmstadt.ukp.wikipedia.parser
+ org.dkpro.jwpl
+ dkpro-jwpl-parser
${ukp.wikipedia.version}
@@ -293,7 +294,7 @@
src/main/resources/**/*
src/test/resources/**/*
.activate_rat-check
- src/main/java/de/tudarmstadt/ukp/wikipedia/tutorial/parser/DarmstadtWikipediaArticle.txt
+ src/main/java/org/dkpro/jwpl/tutorial/parser/DarmstadtWikipediaArticle.txt
@@ -304,16 +305,16 @@