Merge pull request #1656 from OpenRefine/issue/1648

fix the template load issue and package typo

extensions/database/src/com/google/refine/extension/database/DatabaseImportController.java

@@ -55,7 +55,7 @@ import com.google.refine.importing.ImportingController;
 import com.google.refine.importing.ImportingJob;
 import com.google.refine.importing.ImportingManager;
 import com.google.refine.model.Project;
-import com.google.refine.model.medadata.ProjectMetadata;
+import com.google.refine.model.metadata.ProjectMetadata;
 import com.google.refine.util.JSONUtilities;
 import com.google.refine.util.ParsingUtilities;
 

extensions/database/test/com/google/refine/extension/database/DatabaseImportControllerTest.java

@@ -25,7 +25,6 @@ import org.testng.annotations.Parameters;
 import org.testng.annotations.Test;
 
 import com.google.refine.ProjectManager;
-import com.google.refine.model.medadata.ProjectMetadata;
 import com.google.refine.RefineServlet;
 import com.google.refine.extension.database.mysql.MySQLDatabaseService;
 import com.google.refine.extension.database.stub.RefineDbServletStub;
@@ -33,6 +32,7 @@ import com.google.refine.importing.ImportingJob;
 import com.google.refine.importing.ImportingManager;
 import com.google.refine.io.FileProjectManager;
 import com.google.refine.model.Project;
+import com.google.refine.model.metadata.ProjectMetadata;
 
 
 

extensions/database/test/com/google/refine/extension/database/cmd/SavedConnectionCommandTest.java

@@ -25,7 +25,6 @@ import org.testng.annotations.Parameters;
 import org.testng.annotations.Test;
 
 import com.google.refine.ProjectManager;
-import com.google.refine.model.medadata.ProjectMetadata;
 import com.google.refine.RefineServlet;
 import com.google.refine.extension.database.DBExtensionTestUtils;
 import com.google.refine.extension.database.DBExtensionTests;
@@ -36,6 +35,7 @@ import com.google.refine.extension.database.stub.RefineDbServletStub;
 import com.google.refine.importing.ImportingManager;
 import com.google.refine.io.FileProjectManager;
 import com.google.refine.model.Project;
