From 0b6bf01ec5946b0ba147c1e6fc65f5f8235e1885 Mon Sep 17 00:00:00 2001
From: Florian Necas <florian.necas@camptocamp.com>
Date: Thu, 16 Nov 2023 09:34:43 +0100
Subject: [PATCH] fix: reset db and georchestra build

---
 pom.xml                                       |   5 +-
 web/pom.xml                                   | 452 +++++++++++++++---
 .../config-security/config-security.xml       |   7 -
 3 files changed, 376 insertions(+), 88 deletions(-)

diff --git a/pom.xml b/pom.xml
index dabf338a2f..c5f3e66afc 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1474,8 +1474,6 @@
     <application.name>geonetwork</application.name>
     <app.properties>WEB-INF/config.properties</app.properties>
     <!--<app.properties>file:/${geonetwork.dir}/config.properties</app.properties>-->
-    <maven.compiler.source>1.8</maven.compiler.source>
-    <maven.compiler.target>1.8</maven.compiler.target>
     <!-- Configure database config file to use. Could be
      h2, postgres, sqlserver, mysql, oracle, db2, postgres-postgis, jndi
      -->
@@ -1490,9 +1488,8 @@
         GEONETWORK_DB_CONNECTION_PROPERTIES=
     -->
 
-    <db.type>${geonetwork.db.type:h2}</db.type>
     <!-- Instead of using db_type a specific config file can be specified -->
-    <db.config.file>../config-db/${db.type}.xml</db.config.file>
+    <db.config.file>../config-db/postgres-postgis.xml</db.config.file>
     <db.host>#{systemEnvironment['GEONETWORK_DB_HOST']?:'localhost'}</db.host>
     <db.port>#{systemEnvironment['GEONETWORK_DB_PORT']}</db.port>
     <db.name>#{systemEnvironment['GEONETWORK_DB_NAME']?:'~/gn'}</db.name>
diff --git a/web/pom.xml b/web/pom.xml
index 4ebd916c00..bd69b6fe23 100644
--- a/web/pom.xml
+++ b/web/pom.xml
@@ -407,6 +407,17 @@
       <version>${project.version}</version>
     </dependency>
 
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>gn-georchestra-utils</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>gn-georchestra-authnz</artifactId>
+      <version>${project.version}</version>
+    </dependency>
+
     <!-- Handled locally by a temporarly repository -->
     <dependency>
       <groupId>dlib</groupId>
@@ -625,83 +636,87 @@
     <plugins>
       <!-- Generate a properties file with the commit hash to be displayed on the admin.console -->
 	    <plugin>
