Commit 3a3ed8a2 authored by naji's avatar naji
Browse files

new config pastis modules

parent 2e136305
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>fr.gouv.vitamui</groupId>
<artifactId>api-pastis</artifactId>
<version>4.4.0-SNAPSHOT</version>
<version>5.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>pastis-commons</artifactId>
<name>VITAMUI Pastis Commons</name>
<description>Demo project for Spring Boot</description>
<dependencies>
<!-- VITAMUI -->
......
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>fr.gouv.vitamui</groupId>
<artifactId>api-pastis</artifactId>
<version>4.4.0-SNAPSHOT</version>
<version>5.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>pastis-external-client</artifactId>
<name>VITAMUI Pastis API External Client</name>
<description>Demo project for Spring Boot</description>
<dependencies>
......@@ -20,7 +18,7 @@
<dependency>
<groupId>fr.gouv.vitamui</groupId>
<artifactId>pastis-commons</artifactId>
<version>4.4.0-SNAPSHOT</version>
<version>5.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>fr.gouv.vitamui.commons</groupId>
......@@ -85,8 +83,8 @@
<!-- TEST -->
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<groupId>org.junit.vintage</groupId>
<artifactId>junit-vintage-engine</artifactId>
<scope>test</scope>
</dependency>
<dependency>
......
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>fr.gouv.vitamui</groupId>
<artifactId>api-pastis</artifactId>
<version>4.4.0-SNAPSHOT</version>
<version>5.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>pastis-external</artifactId>
<name>VITAMUI Pastis API External</name>
<description>Demo project for Spring Boot</description>
<properties>
<rpm.skip>false</rpm.skip>
......@@ -20,7 +19,6 @@
</properties>
<dependencies>
<dependency>
<groupId>fr.gouv.vitamui</groupId>
<artifactId>pastis-commons</artifactId>
......@@ -224,6 +222,11 @@
</dependency>
<!--TEST -->
<dependency>
<groupId>org.junit.vintage</groupId>
<artifactId>junit-vintage-engine</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-test</artifactId>
......@@ -278,9 +281,7 @@
<mainClass>fr.gouv.vitamui.pastis.external.PastisExternalApplication</mainClass>
<jvmArguments>-Xmx512m</jvmArguments>
<arguments>
<!-- use src/main/config/application-dev.yml when using mvn spring-boot:run -->
<!-- See : https://docs.spring.io/spring-boot/docs/current/reference/html/boot-features-external-config.html#boot-features-external-config-application-property-files -->
<argument>--spring.config.additional-location=file:${basedir}/src/main/config/pastis-external-application-dev.yml</argument>
<argument>--spring.profiles.active=dev</argument>
</arguments>
</configuration>
</plugin>
......
......@@ -21,7 +21,7 @@ public class PastisExternalApplication extends SpringBootServletInitializer impl
private static final VitamUILogger LOGGER = VitamUILoggerFactory.getInstance(PastisExternalApplication.class);
public static void main(final String[] args) {
final SpringApplication app = new SpringApplicationBuilder(PastisExternalApplication.class).properties("spring.config.name:pastis-external-application")
final SpringApplication app = new SpringApplicationBuilder(PastisExternalApplication.class)
.build();
app.run(args);
}
......
debug: false
#Spring docs swagger
spring:
config:
use-legacy-processing: true
profiles:
active: swagger
active: dev, swagger
cloud:
consul: #disabled for dev
enabled: false
discovery:
enabled: false
register: false
servlet:
multipart:
max-file-size: -1
max-request-size: -1
multipart:
enabled: true
spring.servlet.multipart.max-file-size: -1
spring.servlet.multipart.max-request-size: -1
server-identity:
identityName: vitamui-dev
identityRole: pastis-external
......@@ -31,6 +34,9 @@ server:
trust-store: ../../../dev-deployment/environments/keystores/server/truststore_server.jks
trust-store-password: changeme
client-auth: need
enabled-protocols: TLSv1.1,TLSv1.2,TLSv1.3
ciphers: ECDHE-RSA-AES256-GCM-SHA512:DHE-RSA-AES256-GCM-SHA512:ECDHE-RSA-AES256-GCM-SHA384:DHE-RSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-SHA384
management:
server:
address: localhost
......
......@@ -2,27 +2,22 @@
<project xmlns="http://maven.apache.org/POM/4.0.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>fr.gouv.vitamui</groupId>
<artifactId>api-pastis</artifactId>
<version>4.4.0-SNAPSHOT</version>
<version>5.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>pastis-internal-client</artifactId>
<packaging>jar</packaging>
<name>VITAMUI Pastis API Internal Client</name>
<description>Demo project for Spring Boot</description>
<dependencies>
<!-- VITAMUI -->
<dependency>
<groupId>fr.gouv.vitamui</groupId>
<artifactId>pastis-commons</artifactId>
<version>4.4.0-SNAPSHOT</version>
<version>5.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>fr.gouv.vitamui.commons</groupId>
......@@ -75,8 +70,8 @@
<!-- TEST -->
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<groupId>org.junit.vintage</groupId>
<artifactId>junit-vintage-engine</artifactId>
<scope>test</scope>
</dependency>
<dependency>
......
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<parent>
<groupId>fr.gouv.vitamui</groupId>
<artifactId>api-pastis</artifactId>
<version>4.4.0-SNAPSHOT</version>
<version>5.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>pastis-internal</artifactId>
<name>pastis-internal</name>
<description>Demo project for Spring Boot</description>
<name>VITAMUI Pastis Internal API</name>
<properties>
<rpm.skip>false</rpm.skip>
......@@ -23,7 +22,7 @@
<dependency>
<groupId>fr.gouv.vitamui</groupId>
<artifactId>pastis-commons</artifactId>
<version>4.4.0-SNAPSHOT</version>
<version>5.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>fr.gouv.vitamui.commons</groupId>
......@@ -219,14 +218,13 @@
<configuration>
<executable>true</executable>
<attach>false</attach> <!-- Need to use the original jar for integration-tests -->
<mainClass>fr.gouv.vitamui.pastis.internal.PastisInternalApplication</mainClass>
<mainClass>fr.gouv.vitamui.referential.internal.server.ApiReferentialInternalServerApplication
</mainClass>
<jvmArguments>
-Xmx512m -Dvitam.config.folder=${basedir}/src/main/config/dev-vitam
</jvmArguments>
<arguments>
<!-- use src/main/config/application-dev.yml when using mvn spring-boot:run -->
<!-- See : https://docs.spring.io/spring-boot/docs/current/reference/html/boot-features-external-config.html#boot-features-external-config-application-property-files -->
<argument>--spring.config.additional-location=file:${basedir}/src/main/config/pastis-internal-application-dev.yml</argument>
<argument>--spring.profiles.active=dev</argument>
</arguments>
</configuration>
</plugin>
......
......@@ -20,7 +20,7 @@ public class PastisInternalApplication implements CommandLineRunner {
private static final VitamUILogger LOGGER = VitamUILoggerFactory.getInstance(PastisInternalApplication.class);
public static void main(final String[] args) {
final SpringApplication app = new SpringApplicationBuilder(PastisInternalApplication.class).properties("spring.config.name:pastis-internal-application")
final SpringApplication app = new SpringApplicationBuilder(PastisInternalApplication.class)
.build();
app.run(args);
}
......
debug: false
spring:
config:
use-legacy-processing: true
profiles:
active: swagger
active: dev, swagger
cloud:
consul: #disabled for dev
enabled: false
......@@ -11,12 +12,14 @@ spring:
enabled: false
register: false
servlet:
multipart:
max-file-size: -1
max-request-size: -1
multipart:
enabled: true
spring.servlet.multipart.max-file-size: -1
spring.servlet.multipart.max-request-size: -1
server-identity:
identityName: vitamui-dev
identityRole: pastis-internal
......
......@@ -6,11 +6,11 @@
<parent>
<groupId>fr.gouv.vitamui</groupId>
<artifactId>api-parent</artifactId>
<version>4.4.0-SNAPSHOT</version>
<version>5.0-SNAPSHOT</version>
</parent>
<artifactId>api-pastis</artifactId>
<version>4.4.0-SNAPSHOT</version>
<version>5.0-SNAPSHOT</version>
<name>api-pastis</name>
<packaging>pom</packaging>
<description>Demo project for Spring Boot</description>
......
......@@ -934,13 +934,8 @@
"budgets": [
{
"type": "initial",
"maximumWarning": "2mb",
"maximumError": "5mb"
},
{
"type": "anyComponentStyle",
"maximumWarning": "6kb",
"maximumError": "10kb"
"maximumWarning": "15mb",
"maximumError": "15mb"
}
]
}
......
/*
* Copyright French Prime minister Office/SGMAP/DINSIC/Vitam Program (2019-2020)
* and the signatories of the "VITAM - Accord du Contributeur" agreement.
*
* contact@programmevitam.fr
*
* This software is a computer program whose purpose is to implement
* implement a digital archiving front-office system for the secure and
* efficient high volumetry VITAM solution.
*
* This software is governed by the CeCILL-C license under French law and
* abiding by the rules of distribution of free software. You can use,
* modify and/ or redistribute the software under the terms of the CeCILL-C
* license as circulated by CEA, CNRS and INRIA at the following URL
* "http://www.cecill.info".
*
* As a counterpart to the access to the source code and rights to copy,
* modify and redistribute granted by the license, users are provided only
* with a limited warranty and the software's author, the holder of the
* economic rights, and the successive licensors have only limited
* liability.
*
* In this respect, the user's attention is drawn to the risks associated
* with loading, using, modifying and/or developing or reproducing the
* software by the user in light of its specific status of free software,
* that may mean that it is complicated to manipulate, and that also
* therefore means that it is reserved for developers and experienced
* professionals having in-depth computer knowledge. Users are therefore
* encouraged to load and test the software's suitability as regards their
* requirements in conditions enabling the security of their systems and/or
* data to be ensured and, more generally, to use and operate it in the
* same conditions as regards security.
*
* The fact that you are presently reading this means that you have had
* knowledge of the CeCILL-C license and that you accept its terms.
*/
export const environment = {
production: true,
apiServerUrl: "https://dev.vitamui.com:8051",
standalone: false
};
......@@ -5,12 +5,11 @@
<artifactId>ui-pastis-test</artifactId>
<name>VITAMUI UI Pastis TEST</name>
<description>Demo project for Spring Boot</description>
<parent>
<groupId>fr.gouv.vitamui</groupId>
<artifactId>ui-parent</artifactId>
<version>4.4.0-SNAPSHOT</version>
<version>5.0-SNAPSHOT</version>
</parent>
<properties>
......@@ -149,6 +148,11 @@
<version>5.2.0.RELEASE</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.junit.vintage</groupId>
<artifactId>junit-vintage-engine</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
<build>
......@@ -161,6 +165,12 @@
<directory>src/main/resources</directory>
</resource>
</resources>
<testResources>
<testResource>
<directory>src/test/resources</directory>
<filtering>true</filtering>
</testResource>
</testResources>
<plugins>
<plugin>
<groupId>org.springframework.boot</groupId>
......@@ -185,80 +195,15 @@
<mainClass>fr.gouv.vitamui.pastistest.UiPastisTestApplication</mainClass>
<jvmArguments>-Xmx512m</jvmArguments>
<arguments>
<!-- use src/main/config/application-dev.yml when using mvn spring-boot:run -->
<!-- See : https://docs.spring.io/spring-boot/docs/current/reference/html/boot-features-external-config.html#boot-features-external-config-application-property-files -->
<argument>--spring.config.additional-location=file:${basedir}/src/main/config/ui-pastis-application-dev.yml</argument>
<argument>
--spring.profiles.active=dev
</argument>
</arguments>
</configuration>
</plugin>
<!--<plugin>
<groupId>com.github.eirslett</groupId>
<artifactId>frontend-maven-plugin</artifactId>
<version>${maven.frontend.plugin.version}</version>
<configuration>
<workingDirectory>${maven.multiModuleProjectDirectory}/ui/ui-frontend</workingDirectory>
<installDirectory>${maven.multiModuleProjectDirectory}/ui/ui-frontend</installDirectory>
</configuration>
<executions>
<execution>
<id>install node and npm</id>
<goals>
<goal>install-node-and-npm</goal>
</goals>
<phase>initialize</phase>
<configuration>
<skip>${skipAllFrontend}</skip>
<nodeVersion>${node.version}</nodeVersion>
<npmVersion>${npm.version}</npmVersion>
</configuration>
</execution>
<execution>
<id>npm install</id>
<goals>
<goal>npm</goal>
</goals>
<phase>generate-sources</phase>
<configuration>
<skip>${skipAllFrontend}</skip>
<arguments>install &#45;&#45;loglevel warn</arguments>
</configuration>
</execution>
&lt;!&ndash; copy scss from vitamui-library to other projects &ndash;&gt;
<execution>
<id>copy scss</id>
<goals>
<goal>npm</goal>
</goals>
<phase>generate-sources</phase>
<configuration>
<skip>${skipAllFrontend}</skip>
<arguments>run copy-scss:vitamui-library</arguments>
</configuration>
</execution>
<execution>
<id>npm run build</id>
<goals>
<goal>npm</goal>
</goals>
<phase>process-sources</phase>
<configuration>
<skip>${skipAllFrontend}</skip>
<arguments>run ng-high-memory build &#45;&#45; &#45;&#45;project=pastis &#45;&#45;prod &#45;&#45;output-path=${project.basedir}/target/www &#45;&#45;base-href=${angular.base.href} &#45;&#45;deploy-url=${angular.base.href}</arguments>
</configuration>
</execution>
<execution>
<id>npm test</id>
<phase>test</phase>
<goals>
<goal>npm</goal>
</goals>
<configuration>
<skip>${skipTests}</skip>
<arguments>run test:conf-ci &#45;&#45; &#45;&#45;project=pastis</arguments>
</configuration>
</execution>
</executions>
</plugin>-->
</plugins>
</build>
......
......@@ -23,7 +23,6 @@ public class UiPastisTestApplication implements CommandLineRunner {
public static void main(String[] args) {
SpringApplication app = new SpringApplicationBuilder(UiPastisTestApplication.class)
.properties("spring.config.name:ui-pastis-application")
.build();
app.run(args);
}
......
debug: true
spring:
config:
use-legacy-processing: true
profiles:
active: dev,swagger
cloud:
consul: #disable for dev
enabled: false
discovery:
enabled: false
register: false
server:
host: dev.vitamui.com
port: 9015
scheme: https
ssl:
key-store: ../../dev-deployment/environments/keystores/server/localhost/keystore_ui-pastis.jks
key-store-password: changme
key-password: changeme
enabled-protocols: TLSv1.1,TLSv1.2,TLSv1.3
ciphers: ECDHE-RSA-AES256-GCM-SHA512:DHE-RSA-AES256-GCM-SHA512:ECDHE-RSA-AES256-GCM-SHA384:DHE-RSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-SHA384
servlet.session.cookie.path: /pastis-api
management:
server:
address: localhost
port: 9115
ssl:
enabled: false
ui-pastis:
platform-name: VITAM-UI
portal-logo: logo_PORTAL.png
header-logo: logo_HEADER.png
footer-logo: logo_FOOTER.png
portal-title: "Portail des applications de l'archivage"
theme-colors:
vitamui-primary: "#702382"
vitamui-secondary: "#2563A9"
vitamui-tertiary: "#C22A40"
vitamui-header-footer: "#ffffff"
vitamui-background: "#F5F7FC"
assets: src/main/resources/assets
iam-external-client:
server-host: localhost
server-port: 8083
secure: true
ssl-configuration:
keystore:
key-path: ../../dev-deployment/environments/keystores/server/localhost/keystore_ui-pastis.jks
key-password: changeme
type: JKS
truststore:
key-path: ../../dev-deployment/environments/keystores/server/truststore_server.jks
key-password: changeme
hostname-verification: false
pastis-external-client:
server-host: localhost
server-port: 8015
secure: true
ssl-configuration:
keystore:
key-path: ../../dev-deployment/environments/keystores/server/localhost/keystore_ui-pastis.jks
key-password: changeme
type: JKS
truststore:
key-path: ../../dev-deployment/environments/keystores/server/truststore_server.jks
key-password: changeme
hostname-verification: false
base-url:
portal: "https://dev.vitamui.com:4200"
archives-search: "https://dev.vitamui.com:4209/archive-search"
ingest: "https://dev.vitamui.com:4208/ingest"
referential: "https://dev.vitamui.com:4202"
portal-categories:
ingest_and_consultation:
title: "Versement & consultation"
displayTitle: true
order: 1
referential:
title: "Référentiels"
displayTitle: true
order: 2
supervision_and_audits:
title: "Supervision & Audits"
displayTitle: true
order: 3
security_and_application_rights:
title: "Sécurité & droits applicatifs"
displayTitle: true
order: 4
organization_and_user_rights:
title: "Organisation & droits utilisateurs"
displayTitle: true
order: 5
ui:
url: "https://dev.vitamui.com:4251"
redirect-url: https://dev.vitamui.com:9015/${ui-prefix}
cas:
internal-url: https://dev.vitamui.com:8080/cas
external-url: https://dev.vitamui.com:8080/cas
callback-url: ${ui.url}/pastis-api/callback
ssl:
trust-store: ../../dev-deployment/environments/keystores/server/truststore_server.jks
trust-store-password: changeme