From 10c0177b97588f8d532150c067ae94f606cb1297 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?MURGEY=20S=C3=A9bastien?= Date: Mon, 2 Jul 2018 10:35:27 +0200 Subject: [PATCH] Initial commit --- .gitignore | 5 + LICENSE.txt | 374 ++++++++++++++++++ README.md | 39 ++ afs-server/Dockerfile | 18 + afs-server/pom.xml | 169 ++++++++ afs-server/src/main/docker/.itools/config.yml | 9 + .../powsybl/docker/afs/AfsApplication.java | 66 ++++ .../docker/afs/CombinedResourceProvider.java | 35 ++ .../com/powsybl/docker/afs/JerseyConfig.java | 39 ++ afs-server/src/main/resources/logback.xml | 21 + checkstyle.xml | 65 +++ docker-compose.yml | 17 + gse-app/Dockerfile | 16 + gse-app/pom.xml | 191 +++++++++ gse-app/src/main/docker/.itools/config.yml | 7 + .../java/com/powsybl/docker/app/FldApp.java | 26 ++ gse-app/src/main/resources/logback.xml | 21 + pom.xml | 111 ++++++ 18 files changed, 1229 insertions(+) create mode 100644 .gitignore create mode 100644 LICENSE.txt create mode 100644 README.md create mode 100644 afs-server/Dockerfile create mode 100644 afs-server/pom.xml create mode 100644 afs-server/src/main/docker/.itools/config.yml create mode 100644 afs-server/src/main/java/com/powsybl/docker/afs/AfsApplication.java create mode 100644 afs-server/src/main/java/com/powsybl/docker/afs/CombinedResourceProvider.java create mode 100644 afs-server/src/main/java/com/powsybl/docker/afs/JerseyConfig.java create mode 100644 afs-server/src/main/resources/logback.xml create mode 100644 checkstyle.xml create mode 100644 docker-compose.yml create mode 100644 gse-app/Dockerfile create mode 100644 gse-app/pom.xml create mode 100644 gse-app/src/main/docker/.itools/config.yml create mode 100644 gse-app/src/main/java/com/powsybl/docker/app/FldApp.java create mode 100644 gse-app/src/main/resources/logback.xml create mode 100644 pom.xml diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..283a3d9 --- /dev/null +++ b/.gitignore @@ -0,0 +1,5 @@ +target + +.idea +*.iml +*.log \ No newline at end of file diff --git a/LICENSE.txt b/LICENSE.txt new file mode 100644 index 0000000..52d1351 --- /dev/null +++ b/LICENSE.txt @@ -0,0 +1,374 @@ +Mozilla Public License Version 2.0 +================================== + +1. Definitions +-------------- + +1.1. "Contributor" + means each individual or legal entity that creates, contributes to + the creation of, or owns Covered Software. + +1.2. "Contributor Version" + means the combination of the Contributions of others (if any) used + by a Contributor and that particular Contributor's Contribution. + +1.3. "Contribution" + means Covered Software of a particular Contributor. + +1.4. "Covered Software" + means Source Code Form to which the initial Contributor has attached + the notice in Exhibit A, the Executable Form of such Source Code + Form, and Modifications of such Source Code Form, in each case + including portions thereof. + +1.5. "Incompatible With Secondary Licenses" + means + + (a) that the initial Contributor has attached the notice described + in Exhibit B to the Covered Software; or + + (b) that the Covered Software was made available under the terms of + version 1.1 or earlier of the License, but not also under the + terms of a Secondary License. + +1.6. "Executable Form" + means any form of the work other than Source Code Form. + +1.7. "Larger Work" + means a work that combines Covered Software with other material, in + a separate file or files, that is not Covered Software. + +1.8. "License" + means this document. + +1.9. "Licensable" + means having the right to grant, to the maximum extent possible, + whether at the time of the initial grant or subsequently, any and + all of the rights conveyed by this License. + +1.10. "Modifications" + means any of the following: + + (a) any file in Source Code Form that results from an addition to, + deletion from, or modification of the contents of Covered + Software; or + + (b) any new file in Source Code Form that contains any Covered + Software. + +1.11. "Patent Claims" of a Contributor + means any patent claim(s), including without limitation, method, + process, and apparatus claims, in any patent Licensable by such + Contributor that would be infringed, but for the grant of the + License, by the making, using, selling, offering for sale, having + made, import, or transfer of either its Contributions or its + Contributor Version. + +1.12. "Secondary License" + means either the GNU General Public License, Version 2.0, the GNU + Lesser General Public License, Version 2.1, the GNU Affero General + Public License, Version 3.0, or any later versions of those + licenses. + +1.13. "Source Code Form" + means the form of the work preferred for making modifications. + +1.14. "You" (or "Your") + means an individual or a legal entity exercising rights under this + License. For legal entities, "You" includes any entity that + controls, is controlled by, or is under common control with You. For + purposes of this definition, "control" means (a) the power, direct + or indirect, to cause the direction or management of such entity, + whether by contract or otherwise, or (b) ownership of more than + fifty percent (50%) of the outstanding shares or beneficial + ownership of such entity. + +2. License Grants and Conditions +-------------------------------- + +2.1. Grants + +Each Contributor hereby grants You a world-wide, royalty-free, +non-exclusive license: + +(a) under intellectual property rights (other than patent or trademark) + Licensable by such Contributor to use, reproduce, make available, + modify, display, perform, distribute, and otherwise exploit its + Contributions, either on an unmodified basis, with Modifications, or + as part of a Larger Work; and + +(b) under Patent Claims of such Contributor to make, use, sell, offer + for sale, have made, import, and otherwise transfer either its + Contributions or its Contributor Version. + +2.2. Effective Date + +The licenses granted in Section 2.1 with respect to any Contribution +become effective for each Contribution on the date the Contributor first +distributes such Contribution. + +2.3. Limitations on Grant Scope + +The licenses granted in this Section 2 are the only rights granted under +this License. No additional rights or licenses will be implied from the +distribution or licensing of Covered Software under this License. +Notwithstanding Section 2.1(b) above, no patent license is granted by a +Contributor: + +(a) for any code that a Contributor has removed from Covered Software; + or + +(b) for infringements caused by: (i) Your and any other third party's + modifications of Covered Software, or (ii) the combination of its + Contributions with other software (except as part of its Contributor + Version); or + +(c) under Patent Claims infringed by Covered Software in the absence of + its Contributions. + +This License does not grant any rights in the trademarks, service marks, +or logos of any Contributor (except as may be necessary to comply with +the notice requirements in Section 3.4). + +2.4. Subsequent Licenses + +No Contributor makes additional grants as a result of Your choice to +distribute the Covered Software under a subsequent version of this +License (see Section 10.2) or under the terms of a Secondary License (if +permitted under the terms of Section 3.3). + +2.5. Representation + +Each Contributor represents that the Contributor believes its +Contributions are its original creation(s) or it has sufficient rights +to grant the rights to its Contributions conveyed by this License. + +2.6. Fair Use + +This License is not intended to limit any rights You have under +applicable copyright doctrines of fair use, fair dealing, or other +equivalents. + +2.7. Conditions + +Sections 3.1, 3.2, 3.3, and 3.4 are conditions of the licenses granted +in Section 2.1. + +3. Responsibilities +------------------- + +3.1. Distribution of Source Form + +All distribution of Covered Software in Source Code Form, including any +Modifications that You create or to which You contribute, must be under +the terms of this License. You must inform recipients that the Source +Code Form of the Covered Software is governed by the terms of this +License, and how they can obtain a copy of this License. You may not +attempt to alter or restrict the recipients' rights in the Source Code +Form. + +3.2. Distribution of Executable Form + +If You distribute Covered Software in Executable Form then: + +(a) such Covered Software must also be made available in Source Code + Form, as described in Section 3.1, and You must inform recipients of + the Executable Form how they can obtain a copy of such Source Code + Form by reasonable means in a timely manner, at a charge no more + than the cost of distribution to the recipient; and + +(b) You may distribute such Executable Form under the terms of this + License, or sublicense it under different terms, provided that the + license for the Executable Form does not attempt to limit or alter + the recipients' rights in the Source Code Form under this License. + +3.3. Distribution of a Larger Work + +You may create and distribute a Larger Work under terms of Your choice, +provided that You also comply with the requirements of this License for +the Covered Software. If the Larger Work is a combination of Covered +Software with a work governed by one or more Secondary Licenses, and the +Covered Software is not Incompatible With Secondary Licenses, this +License permits You to additionally distribute such Covered Software +under the terms of such Secondary License(s), so that the recipient of +the Larger Work may, at their option, further distribute the Covered +Software under the terms of either this License or such Secondary +License(s). + +3.4. Notices + +You may not remove or alter the substance of any license notices +(including copyright notices, patent notices, disclaimers of warranty, +or limitations of liability) contained within the Source Code Form of +the Covered Software, except that You may alter any license notices to +the extent required to remedy known factual inaccuracies. + +3.5. Application of Additional Terms + +You may choose to offer, and to charge a fee for, warranty, support, +indemnity or liability obligations to one or more recipients of Covered +Software. However, You may do so only on Your own behalf, and not on +behalf of any Contributor. You must make it absolutely clear that any +such warranty, support, indemnity, or liability obligation is offered by +You alone, and You hereby agree to indemnify every Contributor for any +liability incurred by such Contributor as a result of warranty, support, +indemnity or liability terms You offer. You may include additional +disclaimers of warranty and limitations of liability specific to any +jurisdiction. + +4. Inability to Comply Due to Statute or Regulation +--------------------------------------------------- + +If it is impossible for You to comply with any of the terms of this +License with respect to some or all of the Covered Software due to +statute, judicial order, or regulation then You must: (a) comply with +the terms of this License to the maximum extent possible; and (b) +describe the limitations and the code they affect. Such description must +be placed in a text file included with all distributions of the Covered +Software under this License. Except to the extent prohibited by statute +or regulation, such description must be sufficiently detailed for a +recipient of ordinary skill to be able to understand it. + +5. Termination +-------------- + +5.1. The rights granted under this License will terminate automatically +if You fail to comply with any of its terms. However, if You become +compliant, then the rights granted under this License from a particular +Contributor are reinstated (a) provisionally, unless and until such +Contributor explicitly and finally terminates Your grants, and (b) on an +ongoing basis, if such Contributor fails to notify You of the +non-compliance by some reasonable means prior to 60 days after You have +come back into compliance. Moreover, Your grants from a particular +Contributor are reinstated on an ongoing basis if such Contributor +notifies You of the non-compliance by some reasonable means, this is the +first time You have received notice of non-compliance with this License +from such Contributor, and You become compliant prior to 30 days after +Your receipt of the notice. + +5.2. If You initiate litigation against any entity by asserting a patent +infringement claim (excluding declaratory judgment actions, +counter-claims, and cross-claims) alleging that a Contributor Version +directly or indirectly infringes any patent, then the rights granted to +You by any and all Contributors for the Covered Software under Section +2.1 of this License shall terminate. + +5.3. In the event of termination under Sections 5.1 or 5.2 above, all +end user license agreements (excluding distributors and resellers) which +have been validly granted by You or Your distributors under this License +prior to termination shall survive termination. + +************************************************************************ +* * +* 6. Disclaimer of Warranty * +* ------------------------- * +* * +* Covered Software is provided under this License on an "as is" * +* basis, without warranty of any kind, either expressed, implied, or * +* statutory, including, without limitation, warranties that the * +* Covered Software is free of defects, merchantable, fit for a * +* particular purpose or non-infringing. The entire risk as to the * +* quality and performance of the Covered Software is with You. * +* Should any Covered Software prove defective in any respect, You * +* (not any Contributor) assume the cost of any necessary servicing, * +* repair, or correction. This disclaimer of warranty constitutes an * +* essential part of this License. No use of any Covered Software is * +* authorized under this License except under this disclaimer. * +* * +************************************************************************ + +************************************************************************ +* * +* 7. Limitation of Liability * +* -------------------------- * +* * +* Under no circumstances and under no legal theory, whether tort * +* (including negligence), contract, or otherwise, shall any * +* Contributor, or anyone who distributes Covered Software as * +* permitted above, be liable to You for any direct, indirect, * +* special, incidental, or consequential damages of any character * +* including, without limitation, damages for lost profits, loss of * +* goodwill, work stoppage, computer failure or malfunction, or any * +* and all other commercial damages or losses, even if such party * +* shall have been informed of the possibility of such damages. This * +* limitation of liability shall not apply to liability for death or * +* personal injury resulting from such party's negligence to the * +* extent applicable law prohibits such limitation. Some * +* jurisdictions do not allow the exclusion or limitation of * +* incidental or consequential damages, so this exclusion and * +* limitation may not apply to You. * +* * +************************************************************************ + +8. Litigation +------------- + +Any litigation relating to this License may be brought only in the +courts of a jurisdiction where the defendant maintains its principal +place of business and such litigation shall be governed by laws of that +jurisdiction, without reference to its conflict-of-law provisions. +Nothing in this Section shall prevent a party's ability to bring +cross-claims or counter-claims. + +9. Miscellaneous +---------------- + +This License represents the complete agreement concerning the subject +matter hereof. If any provision of this License is held to be +unenforceable, such provision shall be reformed only to the extent +necessary to make it enforceable. Any law or regulation which provides +that the language of a contract shall be construed against the drafter +shall not be used to construe this License against a Contributor. + +10. Versions of the License +--------------------------- + +10.1. New Versions + +Mozilla Foundation is the license steward. Except as provided in Section +10.3, no one other than the license steward has the right to modify or +publish new versions of this License. Each version will be given a +distinguishing version number. + +10.2. Effect of New Versions + +You may distribute the Covered Software under the terms of the version +of the License under which You originally received the Covered Software, +or under the terms of any subsequent version published by the license +steward. + +10.3. Modified Versions + +If you create software not governed by this License, and you want to +create a new license for such software, you may create and use a +modified version of this License if you rename the license and remove +any references to the name of the license steward (except to note that +such modified license differs from this License). + +10.4. Distributing Source Code Form that is Incompatible With Secondary +Licenses + +If You choose to distribute Source Code Form that is Incompatible With +Secondary Licenses under the terms of this version of the License, the +notice described in Exhibit B of this License must be attached. + +Exhibit A - Source Code Form License Notice +------------------------------------------- + + This Source Code Form is subject to the terms of the Mozilla Public + License, v. 2.0. If a copy of the MPL was not distributed with this + file, You can obtain one at http://mozilla.org/MPL/2.0/. + +If it is not possible or desirable to put the notice in a particular +file, then You may include the notice in a location (such as a LICENSE +file in a relevant directory) where a recipient would be likely to look +for such a notice. + +You may add additional accurate notices of copyright ownership. + +Exhibit B - "Incompatible With Secondary Licenses" Notice +--------------------------------------------------------- + + This Source Code Form is "Incompatible With Secondary Licenses", as + defined by the Mozilla Public License, v. 2.0. + diff --git a/README.md b/README.md new file mode 100644 index 0000000..e219d2d --- /dev/null +++ b/README.md @@ -0,0 +1,39 @@ +# Powsybl GSE Docker + +## Work in progress +This source is under developement and is not currently effective for using WS implementation of AFS in GSE. + +## Overview +This is a test of creation of a docker based deployments of Powsybl GSE platform into docker containers based on SpringBoot +for web-service deployment. + +## Environment requirements +In order to build the project, you need: + * JDK *(1.8 or greater)* + * Maven + * Powsybl (snapshot version) + * Powsybl GSE (snapshots version) + * Docker + * Docker-compose + +## Install +To compile and generate Docker images, you just have to use: +``` +$> mvn clean package +``` + +## Using the platform +Launch the AFS server: +``` +$> docker-compose up afs-server +``` + +Then when it has started, launch GSE: +``` +$> docker-compose up gse-app +``` + +To stop the services: +``` +$> docker-compose down +``` diff --git a/afs-server/Dockerfile b/afs-server/Dockerfile new file mode 100644 index 0000000..4723fe5 --- /dev/null +++ b/afs-server/Dockerfile @@ -0,0 +1,18 @@ +FROM openjdk:8-jre +MAINTAINER Sebastien Murgey + +EXPOSE 8080 + +# Add Maven dependencies (not shaded into the artifact; Docker-cached) +ADD target/lib /usr/share/powsybl/lib +# Add the service itself +ARG JAR_FILE +ADD target/${JAR_FILE} /usr/share/powsybl/afs-server.jar + +RUN useradd -ms /bin/bash powsybl-afs +USER powsybl-afs +ADD target/docker-resources /home/powsybl-afs + +WORKDIR /home/powsybl-afs + +ENTRYPOINT ["/usr/bin/java", "-jar", "/usr/share/powsybl/afs-server.jar"] \ No newline at end of file diff --git a/afs-server/pom.xml b/afs-server/pom.xml new file mode 100644 index 0000000..8409ba7 --- /dev/null +++ b/afs-server/pom.xml @@ -0,0 +1,169 @@ + + + 4.0.0 + + + com.powsybl + powsybl-docker + 1.0.0-SNAPSHOT + + + com.powybl + powsybl-docker-afs-server + 1.0.0-SNAPSHOT + + + + org.springframework.boot + spring-boot-starter-jersey + + + org.springframework.boot + spring-boot-starter-web + + + org.springframework.boot + spring-boot-starter-websocket + + + com.powsybl + powsybl-afs-ws-server + 1.2.0-SNAPSHOT + + + com.powsybl + powsybl-afs-network-server + 1.2.0-SNAPSHOT + + + com.powsybl + powsybl-afs-mapdb + 1.2.0-SNAPSHOT + runtime + + + com.powsybl + powsybl-afs-local + 1.2.0-SNAPSHOT + runtime + + + com.powsybl + powsybl-afs-ext-base + 1.2.0-SNAPSHOT + runtime + + + javax.enterprise + cdi-api + 1.2 + + + javax.inject + javax.inject + 1 + + + + io.swagger + swagger-jersey2-jaxrs + 1.5.13 + + + io.springfox + springfox-swagger2 + 2.7.0 + + + io.springfox + springfox-swagger-ui + 2.7.0 + + + ch.qos.logback + logback-classic + ${logback.version} + runtime + + + + + + + maven-jar-plugin + + + + true + lib/ + com.powsybl.docker.afs.AfsApplication + + + + + + + maven-dependency-plugin + + + initialize + + copy-dependencies + + + false + runtime + ${project.build.directory}/lib + + + + + + + maven-resources-plugin + + + copy-resources + validate + + copy-resources + + + ${basedir}/target/docker-resources + + + src/main/docker + true + + + + + + + + com.spotify + dockerfile-maven-plugin + ${dockerfile.maven.version} + + + default + + build + + + + + powsybl/afs-server + ${project.version} + + ${project.build.finalName}.jar + + false + true + + + + + \ No newline at end of file diff --git a/afs-server/src/main/docker/.itools/config.yml b/afs-server/src/main/docker/.itools/config.yml new file mode 100644 index 0000000..be5f60a --- /dev/null +++ b/afs-server/src/main/docker/.itools/config.yml @@ -0,0 +1,9 @@ +mapdb-app-file-system: + drive-name: Projects + db-file: $HOME/powsybl.db + remotely-accessible: true + +local-app-file-system: + drive-name: Distant + root-dir: / + remotely-accessible: true diff --git a/afs-server/src/main/java/com/powsybl/docker/afs/AfsApplication.java b/afs-server/src/main/java/com/powsybl/docker/afs/AfsApplication.java new file mode 100644 index 0000000..c11b6f7 --- /dev/null +++ b/afs-server/src/main/java/com/powsybl/docker/afs/AfsApplication.java @@ -0,0 +1,66 @@ +package com.powsybl.docker.afs; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.ComponentScan; +import org.springframework.web.socket.server.standard.ServerEndpointExporter; +import springfox.documentation.builders.PathSelectors; +import springfox.documentation.builders.RequestHandlerSelectors; +import springfox.documentation.service.ApiInfo; +import springfox.documentation.service.Contact; +import springfox.documentation.service.StringVendorExtension; +import springfox.documentation.service.VendorExtension; +import springfox.documentation.spi.DocumentationType; +import springfox.documentation.spring.web.plugins.Docket; +import springfox.documentation.swagger2.annotations.EnableSwagger2; + +import java.util.ArrayList; +import java.util.Collection; + +@SpringBootApplication +@EnableSwagger2 +@ComponentScan(basePackages = {"com.powsybl.docker.afs", "com.powsybl.afs.ws.server"}) +public class AfsApplication { + + protected AfsApplication() { + // No constructor + } + + public Docket api() { + return new Docket(DocumentationType.SWAGGER_2) + .select().apis(RequestHandlerSelectors.any()) + .paths(PathSelectors.any()) + .build() + .enable(true) + .apiInfo(apiInfo()); + } + + public ApiInfo apiInfo() { + StringVendorExtension vendorExtension = new StringVendorExtension("", ""); + Collection vendorExtensions = new ArrayList<>(); + vendorExtensions.add(vendorExtension); + + Contact contactInfo = new Contact("RTE", "www.rte-france.com", + "sebastien.murgey@rte-france.com"); + + return new ApiInfo( + "GSE demo", + "Example project showing how to integrate spring boot " + + "web app using jaxrs instead of springmvc with swagger and springfox.", + "1.0", + "For Demo only", + contactInfo, + "Mozilla Public License 2.0", + "www.mozilla.org", + vendorExtensions); + } + @Bean + public ServerEndpointExporter endpointExporter() { + return new ServerEndpointExporter(); + } + + public static void main(String[] args) { + SpringApplication.run(AfsApplication.class, args); + } +} diff --git a/afs-server/src/main/java/com/powsybl/docker/afs/CombinedResourceProvider.java b/afs-server/src/main/java/com/powsybl/docker/afs/CombinedResourceProvider.java new file mode 100644 index 0000000..46199d4 --- /dev/null +++ b/afs-server/src/main/java/com/powsybl/docker/afs/CombinedResourceProvider.java @@ -0,0 +1,35 @@ +package com.powsybl.docker.afs; + +import org.springframework.context.annotation.Primary; +import org.springframework.stereotype.Component; +import springfox.documentation.swagger.web.InMemorySwaggerResourcesProvider; +import springfox.documentation.swagger.web.SwaggerResource; +import springfox.documentation.swagger.web.SwaggerResourcesProvider; + +import javax.annotation.Resource; +import java.util.List; +import java.util.stream.Collectors; +import java.util.stream.Stream; + +/** + * Created by atech on 1/21/18. + */ +@Component +@Primary +public class CombinedResourceProvider implements SwaggerResourcesProvider { + + @Resource + private InMemorySwaggerResourcesProvider inMemorySwaggerResourcesProvider; + + public List get() { + + SwaggerResource jerseySwaggerResource = new SwaggerResource(); + jerseySwaggerResource.setLocation("/rest/swagger.json"); + jerseySwaggerResource.setSwaggerVersion("2.0"); + jerseySwaggerResource.setName("Jersey"); + + return Stream.concat(Stream.of(jerseySwaggerResource), + inMemorySwaggerResourcesProvider.get().stream()).collect(Collectors.toList()); + } + +} diff --git a/afs-server/src/main/java/com/powsybl/docker/afs/JerseyConfig.java b/afs-server/src/main/java/com/powsybl/docker/afs/JerseyConfig.java new file mode 100644 index 0000000..eee0037 --- /dev/null +++ b/afs-server/src/main/java/com/powsybl/docker/afs/JerseyConfig.java @@ -0,0 +1,39 @@ +package com.powsybl.docker.afs; + +import com.powsybl.afs.network.server.NetworkCacheServer; +import com.powsybl.afs.ws.server.AppStorageServer; +import com.powsybl.afs.ws.server.UserEndpoint; +import io.swagger.jaxrs.config.BeanConfig; +import io.swagger.jaxrs.config.SwaggerConfigLocator; +import io.swagger.jaxrs.config.SwaggerContextService; +import io.swagger.jaxrs.listing.ApiListingResource; +import org.glassfish.jersey.server.ResourceConfig; +import org.springframework.context.annotation.Configuration; + +import javax.ws.rs.ApplicationPath; + +@Configuration +@ApplicationPath("/rest") +public class JerseyConfig extends ResourceConfig { + public JerseyConfig() { +/* + register(new AbstractBinder() { + @Override + protected void configure() { + bind(AppDataBean.class).to(AppDataBean.class).in(Singleton.class); + bind(WebSocketContext.class).to(WebSocketContext.class).in(Singleton.class); + bind(SimpleKeyGenerator.class).to(KeyGenerator.class); + } + }); + */ + register(AppStorageServer.class); + register(UserEndpoint.class); + register(NetworkCacheServer.class); + + BeanConfig swaggerConfig = new BeanConfig(); + swaggerConfig.setBasePath("/rest"); + SwaggerConfigLocator.getInstance().putConfig(SwaggerContextService.CONFIG_ID_DEFAULT, swaggerConfig); + + packages(ApiListingResource.class.getPackage().getName()); + } +} diff --git a/afs-server/src/main/resources/logback.xml b/afs-server/src/main/resources/logback.xml new file mode 100644 index 0000000..99d999a --- /dev/null +++ b/afs-server/src/main/resources/logback.xml @@ -0,0 +1,21 @@ + + + + + %date %level [%thread] %logger{10} [%file:%line] %msg%n + + + + powsybl.log + + %date %level [%thread] %logger{10} [%file:%line] %msg%n + + + + + + + + + + diff --git a/checkstyle.xml b/checkstyle.xml new file mode 100644 index 0000000..ef37f62 --- /dev/null +++ b/checkstyle.xml @@ -0,0 +1,65 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/docker-compose.yml b/docker-compose.yml new file mode 100644 index 0000000..6f509c2 --- /dev/null +++ b/docker-compose.yml @@ -0,0 +1,17 @@ +version: "2" +services: + afs-server: + image: powsybl/afs-server:1.0.0-SNAPSHOT + container_name: afs-server + ports: + - "8080:8080" + gse-app: + image: powsybl/gse-app:1.0.0-SNAPSHOT + container_name: gse-app + links: + - afs-server + environment: + - DISPLAY=$DISPLAY + volumes: + - /tmp/.X11-unix:/tmp/.X11-unix + privileged: true \ No newline at end of file diff --git a/gse-app/Dockerfile b/gse-app/Dockerfile new file mode 100644 index 0000000..7d55678 --- /dev/null +++ b/gse-app/Dockerfile @@ -0,0 +1,16 @@ +FROM jasch/openjdk8-javafx +MAINTAINER Sebastien Murgey + +# Add Maven dependencies (not shaded into the artifact; Docker-cached) +ADD target/lib /usr/share/powsybl/lib +# Add the service itself +ARG JAR_FILE +ADD target/${JAR_FILE} /usr/share/powsybl/gse-app.jar + +RUN useradd -ms /bin/bash powsybl-gse +USER powsybl-gse +ADD target/docker-resources /home/powsybl-gse + +WORKDIR /home/powsybl-gse + +ENTRYPOINT ["/usr/bin/java", "-jar", "/usr/share/powsybl/gse-app.jar"] \ No newline at end of file diff --git a/gse-app/pom.xml b/gse-app/pom.xml new file mode 100644 index 0000000..9f23499 --- /dev/null +++ b/gse-app/pom.xml @@ -0,0 +1,191 @@ + + + 4.0.0 + + + com.powsybl + powsybl-docker + 1.0.0-SNAPSHOT + + + com.powybl + powsybl-docker-gse-app + 1.0.0-SNAPSHOT + + + + com.powsybl + powsybl-gse-app + ${powsybl.gse.version} + + + com.powsybl + powsybl-gse-spi + ${powsybl.gse.version} + + + com.powsybl + powsybl-gse-util + ${powsybl.gse.version} + + + org.slf4j + jul-to-slf4j + ${slf4j.version} + + + + + + ch.qos.logback + logback-classic + ${logback.version} + runtime + + + + + com.powsybl + powsybl-iidm-impl + ${powsybl.core.version} + runtime + + + + + com.powsybl + powsybl-computation-local + ${powsybl.core.version} + runtime + + + + + com.powsybl + powsybl-afs-local + ${powsybl.core.version} + runtime + + + com.powsybl + powsybl-afs-core + ${powsybl.core.version} + runtime + + + com.powsybl + powsybl-afs-ws-client + ${powsybl.core.version} + runtime + + + + + com.powsybl + powsybl-ucte-converter + ${powsybl.core.version} + runtime + + + com.powsybl + powsybl-iidm-xml-converter + ${powsybl.core.version} + runtime + + + + + com.powsybl + powsybl-gse-afs-ext-base + ${powsybl.gse.version} + runtime + + + com.powsybl + powsybl-gse-network-explorer + ${powsybl.gse.version} + runtime + + + + + + + + maven-jar-plugin + + + + true + lib/ + com.powsybl.docker.app.FldApp + + + + + + + maven-dependency-plugin + + + initialize + + copy-dependencies + + + false + runtime + ${project.build.directory}/lib + + + + + + + maven-resources-plugin + + + copy-resources + validate + + copy-resources + + + ${basedir}/target/docker-resources + + + src/main/docker + true + + + + + + + + com.spotify + dockerfile-maven-plugin + ${dockerfile.maven.version} + + + default + + build + + + + + powsybl/gse-app + ${project.version} + + ${project.build.finalName}.jar + + false + true + + + + + \ No newline at end of file diff --git a/gse-app/src/main/docker/.itools/config.yml b/gse-app/src/main/docker/.itools/config.yml new file mode 100644 index 0000000..1a75a06 --- /dev/null +++ b/gse-app/src/main/docker/.itools/config.yml @@ -0,0 +1,7 @@ +rest-app-file-system: + drive-name: "AFS server" + url-address: http://afs-server:8080 + +local-app-file-system: + drive-name: Local + root-dir: / diff --git a/gse-app/src/main/java/com/powsybl/docker/app/FldApp.java b/gse-app/src/main/java/com/powsybl/docker/app/FldApp.java new file mode 100644 index 0000000..472d45a --- /dev/null +++ b/gse-app/src/main/java/com/powsybl/docker/app/FldApp.java @@ -0,0 +1,26 @@ +/** + * Copyright (c) 2018, RTE (http://www.rte-france.com) + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + */ +package com.powsybl.docker.app; + +import com.powsybl.gse.app.GseApp; +import org.slf4j.bridge.SLF4JBridgeHandler; + +/** + * @author Sebastien Murgey + */ +public final class FldApp { + + private FldApp() { + } + + public static void main(String[] args) { + SLF4JBridgeHandler.removeHandlersForRootLogger(); + SLF4JBridgeHandler.install(); + + GseApp.main(args); + } +} diff --git a/gse-app/src/main/resources/logback.xml b/gse-app/src/main/resources/logback.xml new file mode 100644 index 0000000..99d999a --- /dev/null +++ b/gse-app/src/main/resources/logback.xml @@ -0,0 +1,21 @@ + + + + + %date %level [%thread] %logger{10} [%file:%line] %msg%n + + + + powsybl.log + + %date %level [%thread] %logger{10} [%file:%line] %msg%n + + + + + + + + + + diff --git a/pom.xml b/pom.xml new file mode 100644 index 0000000..9f521f4 --- /dev/null +++ b/pom.xml @@ -0,0 +1,111 @@ + + + 4.0.0 + + + org.springframework.boot + spring-boot-starter-parent + 2.0.3.RELEASE + + + com.powsybl + powsybl-docker + pom + 1.0.0-SNAPSHOT + + gse-app + afs-server + + + + UTF-8 + + 1.4.3 + 1.8 + 1.1.8 + 2.17 + 3.6.0 + 2.10 + 0.7.8 + 3.1.0 + 3.0.0 + 1.2.0-SNAPSHOT + 1.0.0-SNAPSHOT + 1.7.22 + + + + + + org.apache.maven.plugins + maven-compiler-plugin + ${maven.compiler.version} + + ${java.version} + ${java.version} + + + + org.jacoco + jacoco-maven-plugin + ${maven.jacoco.version} + + + prepare-agent + + prepare-agent + + + + + + org.apache.maven.plugins + maven-dependency-plugin + ${maven.dependency.version} + + + analyze-only + generate-sources + + analyze-only + + + + + + + + + checks + + true + + + + + org.apache.maven.plugins + maven-checkstyle-plugin + ${maven.checkstyle.version} + + + validate + + check + + + checkstyle.xml + true + true + true + + + + + + + + + + \ No newline at end of file