-        <groupId>io.github.git-commit-id</groupId>
-        <artifactId>git-commit-id-maven-plugin</artifactId>
-        <version>4.9.9</version>
-        <executions>
-          <execution>
-            <phase>initialize</phase>
-            <id>get-the-git-infos</id>
-            <goals>
-                <goal>revision</goal>
-            </goals>
-          </execution>
-        </executions>
+          <groupId>io.github.git-commit-id</groupId>
+          <artifactId>git-commit-id-maven-plugin</artifactId>
+          <version>4.9.9</version>
+	        <executions>
+                  <execution>
+                    <phase>initialize</phase>
+	                  <id>get-the-git-infos</id>
+	                <goals>
+	                    <goal>revision</goal>
+	                </goals>
+	            </execution>
+	        </executions>
+	        <configuration>
+	            <dotGitDirectory>${project.basedir}/../.git</dotGitDirectory>
+	            <prefix>git</prefix>
+	            <dateFormat>yyyy-MM-dd'T'HH:mm:ssZ</dateFormat>
+	            <dateFormatTimeZone>${user.timezone}</dateFormatTimeZone>
+	            <verbose>false</verbose>
+	            <generateGitPropertiesFile>true</generateGitPropertiesFile>
+	            <generateGitPropertiesFilename>src/main/webResources/WEB-INF/classes/git.properties</generateGitPropertiesFilename>
+	            <!-- Denotes the format to save properties in. Valid options are "properties" (default) and "json". Properties will be saved to the generateGitPropertiesFilename if generateGitPropertiesFile is set to `true`. -->
+	            <format>properties</format>
+	            <skipPoms>true</skipPoms>
+	            <injectAllReactorProjects>true</injectAllReactorProjects>
+              <injectIntoSysProperties>true</injectIntoSysProperties>
+	            <failOnNoGitDirectory>false</failOnNoGitDirectory>
+	            <failOnUnableToExtractRepoInfo>false</failOnUnableToExtractRepoInfo>
+	            <skip>false</skip>
+	            <runOnlyOnce>false</runOnlyOnce>
+	            <excludeProperties>
+	            </excludeProperties>
+							<includeOnlyProperties>
+								<includeOnlyProperty>^git.tags$</includeOnlyProperty>
+								<includeOnlyProperty>^git.branch$</includeOnlyProperty>
+								<includeOnlyProperty>^git.commit.id$</includeOnlyProperty>
+                <includeOnlyProperty>^git.commit.id.abbrev$</includeOnlyProperty>
+                <includeOnlyProperty>^git.closest.tag.name$</includeOnlyProperty>
+                <includeOnlyProperty>^git.closest.tag.commit.count$</includeOnlyProperty>
+                <includeOnlyProperty>^git.commit.id.describe.short$</includeOnlyProperty>
+								<includeOnlyProperty>^git.build.time$</includeOnlyProperty>
+							</includeOnlyProperties>
+	            <replacementProperties>
+	            </replacementProperties>
+	            <useNativeGit>false</useNativeGit>
+	            <abbrevLength>7</abbrevLength>
+	            <commitIdGenerationMode>flat</commitIdGenerationMode>
+	            <gitDescribe>
+	                <skip>false</skip>
+	                <always>false</always>
+	                <abbrev>7</abbrev>
+	                <dirty>-dirty</dirty>
+	                <match>*</match>
+	                <tags>true</tags>
+	                <forceLongFormat>false</forceLongFormat>
+	            </gitDescribe>
+	            <!-- @since 2.2.2 -->
+	            <!--
+	                Since version **2.2.2** the maven-git-commit-id-plugin comes equipped with an additional validation utility which can be used to verify if your project properties are set as you would like to have them set.
+	                *Note*: This configuration will only be taken into account when the additional goal `validateRevision` is configured inside an execution.
+	            -->
+	            <validationProperties>
+	                <validationProperty>
+	                    <!--
+	                         A descriptive name that will be used to be able to identify the validation that does not match up (will be displayed in the error message).
+	                    -->
+	                    <name>validating project version</name>
+	                    <!--
+	                         the value that needs the validation
+	                         *Note* : In order to be able to validate the generated git-properties inside the pom itself you may need to set the configuration `<injectAllReactorProjects>true</injectAllReactorProjects>`.
+	                    -->
+	                    <value>${project.version}</value>
+	                    <!--
+	                        the expected value
+	                    -->
+	                    <shouldMatchTo><![CDATA[^.*(?<!-SNAPSHOT)$]]></shouldMatchTo>
+	                </validationProperty>
+	                <!-- the next validationProperty you would like to validate -->
+	            </validationProperties>
+	            <validationShouldFailIfNoMatch>false</validationShouldFailIfNoMatch>
+	        </configuration>
 
