diff --git a/core/modules/rdf/lib/Drupal/rdf/Plugin/Core/Entity/BundleRdfMapping.php b/core/modules/rdf/lib/Drupal/rdf/Plugin/Core/Entity/BundleRdfMapping.php index 01c0cd2..dc7cfef 100644 --- a/core/modules/rdf/lib/Drupal/rdf/Plugin/Core/Entity/BundleRdfMapping.php +++ b/core/modules/rdf/lib/Drupal/rdf/Plugin/Core/Entity/BundleRdfMapping.php @@ -8,13 +8,13 @@ namespace Drupal\rdf\Plugin\Core\Entity; use Drupal\Core\Config\Entity\ConfigEntityBase; -use Drupal\Core\Annotation\Plugin; +use Drupal\Core\Entity\Annotation\EntityType; use Drupal\Core\Annotation\Translation; /** * Defines the bundle RDF mapping entity. * - * @Plugin( + * @EntityType( * id = "rdf_mapping_bundle", * label = @Translation("Bundle RDF mapping"), * module = "rdf", diff --git a/core/modules/rdf/lib/Drupal/rdf/Plugin/Core/Entity/FieldRdfMapping.php b/core/modules/rdf/lib/Drupal/rdf/Plugin/Core/Entity/FieldRdfMapping.php index a38eee3..b71922d 100644 --- a/core/modules/rdf/lib/Drupal/rdf/Plugin/Core/Entity/FieldRdfMapping.php +++ b/core/modules/rdf/lib/Drupal/rdf/Plugin/Core/Entity/FieldRdfMapping.php @@ -8,13 +8,13 @@ namespace Drupal\rdf\Plugin\Core\Entity; use Drupal\Core\Config\Entity\ConfigEntityBase; -use Drupal\Core\Annotation\Plugin; +use Drupal\Core\Entity\Annotation\EntityType; use Drupal\Core\Annotation\Translation; /** * Defines the field RDF mapping entity. * - * @Plugin( + * @EntityType( * id = "rdf_mapping_field", * label = @Translation("Field RDF mapping"), * module = "rdf", diff --git a/core/modules/rdf/rdf.services.yml b/core/modules/rdf/rdf.services.yml index 9777720..0719597 100644 --- a/core/modules/rdf/rdf.services.yml +++ b/core/modules/rdf/rdf.services.yml @@ -3,7 +3,7 @@ services: class: Drupal\rdf\SiteSchema\SiteSchemaManager arguments: ['@cache.cache'] rdf.mapping_manager: - class: Drupal\rdf\RdfMappingManager + class: Drupal\rdf\Mapping\RdfMappingManager arguments: ['@event_dispatcher', '@rdf.site_schema_manager'] rdf.mapping: class: Drupal\rdf\EventSubscriber\MappingSubscriber