HTM-1174: Update namespace / package name

Tailormap · Aug 27, 2024 · 26466c8 · 26466c8
1 parent 753edf1
commit 26466c8
Show file tree

Hide file tree

Showing 159 changed files with 743 additions and 742 deletions.
diff --git a/README.md b/README.md
@@ -128,7 +128,7 @@ Other Spring profiles are useful during development:
  the JPA entities. Rename the generated Flyway script to the correct version and give it a
  meaningful name. The script may need to be modified. If you need to migrate using Java code you can
  use a Flyway callback (executed before the entity manager is initialized) or add code to 
- [TailormapDatabaseMigration.java](src%2Fmain%2Fjava%2Fnl%2Fb3p%2Ftailormap%2Fapi%2Fconfiguration%2FTailormapDatabaseMigration.java) 
+ [TailormapDatabaseMigration.java](src%2Fmain%2Fjava%2Forg%2Ftailormap%2Fapi%2Fconfiguration%2FTailormapDatabaseMigration.java) 
  if you can use the entity manager after all SQL migrations.
 * **[dev](src%2Fmain%2Fresources%2Fapplication-dev.properties)**  
  Use during development to:
@@ -144,7 +144,7 @@ Other Spring profiles are useful during development:
   connects to spatial databases which can be started using Docker Compose (see
   [Spatial database stack](#spatial-database-stack)).  
   The class which loads the testdata is 
-  [PopulateTestData.java](src%2Fmain%2Fjava%2Fnl%2Fb3p%2Ftailormap%2Fapi%2Fconfiguration%2Fdev%2FPopulateTestData.java).
+  [PopulateTestData.java](src%2Fmain%2Fjava%2Forg%2Ftailormap%2Fapi%2Fconfiguration%2Fdev%2FPopulateTestData.java).
   The default admin username and password is `tm-admin` instead of randomly generated 
   as in the default profile, but you can change it if you expose your environment publicly by 
   specifying a property.

diff --git a/pom.xml b/pom.xml
@@ -11,7 +11,7 @@ SPDX-License-Identifier: MIT
         <artifactId>spring-boot-starter-parent</artifactId>
         <version>3.3.3</version>
     </parent>
-    <groupId>nl.b3p.tailormap</groupId>
+    <groupId>org.tailormap</groupId>
     <artifactId>tailormap-api</artifactId>
     <version>11.4.0-SNAPSHOT</version>
     <packaging>jar</packaging>
@@ -88,7 +88,7 @@ SPDX-License-Identifier: MIT
         <site>
             <id>gh-pages</id>
             <name>github pages site</name>
-            <url>scm:git:ssh://[email protected]/b3partners/tailormap-api.git</url>
+            <url>scm:git:ssh://[email protected]/tailormap/tailormap-api.git</url>
         </site>
     </distributionManagement>
     <properties>
@@ -162,7 +162,7 @@ SPDX-License-Identifier: MIT
         <pom.fmt.action>sort</pom.fmt.action>
         <!-- suppress missing javadoc warnings -->
         <javadoc.doclint>all,-missing</javadoc.doclint>
-        <!-- docker.b3p.nl or alternatively ghcr.io  -->
+        <!--  ghcr.io or alternatively another OCI repo such as docker.b3p.nl -->
         <docker.deploy.repo>ghcr.io</docker.deploy.repo>
         <docker.skip>false</docker.skip>
         <docker.pull.policy>Always</docker.pull.policy>
@@ -635,8 +635,8 @@ SPDX-License-Identifier: MIT
                 <artifactId>jacoco-maven-plugin</artifactId>
                 <configuration>
                     <excludes>
-                        <exclude>nl/b3p/tailormap/api/viewer/model/**</exclude>
-                        <exclude>nl/b3p/tailormap/api/persistence/json/**</exclude>
+                        <exclude>org/tailormap/api/viewer/model/**</exclude>
+                        <exclude>org/tailormap/api/persistence/json/**</exclude>
                     </excludes>
                 </configuration>
                 <executions>
@@ -816,7 +816,7 @@ SPDX-License-Identifier: MIT
                         <configuration>
                             <inputSpec>${project.basedir}/src/main/resources/openapi/persistence-schemas.yaml</inputSpec>
                             <generatorName>spring</generatorName>
-                            <modelPackage>nl.b3p.tailormap.api.persistence.json</modelPackage>
+                            <modelPackage>org.tailormap.api.persistence.json</modelPackage>
                             <library>spring-boot</library>
                             <configOptions>
                                 <!-- see https://openapi-generator.tech/docs/generators/spring/ -->
@@ -849,7 +849,7 @@ SPDX-License-Identifier: MIT
                         <configuration>
                             <inputSpec>${project.basedir}/src/main/resources/openapi/admin-schemas.yaml</inputSpec>
                             <generatorName>spring</generatorName>
-                            <modelPackage>nl.b3p.tailormap.api.admin.model</modelPackage>
+                            <modelPackage>org.tailormap.api.admin.model</modelPackage>
                             <library>spring-boot</library>
                             <configOptions>
                                 <dateLibrary>java8</dateLibrary>
@@ -879,7 +879,7 @@ SPDX-License-Identifier: MIT
                             <!-- see https://github.com/OpenAPITools/openapi-generator/tree/master/modules/openapi-generator-maven-plugin -->
                             <inputSpec>${project.basedir}/src/main/resources/openapi/viewer-api.yaml</inputSpec>
                             <generatorName>spring</generatorName>
-                            <modelPackage>nl.b3p.tailormap.api.viewer.model</modelPackage>
+                            <modelPackage>org.tailormap.api.viewer.model</modelPackage>
                             <library>spring-boot</library>
                             <configOptions>
                                 <!-- see https://openapi-generator.tech/docs/generators/spring/ -->
@@ -893,19 +893,19 @@ SPDX-License-Identifier: MIT
                                 <useSpringBoot3>true</useSpringBoot3>
                             </configOptions>
                             <!-- All common models from common-schemas.yaml here, comma separated -->
-                            <importMappings>TileLayerHiDpiMode=nl.b3p.tailormap.api.persistence.json.TileLayerHiDpiMode,
-                                GeoServiceProtocol=nl.b3p.tailormap.api.persistence.json.GeoServiceProtocol,
-                                Bounds=nl.b3p.tailormap.api.persistence.json.Bounds,
-                                BoundsWithCRS=nl.b3p.tailormap.api.persistence.json.BoundsWithCRS,
-                                TMAttributeType=nl.b3p.tailormap.api.persistence.json.TMAttributeType,
-                                TMGeometryType=nl.b3p.tailormap.api.persistence.json.TMGeometryType,
-                                WMSStyle=nl.b3p.tailormap.api.persistence.json.WMSStyle,
-                                AppI18nSettings=nl.b3p.tailormap.api.persistence.json.AppI18nSettings,
-                                AppUiSettings=nl.b3p.tailormap.api.persistence.json.AppUiSettings,
-                                FormOptions=nl.b3p.tailormap.api.persistence.json.FormOptions,
-                                FormTab=nl.b3p.tailormap.api.persistence.json.FormTab,
-                                FormField=nl.b3p.tailormap.api.persistence.json.FormField,
-                                FormFieldValue=nl.b3p.tailormap.api.persistence.json.FormFieldValue</importMappings>
+                            <importMappings>TileLayerHiDpiMode=org.tailormap.api.persistence.json.TileLayerHiDpiMode,
+                                GeoServiceProtocol=org.tailormap.api.persistence.json.GeoServiceProtocol,
+                                Bounds=org.tailormap.api.persistence.json.Bounds,
+                                BoundsWithCRS=org.tailormap.api.persistence.json.BoundsWithCRS,
+                                TMAttributeType=org.tailormap.api.persistence.json.TMAttributeType,
+                                TMGeometryType=org.tailormap.api.persistence.json.TMGeometryType,
+                                WMSStyle=org.tailormap.api.persistence.json.WMSStyle,
+                                AppI18nSettings=org.tailormap.api.persistence.json.AppI18nSettings,
+                                AppUiSettings=org.tailormap.api.persistence.json.AppUiSettings,
+                                FormOptions=org.tailormap.api.persistence.json.FormOptions,
+                                FormTab=org.tailormap.api.persistence.json.FormTab,
+                                FormField=org.tailormap.api.persistence.json.FormField,
+                                FormFieldValue=org.tailormap.api.persistence.json.FormFieldValue</importMappings>
                             <ignoreFileOverride>${project.basedir}/src/main/resources/openapi/common-schemas-openapi-ignore</ignoreFileOverride>
                             <generateApis>false</generateApis>
                             <generateModels>true</generateModels>
@@ -941,7 +941,7 @@ SPDX-License-Identifier: MIT
                                 <!-- HTM-1051 replace javax.validation with jakarta.validation in generated sources
                                 the current config still generates javax.validation, but we want jakarta.validation
                                 -->
-                                <replace dir="target/generated-sources/openapi/src/main/java/nl/b3p/tailormap/api/" summary="true">
+                                <replace dir="target/generated-sources/openapi/src/main/java/org/tailormap/api/" summary="true">
                                     <replacetoken><![CDATA[import javax.validation.]]></replacetoken>
                                     <replacevalue><![CDATA[import jakarta.validation.]]></replacevalue>
                                 </replace>
@@ -1231,8 +1231,9 @@ SPDX-License-Identifier: MIT
                             <goal>push</goal>
                         </goals>
                         <!-- NB for deploy/push login is required on ghcr.io or docker.b3p.nl repository with
-                 docker - whatever value is ${docker.deploy.repo}
-                 see: https://docs.github.com/en/packages/working-with-a-github-packages-registry/working-with-the-container-registry -->
+                             docker login - whatever value is ${docker.deploy.repo}
+                             see: https://docs.github.com/en/packages/working-with-a-github-packages-registry/working-with-the-container-registry
+                         -->
                         <phase>deploy</phase>
                     </execution>
                 </executions>
@@ -1420,8 +1421,8 @@ SPDX-License-Identifier: MIT
                         <!-- NO! <dataFileInclude>${project.build.directory}/jacoco-it.exec</dataFileInclude>-->
                     </dataFileIncludes>
                     <excludes>
-                        <exclude>nl/b3p/tailormap/api/viewer/model/**</exclude>
-                        <exclude>nl/b3p/tailormap/api/persistence/json/**</exclude>
+                        <exclude>org/tailormap/api/viewer/model/**</exclude>
+                        <exclude>org/tailormap/api/persistence/json/**</exclude>
                     </excludes>
                 </configuration>
                 <reportSets>

diff --git a/...ailormap/api/TailormapApiApplication.java → ...ailormap/api/TailormapApiApplication.java b/...ailormap/api/TailormapApiApplication.java → ...ailormap/api/TailormapApiApplication.java
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: MIT
  */
 
-package nl.b3p.tailormap.api;
+package org.tailormap.api;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;

diff --git a/...map/api/annotation/AppRestController.java → ...map/api/annotation/AppRestController.java b/...map/api/annotation/AppRestController.java → ...map/api/annotation/AppRestController.java
@@ -3,7 +3,7 @@
  *
  * SPDX-License-Identifier: MIT
  */
-package nl.b3p.tailormap.api.annotation;
+package org.tailormap.api.annotation;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;

diff --git a/...uration/CaseInsensitiveEnumConverter.java → ...uration/CaseInsensitiveEnumConverter.java b/...uration/CaseInsensitiveEnumConverter.java → ...uration/CaseInsensitiveEnumConverter.java
@@ -3,7 +3,7 @@
  *
  * SPDX-License-Identifier: MIT
  */
-package nl.b3p.tailormap.api.configuration;
+package org.tailormap.api.configuration;
 
 import java.util.Locale;
 import org.springframework.core.convert.converter.Converter;

diff --git a/...ion/GeoToolsEPSGAliasesConfiguration.java → ...ion/GeoToolsEPSGAliasesConfiguration.java b/...ion/GeoToolsEPSGAliasesConfiguration.java → ...ion/GeoToolsEPSGAliasesConfiguration.java
@@ -3,7 +3,7 @@
  *
  * SPDX-License-Identifier: MIT
  */
-package nl.b3p.tailormap.api.configuration;
+package org.tailormap.api.configuration;
 
 import jakarta.annotation.PostConstruct;
 import java.io.File;

diff --git a/...p/api/configuration/JPAConfiguration.java → ...p/api/configuration/JPAConfiguration.java b/...p/api/configuration/JPAConfiguration.java → ...p/api/configuration/JPAConfiguration.java
@@ -3,7 +3,7 @@
  *
  * SPDX-License-Identifier: MIT
  */
-package nl.b3p.tailormap.api.configuration;
+package org.tailormap.api.configuration;
 
 import jakarta.persistence.EntityManagerFactory;
 import org.springframework.boot.autoconfigure.domain.EntityScan;

diff --git a/...onfiguration/MonitoringConfiguration.java → ...onfiguration/MonitoringConfiguration.java b/...onfiguration/MonitoringConfiguration.java → ...onfiguration/MonitoringConfiguration.java
@@ -3,7 +3,7 @@
  *
  * SPDX-License-Identifier: MIT
  */
-package nl.b3p.tailormap.api.configuration;
+package org.tailormap.api.configuration;
 
 import io.micrometer.core.aop.TimedAspect;
 import io.micrometer.core.instrument.MeterRegistry;

diff --git a/.../api/configuration/RestConfiguration.java → .../api/configuration/RestConfiguration.java b/.../api/configuration/RestConfiguration.java → .../api/configuration/RestConfiguration.java
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: MIT
  */
 
-package nl.b3p.tailormap.api.configuration;
+package org.tailormap.api.configuration;
 
 import jakarta.persistence.EntityManager;
 import jakarta.persistence.metamodel.Type;

diff --git a/...ap/api/configuration/TailormapConfig.java → ...ap/api/configuration/TailormapConfig.java b/...ap/api/configuration/TailormapConfig.java → ...ap/api/configuration/TailormapConfig.java
@@ -3,7 +3,7 @@
  *
  * SPDX-License-Identifier: MIT
  */
-package nl.b3p.tailormap.api.configuration;
+package org.tailormap.api.configuration;
 
 import ch.rasc.sse.eventbus.config.EnableSseEventBus;
 import org.springframework.boot.context.properties.ConfigurationProperties;

diff --git a/...iguration/TailormapDatabaseMigration.java → ...iguration/TailormapDatabaseMigration.java b/...iguration/TailormapDatabaseMigration.java → ...iguration/TailormapDatabaseMigration.java
@@ -4,17 +4,17 @@
  * SPDX-License-Identifier: MIT
  */
 
-package nl.b3p.tailormap.api.configuration;
+package org.tailormap.api.configuration;
 
 import jakarta.annotation.PostConstruct;
 import java.util.List;
-import nl.b3p.tailormap.api.configuration.ddl.FlywayMigrationResult;
-import nl.b3p.tailormap.api.persistence.Catalog;
-import nl.b3p.tailormap.api.persistence.json.CatalogNode;
-import nl.b3p.tailormap.api.repository.CatalogRepository;
-import nl.b3p.tailormap.api.security.InternalAdminAuthentication;
 import org.flywaydb.core.api.output.MigrateResult;
 import org.springframework.context.annotation.Configuration;
+import org.tailormap.api.configuration.ddl.FlywayMigrationResult;
+import org.tailormap.api.persistence.Catalog;
+import org.tailormap.api.persistence.json.CatalogNode;
+import org.tailormap.api.repository.CatalogRepository;
+import org.tailormap.api.security.InternalAdminAuthentication;
 
 /**
  * Migrate the database using JPA entities, after Flyway has migrated and the entity manager is

diff --git a/...tion/TailormapPasswordStrengthConfig.java → ...tion/TailormapPasswordStrengthConfig.java b/...tion/TailormapPasswordStrengthConfig.java → ...tion/TailormapPasswordStrengthConfig.java
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: MIT
  */
 
-package nl.b3p.tailormap.api.configuration;
+package org.tailormap.api.configuration;
 
 import org.springframework.boot.context.properties.ConfigurationProperties;
 import org.springframework.boot.context.properties.EnableConfigurationProperties;

diff --git a/...i/configuration/base/FrontController.java → ...i/configuration/base/FrontController.java b/...i/configuration/base/FrontController.java → ...i/configuration/base/FrontController.java
@@ -3,23 +3,23 @@
  *
  * SPDX-License-Identifier: MIT
  */
-package nl.b3p.tailormap.api.configuration.base;
+package org.tailormap.api.configuration.base;
 
 import jakarta.servlet.http.HttpServletRequest;
 import java.nio.charset.StandardCharsets;
 import java.util.List;
 import java.util.Locale;
-import nl.b3p.tailormap.api.persistence.Application;
-import nl.b3p.tailormap.api.persistence.Configuration;
-import nl.b3p.tailormap.api.repository.ApplicationRepository;
-import nl.b3p.tailormap.api.repository.ConfigurationRepository;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.servlet.i18n.AcceptHeaderLocaleResolver;
 import org.springframework.web.util.UriUtils;
+import org.tailormap.api.persistence.Application;
+import org.tailormap.api.persistence.Configuration;
+import org.tailormap.api.repository.ApplicationRepository;
+import org.tailormap.api.repository.ConfigurationRepository;
 
 /**
  * Front controller which forwards requests to URLs created by the Angular routing module to the

diff --git a/...figuration/base/IndexHtmlTransformer.java → ...figuration/base/IndexHtmlTransformer.java b/...figuration/base/IndexHtmlTransformer.java → ...figuration/base/IndexHtmlTransformer.java
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: MIT
  */
 
-package nl.b3p.tailormap.api.configuration.base;
+package org.tailormap.api.configuration.base;
 
 import static java.nio.charset.StandardCharsets.UTF_8;
 import static org.apache.commons.lang3.StringUtils.isNotBlank;

diff --git a/...uration/base/SourceMapSecurityFilter.java → ...uration/base/SourceMapSecurityFilter.java b/...uration/base/SourceMapSecurityFilter.java → ...uration/base/SourceMapSecurityFilter.java
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: MIT
  */
 
-package nl.b3p.tailormap.api.configuration.base;
+package org.tailormap.api.configuration.base;
 
 import static jakarta.servlet.http.HttpServletResponse.SC_FORBIDDEN;
 import static jakarta.servlet.http.HttpServletResponse.SC_UNAUTHORIZED;

diff --git a/...ation/base/TailormapApiConfiguration.java → ...ation/base/TailormapApiConfiguration.java b/...ation/base/TailormapApiConfiguration.java → ...ation/base/TailormapApiConfiguration.java
@@ -3,7 +3,7 @@
  *
  * SPDX-License-Identifier: MIT
  */
-package nl.b3p.tailormap.api.configuration.base;
+package org.tailormap.api.configuration.base;
 
 import org.springframework.boot.autoconfigure.condition.ConditionalOnExpression;
 import org.springframework.context.annotation.ComponentScan;

diff --git a/.../api/configuration/base/WebMvcConfig.java → .../api/configuration/base/WebMvcConfig.java b/.../api/configuration/base/WebMvcConfig.java → .../api/configuration/base/WebMvcConfig.java
@@ -4,11 +4,9 @@
  * SPDX-License-Identifier: MIT
  */
 
-package nl.b3p.tailormap.api.configuration.base;
+package org.tailormap.api.configuration.base;
 
 import java.util.List;
-import nl.b3p.tailormap.api.configuration.CaseInsensitiveEnumConverter;
-import nl.b3p.tailormap.api.persistence.json.GeoServiceProtocol;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.format.FormatterRegistry;
@@ -17,6 +15,8 @@
 import org.springframework.web.servlet.config.annotation.ResourceHandlerRegistry;
 import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
 import org.springframework.web.servlet.resource.EncodedResourceResolver;
+import org.tailormap.api.configuration.CaseInsensitiveEnumConverter;
+import org.tailormap.api.persistence.json.GeoServiceProtocol;
 
 @Configuration
 public class WebMvcConfig implements WebMvcConfigurer {

diff --git a/...on/ddl/DeleteDDLScriptBeforeCreating.java → ...on/ddl/DeleteDDLScriptBeforeCreating.java b/...on/ddl/DeleteDDLScriptBeforeCreating.java → ...on/ddl/DeleteDDLScriptBeforeCreating.java
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: MIT
  */
 
-package nl.b3p.tailormap.api.configuration.ddl;
+package org.tailormap.api.configuration.ddl;
 
 import jakarta.annotation.PostConstruct;
 import java.io.File;

diff --git a/...nfiguration/ddl/ExitAfterCreatingDDL.java → ...nfiguration/ddl/ExitAfterCreatingDDL.java b/...nfiguration/ddl/ExitAfterCreatingDDL.java → ...nfiguration/ddl/ExitAfterCreatingDDL.java
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: MIT
  */
 
-package nl.b3p.tailormap.api.configuration.ddl;
+package org.tailormap.api.configuration.ddl;
 
 import jakarta.annotation.PostConstruct;
 import java.lang.invoke.MethodHandles;

diff --git a/.../configuration/ddl/FlywayCleanSchema.java → .../configuration/ddl/FlywayCleanSchema.java b/.../configuration/ddl/FlywayCleanSchema.java → .../configuration/ddl/FlywayCleanSchema.java
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: MIT
  */
 
-package nl.b3p.tailormap.api.configuration.ddl;
+package org.tailormap.api.configuration.ddl;
 
 import org.flywaydb.core.Flyway;
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;

diff --git a/...figuration/ddl/FlywayDefaultStrategy.java → ...figuration/ddl/FlywayDefaultStrategy.java b/...figuration/ddl/FlywayDefaultStrategy.java → ...figuration/ddl/FlywayDefaultStrategy.java
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: MIT
  */
 
-package nl.b3p.tailormap.api.configuration.ddl;
+package org.tailormap.api.configuration.ddl;
 
 import org.springframework.boot.autoconfigure.flyway.FlywayMigrationStrategy;
 import org.springframework.context.annotation.Bean;

diff --git a/...figuration/ddl/FlywayMigrationResult.java → ...figuration/ddl/FlywayMigrationResult.java b/...figuration/ddl/FlywayMigrationResult.java → ...figuration/ddl/FlywayMigrationResult.java
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: MIT
  */
 
-package nl.b3p.tailormap.api.configuration.ddl;
+package org.tailormap.api.configuration.ddl;
 
 import org.flywaydb.core.api.output.MigrateResult;
 import org.springframework.stereotype.Component;

diff --git a/...uration/ddl/FlywayStartWithNewSchema.java → ...uration/ddl/FlywayStartWithNewSchema.java b/...uration/ddl/FlywayStartWithNewSchema.java → ...uration/ddl/FlywayStartWithNewSchema.java
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: MIT
  */
 
-package nl.b3p.tailormap.api.configuration.ddl;
+package org.tailormap.api.configuration.ddl;
 
 import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
 import org.springframework.boot.autoconfigure.flyway.FlywayMigrationStrategy;