[808] Update the packages to org.eclipse.sirius.components.xxx

Bug: #808 Signed-off-by: Stéphane Bégaudeau <stephane.begaudeau@obeo.fr>
eclipse-sirius · Jan 25, 2022 · 1625f31 · 1625f31
1 parent ffe9b91
commit 1625f31
Show file tree

Hide file tree

Showing 970 changed files with 6,277 additions and 6,276 deletions.
diff --git a/CHANGELOG.adoc b/CHANGELOG.adoc
@@ -6,6 +6,7 @@
 
 - https://github.com/eclipse-sirius/sirius-components/issues/808[#808] [core] Update the namespace of the projects from `sirius-web-xxx` to `sirius-components-xxx`. The projects `sirius-web-api` and `sirius-web-core-api` have been merged into `sirius-components-core` since there was no difference in scope between both projects and neither of them was strictly limited to an api. Since we have validated that most of our projects can be reused outside of a Spring environment (i.e. an environment where Spring Frameworks is in charge of the ApplicationContext), we have also removed the `-spring-` from most of our project names. We already had Spring dependencies outside of those `-spring-` projects anyway.
 - [core] Switch to the `org.eclipse.sirius` groupId in order to prepare for a future publication of our backend on maven central
+- https://github.com/eclipse-sirius/sirius-components/issues/808[#808] [core] Update the namespace of the packages from `org.eclipse.sirius.web.xxx` to `org.eclipse.sirius.components.xxx`.
 
 == v2022.01.0
 

diff --git a/...s/spring/graphql/MutationDataFetcher.java → ...s/spring/graphql/MutationDataFetcher.java b/...s/spring/graphql/MutationDataFetcher.java → ...s/spring/graphql/MutationDataFetcher.java
@@ -10,7 +10,7 @@
  * Contributors:
  *     Obeo - initial API and implementation
  *******************************************************************************/
-package org.eclipse.sirius.web.annotations.spring.graphql;
+package org.eclipse.sirius.components.annotations.spring.graphql;
 
 import static java.lang.annotation.ElementType.TYPE;
 import static java.lang.annotation.RetentionPolicy.RUNTIME;

diff --git a/...ions/spring/graphql/QueryDataFetcher.java → ...ions/spring/graphql/QueryDataFetcher.java b/...ions/spring/graphql/QueryDataFetcher.java → ...ions/spring/graphql/QueryDataFetcher.java
@@ -10,7 +10,7 @@
  * Contributors:
  *     Obeo - initial API and implementation
  *******************************************************************************/
-package org.eclipse.sirius.web.annotations.spring.graphql;
+package org.eclipse.sirius.components.annotations.spring.graphql;
 
 import static java.lang.annotation.ElementType.TYPE;
 import static java.lang.annotation.RetentionPolicy.RUNTIME;

diff --git a/...ring/graphql/SubscriptionDataFetcher.java → ...ring/graphql/SubscriptionDataFetcher.java b/...ring/graphql/SubscriptionDataFetcher.java → ...ring/graphql/SubscriptionDataFetcher.java
@@ -10,7 +10,7 @@
  * Contributors:
  *     Obeo - initial API and implementation
  *******************************************************************************/
-package org.eclipse.sirius.web.annotations.spring.graphql;
+package org.eclipse.sirius.components.annotations.spring.graphql;
 
 import static java.lang.annotation.ElementType.TYPE;
 import static java.lang.annotation.RetentionPolicy.RUNTIME;

diff --git a/...lipse/sirius/web/annotations/Audited.java → ...irius/components/annotations/Audited.java b/...lipse/sirius/web/annotations/Audited.java → ...irius/components/annotations/Audited.java
@@ -10,7 +10,7 @@
  * Contributors:
  *     Obeo - initial API and implementation
  *******************************************************************************/
-package org.eclipse.sirius.web.annotations;
+package org.eclipse.sirius.components.annotations;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;

diff --git a/...pse/sirius/web/annotations/Immutable.java → ...ius/components/annotations/Immutable.java b/...pse/sirius/web/annotations/Immutable.java → ...ius/components/annotations/Immutable.java
@@ -10,7 +10,7 @@
  * Contributors:
  *     Obeo - initial API and implementation
  *******************************************************************************/
-package org.eclipse.sirius.web.annotations;
+package org.eclipse.sirius.components.annotations;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;

