Skip to content

Commit

Permalink
[808] Update the namespace of the projects to sirius-components-xxx
Browse files Browse the repository at this point in the history
Bug: #808
Signed-off-by: Stéphane Bégaudeau <stephane.begaudeau@obeo.fr>
  • Loading branch information
sbegaudeau committed Jan 25, 2022
1 parent 2dd1e56 commit 1772cfd
Show file tree
Hide file tree
Showing 1,756 changed files with 1,315 additions and 4,367 deletions.
6 changes: 6 additions & 0 deletions CHANGELOG.adoc
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
= Changelog

== v2022.03.0 (Unreleased)

=== Breaking changes

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

== v2022.01.0

=== Architectural decision records
Expand Down
74 changes: 36 additions & 38 deletions backend/pom.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright (c) 2020, 2021 Obeo.
Copyright (c) 2020, 2022 Obeo.
All rights reserved. This program and the accompanying materials
are made available under the terms of the Eclipse Public License v1.0
which accompanies this distribution, and is available at
Expand Down Expand Up @@ -30,42 +30,40 @@
</distributionManagement>

<modules>
<module>sirius-web-annotations-spring</module>
<module>sirius-web-annotations</module>
<module>sirius-web-api</module>
<module>sirius-web-core-api</module>
<module>sirius-web-components</module>
<module>sirius-web-diagrams-layout-api</module>
<module>sirius-web-diagrams-layout</module>
<module>sirius-web-diagrams-tests</module>
<module>sirius-web-diagrams</module>
<module>sirius-web-forms-tests</module>
<module>sirius-web-forms</module>
<module>sirius-web-graphiql</module>
<module>sirius-web-graphql-utils</module>
<module>sirius-web-graphql-voyager</module>
<module>sirius-web-representations</module>
<module>sirius-web-selection</module>
<module>sirius-web-spring-collaborative-diagrams</module>
<module>sirius-web-spring-collaborative-forms</module>
<module>sirius-web-spring-collaborative-selection</module>
<module>sirius-web-spring-collaborative-trees</module>
<module>sirius-web-spring-collaborative-validation</module>
<module>sirius-web-spring-collaborative</module>
<module>sirius-web-spring-graphql-api</module>
<module>sirius-web-spring-graphql</module>
<module>sirius-web-spring-starter</module>
<module>sirius-web-spring-tests</module>
<module>sirius-web-tests</module>
<module>sirius-web-trees</module>
<module>sirius-web-compatibility</module>
<module>sirius-web-emf</module>
<module>sirius-web-interpreter</module>
<module>sirius-web-domain</module>
<module>sirius-web-domain-edit</module>
<module>sirius-web-domain-design</module>
<module>sirius-web-validation</module>
<module>sirius-web-view</module>
<module>sirius-web-view-edit</module>
<module>sirius-components-annotations-spring</module>
<module>sirius-components-annotations</module>
<module>sirius-components-core</module>
<module>sirius-components-diagrams-layout-api</module>
<module>sirius-components-diagrams-layout</module>
<module>sirius-components-diagrams-tests</module>
<module>sirius-components-diagrams</module>
<module>sirius-components-forms-tests</module>
<module>sirius-components-forms</module>
<module>sirius-components-graphiql</module>
<module>sirius-components-graphql-utils</module>
<module>sirius-components-graphql-voyager</module>
<module>sirius-components-representations</module>
<module>sirius-components-selection</module>
<module>sirius-components-collaborative-diagrams</module>
<module>sirius-components-collaborative-forms</module>
<module>sirius-components-collaborative-selection</module>
<module>sirius-components-collaborative-trees</module>
<module>sirius-components-collaborative-validation</module>
<module>sirius-components-collaborative</module>
<module>sirius-components-graphql-api</module>
<module>sirius-components-graphql</module>
<module>sirius-components-starter</module>
<module>sirius-components-spring-tests</module>
<module>sirius-components-tests</module>
<module>sirius-components-trees</module>
<module>sirius-components-compatibility</module>
<module>sirius-components-emf</module>
<module>sirius-components-interpreter</module>
<module>sirius-components-domain</module>
<module>sirius-components-domain-edit</module>
<module>sirius-components-domain-design</module>
<module>sirius-components-validation</module>
<module>sirius-components-view</module>
<module>sirius-components-view-edit</module>
</modules>
</project>
34 changes: 34 additions & 0 deletions backend/sirius-components-annotations-spring/.project
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>sirius-components-annotations-spring</name>
<comment></comment>
<projects>
</projects>
<buildSpec>
<buildCommand>
<name>org.eclipse.jdt.core.javabuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.springframework.ide.eclipse.boot.validation.springbootbuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>net.sf.eclipsecs.core.CheckstyleBuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.m2e.core.maven2Builder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.jdt.core.javanature</nature>
<nature>org.eclipse.m2e.core.maven2Nature</nature>
<nature>net.sf.eclipsecs.core.CheckstyleNature</nature>
</natures>
</projectDescription>
11 changes: 11 additions & 0 deletions backend/sirius-components-annotations-spring/README.adoc
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
= sirius-components-annotations-spring

