s434730/RandomSec
3
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #1656 from OpenRefine/issue/1648

Browse Source 
fix the template load issue and package typo
This commit is contained in:
Antonin Delpeuch 2018-06-17 09:23:52 +01:00 committed by GitHub
commit 448a969cb1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
95 changed files with 138 additions and 138 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
extensions/database/src/com/google/refine/extension/database/DatabaseImportController.java
View File

@ -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;

2
extensions/database/test/com/google/refine/extension/database/DatabaseImportControllerTest.java
View File

@ -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;

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

@ -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{

2
extensions/gdata/src/com/google/refine/extension/gdata/FusionTableImporter.java
View File

@ -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;
/**

2
extensions/gdata/src/com/google/refine/extension/gdata/GDataImporter.java
View File

@ -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 {

2
extensions/gdata/src/com/google/refine/extension/gdata/GDataImportingController.java
View File

@ -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;

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

@ -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 {

4
main/src/com/google/refine/ProjectManager.java
View File

@ -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;

2
main/src/com/google/refine/commands/Command.java
View File

@ -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;

2
main/src/com/google/refine/commands/project/DeleteProjectCommand.java
View File

@ -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 {

6
main/src/com/google/refine/commands/project/GetMetadataCommand.java
View File

@ -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

2
main/src/com/google/refine/commands/project/ImportProjectCommand.java
View File

@ -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 {

4
main/src/com/google/refine/commands/project/PackageProjectCommand.java
View File

@ -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

2
main/src/com/google/refine/commands/project/RenameProjectCommand.java
View File

@ -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

2
main/src/com/google/refine/commands/project/SetProjectMetadataCommand.java
View File

@ -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

2
main/src/com/google/refine/commands/project/SetProjectTagsCommand.java
View File

@ -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

2
main/src/com/google/refine/commands/project/ValidateSchemaCommand.java
View File

@ -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 {

2
main/src/com/google/refine/commands/workspace/GetAllProjectMetadataCommand.java
View File

@ -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

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

@ -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 {

2
main/src/com/google/refine/importers/ExcelImporter.java
View File

@ -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;

2
main/src/com/google/refine/importers/FixedWidthImporter.java
View File

@ -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 {

2
main/src/com/google/refine/importers/ImportingParserBase.java
View File

@ -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 {

2
main/src/com/google/refine/importers/JsonImporter.java
View File

@ -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 {

2
main/src/com/google/refine/importers/LineBasedImporter.java
View File

@ -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 {

2
main/src/com/google/refine/importers/OdsImporter.java
View File

@ -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;

2
main/src/com/google/refine/importers/RdfTripleImporter.java
View File

@ -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;

2
main/src/com/google/refine/importers/SeparatorBasedImporter.java
View File

@ -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 {

2
main/src/com/google/refine/importers/TabularImportingParserBase.java
View File

@ -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 {

2
main/src/com/google/refine/importers/WikitextImporter.java
View File

@ -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;

2
main/src/com/google/refine/importers/XmlImporter.java
View File

@ -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 {

2
main/src/com/google/refine/importers/tree/TreeImportingParserBase.java
View File

@ -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;
/**

2
main/src/com/google/refine/importing/ImportingJob.java
View File

@ -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;

2
main/src/com/google/refine/importing/ImportingParser.java
View File

@ -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 {
/**

12
main/src/com/google/refine/importing/ImportingUtilities.java
View File

@ -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;

8
main/src/com/google/refine/io/FileProjectManager.java
View File

@ -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;

4
main/src/com/google/refine/io/ProjectMetadataUtilities.java
View File

@ -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");

6
main/src/com/google/refine/io/ProjectUtilities.java
View File

@ -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;

2
main/src/com/google/refine/model/Project.java
View File

@ -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;

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

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

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

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

2
main/src/com/google/refine/model/medadata/AbstractMetadata.java → main/src/com/google/refine/model/metadata/AbstractMetadata.java
View File

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

2
main/src/com/google/refine/model/medadata/DataPackageMetadata.java → main/src/com/google/refine/model/metadata/DataPackageMetadata.java
View File

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

2
main/src/com/google/refine/model/medadata/DataPackageUrlRewriter.java → main/src/com/google/refine/model/metadata/DataPackageUrlRewriter.java
View File

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

2
main/src/com/google/refine/model/medadata/IMetadata.java → main/src/com/google/refine/model/metadata/IMetadata.java
View File

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

2
main/src/com/google/refine/model/medadata/MetadataFactory.java → main/src/com/google/refine/model/metadata/MetadataFactory.java
View File

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

2
main/src/com/google/refine/model/medadata/MetadataFormat.java → main/src/com/google/refine/model/metadata/MetadataFormat.java
View File

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

12
main/src/com/google/refine/model/medadata/PackageExtension.java → main/src/com/google/refine/model/metadata/PackageExtension.java
View File

@ -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) {

2
main/src/com/google/refine/model/medadata/ProjectMetadata.java → main/src/com/google/refine/model/metadata/ProjectMetadata.java
View File

@ -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;

2
main/src/com/google/refine/model/medadata/SchemaExtension.java → main/src/com/google/refine/model/metadata/SchemaExtension.java
View File

@ -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;

2
main/src/com/google/refine/model/medadata/validator/ValidateOperation.java → main/src/com/google/refine/model/metadata/validator/ValidateOperation.java
View File

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

6
main/src/com/google/refine/model/metadata/validator/ValidatorConfig.java Normal file
View File

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

6
main/src/com/google/refine/model/metadata/validator/ValidatorExceptions.java Normal file
View File

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

6
main/src/com/google/refine/model/medadata/validator/ValidatorInspector.java → main/src/com/google/refine/model/metadata/validator/ValidatorInspector.java
View File

@ -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 {

16
main/src/com/google/refine/model/medadata/validator/ValidatorRegistry.java → main/src/com/google/refine/model/metadata/validator/ValidatorRegistry.java
View File

@ -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;

2
main/src/com/google/refine/model/medadata/validator/ValidatorSpec.java → main/src/com/google/refine/model/metadata/validator/ValidatorSpec.java
View File

@ -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;

6
main/src/com/google/refine/model/medadata/validator/checks/AbstractValidator.java → main/src/com/google/refine/model/metadata/validator/checks/AbstractValidator.java
View File

@ -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() {

2
main/src/com/google/refine/model/medadata/validator/checks/BlankHeader.java → main/src/com/google/refine/model/metadata/validator/checks/BlankHeader.java
View File

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

2
main/src/com/google/refine/model/medadata/validator/checks/BlankRow.java → main/src/com/google/refine/model/metadata/validator/checks/BlankRow.java
View File

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

2
main/src/com/google/refine/model/medadata/validator/checks/DuplicateHeader.java → main/src/com/google/refine/model/metadata/validator/checks/DuplicateHeader.java
View File

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

2
main/src/com/google/refine/model/medadata/validator/checks/DuplicateRow.java → main/src/com/google/refine/model/metadata/validator/checks/DuplicateRow.java
View File

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

2
main/src/com/google/refine/model/medadata/validator/checks/EnumerableConstraint.java → main/src/com/google/refine/model/metadata/validator/checks/EnumerableConstraint.java
View File

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

2
main/src/com/google/refine/model/medadata/validator/checks/ExtraHeader.java → main/src/com/google/refine/model/metadata/validator/checks/ExtraHeader.java
View File

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

2
main/src/com/google/refine/model/medadata/validator/checks/ExtraValue.java → main/src/com/google/refine/model/metadata/validator/checks/ExtraValue.java
View File

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

2
main/src/com/google/refine/model/medadata/validator/checks/MaximumConstraint.java → main/src/com/google/refine/model/metadata/validator/checks/MaximumConstraint.java
View File

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

2
main/src/com/google/refine/model/medadata/validator/checks/MaximumLengthConstraint.java → main/src/com/google/refine/model/metadata/validator/checks/MaximumLengthConstraint.java
View File

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

2
main/src/com/google/refine/model/medadata/validator/checks/MinimumConstraint.java → main/src/com/google/refine/model/metadata/validator/checks/MinimumConstraint.java
View File

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

2
main/src/com/google/refine/model/medadata/validator/checks/MinimumLengthConstraint.java → main/src/com/google/refine/model/metadata/validator/checks/MinimumLengthConstraint.java
View File

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

2
main/src/com/google/refine/model/medadata/validator/checks/MissingHeader.java → main/src/com/google/refine/model/metadata/validator/checks/MissingHeader.java
View File

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

2
main/src/com/google/refine/model/medadata/validator/checks/MissingValue.java → main/src/com/google/refine/model/metadata/validator/checks/MissingValue.java
View File

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

2
main/src/com/google/refine/model/medadata/validator/checks/NonMatchingHeader.java → main/src/com/google/refine/model/metadata/validator/checks/NonMatchingHeader.java
View File

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

2
main/src/com/google/refine/model/medadata/validator/checks/PatternConstraint.java → main/src/com/google/refine/model/metadata/validator/checks/PatternConstraint.java
View File

@ -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;

2
main/src/com/google/refine/model/medadata/validator/checks/RequiredConstraint.java → main/src/com/google/refine/model/metadata/validator/checks/RequiredConstraint.java
View File

@ -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;

2
main/src/com/google/refine/model/medadata/validator/checks/TypeorFormatError.java → main/src/com/google/refine/model/metadata/validator/checks/TypeorFormatError.java
View File

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

2
main/src/com/google/refine/model/medadata/validator/checks/UniqueConstraint.java → main/src/com/google/refine/model/metadata/validator/checks/UniqueConstraint.java
View File

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

2
main/src/com/google/refine/model/medadata/validator/checks/Validator.java → main/src/com/google/refine/model/metadata/validator/checks/Validator.java
View File

@ -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;

4
main/tests/server/src/com/google/refine/tests/ProjectManagerStub.java
View File

@ -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

2
main/tests/server/src/com/google/refine/tests/ProjectManagerTests.java
View File

@ -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;

2
main/tests/server/src/com/google/refine/tests/RefineTest.java
View File

@ -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;

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

@ -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;

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

@ -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 {

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

@ -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;

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

@ -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;

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

@ -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;

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

@ -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;

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

@ -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;

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

@ -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;

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

@ -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;

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

@ -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;

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

@ -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;

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

@ -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;

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

@ -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;

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

@ -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;

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

@ -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;

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

@ -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;

2
main/webapp/modules/core/MOD-INF/controller.js
View File

@ -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,