diff --git a/...pse/sirius/web/annotations/PublicApi.java → ...ius/components/annotations/PublicApi.java b/...pse/sirius/web/annotations/PublicApi.java → ...ius/components/annotations/PublicApi.java
@@ -10,7 +10,7 @@
  * Contributors:
  *     Obeo - initial API and implementation
  *******************************************************************************/
-package org.eclipse.sirius.web.annotations;
+package org.eclipse.sirius.components.annotations;
 
 import static java.lang.annotation.ElementType.TYPE;
 

diff --git a/.../annotations/graphql/GraphQLEnumType.java → .../annotations/graphql/GraphQLEnumType.java b/.../annotations/graphql/GraphQLEnumType.java → .../annotations/graphql/GraphQLEnumType.java
@@ -10,7 +10,7 @@
  * Contributors:
  *     Obeo - initial API and implementation
  *******************************************************************************/
-package org.eclipse.sirius.web.annotations.graphql;
+package org.eclipse.sirius.components.annotations.graphql;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;

diff --git a/...web/annotations/graphql/GraphQLField.java → ...nts/annotations/graphql/GraphQLField.java b/...web/annotations/graphql/GraphQLField.java → ...nts/annotations/graphql/GraphQLField.java
@@ -10,7 +10,7 @@
  * Contributors:
  *     Obeo - initial API and implementation
  *******************************************************************************/
-package org.eclipse.sirius.web.annotations.graphql;
+package org.eclipse.sirius.components.annotations.graphql;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;

diff --git a/...us/web/annotations/graphql/GraphQLID.java → ...onents/annotations/graphql/GraphQLID.java b/...us/web/annotations/graphql/GraphQLID.java → ...onents/annotations/graphql/GraphQLID.java
@@ -10,7 +10,7 @@
  * Contributors:
  *     Obeo - initial API and implementation
  *******************************************************************************/
-package org.eclipse.sirius.web.annotations.graphql;
+package org.eclipse.sirius.components.annotations.graphql;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;

diff --git a/...tions/graphql/GraphQLInputObjectType.java → ...tions/graphql/GraphQLInputObjectType.java b/...tions/graphql/GraphQLInputObjectType.java → ...tions/graphql/GraphQLInputObjectType.java
@@ -10,7 +10,7 @@
  * Contributors:
  *     Obeo - initial API and implementation
  *******************************************************************************/
-package org.eclipse.sirius.web.annotations.graphql;
+package org.eclipse.sirius.components.annotations.graphql;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;

diff --git a/...tations/graphql/GraphQLInterfaceType.java → ...tations/graphql/GraphQLInterfaceType.java b/...tations/graphql/GraphQLInterfaceType.java → ...tations/graphql/GraphQLInterfaceType.java
@@ -10,7 +10,7 @@
  * Contributors:
  *     Obeo - initial API and implementation
  *******************************************************************************/
-package org.eclipse.sirius.web.annotations.graphql;
+package org.eclipse.sirius.components.annotations.graphql;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;

diff --git a/...tations/graphql/GraphQLMutationTypes.java → ...tations/graphql/GraphQLMutationTypes.java b/...tations/graphql/GraphQLMutationTypes.java → ...tations/graphql/GraphQLMutationTypes.java
@@ -10,7 +10,7 @@
  * Contributors:
  *     Obeo - initial API and implementation
  *******************************************************************************/
-package org.eclipse.sirius.web.annotations.graphql;
+package org.eclipse.sirius.components.annotations.graphql;
 
 import static java.lang.annotation.ElementType.TYPE;
 import static java.lang.annotation.RetentionPolicy.RUNTIME;

diff --git a/...b/annotations/graphql/GraphQLNonNull.java → ...s/annotations/graphql/GraphQLNonNull.java b/...b/annotations/graphql/GraphQLNonNull.java → ...s/annotations/graphql/GraphQLNonNull.java
@@ -10,7 +10,7 @@
  * Contributors:
  *     Obeo - initial API and implementation
  *******************************************************************************/
-package org.eclipse.sirius.web.annotations.graphql;
+package org.eclipse.sirius.components.annotations.graphql;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;

diff --git a/...nnotations/graphql/GraphQLObjectType.java → ...nnotations/graphql/GraphQLObjectType.java b/...nnotations/graphql/GraphQLObjectType.java → ...nnotations/graphql/GraphQLObjectType.java
@@ -10,7 +10,7 @@
  * Contributors:
  *     Obeo - initial API and implementation
  *******************************************************************************/