-        <configuration>
-          <dotGitDirectory>${project.basedir}/../.git</dotGitDirectory>
-          <prefix>git</prefix>
-          <dateFormat>yyyy-MM-dd'T'HH:mm:ssZ</dateFormat>
-          <dateFormatTimeZone>${user.timezone}</dateFormatTimeZone>
-          <verbose>false</verbose>
-          <generateGitPropertiesFile>true</generateGitPropertiesFile>
-          <generateGitPropertiesFilename>src/main/webResources/WEB-INF/classes/git.properties</generateGitPropertiesFilename>
-          <!-- Denotes the format to save properties in. Valid options are "properties" (default) and "json". Properties will be saved to the generateGitPropertiesFilename if generateGitPropertiesFile is set to `true`. -->
-          <format>properties</format>
-          <skipPoms>true</skipPoms>
-          <injectAllReactorProjects>true</injectAllReactorProjects>
-          <failOnNoGitDirectory>false</failOnNoGitDirectory>
-          <failOnUnableToExtractRepoInfo>false</failOnUnableToExtractRepoInfo>
-          <skip>false</skip>
-          <runOnlyOnce>false</runOnlyOnce>
-          <excludeProperties>
-          </excludeProperties>
-          <includeOnlyProperties>
-            <includeOnlyProperty>^git.tags$</includeOnlyProperty>
-            <includeOnlyProperty>^git.branch$</includeOnlyProperty>
-            <includeOnlyProperty>^git.commit.id$</includeOnlyProperty>
-            <includeOnlyProperty>^git.commit.id.describe.*$</includeOnlyProperty>
-            <includeOnlyProperty>^git.build.time$</includeOnlyProperty>
-          </includeOnlyProperties>
-          <replacementProperties>
-          </replacementProperties>
-          <useNativeGit>false</useNativeGit>
-          <abbrevLength>7</abbrevLength>
-          <commitIdGenerationMode>flat</commitIdGenerationMode>
-          <gitDescribe>
-            <skip>false</skip>
-            <always>false</always>
-            <abbrev>7</abbrev>
-            <dirty>-dirty</dirty>
-            <match>*</match>
-            <tags>true</tags>
-            <forceLongFormat>false</forceLongFormat>
-          </gitDescribe>
-          <!-- @since 2.2.2 -->
-          <!--
-              Since version **2.2.2** the maven-git-commit-id-plugin comes equipped with an additional validation utility which can be used to verify if your project properties are set as you would like to have them set.
-              *Note*: This configuration will only be taken into account when the additional goal `validateRevision` is configured inside an execution.
-          -->
-          <validationProperties>
-            <validationProperty>
-              <!--
-                   A descriptive name that will be used to be able to identify the validation that does not match up (will be displayed in the error message).
-              -->
-              <name>validating project version</name>
-              <!--
-                   the value that needs the validation
-                   *Note* : In order to be able to validate the generated git-properties inside the pom itself you may need to set the configuration `<injectAllReactorProjects>true</injectAllReactorProjects>`.
-              -->
-              <value>${project.version}</value>
-              <!--
-                  the expected value
-              -->
-              <shouldMatchTo><![CDATA[^.*(?<!-SNAPSHOT)$]]></shouldMatchTo>
-            </validationProperty>
-            <!-- the next validationProperty you would like to validate -->
-          </validationProperties>
-          <validationShouldFailIfNoMatch>false</validationShouldFailIfNoMatch>
-        </configuration>
 	    </plugin>
       <plugin>
         <artifactId>maven-clean-plugin</artifactId>