+import com.google.refine.model.metadata.ProjectMetadata;
 
 public class SavedConnectionCommandTest extends DBExtensionTests{
     

extensions/gdata/src/com/google/refine/extension/gdata/FusionTableImporter.java

@@ -43,7 +43,7 @@ import com.google.refine.importers.TabularImportingParserBase;
 import com.google.refine.importers.TabularImportingParserBase.TableDataReader;
 import com.google.refine.importing.ImportingJob;
 import com.google.refine.model.Project;
-import com.google.refine.model.medadata.ProjectMetadata;
+import com.google.refine.model.metadata.ProjectMetadata;
 import com.google.refine.util.JSONUtilities;
 
 /**

extensions/gdata/src/com/google/refine/extension/gdata/GDataImporter.java

@@ -19,7 +19,7 @@ import com.google.refine.importers.TabularImportingParserBase;
 import com.google.refine.importers.TabularImportingParserBase.TableDataReader;
 import com.google.refine.importing.ImportingJob;
 import com.google.refine.model.Project;
-import com.google.refine.model.medadata.ProjectMetadata;
+import com.google.refine.model.metadata.ProjectMetadata;
 import com.google.refine.util.JSONUtilities;
 
 public class GDataImporter {

extensions/gdata/src/com/google/refine/extension/gdata/GDataImportingController.java

@@ -37,7 +37,7 @@ import com.google.refine.importing.ImportingController;
 import com.google.refine.importing.ImportingJob;
 import com.google.refine.importing.ImportingManager;
 import com.google.refine.model.Project;
-import com.google.refine.model.medadata.ProjectMetadata;
+import com.google.refine.model.metadata.ProjectMetadata;
 import com.google.refine.util.JSONUtilities;
 import com.google.refine.util.ParsingUtilities;
 

extensions/pc-axis/src/com/google/refine/pcaxis/PCAxisImporter.java

@@ -44,7 +44,7 @@ import org.slf4j.LoggerFactory;
 import com.google.refine.importers.TabularImportingParserBase;
 import com.google.refine.importing.ImportingJob;
 import com.google.refine.model.Project;
-import com.google.refine.model.medadata.ProjectMetadata;
+import com.google.refine.model.metadata.ProjectMetadata;
 import com.google.refine.util.JSONUtilities;
 
 public class PCAxisImporter extends TabularImportingParserBase {

main/src/com/google/refine/ProjectManager.java

@@ -56,8 +56,8 @@ import org.slf4j.LoggerFactory;
 
 import com.google.refine.history.HistoryEntryManager;
 import com.google.refine.model.Project;
-import com.google.refine.model.medadata.IMetadata;
+import com.google.refine.model.metadata.IMetadata;
-import com.google.refine.model.medadata.ProjectMetadata;
+import com.google.refine.model.metadata.ProjectMetadata;
 import com.google.refine.preference.PreferenceStore;
 import com.google.refine.preference.TopList;
 

main/src/com/google/refine/commands/Command.java

@@ -56,7 +56,7 @@ import com.google.refine.RefineServlet;
 import com.google.refine.browsing.Engine;
 import com.google.refine.history.HistoryEntry;
 import com.google.refine.model.Project;
-import com.google.refine.model.medadata.ProjectMetadata;
+import com.google.refine.model.metadata.ProjectMetadata;
 import com.google.refine.process.Process;
 import com.google.refine.util.ParsingUtilities;
 

main/src/com/google/refine/commands/project/DeleteProjectCommand.java

@@ -42,7 +42,7 @@ import javax.servlet.http.HttpServletResponse;
 
 import com.google.refine.ProjectManager;
 import com.google.refine.commands.Command;
-import com.google.refine.model.medadata.ProjectMetadata;
+import com.google.refine.model.metadata.ProjectMetadata;
 
 public class DeleteProjectCommand extends Command {
 

main/src/com/google/refine/commands/project/GetMetadataCommand.java

@@ -11,9 +11,9 @@ import org.json.JSONException;
 
 import com.google.refine.commands.Command;
 import com.google.refine.model.Project;
-import com.google.refine.model.medadata.IMetadata;
+import com.google.refine.model.metadata.IMetadata;
-import com.google.refine.model.medadata.MetadataFactory;
+import com.google.refine.model.metadata.MetadataFactory;
-import com.google.refine.model.medadata.MetadataFormat;
+import com.google.refine.model.metadata.MetadataFormat;
 
 public class GetMetadataCommand extends Command {
     @Override

main/src/com/google/refine/commands/project/ImportProjectCommand.java

@@ -53,7 +53,7 @@ import org.slf4j.LoggerFactory;
 import com.google.refine.ProjectManager;
 import com.google.refine.commands.Command;
 import com.google.refine.model.Project;
-import com.google.refine.model.medadata.ProjectMetadata;
+import com.google.refine.model.metadata.ProjectMetadata;
 import com.google.refine.util.ParsingUtilities;
 
 public class ImportProjectCommand extends Command {

main/src/com/google/refine/commands/project/PackageProjectCommand.java

@@ -20,8 +20,8 @@ import com.google.refine.browsing.Engine;
 import com.google.refine.commands.Command;
 import com.google.refine.exporters.CsvExporter;
 import com.google.refine.model.Project;
-import com.google.refine.model.medadata.DataPackageMetadata;
+import com.google.refine.model.metadata.DataPackageMetadata;
-import com.google.refine.model.medadata.PackageExtension;
+import com.google.refine.model.metadata.PackageExtension;
 
 public class PackageProjectCommand extends Command {
     @Override

main/src/com/google/refine/commands/project/RenameProjectCommand.java

@@ -40,7 +40,7 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
 import com.google.refine.commands.Command;
-import com.google.refine.model.medadata.ProjectMetadata;
+import com.google.refine.model.metadata.ProjectMetadata;
 
 public class RenameProjectCommand extends Command {
     @Override

main/src/com/google/refine/commands/project/SetProjectMetadataCommand.java

@@ -11,7 +11,7 @@ import org.json.JSONException;
 import com.google.refine.ProjectManager;
 import com.google.refine.commands.Command;
 import com.google.refine.model.Project;
-import com.google.refine.model.medadata.ProjectMetadata;
+import com.google.refine.model.metadata.ProjectMetadata;
 
 public class SetProjectMetadataCommand extends Command {
     @Override

main/src/com/google/refine/commands/project/SetProjectTagsCommand.java

@@ -39,7 +39,7 @@ import org.json.JSONException;
 import com.google.refine.ProjectManager;
 import com.google.refine.commands.Command;
 import com.google.refine.model.Project;
-import com.google.refine.model.medadata.ProjectMetadata;
+import com.google.refine.model.metadata.ProjectMetadata;
 
 public class SetProjectTagsCommand extends Command {
   @Override

main/src/com/google/refine/commands/project/ValidateSchemaCommand.java

@@ -12,7 +12,7 @@ import org.json.JSONObject;
 import com.google.refine.ProjectManager;
 import com.google.refine.commands.Command;
 import com.google.refine.model.Project;
-import com.google.refine.model.medadata.validator.ValidateOperation;
+import com.google.refine.model.metadata.validator.ValidateOperation;
 import com.google.refine.util.ParsingUtilities;
 
 public class ValidateSchemaCommand extends Command {

main/src/com/google/refine/commands/workspace/GetAllProjectMetadataCommand.java

@@ -48,7 +48,7 @@ import org.json.JSONWriter;
 
 import com.google.refine.ProjectManager;
 import com.google.refine.commands.Command;
-import com.google.refine.model.medadata.ProjectMetadata;
+import com.google.refine.model.metadata.ProjectMetadata;
 
 public class GetAllProjectMetadataCommand extends Command {
     @Override

main/src/com/google/refine/expr/functions/strings/Reinterpret.java

@@ -44,7 +44,7 @@ import com.google.refine.expr.EvalError;
 import com.google.refine.grel.ControlFunctionRegistry;
 import com.google.refine.grel.Function;
 import com.google.refine.model.Project;
-import com.google.refine.model.medadata.ProjectMetadata;
+import com.google.refine.model.metadata.ProjectMetadata;
 
 public class Reinterpret implements Function {
 

main/src/com/google/refine/importers/ExcelImporter.java

@@ -66,7 +66,7 @@ import com.google.refine.model.Cell;
 import com.google.refine.model.Project;
 import com.google.refine.model.Recon;
 import com.google.refine.model.Recon.Judgment;
-import com.google.refine.model.medadata.ProjectMetadata;
+import com.google.refine.model.metadata.ProjectMetadata;
 import com.google.refine.model.ReconCandidate;
 import com.google.refine.util.JSONUtilities;
 

main/src/com/google/refine/importers/FixedWidthImporter.java

@@ -17,7 +17,7 @@ import org.json.JSONObject;
 import com.google.refine.importing.ImportingJob;
 import com.google.refine.importing.ImportingUtilities;
 import com.google.refine.model.Project;
-import com.google.refine.model.medadata.ProjectMetadata;
+import com.google.refine.model.metadata.ProjectMetadata;
 import com.google.refine.util.JSONUtilities;
 
 public class FixedWidthImporter extends TabularImportingParserBase {

main/src/com/google/refine/importers/ImportingParserBase.java

@@ -51,7 +51,7 @@ import com.google.refine.importing.ImportingUtilities;
 import com.google.refine.model.Column;
 import com.google.refine.model.ModelException;
 import com.google.refine.model.Project;
-import com.google.refine.model.medadata.ProjectMetadata;
+import com.google.refine.model.metadata.ProjectMetadata;
 import com.google.refine.util.JSONUtilities;
 
 abstract public class ImportingParserBase implements ImportingParser {

main/src/com/google/refine/importers/JsonImporter.java

@@ -56,7 +56,7 @@ import com.google.refine.importers.tree.TreeReaderException;
 import com.google.refine.importing.ImportingJob;
 import com.google.refine.importing.ImportingUtilities;
 import com.google.refine.model.Project;
-import com.google.refine.model.medadata.ProjectMetadata;
+import com.google.refine.model.metadata.ProjectMetadata;
 import com.google.refine.util.JSONUtilities;
 
 public class JsonImporter extends TreeImportingParserBase {

main/src/com/google/refine/importers/LineBasedImporter.java

@@ -12,7 +12,7 @@ import org.slf4j.LoggerFactory;
 
 import com.google.refine.importing.ImportingJob;
 import com.google.refine.model.Project;
-import com.google.refine.model.medadata.ProjectMetadata;
+import com.google.refine.model.metadata.ProjectMetadata;
 import com.google.refine.util.JSONUtilities;
 
 public class LineBasedImporter extends TabularImportingParserBase {

main/src/com/google/refine/importers/OdsImporter.java

@@ -61,7 +61,7 @@ import com.google.refine.model.Cell;
 import com.google.refine.model.Project;
 import com.google.refine.model.Recon;
 import com.google.refine.model.Recon.Judgment;
-import com.google.refine.model.medadata.ProjectMetadata;
+import com.google.refine.model.metadata.ProjectMetadata;
 import com.google.refine.model.ReconCandidate;
 import com.google.refine.util.JSONUtilities;
 

main/src/com/google/refine/importers/RdfTripleImporter.java

@@ -53,7 +53,7 @@ import com.google.refine.model.Column;
 import com.google.refine.model.ModelException;
 import com.google.refine.model.Project;
 import com.google.refine.model.Row;
-import com.google.refine.model.medadata.ProjectMetadata;
+import com.google.refine.model.metadata.ProjectMetadata;
 
 public class RdfTripleImporter extends ImportingParserBase {
     private Mode mode;

main/src/com/google/refine/importers/SeparatorBasedImporter.java

@@ -59,7 +59,7 @@ import au.com.bytecode.opencsv.CSVParser;
 import com.google.refine.importing.ImportingJob;
 import com.google.refine.importing.ImportingUtilities;
 import com.google.refine.model.Project;
-import com.google.refine.model.medadata.ProjectMetadata;
+import com.google.refine.model.metadata.ProjectMetadata;
 import com.google.refine.util.JSONUtilities;
 
 public class SeparatorBasedImporter extends TabularImportingParserBase {

main/src/com/google/refine/importers/TabularImportingParserBase.java

@@ -47,7 +47,7 @@ import com.google.refine.model.Cell;
 import com.google.refine.model.Column;
 import com.google.refine.model.Project;
 import com.google.refine.model.Row;
-import com.google.refine.model.medadata.ProjectMetadata;
+import com.google.refine.model.metadata.ProjectMetadata;
 import com.google.refine.util.JSONUtilities;
 
 abstract public class TabularImportingParserBase extends ImportingParserBase {

main/src/com/google/refine/importers/WikitextImporter.java

@@ -63,7 +63,7 @@ import com.google.refine.model.Column;
 import com.google.refine.model.Project;
 import com.google.refine.model.Recon;
 import com.google.refine.model.ReconStats;
-import com.google.refine.model.medadata.ProjectMetadata;
+import com.google.refine.model.metadata.ProjectMetadata;
 import com.google.refine.model.recon.StandardReconConfig.ColumnDetail;
 import com.google.refine.util.JSONUtilities;
 import com.google.refine.model.recon.StandardReconConfig;

main/src/com/google/refine/importers/XmlImporter.java

@@ -58,7 +58,7 @@ import com.google.refine.importers.tree.TreeReaderException;
 import com.google.refine.importing.ImportingJob;
 import com.google.refine.importing.ImportingUtilities;
 import com.google.refine.model.Project;
-import com.google.refine.model.medadata.ProjectMetadata;
+import com.google.refine.model.metadata.ProjectMetadata;
 import com.google.refine.util.JSONUtilities;
 
 public class XmlImporter extends TreeImportingParserBase {

main/src/com/google/refine/importers/tree/TreeImportingParserBase.java

@@ -48,7 +48,7 @@ import com.google.refine.importers.ImportingParserBase;
 import com.google.refine.importing.ImportingJob;
 import com.google.refine.importing.ImportingUtilities;
 import com.google.refine.model.Project;
-import com.google.refine.model.medadata.ProjectMetadata;
+import com.google.refine.model.metadata.ProjectMetadata;
 import com.google.refine.util.JSONUtilities;
 
 /**

main/src/com/google/refine/importing/ImportingJob.java

@@ -48,7 +48,7 @@ import org.json.JSONWriter;
 import com.google.refine.Jsonizable;
 import com.google.refine.ProjectManager;
 import com.google.refine.model.Project;
-import com.google.refine.model.medadata.ProjectMetadata;
+import com.google.refine.model.metadata.ProjectMetadata;
 import com.google.refine.util.JSONUtilities;
 
 

main/src/com/google/refine/importing/ImportingParser.java

@@ -38,7 +38,7 @@ import java.util.List;
 import org.json.JSONObject;
 
 import com.google.refine.model.Project;
-import com.google.refine.model.medadata.ProjectMetadata;
+import com.google.refine.model.metadata.ProjectMetadata;
 
 public interface ImportingParser {
     /**

main/src/com/google/refine/importing/ImportingUtilities.java

@@ -97,12 +97,12 @@ import com.google.refine.model.Column;
 import com.google.refine.model.ColumnModel;
 import com.google.refine.model.Project;
 import com.google.refine.model.Row;
-import com.google.refine.model.medadata.DataPackageMetadata;
+import com.google.refine.model.metadata.DataPackageMetadata;
-import com.google.refine.model.medadata.IMetadata;
+import com.google.refine.model.metadata.IMetadata;
-import com.google.refine.model.medadata.MetadataFactory;
+import com.google.refine.model.metadata.MetadataFactory;
-import com.google.refine.model.medadata.MetadataFormat;
+import com.google.refine.model.metadata.MetadataFormat;
-import com.google.refine.model.medadata.PackageExtension;
+import com.google.refine.model.metadata.PackageExtension;
-import com.google.refine.model.medadata.ProjectMetadata;
+import com.google.refine.model.metadata.ProjectMetadata;
 import com.google.refine.preference.PreferenceStore;
 import com.google.refine.util.JSONUtilities;
 

main/src/com/google/refine/io/FileProjectManager.java

@@ -60,10 +60,10 @@ import org.slf4j.LoggerFactory;
 import com.google.refine.ProjectManager;
 import com.google.refine.history.HistoryEntryManager;
 import com.google.refine.model.Project;
-import com.google.refine.model.medadata.DataPackageMetadata;
+import com.google.refine.model.metadata.DataPackageMetadata;
-import com.google.refine.model.medadata.IMetadata;
+import com.google.refine.model.metadata.IMetadata;
-import com.google.refine.model.medadata.MetadataFormat;
+import com.google.refine.model.metadata.MetadataFormat;
-import com.google.refine.model.medadata.ProjectMetadata;
+import com.google.refine.model.metadata.ProjectMetadata;
 import com.google.refine.preference.TopList;
 
 

main/src/com/google/refine/io/ProjectMetadataUtilities.java

@@ -51,8 +51,8 @@ import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
 import com.google.refine.model.Project;
-import com.google.refine.model.medadata.IMetadata;
+import com.google.refine.model.metadata.IMetadata;
-import com.google.refine.model.medadata.ProjectMetadata;
+import com.google.refine.model.metadata.ProjectMetadata;
 
 public class ProjectMetadataUtilities {
     final static Logger logger = LoggerFactory.getLogger("project_metadata_utilities");

main/src/com/google/refine/io/ProjectUtilities.java

@@ -47,9 +47,9 @@ import org.slf4j.LoggerFactory;
 
 import com.google.refine.ProjectManager;
 import com.google.refine.model.Project;
-import com.google.refine.model.medadata.DataPackageMetadata;
+import com.google.refine.model.metadata.DataPackageMetadata;
-import com.google.refine.model.medadata.IMetadata;
+import com.google.refine.model.metadata.IMetadata;
-import com.google.refine.model.medadata.MetadataFormat;
+import com.google.refine.model.metadata.MetadataFormat;
 import com.google.refine.util.Pool;
 
 

main/src/com/google/refine/model/Project.java

@@ -57,7 +57,7 @@ import org.slf4j.LoggerFactory;
 import com.google.refine.ProjectManager;
 import com.google.refine.RefineServlet;
 import com.google.refine.history.History;
-import com.google.refine.model.medadata.ProjectMetadata;
+import com.google.refine.model.metadata.ProjectMetadata;
 import com.google.refine.process.ProcessManager;
 import com.google.refine.util.ParsingUtilities;
 import com.google.refine.util.Pool;

main/src/com/google/refine/model/medadata/validator/ValidatorConfig.java

@@ -1,6 +0,0 @@
-package com.google.refine.model.medadata.validator;
-
-
-public class ValidatorConfig {
-
-}

main/src/com/google/refine/model/medadata/validator/ValidatorExceptions.java

@@ -1,6 +0,0 @@
-package com.google.refine.model.medadata.validator;
-
-
-public class ValidatorExceptions {
-
-}

main/src/com/google/refine/model/metadata/AbstractMetadata.java

@@ -1,4 +1,4 @@
-package com.google.refine.model.medadata;
+package com.google.refine.model.metadata;
 
 import java.io.File;
 import java.time.LocalDateTime;

main/src/com/google/refine/model/metadata/DataPackageMetadata.java

@@ -1,4 +1,4 @@
-package com.google.refine.model.medadata;
+package com.google.refine.model.metadata;
 
 import java.io.File;
 import java.io.IOException;

main/src/com/google/refine/model/metadata/DataPackageUrlRewriter.java

@@ -1,4 +1,4 @@
-package com.google.refine.model.medadata;
+package com.google.refine.model.metadata;
 
 import java.io.IOException;
 import java.net.MalformedURLException;

main/src/com/google/refine/model/metadata/IMetadata.java

@@ -1,4 +1,4 @@
-package com.google.refine.model.medadata;
+package com.google.refine.model.metadata;
 
 import java.io.File;
 import java.io.InputStream;

main/src/com/google/refine/model/metadata/MetadataFactory.java

@@ -1,4 +1,4 @@
-package com.google.refine.model.medadata;
+package com.google.refine.model.metadata;
 
 import java.io.IOException;
 

main/src/com/google/refine/model/metadata/MetadataFormat.java

@@ -1,4 +1,4 @@
-package com.google.refine.model.medadata;
+package com.google.refine.model.metadata;
 
 
 /**

main/src/com/google/refine/model/metadata/PackageExtension.java

@@ -1,16 +1,16 @@
-package com.google.refine.model.medadata;
+package com.google.refine.model.metadata;
 
 import java.io.ByteArrayOutputStream;
-import java.io.File;
 import java.io.FileNotFoundException;
 import java.io.IOException;
+import java.io.InputStream;
 import java.io.OutputStream;
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipOutputStream;
 
-import org.apache.commons.io.FileUtils;
+import org.apache.commons.io.IOUtils;
-import org.apache.commons.lang3.exception.ExceptionUtils;
 import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.exception.ExceptionUtils;
 import org.everit.json.schema.ValidationException;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -73,8 +73,8 @@ public class PackageExtension {
     public static Package buildPackageFromTemplate() {
         try {
             ClassLoader classLoader = PackageExtension.class.getClassLoader();
-            File file = new File(classLoader.getResource(DATAPACKAGE_TEMPLATE_FILE).getFile());
+            InputStream inputStream = classLoader.getResourceAsStream(DATAPACKAGE_TEMPLATE_FILE);
-            return new Package(FileUtils.readFileToString(file), false);
+            return new Package(IOUtils.toString(inputStream), false);
         } catch (ValidationException e) {
             logger.error("validation failed", ExceptionUtils.getStackTrace(e));
         } catch (DataPackageException e) {

main/src/com/google/refine/model/metadata/ProjectMetadata.java

@@ -31,7 +31,7 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 */
 
-package com.google.refine.model.medadata;
+package com.google.refine.model.metadata;
 
 import java.io.File;
 import java.io.FileNotFoundException;

main/src/com/google/refine/model/metadata/SchemaExtension.java

@@ -1,4 +1,4 @@
-package com.google.refine.model.medadata;
+package com.google.refine.model.metadata;
 
 import com.google.refine.model.Column;
 import com.google.refine.model.ColumnModel;

main/src/com/google/refine/model/metadata/validator/ValidateOperation.java

@@ -1,4 +1,4 @@
-package com.google.refine.model.medadata.validator;
+package com.google.refine.model.metadata.validator;
 
 import java.util.Properties;
 

main/src/com/google/refine/model/metadata/validator/ValidatorConfig.java

@@ -0,0 +1,6 @@
+package com.google.refine.model.metadata.validator;
+
+
+public class ValidatorConfig {
+
+}

main/src/com/google/refine/model/metadata/validator/ValidatorExceptions.java

@@ -0,0 +1,6 @@
+package com.google.refine.model.metadata.validator;
+
+
+public class ValidatorExceptions {
+
+}

main/src/com/google/refine/model/metadata/validator/ValidatorInspector.java

@@ -1,4 +1,4 @@
-package com.google.refine.model.medadata.validator;
+package com.google.refine.model.metadata.validator;
 
 import java.lang.reflect.Constructor;
 import java.lang.reflect.InvocationTargetException;
@@ -16,8 +16,8 @@ import org.slf4j.LoggerFactory;
 
 import com.google.refine.model.Column;
 import com.google.refine.model.Project;
-import com.google.refine.model.medadata.validator.checks.TypeorFormatError;
+import com.google.refine.model.metadata.validator.checks.TypeorFormatError;
-import com.google.refine.model.medadata.validator.checks.Validator;
+import com.google.refine.model.metadata.validator.checks.Validator;
 import com.google.refine.util.JSONUtilities;
 
 public class ValidatorInspector {

main/src/com/google/refine/model/metadata/validator/ValidatorRegistry.java

@@ -1,15 +1,15 @@
-package com.google.refine.model.medadata.validator;
+package com.google.refine.model.metadata.validator;
 
 import java.util.HashMap;
 import java.util.Map;
 
-import com.google.refine.model.medadata.validator.checks.EnumerableConstraint;
+import com.google.refine.model.metadata.validator.checks.EnumerableConstraint;
-import com.google.refine.model.medadata.validator.checks.MaximumConstraint;
+import com.google.refine.model.metadata.validator.checks.MaximumConstraint;
-import com.google.refine.model.medadata.validator.checks.MaximumLengthConstraint;
+import com.google.refine.model.metadata.validator.checks.MaximumLengthConstraint;
-import com.google.refine.model.medadata.validator.checks.MinimumConstraint;
+import com.google.refine.model.metadata.validator.checks.MinimumConstraint;
-import com.google.refine.model.medadata.validator.checks.MinimumLengthConstraint;
+import com.google.refine.model.metadata.validator.checks.MinimumLengthConstraint;
-import com.google.refine.model.medadata.validator.checks.PatternConstraint;
+import com.google.refine.model.metadata.validator.checks.PatternConstraint;
-import com.google.refine.model.medadata.validator.checks.RequiredConstraint;
+import com.google.refine.model.metadata.validator.checks.RequiredConstraint;
 
 import io.frictionlessdata.tableschema.Field;
 

main/src/com/google/refine/model/metadata/validator/ValidatorSpec.java

@@ -1,4 +1,4 @@
-package com.google.refine.model.medadata.validator;
+package com.google.refine.model.metadata.validator;
 
 import java.util.Locale;
 import java.util.ResourceBundle;

main/src/com/google/refine/model/metadata/validator/checks/AbstractValidator.java

@@ -1,4 +1,4 @@
-package com.google.refine.model.medadata.validator.checks;
+package com.google.refine.model.metadata.validator.checks;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -13,7 +13,7 @@ import com.google.refine.model.Cell;
 import com.google.refine.model.Column;
 import com.google.refine.model.Project;
 import com.google.refine.model.Row;
-import com.google.refine.model.medadata.validator.ValidatorSpec;
+import com.google.refine.model.metadata.validator.ValidatorSpec;
 
 public abstract class AbstractValidator implements Validator {
     protected final Logger logger = LoggerFactory.getLogger(this.getClass());
@@ -92,7 +92,7 @@ public abstract class AbstractValidator implements Validator {
     
     /*
      * Empty body since default there is no customized Format
-     * @see com.google.refine.model.medadata.validator.checks.Validator#customizedFormat()
+     * @see com.google.refine.model.metadata.validator.checks.Validator#customizedFormat()
      */
     @Override
     public void customizedFormat() {

main/src/com/google/refine/model/metadata/validator/checks/BlankHeader.java

@@ -1,4 +1,4 @@
-package com.google.refine.model.medadata.validator.checks;
+package com.google.refine.model.metadata.validator.checks;
 
 import org.json.JSONObject;
 

main/src/com/google/refine/model/metadata/validator/checks/BlankRow.java

@@ -1,4 +1,4 @@
-package com.google.refine.model.medadata.validator.checks;
+package com.google.refine.model.metadata.validator.checks;
 
 import org.json.JSONObject;
 

main/src/com/google/refine/model/metadata/validator/checks/DuplicateHeader.java

@@ -1,4 +1,4 @@
-package com.google.refine.model.medadata.validator.checks;
+package com.google.refine.model.metadata.validator.checks;
 
 import org.json.JSONObject;
 

main/src/com/google/refine/model/metadata/validator/checks/DuplicateRow.java

@@ -1,4 +1,4 @@
-package com.google.refine.model.medadata.validator.checks;
+package com.google.refine.model.metadata.validator.checks;
 
 import org.json.JSONObject;
 

main/src/com/google/refine/model/metadata/validator/checks/EnumerableConstraint.java

@@ -1,4 +1,4 @@
-package com.google.refine.model.medadata.validator.checks;
+package com.google.refine.model.metadata.validator.checks;
 
 import java.util.List;
 

main/src/com/google/refine/model/metadata/validator/checks/ExtraHeader.java

@@ -1,4 +1,4 @@
-package com.google.refine.model.medadata.validator.checks;
+package com.google.refine.model.metadata.validator.checks;
 
 import org.json.JSONObject;
 

main/src/com/google/refine/model/metadata/validator/checks/ExtraValue.java

@@ -1,4 +1,4 @@
-package com.google.refine.model.medadata.validator.checks;
+package com.google.refine.model.metadata.validator.checks;
 
 import org.json.JSONObject;
 

main/src/com/google/refine/model/metadata/validator/checks/MaximumConstraint.java

@@ -1,4 +1,4 @@
-package com.google.refine.model.medadata.validator.checks;
+package com.google.refine.model.metadata.validator.checks;
 
 import org.json.JSONObject;
 

main/src/com/google/refine/model/metadata/validator/checks/MaximumLengthConstraint.java

@@ -1,4 +1,4 @@
-package com.google.refine.model.medadata.validator.checks;
+package com.google.refine.model.metadata.validator.checks;
 
 import org.json.JSONObject;
 

main/src/com/google/refine/model/metadata/validator/checks/MinimumConstraint.java

@@ -1,4 +1,4 @@
-package com.google.refine.model.medadata.validator.checks;
+package com.google.refine.model.metadata.validator.checks;
 
 import org.json.JSONObject;
 

main/src/com/google/refine/model/metadata/validator/checks/MinimumLengthConstraint.java

@@ -1,4 +1,4 @@
-package com.google.refine.model.medadata.validator.checks;
+package com.google.refine.model.metadata.validator.checks;
 
 import org.json.JSONObject;
 

main/src/com/google/refine/model/metadata/validator/checks/MissingHeader.java

@@ -1,4 +1,4 @@
-package com.google.refine.model.medadata.validator.checks;
+package com.google.refine.model.metadata.validator.checks;
 
 import org.json.JSONObject;
 

main/src/com/google/refine/model/metadata/validator/checks/MissingValue.java

@@ -1,4 +1,4 @@
-package com.google.refine.model.medadata.validator.checks;
+package com.google.refine.model.metadata.validator.checks;
 
 import org.json.JSONObject;
 

main/src/com/google/refine/model/metadata/validator/checks/NonMatchingHeader.java

@@ -1,4 +1,4 @@
-package com.google.refine.model.medadata.validator.checks;
+package com.google.refine.model.metadata.validator.checks;
 
 import org.json.JSONObject;
 

main/src/com/google/refine/model/metadata/validator/checks/PatternConstraint.java

@@ -1,4 +1,4 @@
-package com.google.refine.model.medadata.validator.checks;
+package com.google.refine.model.metadata.validator.checks;
 
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;

main/src/com/google/refine/model/metadata/validator/checks/RequiredConstraint.java

@@ -1,4 +1,4 @@
-package com.google.refine.model.medadata.validator.checks;
+package com.google.refine.model.metadata.validator.checks;
 
 import org.apache.commons.lang3.StringUtils;
 import org.json.JSONObject;

main/src/com/google/refine/model/metadata/validator/checks/TypeorFormatError.java

@@ -1,4 +1,4 @@
-package com.google.refine.model.medadata.validator.checks;
+package com.google.refine.model.metadata.validator.checks;
 
 import org.json.JSONObject;
 

main/src/com/google/refine/model/metadata/validator/checks/UniqueConstraint.java

@@ -1,4 +1,4 @@
-package com.google.refine.model.medadata.validator.checks;
+package com.google.refine.model.metadata.validator.checks;
 
 import org.json.JSONObject;
 

main/src/com/google/refine/model/metadata/validator/checks/Validator.java

@@ -1,4 +1,4 @@
-package com.google.refine.model.medadata.validator.checks;
+package com.google.refine.model.metadata.validator.checks;
 
 import org.json.JSONArray;
 import org.json.JSONObject;

main/tests/server/src/com/google/refine/tests/ProjectManagerStub.java

@@ -42,8 +42,8 @@ import org.apache.tools.tar.TarOutputStream;
 import com.google.refine.ProjectManager;
 import com.google.refine.history.HistoryEntryManager;
 import com.google.refine.model.Project;
-import com.google.refine.model.medadata.IMetadata;
+import com.google.refine.model.metadata.IMetadata;
-import com.google.refine.model.medadata.MetadataFormat;
+import com.google.refine.model.metadata.MetadataFormat;
 
 /**
  * Stub used to make protected methods public for testing

main/tests/server/src/com/google/refine/tests/ProjectManagerTests.java

@@ -53,7 +53,7 @@ import org.testng.annotations.Test;
 
 import com.google.refine.ProjectManager;
 import com.google.refine.model.Project;
-import com.google.refine.model.medadata.ProjectMetadata;
+import com.google.refine.model.metadata.ProjectMetadata;
 import com.google.refine.process.ProcessManager;
 import com.google.refine.tests.model.ProjectStub;
 

main/tests/server/src/com/google/refine/tests/RefineTest.java

@@ -65,7 +65,7 @@ import com.google.refine.model.Column;
 import com.google.refine.model.ModelException;
 import com.google.refine.model.Project;
 import com.google.refine.model.Row;
-import com.google.refine.model.medadata.ProjectMetadata;
+import com.google.refine.model.metadata.ProjectMetadata;
 import com.google.refine.tests.util.TestUtils;
 import com.google.refine.util.JSONUtilities;
 

main/tests/server/src/com/google/refine/tests/browsing/facets/TextSearchFacetTests.java

@@ -45,7 +45,7 @@ import org.testng.annotations.Test;
 
 import com.google.refine.model.ModelException;
 import com.google.refine.model.Project;
-import com.google.refine.model.medadata.ProjectMetadata;
+import com.google.refine.model.metadata.ProjectMetadata;
 import com.google.refine.browsing.RowFilter;
 import com.google.refine.browsing.facets.TextSearchFacet;
 import com.google.refine.tests.RefineTest;

main/tests/server/src/com/google/refine/tests/commands/project/SetProjectMetadataCommandTests.java

@@ -59,7 +59,7 @@ import org.testng.annotations.Test;
 import com.google.refine.ProjectManager;
 import com.google.refine.commands.project.SetProjectMetadataCommand;
 import com.google.refine.model.Project;
-import com.google.refine.model.medadata.ProjectMetadata;
+import com.google.refine.model.metadata.ProjectMetadata;
 import com.google.refine.tests.RefineTest;
 
 public class SetProjectMetadataCommandTests extends RefineTest {

main/tests/server/src/com/google/refine/tests/commands/project/ValidateOperationTests.java

@@ -28,10 +28,10 @@ import org.testng.Assert;
 import com.google.refine.ProjectManager;
 import com.google.refine.importers.SeparatorBasedImporter;
 import com.google.refine.model.Column;
-import com.google.refine.model.medadata.DataPackageMetadata;
+import com.google.refine.model.metadata.validator.ValidateOperation;
-import com.google.refine.model.medadata.MetadataFactory;
+import com.google.refine.model.metadata.DataPackageMetadata;
-import com.google.refine.model.medadata.MetadataFormat;
+import com.google.refine.model.metadata.MetadataFactory;
-import com.google.refine.model.medadata.validator.ValidateOperation;
+import com.google.refine.model.metadata.MetadataFormat;
 import com.google.refine.tests.importers.TsvCsvImporterTests;
 import com.google.refine.util.ParsingUtilities;
 

main/tests/server/src/com/google/refine/tests/exporters/HtmlExporterTests.java

@@ -58,7 +58,7 @@ import com.google.refine.model.Column;
 import com.google.refine.model.ModelException;
 import com.google.refine.model.Project;
 import com.google.refine.model.Row;
-import com.google.refine.model.medadata.ProjectMetadata;
+import com.google.refine.model.metadata.ProjectMetadata;
 import com.google.refine.tests.ProjectManagerStub;
 import com.google.refine.tests.RefineTest;
 

main/tests/server/src/com/google/refine/tests/exporters/TemplatingExporterTests.java

@@ -56,7 +56,7 @@ import com.google.refine.model.Column;
 import com.google.refine.model.ModelException;
 import com.google.refine.model.Project;
 import com.google.refine.model.Row;
-import com.google.refine.model.medadata.ProjectMetadata;
+import com.google.refine.model.metadata.ProjectMetadata;
 import com.google.refine.tests.ProjectManagerStub;
 import com.google.refine.tests.RefineTest;
 

main/tests/server/src/com/google/refine/tests/exporters/XlsExporterTests.java

@@ -59,7 +59,7 @@ import com.google.refine.model.Column;
 import com.google.refine.model.ModelException;
 import com.google.refine.model.Project;
 import com.google.refine.model.Row;
-import com.google.refine.model.medadata.ProjectMetadata;
+import com.google.refine.model.metadata.ProjectMetadata;
 import com.google.refine.tests.ProjectManagerStub;
 import com.google.refine.tests.RefineTest;
 

main/tests/server/src/com/google/refine/tests/exporters/sql/SqlExporterTests.java

@@ -64,7 +64,7 @@ import com.google.refine.model.Column;
 import com.google.refine.model.ModelException;
 import com.google.refine.model.Project;
 import com.google.refine.model.Row;
-import com.google.refine.model.medadata.ProjectMetadata;
+import com.google.refine.model.metadata.ProjectMetadata;
 import com.google.refine.tests.ProjectManagerStub;
 import com.google.refine.tests.RefineTest;
 

main/tests/server/src/com/google/refine/tests/expr/functions/FunctionTests.java

@@ -52,7 +52,7 @@ import com.google.refine.model.Cell;
 import com.google.refine.model.ModelException;
 import com.google.refine.model.Project;
 import com.google.refine.model.Row;
-import com.google.refine.model.medadata.ProjectMetadata;
+import com.google.refine.model.metadata.ProjectMetadata;
 import com.google.refine.tests.RefineTest;
 
 

main/tests/server/src/com/google/refine/tests/expr/functions/booleans/BooleanTests.java

@@ -50,7 +50,7 @@ import com.google.refine.model.Cell;
 import com.google.refine.model.ModelException;
 import com.google.refine.model.Project;
 import com.google.refine.model.Row;
-import com.google.refine.model.medadata.ProjectMetadata;
+import com.google.refine.model.metadata.ProjectMetadata;
 import com.google.refine.tests.RefineTest;
 
 

main/tests/server/src/com/google/refine/tests/history/HistoryTests.java

@@ -50,7 +50,7 @@ import com.google.refine.ProjectManager;
 import com.google.refine.history.History;
 import com.google.refine.history.HistoryEntry;
 import com.google.refine.model.Project;
-import com.google.refine.model.medadata.ProjectMetadata;
+import com.google.refine.model.metadata.ProjectMetadata;
 import com.google.refine.tests.RefineTest;
 
 

main/tests/server/src/com/google/refine/tests/importers/ImporterTest.java

@@ -21,7 +21,7 @@ import com.google.refine.importers.tree.XmlImportUtilities;
 import com.google.refine.importing.ImportingJob;
 import com.google.refine.importing.ImportingManager;
 import com.google.refine.model.Project;
-import com.google.refine.model.medadata.ProjectMetadata;
+import com.google.refine.model.metadata.ProjectMetadata;
 import com.google.refine.tests.RefineServletStub;
 import com.google.refine.tests.RefineTest;
 

main/tests/server/src/com/google/refine/tests/importing/ImportingUtilitiesTests.java

@@ -16,7 +16,7 @@ import com.google.refine.importing.ImportingJob;
 import com.google.refine.importing.ImportingManager;
 import com.google.refine.importing.ImportingUtilities;
 import com.google.refine.model.Column;
-import com.google.refine.model.medadata.ProjectMetadata;
+import com.google.refine.model.metadata.ProjectMetadata;
 import com.google.refine.tests.importers.ImporterTest;
 import com.google.refine.util.JSONUtilities;
 

main/tests/server/src/com/google/refine/tests/model/CacheTests.java

@@ -52,7 +52,7 @@ import com.google.refine.model.Cell;
 import com.google.refine.model.ModelException;
 import com.google.refine.model.Project;
 import com.google.refine.model.Row;
-import com.google.refine.model.medadata.ProjectMetadata;
+import com.google.refine.model.metadata.ProjectMetadata;
 import com.google.refine.operations.EngineDependentOperation;
 import com.google.refine.operations.row.RowRemovalOperation;
 import com.google.refine.tests.RefineTest;

main/tests/server/src/com/google/refine/tests/model/TextSearchFacetTests.java

@@ -60,7 +60,7 @@ import com.google.refine.importing.ImportingManager;
 import com.google.refine.io.FileProjectManager;
 import com.google.refine.model.ModelException;
 import com.google.refine.model.Project;
-import com.google.refine.model.medadata.ProjectMetadata;
+import com.google.refine.model.metadata.ProjectMetadata;
 import com.google.refine.tests.RefineServletStub;
 import com.google.refine.tests.RefineTest;
 import com.google.refine.tests.util.TestUtils;

main/tests/server/src/com/google/refine/tests/operations/cell/KeyValueColumnizeTests.java

@@ -60,7 +60,7 @@ import com.google.refine.io.FileProjectManager;
 import com.google.refine.model.AbstractOperation;
 import com.google.refine.model.ModelException;
 import com.google.refine.model.Project;
-import com.google.refine.model.medadata.ProjectMetadata;
+import com.google.refine.model.metadata.ProjectMetadata;
 import com.google.refine.operations.cell.KeyValueColumnizeOperation;
 import com.google.refine.process.Process;
 import com.google.refine.tests.RefineServletStub;

main/tests/server/src/com/google/refine/tests/operations/cell/TransposeTests.java

@@ -42,7 +42,7 @@ import org.testng.annotations.Test;
 
 import com.google.refine.model.AbstractOperation;
 import com.google.refine.model.Project;
-import com.google.refine.model.medadata.ProjectMetadata;
+import com.google.refine.model.metadata.ProjectMetadata;
 import com.google.refine.operations.cell.KeyValueColumnizeOperation;
 import com.google.refine.process.Process;
 import com.google.refine.tests.RefineTest;

main/webapp/modules/core/MOD-INF/controller.js

@@ -281,7 +281,7 @@ function registerImporting() {
 
   IM.registerMimeType("application/marc", "text/marc");
   
-  IM.registerUrlRewriter(new Packages.com.google.refine.model.medadata.DataPackageUrlRewriter());
+  IM.registerUrlRewriter(new Packages.com.google.refine.model.metadata.DataPackageUrlRewriter());
 
   /*
    *  Format guessers: these take a format derived from extensions or mime-types,