-package org.eclipse.sirius.web.annotations.graphql;
+package org.eclipse.sirius.components.annotations.graphql;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;

diff --git a/...ons/graphql/GraphQLSubscriptionTypes.java → ...ons/graphql/GraphQLSubscriptionTypes.java b/...ons/graphql/GraphQLSubscriptionTypes.java → ...ons/graphql/GraphQLSubscriptionTypes.java
@@ -10,7 +10,7 @@
  * Contributors:
  *     Obeo - initial API and implementation
  *******************************************************************************/
-package org.eclipse.sirius.web.annotations.graphql;
+package org.eclipse.sirius.components.annotations.graphql;
 
 import static java.lang.annotation.ElementType.TYPE;
 import static java.lang.annotation.RetentionPolicy.RUNTIME;

diff --git a/...eb/annotations/graphql/GraphQLUpload.java → ...ts/annotations/graphql/GraphQLUpload.java b/...eb/annotations/graphql/GraphQLUpload.java → ...ts/annotations/graphql/GraphQLUpload.java
@@ -10,7 +10,7 @@
  * Contributors:
  *     Obeo - initial API and implementation
  *******************************************************************************/
-package org.eclipse.sirius.web.annotations.graphql;
+package org.eclipse.sirius.components.annotations.graphql;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;

diff --git a/...aborative/diagrams/DiagramChangeKind.java → ...aborative/diagrams/DiagramChangeKind.java b/...aborative/diagrams/DiagramChangeKind.java → ...aborative/diagrams/DiagramChangeKind.java
@@ -10,7 +10,7 @@
  * Contributors:
  *     Obeo - initial API and implementation
  *******************************************************************************/
-package org.eclipse.sirius.web.spring.collaborative.diagrams;
+package org.eclipse.sirius.components.collaborative.diagrams;
 
 /**
  * Description of the changes performed by diagrams event handlers.

diff --git a/...ollaborative/diagrams/DiagramContext.java → ...ollaborative/diagrams/DiagramContext.java b/...ollaborative/diagrams/DiagramContext.java → ...ollaborative/diagrams/DiagramContext.java
@@ -10,17 +10,17 @@
  * Contributors:
  *     Obeo - initial API and implementation
  *******************************************************************************/
-package org.eclipse.sirius.web.spring.collaborative.diagrams;
+package org.eclipse.sirius.components.collaborative.diagrams;
 
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
 
-import org.eclipse.sirius.web.diagrams.Diagram;
-import org.eclipse.sirius.web.diagrams.ViewCreationRequest;
-import org.eclipse.sirius.web.diagrams.ViewDeletionRequest;
-import org.eclipse.sirius.web.diagrams.events.IDiagramEvent;
-import org.eclipse.sirius.web.spring.collaborative.diagrams.api.IDiagramContext;
+import org.eclipse.sirius.components.collaborative.diagrams.api.IDiagramContext;
+import org.eclipse.sirius.components.diagrams.Diagram;
+import org.eclipse.sirius.components.diagrams.ViewCreationRequest;
+import org.eclipse.sirius.components.diagrams.ViewDeletionRequest;
+import org.eclipse.sirius.components.diagrams.events.IDiagramEvent;
 
 /**
  * The implementation of {@link IDiagramContext}.

diff --git a/...tive/diagrams/DiagramCreationService.java → ...tive/diagrams/DiagramCreationService.java b/...tive/diagrams/DiagramCreationService.java → ...tive/diagrams/DiagramCreationService.java
@@ -10,33 +10,33 @@
  * Contributors:
  *     Obeo - initial API and implementation
  *******************************************************************************/
-package org.eclipse.sirius.web.spring.collaborative.diagrams;
+package org.eclipse.sirius.components.collaborative.diagrams;
 
 import java.util.List;
 import java.util.Objects;
 import java.util.Optional;
 import java.util.concurrent.TimeUnit;
 
-import org.eclipse.sirius.web.core.api.IEditingContext;
-import org.eclipse.sirius.web.core.api.IObjectService;
-import org.eclipse.sirius.web.core.api.IRepresentationDescriptionSearchService;
-import org.eclipse.sirius.web.diagrams.Diagram;
-import org.eclipse.sirius.web.diagrams.ViewCreationRequest;
-import org.eclipse.sirius.web.diagrams.ViewDeletionRequest;
-import org.eclipse.sirius.web.diagrams.components.DiagramComponent;
-import org.eclipse.sirius.web.diagrams.components.DiagramComponentProps;
-import org.eclipse.sirius.web.diagrams.components.DiagramComponentProps.Builder;
-import org.eclipse.sirius.web.diagrams.description.DiagramDescription;
-import org.eclipse.sirius.web.diagrams.events.ArrangeAllEvent;
-import org.eclipse.sirius.web.diagrams.events.IDiagramEvent;
-import org.eclipse.sirius.web.diagrams.layout.api.ILayoutService;
-import org.eclipse.sirius.web.diagrams.renderer.DiagramRenderer;
-import org.eclipse.sirius.web.representations.Element;
-import org.eclipse.sirius.web.representations.VariableManager;
-import org.eclipse.sirius.web.spring.collaborative.api.IRepresentationPersistenceService;
-import org.eclipse.sirius.web.spring.collaborative.api.Monitoring;
-import org.eclipse.sirius.web.spring.collaborative.diagrams.api.IDiagramContext;
-import org.eclipse.sirius.web.spring.collaborative.diagrams.api.IDiagramCreationService;
+import org.eclipse.sirius.components.collaborative.api.IRepresentationPersistenceService;
+import org.eclipse.sirius.components.collaborative.api.Monitoring;
+import org.eclipse.sirius.components.collaborative.diagrams.api.IDiagramContext;
+import org.eclipse.sirius.components.collaborative.diagrams.api.IDiagramCreationService;
+import org.eclipse.sirius.components.core.api.IEditingContext;
+import org.eclipse.sirius.components.core.api.IObjectService;
+import org.eclipse.sirius.components.core.api.IRepresentationDescriptionSearchService;
+import org.eclipse.sirius.components.diagrams.Diagram;
+import org.eclipse.sirius.components.diagrams.ViewCreationRequest;
+import org.eclipse.sirius.components.diagrams.ViewDeletionRequest;
+import org.eclipse.sirius.components.diagrams.components.DiagramComponent;
+import org.eclipse.sirius.components.diagrams.components.DiagramComponentProps;
+import org.eclipse.sirius.components.diagrams.components.DiagramComponentProps.Builder;
+import org.eclipse.sirius.components.diagrams.description.DiagramDescription;
+import org.eclipse.sirius.components.diagrams.events.ArrangeAllEvent;
+import org.eclipse.sirius.components.diagrams.events.IDiagramEvent;
+import org.eclipse.sirius.components.diagrams.layout.api.ILayoutService;
+import org.eclipse.sirius.components.diagrams.renderer.DiagramRenderer;
+import org.eclipse.sirius.components.representations.Element;
+import org.eclipse.sirius.components.representations.VariableManager;
 import org.springframework.stereotype.Service;
 
 import io.micrometer.core.instrument.MeterRegistry;

diff --git a/...e/diagrams/DiagramDescriptionService.java → ...e/diagrams/DiagramDescriptionService.java b/...e/diagrams/DiagramDescriptionService.java → ...e/diagrams/DiagramDescriptionService.java
@@ -10,18 +10,18 @@
  * Contributors:
  *     Obeo - initial API and implementation
  *******************************************************************************/
-package org.eclipse.sirius.web.spring.collaborative.diagrams;
+package org.eclipse.sirius.components.collaborative.diagrams;
 
 import java.util.List;
 import java.util.Objects;
 import java.util.Optional;
 import java.util.UUID;
 import java.util.function.Predicate;
 
-import org.eclipse.sirius.web.diagrams.description.DiagramDescription;
-import org.eclipse.sirius.web.diagrams.description.EdgeDescription;
-import org.eclipse.sirius.web.diagrams.description.NodeDescription;
-import org.eclipse.sirius.web.spring.collaborative.diagrams.api.IDiagramDescriptionService;
+import org.eclipse.sirius.components.collaborative.diagrams.api.IDiagramDescriptionService;
+import org.eclipse.sirius.components.diagrams.description.DiagramDescription;
+import org.eclipse.sirius.components.diagrams.description.EdgeDescription;
+import org.eclipse.sirius.components.diagrams.description.NodeDescription;
 import org.springframework.stereotype.Service;
 
 /**

diff --git a/...laborative/diagrams/DiagramEventFlux.java → ...laborative/diagrams/DiagramEventFlux.java b/...laborative/diagrams/DiagramEventFlux.java → ...laborative/diagrams/DiagramEventFlux.java
@@ -10,14 +10,14 @@
  * Contributors:
  *     Obeo - initial API and implementation
  *******************************************************************************/
