Commit c09efac0 authored by cazenave's avatar cazenave
Browse files

Merge branch 'feature/nicoback' into 'master'

Feature/nicoback

See merge request !1
parents d4296394 56606d5f
......@@ -18,6 +18,7 @@
<module>ui-commons</module>
<module>ui-portal</module>
<module>ui-identity</module>
<module>ui-pastis</module>
</modules>
</project>
......@@ -7,7 +7,7 @@
"start": "ng serve --aot --proxy-config proxy.conf.json --disable-host-check --ssl --ssl-key server-identity.key --ssl-cert server-identity.crt",
"build": "ng build --prod --build-optimizer=false --optimization=false",
"build:dev": "ng build --prod --sourceMap=false --build-optimizer=false --optimization=false",
"build:prod": "export NODE_OPTIONS=--max_old_space_size=4096; ng build --prod",
"build:prod": " ng build --prod",
"test": "ng test --watch=false",
"test:conf-ci": "ng test --watch=false --karma-config=karma.conf.ci.js",
"test:sonar": "ng test --code-coverage --watch=false --karma-config=karma.conf.ci.js --source-map=true",
......
......@@ -10374,7 +10374,7 @@
},
"ui-frontend-common": {
"version": "file:../ui-frontend-common/ui-frontend-common-0.0.12.tgz",
"integrity": "sha512-M+MJJUX9jscmGGF8chSunJGAev5tlEJILsezsmdJneohhN80dZp+uS2/D8YI3KDMwZkW37UKtYqn1xTcjt7NcQ==",
"integrity": "sha512-MNKzVe8KVnBQvMib0GYoK4kGnuhBtFFh42X2XMWQZBamfIDv5skKZPEIP9IuUzy/VplyCVmmLQJ6YxYcx4Yd0Q==",
"requires": {
"@angular/animations": "8.0.0",
"@angular/cdk": "^8.0.0",
......@@ -10409,14 +10409,6 @@
"tslib": "^1.9.0"
}
},
"@angular/common": {
"version": "8.0.0",
"resolved": "https://registry.npmjs.org/@angular/common/-/common-8.0.0.tgz",
"integrity": "sha512-iOAJZ0+1zTRHnHE/5G30+4Q66W1pfZkSkxZIXvgijZ+wtuNloYdWNy/IdZ/m7ayBI7A6FsYEhyMUoWz2HVEJNw==",
"requires": {
"tslib": "^1.9.0"
}
},
"@angular/compiler": {
"version": "8.0.0",
"resolved": "https://registry.npmjs.org/@angular/compiler/-/compiler-8.0.0.tgz",
......
......@@ -59,14 +59,14 @@
"lodash": "^4.17.10",
"material-design-icons": "^3.0.1",
"moment": "^2.24.0",
"ng2-file-upload": "^1.4.0",
"ngx-toastr": "^11.3.3",
"rxjs": "^6.5.2",
"tslib": "^1.9.0",
"ui-frontend-common": "file:../ui-frontend-common/ui-frontend-common-0.0.12.tgz",
"underscore": "^1.9.1",
"web-animations-js": "^2.3.2",
"zone.js": "~0.9.1",
"ng2-file-upload": "^1.4.0",
"ngx-toastr": "^11.3.3"
"zone.js": "~0.9.1"
},
"devDependencies": {
"@angular-devkit/build-angular": "~0.800.0",
......
......@@ -8,6 +8,9 @@
<vitamui-common-navbar [hideTenantMenu]="true" [hideCustomerMenu]="true"></vitamui-common-navbar>
</div>
</div>
<app-home></app-home>
<app-home></app-home>
......@@ -3,7 +3,7 @@
.vitamui-header {
background: none;
.vitamui-container {
.vitamui-container {
padding-bottom: 0px;
}
......
export const environment = {
production: false,
apiPastisUrl: 'http://10.100.129.51:8080/rest',
apiPastisUrl: 'https://dev.vitamui.com:8585',
apiOntologyUrl: 'http://10.100.129.51:8080',
name: 'dev'
};
export const environment = {
production: true,
apiPastisUrl: 'http://10.100.129.51:8080/rest',
apiPastisUrl: 'https://dev.vitamui.com:8585',
apiOntologyUrl: 'http://10.100.129.51:8080',
name: 'prod'
};
......@@ -4,8 +4,8 @@
export const environment = {
production: false,
apiPastisUrl: 'http://10.100.129.51:8080/rest',
apiOntologyUrl: 'http://10.100.129.51:8080',
apiPastisUrl: 'https://dev.vitamui.com:8585',
apiOntologyUrl: 'https://dev.vitamui.com:8585',
name: 'dev'
};
......
......@@ -10,5 +10,11 @@
"secure": false,
"pathRewrite": {},
"logLevel": "debug"
},
"/pastis-api": {
"target": "https://dev.vitamui.com:9000/",
"secure": false,
"pathRewrite": {},
"logLevel": "debug"
}
}
......@@ -24,7 +24,7 @@
"vitamui-demo": ["./projects/demo/src"],
"vitamui-identity": ["./projects/identity/src/app/"],
"vitamui-portal": ["./projects/portal/src/app/"],
"vitamui-pastis": ["./projects/pastis/src/app/"]
"vitamui-pastis": ["./projects/pastis/src/"]
},
"noUnusedLocals": false,
"noUnusedParameters": false
......
{
"lockfileVersion": 1
}
<?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 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<packaging>war</packaging>
<url>http://maven.apache.org</url>
<artifactId>ui-pastis</artifactId>
<name>PASTIS-API</name>
<parent>
<groupId>fr.gouv.vitamui</groupId>
<artifactId>ui-parent</artifactId>
<version>1.0.0-SNAPSHOT</version>
</parent>
<properties>
<!-- Generic properties -->
<maven.compile.target>1.8</maven.compile.target>
<maven.compile.source>1.8</maven.compile.source>
<warDevName>rest</warDevName>
<warProdName>rest</warProdName>
</properties>
<dependencies>
<!--VITAMUI -->
<dependency>
<groupId>fr.gouv.vitamui.commons</groupId>
<artifactId>commons-api</artifactId>
</dependency>
<dependency>
<groupId>fr.gouv.vitamui.commons</groupId>
<artifactId>commons-rest</artifactId>
</dependency>
<!-- SPRING BOOT -->
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId>
</dependency>
<dependency>
<groupId>org.jvnet.jaxb2.maven2</groupId>
<artifactId>maven-jaxb2-plugin</artifactId>
<version>0.14.0</version>
</dependency>
<dependency>
<groupId>org.json</groupId>
<artifactId>json</artifactId>
<version>20180813</version>
</dependency>
<dependency>
<groupId>com.google.code.gson</groupId>
<artifactId>gson</artifactId>
<version>2.8.5</version>
</dependency>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.4</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.fasterxml</groupId>
<artifactId>jackson-xml-databind</artifactId>
<version>0.6.2</version>
</dependency>
</dependencies>
<build>
<resources>
<resource>
<directory>target/www/</directory>
<targetPath>static/</targetPath>
</resource>
<resource>
<directory>src/main/resources</directory>
</resource>
</resources>
<plugins>
<plugin>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-maven-plugin</artifactId>
<executions>
<execution>
<id>build-info</id>
<goals>
<goal>build-info</goal>
</goals>
</execution>
<execution>
<id>spring-boot-repackage</id>
<goals>
<goal>repackage</goal>
</goals>
</execution>
</executions>
<configuration>
<executable>true</executable>
<attach>false</attach> <!-- Need to use the original jar for integration-tests -->
<mainClass>fr.gouv.vitamui.pastis.PastisRestApplication</mainClass>
<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>
</arguments>
</configuration>
</plugin>
<!-- Read the config.properties files with the properties plug-in -->
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>properties-maven-plugin</artifactId>
<version>1.0-alpha-2</version>
<executions>
<execution>
<phase>initialize</phase>
<goals>
<goal>read-project-properties</goal>
</goals>
<configuration>
<files>
<file>${project.basedir}/src/main/resources/config.properties</file>
</files>
</configuration>
</execution>
</executions>
</plugin>
<!-- Create folder for .rng files on server -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId>
<version>2.6</version>
<configuration>
<warName>${war.dev.filename}</warName>
</configuration>
</plugin>
<!-- Jsonix plugin -->
<plugin>
<groupId>org.jvnet.jaxb2.maven2</groupId>
<artifactId>maven-jaxb2-plugin</artifactId>
<version>0.14.0</version>
<executions>
<execution>
<goals>
<goal>generate</goal>
</goals>
<configuration>
<extension>true</extension>
<args>
<arg>-Xjsonix</arg>
<arg>-Xjsonix-compact</arg>
</args>
<plugins>
<plugin>
<groupId>org.hisrc.jsonix</groupId>
<artifactId>jsonix-schema-compiler</artifactId>
<version>2.3.9</version>
</plugin>
</plugins>
</configuration>
</execution>
</executions>
</plugin>
</plugins>
</build>
<profiles>
<profile>
<id>dev</id>
<build>
<finalName>${war.dev.filename}</finalName>
</build>
</profile>
</profiles>
</project>
<?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 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>
<groupId>fr.cines.vitam</groupId>
<artifactId>pastis</artifactId>
<name>PASTIS-CORE</name>
<version>0.0.1-SNAPSHOT</version>
<packaging>pom</packaging>
<modules>
<module>rest-api</module>
<module>webapp</module>
</modules>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>
<build>
<plugins>
<!-- Read build.properties -->
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>properties-maven-plugin</artifactId>
<version>1.0-alpha-2</version>
<executions>
<execution>
<phase>initialize</phase>
<goals>
<goal>read-project-properties</goal>
</goals>
<configuration>
<files>
<file>build.properties</file>
</files>
</configuration>
</execution>
</executions>
</plugin>
<!-- Maven compiler -->
<plugin>
<artifactId>maven-compiler-plugin</artifactId>
<version>3.8.0</version>
<configuration>
<source>1.8</source>
<target>1.8</target>
</configuration>
</plugin>
</plugins>
</build>
</project>
<?xml version="1.0" encoding="UTF-8"?>
<configuration>
<!-- Send debug messages to System.out -->
<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender">
<!-- By default, encoders are assigned the type ch.qos.logback.classic.encoder.PatternLayoutEncoder -->
<encoder>
<pattern>%d{ISO8601} [[%thread]] [%X{X-Request-Id}] %-5level %logger - %replace(%caller{1..2}){'Caller\+1 at |\n',''} : %msg %rootException%n</pattern>
</encoder>
</appender>
<!-- <appender name="FILE" class="ch.qos.logback.core.FileAppender"> -->
<appender name="FILE" class="ch.qos.logback.core.rolling.RollingFileAppender">
<rollingPolicy class="ch.qos.logback.core.rolling.SizeAndTimeBasedRollingPolicy">
<fileNamePattern>/tmp/vitamui/ui-pastis.%d{yyyy-MM-dd}.%i.log</fileNamePattern>
<maxFileSize>10MB</maxFileSize>
<maxHistory>30</maxHistory>
<totalSizeCap>5GB</totalSizeCap>
</rollingPolicy>
<encoder>
<pattern>%d{ISO8601} [[%thread]] [%X{X-Request-Id}] %-5level %logger - %replace(%caller{1..2}){'Caller\+1 at |\n',''} : %msg %rootException%n</pattern>
</encoder>
</appender>
<appender name="SYSLOG" class="ch.qos.logback.classic.net.SyslogAppender">
<syslogHost>localhost</syslogHost>
<facility>local0</facility>
<port>5140</port>
<suffixPattern>vitamui-ui-pastis: %d{ISO8601} [[%thread]] [%X{X-Request-Id}] %-5level %logger - %replace(%caller{1..2}){'Caller\+1 at |\n',''} : %msg %rootException%n</suffixPattern>
</appender>
<!-- By default, the level of the root level is set to TRACE -->
<root level="INFO">
<appender-ref ref="STDOUT" />
<appender-ref ref="FILE" />
<appender-ref ref="SYSLOG" />
</root>
<logger name="org.springframework.web" level="INFO"/>
<logger name="fr.gouv.vitamui.pastis" level="INFO"/>
</configuration>
spring:
profiles:
active: dev
server:
host: dev.vitamui.com
port: 8585
scheme: https
ssl:
key-store: src/main/config/ui-pastis.jks
key-store-password: jkspasswd
key-password: jkspasswd
logging:
level:
fr.gouv.vitamui: DEBUG
org.springframework.web: INFO
management.endpoints.web.exposure.include: "*"
# Uncomment if you want to use you specific logback config.
#logging:
# config: src/main/config/logback.xml
/*
* Copyright CINES, 2016 Alexandre Granier Ce
* logiciel est un programme informatique servant à créer une interface Web pour valider des formats
* de fichiers. Ce logiciel est régi par la licence CeCILL-C soumise au droit français et respectant
* les principes de diffusion des logiciels libres. Vous pouvez utiliser, modifier et/ou
* redistribuer ce programme sous les conditions de la licence CeCILL-C telle que diffusée par le
* CEA, le CNRS et l'INRIA sur le site "http://www.cecill.info". En contrepartie de l'accessibilité
* au code source et des droits de copie, de modification et de redistribution accordés par cette
* licence, il n'est offert aux utilisateurs qu'une garantie limitée. Pour les mêmes raisons, seule
* une responsabilité restreinte pèse sur l'auteur du programme, le titulaire des droits
* patrimoniaux et les concédants successifs. A cet égard l'attention de l'utilisateur est attirée
* sur les risques associés au chargement, à l'utilisation, à la modification et/ou au développement
* et à la reproduction du logiciel par l'utilisateur étant donné sa spécificité de logiciel libre,
* qui peut le rendre complexe à manipuler et qui le réserve donc à des développeurs et des
* professionnels avertis possédant des connaissances informatiques approfondies. Les utilisateurs
* sont donc invités à charger et tester l'adéquation du logiciel à leurs besoins dans des
* conditions permettant d'assurer la sécurité de leurs systèmes et ou de leurs données et, plus
* généralement, à l'utiliser et l'exploiter dans les mêmes conditions de sécurité. Le fait que vous
* puissiez accéder à cet en-tête signifie que vous avez pris connaissance de la licence CeCILL-C,
* et que vous en avez accepté les termes.
*/
package fr.gouv.vitamui.pastis;
import fr.gouv.vitamui.commons.api.logger.VitamUILogger;
import fr.gouv.vitamui.commons.api.logger.VitamUILoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.boot.autoconfigure.security.servlet.SecurityAutoConfiguration;
import org.springframework.boot.builder.SpringApplicationBuilder;
import org.springframework.core.env.Environment;
import javax.ws.rs.core.Application;
/**
*
* @author RACHID Sala <rachid@cines.fr>
*
*/
@SpringBootApplication(exclude = { SecurityAutoConfiguration.class })
public class PastisRestApplication extends Application {
public PastisRestApplication(){}
@Autowired
private Environment env;
private static final VitamUILogger LOGGER = VitamUILoggerFactory.getInstance(PastisRestApplication.class);
public static void main(final String[] args) {
SpringApplication app = new SpringApplicationBuilder(PastisRestApplication.class).properties("spring.config.name:ui-pastis-application").build();
app.run(args);
}
public void run(final String... args) throws Exception {
LOGGER.info("VITAMUI SpringBoot Application started:");
LOGGER.info("spring.config.name: " + env.getProperty("spring.config.name"));
LOGGER.info("spring.application.name: " + env.getProperty("spring.application.name"));
}
}
Markdown is supported
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