You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@joshua.apache.org by le...@apache.org on 2016/05/16 06:27:09 UTC

[53/66] incubator-joshua git commit: JOSHUA-252 Make it possible to use Maven to build Joshua

http://git-wip-us.apache.org/repos/asf/incubator-joshua/blob/89e22758/src/main/java/org/apache/joshua/decoder/segment_file/ConstraintSpan.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/joshua/decoder/segment_file/ConstraintSpan.java b/src/main/java/org/apache/joshua/decoder/segment_file/ConstraintSpan.java
index c8087bd..9d758f0 100644
--- a/src/main/java/org/apache/joshua/decoder/segment_file/ConstraintSpan.java
+++ b/src/main/java/org/apache/joshua/decoder/segment_file/ConstraintSpan.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package joshua.decoder.segment_file;
+package org.apache.joshua.decoder.segment_file;
 
 import java.util.List;
 

http://git-wip-us.apache.org/repos/asf/incubator-joshua/blob/89e22758/src/main/java/org/apache/joshua/decoder/segment_file/ParseTreeInput.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/joshua/decoder/segment_file/ParseTreeInput.java b/src/main/java/org/apache/joshua/decoder/segment_file/ParseTreeInput.java
index 5feb051..b9b1896 100644
--- a/src/main/java/org/apache/joshua/decoder/segment_file/ParseTreeInput.java
+++ b/src/main/java/org/apache/joshua/decoder/segment_file/ParseTreeInput.java
@@ -16,9 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package joshua.decoder.segment_file;
+package org.apache.joshua.decoder.segment_file;
 
