Commit f21f59e5 authored by Sylvain Renault's avatar Sylvain Renault
Browse files

Merge branch 'feature/stf669-orange' into 'develop' 

Milestone B version (relocalization information, last openapi)

See merge request !7
parents c4c1deeb 35d29c13

.gitignore

+13 −9
Original line number Diff line number Diff line 
## Ignore .openapi-generator Folder

##

.openapi-generator/

server/src/Org.OpenAPITools/.gitignore

server/worldstorage/src/ETSI.ARF.OpenAPI.WorldStorage/.gitignore



# Visual Studio cache/options directory

.vs/
@@ -9,6 +9,9 @@ server/src/Org.OpenAPITools/.gitignore 
# Visual Studio solution

*.sln



# generated project-files

*.csproj



# build-jobs

build.*
@@ -22,25 +25,26 @@ server/programs/MongoDB/ 
!server/programs/MongoDB/readme.md



#generated readme

server/README.md

server/worldstorage/README.md



#!ETSI-ARF/Models/

#!ETSI-ARF/Controllers/

#!ETSI-ARF/Services/



# all generated directories

wwwroot/

Attributes/

Authentication/

Controllers/

Converters/

Filters/

Formatters/

Models/

OpenAPI/

Properties/

wwwroot/



# generated project-files

*.csproj

Models

Controllers/



# generated Program.cs

Program.cs

#Program.cs



# backup-files

*.bak

.gitmodules

+4 −4
Original line number Diff line number Diff line 
[submodule "arf005"]

	path = arf005

	url = git@forge.etsi.org:arf/arf005.git

	branch = develop
 
 No newline at end of file
 
[submodule "openapi"]

	path = openapi

	url = https://forge.etsi.org/rep/arf/openapi.git

	branch = master
 
 No newline at end of file

server/.openapi-generator-ignore→.openapi-generator-ignore

+12 −8
Original line number Diff line number Diff line
@@ -22,16 +22,20 @@ 
# Then explicitly reverse the ignore rule for a single file:

#!docs/README.md



#

# ETSI - ISG - ARF

#

**\ETSI.ARF.OpenAPI.WorldStorage.csproj



# Modules to initialize World Storage database, server....

**/Program.cs

**/Startup.cs

**/appsettings.json

**/Dockerfile

**/docker-compose.yml

**/.openapi-generator-ignore



**/appsettings.json



# ARF

# Implementation of REST request and database functionalities

#

**/ControllersImpl

**/Services
 
**/ETSI-ARF



# Design of some web pages

**/wwwroot/portal

**/wwwroot/index.html
 
 No newline at end of file

arf005 @ 533b9d31

Original line number Diff line number Diff line 
Subproject commit 533b9d3198b772c7b628b0ab0e0a144b89966b46

build-iis-docker-ws.bat

0 → 100644
+2 −0
Original line number Diff line number Diff line 
cd server\worldstorage\src\ETSI.ARF.OpenAPI.WorldStorage

docker build -t etsi.arf.openapi.worldstorage .
 
 No newline at end of file