== Goal

This project provides some annotations which can be used to decorate our code.
Contrary to sirius-components-annotations, the annotations inside this project need to depend on some Spring annotations


== Dependencies

None.
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright (c) 2019, 2020 Obeo.
Copyright (c) 2019, 2022 Obeo.
This program and the accompanying materials
are made available under the terms of the Eclipse Public License v2.0
which accompanies this distribution, and is available at
Expand All @@ -21,10 +21,10 @@
<relativePath/> <!-- lookup parent from repository -->
</parent>
<groupId>org.eclipse.sirius.web</groupId>
<artifactId>sirius-web-annotations-spring</artifactId>
<artifactId>sirius-components-annotations-spring</artifactId>
<version>2022.01.0</version>
<name>sirius-web-annotations-spring</name>
<description>Sirius Web Annotations Spring</description>
<name>sirius-components-annotations-spring</name>
<description>Sirius Components Annotations Spring</description>

<properties>
<java.version>11</java.version>
Expand Down Expand Up @@ -52,7 +52,7 @@
<artifactId>maven-checkstyle-plugin</artifactId>
<version>3.1.0</version>
<configuration>
<configLocation>../sirius-web-resources/checkstyle/CheckstyleConfiguration.xml</configLocation>
<configLocation>../sirius-components-resources/checkstyle/CheckstyleConfiguration.xml</configLocation>
<encoding>UTF-8</encoding>
<failsOnError>true</failsOnError>
<consoleOutput>true</consoleOutput>
Expand Down
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>sirius-web-annotations-spring</name>
<name>sirius-components-annotations</name>
<comment></comment>
<projects>
</projects>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
= sirius-web-annotations
= sirius-components-annotations

== Goal

Expand Down
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright (c) 2019, 2020 Obeo.
Copyright (c) 2019, 2022 Obeo.
This program and the accompanying materials
are made available under the terms of the Eclipse Public License v2.0
which accompanies this distribution, and is available at
Expand All @@ -21,10 +21,10 @@
<relativePath/> <!-- lookup parent from repository -->
</parent>
<groupId>org.eclipse.sirius.web</groupId>
<artifactId>sirius-web-annotations</artifactId>
<artifactId>sirius-components-annotations</artifactId>
<version>2022.01.0</version>
<name>sirius-web-annotations</name>
<description>Sirius Web Annotations</description>
<name>sirius-components-annotations</name>
<description>Sirius Components Annotations</description>

<properties>
<java.version>11</java.version>
Expand All @@ -45,7 +45,7 @@
<artifactId>maven-checkstyle-plugin</artifactId>
<version>3.1.0</version>
<configuration>
<configLocation>../sirius-web-resources/checkstyle/CheckstyleConfiguration.xml</configLocation>
<configLocation>../sirius-components-resources/checkstyle/CheckstyleConfiguration.xml</configLocation>
<encoding>UTF-8</encoding>
<failsOnError>true</failsOnError>
<consoleOutput>true</consoleOutput>
Expand Down
File renamed without changes.
File renamed without changes.
34 changes: 34 additions & 0 deletions backend/sirius-components-collaborative-diagrams/.project
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
<?xml version="1.0" encoding="UTF-8"?>
<projectDescription>
<name>sirius-components-collaborative-diagrams</name>
<comment></comment>
<projects>
</projects>
<buildSpec>
<buildCommand>
<name>org.eclipse.jdt.core.javabuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.springframework.ide.eclipse.boot.validation.springbootbuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>net.sf.eclipsecs.core.CheckstyleBuilder</name>
<arguments>
</arguments>
</buildCommand>
<buildCommand>
<name>org.eclipse.m2e.core.maven2Builder</name>
<arguments>
</arguments>
</buildCommand>
</buildSpec>
<natures>
<nature>org.eclipse.jdt.core.javanature</nature>
<nature>org.eclipse.m2e.core.maven2Nature</nature>
<nature>net.sf.eclipsecs.core.CheckstyleNature</nature>
</natures>
</projectDescription>
10 changes: 10 additions & 0 deletions backend/sirius-components-collaborative-diagrams/README.adoc
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
= sirius-components-collaborative-diagrams

