diff --git a/core/lib/Drupal/Core/Config/ConfigInstaller.php b/core/lib/Drupal/Core/Config/ConfigInstaller.php index ffdc760..9b3d7bf 100644 --- a/core/lib/Drupal/Core/Config/ConfigInstaller.php +++ b/core/lib/Drupal/Core/Config/ConfigInstaller.php @@ -477,12 +477,6 @@ protected function findDefaultConfigWithUnmetDependencies(StorageInterface $stor * TRUE if the dependencies are met, FALSE if not. */ protected function validateDependencies($config_name, array $data, array $enabled_extensions, array $all_config) { - // All the migrate tests will fail if we check since they install the - // migrate_drupal module but only set up the dependencies for the single - // migration they are testing. - if (strpos($config_name, 'migrate.migration.') === 0) { - return TRUE; - } if (isset($data['dependencies'])) { $all_dependencies = $data['dependencies']; diff --git a/core/modules/migrate/config/schema/migrate.data_types.schema.yml b/core/modules/migrate/config/schema/migrate.data_types.schema.yml deleted file mode 100644 index edb628a..0000000 --- a/core/modules/migrate/config/schema/migrate.data_types.schema.yml +++ /dev/null @@ -1,29 +0,0 @@ -# Basic data types for Migrate. - -migrate_plugin: - type: mapping - mapping: - plugin: - type: string - label: 'Plugin' - -migrate_destination: - type: migrate_plugin - label: 'Destination' - -migrate_source: - type: migrate_plugin - label: 'Source' - -# Base schema for migrate source plugins that extend -# \Drupal\migrate\Plugin\migrate\source\SqlBase. -migrate_source_sql: - type: migrate_source - mapping: - target: - type: string - label: 'The migration database target' - -migrate_load: - type: migrate_plugin - label: 'Load' diff --git a/core/modules/migrate/config/schema/migrate.destination.schema.yml b/core/modules/migrate/config/schema/migrate.destination.schema.yml deleted file mode 100644 index 139164d..0000000 --- a/core/modules/migrate/config/schema/migrate.destination.schema.yml +++ /dev/null @@ -1,34 +0,0 @@ -# Schema for the migrate destination plugins. - -migrate.destination.*: - type: migrate_destination - label: 'Default destination' - mapping: - no_stub: - type: boolean - label: 'Whether stubbing is allowed.' - default: false - -migrate.destination.config: - type: migrate_destination - label: 'Config' - mapping: - config_name: - type: string - label: 'Configuration name' - -migrate.destination.entity:user: - type: migrate_destination - label: 'User' - mapping: - md5_passwords: - type: boolean - label: 'Passwords' - -migrate.destination.entity:file: - type: migrate_destination - label: 'Picture' - mapping: - source_path_property: - type: string - label: 'Source path' diff --git a/core/modules/migrate/config/schema/migrate.load.schema.yml b/core/modules/migrate/config/schema/migrate.load.schema.yml deleted file mode 100644 index aab9469..0000000 --- a/core/modules/migrate/config/schema/migrate.load.schema.yml +++ /dev/null @@ -1,21 +0,0 @@ -# Schema for the migrate load plugins. - -migrate.load.*: - type: migrate_load - label: 'Default load' - -migrate.load.drupal_entity: - type: migrate_load - label: 'Default source' - mapping: - bundle_migration: - type: string - label: 'Bundle migration' - -migrate.load.d6_term_node: - type: migrate_load - label: 'Default source' - mapping: - bundle_migration: - type: string - label: 'Bundle migration' diff --git a/core/modules/migrate/config/schema/migrate.schema.yml b/core/modules/migrate/config/schema/migrate.schema.yml deleted file mode 100644 index c48bdd1..0000000 --- a/core/modules/migrate/config/schema/migrate.schema.yml +++ /dev/null @@ -1,46 +0,0 @@ -# Schema for the configuration files of the Migrate module. - -migrate.migration.*: - type: config_entity - label: 'Migration' - mapping: - id: - type: string - label: 'ID' - migration_groups: - type: sequence - label: 'Migration Groups' - sequence: - type: string - label: 'Group' - label: - type: label - label: 'Label' - load: - type: migrate.load.[plugin] - label: 'Source' - source: - type: migrate.source.[plugin] - label: 'Source' - process: - type: ignore - label: 'Process' - destination: - type: migrate.destination.[plugin] - label: 'Destination' - migration_dependencies: - type: mapping - label: 'Dependencies' - mapping: - required: - type: sequence - label: 'Required dependencies' - sequence: - type: string - label: 'Dependency' - optional: - type: sequence - label: 'Optional dependencies' - sequence: - type: string - label: 'Dependency' diff --git a/core/modules/migrate/config/schema/migrate.source.schema.yml b/core/modules/migrate/config/schema/migrate.source.schema.yml deleted file mode 100644 index d9101a0..0000000 --- a/core/modules/migrate/config/schema/migrate.source.schema.yml +++ /dev/null @@ -1,16 +0,0 @@ -# Schema for the migrate source plugins. - -migrate.source.*: - type: migrate_source - label: 'Default source' - -migrate.source.empty: - type: migrate_source_sql - label: 'Empty source' - mapping: - provider: - type: string - label: 'Provider' - constants: - type: ignore - label: 'Constants' diff --git a/core/modules/migrate/src/Entity/Migration.php b/core/modules/migrate/src/Entity/Migration.php index 42d9a7a..b12032c 100644 --- a/core/modules/migrate/src/Entity/Migration.php +++ b/core/modules/migrate/src/Entity/Migration.php @@ -9,6 +9,7 @@ use Drupal\Component\Utility\SafeMarkup; use Drupal\Core\Config\Entity\ConfigEntityBase; +use Drupal\Core\Entity\Entity; use Drupal\migrate\Exception\RequirementsException; use Drupal\migrate\MigrateException; use Drupal\migrate\MigrateSkipRowException; @@ -22,7 +23,7 @@ * The migration entity stores the information about a single migration, like * the source, process and destination plugins. * - * @ConfigEntityType( + * @EntityType( * id = "migration", * label = @Translation("Migration"), * module = "migrate", @@ -33,10 +34,11 @@ * "id" = "id", * "label" = "label", * "weight" = "weight" - * } + * }, + * static_cache = false * ) */ -class Migration extends ConfigEntityBase implements MigrationInterface, RequirementsInterface { +class Migration extends Entity implements MigrationInterface, RequirementsInterface { /** * The migration ID (machine name). @@ -400,9 +402,16 @@ public function set($property_name, $value) { // Invalidate the source plugin. unset($this->sourcePlugin); } - return parent::set($property_name, $value); + $this->{$property_name} = $value; + return $this; } + /** + * {@inheritdoc} + */ + public function get($property_name) { + return isset($this->{$property_name}) ? $this->{$property_name} : NULL; + } /** * {@inheritdoc} @@ -480,4 +489,21 @@ public function setTrackLastImported($track_last_imported) { public function getMigrationDependencies() { return $this->migration_dependencies; } + + /** + * {@inheritdoc} + */ + public function toArray() { + return [ + 'id' => $this->id(), + 'label' => $this->label(), + 'migration_groups' => $this->get('migration_groups'), + 'load' => $this->get('load'), + 'source' => $this->get('source'), + 'process' => $this->get('process'), + 'destination' => $this->get('destination'), + 'migration_dependencies' => $this->getMigrationDependencies(), + ]; + } + } diff --git a/core/modules/migrate/src/Entity/MigrationInterface.php b/core/modules/migrate/src/Entity/MigrationInterface.php index 793e719..59097fe 100644 --- a/core/modules/migrate/src/Entity/MigrationInterface.php +++ b/core/modules/migrate/src/Entity/MigrationInterface.php @@ -7,12 +7,12 @@ namespace Drupal\migrate\Entity; -use Drupal\Core\Config\Entity\ConfigEntityInterface; +use Drupal\Core\Entity\EntityInterface; /** * Interface for migrations. */ -interface MigrationInterface extends ConfigEntityInterface { +interface MigrationInterface extends EntityInterface { /** * A constant used for systemOfRecord. @@ -100,6 +100,17 @@ const RESULT_DISABLED = 6; /** + * Returns the value of a property. + * + * @param string $property_name + * The name of the property that should be returned. + * + * @return mixed + * The property if it exists, or NULL otherwise. + */ + public function get($property_name); + + /** * Returns the initialized source plugin. * * @return \Drupal\migrate\Plugin\MigrateSourceInterface diff --git a/core/modules/migrate/src/MigrationStorage.php b/core/modules/migrate/src/MigrationStorage.php index 3d0454e..0d3aebf 100644 --- a/core/modules/migrate/src/MigrationStorage.php +++ b/core/modules/migrate/src/MigrationStorage.php @@ -9,11 +9,159 @@ use Drupal\Component\Graph\Graph; use Drupal\Core\Config\Entity\ConfigEntityStorage; +use Drupal\Core\Config\ExtensionInstallStorage; +use Drupal\Core\Config\StorageInterface; +use Drupal\Core\Entity\EntityInterface; +use Drupal\Core\Entity\EntityStorageBase; +use Drupal\Core\Entity\EntityTypeInterface; +use Drupal\Core\Extension\ModuleHandlerInterface; +use Symfony\Component\DependencyInjection\ContainerInterface; /** * Storage for migration entities. */ -class MigrationStorage extends ConfigEntityStorage implements MigrateBuildDependencyInterface { +class MigrationStorage extends EntityStorageBase implements MigrateBuildDependencyInterface { + + /** + * Length limit of the configuration entity ID. + * + * Most file systems limit a file name's length to 255 characters, so + * ConfigBase::MAX_NAME_LENGTH restricts the full configuration object name + * to 250 characters (leaving 5 for the file extension). The config prefix + * is limited by ConfigEntityType::PREFIX_LENGTH to 83 characters, so this + * leaves 166 remaining characters for the configuration entity ID, with 1 + * additional character needed for the joining dot. + * + * @see \Drupal\Core\Config\ConfigBase::MAX_NAME_LENGTH + * @see \Drupal\Core\Config\Entity\ConfigEntityType::PREFIX_LENGTH + * + * @todo fix to be correct. + */ + const MAX_ID_LENGTH = 166; + + const MIGRATION_DIRECTORY = 'migrations'; + + /** + * {@inheritdoc} + */ + protected $uuidKey = 'uuid'; + + /** + * Static cache of entities, keyed first by entity ID, then by an extra key. + * + * The additional cache key is to maintain separate caches for different + * states of config overrides. + * + * @var array + * @see \Drupal\Core\Config\ConfigFactoryInterface::getCacheKeys(). + */ + protected $entities = array(); + + /** + * Constructs a MigrationStorage object. + + */ + public function __construct(EntityTypeInterface $entity_type, StorageInterface $config_storage) { + parent::__construct($entity_type); + $this->fileStorage = new ExtensionInstallStorage($config_storage, static::MIGRATION_DIRECTORY); + } + + /** + * {@inheritdoc} + */ + public static function createInstance(ContainerInterface $container, EntityTypeInterface $entity_type) { + return new static( + $entity_type, + $container->get('config.storage') + ); + } + + /** + * {@inheritdoc} + */ + public function loadRevision($revision_id) { + return NULL; + } + + /** + * Implements Drupal\Core\Entity\EntityStorageInterface::deleteRevision(). + */ + public function deleteRevision($revision_id) { + return NULL; + } + + /** + * Returns the prefix used to create the configuration name. + * + * The prefix consists of the config prefix from the entity type plus a dot + * for separating from the ID. + * + * @return string + * The full configuration prefix, for example 'views.view.'. + */ + protected function getPrefix() { + return 'migrate.migration.'; + } + + /** + * {@inheritdoc} + */ + protected function doLoadMultiple(array $ids = NULL) { + $prefix = $this->getPrefix(); + + // Get the names of the configuration entities we are going to load. + if ($ids === NULL) { + $names = $this->fileStorage->listAll($prefix); + } + else { + $names = array(); + foreach ($ids as $id) { + // Add the prefix to the ID to serve as the configuration object name. + $names[] = $prefix . $id; + } + } + + // Load all of the configuration entities. + return $this->mapFromStorageRecords($this->fileStorage->readMultiple($names)); + } + + /** + * {@inheritdoc} + */ + protected function doDelete($entities) { + throw new \RuntimeException('nope'); + } + + /** + * {@inheritdoc} + */ + public function save(EntityInterface $entity) { + throw new \RuntimeException('nope'); + } + + /** + * {@inheritdoc} + */ + protected function doSave($id, EntityInterface $entity) { + throw new \RuntimeException('nope'); + } + + + /** + * {@inheritdoc} + */ + protected function has($id, EntityInterface $entity) { + $prefix = $this->getPrefix(); + return $this->fileStorage->exists($prefix . $id); + } + + /** + * {@inheritdoc} + */ + protected function getQueryServiceName() { + // @todo bit of a mess? + return 'entity.query.config'; + } /** * {@inheritdoc} diff --git a/core/modules/migrate_drupal/migrate_drupal.module b/core/modules/migrate_drupal/migrate_drupal.module index f76e67c..967ef6d 100644 --- a/core/modules/migrate_drupal/migrate_drupal.module +++ b/core/modules/migrate_drupal/migrate_drupal.module @@ -4,6 +4,7 @@ * Implements hook_entity_type_alter(). */ function migrate_drupal_entity_type_alter(array &$entity_types) { + $a = 1; /** @var \Drupal\Core\Config\Entity\ConfigEntityType[] $entity_types */ $entity_types['migration'] ->setClass('Drupal\migrate_drupal\Entity\Migration') diff --git a/core/modules/migrate_drupal/config/install/migrate.migration.d6_action_settings.yml b/core/modules/migrate_drupal/migrations/migrate.migration.d6_action_settings.yml similarity index 100% rename from core/modules/migrate_drupal/config/install/migrate.migration.d6_action_settings.yml rename to core/modules/migrate_drupal/migrations/migrate.migration.d6_action_settings.yml diff --git a/core/modules/migrate_drupal/config/install/migrate.migration.d6_aggregator_feed.yml b/core/modules/migrate_drupal/migrations/migrate.migration.d6_aggregator_feed.yml similarity index 100% rename from core/modules/migrate_drupal/config/install/migrate.migration.d6_aggregator_feed.yml rename to core/modules/migrate_drupal/migrations/migrate.migration.d6_aggregator_feed.yml diff --git a/core/modules/migrate_drupal/config/install/migrate.migration.d6_aggregator_item.yml b/core/modules/migrate_drupal/migrations/migrate.migration.d6_aggregator_item.yml similarity index 100% rename from core/modules/migrate_drupal/config/install/migrate.migration.d6_aggregator_item.yml rename to core/modules/migrate_drupal/migrations/migrate.migration.d6_aggregator_item.yml diff --git a/core/modules/migrate_drupal/config/install/migrate.migration.d6_aggregator_settings.yml b/core/modules/migrate_drupal/migrations/migrate.migration.d6_aggregator_settings.yml similarity index 100% rename from core/modules/migrate_drupal/config/install/migrate.migration.d6_aggregator_settings.yml rename to core/modules/migrate_drupal/migrations/migrate.migration.d6_aggregator_settings.yml diff --git a/core/modules/migrate_drupal/config/install/migrate.migration.d6_block.yml b/core/modules/migrate_drupal/migrations/migrate.migration.d6_block.yml similarity index 100% rename from core/modules/migrate_drupal/config/install/migrate.migration.d6_block.yml rename to core/modules/migrate_drupal/migrations/migrate.migration.d6_block.yml diff --git a/core/modules/migrate_drupal/config/install/migrate.migration.d6_block_content_body_field.yml b/core/modules/migrate_drupal/migrations/migrate.migration.d6_block_content_body_field.yml similarity index 100% rename from core/modules/migrate_drupal/config/install/migrate.migration.d6_block_content_body_field.yml rename to core/modules/migrate_drupal/migrations/migrate.migration.d6_block_content_body_field.yml diff --git a/core/modules/migrate_drupal/config/install/migrate.migration.d6_block_content_type.yml b/core/modules/migrate_drupal/migrations/migrate.migration.d6_block_content_type.yml similarity index 100% rename from core/modules/migrate_drupal/config/install/migrate.migration.d6_block_content_type.yml rename to core/modules/migrate_drupal/migrations/migrate.migration.d6_block_content_type.yml diff --git a/core/modules/migrate_drupal/config/install/migrate.migration.d6_book.yml b/core/modules/migrate_drupal/migrations/migrate.migration.d6_book.yml similarity index 100% rename from core/modules/migrate_drupal/config/install/migrate.migration.d6_book.yml rename to core/modules/migrate_drupal/migrations/migrate.migration.d6_book.yml diff --git a/core/modules/migrate_drupal/config/install/migrate.migration.d6_book_settings.yml b/core/modules/migrate_drupal/migrations/migrate.migration.d6_book_settings.yml similarity index 100% rename from core/modules/migrate_drupal/config/install/migrate.migration.d6_book_settings.yml rename to core/modules/migrate_drupal/migrations/migrate.migration.d6_book_settings.yml diff --git a/core/modules/migrate_drupal/config/install/migrate.migration.d6_cck_field_revision.yml b/core/modules/migrate_drupal/migrations/migrate.migration.d6_cck_field_revision.yml similarity index 100% rename from core/modules/migrate_drupal/config/install/migrate.migration.d6_cck_field_revision.yml rename to core/modules/migrate_drupal/migrations/migrate.migration.d6_cck_field_revision.yml diff --git a/core/modules/migrate_drupal/config/install/migrate.migration.d6_cck_field_values.yml b/core/modules/migrate_drupal/migrations/migrate.migration.d6_cck_field_values.yml similarity index 100% rename from core/modules/migrate_drupal/config/install/migrate.migration.d6_cck_field_values.yml rename to core/modules/migrate_drupal/migrations/migrate.migration.d6_cck_field_values.yml diff --git a/core/modules/migrate_drupal/config/install/migrate.migration.d6_comment.yml b/core/modules/migrate_drupal/migrations/migrate.migration.d6_comment.yml similarity index 100% rename from core/modules/migrate_drupal/config/install/migrate.migration.d6_comment.yml rename to core/modules/migrate_drupal/migrations/migrate.migration.d6_comment.yml diff --git a/core/modules/migrate_drupal/config/install/migrate.migration.d6_comment_entity_display.yml b/core/modules/migrate_drupal/migrations/migrate.migration.d6_comment_entity_display.yml similarity index 100% rename from core/modules/migrate_drupal/config/install/migrate.migration.d6_comment_entity_display.yml rename to core/modules/migrate_drupal/migrations/migrate.migration.d6_comment_entity_display.yml diff --git a/core/modules/migrate_drupal/config/install/migrate.migration.d6_comment_entity_form_display.yml b/core/modules/migrate_drupal/migrations/migrate.migration.d6_comment_entity_form_display.yml similarity index 100% rename from core/modules/migrate_drupal/config/install/migrate.migration.d6_comment_entity_form_display.yml rename to core/modules/migrate_drupal/migrations/migrate.migration.d6_comment_entity_form_display.yml diff --git a/core/modules/migrate_drupal/config/install/migrate.migration.d6_comment_entity_form_display_subject.yml b/core/modules/migrate_drupal/migrations/migrate.migration.d6_comment_entity_form_display_subject.yml similarity index 100% rename from core/modules/migrate_drupal/config/install/migrate.migration.d6_comment_entity_form_display_subject.yml rename to core/modules/migrate_drupal/migrations/migrate.migration.d6_comment_entity_form_display_subject.yml diff --git a/core/modules/migrate_drupal/config/install/migrate.migration.d6_comment_field.yml b/core/modules/migrate_drupal/migrations/migrate.migration.d6_comment_field.yml similarity index 100% rename from core/modules/migrate_drupal/config/install/migrate.migration.d6_comment_field.yml rename to core/modules/migrate_drupal/migrations/migrate.migration.d6_comment_field.yml diff --git a/core/modules/migrate_drupal/config/install/migrate.migration.d6_comment_field_instance.yml b/core/modules/migrate_drupal/migrations/migrate.migration.d6_comment_field_instance.yml similarity index 100% rename from core/modules/migrate_drupal/config/install/migrate.migration.d6_comment_field_instance.yml rename to core/modules/migrate_drupal/migrations/migrate.migration.d6_comment_field_instance.yml diff --git a/core/modules/migrate_drupal/config/install/migrate.migration.d6_comment_type.yml b/core/modules/migrate_drupal/migrations/migrate.migration.d6_comment_type.yml similarity index 100% rename from core/modules/migrate_drupal/config/install/migrate.migration.d6_comment_type.yml rename to core/modules/migrate_drupal/migrations/migrate.migration.d6_comment_type.yml diff --git a/core/modules/migrate_drupal/config/install/migrate.migration.d6_contact_category.yml b/core/modules/migrate_drupal/migrations/migrate.migration.d6_contact_category.yml similarity index 100% rename from core/modules/migrate_drupal/config/install/migrate.migration.d6_contact_category.yml rename to core/modules/migrate_drupal/migrations/migrate.migration.d6_contact_category.yml diff --git a/core/modules/migrate_drupal/config/install/migrate.migration.d6_contact_settings.yml b/core/modules/migrate_drupal/migrations/migrate.migration.d6_contact_settings.yml similarity index 100% rename from core/modules/migrate_drupal/config/install/migrate.migration.d6_contact_settings.yml rename to core/modules/migrate_drupal/migrations/migrate.migration.d6_contact_settings.yml diff --git a/core/modules/migrate_drupal/config/install/migrate.migration.d6_custom_block.yml b/core/modules/migrate_drupal/migrations/migrate.migration.d6_custom_block.yml similarity index 100% rename from core/modules/migrate_drupal/config/install/migrate.migration.d6_custom_block.yml rename to core/modules/migrate_drupal/migrations/migrate.migration.d6_custom_block.yml diff --git a/core/modules/migrate_drupal/config/install/migrate.migration.d6_date_formats.yml b/core/modules/migrate_drupal/migrations/migrate.migration.d6_date_formats.yml similarity index 100% rename from core/modules/migrate_drupal/config/install/migrate.migration.d6_date_formats.yml rename to core/modules/migrate_drupal/migrations/migrate.migration.d6_date_formats.yml diff --git a/core/modules/migrate_drupal/config/install/migrate.migration.d6_dblog_settings.yml b/core/modules/migrate_drupal/migrations/migrate.migration.d6_dblog_settings.yml similarity index 100% rename from core/modules/migrate_drupal/config/install/migrate.migration.d6_dblog_settings.yml rename to core/modules/migrate_drupal/migrations/migrate.migration.d6_dblog_settings.yml diff --git a/core/modules/migrate_drupal/config/install/migrate.migration.d6_field.yml b/core/modules/migrate_drupal/migrations/migrate.migration.d6_field.yml similarity index 100% rename from core/modules/migrate_drupal/config/install/migrate.migration.d6_field.yml rename to core/modules/migrate_drupal/migrations/migrate.migration.d6_field.yml diff --git a/core/modules/migrate_drupal/config/install/migrate.migration.d6_field_formatter_settings.yml b/core/modules/migrate_drupal/migrations/migrate.migration.d6_field_formatter_settings.yml similarity index 100% rename from core/modules/migrate_drupal/config/install/migrate.migration.d6_field_formatter_settings.yml rename to core/modules/migrate_drupal/migrations/migrate.migration.d6_field_formatter_settings.yml diff --git a/core/modules/migrate_drupal/config/install/migrate.migration.d6_field_instance.yml b/core/modules/migrate_drupal/migrations/migrate.migration.d6_field_instance.yml similarity index 100% rename from core/modules/migrate_drupal/config/install/migrate.migration.d6_field_instance.yml rename to core/modules/migrate_drupal/migrations/migrate.migration.d6_field_instance.yml diff --git a/core/modules/migrate_drupal/config/install/migrate.migration.d6_field_instance_widget_settings.yml b/core/modules/migrate_drupal/migrations/migrate.migration.d6_field_instance_widget_settings.yml similarity index 100% rename from core/modules/migrate_drupal/config/install/migrate.migration.d6_field_instance_widget_settings.yml rename to core/modules/migrate_drupal/migrations/migrate.migration.d6_field_instance_widget_settings.yml diff --git a/core/modules/migrate_drupal/config/install/migrate.migration.d6_file.yml b/core/modules/migrate_drupal/migrations/migrate.migration.d6_file.yml similarity index 100% rename from core/modules/migrate_drupal/config/install/migrate.migration.d6_file.yml rename to core/modules/migrate_drupal/migrations/migrate.migration.d6_file.yml diff --git a/core/modules/migrate_drupal/config/install/migrate.migration.d6_file_settings.yml b/core/modules/migrate_drupal/migrations/migrate.migration.d6_file_settings.yml similarity index 100% rename from core/modules/migrate_drupal/config/install/migrate.migration.d6_file_settings.yml rename to core/modules/migrate_drupal/migrations/migrate.migration.d6_file_settings.yml diff --git a/core/modules/migrate_drupal/config/install/migrate.migration.d6_filter_format.yml b/core/modules/migrate_drupal/migrations/migrate.migration.d6_filter_format.yml similarity index 100% rename from core/modules/migrate_drupal/config/install/migrate.migration.d6_filter_format.yml rename to core/modules/migrate_drupal/migrations/migrate.migration.d6_filter_format.yml diff --git a/core/modules/migrate_drupal/config/install/migrate.migration.d6_forum_settings.yml b/core/modules/migrate_drupal/migrations/migrate.migration.d6_forum_settings.yml similarity index 100% rename from core/modules/migrate_drupal/config/install/migrate.migration.d6_forum_settings.yml rename to core/modules/migrate_drupal/migrations/migrate.migration.d6_forum_settings.yml diff --git a/core/modules/migrate_drupal/config/install/migrate.migration.d6_locale_settings.yml b/core/modules/migrate_drupal/migrations/migrate.migration.d6_locale_settings.yml similarity index 100% rename from core/modules/migrate_drupal/config/install/migrate.migration.d6_locale_settings.yml rename to core/modules/migrate_drupal/migrations/migrate.migration.d6_locale_settings.yml diff --git a/core/modules/migrate_drupal/config/install/migrate.migration.d6_menu.yml b/core/modules/migrate_drupal/migrations/migrate.migration.d6_menu.yml similarity index 100% rename from core/modules/migrate_drupal/config/install/migrate.migration.d6_menu.yml rename to core/modules/migrate_drupal/migrations/migrate.migration.d6_menu.yml diff --git a/core/modules/migrate_drupal/config/install/migrate.migration.d6_menu_links.yml b/core/modules/migrate_drupal/migrations/migrate.migration.d6_menu_links.yml similarity index 100% rename from core/modules/migrate_drupal/config/install/migrate.migration.d6_menu_links.yml rename to core/modules/migrate_drupal/migrations/migrate.migration.d6_menu_links.yml diff --git a/core/modules/migrate_drupal/config/install/migrate.migration.d6_menu_settings.yml b/core/modules/migrate_drupal/migrations/migrate.migration.d6_menu_settings.yml similarity index 100% rename from core/modules/migrate_drupal/config/install/migrate.migration.d6_menu_settings.yml rename to core/modules/migrate_drupal/migrations/migrate.migration.d6_menu_settings.yml diff --git a/core/modules/migrate_drupal/config/install/migrate.migration.d6_node.yml b/core/modules/migrate_drupal/migrations/migrate.migration.d6_node.yml similarity index 100% rename from core/modules/migrate_drupal/config/install/migrate.migration.d6_node.yml rename to core/modules/migrate_drupal/migrations/migrate.migration.d6_node.yml diff --git a/core/modules/migrate_drupal/config/install/migrate.migration.d6_node_revision.yml b/core/modules/migrate_drupal/migrations/migrate.migration.d6_node_revision.yml similarity index 100% rename from core/modules/migrate_drupal/config/install/migrate.migration.d6_node_revision.yml rename to core/modules/migrate_drupal/migrations/migrate.migration.d6_node_revision.yml diff --git a/core/modules/migrate_drupal/config/install/migrate.migration.d6_node_setting_promote.yml b/core/modules/migrate_drupal/migrations/migrate.migration.d6_node_setting_promote.yml similarity index 100% rename from core/modules/migrate_drupal/config/install/migrate.migration.d6_node_setting_promote.yml rename to core/modules/migrate_drupal/migrations/migrate.migration.d6_node_setting_promote.yml diff --git a/core/modules/migrate_drupal/config/install/migrate.migration.d6_node_setting_status.yml b/core/modules/migrate_drupal/migrations/migrate.migration.d6_node_setting_status.yml similarity index 100% rename from core/modules/migrate_drupal/config/install/migrate.migration.d6_node_setting_status.yml rename to core/modules/migrate_drupal/migrations/migrate.migration.d6_node_setting_status.yml diff --git a/core/modules/migrate_drupal/config/install/migrate.migration.d6_node_setting_sticky.yml b/core/modules/migrate_drupal/migrations/migrate.migration.d6_node_setting_sticky.yml similarity index 100% rename from core/modules/migrate_drupal/config/install/migrate.migration.d6_node_setting_sticky.yml rename to core/modules/migrate_drupal/migrations/migrate.migration.d6_node_setting_sticky.yml diff --git a/core/modules/migrate_drupal/config/install/migrate.migration.d6_node_settings.yml b/core/modules/migrate_drupal/migrations/migrate.migration.d6_node_settings.yml similarity index 100% rename from core/modules/migrate_drupal/config/install/migrate.migration.d6_node_settings.yml rename to core/modules/migrate_drupal/migrations/migrate.migration.d6_node_settings.yml diff --git a/core/modules/migrate_drupal/config/install/migrate.migration.d6_node_type.yml b/core/modules/migrate_drupal/migrations/migrate.migration.d6_node_type.yml similarity index 100% rename from core/modules/migrate_drupal/config/install/migrate.migration.d6_node_type.yml rename to core/modules/migrate_drupal/migrations/migrate.migration.d6_node_type.yml diff --git a/core/modules/migrate_drupal/config/install/migrate.migration.d6_profile_values.yml b/core/modules/migrate_drupal/migrations/migrate.migration.d6_profile_values.yml similarity index 100% rename from core/modules/migrate_drupal/config/install/migrate.migration.d6_profile_values.yml rename to core/modules/migrate_drupal/migrations/migrate.migration.d6_profile_values.yml diff --git a/core/modules/migrate_drupal/config/install/migrate.migration.d6_search_page.yml b/core/modules/migrate_drupal/migrations/migrate.migration.d6_search_page.yml similarity index 100% rename from core/modules/migrate_drupal/config/install/migrate.migration.d6_search_page.yml rename to core/modules/migrate_drupal/migrations/migrate.migration.d6_search_page.yml diff --git a/core/modules/migrate_drupal/config/install/migrate.migration.d6_search_settings.yml b/core/modules/migrate_drupal/migrations/migrate.migration.d6_search_settings.yml similarity index 100% rename from core/modules/migrate_drupal/config/install/migrate.migration.d6_search_settings.yml rename to core/modules/migrate_drupal/migrations/migrate.migration.d6_search_settings.yml diff --git a/core/modules/migrate_drupal/config/install/migrate.migration.d6_simpletest_settings.yml b/core/modules/migrate_drupal/migrations/migrate.migration.d6_simpletest_settings.yml similarity index 100% rename from core/modules/migrate_drupal/config/install/migrate.migration.d6_simpletest_settings.yml rename to core/modules/migrate_drupal/migrations/migrate.migration.d6_simpletest_settings.yml diff --git a/core/modules/migrate_drupal/config/install/migrate.migration.d6_statistics_settings.yml b/core/modules/migrate_drupal/migrations/migrate.migration.d6_statistics_settings.yml similarity index 100% rename from core/modules/migrate_drupal/config/install/migrate.migration.d6_statistics_settings.yml rename to core/modules/migrate_drupal/migrations/migrate.migration.d6_statistics_settings.yml diff --git a/core/modules/migrate_drupal/config/install/migrate.migration.d6_syslog_settings.yml b/core/modules/migrate_drupal/migrations/migrate.migration.d6_syslog_settings.yml similarity index 100% rename from core/modules/migrate_drupal/config/install/migrate.migration.d6_syslog_settings.yml rename to core/modules/migrate_drupal/migrations/migrate.migration.d6_syslog_settings.yml diff --git a/core/modules/migrate_drupal/config/install/migrate.migration.d6_system_cron.yml b/core/modules/migrate_drupal/migrations/migrate.migration.d6_system_cron.yml similarity index 100% rename from core/modules/migrate_drupal/config/install/migrate.migration.d6_system_cron.yml rename to core/modules/migrate_drupal/migrations/migrate.migration.d6_system_cron.yml diff --git a/core/modules/migrate_drupal/config/install/migrate.migration.d6_system_file.yml b/core/modules/migrate_drupal/migrations/migrate.migration.d6_system_file.yml similarity index 100% rename from core/modules/migrate_drupal/config/install/migrate.migration.d6_system_file.yml rename to core/modules/migrate_drupal/migrations/migrate.migration.d6_system_file.yml diff --git a/core/modules/migrate_drupal/config/install/migrate.migration.d6_system_filter.yml b/core/modules/migrate_drupal/migrations/migrate.migration.d6_system_filter.yml similarity index 100% rename from core/modules/migrate_drupal/config/install/migrate.migration.d6_system_filter.yml rename to core/modules/migrate_drupal/migrations/migrate.migration.d6_system_filter.yml diff --git a/core/modules/migrate_drupal/config/install/migrate.migration.d6_system_image.yml b/core/modules/migrate_drupal/migrations/migrate.migration.d6_system_image.yml similarity index 100% rename from core/modules/migrate_drupal/config/install/migrate.migration.d6_system_image.yml rename to core/modules/migrate_drupal/migrations/migrate.migration.d6_system_image.yml diff --git a/core/modules/migrate_drupal/config/install/migrate.migration.d6_system_image_gd.yml b/core/modules/migrate_drupal/migrations/migrate.migration.d6_system_image_gd.yml similarity index 100% rename from core/modules/migrate_drupal/config/install/migrate.migration.d6_system_image_gd.yml rename to core/modules/migrate_drupal/migrations/migrate.migration.d6_system_image_gd.yml diff --git a/core/modules/migrate_drupal/config/install/migrate.migration.d6_system_logging.yml b/core/modules/migrate_drupal/migrations/migrate.migration.d6_system_logging.yml similarity index 100% rename from core/modules/migrate_drupal/config/install/migrate.migration.d6_system_logging.yml rename to core/modules/migrate_drupal/migrations/migrate.migration.d6_system_logging.yml diff --git a/core/modules/migrate_drupal/config/install/migrate.migration.d6_system_maintenance.yml b/core/modules/migrate_drupal/migrations/migrate.migration.d6_system_maintenance.yml similarity index 100% rename from core/modules/migrate_drupal/config/install/migrate.migration.d6_system_maintenance.yml rename to core/modules/migrate_drupal/migrations/migrate.migration.d6_system_maintenance.yml diff --git a/core/modules/migrate_drupal/config/install/migrate.migration.d6_system_performance.yml b/core/modules/migrate_drupal/migrations/migrate.migration.d6_system_performance.yml similarity index 100% rename from core/modules/migrate_drupal/config/install/migrate.migration.d6_system_performance.yml rename to core/modules/migrate_drupal/migrations/migrate.migration.d6_system_performance.yml diff --git a/core/modules/migrate_drupal/config/install/migrate.migration.d6_system_rss.yml b/core/modules/migrate_drupal/migrations/migrate.migration.d6_system_rss.yml similarity index 100% rename from core/modules/migrate_drupal/config/install/migrate.migration.d6_system_rss.yml rename to core/modules/migrate_drupal/migrations/migrate.migration.d6_system_rss.yml diff --git a/core/modules/migrate_drupal/config/install/migrate.migration.d6_system_site.yml b/core/modules/migrate_drupal/migrations/migrate.migration.d6_system_site.yml similarity index 100% rename from core/modules/migrate_drupal/config/install/migrate.migration.d6_system_site.yml rename to core/modules/migrate_drupal/migrations/migrate.migration.d6_system_site.yml diff --git a/core/modules/migrate_drupal/config/install/migrate.migration.d6_taxonomy_settings.yml b/core/modules/migrate_drupal/migrations/migrate.migration.d6_taxonomy_settings.yml similarity index 100% rename from core/modules/migrate_drupal/config/install/migrate.migration.d6_taxonomy_settings.yml rename to core/modules/migrate_drupal/migrations/migrate.migration.d6_taxonomy_settings.yml diff --git a/core/modules/migrate_drupal/config/install/migrate.migration.d6_taxonomy_term.yml b/core/modules/migrate_drupal/migrations/migrate.migration.d6_taxonomy_term.yml similarity index 100% rename from core/modules/migrate_drupal/config/install/migrate.migration.d6_taxonomy_term.yml rename to core/modules/migrate_drupal/migrations/migrate.migration.d6_taxonomy_term.yml diff --git a/core/modules/migrate_drupal/config/install/migrate.migration.d6_taxonomy_vocabulary.yml b/core/modules/migrate_drupal/migrations/migrate.migration.d6_taxonomy_vocabulary.yml similarity index 100% rename from core/modules/migrate_drupal/config/install/migrate.migration.d6_taxonomy_vocabulary.yml rename to core/modules/migrate_drupal/migrations/migrate.migration.d6_taxonomy_vocabulary.yml diff --git a/core/modules/migrate_drupal/config/install/migrate.migration.d6_term_node.yml b/core/modules/migrate_drupal/migrations/migrate.migration.d6_term_node.yml similarity index 100% rename from core/modules/migrate_drupal/config/install/migrate.migration.d6_term_node.yml rename to core/modules/migrate_drupal/migrations/migrate.migration.d6_term_node.yml diff --git a/core/modules/migrate_drupal/config/install/migrate.migration.d6_term_node_revision.yml b/core/modules/migrate_drupal/migrations/migrate.migration.d6_term_node_revision.yml similarity index 100% rename from core/modules/migrate_drupal/config/install/migrate.migration.d6_term_node_revision.yml rename to core/modules/migrate_drupal/migrations/migrate.migration.d6_term_node_revision.yml diff --git a/core/modules/migrate_drupal/config/install/migrate.migration.d6_text_settings.yml b/core/modules/migrate_drupal/migrations/migrate.migration.d6_text_settings.yml similarity index 100% rename from core/modules/migrate_drupal/config/install/migrate.migration.d6_text_settings.yml rename to core/modules/migrate_drupal/migrations/migrate.migration.d6_text_settings.yml diff --git a/core/modules/migrate_drupal/config/install/migrate.migration.d6_update_settings.yml b/core/modules/migrate_drupal/migrations/migrate.migration.d6_update_settings.yml similarity index 100% rename from core/modules/migrate_drupal/config/install/migrate.migration.d6_update_settings.yml rename to core/modules/migrate_drupal/migrations/migrate.migration.d6_update_settings.yml diff --git a/core/modules/migrate_drupal/config/install/migrate.migration.d6_upload.yml b/core/modules/migrate_drupal/migrations/migrate.migration.d6_upload.yml similarity index 100% rename from core/modules/migrate_drupal/config/install/migrate.migration.d6_upload.yml rename to core/modules/migrate_drupal/migrations/migrate.migration.d6_upload.yml diff --git a/core/modules/migrate_drupal/config/install/migrate.migration.d6_upload_entity_display.yml b/core/modules/migrate_drupal/migrations/migrate.migration.d6_upload_entity_display.yml similarity index 100% rename from core/modules/migrate_drupal/config/install/migrate.migration.d6_upload_entity_display.yml rename to core/modules/migrate_drupal/migrations/migrate.migration.d6_upload_entity_display.yml diff --git a/core/modules/migrate_drupal/config/install/migrate.migration.d6_upload_entity_form_display.yml b/core/modules/migrate_drupal/migrations/migrate.migration.d6_upload_entity_form_display.yml similarity index 100% rename from core/modules/migrate_drupal/config/install/migrate.migration.d6_upload_entity_form_display.yml rename to core/modules/migrate_drupal/migrations/migrate.migration.d6_upload_entity_form_display.yml diff --git a/core/modules/migrate_drupal/config/install/migrate.migration.d6_upload_field.yml b/core/modules/migrate_drupal/migrations/migrate.migration.d6_upload_field.yml similarity index 100% rename from core/modules/migrate_drupal/config/install/migrate.migration.d6_upload_field.yml rename to core/modules/migrate_drupal/migrations/migrate.migration.d6_upload_field.yml diff --git a/core/modules/migrate_drupal/config/install/migrate.migration.d6_upload_field_instance.yml b/core/modules/migrate_drupal/migrations/migrate.migration.d6_upload_field_instance.yml similarity index 100% rename from core/modules/migrate_drupal/config/install/migrate.migration.d6_upload_field_instance.yml rename to core/modules/migrate_drupal/migrations/migrate.migration.d6_upload_field_instance.yml diff --git a/core/modules/migrate_drupal/config/install/migrate.migration.d6_url_alias.yml b/core/modules/migrate_drupal/migrations/migrate.migration.d6_url_alias.yml similarity index 100% rename from core/modules/migrate_drupal/config/install/migrate.migration.d6_url_alias.yml rename to core/modules/migrate_drupal/migrations/migrate.migration.d6_url_alias.yml diff --git a/core/modules/migrate_drupal/config/install/migrate.migration.d6_user.yml b/core/modules/migrate_drupal/migrations/migrate.migration.d6_user.yml similarity index 100% rename from core/modules/migrate_drupal/config/install/migrate.migration.d6_user.yml rename to core/modules/migrate_drupal/migrations/migrate.migration.d6_user.yml diff --git a/core/modules/migrate_drupal/config/install/migrate.migration.d6_user_contact_settings.yml b/core/modules/migrate_drupal/migrations/migrate.migration.d6_user_contact_settings.yml similarity index 100% rename from core/modules/migrate_drupal/config/install/migrate.migration.d6_user_contact_settings.yml rename to core/modules/migrate_drupal/migrations/migrate.migration.d6_user_contact_settings.yml diff --git a/core/modules/migrate_drupal/config/install/migrate.migration.d6_user_mail.yml b/core/modules/migrate_drupal/migrations/migrate.migration.d6_user_mail.yml similarity index 100% rename from core/modules/migrate_drupal/config/install/migrate.migration.d6_user_mail.yml rename to core/modules/migrate_drupal/migrations/migrate.migration.d6_user_mail.yml diff --git a/core/modules/migrate_drupal/config/install/migrate.migration.d6_user_picture_entity_display.yml b/core/modules/migrate_drupal/migrations/migrate.migration.d6_user_picture_entity_display.yml similarity index 100% rename from core/modules/migrate_drupal/config/install/migrate.migration.d6_user_picture_entity_display.yml rename to core/modules/migrate_drupal/migrations/migrate.migration.d6_user_picture_entity_display.yml diff --git a/core/modules/migrate_drupal/config/install/migrate.migration.d6_user_picture_entity_form_display.yml b/core/modules/migrate_drupal/migrations/migrate.migration.d6_user_picture_entity_form_display.yml similarity index 100% rename from core/modules/migrate_drupal/config/install/migrate.migration.d6_user_picture_entity_form_display.yml rename to core/modules/migrate_drupal/migrations/migrate.migration.d6_user_picture_entity_form_display.yml diff --git a/core/modules/migrate_drupal/config/install/migrate.migration.d6_user_picture_field.yml b/core/modules/migrate_drupal/migrations/migrate.migration.d6_user_picture_field.yml similarity index 100% rename from core/modules/migrate_drupal/config/install/migrate.migration.d6_user_picture_field.yml rename to core/modules/migrate_drupal/migrations/migrate.migration.d6_user_picture_field.yml diff --git a/core/modules/migrate_drupal/config/install/migrate.migration.d6_user_picture_field_instance.yml b/core/modules/migrate_drupal/migrations/migrate.migration.d6_user_picture_field_instance.yml similarity index 100% rename from core/modules/migrate_drupal/config/install/migrate.migration.d6_user_picture_field_instance.yml rename to core/modules/migrate_drupal/migrations/migrate.migration.d6_user_picture_field_instance.yml diff --git a/core/modules/migrate_drupal/config/install/migrate.migration.d6_user_picture_file.yml b/core/modules/migrate_drupal/migrations/migrate.migration.d6_user_picture_file.yml similarity index 100% rename from core/modules/migrate_drupal/config/install/migrate.migration.d6_user_picture_file.yml rename to core/modules/migrate_drupal/migrations/migrate.migration.d6_user_picture_file.yml diff --git a/core/modules/migrate_drupal/config/install/migrate.migration.d6_user_profile_entity_display.yml b/core/modules/migrate_drupal/migrations/migrate.migration.d6_user_profile_entity_display.yml similarity index 100% rename from core/modules/migrate_drupal/config/install/migrate.migration.d6_user_profile_entity_display.yml rename to core/modules/migrate_drupal/migrations/migrate.migration.d6_user_profile_entity_display.yml diff --git a/core/modules/migrate_drupal/config/install/migrate.migration.d6_user_profile_entity_form_display.yml b/core/modules/migrate_drupal/migrations/migrate.migration.d6_user_profile_entity_form_display.yml similarity index 100% rename from core/modules/migrate_drupal/config/install/migrate.migration.d6_user_profile_entity_form_display.yml rename to core/modules/migrate_drupal/migrations/migrate.migration.d6_user_profile_entity_form_display.yml diff --git a/core/modules/migrate_drupal/config/install/migrate.migration.d6_user_profile_field.yml b/core/modules/migrate_drupal/migrations/migrate.migration.d6_user_profile_field.yml similarity index 100% rename from core/modules/migrate_drupal/config/install/migrate.migration.d6_user_profile_field.yml rename to core/modules/migrate_drupal/migrations/migrate.migration.d6_user_profile_field.yml diff --git a/core/modules/migrate_drupal/config/install/migrate.migration.d6_user_profile_field_instance.yml b/core/modules/migrate_drupal/migrations/migrate.migration.d6_user_profile_field_instance.yml similarity index 100% rename from core/modules/migrate_drupal/config/install/migrate.migration.d6_user_profile_field_instance.yml rename to core/modules/migrate_drupal/migrations/migrate.migration.d6_user_profile_field_instance.yml diff --git a/core/modules/migrate_drupal/config/install/migrate.migration.d6_user_role.yml b/core/modules/migrate_drupal/migrations/migrate.migration.d6_user_role.yml similarity index 100% rename from core/modules/migrate_drupal/config/install/migrate.migration.d6_user_role.yml rename to core/modules/migrate_drupal/migrations/migrate.migration.d6_user_role.yml diff --git a/core/modules/migrate_drupal/config/install/migrate.migration.d6_user_settings.yml b/core/modules/migrate_drupal/migrations/migrate.migration.d6_user_settings.yml similarity index 100% rename from core/modules/migrate_drupal/config/install/migrate.migration.d6_user_settings.yml rename to core/modules/migrate_drupal/migrations/migrate.migration.d6_user_settings.yml diff --git a/core/modules/migrate_drupal/config/install/migrate.migration.d6_view_modes.yml b/core/modules/migrate_drupal/migrations/migrate.migration.d6_view_modes.yml similarity index 100% rename from core/modules/migrate_drupal/config/install/migrate.migration.d6_view_modes.yml rename to core/modules/migrate_drupal/migrations/migrate.migration.d6_view_modes.yml diff --git a/core/modules/migrate_drupal/config/install/migrate.migration.d6_vocabulary_entity_display.yml b/core/modules/migrate_drupal/migrations/migrate.migration.d6_vocabulary_entity_display.yml similarity index 100% rename from core/modules/migrate_drupal/config/install/migrate.migration.d6_vocabulary_entity_display.yml rename to core/modules/migrate_drupal/migrations/migrate.migration.d6_vocabulary_entity_display.yml diff --git a/core/modules/migrate_drupal/config/install/migrate.migration.d6_vocabulary_entity_form_display.yml b/core/modules/migrate_drupal/migrations/migrate.migration.d6_vocabulary_entity_form_display.yml similarity index 100% rename from core/modules/migrate_drupal/config/install/migrate.migration.d6_vocabulary_entity_form_display.yml rename to core/modules/migrate_drupal/migrations/migrate.migration.d6_vocabulary_entity_form_display.yml diff --git a/core/modules/migrate_drupal/config/install/migrate.migration.d6_vocabulary_field.yml b/core/modules/migrate_drupal/migrations/migrate.migration.d6_vocabulary_field.yml similarity index 100% rename from core/modules/migrate_drupal/config/install/migrate.migration.d6_vocabulary_field.yml rename to core/modules/migrate_drupal/migrations/migrate.migration.d6_vocabulary_field.yml diff --git a/core/modules/migrate_drupal/config/install/migrate.migration.d6_vocabulary_field_instance.yml b/core/modules/migrate_drupal/migrations/migrate.migration.d6_vocabulary_field_instance.yml similarity index 100% rename from core/modules/migrate_drupal/config/install/migrate.migration.d6_vocabulary_field_instance.yml rename to core/modules/migrate_drupal/migrations/migrate.migration.d6_vocabulary_field_instance.yml