Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
cazenave
Pastis Vitamui
Commits
cd603b27
Commit
cd603b27
authored
Apr 23, 2020
by
cazenave
Browse files
back ok
parent
8477d610
Changes
57
Expand all
Hide whitespace changes
Inline
Side-by-side
ui/ui-frontend-common/package.json
View file @
cd603b27
...
...
@@ -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"
,
...
...
ui/ui-frontend/package-lock.json
View file @
cd603b27
...
...
@@ -10374,7 +10374,7 @@
},
"ui-frontend-common"
:
{
"version"
:
"file:../ui-frontend-common/ui-frontend-common-0.0.12.tgz"
,
"integrity"
:
"sha512-M
+MJJUX9jscmGGF8chSunJGAev5tlEJILsezsmdJneohhN80dZp+uS2/D8YI3KDMwZkW37UKtYqn1xTcjt7Nc
Q=="
,
"integrity"
:
"sha512-M
NKzVe8KVnBQvMib0GYoK4kGnuhBtFFh42X2XMWQZBamfIDv5skKZPEIP9IuUzy/VplyCVmmLQJ6YxYcx4Yd0
Q=="
,
"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"
,
...
...
ui/ui-frontend/package.json
View file @
cd603b27
...
...
@@ -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"
,
...
...
ui/ui-frontend/projects/pastis/src/assets/background.jpg
0 → 100755
View file @
cd603b27
391 KB
ui/ui-frontend/projects/pastis/src/environments/environment.dev.ts
View file @
cd603b27
export
const
environment
=
{
production
:
false
,
apiPastisUrl
:
'
http://
10.100.129.51:8080/rest
'
,
apiPastisUrl
:
'
http
s
://
dev.vitamui.com:8585
'
,
apiOntologyUrl
:
'
http://10.100.129.51:8080
'
,
name
:
'
dev
'
};
ui/ui-frontend/projects/pastis/src/environments/environment.prod.ts
View file @
cd603b27
export
const
environment
=
{
production
:
true
,
apiPastisUrl
:
'
http://
10.100.129.51:8080/rest
'
,
apiPastisUrl
:
'
http
s
://
dev.vitamui.com:8585
'
,
apiOntologyUrl
:
'
http://10.100.129.51:8080
'
,
name
:
'
prod
'
};
ui/ui-frontend/projects/pastis/src/environments/environment.ts
View file @
cd603b27
...
...
@@ -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
:
'
http
s
://
dev.vitamui.com:8585
'
,
apiOntologyUrl
:
'
http
s
://
dev.vitamui.com:8585
'
,
name
:
'
dev
'
};
...
...
ui/ui-frontend/proxy.conf.json
View file @
cd603b27
...
...
@@ -10,5 +10,11 @@
"secure"
:
false
,
"pathRewrite"
:
{},
"logLevel"
:
"debug"
},
"/pastis-api"
:
{
"target"
:
"https://dev.vitamui.com:9000/"
,
"secure"
:
false
,
"pathRewrite"
:
{},
"logLevel"
:
"debug"
}
}
ui/ui-pastis/pom-pastis.xml
deleted
100644 → 0
View file @
8477d610
<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/maven-v4_0_0.xsd"
>
<modelVersion>
4.0.0
</modelVersion>
<packaging>
war
</packaging>
<url>
http://maven.apache.org
</url>
<artifactId>
rest-api
</artifactId>
<name>
PASTIS-API
</name>
<parent>
<groupId>
fr.cines.vitam
</groupId>
<artifactId>
pastis
</artifactId>
<version>
0.0.1-SNAPSHOT
</version>
</parent>
<properties>
<!-- Generic properties -->
<maven.compile.target>
1.8
</maven.compile.target>
<maven.compile.source>
1.8
</maven.compile.source>
<java.version>
11
</java.version>
<warDevName>
rest
</warDevName>
<warProdName>
rest
</warProdName>
</properties>
<dependencies>
<!-- Rest -->
<!-- For xjc class generation -->
<dependency>
<groupId>
org.jvnet.jaxb2.maven2
</groupId>
<artifactId>
maven-jaxb2-plugin
</artifactId>
<version>
0.14.0
</version>
</dependency>
<dependency>
<groupId>
javax.json
</groupId>
<artifactId>
javax.json-api
</artifactId>
<version>
1.1.4
</version>
</dependency>
<dependency>
<groupId>
org.eclipse.persistence
</groupId>
<artifactId>
eclipselink
</artifactId>
<version>
2.7.4
</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>
org.jboss.resteasy
</groupId>
<artifactId>
resteasy-jackson-provider
</artifactId>
<version>
3.9.0.Final
</version>
</dependency>
<dependency>
<groupId>
org.jboss.resteasy
</groupId>
<artifactId>
resteasy-jaxrs
</artifactId>
<version>
3.9.0.Final
</version>
</dependency>
<dependency>
<groupId>
org.apache.logging.log4j
</groupId>
<artifactId>
log4j-web
</artifactId>
<version>
2.5
</version>
</dependency>
<dependency>
<groupId>
org.apache.logging.log4j
</groupId>
<artifactId>
log4j-slf4j-impl
</artifactId>
<version>
2.5
</version>
</dependency>
<dependency>
<groupId>
org.apache.logging.log4j
</groupId>
<artifactId>
log4j-core
</artifactId>
<version>
2.5
</version>
</dependency>
<dependency>
<groupId>
junit
</groupId>
<artifactId>
junit
</artifactId>
<version>
4.4
</version>
<scope>
test
</scope>
</dependency>
<dependency>
<groupId>
javax.servlet
</groupId>
<artifactId>
javax.servlet-api
</artifactId>
<version>
3.1.0
</version>
</dependency>
<dependency>
<groupId>
com.fasterxml
</groupId>
<artifactId>
jackson-xml-databind
</artifactId>
<version>
0.6.2
</version>
</dependency>
<!-- Jetty start -->
<dependency>
<groupId>
org.glassfish.jersey.bundles.repackaged
</groupId>
<artifactId>
jersey-guava
</artifactId>
<version>
2.9
</version>
</dependency>
<dependency>
<groupId>
org.eclipse.jetty
</groupId>
<artifactId>
jetty-server
</artifactId>
<version>
9.4.21.v20190926
</version>
</dependency>
<dependency>
<groupId>
org.eclipse.jetty
</groupId>
<artifactId>
jetty-servlet
</artifactId>
<version>
9.4.21.v20190926
</version>
</dependency>
<!-- Jetty servetls for cross-origin -->
<dependency>
<groupId>
org.eclipse.jetty
</groupId>
<artifactId>
jetty-servlets
</artifactId>
<version>
9.4.21.v20190926
</version>
</dependency>
<dependency>
<groupId>
org.eclipse.jetty
</groupId>
<artifactId>
jetty-util
</artifactId>
<version>
9.4.12.RC2
</version>
</dependency>
<!-- Jetty end -->
<!-- Jersey start -->
<!-- Jersey Client -->
<dependency>
<groupId>
com.sun.jersey
</groupId>
<artifactId>
jersey-client
</artifactId>
<version>
1.8
</version>
</dependency>
<dependency>
<groupId>
org.glassfish.jersey.containers
</groupId>
<artifactId>
jersey-container-servlet
</artifactId>
<version>
2.9
</version>
</dependency>
<dependency>
<groupId>
org.glassfish.jersey.containers
</groupId>
<artifactId>
jersey-container-servlet-core
</artifactId>
<version>
2.9
</version>
</dependency>
<dependency>
<groupId>
org.glassfish.jersey.core
</groupId>
<artifactId>
jersey-server
</artifactId>
<version>
2.9
</version>
</dependency>
<dependency>
<groupId>
org.glassfish.jersey.inject
</groupId>
<artifactId>
jersey-hk2
</artifactId>
<version>
2.27
</version>
</dependency>
<dependency>
<groupId>
org.glassfish.jersey.media
</groupId>
<artifactId>
jersey-media-json-jackson
</artifactId>
<version>
2.9
</version>
</dependency>
<dependency>
<groupId>
org.glassfish.jersey.media
</groupId>
<artifactId>
jersey-media-moxy
</artifactId>
<version>
2.9
</version>
</dependency>
<dependency>
<groupId>
org.glassfish.jersey.connectors
</groupId>
<artifactId>
jersey-apache-connector
</artifactId>
<version>
2.9
</version>
<scope>
test
</scope>
</dependency>
<dependency>
<groupId>
org.jboss.resteasy
</groupId>
<artifactId>
resteasy-multipart-provider
</artifactId>
<version>
3.1.4.Final
</version>
</dependency>
<dependency>
<groupId>
org.glassfish.jersey.media
</groupId>
<artifactId>
jersey-media-multipart
</artifactId>
<version>
2.9
</version>
</dependency>
<dependency>
<groupId>
org.glassfish.jersey.core
</groupId>
<artifactId>
jersey-common
</artifactId>
<version>
2.9
</version>
</dependency>
<dependency>
<groupId>
org.jvnet.mimepull
</groupId>
<artifactId>
mimepull
</artifactId>
<version>
1.9.11
</version>
</dependency>
</dependencies>
<!-- Start of profiles -->
<profiles>
<!-- Profile 1 - Production -->
<profile>
<id>
prod
</id>
<!-- Start of production plugins -->
<build>
<plugins>
<!-- 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>
<!-- Jetty maven plugin -->
<plugin>
<groupId>
org.eclipse.jetty
</groupId>
<artifactId>
jetty-maven-plugin
</artifactId>
<version>
9.4.12.v20180830
</version>
<configuration>
<scanIntervalSeconds>
10
</scanIntervalSeconds>
<jettyXml>
jetty-prod.xml,jetty-web.xml
</jettyXml>
</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>
<!-- Tests -->
<testResources>
<testResource>
<directory>
${project.basedir}/src/test/resources
</directory>
</testResource>
</testResources>
<finalName>
${war.prod.filename}
</finalName>
</build>
</profile>
<!-- Start of Development profile -->
<profile>
<id>
dev
</id>
<build>
<!-- Start of development plugins -->
<plugins>
<!-- 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>
<!-- Jetty maven plugin -->
<plugin>
<groupId>
org.eclipse.jetty
</groupId>
<artifactId>
jetty-maven-plugin
</artifactId>
<version>
9.4.12.v20180830
</version>
<configuration>
<scanIntervalSeconds>
10
</scanIntervalSeconds>
<jettyXml>
jetty-dev.xml,jetty-web.xml
</jettyXml>
</configuration>
</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>
<!-- Tests -->
<testResources>
<testResource>
<directory>
${project.basedir}/src/test/resources
</directory>
</testResource>
</testResources>
<finalName>
${war.dev.filename}
</finalName>
</build>
</profile>
</profiles>
</project>
ui/ui-pastis/pom.xml
View file @
cd603b27
This diff is collapsed.
Click to expand it.
ui/ui-pastis/pom2.xml
0 → 100644
View file @
cd603b27
<?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>
ui/ui-pastis/run.sh
deleted
100755 → 0
View file @
8477d610
#!/bin/bash
mkdir
-p
target/src/main
rm
-rf
target/src/main/config
cp
-r
src/main/config target/src/main/config
#retrieve version
version
=
"
$(
grep
-oP
'(?<=>).*?(?=</version>)'
pom.xml |
grep
-v
'version'
)
"
./target/ui-pastis-
$(
echo
$version
)
.war
-Xms128m
-Xmx512m
--spring
.config.additional-location
=
file:src/main/config/ui-pastis-application-dev.yml
ui/ui-pastis/src/main/config/logback.xml
0 → 100755
View file @
cd603b27
<?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>
ui/ui-pastis/src/main/config/ui-pastis-application-dev (copie).yml
deleted
100755 → 0
View file @
8477d610
spring
:
profiles
:
active
:
dev,swagger
cloud
:
consul
:
#disable for dev
enabled
:
false
discovery
:
enabled
:
false
register
:
false
ui-pastis
:
iam-external-client
:
server-host
:
localhost
server-port
:
8083
secure
:
true
ssl-configuration
:
keystore
:
key-path
:
src/main/config/ui-portal.jks
key-password
:
jkspasswd
type
:
JKS