@@ -745,7 +760,8 @@
                   <includes>
                     <include>META-INF/MANIFEST.MF</include>
                     <include>data/**</include>
-                    <include>doc/**</include>
+                    <include>doc/en/**</include>
+                    <include>doc/fr/**</include>
                     <include>images/logos/*</include>
                     <include>images/logos/statTmp</include>
                     <include>scripts/lib/**</include>
@@ -1303,6 +1319,288 @@
       </dependencies>
     </profile>
 
+    <!-- specific to geOrchestra build -->
+    <profile>
+      <id>debianPackage</id>
+      <properties>
+        <maven.build.timestamp.format>yyyyMMddHHmmss</maven.build.timestamp.format>
+      </properties>
+      <build>
+        <finalName>geonetwork</finalName>
+        <plugins>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-war-plugin</artifactId>
+            <configuration>
+              <classifier>generic</classifier>
+              <archiveClasses>false</archiveClasses>
+              <attachClasses>false</attachClasses>
+              <webResources>
+                <resource>
+                  <directory>${project.basedir}/../schemas</directory>
+                  <includes>
+                    <include>**/src/main/plugin/*</include>
+                  </includes>
+                  <targetPath>WEB-INF/data/config/schema_plugins</targetPath>
+                </resource>
+                <resource>
+                  <directory>${project.basedir}/../web-ui/src/main/resources</directory>
+                </resource>
+                <resource>
+                  <directory>${build.webapp.resources}</directory>
+                </resource>
+              </webResources>
+              <packagingExcludes>
+                xml/schemas/**,
+                catalog/lib/style/bootstrap/docs/**,
+                catalog/lib/style/bootstrap/fonts/**,
+                catalog/lib/style/bootstrap/grunt/**,
+                catalog/lib/style/bootstrap/test-infra/**,
+                catalog/lib/style/font-awesome/css/**,
+                catalog/lib/style/font-awesome/src/**,
+                catalog/lib/style/font-awesome/scss/**
+              </packagingExcludes>
+              <webXml>${build.webapp.resources}/WEB-INF/web.xml</webXml>
+            </configuration>
+          </plugin>
+          <plugin>
+            <artifactId>maven-resources-plugin</artifactId>
+            <version>2.5</version>
+            <executions>
+              <execution>
+                <id>copy-filter-webResource</id>
+                <phase>process-resources</phase>
+                <goals>
+                  <goal>copy-resources</goal>
+                </goals>
+                <configuration>
+                  <includeEmptyDirs>false</includeEmptyDirs>
+                  <outputDirectory>${build.webapp.resources}</outputDirectory>
+                  <resources>
+                    <resource>
+                      <directory>${basedir}/src/main/webResources</directory>
+                      <filtering>true</filtering>
+                      <targetPath>${build.webapp.resources}</targetPath>
+                    </resource>
+                  </resources>
+                  <filters>
+                    <filter>${basedir}/src/main/filters/${env}.properties</filter>
+                  </filters>
+                  <overwrite>true</overwrite>
+                </configuration>
+              </execution>
+            </executions>
+          </plugin>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-scm-plugin</artifactId>
+            <version>1.9.4</version>
+            <configuration>
+              <checkoutDirectory>${project.build.directory}/deb/etc/georchestra</checkoutDirectory>
+              <connectionUrl>scm:git:https://github.com/georchestra/datadir.git</connectionUrl>
+              <pushChanges>false</pushChanges>
+              <scmVersion>22.0</scmVersion>
+              <scmVersionType>branch</scmVersionType>
+            </configuration>
+            <executions>
+              <execution>
+                <id>checkout-deb-default-datadir</id>
+                <phase>process-resources</phase>
+                <goals>
+                  <goal>checkout</goal>
+                </goals>
+              </execution>
+            </executions>
+          </plugin>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-antrun-plugin</artifactId>
+            <version>1.7</version>
+            <executions>
+              <execution>
+                <id>remove-useless-directories</id>
+                <phase>package</phase>
+                <configuration>
+                  <target>
+                    <delete includeemptydirs="true">
+                      <fileset defaultexcludes="false" dir="${project.build.directory}/deb/etc/georchestra">
+                        <include name="**/*" />
+                        <exclude name="geonetwork/**" />
+                      </fileset>
+                    </delete>
+                  </target>
+                </configuration>
+                <goals>
+                  <goal>run</goal>
+                </goals>
+              </execution>
+              <execution>
+                <id>fix-permissions</id>
+                <phase>package</phase>
+                <configuration>
+                  <target>
+                    <chmod perm="ugo+x">
+                      <fileset dir="${basedir}/target/deb">
+                        <include name="**/bin/**"/>
+                        <include name="**/sbin/**"/>
+                        <include name="DEBIAN/post*"/>
+                        <include name="DEBIAN/pre*"/>
+                      </fileset>
+                    </chmod>
+                  </target>
+                </configuration>
+                <goals><goal>run</goal></goals>
+              </execution>
+              <execution>
+                <id>set-project-packageversion</id>
+                <phase>package</phase>
+                <goals>
+                  <goal>run</goal>
+                </goals>
+                <configuration>
+                  <exportAntProperties>true</exportAntProperties>
+                  <target>
+                    <condition property="project.packageVersion"
+                               value="99.master.${maven.build.timestamp}~${git.commit.id.abbrev}"
+                               else="${project.version}.${maven.build.timestamp}~${git.commit.id.abbrev}">
+                      <matches string="${project.version}" pattern="SNAPSHOT$" />
+                    </condition>
+                  </target>
+                </configuration>
+              </execution>
+            </executions>
+          </plugin>
+          <plugin>
+            <groupId>net.sf.debian-maven</groupId>
+            <artifactId>debian-maven-plugin</artifactId>
+            <version>1.0.6</version>
+            <configuration>
+              <packageName>georchestra-geonetwork</packageName>
+              <packageDescription>Debian package for the GeoNetwork fork of geOrchestra.</packageDescription>
+              <packageVersion>${project.packageVersion}</packageVersion>
+              <projectUrl>http://www.georchestra.org/</projectUrl>
+              <projectOrganization>geOrchestra</projectOrganization>
+              <maintainerName>PSC</maintainerName>
+              <maintainerEmail>psc@georchestra.org</maintainerEmail>
+              <excludeAllArtifacts>true</excludeAllArtifacts>
+            </configuration>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+    <profile>
+      <id>docker</id>
+      <properties>
+        <dockerImageName>georchestra/${project.parent.artifactId}:${git.closest.tag.name}-dev</dockerImageName>
+        <dockerDatadirScmUrl>scm:git:https://github.com/georchestra/datadir.git</dockerDatadirScmUrl>
+        <dockerDatadirScmVersion>docker-master</dockerDatadirScmVersion>
+        <dockerGnDatadirScmUrl>scm:git:https://github.com/georchestra/geonetwork_minimal_datadir.git</dockerGnDatadirScmUrl>
+        <dockerGnDatadirScmVersion>gn4.2.2</dockerGnDatadirScmVersion>
+
+      </properties>
+      <build>
+        <finalName>geonetwork</finalName>
+        <plugins>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-scm-plugin</artifactId>
+            <version>1.9.4</version>
+            <executions>
+              <execution>
+                <id>checkout-docker-default-datadir</id>
+                <phase>process-resources</phase>
+                <goals>
+                  <goal>checkout</goal>
+                </goals>
+                <configuration>
+                  <checkoutDirectory>${project.build.directory}/datadir/</checkoutDirectory>
+                  <connectionUrl>${dockerDatadirScmUrl}</connectionUrl>
+                  <pushChanges>false</pushChanges>
+                  <scmVersion>${dockerDatadirScmVersion}</scmVersion>
+                  <scmVersionType>branch</scmVersionType>
+                </configuration>
+              </execution>
+              <execution>
+                <id>checkout-docker-gn-datadir</id>
+                <phase>process-resources</phase>
+                <goals>
+                  <goal>checkout</goal>
+                </goals>
+                <configuration>
+                  <checkoutDirectory>${project.build.directory}/gn_datadir/</checkoutDirectory>
+                  <connectionUrl>${dockerGnDatadirScmUrl}</connectionUrl>
+                  <pushChanges>false</pushChanges>
+                  <scmVersion>${dockerGnDatadirScmVersion}</scmVersion>
+                  <scmVersionType>branch</scmVersionType>
+                </configuration>
+              </execution>
+            </executions>
+          </plugin>
+          <plugin>
+            <groupId>com.spotify</groupId>
+            <artifactId>docker-maven-plugin</artifactId>
+            <version>0.3.8</version>
+            <configuration>
+              <imageName>${dockerImageName}</imageName>
+              <dockerDirectory>${project.basedir}/src/docker</dockerDirectory>
+              <resources>
+                <resource>
+                  <targetPath>/var/lib/jetty/webapps</targetPath>
+                  <directory>${project.build.directory}</directory>
+                  <include>geonetwork/**</include>
+                </resource>
+                <resource>
+                  <targetPath>/etc/georchestra</targetPath>
+                  <directory>${project.build.directory}/datadir</directory>
+                  <include>${project.parent.artifactId}/**</include>
+                </resource>
+                <resource>
+                  <targetPath>/mnt/geonetwork_datadir</targetPath>
+                  <directory>${project.build.directory}/gn_datadir</directory>
+                  <exclude>.git**</exclude>
+                  <filtering>true</filtering>
+                </resource>
+              </resources>
+              <serverId>docker-hub</serverId>
+              <registryUrl>https://index.docker.io/v1/</registryUrl>
+            </configuration>
+            <dependencies>
+              <dependency>
+                <groupId>com.google.guava</groupId>
+                <artifactId>guava</artifactId>
+                <version>19.0</version>
+              </dependency>
+              <dependency>
+                <groupId>javax.activation</groupId>
+                <artifactId>activation</artifactId>
+                <version>1.1.1</version>
+              </dependency>
+            </dependencies>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+    <profile>
+      <id>log4j-logstash</id>
+      <dependencies>
+        <dependency>
+          <groupId>net.logstash.log4j</groupId>
+          <artifactId>jsonevent-layout</artifactId>
+          <version>1.7</version>
+        </dependency>
+      </dependencies>
+    </profile>
+    <profile>
+      <id>sentry-log4j</id>
+      <dependencies>
+        <dependency>
+          <groupId>io.sentry</groupId>
+          <artifactId>sentry-log4j</artifactId>
+          <version>1.7.30</version>
+        </dependency>
+      </dependencies>
+    </profile>
+
     <profile>
       <id>war</id>
       <dependencies>
diff --git a/web/src/main/webapp/WEB-INF/config-security/config-security.xml b/web/src/main/webapp/WEB-INF/config-security/config-security.xml
index 13a182ee41..b0de1db0a0 100644
--- a/web/src/main/webapp/WEB-INF/config-security/config-security.xml
+++ b/web/src/main/webapp/WEB-INF/config-security/config-security.xml
@@ -30,13 +30,6 @@
           http://www.springframework.org/schema/context/spring-context.xsd"
   xmlns="http://www.springframework.org/schema/beans">
   <!-- <sec:debug/> -->
-
-  <ctx:property-placeholder location="WEB-INF/config-security/config-security.properties,file://#{systemEnvironment['geonetwork_dir']}/config/security.properties"
-                                ignore-unresolvable="true"
-                                ignore-resource-not-found="true"
-                                file-encoding="UTF-8"
-                                order="100"/>
-
   <import resource="config-security-core.xml"/>
   <import resource="config-security-mapping.xml"/>