-package org.eclipse.sirius.web.spring.collaborative.diagrams;
+package org.eclipse.sirius.components.collaborative.diagrams;
 
 import java.util.Objects;
 
-import org.eclipse.sirius.web.core.api.IInput;
-import org.eclipse.sirius.web.core.api.IPayload;
-import org.eclipse.sirius.web.diagrams.Diagram;
-import org.eclipse.sirius.web.spring.collaborative.diagrams.dto.DiagramRefreshedEventPayload;
+import org.eclipse.sirius.components.collaborative.diagrams.dto.DiagramRefreshedEventPayload;
+import org.eclipse.sirius.components.core.api.IInput;
+import org.eclipse.sirius.components.core.api.IPayload;
+import org.eclipse.sirius.components.diagrams.Diagram;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

diff --git a/...ative/diagrams/DiagramEventProcessor.java → ...ative/diagrams/DiagramEventProcessor.java b/...ative/diagrams/DiagramEventProcessor.java → ...ative/diagrams/DiagramEventProcessor.java
@@ -10,32 +10,32 @@
  * Contributors:
  *     Obeo - initial API and implementation
  *******************************************************************************/
-package org.eclipse.sirius.web.spring.collaborative.diagrams;
+package org.eclipse.sirius.components.collaborative.diagrams;
 
 import java.util.List;
 import java.util.Objects;
 import java.util.Optional;
 
-import org.eclipse.sirius.web.core.api.IEditingContext;
-import org.eclipse.sirius.web.core.api.IInput;
-import org.eclipse.sirius.web.core.api.IPayload;
-import org.eclipse.sirius.web.core.api.IRepresentationDescriptionSearchService;
-import org.eclipse.sirius.web.core.api.IRepresentationInput;
-import org.eclipse.sirius.web.diagrams.Diagram;
-import org.eclipse.sirius.web.diagrams.description.DiagramDescription;
-import org.eclipse.sirius.web.representations.IRepresentation;
-import org.eclipse.sirius.web.spring.collaborative.api.ChangeDescription;
-import org.eclipse.sirius.web.spring.collaborative.api.ChangeKind;
-import org.eclipse.sirius.web.spring.collaborative.api.IRepresentationRefreshPolicy;
-import org.eclipse.sirius.web.spring.collaborative.api.IRepresentationRefreshPolicyRegistry;
-import org.eclipse.sirius.web.spring.collaborative.api.ISubscriptionManager;
-import org.eclipse.sirius.web.spring.collaborative.diagrams.api.IDiagramContext;
-import org.eclipse.sirius.web.spring.collaborative.diagrams.api.IDiagramCreationService;
-import org.eclipse.sirius.web.spring.collaborative.diagrams.api.IDiagramEventHandler;
-import org.eclipse.sirius.web.spring.collaborative.diagrams.api.IDiagramEventProcessor;
-import org.eclipse.sirius.web.spring.collaborative.diagrams.api.IDiagramInput;
-import org.eclipse.sirius.web.spring.collaborative.diagrams.dto.RenameDiagramInput;
-import org.eclipse.sirius.web.spring.collaborative.dto.RenameRepresentationInput;
+import org.eclipse.sirius.components.collaborative.api.ChangeDescription;
+import org.eclipse.sirius.components.collaborative.api.ChangeKind;
+import org.eclipse.sirius.components.collaborative.api.IRepresentationRefreshPolicy;
+import org.eclipse.sirius.components.collaborative.api.IRepresentationRefreshPolicyRegistry;
+import org.eclipse.sirius.components.collaborative.api.ISubscriptionManager;
+import org.eclipse.sirius.components.collaborative.diagrams.api.IDiagramContext;
+import org.eclipse.sirius.components.collaborative.diagrams.api.IDiagramCreationService;
+import org.eclipse.sirius.components.collaborative.diagrams.api.IDiagramEventHandler;
+import org.eclipse.sirius.components.collaborative.diagrams.api.IDiagramEventProcessor;
+import org.eclipse.sirius.components.collaborative.diagrams.api.IDiagramInput;
+import org.eclipse.sirius.components.collaborative.diagrams.dto.RenameDiagramInput;
+import org.eclipse.sirius.components.collaborative.dto.RenameRepresentationInput;
+import org.eclipse.sirius.components.core.api.IEditingContext;
+import org.eclipse.sirius.components.core.api.IInput;
+import org.eclipse.sirius.components.core.api.IPayload;
+import org.eclipse.sirius.components.core.api.IRepresentationDescriptionSearchService;
+import org.eclipse.sirius.components.core.api.IRepresentationInput;
+import org.eclipse.sirius.components.diagrams.Diagram;
+import org.eclipse.sirius.components.diagrams.description.DiagramDescription;
+import org.eclipse.sirius.components.representations.IRepresentation;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