== Goal

This project provides support for our diagram collaborative edition layer.

== Dependencies

- sirius-components-collaborative-diagrams-api
- sirius-components-services-api
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright (c) 2019, 2021 Obeo.
Copyright (c) 2019, 2022 Obeo.
This program and the accompanying materials
are made available under the terms of the Eclipse Public License v2.0
which accompanies this distribution, and is available at
Expand All @@ -21,10 +21,10 @@
<relativePath/> <!-- lookup parent from repository -->
</parent>
<groupId>org.eclipse.sirius.web</groupId>
<artifactId>sirius-web-spring-collaborative-diagrams</artifactId>
<artifactId>sirius-components-collaborative-diagrams</artifactId>
<version>2022.01.0</version>
<name>sirius-web-spring-collaborative-diagrams</name>
<description>Sirius Web Spring Collaborative Diagrams</description>
<name>sirius-components-collaborative-diagrams</name>
<description>Sirius Components Collaborative Diagrams</description>

<properties>
<java.version>11</java.version>
Expand All @@ -49,39 +49,34 @@
</dependency>
<dependency>
<groupId>org.eclipse.sirius.web</groupId>
<artifactId>sirius-web-api</artifactId>
<artifactId>sirius-components-diagrams</artifactId>
<version>2022.01.0</version>
</dependency>
<dependency>
<groupId>org.eclipse.sirius.web</groupId>
<artifactId>sirius-web-diagrams</artifactId>
<artifactId>sirius-components-collaborative</artifactId>
<version>2022.01.0</version>
</dependency>
<dependency>
<groupId>org.eclipse.sirius.web</groupId>
<artifactId>sirius-web-spring-collaborative</artifactId>
<version>2022.01.0</version>
</dependency>
<dependency>
<groupId>org.eclipse.sirius.web</groupId>
<artifactId>sirius-web-diagrams-layout</artifactId>
<artifactId>sirius-components-diagrams-layout</artifactId>
<version>2022.01.0</version>
</dependency>
<dependency>
<groupId>org.eclipse.sirius.web</groupId>
<artifactId>sirius-web-tests</artifactId>
<artifactId>sirius-components-tests</artifactId>
<version>2022.01.0</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.eclipse.sirius.web</groupId>
<artifactId>sirius-web-spring-tests</artifactId>
<artifactId>sirius-components-spring-tests</artifactId>
<version>2022.01.0</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.eclipse.sirius.web</groupId>
<artifactId>sirius-web-diagrams-tests</artifactId>
<artifactId>sirius-components-diagrams-tests</artifactId>
<version>2022.01.0</version>
<scope>test</scope>
</dependency>
Expand All @@ -99,7 +94,7 @@
<artifactId>maven-checkstyle-plugin</artifactId>
<version>3.1.0</version>
<configuration>
<configLocation>../sirius-web-resources/checkstyle/CheckstyleConfiguration.xml</configLocation>
<configLocation>../sirius-components-resources/checkstyle/CheckstyleConfiguration.xml</configLocation>
<encoding>UTF-8</encoding>
<failsOnError>true</failsOnError>
<consoleOutput>true</consoleOutput>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
import java.util.Optional;
import java.util.concurrent.TimeUnit;

import org.eclipse.sirius.web.components.Element;
import org.eclipse.sirius.web.core.api.IEditingContext;
import org.eclipse.sirius.web.core.api.IObjectService;
import org.eclipse.sirius.web.core.api.IRepresentationDescriptionSearchService;
Expand All @@ -32,6 +31,7 @@
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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

import java.util.List;

import org.eclipse.sirius.web.api.services.IImagePathService;
import org.eclipse.sirius.web.core.api.IImagePathService;
import org.springframework.stereotype.Service;

/**
Expand Down
File renamed without changes.
Loading

0 comments on commit 1772cfd

Please sign in to comment.