-import joshua.decoder.JoshuaConfiguration;
+import org.apache.joshua.decoder.JoshuaConfiguration;
 
 public class ParseTreeInput extends Sentence {
 

http://git-wip-us.apache.org/repos/asf/incubator-joshua/blob/89e22758/src/main/java/org/apache/joshua/decoder/segment_file/ParsedSentence.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/joshua/decoder/segment_file/ParsedSentence.java b/src/main/java/org/apache/joshua/decoder/segment_file/ParsedSentence.java
index 9273b96..a97718e 100644
--- a/src/main/java/org/apache/joshua/decoder/segment_file/ParsedSentence.java
+++ b/src/main/java/org/apache/joshua/decoder/segment_file/ParsedSentence.java
@@ -16,12 +16,12 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package joshua.decoder.segment_file;
+package org.apache.joshua.decoder.segment_file;
 
-import joshua.corpus.Vocabulary;
-import joshua.corpus.syntax.ArraySyntaxTree;
-import joshua.corpus.syntax.SyntaxTree;
-import joshua.decoder.JoshuaConfiguration;
+import org.apache.joshua.corpus.Vocabulary;
+import org.apache.joshua.corpus.syntax.ArraySyntaxTree;
+import org.apache.joshua.corpus.syntax.SyntaxTree;
+import org.apache.joshua.decoder.JoshuaConfiguration;
 
 public class ParsedSentence extends Sentence {
 

http://git-wip-us.apache.org/repos/asf/incubator-joshua/blob/89e22758/src/main/java/org/apache/joshua/decoder/segment_file/Sentence.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/joshua/decoder/segment_file/Sentence.java b/src/main/java/org/apache/joshua/decoder/segment_file/Sentence.java
index 588850b..2f45ced 100644
--- a/src/main/java/org/apache/joshua/decoder/segment_file/Sentence.java
+++ b/src/main/java/org/apache/joshua/decoder/segment_file/Sentence.java
@@ -16,10 +16,10 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package joshua.decoder.segment_file;
+package org.apache.joshua.decoder.segment_file;
 
-import static joshua.util.FormatUtils.addSentenceMarkers;
-import static joshua.util.FormatUtils.escapeSpecialSymbols;
+import static org.apache.joshua.util.FormatUtils.addSentenceMarkers;
+import static org.apache.joshua.util.FormatUtils.escapeSpecialSymbols;
 
 import java.util.ArrayList;
 import java.util.HashSet;
@@ -30,15 +30,15 @@ import java.util.StringTokenizer;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import joshua.corpus.Vocabulary;
-import joshua.decoder.Decoder;
-import joshua.decoder.JoshuaConfiguration;	
-import joshua.decoder.ff.tm.Grammar;
-import joshua.lattice.Arc;
-import joshua.lattice.Lattice;
-import joshua.lattice.Node;
-import joshua.util.ChartSpan;
-import joshua.util.Regex;
+import org.apache.joshua.corpus.Vocabulary;
+import org.apache.joshua.decoder.Decoder;
+import org.apache.joshua.decoder.JoshuaConfiguration;	
+import org.apache.joshua.decoder.ff.tm.Grammar;
+import org.apache.joshua.lattice.Arc;
+import org.apache.joshua.lattice.Lattice;
+import org.apache.joshua.lattice.Node;
+import org.apache.joshua.util.ChartSpan;
+import org.apache.joshua.util.Regex;
 
 /**
  * This class represents lattice input. The lattice is contained on a single line and is represented

http://git-wip-us.apache.org/repos/asf/incubator-joshua/blob/89e22758/src/main/java/org/apache/joshua/decoder/segment_file/Token.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/joshua/decoder/segment_file/Token.java b/src/main/java/org/apache/joshua/decoder/segment_file/Token.java
index bddfd68..04c1da4 100644
--- a/src/main/java/org/apache/joshua/decoder/segment_file/Token.java
+++ b/src/main/java/org/apache/joshua/decoder/segment_file/Token.java
@@ -16,18 +16,18 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package joshua.decoder.segment_file;
+package org.apache.joshua.decoder.segment_file;
 
-import static joshua.util.FormatUtils.escapeSpecialSymbols;
+import static org.apache.joshua.util.FormatUtils.escapeSpecialSymbols;
 
 import java.util.HashMap;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import joshua.corpus.Vocabulary;
-import joshua.decoder.Decoder;
-import joshua.decoder.JoshuaConfiguration;
-import joshua.util.FormatUtils;
+import org.apache.joshua.corpus.Vocabulary;
+import org.apache.joshua.decoder.Decoder;
+import org.apache.joshua.decoder.JoshuaConfiguration;
+import org.apache.joshua.util.FormatUtils;
 
 /**
  * Stores the identity of a word and its annotations in a sentence.

http://git-wip-us.apache.org/repos/asf/incubator-joshua/blob/89e22758/src/main/java/org/apache/joshua/lattice/Arc.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/joshua/lattice/Arc.java b/src/main/java/org/apache/joshua/lattice/Arc.java
index 793a128..5d056ab 100644
--- a/src/main/java/org/apache/joshua/lattice/Arc.java
+++ b/src/main/java/org/apache/joshua/lattice/Arc.java
@@ -16,8 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package joshua.lattice;
-
+package org.apache.joshua.lattice;
 
 /**
  * An arc in a directed graph.

http://git-wip-us.apache.org/repos/asf/incubator-joshua/blob/89e22758/src/main/java/org/apache/joshua/lattice/Lattice.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/joshua/lattice/Lattice.java b/src/main/java/org/apache/joshua/lattice/Lattice.java
index b0ef40f..98938d8 100644
--- a/src/main/java/org/apache/joshua/lattice/Lattice.java
+++ b/src/main/java/org/apache/joshua/lattice/Lattice.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package joshua.lattice;
+package org.apache.joshua.lattice;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -29,10 +29,10 @@ import java.util.logging.Logger;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import joshua.corpus.Vocabulary;
-import joshua.decoder.JoshuaConfiguration;
-import joshua.decoder.segment_file.Token;
-import joshua.util.ChartSpan;
+import org.apache.joshua.corpus.Vocabulary;
+import org.apache.joshua.decoder.JoshuaConfiguration;
+import org.apache.joshua.decoder.segment_file.Token;
+import org.apache.joshua.util.ChartSpan;
 
 /**
  * A lattice representation of a directed graph.

http://git-wip-us.apache.org/repos/asf/incubator-joshua/blob/89e22758/src/main/java/org/apache/joshua/lattice/Node.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/joshua/lattice/Node.java b/src/main/java/org/apache/joshua/lattice/Node.java
index 31dcea9..09fb150 100644
--- a/src/main/java/org/apache/joshua/lattice/Node.java
+++ b/src/main/java/org/apache/joshua/lattice/Node.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package joshua.lattice;
+package org.apache.joshua.lattice;
 
 import java.util.ArrayList;
 import java.util.Iterator;

http://git-wip-us.apache.org/repos/asf/incubator-joshua/blob/89e22758/src/main/java/org/apache/joshua/lattice/NodeIdentifierComparator.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/joshua/lattice/NodeIdentifierComparator.java b/src/main/java/org/apache/joshua/lattice/NodeIdentifierComparator.java
index 40e50b8..aca5526 100644
--- a/src/main/java/org/apache/joshua/lattice/NodeIdentifierComparator.java
+++ b/src/main/java/org/apache/joshua/lattice/NodeIdentifierComparator.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package joshua.lattice;
+package org.apache.joshua.lattice;
 
 import java.io.Serializable;
 import java.util.Comparator;

http://git-wip-us.apache.org/repos/asf/incubator-joshua/blob/89e22758/src/main/java/org/apache/joshua/metrics/BLEU.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/joshua/metrics/BLEU.java b/src/main/java/org/apache/joshua/metrics/BLEU.java
index 95c6cee..6ed8e07 100644
--- a/src/main/java/org/apache/joshua/metrics/BLEU.java
+++ b/src/main/java/org/apache/joshua/metrics/BLEU.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package joshua.metrics;
+package org.apache.joshua.metrics;
 
 import java.util.HashMap;
 import java.util.Iterator;

http://git-wip-us.apache.org/repos/asf/incubator-joshua/blob/89e22758/src/main/java/org/apache/joshua/metrics/BLEU_SBP.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/joshua/metrics/BLEU_SBP.java b/src/main/java/org/apache/joshua/metrics/BLEU_SBP.java
index e58256b..c3aca70 100644
--- a/src/main/java/org/apache/joshua/metrics/BLEU_SBP.java
+++ b/src/main/java/org/apache/joshua/metrics/BLEU_SBP.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package joshua.metrics;
+package org.apache.joshua.metrics;
 
 public class BLEU_SBP extends BLEU {
   // constructors

http://git-wip-us.apache.org/repos/asf/incubator-joshua/blob/89e22758/src/main/java/org/apache/joshua/metrics/EvaluationMetric.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/joshua/metrics/EvaluationMetric.java b/src/main/java/org/apache/joshua/metrics/EvaluationMetric.java
index 4dd9fbd..4ca1675 100644
--- a/src/main/java/org/apache/joshua/metrics/EvaluationMetric.java
+++ b/src/main/java/org/apache/joshua/metrics/EvaluationMetric.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package joshua.metrics;
+package org.apache.joshua.metrics;
 
 import java.io.BufferedReader;
 import java.io.FileInputStream;

http://git-wip-us.apache.org/repos/asf/incubator-joshua/blob/89e22758/src/main/java/org/apache/joshua/metrics/GradeLevelBLEU.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/joshua/metrics/GradeLevelBLEU.java b/src/main/java/org/apache/joshua/metrics/GradeLevelBLEU.java
index 06efa8b..bb78a16 100644
--- a/src/main/java/org/apache/joshua/metrics/GradeLevelBLEU.java
+++ b/src/main/java/org/apache/joshua/metrics/GradeLevelBLEU.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package joshua.metrics;
+package org.apache.joshua.metrics;
 
 import java.io.BufferedReader;
 import java.io.FileReader;
@@ -26,7 +26,6 @@ import java.util.logging.Logger;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-
 public class GradeLevelBLEU extends BLEU {
   private static final Logger logger = Logger.getLogger(GradeLevelBLEU.class.getName());
 

http://git-wip-us.apache.org/repos/asf/incubator-joshua/blob/89e22758/src/main/java/org/apache/joshua/metrics/METEOR.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/joshua/metrics/METEOR.java b/src/main/java/org/apache/joshua/metrics/METEOR.java
index d94599b..7ed0796 100644
--- a/src/main/java/org/apache/joshua/metrics/METEOR.java
+++ b/src/main/java/org/apache/joshua/metrics/METEOR.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package joshua.metrics;
+package org.apache.joshua.metrics;
 
 import java.io.BufferedReader;
 import java.io.BufferedWriter;
@@ -25,8 +25,7 @@ import java.io.FileReader;
 import java.io.IOException;
 import java.io.OutputStreamWriter;
 
-import joshua.util.StreamGobbler;
-
+import org.apache.joshua.util.StreamGobbler;
 
 public class METEOR extends EvaluationMetric {
   protected String targetLanguage;

http://git-wip-us.apache.org/repos/asf/incubator-joshua/blob/89e22758/src/main/java/org/apache/joshua/metrics/MinimumChangeBLEU.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/joshua/metrics/MinimumChangeBLEU.java b/src/main/java/org/apache/joshua/metrics/MinimumChangeBLEU.java
index fa764c3..96a0a43 100644
--- a/src/main/java/org/apache/joshua/metrics/MinimumChangeBLEU.java
+++ b/src/main/java/org/apache/joshua/metrics/MinimumChangeBLEU.java
@@ -16,14 +16,14 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package joshua.metrics;
+package org.apache.joshua.metrics;
 
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.Map;
 import java.util.logging.Logger;
 
-import joshua.util.Algorithms;
+import org.apache.joshua.util.Algorithms;
 
 public class MinimumChangeBLEU extends BLEU {
   private static final Logger logger = Logger.getLogger(MinimumChangeBLEU.class.getName());

http://git-wip-us.apache.org/repos/asf/incubator-joshua/blob/89e22758/src/main/java/org/apache/joshua/metrics/Precis.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/joshua/metrics/Precis.java b/src/main/java/org/apache/joshua/metrics/Precis.java
index 82f4106..f2a1620 100644
--- a/src/main/java/org/apache/joshua/metrics/Precis.java
+++ b/src/main/java/org/apache/joshua/metrics/Precis.java
@@ -16,14 +16,14 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package joshua.metrics;
+package org.apache.joshua.metrics;
 
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.Map;
 import java.util.logging.Logger;
 
-import joshua.util.Algorithms;
+import org.apache.joshua.util.Algorithms;
 
 // The metric re-uses most of the BLEU code
 public class Precis extends BLEU {

http://git-wip-us.apache.org/repos/asf/incubator-joshua/blob/89e22758/src/main/java/org/apache/joshua/metrics/PrecisMinusSourceBLEU.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/joshua/metrics/PrecisMinusSourceBLEU.java b/src/main/java/org/apache/joshua/metrics/PrecisMinusSourceBLEU.java
index f56f8cb..461243c 100644
--- a/src/main/java/org/apache/joshua/metrics/PrecisMinusSourceBLEU.java
+++ b/src/main/java/org/apache/joshua/metrics/PrecisMinusSourceBLEU.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package joshua.metrics;
+package org.apache.joshua.metrics;
 
 import java.io.BufferedReader;
 import java.io.File;

http://git-wip-us.apache.org/repos/asf/incubator-joshua/blob/89e22758/src/main/java/org/apache/joshua/metrics/SourceBLEU.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/joshua/metrics/SourceBLEU.java b/src/main/java/org/apache/joshua/metrics/SourceBLEU.java
index 582b642..50cdd8a 100644
--- a/src/main/java/org/apache/joshua/metrics/SourceBLEU.java
+++ b/src/main/java/org/apache/joshua/metrics/SourceBLEU.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package joshua.metrics;
+package org.apache.joshua.metrics;
 
 import java.util.HashMap;
 

http://git-wip-us.apache.org/repos/asf/incubator-joshua/blob/89e22758/src/main/java/org/apache/joshua/metrics/TER.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/joshua/metrics/TER.java b/src/main/java/org/apache/joshua/metrics/TER.java
index a36b171..2e37c11 100644
--- a/src/main/java/org/apache/joshua/metrics/TER.java
+++ b/src/main/java/org/apache/joshua/metrics/TER.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package joshua.metrics;
+package org.apache.joshua.metrics;
 
 import java.io.BufferedReader;
 import java.io.BufferedWriter;
@@ -32,8 +32,7 @@ import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.concurrent.Semaphore;
 
-import joshua.util.StreamGobbler;
-
+import org.apache.joshua.util.StreamGobbler;
 
 public class TER extends EvaluationMetric {
   private boolean caseSensitive;

http://git-wip-us.apache.org/repos/asf/incubator-joshua/blob/89e22758/src/main/java/org/apache/joshua/metrics/TERMinusBLEU.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/joshua/metrics/TERMinusBLEU.java b/src/main/java/org/apache/joshua/metrics/TERMinusBLEU.java
index ce756c6..5208546 100644
--- a/src/main/java/org/apache/joshua/metrics/TERMinusBLEU.java
+++ b/src/main/java/org/apache/joshua/metrics/TERMinusBLEU.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package joshua.metrics;
+package org.apache.joshua.metrics;
 
 import java.io.BufferedReader;
 import java.io.File;

http://git-wip-us.apache.org/repos/asf/incubator-joshua/blob/89e22758/src/main/java/org/apache/joshua/metrics/TercomRunner.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/joshua/metrics/TercomRunner.java b/src/main/java/org/apache/joshua/metrics/TercomRunner.java
index 5770c49..75a76dc 100644
--- a/src/main/java/org/apache/joshua/metrics/TercomRunner.java
+++ b/src/main/java/org/apache/joshua/metrics/TercomRunner.java
@@ -16,13 +16,13 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package joshua.metrics;
+package org.apache.joshua.metrics;
 
 import java.io.File;
 import java.io.IOException;
 import java.util.concurrent.Semaphore;
 
-import joshua.util.StreamGobbler;
+import org.apache.joshua.util.StreamGobbler;
 
 
 public class TercomRunner implements Runnable {

http://git-wip-us.apache.org/repos/asf/incubator-joshua/blob/89e22758/src/main/java/org/apache/joshua/metrics/ZeroOneLoss.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/joshua/metrics/ZeroOneLoss.java b/src/main/java/org/apache/joshua/metrics/ZeroOneLoss.java
index ca59b77..3d4b616 100644
--- a/src/main/java/org/apache/joshua/metrics/ZeroOneLoss.java
+++ b/src/main/java/org/apache/joshua/metrics/ZeroOneLoss.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package joshua.metrics;
+package org.apache.joshua.metrics;
 
 public class ZeroOneLoss extends EvaluationMetric {
   public ZeroOneLoss() {

http://git-wip-us.apache.org/repos/asf/incubator-joshua/blob/89e22758/src/main/java/org/apache/joshua/mira/MIRA.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/joshua/mira/MIRA.java b/src/main/java/org/apache/joshua/mira/MIRA.java
index a0e14ac..efb4163 100755
--- a/src/main/java/org/apache/joshua/mira/MIRA.java
+++ b/src/main/java/org/apache/joshua/mira/MIRA.java
@@ -16,11 +16,11 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package joshua.mira;
+package org.apache.joshua.mira;
 
-import joshua.decoder.JoshuaConfiguration;
-import joshua.util.FileUtility;
-import joshua.util.StreamGobbler;
+import org.apache.joshua.decoder.JoshuaConfiguration;
+import org.apache.joshua.util.FileUtility;
+import org.apache.joshua.util.StreamGobbler;
 
 public class MIRA {
   public static void main(String[] args) throws Exception {

http://git-wip-us.apache.org/repos/asf/incubator-joshua/blob/89e22758/src/main/java/org/apache/joshua/mira/MIRACore.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/joshua/mira/MIRACore.java b/src/main/java/org/apache/joshua/mira/MIRACore.java
index 02d8653..045353a 100755
--- a/src/main/java/org/apache/joshua/mira/MIRACore.java
+++ b/src/main/java/org/apache/joshua/mira/MIRACore.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package joshua.mira;
+package org.apache.joshua.mira;
 
 import java.io.BufferedReader;
 import java.io.BufferedWriter;
@@ -44,11 +44,11 @@ import java.util.concurrent.ConcurrentHashMap;
 import java.util.zip.GZIPInputStream;
 import java.util.zip.GZIPOutputStream;
 
-import joshua.decoder.Decoder;
-import joshua.decoder.JoshuaConfiguration;
-import joshua.metrics.EvaluationMetric;
-import joshua.util.StreamGobbler;
-import joshua.corpus.Vocabulary;
+import org.apache.joshua.decoder.Decoder;
+import org.apache.joshua.decoder.JoshuaConfiguration;
+import org.apache.joshua.metrics.EvaluationMetric;
+import org.apache.joshua.util.StreamGobbler;
+import org.apache.joshua.corpus.Vocabulary;
 
 /**
  * This code was originally written by Yuan Cao, who copied the MERT code to produce this file.

http://git-wip-us.apache.org/repos/asf/incubator-joshua/blob/89e22758/src/main/java/org/apache/joshua/mira/Optimizer.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/joshua/mira/Optimizer.java b/src/main/java/org/apache/joshua/mira/Optimizer.java
index d67ffbc..6eaced4 100755
--- a/src/main/java/org/apache/joshua/mira/Optimizer.java
+++ b/src/main/java/org/apache/joshua/mira/Optimizer.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package joshua.mira;
+package org.apache.joshua.mira;
 
 import java.util.Collection;
 import java.util.Collections;
@@ -27,8 +27,8 @@ import java.util.List;
 import java.util.Set;
 import java.util.Vector;
 
-import joshua.corpus.Vocabulary;
-import joshua.metrics.EvaluationMetric;
+import org.apache.joshua.corpus.Vocabulary;
+import org.apache.joshua.metrics.EvaluationMetric;
 
 // this class implements the MIRA algorithm
 public class Optimizer {

http://git-wip-us.apache.org/repos/asf/incubator-joshua/blob/89e22758/src/main/java/org/apache/joshua/oracle/OracleExtractionHG.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/joshua/oracle/OracleExtractionHG.java b/src/main/java/org/apache/joshua/oracle/OracleExtractionHG.java
index 7e7fcb8..184a14a 100644
--- a/src/main/java/org/apache/joshua/oracle/OracleExtractionHG.java
+++ b/src/main/java/org/apache/joshua/oracle/OracleExtractionHG.java
@@ -16,26 +16,26 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package joshua.oracle;
+package org.apache.joshua.oracle;
 
-import static joshua.decoder.hypergraph.ViterbiExtractor.getViterbiString;
-import static joshua.util.FormatUtils.removeSentenceMarkers;
+import static org.apache.joshua.decoder.hypergraph.ViterbiExtractor.getViterbiString;
+import static org.apache.joshua.util.FormatUtils.removeSentenceMarkers;
 
 import java.io.BufferedWriter;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.HashMap;
 
-import joshua.corpus.Vocabulary;
-import joshua.decoder.JoshuaConfiguration;
-import joshua.decoder.Support;
-import joshua.decoder.Decoder;
-import joshua.decoder.hypergraph.HGNode;
-import joshua.decoder.hypergraph.HyperEdge;
-import joshua.decoder.hypergraph.HyperGraph;
-import joshua.decoder.hypergraph.KBestExtractor;
-import joshua.util.FileUtility;
-import joshua.util.io.LineReader;
+import org.apache.joshua.corpus.Vocabulary;
+import org.apache.joshua.decoder.JoshuaConfiguration;
+import org.apache.joshua.decoder.Support;
+import org.apache.joshua.decoder.Decoder;
+import org.apache.joshua.decoder.hypergraph.HGNode;
+import org.apache.joshua.decoder.hypergraph.HyperEdge;
+import org.apache.joshua.decoder.hypergraph.HyperGraph;
+import org.apache.joshua.decoder.hypergraph.KBestExtractor;
+import org.apache.joshua.util.FileUtility;
+import org.apache.joshua.util.io.LineReader;
 
 /**
  * approximated BLEU (1) do not consider clipping effect (2) in the dynamic programming, do not

http://git-wip-us.apache.org/repos/asf/incubator-joshua/blob/89e22758/src/main/java/org/apache/joshua/oracle/OracleExtractor.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/joshua/oracle/OracleExtractor.java b/src/main/java/org/apache/joshua/oracle/OracleExtractor.java
index d4a0019..ef67905 100644
--- a/src/main/java/org/apache/joshua/oracle/OracleExtractor.java
+++ b/src/main/java/org/apache/joshua/oracle/OracleExtractor.java
@@ -16,9 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package joshua.oracle;
+package org.apache.joshua.oracle;
 
-import joshua.decoder.hypergraph.HyperGraph;
+import org.apache.joshua.decoder.hypergraph.HyperGraph;
 
 /**
  * Convenience wrapper class for oracle extraction code.

http://git-wip-us.apache.org/repos/asf/incubator-joshua/blob/89e22758/src/main/java/org/apache/joshua/oracle/SplitHg.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/joshua/oracle/SplitHg.java b/src/main/java/org/apache/joshua/oracle/SplitHg.java
index 5f2a38b..054e9b7 100644
--- a/src/main/java/org/apache/joshua/oracle/SplitHg.java
+++ b/src/main/java/org/apache/joshua/oracle/SplitHg.java
@@ -16,15 +16,15 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package joshua.oracle;
+package org.apache.joshua.oracle;
 
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
 
-import joshua.decoder.hypergraph.HGNode;
-import joshua.decoder.hypergraph.HyperEdge;
-import joshua.decoder.hypergraph.HyperGraph;
+import org.apache.joshua.decoder.hypergraph.HGNode;
+import org.apache.joshua.decoder.hypergraph.HyperEdge;
+import org.apache.joshua.decoder.hypergraph.HyperGraph;
 
 /**
  * This class implements general ways of splitting the hypergraph based on coarse-to-fine idea input

http://git-wip-us.apache.org/repos/asf/incubator-joshua/blob/89e22758/src/main/java/org/apache/joshua/pro/ClassifierInterface.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/joshua/pro/ClassifierInterface.java b/src/main/java/org/apache/joshua/pro/ClassifierInterface.java
index 0a0607c..d6dca73 100755
--- a/src/main/java/org/apache/joshua/pro/ClassifierInterface.java
+++ b/src/main/java/org/apache/joshua/pro/ClassifierInterface.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package joshua.pro;
+package org.apache.joshua.pro;
 
 import java.util.Vector;
 

http://git-wip-us.apache.org/repos/asf/incubator-joshua/blob/89e22758/src/main/java/org/apache/joshua/pro/ClassifierMegaM.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/joshua/pro/ClassifierMegaM.java b/src/main/java/org/apache/joshua/pro/ClassifierMegaM.java
index ba89b5b..4817290 100755
--- a/src/main/java/org/apache/joshua/pro/ClassifierMegaM.java
+++ b/src/main/java/org/apache/joshua/pro/ClassifierMegaM.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package joshua.pro;
+package org.apache.joshua.pro;
 
 import java.io.File;
 import java.io.FileOutputStream;
@@ -24,8 +24,8 @@ import java.io.IOException;
 import java.io.PrintWriter;
 import java.util.Vector;
 
-import joshua.util.StreamGobbler;
-import joshua.util.io.LineReader;
+import org.apache.joshua.util.StreamGobbler;
+import org.apache.joshua.util.io.LineReader;
 
 // sparse feature representation version
 public class ClassifierMegaM implements ClassifierInterface {

http://git-wip-us.apache.org/repos/asf/incubator-joshua/blob/89e22758/src/main/java/org/apache/joshua/pro/ClassifierPerceptron.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/joshua/pro/ClassifierPerceptron.java b/src/main/java/org/apache/joshua/pro/ClassifierPerceptron.java
index e2ba5b3..a92af0e 100755
--- a/src/main/java/org/apache/joshua/pro/ClassifierPerceptron.java
+++ b/src/main/java/org/apache/joshua/pro/ClassifierPerceptron.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package joshua.pro;
+package org.apache.joshua.pro;
 
 import java.util.Vector;
 

http://git-wip-us.apache.org/repos/asf/incubator-joshua/blob/89e22758/src/main/java/org/apache/joshua/pro/ClassifierSVM.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/joshua/pro/ClassifierSVM.java b/src/main/java/org/apache/joshua/pro/ClassifierSVM.java
index 1050139..a1fe91a 100755
--- a/src/main/java/org/apache/joshua/pro/ClassifierSVM.java
+++ b/src/main/java/org/apache/joshua/pro/ClassifierSVM.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package joshua.pro;
+package org.apache.joshua.pro;
 
 import java.io.File;
 import java.io.FileOutputStream;
@@ -24,8 +24,8 @@ import java.io.IOException;
 import java.io.PrintWriter;
 import java.util.Vector;
 
-import joshua.util.StreamGobbler;
-import joshua.util.io.LineReader;
+import org.apache.joshua.util.StreamGobbler;
+import org.apache.joshua.util.io.LineReader;
 
 public class ClassifierSVM implements ClassifierInterface {
   @Override

http://git-wip-us.apache.org/repos/asf/incubator-joshua/blob/89e22758/src/main/java/org/apache/joshua/pro/Optimizer.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/joshua/pro/Optimizer.java b/src/main/java/org/apache/joshua/pro/Optimizer.java
index 3dbf4d4..ff7d902 100755
--- a/src/main/java/org/apache/joshua/pro/Optimizer.java
+++ b/src/main/java/org/apache/joshua/pro/Optimizer.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package joshua.pro;
+package org.apache.joshua.pro;
 
 import java.util.Comparator;
 import java.util.HashMap;
@@ -28,8 +28,8 @@ import java.util.Set;
 import java.util.TreeMap;
 import java.util.Vector;
 
-import joshua.corpus.Vocabulary;
-import joshua.metrics.EvaluationMetric;
+import org.apache.joshua.corpus.Vocabulary;
+import org.apache.joshua.metrics.EvaluationMetric;
 
 // this class implements the PRO tuning method
 public class Optimizer {

http://git-wip-us.apache.org/repos/asf/incubator-joshua/blob/89e22758/src/main/java/org/apache/joshua/pro/PRO.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/joshua/pro/PRO.java b/src/main/java/org/apache/joshua/pro/PRO.java
index 492912a..237c8c8 100755
--- a/src/main/java/org/apache/joshua/pro/PRO.java
+++ b/src/main/java/org/apache/joshua/pro/PRO.java
@@ -16,11 +16,11 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package joshua.pro;
+package org.apache.joshua.pro;
 
-import joshua.decoder.JoshuaConfiguration;
-import joshua.util.FileUtility;
-import joshua.util.StreamGobbler;
+import org.apache.joshua.decoder.JoshuaConfiguration;
+import org.apache.joshua.util.FileUtility;
+import org.apache.joshua.util.StreamGobbler;
 
 public class PRO {
   public static void main(String[] args) throws Exception {

http://git-wip-us.apache.org/repos/asf/incubator-joshua/blob/89e22758/src/main/java/org/apache/joshua/pro/PROCore.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/joshua/pro/PROCore.java b/src/main/java/org/apache/joshua/pro/PROCore.java
index 9e0a09a..e378e9d 100755
--- a/src/main/java/org/apache/joshua/pro/PROCore.java
+++ b/src/main/java/org/apache/joshua/pro/PROCore.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package joshua.pro;
+package org.apache.joshua.pro;
 
 import java.io.BufferedReader;
 import java.io.BufferedWriter;
@@ -40,15 +40,16 @@ import java.util.Random;
 import java.util.Scanner;
 import java.util.TreeSet;
 import java.util.Vector;
-import java.util.concurrent.ConcurrentHashMap;
 import java.util.zip.GZIPInputStream;
 import java.util.zip.GZIPOutputStream;
 
-import joshua.decoder.Decoder;
-import joshua.decoder.JoshuaConfiguration;
-import joshua.metrics.EvaluationMetric;
-import joshua.util.StreamGobbler;
-import joshua.corpus.Vocabulary;
+import org.apache.joshua.corpus.Vocabulary;
+import org.apache.joshua.decoder.Decoder;
+import org.apache.joshua.decoder.JoshuaConfiguration;
+import org.apache.joshua.metrics.EvaluationMetric;
+import org.apache.joshua.util.StreamGobbler;
+
+import EDU.oswego.cs.dl.util.concurrent.ConcurrentHashMap;
 
 /**
  * This code was originally written by Yuan Cao, who copied the MERT code to produce this file.
@@ -710,12 +711,12 @@ public class PROCore {
       int[] candCount = new int[numSentences];
       int[] lastUsedIndex = new int[numSentences];
 
-      ConcurrentHashMap<Integer, int[]>[] suffStats_array = new ConcurrentHashMap[numSentences];
+      ConcurrentHashMap[] suffStats_array = new ConcurrentHashMap[numSentences];
       for (int i = 0; i < numSentences; ++i) {
         candCount[i] = 0;
         lastUsedIndex[i] = -1;
         // suffStats_array[i].clear();
-        suffStats_array[i] = new ConcurrentHashMap<Integer, int[]>();
+        suffStats_array[i] = new ConcurrentHashMap();
       }
 
       // initLambda[0] is not used!

http://git-wip-us.apache.org/repos/asf/incubator-joshua/blob/89e22758/src/main/java/org/apache/joshua/server/ServerThread.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/joshua/server/ServerThread.java b/src/main/java/org/apache/joshua/server/ServerThread.java
index ac0390b..5f42be6 100644
--- a/src/main/java/org/apache/joshua/server/ServerThread.java
+++ b/src/main/java/org/apache/joshua/server/ServerThread.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package joshua.server;
+package org.apache.joshua.server;
 
 import java.io.BufferedReader;
 import java.io.IOException;
@@ -32,9 +32,9 @@ import java.util.HashMap;
 import com.sun.net.httpserver.HttpExchange;
 import com.sun.net.httpserver.HttpHandler;
 
-import joshua.decoder.Decoder;
-import joshua.decoder.JoshuaConfiguration;
-import joshua.decoder.io.TranslationRequestStream;
+import org.apache.joshua.decoder.Decoder;
+import org.apache.joshua.decoder.JoshuaConfiguration;
+import org.apache.joshua.decoder.io.TranslationRequestStream;
 
 /**
  * This class handles a concurrent request for translations from a newly opened socket.

http://git-wip-us.apache.org/repos/asf/incubator-joshua/blob/89e22758/src/main/java/org/apache/joshua/server/TcpServer.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/joshua/server/TcpServer.java b/src/main/java/org/apache/joshua/server/TcpServer.java
index 2b63e72..137794d 100644
--- a/src/main/java/org/apache/joshua/server/TcpServer.java
+++ b/src/main/java/org/apache/joshua/server/TcpServer.java
@@ -16,13 +16,13 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package joshua.server;
+package org.apache.joshua.server;
 
-import java.net.*;
-import java.io.*;
+import java.io.IOException;
+import java.net.ServerSocket;
 
-import joshua.decoder.Decoder;
-import joshua.decoder.JoshuaConfiguration;
+import org.apache.joshua.decoder.Decoder;
+import org.apache.joshua.decoder.JoshuaConfiguration;
 
 /**
  * TCP/IP server. Accepts newline-separated input sentences written to the socket, translates them

http://git-wip-us.apache.org/repos/asf/incubator-joshua/blob/89e22758/src/main/java/org/apache/joshua/subsample/AlignedSubsampler.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/joshua/subsample/AlignedSubsampler.java b/src/main/java/org/apache/joshua/subsample/AlignedSubsampler.java
index 37480d7..88a0960 100644
--- a/src/main/java/org/apache/joshua/subsample/AlignedSubsampler.java
+++ b/src/main/java/org/apache/joshua/subsample/AlignedSubsampler.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package joshua.subsample;
+package org.apache.joshua.subsample;
 
 import java.io.BufferedWriter;
 import java.io.FileOutputStream;

http://git-wip-us.apache.org/repos/asf/incubator-joshua/blob/89e22758/src/main/java/org/apache/joshua/subsample/Alignment.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/joshua/subsample/Alignment.java b/src/main/java/org/apache/joshua/subsample/Alignment.java
index 9033a3e..2372bdd 100644
--- a/src/main/java/org/apache/joshua/subsample/Alignment.java
+++ b/src/main/java/org/apache/joshua/subsample/Alignment.java
@@ -5,8 +5,7 @@
  * under the LGPL version 2.1. LGPL version 3 requires no special permission since it is compatible
  * with Apache License 2.0
  */
-package joshua.subsample;
-
+package org.apache.joshua.subsample;
 
 /**
  * A set of word alignments between an F phrase and an E phrase. The implementation uses a

http://git-wip-us.apache.org/repos/asf/incubator-joshua/blob/89e22758/src/main/java/org/apache/joshua/subsample/BiCorpus.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/joshua/subsample/BiCorpus.java b/src/main/java/org/apache/joshua/subsample/BiCorpus.java
index 83cba63..c2959fa 100644
--- a/src/main/java/org/apache/joshua/subsample/BiCorpus.java
+++ b/src/main/java/org/apache/joshua/subsample/BiCorpus.java
@@ -5,7 +5,7 @@
  * Machine Translation System to release modifications under the LGPL version 2.1. LGPL version 3
  * requires no special permission since it is compatible with Apache License 2.0
  */
-package joshua.subsample;
+package org.apache.joshua.subsample;
 
 import java.io.BufferedReader;
 import java.io.FileNotFoundException;
@@ -14,8 +14,7 @@ import java.io.IOException;
 import java.util.Iterator;
 import java.util.NoSuchElementException;
 
-import joshua.corpus.Phrase;
-
+import org.apache.joshua.corpus.Phrase;
 
 /**
  * Class for representing a sentence-aligned bi-corpus (with optional word-alignments).

http://git-wip-us.apache.org/repos/asf/incubator-joshua/blob/89e22758/src/main/java/org/apache/joshua/subsample/BiCorpusFactory.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/joshua/subsample/BiCorpusFactory.java b/src/main/java/org/apache/joshua/subsample/BiCorpusFactory.java
index eea8937..226090d 100644
--- a/src/main/java/org/apache/joshua/subsample/BiCorpusFactory.java
+++ b/src/main/java/org/apache/joshua/subsample/BiCorpusFactory.java
@@ -16,12 +16,11 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package joshua.subsample;
+package org.apache.joshua.subsample;
 
 import java.io.File;
 import java.io.IOException;
 
-
 /**
  * A callback closure for <code>Subsampler.subsample</code>. This class is used by
  * {@link AlignedSubsampler} in order to "override" methods of {@link Subsampler}, minimizing code

http://git-wip-us.apache.org/repos/asf/incubator-joshua/blob/89e22758/src/main/java/org/apache/joshua/subsample/PhrasePair.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/joshua/subsample/PhrasePair.java b/src/main/java/org/apache/joshua/subsample/PhrasePair.java
index 36a1da5..125cac2 100644
--- a/src/main/java/org/apache/joshua/subsample/PhrasePair.java
+++ b/src/main/java/org/apache/joshua/subsample/PhrasePair.java
@@ -5,12 +5,9 @@
  * under the LGPL version 2.1. LGPL version 3 requires no special permission since it is compatible
  * with Apache License 2.0
  */
-package joshua.subsample;
+package org.apache.joshua.subsample;
 
-// TODO: if we generalize the Alignment class, we could move this
-// to joshua.util.sentence.
-
-import joshua.corpus.Phrase;
+import org.apache.joshua.corpus.Phrase;
 
 
 /**

http://git-wip-us.apache.org/repos/asf/incubator-joshua/blob/89e22758/src/main/java/org/apache/joshua/subsample/PhraseReader.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/joshua/subsample/PhraseReader.java b/src/main/java/org/apache/joshua/subsample/PhraseReader.java
index f6dd6d3..f35288c 100644
--- a/src/main/java/org/apache/joshua/subsample/PhraseReader.java
+++ b/src/main/java/org/apache/joshua/subsample/PhraseReader.java
@@ -5,14 +5,13 @@
  * under the LGPL version 2.1. LGPL version 3 requires no special permission since it is compatible
  * with Apache License 2.0
  */
-package joshua.subsample;
+package org.apache.joshua.subsample;
 
 import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.Reader;
 
-import joshua.corpus.BasicPhrase;
-
+import org.apache.joshua.corpus.BasicPhrase;
 
 /**
  * Wrapper class to read in each line as a BasicPhrase.

http://git-wip-us.apache.org/repos/asf/incubator-joshua/blob/89e22758/src/main/java/org/apache/joshua/subsample/PhraseWriter.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/joshua/subsample/PhraseWriter.java b/src/main/java/org/apache/joshua/subsample/PhraseWriter.java
index 16a3563..cda99e6 100644
--- a/src/main/java/org/apache/joshua/subsample/PhraseWriter.java
+++ b/src/main/java/org/apache/joshua/subsample/PhraseWriter.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package joshua.subsample;
+package org.apache.joshua.subsample;
 
 import java.io.BufferedWriter;
 import java.io.IOException;

http://git-wip-us.apache.org/repos/asf/incubator-joshua/blob/89e22758/src/main/java/org/apache/joshua/subsample/Subsampler.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/joshua/subsample/Subsampler.java b/src/main/java/org/apache/joshua/subsample/Subsampler.java
index 49e1a16..d56c529 100644
--- a/src/main/java/org/apache/joshua/subsample/Subsampler.java
+++ b/src/main/java/org/apache/joshua/subsample/Subsampler.java
@@ -5,7 +5,7 @@
  * Machine Translation System to release modifications under the LGPL version 2.1. LGPL version 3
  * requires no special permission since it is compatible with Apache License 2.0
  */
-package joshua.subsample;
+package org.apache.joshua.subsample;
 
 import java.io.BufferedReader;
 import java.io.BufferedWriter;
@@ -18,9 +18,8 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-import joshua.corpus.BasicPhrase;
-import joshua.corpus.Phrase;
-
+import org.apache.joshua.corpus.BasicPhrase;
+import org.apache.joshua.corpus.Phrase;
 
 /**
  * A class for subsampling a large (F,E)-parallel sentence-aligned corpus to generate a smaller

http://git-wip-us.apache.org/repos/asf/incubator-joshua/blob/89e22758/src/main/java/org/apache/joshua/subsample/SubsamplerCLI.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/joshua/subsample/SubsamplerCLI.java b/src/main/java/org/apache/joshua/subsample/SubsamplerCLI.java
index ad80b74..8303617 100644
--- a/src/main/java/org/apache/joshua/subsample/SubsamplerCLI.java
+++ b/src/main/java/org/apache/joshua/subsample/SubsamplerCLI.java
@@ -5,7 +5,7 @@
  * Machine Translation System to release modifications under the LGPL version 2.1. LGPL version 3
  * requires no special permission since it is compatible with Apache License 2.0
  */
-package joshua.subsample;
+package org.apache.joshua.subsample;
 
 import java.io.IOException;
 

http://git-wip-us.apache.org/repos/asf/incubator-joshua/blob/89e22758/src/main/java/org/apache/joshua/tools/GrammarPacker.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/joshua/tools/GrammarPacker.java b/src/main/java/org/apache/joshua/tools/GrammarPacker.java
index 33d3391..0b5985d 100644
--- a/src/main/java/org/apache/joshua/tools/GrammarPacker.java
+++ b/src/main/java/org/apache/joshua/tools/GrammarPacker.java
@@ -16,9 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package joshua.tools;
+package org.apache.joshua.tools;
 
-import static joshua.decoder.ff.tm.packed.PackedGrammar.VOCABULARY_FILENAME;
+import static org.apache.joshua.decoder.ff.tm.packed.PackedGrammar.VOCABULARY_FILENAME;
 
 import java.io.BufferedOutputStream;
 import java.io.DataOutputStream;
@@ -36,12 +36,12 @@ import java.util.Queue;
 import java.util.TreeMap;
 import java.util.logging.Logger;
 
-import joshua.corpus.Vocabulary;
-import joshua.util.FormatUtils;
-import joshua.util.encoding.EncoderConfiguration;
-import joshua.util.encoding.FeatureTypeAnalyzer;
-import joshua.util.encoding.IntEncoder;
-import joshua.util.io.LineReader;
+import org.apache.joshua.corpus.Vocabulary;
+import org.apache.joshua.util.FormatUtils;
+import org.apache.joshua.util.encoding.EncoderConfiguration;
+import org.apache.joshua.util.encoding.FeatureTypeAnalyzer;
+import org.apache.joshua.util.encoding.IntEncoder;
+import org.apache.joshua.util.io.LineReader;
 
 public class GrammarPacker {
 

http://git-wip-us.apache.org/repos/asf/incubator-joshua/blob/89e22758/src/main/java/org/apache/joshua/tools/GrammarPackerCli.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/joshua/tools/GrammarPackerCli.java b/src/main/java/org/apache/joshua/tools/GrammarPackerCli.java
index eef65bb..e97cbe7 100644
--- a/src/main/java/org/apache/joshua/tools/GrammarPackerCli.java
+++ b/src/main/java/org/apache/joshua/tools/GrammarPackerCli.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package joshua.tools;
+package org.apache.joshua.tools;
 
 import java.io.File;
 import java.io.IOException;

http://git-wip-us.apache.org/repos/asf/incubator-joshua/blob/89e22758/src/main/java/org/apache/joshua/tools/LabelPhrases.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/joshua/tools/LabelPhrases.java b/src/main/java/org/apache/joshua/tools/LabelPhrases.java
index 9733672..b4a31c7 100644
--- a/src/main/java/org/apache/joshua/tools/LabelPhrases.java
+++ b/src/main/java/org/apache/joshua/tools/LabelPhrases.java
@@ -16,14 +16,14 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package joshua.tools;
+package org.apache.joshua.tools;
 
 import java.io.IOException;
 import java.util.logging.Logger;
 
-import joshua.corpus.Vocabulary;
-import joshua.corpus.syntax.ArraySyntaxTree;
-import joshua.util.io.LineReader;
+import org.apache.joshua.corpus.Vocabulary;
+import org.apache.joshua.corpus.syntax.ArraySyntaxTree;
+import org.apache.joshua.util.io.LineReader;
 
 /**
  * Finds labeling for a set of phrases.

http://git-wip-us.apache.org/repos/asf/incubator-joshua/blob/89e22758/src/main/java/org/apache/joshua/tools/TestSetFilter.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/joshua/tools/TestSetFilter.java b/src/main/java/org/apache/joshua/tools/TestSetFilter.java
index 06cea5f..6312266 100644
--- a/src/main/java/org/apache/joshua/tools/TestSetFilter.java
+++ b/src/main/java/org/apache/joshua/tools/TestSetFilter.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package joshua.tools;
+package org.apache.joshua.tools;
 
 import java.io.FileNotFoundException;
 import java.io.IOException;
@@ -28,7 +28,7 @@ import java.util.Map;
 import java.util.Set;
 import java.util.regex.Pattern;
 
-import joshua.util.io.LineReader;
+import org.apache.joshua.util.io.LineReader;
 
 public class TestSetFilter {
   private Filter filter = null;

http://git-wip-us.apache.org/repos/asf/incubator-joshua/blob/89e22758/src/main/java/org/apache/joshua/ui/Orientation.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/joshua/ui/Orientation.java b/src/main/java/org/apache/joshua/ui/Orientation.java
index ec7b523..4c536ce 100644
--- a/src/main/java/org/apache/joshua/ui/Orientation.java
+++ b/src/main/java/org/apache/joshua/ui/Orientation.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package joshua.ui;
+package org.apache.joshua.ui;
 
 public enum Orientation {
   HORIZONTAL, VERTICAL

http://git-wip-us.apache.org/repos/asf/incubator-joshua/blob/89e22758/src/main/java/org/apache/joshua/ui/StartupWindow.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/joshua/ui/StartupWindow.java b/src/main/java/org/apache/joshua/ui/StartupWindow.java
index 6fc37a2..cccdd80 100644
--- a/src/main/java/org/apache/joshua/ui/StartupWindow.java
+++ b/src/main/java/org/apache/joshua/ui/StartupWindow.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package joshua.ui;
+package org.apache.joshua.ui;
 
 import java.awt.BorderLayout;
 import java.awt.Color;

http://git-wip-us.apache.org/repos/asf/incubator-joshua/blob/89e22758/src/main/java/org/apache/joshua/ui/tree_visualizer/DerivationTree.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/joshua/ui/tree_visualizer/DerivationTree.java b/src/main/java/org/apache/joshua/ui/tree_visualizer/DerivationTree.java
index 86b9618..f09a40a 100644
--- a/src/main/java/org/apache/joshua/ui/tree_visualizer/DerivationTree.java
+++ b/src/main/java/org/apache/joshua/ui/tree_visualizer/DerivationTree.java
@@ -16,13 +16,13 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package joshua.ui.tree_visualizer;
+package org.apache.joshua.ui.tree_visualizer;
 
 import java.util.Arrays;
 import java.util.List;
 import java.util.Collections;
 
-import joshua.ui.tree_visualizer.tree.Tree;
+import org.apache.joshua.ui.tree_visualizer.tree.Tree;
 
 import edu.uci.ics.jung.graph.DirectedOrderedSparseMultigraph;
 import edu.uci.ics.jung.graph.util.EdgeType;

http://git-wip-us.apache.org/repos/asf/incubator-joshua/blob/89e22758/src/main/java/org/apache/joshua/ui/tree_visualizer/DerivationTreeEdge.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/joshua/ui/tree_visualizer/DerivationTreeEdge.java b/src/main/java/org/apache/joshua/ui/tree_visualizer/DerivationTreeEdge.java
index b457f95..33b6b22 100644
--- a/src/main/java/org/apache/joshua/ui/tree_visualizer/DerivationTreeEdge.java
+++ b/src/main/java/org/apache/joshua/ui/tree_visualizer/DerivationTreeEdge.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package joshua.ui.tree_visualizer;
+package org.apache.joshua.ui.tree_visualizer;
 
 public class DerivationTreeEdge {
   public final boolean pointsToSource;

http://git-wip-us.apache.org/repos/asf/incubator-joshua/blob/89e22758/src/main/java/org/apache/joshua/ui/tree_visualizer/DerivationTreeTransformer.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/joshua/ui/tree_visualizer/DerivationTreeTransformer.java b/src/main/java/org/apache/joshua/ui/tree_visualizer/DerivationTreeTransformer.java
index 9bdeefe..3e4010f 100644
--- a/src/main/java/org/apache/joshua/ui/tree_visualizer/DerivationTreeTransformer.java
+++ b/src/main/java/org/apache/joshua/ui/tree_visualizer/DerivationTreeTransformer.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package joshua.ui.tree_visualizer;
+package org.apache.joshua.ui.tree_visualizer;
 
 import java.awt.Dimension;
 import java.awt.geom.Point2D;

http://git-wip-us.apache.org/repos/asf/incubator-joshua/blob/89e22758/src/main/java/org/apache/joshua/ui/tree_visualizer/DerivationViewer.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/joshua/ui/tree_visualizer/DerivationViewer.java b/src/main/java/org/apache/joshua/ui/tree_visualizer/DerivationViewer.java
index cc8a701..8c6151d 100644
--- a/src/main/java/org/apache/joshua/ui/tree_visualizer/DerivationViewer.java
+++ b/src/main/java/org/apache/joshua/ui/tree_visualizer/DerivationViewer.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package joshua.ui.tree_visualizer;
+package org.apache.joshua.ui.tree_visualizer;
 
 import java.awt.BasicStroke;
 import java.awt.Color;

http://git-wip-us.apache.org/repos/asf/incubator-joshua/blob/89e22758/src/main/java/org/apache/joshua/ui/tree_visualizer/DerivationViewerApplet.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/joshua/ui/tree_visualizer/DerivationViewerApplet.java b/src/main/java/org/apache/joshua/ui/tree_visualizer/DerivationViewerApplet.java
index 7904e8e..d6e7a35 100644
--- a/src/main/java/org/apache/joshua/ui/tree_visualizer/DerivationViewerApplet.java
+++ b/src/main/java/org/apache/joshua/ui/tree_visualizer/DerivationViewerApplet.java
@@ -16,13 +16,13 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package joshua.ui.tree_visualizer;
+package org.apache.joshua.ui.tree_visualizer;
 
 import java.awt.Color;
 
 import javax.swing.JApplet;
 
-import joshua.ui.tree_visualizer.tree.Tree;
+import org.apache.joshua.ui.tree_visualizer.tree.Tree;
 
 /**
  * An applet for viewing DerivationTrees. It consists of a DerivationViewer inside of the applet's
@@ -40,12 +40,12 @@ public class DerivationViewerApplet extends JApplet {
   public void init() {
     String source = getParameter("sourceSentence");
     String derivation = getParameter("derivationTree");
-		Tree tree = new Tree(derivation);
+    Tree tree = new Tree(derivation);
 
     add(new DerivationViewer(new DerivationTree(tree, source),
-					                   getSize(),
-														 Color.red,
-														 DerivationViewer.AnchorType.ANCHOR_ROOT));
+        getSize(),
+        Color.red,
+        DerivationViewer.AnchorType.ANCHOR_ROOT));
     return;
   }
 }

http://git-wip-us.apache.org/repos/asf/incubator-joshua/blob/89e22758/src/main/java/org/apache/joshua/ui/tree_visualizer/Node.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/joshua/ui/tree_visualizer/Node.java b/src/main/java/org/apache/joshua/ui/tree_visualizer/Node.java
index 846fc71..2ffeb06 100644
--- a/src/main/java/org/apache/joshua/ui/tree_visualizer/Node.java
+++ b/src/main/java/org/apache/joshua/ui/tree_visualizer/Node.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package joshua.ui.tree_visualizer;
+package org.apache.joshua.ui.tree_visualizer;
 
 /**
  * A representation of a node in a derivation tree. The derivation tree class itself is

http://git-wip-us.apache.org/repos/asf/incubator-joshua/blob/89e22758/src/main/java/org/apache/joshua/ui/tree_visualizer/browser/Browser.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/joshua/ui/tree_visualizer/browser/Browser.java b/src/main/java/org/apache/joshua/ui/tree_visualizer/browser/Browser.java
index bd5b592..10913f6 100644
--- a/src/main/java/org/apache/joshua/ui/tree_visualizer/browser/Browser.java
+++ b/src/main/java/org/apache/joshua/ui/tree_visualizer/browser/Browser.java
@@ -16,10 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package joshua.ui.tree_visualizer.browser;
-
-import joshua.ui.tree_visualizer.tree.Tree;
-import joshua.util.io.LineReader;
+package org.apache.joshua.ui.tree_visualizer.browser;
 
 import java.awt.BorderLayout;
 import java.awt.Color;
@@ -27,9 +24,9 @@ import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.io.File;
 import java.io.IOException;
-import java.util.List;
 import java.util.ArrayList;
 import java.util.Arrays;
+import java.util.List;
 import java.util.Scanner;
 
 import javax.swing.DefaultListModel;
@@ -38,10 +35,13 @@ import javax.swing.JList;
 import javax.swing.JScrollPane;
 import javax.swing.JTextField;
 import javax.swing.ListSelectionModel;
+import javax.swing.event.DocumentEvent;
+import javax.swing.event.DocumentListener;
 import javax.swing.event.ListSelectionEvent;
 import javax.swing.event.ListSelectionListener;
-import javax.swing.event.DocumentListener;
-import javax.swing.event.DocumentEvent;
+
+import org.apache.joshua.ui.tree_visualizer.tree.Tree;
+import org.apache.joshua.util.io.LineReader;
 
 public class Browser {
 

http://git-wip-us.apache.org/repos/asf/incubator-joshua/blob/89e22758/src/main/java/org/apache/joshua/ui/tree_visualizer/browser/DerivationTreeFrame.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/joshua/ui/tree_visualizer/browser/DerivationTreeFrame.java b/src/main/java/org/apache/joshua/ui/tree_visualizer/browser/DerivationTreeFrame.java
index a08b370..56366a0 100644
--- a/src/main/java/org/apache/joshua/ui/tree_visualizer/browser/DerivationTreeFrame.java
+++ b/src/main/java/org/apache/joshua/ui/tree_visualizer/browser/DerivationTreeFrame.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package joshua.ui.tree_visualizer.browser;
+package org.apache.joshua.ui.tree_visualizer.browser;
 
 import java.awt.BorderLayout;
 import java.awt.Color;
@@ -27,12 +27,12 @@ import java.awt.event.ActionListener;
 import javax.swing.JButton;
 import javax.swing.JFrame;
 import javax.swing.JLabel;
-import javax.swing.JPanel;
 import javax.swing.JList;
+import javax.swing.JPanel;
 
-import joshua.ui.tree_visualizer.DerivationTree;
-import joshua.ui.tree_visualizer.DerivationViewer;
-import joshua.ui.tree_visualizer.tree.Tree;
+import org.apache.joshua.ui.tree_visualizer.DerivationTree;
+import org.apache.joshua.ui.tree_visualizer.DerivationViewer;
+import org.apache.joshua.ui.tree_visualizer.tree.Tree;
 
 /**
  * A frame that displays a derivation tree.

http://git-wip-us.apache.org/repos/asf/incubator-joshua/blob/89e22758/src/main/java/org/apache/joshua/ui/tree_visualizer/browser/TranslationInfo.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/joshua/ui/tree_visualizer/browser/TranslationInfo.java b/src/main/java/org/apache/joshua/ui/tree_visualizer/browser/TranslationInfo.java
index 8fde26f..e23a89d 100644
--- a/src/main/java/org/apache/joshua/ui/tree_visualizer/browser/TranslationInfo.java
+++ b/src/main/java/org/apache/joshua/ui/tree_visualizer/browser/TranslationInfo.java
@@ -16,12 +16,12 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package joshua.ui.tree_visualizer.browser;
+package org.apache.joshua.ui.tree_visualizer.browser;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import joshua.ui.tree_visualizer.tree.Tree;
+import org.apache.joshua.ui.tree_visualizer.tree.Tree;
 
 class TranslationInfo {
   private String sourceSentence;

http://git-wip-us.apache.org/repos/asf/incubator-joshua/blob/89e22758/src/main/java/org/apache/joshua/ui/tree_visualizer/tree/Tree.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/joshua/ui/tree_visualizer/tree/Tree.java b/src/main/java/org/apache/joshua/ui/tree_visualizer/tree/Tree.java
index 409e30a..9eb586e 100644
--- a/src/main/java/org/apache/joshua/ui/tree_visualizer/tree/Tree.java
+++ b/src/main/java/org/apache/joshua/ui/tree_visualizer/tree/Tree.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package joshua.ui.tree_visualizer.tree;
+package org.apache.joshua.ui.tree_visualizer.tree;
 
 import java.util.Stack;
 import java.util.regex.Pattern;

http://git-wip-us.apache.org/repos/asf/incubator-joshua/blob/89e22758/src/main/java/org/apache/joshua/util/Algorithms.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/joshua/util/Algorithms.java b/src/main/java/org/apache/joshua/util/Algorithms.java
index 0f25ee2..93e8e55 100644
--- a/src/main/java/org/apache/joshua/util/Algorithms.java
+++ b/src/main/java/org/apache/joshua/util/Algorithms.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package joshua.util;
+package org.apache.joshua.util;
 
 public final class Algorithms {
 

http://git-wip-us.apache.org/repos/asf/incubator-joshua/blob/89e22758/src/main/java/org/apache/joshua/util/Bits.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/joshua/util/Bits.java b/src/main/java/org/apache/joshua/util/Bits.java
index 2b95a5e..d98415e 100644
--- a/src/main/java/org/apache/joshua/util/Bits.java
+++ b/src/main/java/org/apache/joshua/util/Bits.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package joshua.util;
+package org.apache.joshua.util;
 
 /**
  * Utility class for bit twiddling.

http://git-wip-us.apache.org/repos/asf/incubator-joshua/blob/89e22758/src/main/java/org/apache/joshua/util/BotMap.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/joshua/util/BotMap.java b/src/main/java/org/apache/joshua/util/BotMap.java
index 32dea01..1cc82b5 100644
--- a/src/main/java/org/apache/joshua/util/BotMap.java
+++ b/src/main/java/org/apache/joshua/util/BotMap.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package joshua.util;
+package org.apache.joshua.util;
 
 import java.util.Collection;
 import java.util.Collections;

http://git-wip-us.apache.org/repos/asf/incubator-joshua/blob/89e22758/src/main/java/org/apache/joshua/util/Cache.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/joshua/util/Cache.java b/src/main/java/org/apache/joshua/util/Cache.java
index 8da994b..4f1d555 100644
--- a/src/main/java/org/apache/joshua/util/Cache.java
+++ b/src/main/java/org/apache/joshua/util/Cache.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package joshua.util;
+package org.apache.joshua.util;
 
 // Imports
 import java.util.LinkedHashMap;

http://git-wip-us.apache.org/repos/asf/incubator-joshua/blob/89e22758/src/main/java/org/apache/joshua/util/ChartSpan.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/joshua/util/ChartSpan.java b/src/main/java/org/apache/joshua/util/ChartSpan.java
index 81c6aaa..42fe04d 100644
--- a/src/main/java/org/apache/joshua/util/ChartSpan.java
+++ b/src/main/java/org/apache/joshua/util/ChartSpan.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package joshua.util;
+package org.apache.joshua.util;
 
 /**
  * CKY-based decoding makes extensive use of charts, which maintain information about spans (i, j)

http://git-wip-us.apache.org/repos/asf/incubator-joshua/blob/89e22758/src/main/java/org/apache/joshua/util/CommandLineParser.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/joshua/util/CommandLineParser.java b/src/main/java/org/apache/joshua/util/CommandLineParser.java
index d79fd55..974b973 100644
--- a/src/main/java/org/apache/joshua/util/CommandLineParser.java
+++ b/src/main/java/org/apache/joshua/util/CommandLineParser.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package joshua.util;
+package org.apache.joshua.util;
 
 import java.util.Collection;
 import java.util.HashMap;

http://git-wip-us.apache.org/repos/asf/incubator-joshua/blob/89e22758/src/main/java/org/apache/joshua/util/CompareGrammars.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/joshua/util/CompareGrammars.java b/src/main/java/org/apache/joshua/util/CompareGrammars.java
index 109d7a1..c20e962 100644
--- a/src/main/java/org/apache/joshua/util/CompareGrammars.java
+++ b/src/main/java/org/apache/joshua/util/CompareGrammars.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package joshua.util;
+package org.apache.joshua.util;
 
 import java.io.File;
 import java.io.FileNotFoundException;
@@ -26,7 +26,7 @@ import java.util.Set;
 import java.util.logging.Level;
 import java.util.logging.Logger;
 
-import joshua.decoder.ff.tm.format.HieroFormatReader;
+import org.apache.joshua.decoder.ff.tm.format.HieroFormatReader;
 
 /**
  * This class allows two grammars (loaded from disk) to be compared.

http://git-wip-us.apache.org/repos/asf/incubator-joshua/blob/89e22758/src/main/java/org/apache/joshua/util/Counted.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/joshua/util/Counted.java b/src/main/java/org/apache/joshua/util/Counted.java
index 1014e12..eeb77c8 100644
--- a/src/main/java/org/apache/joshua/util/Counted.java
+++ b/src/main/java/org/apache/joshua/util/Counted.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package joshua.util;
+package org.apache.joshua.util;
 
 import java.util.Comparator;
 

http://git-wip-us.apache.org/repos/asf/incubator-joshua/blob/89e22758/src/main/java/org/apache/joshua/util/Counts.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/joshua/util/Counts.java b/src/main/java/org/apache/joshua/util/Counts.java
index 4a20009..3c44f02 100644
--- a/src/main/java/org/apache/joshua/util/Counts.java
+++ b/src/main/java/org/apache/joshua/util/Counts.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package joshua.util;
+package org.apache.joshua.util;
 
 import java.io.IOException;
 import java.io.ObjectInput;

http://git-wip-us.apache.org/repos/asf/incubator-joshua/blob/89e22758/src/main/java/org/apache/joshua/util/ExtractTopCand.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/joshua/util/ExtractTopCand.java b/src/main/java/org/apache/joshua/util/ExtractTopCand.java
index c24f970..de1d247 100644
--- a/src/main/java/org/apache/joshua/util/ExtractTopCand.java
+++ b/src/main/java/org/apache/joshua/util/ExtractTopCand.java
@@ -16,15 +16,15 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package joshua.util;
+package org.apache.joshua.util;
 
 import java.io.BufferedWriter;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.OutputStreamWriter;
 
-import joshua.util.io.IndexedReader;
-import joshua.util.io.LineReader;
+import org.apache.joshua.util.io.IndexedReader;
+import org.apache.joshua.util.io.LineReader;
 
 
 /**

http://git-wip-us.apache.org/repos/asf/incubator-joshua/blob/89e22758/src/main/java/org/apache/joshua/util/FileUtility.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/joshua/util/FileUtility.java b/src/main/java/org/apache/joshua/util/FileUtility.java
index 0685655..db6e9d9 100644
--- a/src/main/java/org/apache/joshua/util/FileUtility.java
+++ b/src/main/java/org/apache/joshua/util/FileUtility.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package joshua.util;
+package org.apache.joshua.util;
 
 import java.io.BufferedReader;
 import java.io.BufferedWriter;

http://git-wip-us.apache.org/repos/asf/incubator-joshua/blob/89e22758/src/main/java/org/apache/joshua/util/FormatUtils.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/joshua/util/FormatUtils.java b/src/main/java/org/apache/joshua/util/FormatUtils.java
index 67b2bf3..b7cc5e2 100644
--- a/src/main/java/org/apache/joshua/util/FormatUtils.java
+++ b/src/main/java/org/apache/joshua/util/FormatUtils.java
@@ -16,13 +16,13 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package joshua.util;
+package org.apache.joshua.util;
 
 import java.io.PrintStream;
 import java.io.UnsupportedEncodingException;
 import java.util.regex.Pattern;
 
-import joshua.corpus.Vocabulary;
+import org.apache.joshua.corpus.Vocabulary;
 
 /**
  * Utility class for format issues.

http://git-wip-us.apache.org/repos/asf/incubator-joshua/blob/89e22758/src/main/java/org/apache/joshua/util/IntegerPair.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/joshua/util/IntegerPair.java b/src/main/java/org/apache/joshua/util/IntegerPair.java
index 08cefe1..bfbfa23 100644
--- a/src/main/java/org/apache/joshua/util/IntegerPair.java
+++ b/src/main/java/org/apache/joshua/util/IntegerPair.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package joshua.util;
+package org.apache.joshua.util;
 
 /**
  * Memory-efficient implementation of an integer tuple.

http://git-wip-us.apache.org/repos/asf/incubator-joshua/blob/89e22758/src/main/java/org/apache/joshua/util/JoshuaEval.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/joshua/util/JoshuaEval.java b/src/main/java/org/apache/joshua/util/JoshuaEval.java
index 6c0761a..2a0b44c 100644
--- a/src/main/java/org/apache/joshua/util/JoshuaEval.java
+++ b/src/main/java/org/apache/joshua/util/JoshuaEval.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package joshua.util;
+package org.apache.joshua.util;
 
 import java.io.BufferedReader;
 import java.io.File;
@@ -29,7 +29,7 @@ import java.io.InputStreamReader;
 import java.text.DecimalFormat;
 import java.util.TreeSet;
 
-import joshua.metrics.EvaluationMetric;
+import org.apache.joshua.metrics.EvaluationMetric;
 
 public class JoshuaEval {
   final static DecimalFormat f4 = new DecimalFormat("###0.0000");

http://git-wip-us.apache.org/repos/asf/incubator-joshua/blob/89e22758/src/main/java/org/apache/joshua/util/ListUtil.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/joshua/util/ListUtil.java b/src/main/java/org/apache/joshua/util/ListUtil.java
index 0ef5190..ab2109d 100644
--- a/src/main/java/org/apache/joshua/util/ListUtil.java
+++ b/src/main/java/org/apache/joshua/util/ListUtil.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package joshua.util;
+package org.apache.joshua.util;
 
 import java.util.List;
 

http://git-wip-us.apache.org/repos/asf/incubator-joshua/blob/89e22758/src/main/java/org/apache/joshua/util/Lists.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/joshua/util/Lists.java b/src/main/java/org/apache/joshua/util/Lists.java
index 43ffa00..d62d1aa 100644
--- a/src/main/java/org/apache/joshua/util/Lists.java
+++ b/src/main/java/org/apache/joshua/util/Lists.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package joshua.util;
+package org.apache.joshua.util;
 
 import java.util.Iterator;
 import java.util.NoSuchElementException;

http://git-wip-us.apache.org/repos/asf/incubator-joshua/blob/89e22758/src/main/java/org/apache/joshua/util/NBestListUtility.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/joshua/util/NBestListUtility.java b/src/main/java/org/apache/joshua/util/NBestListUtility.java
index 257f3c0..08c85ba 100644
--- a/src/main/java/org/apache/joshua/util/NBestListUtility.java
+++ b/src/main/java/org/apache/joshua/util/NBestListUtility.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package joshua.util;
+package org.apache.joshua.util;
 
 import java.util.ArrayList;
 import java.util.List;

http://git-wip-us.apache.org/repos/asf/incubator-joshua/blob/89e22758/src/main/java/org/apache/joshua/util/Ngram.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/joshua/util/Ngram.java b/src/main/java/org/apache/joshua/util/Ngram.java
index 7ee1703..bb58457 100644
--- a/src/main/java/org/apache/joshua/util/Ngram.java
+++ b/src/main/java/org/apache/joshua/util/Ngram.java
@@ -16,12 +16,12 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package joshua.util;
+package org.apache.joshua.util;
 
 import java.util.List;
 import java.util.Map;
 
-import joshua.corpus.Vocabulary;
+import org.apache.joshua.corpus.Vocabulary;
 
 /**
  * Provides convenience functions for extracting all ngrams from a sentence, represented as an array

http://git-wip-us.apache.org/repos/asf/incubator-joshua/blob/89e22758/src/main/java/org/apache/joshua/util/NullIterator.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/joshua/util/NullIterator.java b/src/main/java/org/apache/joshua/util/NullIterator.java
index ca0b8dd..0c1c8a3 100644
--- a/src/main/java/org/apache/joshua/util/NullIterator.java
+++ b/src/main/java/org/apache/joshua/util/NullIterator.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package joshua.util;
+package org.apache.joshua.util;
 
 import java.util.Iterator;
 import java.util.NoSuchElementException;

http://git-wip-us.apache.org/repos/asf/incubator-joshua/blob/89e22758/src/main/java/org/apache/joshua/util/PackedGrammarServer.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/joshua/util/PackedGrammarServer.java b/src/main/java/org/apache/joshua/util/PackedGrammarServer.java
index 3eb6eaf..74c8e4a 100644
--- a/src/main/java/org/apache/joshua/util/PackedGrammarServer.java
+++ b/src/main/java/org/apache/joshua/util/PackedGrammarServer.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package joshua.util;
+package org.apache.joshua.util;
 
 import java.io.FileNotFoundException;
 import java.io.IOException;
@@ -24,12 +24,12 @@ import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
 
-import joshua.corpus.Vocabulary;
-import joshua.decoder.JoshuaConfiguration;
-import joshua.decoder.ff.tm.Rule;
-import joshua.decoder.ff.tm.Trie;
-import joshua.decoder.ff.tm.packed.PackedGrammar;
-import joshua.util.io.LineReader;
+import org.apache.joshua.corpus.Vocabulary;
+import org.apache.joshua.decoder.JoshuaConfiguration;
+import org.apache.joshua.decoder.ff.tm.Rule;
+import org.apache.joshua.decoder.ff.tm.Trie;
+import org.apache.joshua.decoder.ff.tm.packed.PackedGrammar;
+import org.apache.joshua.util.io.LineReader;
 
 public class PackedGrammarServer {
 

http://git-wip-us.apache.org/repos/asf/incubator-joshua/blob/89e22758/src/main/java/org/apache/joshua/util/Pair.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/joshua/util/Pair.java b/src/main/java/org/apache/joshua/util/Pair.java
index 08bf08c..2dd536d 100644
--- a/src/main/java/org/apache/joshua/util/Pair.java
+++ b/src/main/java/org/apache/joshua/util/Pair.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package joshua.util;
+package org.apache.joshua.util;
 
 /**
  * Represents a pair of elements.

http://git-wip-us.apache.org/repos/asf/incubator-joshua/blob/89e22758/src/main/java/org/apache/joshua/util/Platform.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/joshua/util/Platform.java b/src/main/java/org/apache/joshua/util/Platform.java
index a14ee7e..22089da 100644
--- a/src/main/java/org/apache/joshua/util/Platform.java
+++ b/src/main/java/org/apache/joshua/util/Platform.java
@@ -16,11 +16,10 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package joshua.util;
+package org.apache.joshua.util;
 
 public class Platform {
 
-
   public static boolean isMac() {
     return System.getProperties().getProperty("os.name").toLowerCase().indexOf("mac") != -1;
   }

http://git-wip-us.apache.org/repos/asf/incubator-joshua/blob/89e22758/src/main/java/org/apache/joshua/util/QuietFormatter.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/joshua/util/QuietFormatter.java b/src/main/java/org/apache/joshua/util/QuietFormatter.java
index f8340a1..7220080 100644
--- a/src/main/java/org/apache/joshua/util/QuietFormatter.java
+++ b/src/main/java/org/apache/joshua/util/QuietFormatter.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package joshua.util;
+package org.apache.joshua.util;
 
 import java.util.logging.Formatter;
 import java.util.logging.LogRecord;

http://git-wip-us.apache.org/repos/asf/incubator-joshua/blob/89e22758/src/main/java/org/apache/joshua/util/Regex.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/joshua/util/Regex.java b/src/main/java/org/apache/joshua/util/Regex.java
index 91df031..2defe80 100644
--- a/src/main/java/org/apache/joshua/util/Regex.java
+++ b/src/main/java/org/apache/joshua/util/Regex.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package joshua.util;
+package org.apache.joshua.util;
 
 import java.util.regex.Pattern;
 import java.util.regex.PatternSyntaxException;

http://git-wip-us.apache.org/repos/asf/incubator-joshua/blob/89e22758/src/main/java/org/apache/joshua/util/ReverseOrder.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/joshua/util/ReverseOrder.java b/src/main/java/org/apache/joshua/util/ReverseOrder.java
index 32b0c58..0270036 100644
--- a/src/main/java/org/apache/joshua/util/ReverseOrder.java
+++ b/src/main/java/org/apache/joshua/util/ReverseOrder.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package joshua.util;
+package org.apache.joshua.util;
 
 import java.util.Comparator;
 

http://git-wip-us.apache.org/repos/asf/incubator-joshua/blob/89e22758/src/main/java/org/apache/joshua/util/SampledList.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/joshua/util/SampledList.java b/src/main/java/org/apache/joshua/util/SampledList.java
index 0aab3bd..60b0ef9 100644
--- a/src/main/java/org/apache/joshua/util/SampledList.java
+++ b/src/main/java/org/apache/joshua/util/SampledList.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package joshua.util;
+package org.apache.joshua.util;
 
 import java.util.AbstractList;
 import java.util.List;

http://git-wip-us.apache.org/repos/asf/incubator-joshua/blob/89e22758/src/main/java/org/apache/joshua/util/SocketUtility.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/joshua/util/SocketUtility.java b/src/main/java/org/apache/joshua/util/SocketUtility.java
index db12a21..965a606 100644
--- a/src/main/java/org/apache/joshua/util/SocketUtility.java
+++ b/src/main/java/org/apache/joshua/util/SocketUtility.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package joshua.util;
+package org.apache.joshua.util;
 
 import java.io.BufferedReader;
 import java.io.DataInputStream;
@@ -31,7 +31,6 @@ import java.net.SocketAddress;
 import java.net.SocketTimeoutException;
 import java.net.UnknownHostException;
 
-
 /**
  * 
  * @author Zhifei Li, <zh...@gmail.com>

http://git-wip-us.apache.org/repos/asf/incubator-joshua/blob/89e22758/src/main/java/org/apache/joshua/util/StreamGobbler.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/joshua/util/StreamGobbler.java b/src/main/java/org/apache/joshua/util/StreamGobbler.java
index 965d926..7bb12ca 100644
--- a/src/main/java/org/apache/joshua/util/StreamGobbler.java
+++ b/src/main/java/org/apache/joshua/util/StreamGobbler.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package joshua.util;
+package org.apache.joshua.util;
 
 import java.io.BufferedReader;
 import java.io.IOException;

http://git-wip-us.apache.org/repos/asf/incubator-joshua/blob/89e22758/src/main/java/org/apache/joshua/util/UnicodeCharacterName.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/joshua/util/UnicodeCharacterName.java b/src/main/java/org/apache/joshua/util/UnicodeCharacterName.java
index 06b4b88..93c759e 100644
--- a/src/main/java/org/apache/joshua/util/UnicodeCharacterName.java
+++ b/src/main/java/org/apache/joshua/util/UnicodeCharacterName.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package joshua.util;
+package org.apache.joshua.util;
 
 import java.util.HashMap;
 import java.util.Map;

http://git-wip-us.apache.org/repos/asf/incubator-joshua/blob/89e22758/src/main/java/org/apache/joshua/util/encoding/Analyzer.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/joshua/util/encoding/Analyzer.java b/src/main/java/org/apache/joshua/util/encoding/Analyzer.java
index e85c133..ad2910c 100644
--- a/src/main/java/org/apache/joshua/util/encoding/Analyzer.java
+++ b/src/main/java/org/apache/joshua/util/encoding/Analyzer.java
@@ -16,14 +16,14 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package joshua.util.encoding;
+package org.apache.joshua.util.encoding;
 
 import java.io.IOException;
 import java.nio.ByteBuffer;
 import java.util.ArrayList;
 import java.util.TreeMap;
 
-import joshua.util.io.LineReader;
+import org.apache.joshua.util.io.LineReader;
 
 public class Analyzer {
 

http://git-wip-us.apache.org/repos/asf/incubator-joshua/blob/89e22758/src/main/java/org/apache/joshua/util/encoding/EightBitQuantizer.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/joshua/util/encoding/EightBitQuantizer.java b/src/main/java/org/apache/joshua/util/encoding/EightBitQuantizer.java
index 2a8e014..5876d4f 100644
--- a/src/main/java/org/apache/joshua/util/encoding/EightBitQuantizer.java
+++ b/src/main/java/org/apache/joshua/util/encoding/EightBitQuantizer.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package joshua.util.encoding;
+package org.apache.joshua.util.encoding;
 
 import java.io.DataInputStream;
 import java.io.DataOutputStream;

http://git-wip-us.apache.org/repos/asf/incubator-joshua/blob/89e22758/src/main/java/org/apache/joshua/util/encoding/EncoderConfiguration.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/joshua/util/encoding/EncoderConfiguration.java b/src/main/java/org/apache/joshua/util/encoding/EncoderConfiguration.java
index 6cabf09..5f71f90 100644
--- a/src/main/java/org/apache/joshua/util/encoding/EncoderConfiguration.java
+++ b/src/main/java/org/apache/joshua/util/encoding/EncoderConfiguration.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package joshua.util.encoding;
+package org.apache.joshua.util.encoding;
 
 import java.io.BufferedInputStream;
 import java.io.DataInputStream;
@@ -27,7 +27,7 @@ import java.nio.ByteBuffer;
 import java.util.HashMap;
 import java.util.Map;
 
-import joshua.corpus.Vocabulary;
+import org.apache.joshua.corpus.Vocabulary;
 
 public class EncoderConfiguration {
 

http://git-wip-us.apache.org/repos/asf/incubator-joshua/blob/89e22758/src/main/java/org/apache/joshua/util/encoding/EncoderFactory.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/joshua/util/encoding/EncoderFactory.java b/src/main/java/org/apache/joshua/util/encoding/EncoderFactory.java
index 1cb25e2..a1f93d0 100644
--- a/src/main/java/org/apache/joshua/util/encoding/EncoderFactory.java
+++ b/src/main/java/org/apache/joshua/util/encoding/EncoderFactory.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package joshua.util.encoding;
+package org.apache.joshua.util.encoding;
 
 public class EncoderFactory {
 

http://git-wip-us.apache.org/repos/asf/incubator-joshua/blob/89e22758/src/main/java/org/apache/joshua/util/encoding/FeatureTypeAnalyzer.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/joshua/util/encoding/FeatureTypeAnalyzer.java b/src/main/java/org/apache/joshua/util/encoding/FeatureTypeAnalyzer.java
index 4a8861c..f480ec1 100644
--- a/src/main/java/org/apache/joshua/util/encoding/FeatureTypeAnalyzer.java
+++ b/src/main/java/org/apache/joshua/util/encoding/FeatureTypeAnalyzer.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package joshua.util.encoding;
+package org.apache.joshua.util.encoding;
 
 import java.io.BufferedOutputStream;
 import java.io.DataOutputStream;
@@ -30,8 +30,8 @@ import java.util.List;
 import java.util.Map;
 import java.util.logging.Logger;
 
-import joshua.corpus.Vocabulary;
-import joshua.util.io.LineReader;
+import org.apache.joshua.corpus.Vocabulary;
+import org.apache.joshua.util.io.LineReader;
 
 public class FeatureTypeAnalyzer {
 

http://git-wip-us.apache.org/repos/asf/incubator-joshua/blob/89e22758/src/main/java/org/apache/joshua/util/encoding/FloatEncoder.java
----------------------------------------------------------------------
diff --git a/src/main/java/org/apache/joshua/util/encoding/FloatEncoder.java b/src/main/java/org/apache/joshua/util/encoding/FloatEncoder.java
index 9841db3..5121ea2 100644
--- a/src/main/java/org/apache/joshua/util/encoding/FloatEncoder.java
+++ b/src/main/java/org/apache/joshua/util/encoding/FloatEncoder.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package joshua.util.encoding;
+package org.apache.joshua.util.encoding;
 
 import java.io.DataInputStream;
 import java.io.DataOutputStream;