diff --git a/...iagrams/DiagramEventProcessorFactory.java → ...iagrams/DiagramEventProcessorFactory.java b/...iagrams/DiagramEventProcessorFactory.java → ...iagrams/DiagramEventProcessorFactory.java
@@ -10,25 +10,25 @@
  * Contributors:
  *     Obeo - initial API and implementation
  *******************************************************************************/
-package org.eclipse.sirius.web.spring.collaborative.diagrams;
+package org.eclipse.sirius.components.collaborative.diagrams;
 
 import java.util.List;
 import java.util.Objects;
 import java.util.Optional;
 
-import org.eclipse.sirius.web.core.api.IEditingContext;
-import org.eclipse.sirius.web.core.api.IRepresentationDescriptionSearchService;
-import org.eclipse.sirius.web.diagrams.Diagram;
-import org.eclipse.sirius.web.spring.collaborative.api.IRepresentationConfiguration;
-import org.eclipse.sirius.web.spring.collaborative.api.IRepresentationEventProcessor;
-import org.eclipse.sirius.web.spring.collaborative.api.IRepresentationEventProcessorFactory;
-import org.eclipse.sirius.web.spring.collaborative.api.IRepresentationRefreshPolicyRegistry;
-import org.eclipse.sirius.web.spring.collaborative.api.IRepresentationSearchService;
-import org.eclipse.sirius.web.spring.collaborative.api.ISubscriptionManagerFactory;
-import org.eclipse.sirius.web.spring.collaborative.diagrams.api.DiagramConfiguration;
-import org.eclipse.sirius.web.spring.collaborative.diagrams.api.IDiagramCreationService;
-import org.eclipse.sirius.web.spring.collaborative.diagrams.api.IDiagramEventHandler;
-import org.eclipse.sirius.web.spring.collaborative.diagrams.api.IDiagramEventProcessor;
+import org.eclipse.sirius.components.collaborative.api.IRepresentationConfiguration;
+import org.eclipse.sirius.components.collaborative.api.IRepresentationEventProcessor;
+import org.eclipse.sirius.components.collaborative.api.IRepresentationEventProcessorFactory;
+import org.eclipse.sirius.components.collaborative.api.IRepresentationRefreshPolicyRegistry;
+import org.eclipse.sirius.components.collaborative.api.IRepresentationSearchService;
+import org.eclipse.sirius.components.collaborative.api.ISubscriptionManagerFactory;
+import org.eclipse.sirius.components.collaborative.diagrams.api.DiagramConfiguration;
+import org.eclipse.sirius.components.collaborative.diagrams.api.IDiagramCreationService;
+import org.eclipse.sirius.components.collaborative.diagrams.api.IDiagramEventHandler;
+import org.eclipse.sirius.components.collaborative.diagrams.api.IDiagramEventProcessor;
+import org.eclipse.sirius.components.core.api.IEditingContext;
+import org.eclipse.sirius.components.core.api.IRepresentationDescriptionSearchService;
+import org.eclipse.sirius.components.diagrams.Diagram;
 import org.springframework.stereotype.Service;
 
 /**

diff --git a/...ive/diagrams/DiagramImagePathService.java → ...ive/diagrams/DiagramImagePathService.java b/...ive/diagrams/DiagramImagePathService.java → ...ive/diagrams/DiagramImagePathService.java
@@ -10,11 +10,11 @@
  * Contributors:
  *     Obeo - initial API and implementation
  *******************************************************************************/
-package org.eclipse.sirius.web.spring.collaborative.diagrams;
+package org.eclipse.sirius.components.collaborative.diagrams;
 
 import java.util.List;
 
-import org.eclipse.sirius.web.core.api.IImagePathService;
+import org.eclipse.sirius.components.core.api.IImagePathService;
 import org.springframework.stereotype.Service;
 
 /**