Updated test code to have org.apache.ml package prefix. Updated POM. OPENNLP-416
diff --git a/opennlp-ml/META-INF/MANIFEST.MF b/opennlp-ml/META-INF/MANIFEST.MF
index 6e78a51..6b59373 100644
--- a/opennlp-ml/META-INF/MANIFEST.MF
+++ b/opennlp-ml/META-INF/MANIFEST.MF
@@ -1 +1 @@
-Main-Class: opennlp.maxent.Main
+Main-Class: org.apache.opennlp.ml.maxent.Main
diff --git a/opennlp-ml/pom.xml b/opennlp-ml/pom.xml
index 9318fc2..bb08451 100644
--- a/opennlp-ml/pom.xml
+++ b/opennlp-ml/pom.xml
@@ -19,69 +19,47 @@
under the License.
-->
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<modelVersion>4.0.0</modelVersion>
-
- <parent>
- <groupId>org.apache.opennlp</groupId>
- <artifactId>opennlp</artifactId>
- <version>1.5.3-incubating-SNAPSHOT</version>
- <relativePath>../opennlp/pom.xml</relativePath>
- </parent>
-
- <artifactId>opennlp-maxent</artifactId>
- <packaging>bundle</packaging>
- <version>3.0.3-incubating-SNAPSHOT</version>
- <name>Apache OpenNLP Maxent</name>
- <properties>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- </properties>
-
+ <parent>
+ <groupId>org.apache</groupId>
+ <artifactId>apache</artifactId>
+ <version>9</version>
+ <relativePath />
+ </parent>
+
+ <groupId>org.apache.opennlp</groupId>
+ <artifactId>ml</artifactId>
+ <version>4.0.0-incubating-SNAPSHOT</version>
+ <packaging>jar</packaging>
+
+ <name>Apache OpenNLP Machine Learning Toolkit</name>
+
+ <prerequisites>
+ <maven>3.0</maven>
+ </prerequisites>
+
<dependencies>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
+ <version>4.8.1</version>
+ <scope>test</scope>
</dependency>
</dependencies>
-
+
<build>
<plugins>
<plugin>
- <groupId>org.apache.felix</groupId>
- <artifactId>maven-bundle-plugin</artifactId>
- <extensions>true</extensions>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
<configuration>
- <instructions>
- <Export-Package>
- opennlp.maxent,
- opennlp.maxent.io,
- opennlp.model,
- opennlp.perceptron
- </Export-Package>
- </instructions>
+ <source>1.5</source>
+ <target>1.5</target>
+ <compilerArgument>-Xlint</compilerArgument>
</configuration>
</plugin>
-
- <plugin>
- <groupId>org.apache.rat</groupId>
- <artifactId>apache-rat-plugin</artifactId>
- <executions>
- <execution>
- <id>default-cli</id>
- <configuration>
- <excludes>
- <exclude>META-INF/MANIFEST.MF</exclude>
- <exclude>samples/sports/*.test</exclude> <!-- sample data -->
- <exclude>src/main/java/opennlp/maxent/AllEnglishAffixes.txt</exclude> <!-- test data -->
- <exclude>src/test/resources/data/opennlp/maxent/io/*.txt</exclude> <!-- test data -->
- <exclude>src/test/resources/data/opennlp/maxent/*.txt</exclude> <!-- test data -->
- <exclude>src/test/resources/data/ppa/*</exclude> <!-- sample data -->
- </excludes>
- </configuration>
- </execution>
- </executions>
- </plugin>
</plugins>
</build>
-</project>
\ No newline at end of file
+</project>
diff --git a/opennlp-ml/src/test/java/opennlp/PrepAttachDataUtil.java b/opennlp-ml/src/test/java/org/apache/opennlp/ml/PrepAttachDataUtil.java
similarity index 90%
rename from opennlp-ml/src/test/java/opennlp/PrepAttachDataUtil.java
rename to opennlp-ml/src/test/java/org/apache/opennlp/ml/PrepAttachDataUtil.java
index e404d68..f4dbc5d 100644
--- a/opennlp-ml/src/test/java/opennlp/PrepAttachDataUtil.java
+++ b/opennlp-ml/src/test/java/org/apache/opennlp/ml/PrepAttachDataUtil.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package opennlp;
+package org.apache.opennlp.ml;
import static org.junit.Assert.assertEquals;
@@ -26,11 +26,12 @@
import java.util.ArrayList;
import java.util.List;
-import opennlp.model.AbstractModel;
-import opennlp.model.Event;
-import opennlp.model.EventStream;
-import opennlp.model.ListEventStream;
-import opennlp.perceptron.PerceptronPrepAttachTest;
+import org.apache.opennlp.ml.model.AbstractModel;
+import org.apache.opennlp.ml.model.Event;
+import org.apache.opennlp.ml.model.EventStream;
+import org.apache.opennlp.ml.model.ListEventStream;
+import org.apache.opennlp.ml.perceptron.PerceptronPrepAttachTest;
+
public class PrepAttachDataUtil {
diff --git a/opennlp-ml/src/test/java/opennlp/maxent/MaxentPrepAttachTest.java b/opennlp-ml/src/test/java/org/apache/opennlp/ml/maxent/MaxentPrepAttachTest.java
similarity index 86%
rename from opennlp-ml/src/test/java/opennlp/maxent/MaxentPrepAttachTest.java
rename to opennlp-ml/src/test/java/org/apache/opennlp/ml/maxent/MaxentPrepAttachTest.java
index 4904cd7..aa051b2 100644
--- a/opennlp-ml/src/test/java/opennlp/maxent/MaxentPrepAttachTest.java
+++ b/opennlp-ml/src/test/java/org/apache/opennlp/ml/maxent/MaxentPrepAttachTest.java
@@ -15,20 +15,20 @@
* limitations under the License.
*/
-package opennlp.maxent;
+package org.apache.opennlp.ml.maxent;
-import static opennlp.PrepAttachDataUtil.createTrainingStream;
-import static opennlp.PrepAttachDataUtil.testModel;
+import static org.apache.opennlp.ml.PrepAttachDataUtil.createTrainingStream;
+import static org.apache.opennlp.ml.PrepAttachDataUtil.testModel;
import java.io.IOException;
import java.util.HashMap;
import java.util.Map;
-import opennlp.model.AbstractModel;
-import opennlp.model.TrainUtil;
-import opennlp.model.TwoPassDataIndexer;
-import opennlp.model.UniformPrior;
+import org.apache.opennlp.ml.model.AbstractModel;
+import org.apache.opennlp.ml.model.TrainUtil;
+import org.apache.opennlp.ml.model.TwoPassDataIndexer;
+import org.apache.opennlp.ml.model.UniformPrior;
import org.junit.Test;
public class MaxentPrepAttachTest {
diff --git a/opennlp-ml/src/test/java/opennlp/maxent/RealValueModelTest.java b/opennlp-ml/src/test/java/org/apache/opennlp/ml/maxent/RealValueModelTest.java
similarity index 92%
rename from opennlp-ml/src/test/java/opennlp/maxent/RealValueModelTest.java
rename to opennlp-ml/src/test/java/org/apache/opennlp/ml/maxent/RealValueModelTest.java
index 52934ac..601f11d 100644
--- a/opennlp-ml/src/test/java/opennlp/maxent/RealValueModelTest.java
+++ b/opennlp-ml/src/test/java/org/apache/opennlp/ml/maxent/RealValueModelTest.java
@@ -15,13 +15,14 @@
* limitations under the License.
*/
-package opennlp.maxent;
+package org.apache.opennlp.ml.maxent;
import java.io.IOException;
-import opennlp.model.FileEventStream;
-import opennlp.model.OnePassRealValueDataIndexer;
-import opennlp.model.RealValueFileEventStream;
+import org.apache.opennlp.ml.model.FileEventStream;
+import org.apache.opennlp.ml.model.OnePassRealValueDataIndexer;
+import org.apache.opennlp.ml.model.RealValueFileEventStream;
+
import junit.framework.TestCase;
diff --git a/opennlp-ml/src/test/java/opennlp/maxent/ScaleDoesntMatterTest.java b/opennlp-ml/src/test/java/org/apache/opennlp/ml/maxent/ScaleDoesntMatterTest.java
similarity index 92%
rename from opennlp-ml/src/test/java/opennlp/maxent/ScaleDoesntMatterTest.java
rename to opennlp-ml/src/test/java/org/apache/opennlp/ml/maxent/ScaleDoesntMatterTest.java
index 315b4a2..c48b6fa 100644
--- a/opennlp-ml/src/test/java/opennlp/maxent/ScaleDoesntMatterTest.java
+++ b/opennlp-ml/src/test/java/org/apache/opennlp/ml/maxent/ScaleDoesntMatterTest.java
@@ -15,15 +15,17 @@
* limitations under the License.
*/
-package opennlp.maxent;
+package org.apache.opennlp.ml.maxent;
import java.io.StringReader;
+
+import org.apache.opennlp.ml.model.EventStream;
+import org.apache.opennlp.ml.model.MaxentModel;
+import org.apache.opennlp.ml.model.OnePassRealValueDataIndexer;
+import org.apache.opennlp.ml.model.RealValueFileEventStream;
+
import junit.framework.TestCase;
-import opennlp.model.EventStream;
-import opennlp.model.MaxentModel;
-import opennlp.model.OnePassRealValueDataIndexer;
-import opennlp.model.RealValueFileEventStream;
public class ScaleDoesntMatterTest extends TestCase {
diff --git a/opennlp-ml/src/test/java/opennlp/maxent/io/RealValueFileEventStreamTest.java b/opennlp-ml/src/test/java/org/apache/opennlp/ml/maxent/io/RealValueFileEventStreamTest.java
similarity index 89%
rename from opennlp-ml/src/test/java/opennlp/maxent/io/RealValueFileEventStreamTest.java
rename to opennlp-ml/src/test/java/org/apache/opennlp/ml/maxent/io/RealValueFileEventStreamTest.java
index abcd9ed..266e6be 100644
--- a/opennlp-ml/src/test/java/opennlp/maxent/io/RealValueFileEventStreamTest.java
+++ b/opennlp-ml/src/test/java/org/apache/opennlp/ml/maxent/io/RealValueFileEventStreamTest.java
@@ -15,13 +15,14 @@
* limitations under the License.
*/
-package opennlp.maxent.io;
+package org.apache.opennlp.ml.maxent.io;
import java.io.IOException;
+import org.apache.opennlp.ml.model.OnePassRealValueDataIndexer;
+import org.apache.opennlp.ml.model.RealValueFileEventStream;
+
import junit.framework.TestCase;
-import opennlp.model.OnePassRealValueDataIndexer;
-import opennlp.model.RealValueFileEventStream;
public class RealValueFileEventStreamTest extends TestCase {
diff --git a/opennlp-ml/src/test/java/opennlp/model/IndexHashTableTest.java b/opennlp-ml/src/test/java/org/apache/opennlp/ml/model/IndexHashTableTest.java
similarity index 97%
rename from opennlp-ml/src/test/java/opennlp/model/IndexHashTableTest.java
rename to opennlp-ml/src/test/java/org/apache/opennlp/ml/model/IndexHashTableTest.java
index b91c91d..9dadf83 100644
--- a/opennlp-ml/src/test/java/opennlp/model/IndexHashTableTest.java
+++ b/opennlp-ml/src/test/java/org/apache/opennlp/ml/model/IndexHashTableTest.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package opennlp.model;
+package org.apache.opennlp.ml.model;
import junit.framework.TestCase;
diff --git a/opennlp-ml/src/test/java/opennlp/perceptron/PerceptronPrepAttachTest.java b/opennlp-ml/src/test/java/org/apache/opennlp/ml/perceptron/PerceptronPrepAttachTest.java
similarity index 89%
rename from opennlp-ml/src/test/java/opennlp/perceptron/PerceptronPrepAttachTest.java
rename to opennlp-ml/src/test/java/org/apache/opennlp/ml/perceptron/PerceptronPrepAttachTest.java
index f0802cb..a12cbca 100644
--- a/opennlp-ml/src/test/java/opennlp/perceptron/PerceptronPrepAttachTest.java
+++ b/opennlp-ml/src/test/java/org/apache/opennlp/ml/perceptron/PerceptronPrepAttachTest.java
@@ -15,19 +15,19 @@
* limitations under the License.
*/
-package opennlp.perceptron;
+package org.apache.opennlp.ml.perceptron;
-import static opennlp.PrepAttachDataUtil.createTrainingStream;
-import static opennlp.PrepAttachDataUtil.testModel;
+import static org.apache.opennlp.ml.PrepAttachDataUtil.createTrainingStream;
+import static org.apache.opennlp.ml.PrepAttachDataUtil.testModel;
import java.io.IOException;
import java.util.HashMap;
import java.util.Map;
-import opennlp.model.AbstractModel;
-import opennlp.model.TrainUtil;
-import opennlp.model.TwoPassDataIndexer;
+import org.apache.opennlp.ml.model.AbstractModel;
+import org.apache.opennlp.ml.model.TrainUtil;
+import org.apache.opennlp.ml.model.TwoPassDataIndexer;
import org.junit.Test;
/**
