Skip to content
Snippets Groups Projects
Commit e0e0d9c8 authored by naji's avatar naji
Browse files

refactor: edit profiles maven

parent 7bed0c87
No related branches found
No related tags found
5 merge requests!58compare branch,!54Comparaison de merge vers vitam-ui,!53Comparaison de merge vers vitam-ui,!52Voir difference entre les deux verion,!41MAJ: compare to vitam-ui
Hide whitespace changes
Inline Side-by-side
Showing
with 3355 additions and 23 deletions
ui/ui-pastis/pom.xml
+ 12
− 17
View file @ e0e0d9c8
......@@ -5,7 +5,7 @@
<packaging>jar</packaging>
<url>http://maven.apache.org</url>
<artifactId>ui-pastis</artifactId>
<name>PASTIS-API</name>
<name>UI Pastis</name>
<parent>
<groupId>fr.gouv.vitamui</groupId>
......@@ -55,24 +55,29 @@
<version>1.4.5</version>
</dependency>
<!-- Documentation -->
<dependency>
<groupId>org.springdoc</groupId>
<artifactId>springdoc-openapi-ui</artifactId>
<version>1.5.2</version>
</dependency>
<!-- Start of SpringBoot starter web (Tomcat by default) and starter test-->
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId>
<version>2.2.6.RELEASE</version>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-tomcat</artifactId>
<version>2.2.6.RELEASE</version>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-test</artifactId>
<scope>test</scope>
<version>2.2.6.RELEASE</version>
<exclusions>
<exclusion>
<groupId>com.vaadin.external.google</groupId>
......@@ -201,8 +206,6 @@
</testResource>
</testResources>
<finalName>PastisApi</finalName>
</build>
</profile>
......@@ -236,11 +239,10 @@
<executable>true</executable>
<attach>false</attach> <!-- Need to use the original jar for integration-tests -->
<mainClass>fr.gouv.vitamui.pastis.PastisRestApplication</mainClass>
<jvmArguments>-Xmx512m</jvmArguments>
<jvmArguments>-Xmx128m</jvmArguments>
<jvmArguments>-Xms512m</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/application.yml</argument>
<argument>--spring.config.additional-location=file:src/main/config/ui-pastis-application-dev.yml</argument>
</arguments>
</configuration>
</plugin>
......@@ -264,13 +266,6 @@
</executions>
</plugin>
</plugins>
<!-- Tests -->
<testResources>
<testResource>
<directory>${project.basedir}/src/test/resources</directory>
</testResource>
</testResources>
</build>
</profile>
<!-- End of Dev profile -->
......
ui/ui-pastis/src/main/config/application.yml → ui/ui-pastis/src/main/config/ui-pastis-application-dev.yml
+ 1
− 1
View file @ e0e0d9c8
server:
host: dev.vitamui.com
port: 9051
port: 8051
scheme: https
ssl:
key-store: src/main/config/ui-pastis.jks
......
ui/ui-pastis/src/main/resources/application.properties
+ 3
− 5
View file @ e0e0d9c8
......@@ -4,8 +4,6 @@ spring.servlet.multipart.max-request-size=11MB
spring.servlet.multipart.enabled=true
server.port=8051
#Spring docs swagger
springdoc.api-docs.path=/api-docs
springdoc.swagger-ui.path=/open-api.html
......@@ -16,8 +14,8 @@ rng.base.file=rng/Profil_seda_pastis_mvp.rng
json.base.file=rng/ProfileJson.json
pua.definitions.file=pua_validation/ProfileJson.json
war.dev.filename=rest-pastis
war.prod.filename=rest
#PORT
server.port=8051
#CORS
cors.allowed-origins = https://dev.vitamui.com:4251, https://localhost, http://localhost
cors.allowed-origins = https://dev.vitamui.com:4251, https://localhost
ui/ui-pastis/src/test/resources/pua/Profil_seda_pastis_mvp.rng 0 → 100644
+ 107
− 0
View file @ e0e0d9c8
<?xml version='1.0' encoding='utf-8' standalone='no'?>
<rng:grammar xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
xmlns:rng="http://relaxng.org/ns/structure/1.0"
xmlns:seda="fr:gouv:culture:archivesdefrance:seda:v2.1" xmlns:xlink="http://www.w3.org/1999/xlink"
xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="fr:gouv:culture:archivesdefrance:seda:v2.1"
datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes"
ns="fr:gouv:culture:archivesdefrance:seda:v2.1" seda:warnings="">
<rng:start>
<rng:element name="ArchiveTransfer">
<rng:optional>
<rng:attribute name="id">
<rng:data type="ID"/>
</rng:attribute>
</rng:optional>
<rng:element name="Date">
<rng:data type="dateTime"/>
</rng:element>
<rng:element name="MessageIdentifier">
<rng:data type="token"/>
</rng:element>
<rng:element name="CodeListVersions">
<rng:data type="token"/>
</rng:element>
<rng:element name="DataObjectPackage">
<rng:optional>
<rng:attribute name="xml:id">
<rng:data type="ID"/>
</rng:attribute>
</rng:optional>
<rng:element name="DataObjectGroup">
<rng:attribute name="id">
<rng:data type="ID"/>
</rng:attribute>
<rng:zeroOrMore>
<rng:element name="BinaryDataObject">
<rng:attribute name="id">
<rng:data type="ID"/>
</rng:attribute>
<rng:optional>
<rng:element name="DataObjectVersion">
<rng:data type="token"/>
<xsd:annotation>
<xsd:documentation>BinaryMaster par défaut</xsd:documentation>
</xsd:annotation>
</rng:element>
</rng:optional>
<rng:optional>
<rng:element name="Uri">
<rng:data type="anyURI"/>
</rng:element>
</rng:optional>
<rng:element name="MessageDigest">
<rng:data type="base64Binary"/>
<rng:attribute name="algorithm">
<rng:data type="token"/>
</rng:attribute>
</rng:element>
</rng:element>
</rng:zeroOrMore>
</rng:element>
<rng:element name="DescriptiveMetadata">
<rng:zeroOrMore>
<rng:element name="ArchiveUnit">
<rng:attribute name="id">
<rng:data type="ID"/>
</rng:attribute>
<rng:element name="Content">
<rng:optional>
<rng:element name="DescriptionLevel">
<rng:data type="token"/>
</rng:element>
</rng:optional>
<rng:optional>
<rng:element name="Title">
<rng:data type="string"/>
</rng:element>
</rng:optional>
</rng:element>
</rng:element>
</rng:zeroOrMore>
</rng:element>
<rng:element name="ManagementMetadata">
<rng:optional>
<rng:element name="OriginatingAgencyIdentifier">
<rng:data type="token"/>
</rng:element>
</rng:optional>
<rng:optional>
<rng:element name="SubmissionAgencyIdentifier">
<rng:data type="token"/>
</rng:element>
</rng:optional>
</rng:element>
</rng:element>
<rng:element name="ArchivalAgency">
<rng:element name="Identifier">
<rng:data type="token"/>
</rng:element>
</rng:element>
<rng:element name="TransferringAgency">
<rng:element name="Identifier">
<rng:data type="token"/>
</rng:element>
</rng:element>
</rng:element>
</rng:start>
</rng:grammar>
ui/ui-pastis/src/test/resources/rng/Profil_seda_pastis_mvp.rng 0 → 100644
+ 107
− 0
View file @ e0e0d9c8
<?xml version='1.0' encoding='utf-8' standalone='no'?>
<rng:grammar xmlns:a="http://relaxng.org/ns/compatibility/annotations/1.0"
xmlns:rng="http://relaxng.org/ns/structure/1.0"
xmlns:seda="fr:gouv:culture:archivesdefrance:seda:v2.1" xmlns:xlink="http://www.w3.org/1999/xlink"
xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="fr:gouv:culture:archivesdefrance:seda:v2.1"
datatypeLibrary="http://www.w3.org/2001/XMLSchema-datatypes"
ns="fr:gouv:culture:archivesdefrance:seda:v2.1" seda:warnings="">
<rng:start>
<rng:element name="ArchiveTransfer">
<rng:optional>
<rng:attribute name="id">
<rng:data type="ID"/>
</rng:attribute>
</rng:optional>
<rng:element name="Date">
<rng:data type="dateTime"/>
</rng:element>
<rng:element name="MessageIdentifier">
<rng:data type="token"/>
</rng:element>
<rng:element name="CodeListVersions">
<rng:data type="token"/>
</rng:element>
<rng:element name="DataObjectPackage">
<rng:optional>
<rng:attribute name="xml:id">
<rng:data type="ID"/>
</rng:attribute>
</rng:optional>
<rng:element name="DataObjectGroup">
<rng:attribute name="id">
<rng:data type="ID"/>
</rng:attribute>
<rng:zeroOrMore>
<rng:element name="BinaryDataObject">
<rng:attribute name="id">
<rng:data type="ID"/>
</rng:attribute>
<rng:optional>
<rng:element name="DataObjectVersion">
<rng:data type="token"/>
<xsd:annotation>
<xsd:documentation>BinaryMaster par défaut</xsd:documentation>
</xsd:annotation>
</rng:element>
</rng:optional>
<rng:optional>
<rng:element name="Uri">
<rng:data type="anyURI"/>
</rng:element>
</rng:optional>
<rng:element name="MessageDigest">
<rng:data type="base64Binary"/>
<rng:attribute name="algorithm">
<rng:data type="token"/>
</rng:attribute>
</rng:element>
</rng:element>
</rng:zeroOrMore>
</rng:element>
<rng:element name="DescriptiveMetadata">
<rng:zeroOrMore>
<rng:element name="ArchiveUnit">
<rng:attribute name="id">
<rng:data type="ID"/>
</rng:attribute>
<rng:element name="Content">
<rng:optional>
<rng:element name="DescriptionLevel">
<rng:data type="token"/>
</rng:element>
</rng:optional>
<rng:optional>
<rng:element name="Title">
<rng:data type="string"/>
</rng:element>
</rng:optional>
</rng:element>
</rng:element>
</rng:zeroOrMore>
</rng:element>
<rng:element name="ManagementMetadata">
<rng:optional>
<rng:element name="OriginatingAgencyIdentifier">
<rng:data type="token"/>
</rng:element>
</rng:optional>
<rng:optional>
<rng:element name="SubmissionAgencyIdentifier">
<rng:data type="token"/>
</rng:element>
</rng:optional>
</rng:element>
</rng:element>
<rng:element name="ArchivalAgency">
<rng:element name="Identifier">
<rng:data type="token"/>
</rng:element>
</rng:element>
<rng:element name="TransferringAgency">
<rng:element name="Identifier">
<rng:data type="token"/>
</rng:element>
</rng:element>
</rng:element>
</rng:start>
</rng:grammar>
ui/ui-pastis/src/test/resources/rng/ProfileJson.json 0 → 100644
+ 3125
− 0
View file @ e0e0d9c8
source diff could not be displayed: it is too large. Options to address this: view the blob.
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment