From 5a6c9d72f01f066a0cd6be7c411d4f597e0f7fce Mon Sep 17 00:00:00 2001 From: Jacky Date: Sat, 16 Jun 2018 15:40:59 -0400 Subject: [PATCH] fix the template load issue and package typo --- .../database/DatabaseImportController.java | 2 +- .../database/DatabaseImportControllerTest.java | 2 +- .../database/cmd/SavedConnectionCommandTest.java | 2 +- .../extension/gdata/FusionTableImporter.java | 2 +- .../refine/extension/gdata/GDataImporter.java | 2 +- .../gdata/GDataImportingController.java | 2 +- .../com/google/refine/pcaxis/PCAxisImporter.java | 2 +- main/src/com/google/refine/ProjectManager.java | 4 ++-- main/src/com/google/refine/commands/Command.java | 2 +- .../commands/project/DeleteProjectCommand.java | 2 +- .../commands/project/GetMetadataCommand.java | 6 +++--- .../commands/project/ImportProjectCommand.java | 2 +- .../commands/project/PackageProjectCommand.java | 4 ++-- .../commands/project/RenameProjectCommand.java | 2 +- .../project/SetProjectMetadataCommand.java | 2 +- .../commands/project/SetProjectTagsCommand.java | 2 +- .../commands/project/ValidateSchemaCommand.java | 2 +- .../workspace/GetAllProjectMetadataCommand.java | 2 +- .../expr/functions/strings/Reinterpret.java | 2 +- .../google/refine/importers/ExcelImporter.java | 2 +- .../refine/importers/FixedWidthImporter.java | 2 +- .../refine/importers/ImportingParserBase.java | 2 +- .../google/refine/importers/JsonImporter.java | 2 +- .../refine/importers/LineBasedImporter.java | 2 +- .../com/google/refine/importers/OdsImporter.java | 2 +- .../refine/importers/RdfTripleImporter.java | 2 +- .../refine/importers/SeparatorBasedImporter.java | 2 +- .../importers/TabularImportingParserBase.java | 2 +- .../refine/importers/WikitextImporter.java | 2 +- .../com/google/refine/importers/XmlImporter.java | 2 +- .../importers/tree/TreeImportingParserBase.java | 2 +- .../google/refine/importing/ImportingJob.java | 2 +- .../google/refine/importing/ImportingParser.java | 2 +- .../refine/importing/ImportingUtilities.java | 12 ++++++------ .../com/google/refine/io/FileProjectManager.java | 8 ++++---- .../refine/io/ProjectMetadataUtilities.java | 4 ++-- .../com/google/refine/io/ProjectUtilities.java | 6 +++--- main/src/com/google/refine/model/Project.java | 2 +- .../medadata/validator/ValidatorConfig.java | 6 ------ .../medadata/validator/ValidatorExceptions.java | 6 ------ .../{medadata => metadata}/AbstractMetadata.java | 2 +- .../DataPackageMetadata.java | 2 +- .../DataPackageUrlRewriter.java | 2 +- .../model/{medadata => metadata}/IMetadata.java | 2 +- .../{medadata => metadata}/MetadataFactory.java | 2 +- .../{medadata => metadata}/MetadataFormat.java | 2 +- .../{medadata => metadata}/PackageExtension.java | 12 ++++++------ .../{medadata => metadata}/ProjectMetadata.java | 2 +- .../{medadata => metadata}/SchemaExtension.java | 2 +- .../validator/ValidateOperation.java | 2 +- .../metadata/validator/ValidatorConfig.java | 6 ++++++ .../metadata/validator/ValidatorExceptions.java | 6 ++++++ .../validator/ValidatorInspector.java | 6 +++--- .../validator/ValidatorRegistry.java | 16 ++++++++-------- .../validator/ValidatorSpec.java | 2 +- .../validator/checks/AbstractValidator.java | 6 +++--- .../validator/checks/BlankHeader.java | 2 +- .../validator/checks/BlankRow.java | 2 +- .../validator/checks/DuplicateHeader.java | 2 +- .../validator/checks/DuplicateRow.java | 2 +- .../validator/checks/EnumerableConstraint.java | 2 +- .../validator/checks/ExtraHeader.java | 2 +- .../validator/checks/ExtraValue.java | 2 +- .../validator/checks/MaximumConstraint.java | 2 +- .../checks/MaximumLengthConstraint.java | 2 +- .../validator/checks/MinimumConstraint.java | 2 +- .../checks/MinimumLengthConstraint.java | 2 +- .../validator/checks/MissingHeader.java | 2 +- .../validator/checks/MissingValue.java | 2 +- .../validator/checks/NonMatchingHeader.java | 2 +- .../validator/checks/PatternConstraint.java | 2 +- .../validator/checks/RequiredConstraint.java | 2 +- .../validator/checks/TypeorFormatError.java | 2 +- .../validator/checks/UniqueConstraint.java | 2 +- .../validator/checks/Validator.java | 2 +- .../google/refine/tests/ProjectManagerStub.java | 4 ++-- .../google/refine/tests/ProjectManagerTests.java | 2 +- .../src/com/google/refine/tests/RefineTest.java | 2 +- .../browsing/facets/TextSearchFacetTests.java | 2 +- .../project/SetProjectMetadataCommandTests.java | 2 +- .../commands/project/ValidateOperationTests.java | 8 ++++---- .../tests/exporters/HtmlExporterTests.java | 2 +- .../tests/exporters/TemplatingExporterTests.java | 2 +- .../refine/tests/exporters/XlsExporterTests.java | 2 +- .../tests/exporters/sql/SqlExporterTests.java | 2 +- .../tests/expr/functions/FunctionTests.java | 2 +- .../expr/functions/booleans/BooleanTests.java | 2 +- .../refine/tests/history/HistoryTests.java | 2 +- .../refine/tests/importers/ImporterTest.java | 2 +- .../tests/importing/ImportingUtilitiesTests.java | 2 +- .../google/refine/tests/model/CacheTests.java | 2 +- .../refine/tests/model/TextSearchFacetTests.java | 2 +- .../operations/cell/KeyValueColumnizeTests.java | 2 +- .../tests/operations/cell/TransposeTests.java | 2 +- main/webapp/modules/core/MOD-INF/controller.js | 2 +- 95 files changed, 138 insertions(+), 138 deletions(-) delete mode 100644 main/src/com/google/refine/model/medadata/validator/ValidatorConfig.java delete mode 100644 main/src/com/google/refine/model/medadata/validator/ValidatorExceptions.java rename main/src/com/google/refine/model/{medadata => metadata}/AbstractMetadata.java (97%) rename main/src/com/google/refine/model/{medadata => metadata}/DataPackageMetadata.java (99%) rename main/src/com/google/refine/model/{medadata => metadata}/DataPackageUrlRewriter.java (96%) rename main/src/com/google/refine/model/{medadata => metadata}/IMetadata.java (96%) rename main/src/com/google/refine/model/{medadata => metadata}/MetadataFactory.java (98%) rename main/src/com/google/refine/model/{medadata => metadata}/MetadataFormat.java (91%) rename main/src/com/google/refine/model/{medadata => metadata}/PackageExtension.java (93%) rename main/src/com/google/refine/model/{medadata => metadata}/ProjectMetadata.java (99%) rename main/src/com/google/refine/model/{medadata => metadata}/SchemaExtension.java (98%) rename main/src/com/google/refine/model/{medadata => metadata}/validator/ValidateOperation.java (93%) create mode 100644 main/src/com/google/refine/model/metadata/validator/ValidatorConfig.java create mode 100644 main/src/com/google/refine/model/metadata/validator/ValidatorExceptions.java rename main/src/com/google/refine/model/{medadata => metadata}/validator/ValidatorInspector.java (95%) rename main/src/com/google/refine/model/{medadata => metadata}/validator/ValidatorRegistry.java (73%) rename main/src/com/google/refine/model/{medadata => metadata}/validator/ValidatorSpec.java (93%) rename main/src/com/google/refine/model/{medadata => metadata}/validator/checks/AbstractValidator.java (94%) rename main/src/com/google/refine/model/{medadata => metadata}/validator/checks/BlankHeader.java (80%) rename main/src/com/google/refine/model/{medadata => metadata}/validator/checks/BlankRow.java (80%) rename main/src/com/google/refine/model/{medadata => metadata}/validator/checks/DuplicateHeader.java (81%) rename main/src/com/google/refine/model/{medadata => metadata}/validator/checks/DuplicateRow.java (80%) rename main/src/com/google/refine/model/{medadata => metadata}/validator/checks/EnumerableConstraint.java (92%) rename main/src/com/google/refine/model/{medadata => metadata}/validator/checks/ExtraHeader.java (80%) rename main/src/com/google/refine/model/{medadata => metadata}/validator/checks/ExtraValue.java (80%) rename main/src/com/google/refine/model/{medadata => metadata}/validator/checks/MaximumConstraint.java (95%) rename main/src/com/google/refine/model/{medadata => metadata}/validator/checks/MaximumLengthConstraint.java (91%) rename main/src/com/google/refine/model/{medadata => metadata}/validator/checks/MinimumConstraint.java (95%) rename main/src/com/google/refine/model/{medadata => metadata}/validator/checks/MinimumLengthConstraint.java (93%) rename main/src/com/google/refine/model/{medadata => metadata}/validator/checks/MissingHeader.java (81%) rename main/src/com/google/refine/model/{medadata => metadata}/validator/checks/MissingValue.java (80%) rename main/src/com/google/refine/model/{medadata => metadata}/validator/checks/NonMatchingHeader.java (81%) rename main/src/com/google/refine/model/{medadata => metadata}/validator/checks/PatternConstraint.java (93%) rename main/src/com/google/refine/model/{medadata => metadata}/validator/checks/RequiredConstraint.java (91%) rename main/src/com/google/refine/model/{medadata => metadata}/validator/checks/TypeorFormatError.java (96%) rename main/src/com/google/refine/model/{medadata => metadata}/validator/checks/UniqueConstraint.java (83%) rename main/src/com/google/refine/model/{medadata => metadata}/validator/checks/Validator.java (93%) diff --git a/extensions/database/src/com/google/refine/extension/database/DatabaseImportController.java b/extensions/database/src/com/google/refine/extension/database/DatabaseImportController.java index f5650acf6..e79153c68 100644 --- a/extensions/database/src/com/google/refine/extension/database/DatabaseImportController.java +++ b/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; diff --git a/extensions/database/test/com/google/refine/extension/database/DatabaseImportControllerTest.java b/extensions/database/test/com/google/refine/extension/database/DatabaseImportControllerTest.java index df75a81db..25b1f920d 100644 --- a/extensions/database/test/com/google/refine/extension/database/DatabaseImportControllerTest.java +++ b/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; diff --git a/extensions/database/test/com/google/refine/extension/database/cmd/SavedConnectionCommandTest.java b/extensions/database/test/com/google/refine/extension/database/cmd/SavedConnectionCommandTest.java index 0dc52016c..31aa5ed53 100644 --- a/extensions/database/test/com/google/refine/extension/database/cmd/SavedConnectionCommandTest.java +++ b/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{ diff --git a/extensions/gdata/src/com/google/refine/extension/gdata/FusionTableImporter.java b/extensions/gdata/src/com/google/refine/extension/gdata/FusionTableImporter.java index c02b3253f..c56f9d27e 100644 --- a/extensions/gdata/src/com/google/refine/extension/gdata/FusionTableImporter.java +++ b/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; /** diff --git a/extensions/gdata/src/com/google/refine/extension/gdata/GDataImporter.java b/extensions/gdata/src/com/google/refine/extension/gdata/GDataImporter.java index 3e2e1d9fd..05598e737 100644 --- a/extensions/gdata/src/com/google/refine/extension/gdata/GDataImporter.java +++ b/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 { diff --git a/extensions/gdata/src/com/google/refine/extension/gdata/GDataImportingController.java b/extensions/gdata/src/com/google/refine/extension/gdata/GDataImportingController.java index 8813977fa..1f98f0a3d 100644 --- a/extensions/gdata/src/com/google/refine/extension/gdata/GDataImportingController.java +++ b/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; diff --git a/extensions/pc-axis/src/com/google/refine/pcaxis/PCAxisImporter.java b/extensions/pc-axis/src/com/google/refine/pcaxis/PCAxisImporter.java index ea137ec7e..8a41c27f9 100644 --- a/extensions/pc-axis/src/com/google/refine/pcaxis/PCAxisImporter.java +++ b/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 { diff --git a/main/src/com/google/refine/ProjectManager.java b/main/src/com/google/refine/ProjectManager.java index 7373d5155..ee89a7eda 100644 --- a/main/src/com/google/refine/ProjectManager.java +++ b/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.medadata.ProjectMetadata; +import com.google.refine.model.metadata.IMetadata; +import com.google.refine.model.metadata.ProjectMetadata; import com.google.refine.preference.PreferenceStore; import com.google.refine.preference.TopList; diff --git a/main/src/com/google/refine/commands/Command.java b/main/src/com/google/refine/commands/Command.java index 0ee9b1da9..e5cd9e6ee 100644 --- a/main/src/com/google/refine/commands/Command.java +++ b/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; diff --git a/main/src/com/google/refine/commands/project/DeleteProjectCommand.java b/main/src/com/google/refine/commands/project/DeleteProjectCommand.java index f69f11d1b..57b61207d 100644 --- a/main/src/com/google/refine/commands/project/DeleteProjectCommand.java +++ b/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 { diff --git a/main/src/com/google/refine/commands/project/GetMetadataCommand.java b/main/src/com/google/refine/commands/project/GetMetadataCommand.java index 87f797701..9a7b21de1 100644 --- a/main/src/com/google/refine/commands/project/GetMetadataCommand.java +++ b/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.medadata.MetadataFactory; -import com.google.refine.model.medadata.MetadataFormat; +import com.google.refine.model.metadata.IMetadata; +import com.google.refine.model.metadata.MetadataFactory; +import com.google.refine.model.metadata.MetadataFormat; public class GetMetadataCommand extends Command { @Override diff --git a/main/src/com/google/refine/commands/project/ImportProjectCommand.java b/main/src/com/google/refine/commands/project/ImportProjectCommand.java index 15f5c9b14..8972261e9 100644 --- a/main/src/com/google/refine/commands/project/ImportProjectCommand.java +++ b/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 { diff --git a/main/src/com/google/refine/commands/project/PackageProjectCommand.java b/main/src/com/google/refine/commands/project/PackageProjectCommand.java index 2a56e6388..c73af8935 100644 --- a/main/src/com/google/refine/commands/project/PackageProjectCommand.java +++ b/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.medadata.PackageExtension; +import com.google.refine.model.metadata.DataPackageMetadata; +import com.google.refine.model.metadata.PackageExtension; public class PackageProjectCommand extends Command { @Override diff --git a/main/src/com/google/refine/commands/project/RenameProjectCommand.java b/main/src/com/google/refine/commands/project/RenameProjectCommand.java index ccea3cf99..18eea1872 100644 --- a/main/src/com/google/refine/commands/project/RenameProjectCommand.java +++ b/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 diff --git a/main/src/com/google/refine/commands/project/SetProjectMetadataCommand.java b/main/src/com/google/refine/commands/project/SetProjectMetadataCommand.java index b5b14b648..016716ff7 100644 --- a/main/src/com/google/refine/commands/project/SetProjectMetadataCommand.java +++ b/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 diff --git a/main/src/com/google/refine/commands/project/SetProjectTagsCommand.java b/main/src/com/google/refine/commands/project/SetProjectTagsCommand.java index 00d3e3c61..ce86139b5 100644 --- a/main/src/com/google/refine/commands/project/SetProjectTagsCommand.java +++ b/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 diff --git a/main/src/com/google/refine/commands/project/ValidateSchemaCommand.java b/main/src/com/google/refine/commands/project/ValidateSchemaCommand.java index fbb96a327..cfe5c6e3f 100644 --- a/main/src/com/google/refine/commands/project/ValidateSchemaCommand.java +++ b/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 { diff --git a/main/src/com/google/refine/commands/workspace/GetAllProjectMetadataCommand.java b/main/src/com/google/refine/commands/workspace/GetAllProjectMetadataCommand.java index 786f005c0..0da7fe0c4 100644 --- a/main/src/com/google/refine/commands/workspace/GetAllProjectMetadataCommand.java +++ b/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 diff --git a/main/src/com/google/refine/expr/functions/strings/Reinterpret.java b/main/src/com/google/refine/expr/functions/strings/Reinterpret.java index a376912e5..d096b90ba 100644 --- a/main/src/com/google/refine/expr/functions/strings/Reinterpret.java +++ b/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 { diff --git a/main/src/com/google/refine/importers/ExcelImporter.java b/main/src/com/google/refine/importers/ExcelImporter.java index 2e49aa7c8..f4ee09048 100644 --- a/main/src/com/google/refine/importers/ExcelImporter.java +++ b/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; diff --git a/main/src/com/google/refine/importers/FixedWidthImporter.java b/main/src/com/google/refine/importers/FixedWidthImporter.java index 5eb437095..8d783133d 100644 --- a/main/src/com/google/refine/importers/FixedWidthImporter.java +++ b/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 { diff --git a/main/src/com/google/refine/importers/ImportingParserBase.java b/main/src/com/google/refine/importers/ImportingParserBase.java index 17bad6063..bcb272d61 100644 --- a/main/src/com/google/refine/importers/ImportingParserBase.java +++ b/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 { diff --git a/main/src/com/google/refine/importers/JsonImporter.java b/main/src/com/google/refine/importers/JsonImporter.java index 93c66e1d9..2a0a9a74c 100644 --- a/main/src/com/google/refine/importers/JsonImporter.java +++ b/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 { diff --git a/main/src/com/google/refine/importers/LineBasedImporter.java b/main/src/com/google/refine/importers/LineBasedImporter.java index 7b2a2eda2..eb1ba6c08 100644 --- a/main/src/com/google/refine/importers/LineBasedImporter.java +++ b/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 { diff --git a/main/src/com/google/refine/importers/OdsImporter.java b/main/src/com/google/refine/importers/OdsImporter.java index dce702252..f35ff2cd3 100644 --- a/main/src/com/google/refine/importers/OdsImporter.java +++ b/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; diff --git a/main/src/com/google/refine/importers/RdfTripleImporter.java b/main/src/com/google/refine/importers/RdfTripleImporter.java index eb338c9d1..cbfbd8818 100644 --- a/main/src/com/google/refine/importers/RdfTripleImporter.java +++ b/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; diff --git a/main/src/com/google/refine/importers/SeparatorBasedImporter.java b/main/src/com/google/refine/importers/SeparatorBasedImporter.java index 18cba2080..5d471776f 100644 --- a/main/src/com/google/refine/importers/SeparatorBasedImporter.java +++ b/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 { diff --git a/main/src/com/google/refine/importers/TabularImportingParserBase.java b/main/src/com/google/refine/importers/TabularImportingParserBase.java index ffb8f58ad..efdcc0fe2 100644 --- a/main/src/com/google/refine/importers/TabularImportingParserBase.java +++ b/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 { diff --git a/main/src/com/google/refine/importers/WikitextImporter.java b/main/src/com/google/refine/importers/WikitextImporter.java index ab624b946..2fbb6ad23 100644 --- a/main/src/com/google/refine/importers/WikitextImporter.java +++ b/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; diff --git a/main/src/com/google/refine/importers/XmlImporter.java b/main/src/com/google/refine/importers/XmlImporter.java index 3bef0d3ca..7a3643091 100644 --- a/main/src/com/google/refine/importers/XmlImporter.java +++ b/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 { diff --git a/main/src/com/google/refine/importers/tree/TreeImportingParserBase.java b/main/src/com/google/refine/importers/tree/TreeImportingParserBase.java index d54184ab7..79b83a14a 100644 --- a/main/src/com/google/refine/importers/tree/TreeImportingParserBase.java +++ b/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; /** diff --git a/main/src/com/google/refine/importing/ImportingJob.java b/main/src/com/google/refine/importing/ImportingJob.java index f901cabca..17d644d41 100644 --- a/main/src/com/google/refine/importing/ImportingJob.java +++ b/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; diff --git a/main/src/com/google/refine/importing/ImportingParser.java b/main/src/com/google/refine/importing/ImportingParser.java index f6896b364..faafe4b3c 100644 --- a/main/src/com/google/refine/importing/ImportingParser.java +++ b/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 { /** diff --git a/main/src/com/google/refine/importing/ImportingUtilities.java b/main/src/com/google/refine/importing/ImportingUtilities.java index 705c8e02a..375778019 100644 --- a/main/src/com/google/refine/importing/ImportingUtilities.java +++ b/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.medadata.IMetadata; -import com.google.refine.model.medadata.MetadataFactory; -import com.google.refine.model.medadata.MetadataFormat; -import com.google.refine.model.medadata.PackageExtension; -import com.google.refine.model.medadata.ProjectMetadata; +import com.google.refine.model.metadata.DataPackageMetadata; +import com.google.refine.model.metadata.IMetadata; +import com.google.refine.model.metadata.MetadataFactory; +import com.google.refine.model.metadata.MetadataFormat; +import com.google.refine.model.metadata.PackageExtension; +import com.google.refine.model.metadata.ProjectMetadata; import com.google.refine.preference.PreferenceStore; import com.google.refine.util.JSONUtilities; diff --git a/main/src/com/google/refine/io/FileProjectManager.java b/main/src/com/google/refine/io/FileProjectManager.java index 14df3e784..a59cad8c8 100644 --- a/main/src/com/google/refine/io/FileProjectManager.java +++ b/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.medadata.IMetadata; -import com.google.refine.model.medadata.MetadataFormat; -import com.google.refine.model.medadata.ProjectMetadata; +import com.google.refine.model.metadata.DataPackageMetadata; +import com.google.refine.model.metadata.IMetadata; +import com.google.refine.model.metadata.MetadataFormat; +import com.google.refine.model.metadata.ProjectMetadata; import com.google.refine.preference.TopList; diff --git a/main/src/com/google/refine/io/ProjectMetadataUtilities.java b/main/src/com/google/refine/io/ProjectMetadataUtilities.java index e2b27dffb..6b5a77e94 100644 --- a/main/src/com/google/refine/io/ProjectMetadataUtilities.java +++ b/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.medadata.ProjectMetadata; +import com.google.refine.model.metadata.IMetadata; +import com.google.refine.model.metadata.ProjectMetadata; public class ProjectMetadataUtilities { final static Logger logger = LoggerFactory.getLogger("project_metadata_utilities"); diff --git a/main/src/com/google/refine/io/ProjectUtilities.java b/main/src/com/google/refine/io/ProjectUtilities.java index f72856f46..edc2d5efc 100644 --- a/main/src/com/google/refine/io/ProjectUtilities.java +++ b/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.medadata.IMetadata; -import com.google.refine.model.medadata.MetadataFormat; +import com.google.refine.model.metadata.DataPackageMetadata; +import com.google.refine.model.metadata.IMetadata; +import com.google.refine.model.metadata.MetadataFormat; import com.google.refine.util.Pool; diff --git a/main/src/com/google/refine/model/Project.java b/main/src/com/google/refine/model/Project.java index e9a984ebc..4b4a511cf 100644 --- a/main/src/com/google/refine/model/Project.java +++ b/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; diff --git a/main/src/com/google/refine/model/medadata/validator/ValidatorConfig.java b/main/src/com/google/refine/model/medadata/validator/ValidatorConfig.java deleted file mode 100644 index 7b5642aa1..000000000 --- a/main/src/com/google/refine/model/medadata/validator/ValidatorConfig.java +++ /dev/null @@ -1,6 +0,0 @@ -package com.google.refine.model.medadata.validator; - - -public class ValidatorConfig { - -} diff --git a/main/src/com/google/refine/model/medadata/validator/ValidatorExceptions.java b/main/src/com/google/refine/model/medadata/validator/ValidatorExceptions.java deleted file mode 100644 index c4cf5ea27..000000000 --- a/main/src/com/google/refine/model/medadata/validator/ValidatorExceptions.java +++ /dev/null @@ -1,6 +0,0 @@ -package com.google.refine.model.medadata.validator; - - -public class ValidatorExceptions { - -} diff --git a/main/src/com/google/refine/model/medadata/AbstractMetadata.java b/main/src/com/google/refine/model/metadata/AbstractMetadata.java similarity index 97% rename from main/src/com/google/refine/model/medadata/AbstractMetadata.java rename to main/src/com/google/refine/model/metadata/AbstractMetadata.java index 8ae7c3041..84b0f878e 100644 --- a/main/src/com/google/refine/model/medadata/AbstractMetadata.java +++ b/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; diff --git a/main/src/com/google/refine/model/medadata/DataPackageMetadata.java b/main/src/com/google/refine/model/metadata/DataPackageMetadata.java similarity index 99% rename from main/src/com/google/refine/model/medadata/DataPackageMetadata.java rename to main/src/com/google/refine/model/metadata/DataPackageMetadata.java index ba7b27118..3ddac2f93 100644 --- a/main/src/com/google/refine/model/medadata/DataPackageMetadata.java +++ b/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; diff --git a/main/src/com/google/refine/model/medadata/DataPackageUrlRewriter.java b/main/src/com/google/refine/model/metadata/DataPackageUrlRewriter.java similarity index 96% rename from main/src/com/google/refine/model/medadata/DataPackageUrlRewriter.java rename to main/src/com/google/refine/model/metadata/DataPackageUrlRewriter.java index eefe1313c..7944dfcf1 100644 --- a/main/src/com/google/refine/model/medadata/DataPackageUrlRewriter.java +++ b/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; diff --git a/main/src/com/google/refine/model/medadata/IMetadata.java b/main/src/com/google/refine/model/metadata/IMetadata.java similarity index 96% rename from main/src/com/google/refine/model/medadata/IMetadata.java rename to main/src/com/google/refine/model/metadata/IMetadata.java index 1c759de5c..d3d4192d0 100644 --- a/main/src/com/google/refine/model/medadata/IMetadata.java +++ b/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; diff --git a/main/src/com/google/refine/model/medadata/MetadataFactory.java b/main/src/com/google/refine/model/metadata/MetadataFactory.java similarity index 98% rename from main/src/com/google/refine/model/medadata/MetadataFactory.java rename to main/src/com/google/refine/model/metadata/MetadataFactory.java index 500b69148..d23599659 100644 --- a/main/src/com/google/refine/model/medadata/MetadataFactory.java +++ b/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; diff --git a/main/src/com/google/refine/model/medadata/MetadataFormat.java b/main/src/com/google/refine/model/metadata/MetadataFormat.java similarity index 91% rename from main/src/com/google/refine/model/medadata/MetadataFormat.java rename to main/src/com/google/refine/model/metadata/MetadataFormat.java index e6db73d9c..526d67c95 100644 --- a/main/src/com/google/refine/model/medadata/MetadataFormat.java +++ b/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; /** diff --git a/main/src/com/google/refine/model/medadata/PackageExtension.java b/main/src/com/google/refine/model/metadata/PackageExtension.java similarity index 93% rename from main/src/com/google/refine/model/medadata/PackageExtension.java rename to main/src/com/google/refine/model/metadata/PackageExtension.java index 1d8da5cc8..4a63913be 100644 --- a/main/src/com/google/refine/model/medadata/PackageExtension.java +++ b/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.lang3.exception.ExceptionUtils; +import org.apache.commons.io.IOUtils; 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()); - return new Package(FileUtils.readFileToString(file), false); + InputStream inputStream = classLoader.getResourceAsStream(DATAPACKAGE_TEMPLATE_FILE); + return new Package(IOUtils.toString(inputStream), false); } catch (ValidationException e) { logger.error("validation failed", ExceptionUtils.getStackTrace(e)); } catch (DataPackageException e) { diff --git a/main/src/com/google/refine/model/medadata/ProjectMetadata.java b/main/src/com/google/refine/model/metadata/ProjectMetadata.java similarity index 99% rename from main/src/com/google/refine/model/medadata/ProjectMetadata.java rename to main/src/com/google/refine/model/metadata/ProjectMetadata.java index 962a9832e..d12806c3c 100644 --- a/main/src/com/google/refine/model/medadata/ProjectMetadata.java +++ b/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; diff --git a/main/src/com/google/refine/model/medadata/SchemaExtension.java b/main/src/com/google/refine/model/metadata/SchemaExtension.java similarity index 98% rename from main/src/com/google/refine/model/medadata/SchemaExtension.java rename to main/src/com/google/refine/model/metadata/SchemaExtension.java index 8c3afd6bc..fabe7bec8 100644 --- a/main/src/com/google/refine/model/medadata/SchemaExtension.java +++ b/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; diff --git a/main/src/com/google/refine/model/medadata/validator/ValidateOperation.java b/main/src/com/google/refine/model/metadata/validator/ValidateOperation.java similarity index 93% rename from main/src/com/google/refine/model/medadata/validator/ValidateOperation.java rename to main/src/com/google/refine/model/metadata/validator/ValidateOperation.java index a7bbdcb55..bb918712a 100644 --- a/main/src/com/google/refine/model/medadata/validator/ValidateOperation.java +++ b/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; diff --git a/main/src/com/google/refine/model/metadata/validator/ValidatorConfig.java b/main/src/com/google/refine/model/metadata/validator/ValidatorConfig.java new file mode 100644 index 000000000..4057761fb --- /dev/null +++ b/main/src/com/google/refine/model/metadata/validator/ValidatorConfig.java @@ -0,0 +1,6 @@ +package com.google.refine.model.metadata.validator; + + +public class ValidatorConfig { + +} diff --git a/main/src/com/google/refine/model/metadata/validator/ValidatorExceptions.java b/main/src/com/google/refine/model/metadata/validator/ValidatorExceptions.java new file mode 100644 index 000000000..e023c689a --- /dev/null +++ b/main/src/com/google/refine/model/metadata/validator/ValidatorExceptions.java @@ -0,0 +1,6 @@ +package com.google.refine.model.metadata.validator; + + +public class ValidatorExceptions { + +} diff --git a/main/src/com/google/refine/model/medadata/validator/ValidatorInspector.java b/main/src/com/google/refine/model/metadata/validator/ValidatorInspector.java similarity index 95% rename from main/src/com/google/refine/model/medadata/validator/ValidatorInspector.java rename to main/src/com/google/refine/model/metadata/validator/ValidatorInspector.java index ca7972cc8..829001867 100644 --- a/main/src/com/google/refine/model/medadata/validator/ValidatorInspector.java +++ b/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.medadata.validator.checks.Validator; +import com.google.refine.model.metadata.validator.checks.TypeorFormatError; +import com.google.refine.model.metadata.validator.checks.Validator; import com.google.refine.util.JSONUtilities; public class ValidatorInspector { diff --git a/main/src/com/google/refine/model/medadata/validator/ValidatorRegistry.java b/main/src/com/google/refine/model/metadata/validator/ValidatorRegistry.java similarity index 73% rename from main/src/com/google/refine/model/medadata/validator/ValidatorRegistry.java rename to main/src/com/google/refine/model/metadata/validator/ValidatorRegistry.java index 3fe9d4e65..d4e7e6234 100644 --- a/main/src/com/google/refine/model/medadata/validator/ValidatorRegistry.java +++ b/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.medadata.validator.checks.MaximumConstraint; -import com.google.refine.model.medadata.validator.checks.MaximumLengthConstraint; -import com.google.refine.model.medadata.validator.checks.MinimumConstraint; -import com.google.refine.model.medadata.validator.checks.MinimumLengthConstraint; -import com.google.refine.model.medadata.validator.checks.PatternConstraint; -import com.google.refine.model.medadata.validator.checks.RequiredConstraint; +import com.google.refine.model.metadata.validator.checks.EnumerableConstraint; +import com.google.refine.model.metadata.validator.checks.MaximumConstraint; +import com.google.refine.model.metadata.validator.checks.MaximumLengthConstraint; +import com.google.refine.model.metadata.validator.checks.MinimumConstraint; +import com.google.refine.model.metadata.validator.checks.MinimumLengthConstraint; +import com.google.refine.model.metadata.validator.checks.PatternConstraint; +import com.google.refine.model.metadata.validator.checks.RequiredConstraint; import io.frictionlessdata.tableschema.Field; diff --git a/main/src/com/google/refine/model/medadata/validator/ValidatorSpec.java b/main/src/com/google/refine/model/metadata/validator/ValidatorSpec.java similarity index 93% rename from main/src/com/google/refine/model/medadata/validator/ValidatorSpec.java rename to main/src/com/google/refine/model/metadata/validator/ValidatorSpec.java index f32084615..94df475dd 100644 --- a/main/src/com/google/refine/model/medadata/validator/ValidatorSpec.java +++ b/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; diff --git a/main/src/com/google/refine/model/medadata/validator/checks/AbstractValidator.java b/main/src/com/google/refine/model/metadata/validator/checks/AbstractValidator.java similarity index 94% rename from main/src/com/google/refine/model/medadata/validator/checks/AbstractValidator.java rename to main/src/com/google/refine/model/metadata/validator/checks/AbstractValidator.java index 85b587280..d93958969 100644 --- a/main/src/com/google/refine/model/medadata/validator/checks/AbstractValidator.java +++ b/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() { diff --git a/main/src/com/google/refine/model/medadata/validator/checks/BlankHeader.java b/main/src/com/google/refine/model/metadata/validator/checks/BlankHeader.java similarity index 80% rename from main/src/com/google/refine/model/medadata/validator/checks/BlankHeader.java rename to main/src/com/google/refine/model/metadata/validator/checks/BlankHeader.java index 1f4fb39c4..7598ceef0 100644 --- a/main/src/com/google/refine/model/medadata/validator/checks/BlankHeader.java +++ b/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; diff --git a/main/src/com/google/refine/model/medadata/validator/checks/BlankRow.java b/main/src/com/google/refine/model/metadata/validator/checks/BlankRow.java similarity index 80% rename from main/src/com/google/refine/model/medadata/validator/checks/BlankRow.java rename to main/src/com/google/refine/model/metadata/validator/checks/BlankRow.java index 6f7262923..aeb5d2897 100644 --- a/main/src/com/google/refine/model/medadata/validator/checks/BlankRow.java +++ b/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; diff --git a/main/src/com/google/refine/model/medadata/validator/checks/DuplicateHeader.java b/main/src/com/google/refine/model/metadata/validator/checks/DuplicateHeader.java similarity index 81% rename from main/src/com/google/refine/model/medadata/validator/checks/DuplicateHeader.java rename to main/src/com/google/refine/model/metadata/validator/checks/DuplicateHeader.java index 957320423..61b21533a 100644 --- a/main/src/com/google/refine/model/medadata/validator/checks/DuplicateHeader.java +++ b/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; diff --git a/main/src/com/google/refine/model/medadata/validator/checks/DuplicateRow.java b/main/src/com/google/refine/model/metadata/validator/checks/DuplicateRow.java similarity index 80% rename from main/src/com/google/refine/model/medadata/validator/checks/DuplicateRow.java rename to main/src/com/google/refine/model/metadata/validator/checks/DuplicateRow.java index 3cab2a56b..07d31b2fd 100644 --- a/main/src/com/google/refine/model/medadata/validator/checks/DuplicateRow.java +++ b/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; diff --git a/main/src/com/google/refine/model/medadata/validator/checks/EnumerableConstraint.java b/main/src/com/google/refine/model/metadata/validator/checks/EnumerableConstraint.java similarity index 92% rename from main/src/com/google/refine/model/medadata/validator/checks/EnumerableConstraint.java rename to main/src/com/google/refine/model/metadata/validator/checks/EnumerableConstraint.java index e76f4e667..29bb266a4 100644 --- a/main/src/com/google/refine/model/medadata/validator/checks/EnumerableConstraint.java +++ b/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; diff --git a/main/src/com/google/refine/model/medadata/validator/checks/ExtraHeader.java b/main/src/com/google/refine/model/metadata/validator/checks/ExtraHeader.java similarity index 80% rename from main/src/com/google/refine/model/medadata/validator/checks/ExtraHeader.java rename to main/src/com/google/refine/model/metadata/validator/checks/ExtraHeader.java index d32608f94..d52f2b21a 100644 --- a/main/src/com/google/refine/model/medadata/validator/checks/ExtraHeader.java +++ b/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; diff --git a/main/src/com/google/refine/model/medadata/validator/checks/ExtraValue.java b/main/src/com/google/refine/model/metadata/validator/checks/ExtraValue.java similarity index 80% rename from main/src/com/google/refine/model/medadata/validator/checks/ExtraValue.java rename to main/src/com/google/refine/model/metadata/validator/checks/ExtraValue.java index 79e1a6751..213e9d46f 100644 --- a/main/src/com/google/refine/model/medadata/validator/checks/ExtraValue.java +++ b/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; diff --git a/main/src/com/google/refine/model/medadata/validator/checks/MaximumConstraint.java b/main/src/com/google/refine/model/metadata/validator/checks/MaximumConstraint.java similarity index 95% rename from main/src/com/google/refine/model/medadata/validator/checks/MaximumConstraint.java rename to main/src/com/google/refine/model/metadata/validator/checks/MaximumConstraint.java index 4b4e2df36..d937c5c81 100644 --- a/main/src/com/google/refine/model/medadata/validator/checks/MaximumConstraint.java +++ b/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; diff --git a/main/src/com/google/refine/model/medadata/validator/checks/MaximumLengthConstraint.java b/main/src/com/google/refine/model/metadata/validator/checks/MaximumLengthConstraint.java similarity index 91% rename from main/src/com/google/refine/model/medadata/validator/checks/MaximumLengthConstraint.java rename to main/src/com/google/refine/model/metadata/validator/checks/MaximumLengthConstraint.java index 076ec29ef..fddcc2b78 100644 --- a/main/src/com/google/refine/model/medadata/validator/checks/MaximumLengthConstraint.java +++ b/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; diff --git a/main/src/com/google/refine/model/medadata/validator/checks/MinimumConstraint.java b/main/src/com/google/refine/model/metadata/validator/checks/MinimumConstraint.java similarity index 95% rename from main/src/com/google/refine/model/medadata/validator/checks/MinimumConstraint.java rename to main/src/com/google/refine/model/metadata/validator/checks/MinimumConstraint.java index c01d3bd12..2ac90db56 100644 --- a/main/src/com/google/refine/model/medadata/validator/checks/MinimumConstraint.java +++ b/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; diff --git a/main/src/com/google/refine/model/medadata/validator/checks/MinimumLengthConstraint.java b/main/src/com/google/refine/model/metadata/validator/checks/MinimumLengthConstraint.java similarity index 93% rename from main/src/com/google/refine/model/medadata/validator/checks/MinimumLengthConstraint.java rename to main/src/com/google/refine/model/metadata/validator/checks/MinimumLengthConstraint.java index f8e423f1e..4b42e98f6 100644 --- a/main/src/com/google/refine/model/medadata/validator/checks/MinimumLengthConstraint.java +++ b/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; diff --git a/main/src/com/google/refine/model/medadata/validator/checks/MissingHeader.java b/main/src/com/google/refine/model/metadata/validator/checks/MissingHeader.java similarity index 81% rename from main/src/com/google/refine/model/medadata/validator/checks/MissingHeader.java rename to main/src/com/google/refine/model/metadata/validator/checks/MissingHeader.java index 8574ebe65..1c4f53797 100644 --- a/main/src/com/google/refine/model/medadata/validator/checks/MissingHeader.java +++ b/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; diff --git a/main/src/com/google/refine/model/medadata/validator/checks/MissingValue.java b/main/src/com/google/refine/model/metadata/validator/checks/MissingValue.java similarity index 80% rename from main/src/com/google/refine/model/medadata/validator/checks/MissingValue.java rename to main/src/com/google/refine/model/metadata/validator/checks/MissingValue.java index 6e730ba8e..b3a1d31cc 100644 --- a/main/src/com/google/refine/model/medadata/validator/checks/MissingValue.java +++ b/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; diff --git a/main/src/com/google/refine/model/medadata/validator/checks/NonMatchingHeader.java b/main/src/com/google/refine/model/metadata/validator/checks/NonMatchingHeader.java similarity index 81% rename from main/src/com/google/refine/model/medadata/validator/checks/NonMatchingHeader.java rename to main/src/com/google/refine/model/metadata/validator/checks/NonMatchingHeader.java index 110403c6e..355c238fc 100644 --- a/main/src/com/google/refine/model/medadata/validator/checks/NonMatchingHeader.java +++ b/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; diff --git a/main/src/com/google/refine/model/medadata/validator/checks/PatternConstraint.java b/main/src/com/google/refine/model/metadata/validator/checks/PatternConstraint.java similarity index 93% rename from main/src/com/google/refine/model/medadata/validator/checks/PatternConstraint.java rename to main/src/com/google/refine/model/metadata/validator/checks/PatternConstraint.java index 52798b9c6..f03a3a2b6 100644 --- a/main/src/com/google/refine/model/medadata/validator/checks/PatternConstraint.java +++ b/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; diff --git a/main/src/com/google/refine/model/medadata/validator/checks/RequiredConstraint.java b/main/src/com/google/refine/model/metadata/validator/checks/RequiredConstraint.java similarity index 91% rename from main/src/com/google/refine/model/medadata/validator/checks/RequiredConstraint.java rename to main/src/com/google/refine/model/metadata/validator/checks/RequiredConstraint.java index 7813b9506..4934434d1 100644 --- a/main/src/com/google/refine/model/medadata/validator/checks/RequiredConstraint.java +++ b/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; diff --git a/main/src/com/google/refine/model/medadata/validator/checks/TypeorFormatError.java b/main/src/com/google/refine/model/metadata/validator/checks/TypeorFormatError.java similarity index 96% rename from main/src/com/google/refine/model/medadata/validator/checks/TypeorFormatError.java rename to main/src/com/google/refine/model/metadata/validator/checks/TypeorFormatError.java index 6aaefcd27..c6d9d26ac 100644 --- a/main/src/com/google/refine/model/medadata/validator/checks/TypeorFormatError.java +++ b/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; diff --git a/main/src/com/google/refine/model/medadata/validator/checks/UniqueConstraint.java b/main/src/com/google/refine/model/metadata/validator/checks/UniqueConstraint.java similarity index 83% rename from main/src/com/google/refine/model/medadata/validator/checks/UniqueConstraint.java rename to main/src/com/google/refine/model/metadata/validator/checks/UniqueConstraint.java index 1f562362d..cfc9d344c 100644 --- a/main/src/com/google/refine/model/medadata/validator/checks/UniqueConstraint.java +++ b/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; diff --git a/main/src/com/google/refine/model/medadata/validator/checks/Validator.java b/main/src/com/google/refine/model/metadata/validator/checks/Validator.java similarity index 93% rename from main/src/com/google/refine/model/medadata/validator/checks/Validator.java rename to main/src/com/google/refine/model/metadata/validator/checks/Validator.java index ad064657a..5ea740d22 100644 --- a/main/src/com/google/refine/model/medadata/validator/checks/Validator.java +++ b/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; diff --git a/main/tests/server/src/com/google/refine/tests/ProjectManagerStub.java b/main/tests/server/src/com/google/refine/tests/ProjectManagerStub.java index 813f4e17d..92f8e685f 100644 --- a/main/tests/server/src/com/google/refine/tests/ProjectManagerStub.java +++ b/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.medadata.MetadataFormat; +import com.google.refine.model.metadata.IMetadata; +import com.google.refine.model.metadata.MetadataFormat; /** * Stub used to make protected methods public for testing diff --git a/main/tests/server/src/com/google/refine/tests/ProjectManagerTests.java b/main/tests/server/src/com/google/refine/tests/ProjectManagerTests.java index 9b34f400a..bfcdc2c35 100644 --- a/main/tests/server/src/com/google/refine/tests/ProjectManagerTests.java +++ b/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; diff --git a/main/tests/server/src/com/google/refine/tests/RefineTest.java b/main/tests/server/src/com/google/refine/tests/RefineTest.java index 7640ee55a..88d72c731 100644 --- a/main/tests/server/src/com/google/refine/tests/RefineTest.java +++ b/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; diff --git a/main/tests/server/src/com/google/refine/tests/browsing/facets/TextSearchFacetTests.java b/main/tests/server/src/com/google/refine/tests/browsing/facets/TextSearchFacetTests.java index 97bf45951..09c9ea754 100644 --- a/main/tests/server/src/com/google/refine/tests/browsing/facets/TextSearchFacetTests.java +++ b/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; diff --git a/main/tests/server/src/com/google/refine/tests/commands/project/SetProjectMetadataCommandTests.java b/main/tests/server/src/com/google/refine/tests/commands/project/SetProjectMetadataCommandTests.java index a405f09c3..9647684ba 100644 --- a/main/tests/server/src/com/google/refine/tests/commands/project/SetProjectMetadataCommandTests.java +++ b/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 { diff --git a/main/tests/server/src/com/google/refine/tests/commands/project/ValidateOperationTests.java b/main/tests/server/src/com/google/refine/tests/commands/project/ValidateOperationTests.java index 54af83701..528a43e60 100644 --- a/main/tests/server/src/com/google/refine/tests/commands/project/ValidateOperationTests.java +++ b/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.medadata.MetadataFactory; -import com.google.refine.model.medadata.MetadataFormat; -import com.google.refine.model.medadata.validator.ValidateOperation; +import com.google.refine.model.metadata.validator.ValidateOperation; +import com.google.refine.model.metadata.DataPackageMetadata; +import com.google.refine.model.metadata.MetadataFactory; +import com.google.refine.model.metadata.MetadataFormat; import com.google.refine.tests.importers.TsvCsvImporterTests; import com.google.refine.util.ParsingUtilities; diff --git a/main/tests/server/src/com/google/refine/tests/exporters/HtmlExporterTests.java b/main/tests/server/src/com/google/refine/tests/exporters/HtmlExporterTests.java index 46133ed3a..131a47ea2 100644 --- a/main/tests/server/src/com/google/refine/tests/exporters/HtmlExporterTests.java +++ b/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; diff --git a/main/tests/server/src/com/google/refine/tests/exporters/TemplatingExporterTests.java b/main/tests/server/src/com/google/refine/tests/exporters/TemplatingExporterTests.java index 49f23aa2f..439b2e22c 100644 --- a/main/tests/server/src/com/google/refine/tests/exporters/TemplatingExporterTests.java +++ b/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; diff --git a/main/tests/server/src/com/google/refine/tests/exporters/XlsExporterTests.java b/main/tests/server/src/com/google/refine/tests/exporters/XlsExporterTests.java index a3f00607c..a3a64b7a6 100644 --- a/main/tests/server/src/com/google/refine/tests/exporters/XlsExporterTests.java +++ b/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; diff --git a/main/tests/server/src/com/google/refine/tests/exporters/sql/SqlExporterTests.java b/main/tests/server/src/com/google/refine/tests/exporters/sql/SqlExporterTests.java index 7ddf0e4b5..bdd28f31d 100644 --- a/main/tests/server/src/com/google/refine/tests/exporters/sql/SqlExporterTests.java +++ b/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; diff --git a/main/tests/server/src/com/google/refine/tests/expr/functions/FunctionTests.java b/main/tests/server/src/com/google/refine/tests/expr/functions/FunctionTests.java index cb050e8aa..31815ab96 100644 --- a/main/tests/server/src/com/google/refine/tests/expr/functions/FunctionTests.java +++ b/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; diff --git a/main/tests/server/src/com/google/refine/tests/expr/functions/booleans/BooleanTests.java b/main/tests/server/src/com/google/refine/tests/expr/functions/booleans/BooleanTests.java index 0b57420bc..6279475a4 100644 --- a/main/tests/server/src/com/google/refine/tests/expr/functions/booleans/BooleanTests.java +++ b/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; diff --git a/main/tests/server/src/com/google/refine/tests/history/HistoryTests.java b/main/tests/server/src/com/google/refine/tests/history/HistoryTests.java index b29a7e56d..70e093de7 100644 --- a/main/tests/server/src/com/google/refine/tests/history/HistoryTests.java +++ b/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; diff --git a/main/tests/server/src/com/google/refine/tests/importers/ImporterTest.java b/main/tests/server/src/com/google/refine/tests/importers/ImporterTest.java index 3e1f033ed..7aca54e25 100644 --- a/main/tests/server/src/com/google/refine/tests/importers/ImporterTest.java +++ b/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; diff --git a/main/tests/server/src/com/google/refine/tests/importing/ImportingUtilitiesTests.java b/main/tests/server/src/com/google/refine/tests/importing/ImportingUtilitiesTests.java index c4a13daa6..9e591609c 100644 --- a/main/tests/server/src/com/google/refine/tests/importing/ImportingUtilitiesTests.java +++ b/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; diff --git a/main/tests/server/src/com/google/refine/tests/model/CacheTests.java b/main/tests/server/src/com/google/refine/tests/model/CacheTests.java index 8acb8f49b..fe0c38ab0 100644 --- a/main/tests/server/src/com/google/refine/tests/model/CacheTests.java +++ b/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; diff --git a/main/tests/server/src/com/google/refine/tests/model/TextSearchFacetTests.java b/main/tests/server/src/com/google/refine/tests/model/TextSearchFacetTests.java index 38ed2f299..85a30b63d 100644 --- a/main/tests/server/src/com/google/refine/tests/model/TextSearchFacetTests.java +++ b/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; diff --git a/main/tests/server/src/com/google/refine/tests/operations/cell/KeyValueColumnizeTests.java b/main/tests/server/src/com/google/refine/tests/operations/cell/KeyValueColumnizeTests.java index d44cdeaf1..3df3d868a 100644 --- a/main/tests/server/src/com/google/refine/tests/operations/cell/KeyValueColumnizeTests.java +++ b/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; diff --git a/main/tests/server/src/com/google/refine/tests/operations/cell/TransposeTests.java b/main/tests/server/src/com/google/refine/tests/operations/cell/TransposeTests.java index ad810eb08..fba73147d 100644 --- a/main/tests/server/src/com/google/refine/tests/operations/cell/TransposeTests.java +++ b/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; diff --git a/main/webapp/modules/core/MOD-INF/controller.js b/main/webapp/modules/core/MOD-INF/controller.js index be9e4a060..55ca73bcd 100644 --- a/main/webapp/modules/core/MOD-INF/controller.js +++ b/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,