From c016637b389059a102283f4483bccca0fba9daed Mon Sep 17 00:00:00 2001 From: Alfredo Oliviero Date: Mon, 26 Feb 2024 18:02:00 +0100 Subject: [PATCH] aligned to hello-world-sg4-service --- .vscode/launch.json | 4 +- CHANGELOG.md | 4 +- Dockerfile | 7 +- buildImageAndStart.sh | 5 ++ buildImageAndStartWithDebug.sh | 8 ++ docker/container.ini | 11 ++- docker/logback.xml | 6 ++ .../extra-resources/WEB-INF/application.yaml | 4 +- gcube/extra-resources/WEB-INF/web.xml | 6 +- pom.xml | 88 +++++++++++++++---- 10 files changed, 109 insertions(+), 34 deletions(-) create mode 100755 buildImageAndStart.sh create mode 100755 buildImageAndStartWithDebug.sh diff --git a/.vscode/launch.json b/.vscode/launch.json index d6ffc62..4e2df5a 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -10,7 +10,7 @@ "projectName": "identity-manager", "request": "attach", "hostName": "localhost", - "port": 4954 - } + "port": 5005 + } ] } \ No newline at end of file diff --git a/CHANGELOG.md b/CHANGELOG.md index b140c02..2ece7c9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,7 +3,7 @@ This project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.htm # Changelog for Identity Manager Service -## [v1.0.0-SNAPSHOT] +## [v0.0.1-SNAPSHOT] -- First Version +- First Prototype diff --git a/Dockerfile b/Dockerfile index afcfdb8..2b6670a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,8 @@ -#FROM d4science/smartgears-distribution:4.0.0-SNAPSHOT-java11-tomcat9 -FROM smartgears-distribution:4.0.0-java11-tomcat9-devel +FROM d4science/smartgears-distribution:4.0.0-SNAPSHOT-java11-tomcat9 +#FROM smartgears-distribution:4.0.0-java11-tomcat9-devel COPY ./docker/logback.xml /etc/ COPY ./docker/container.ini /etc/ +COPY ./target/idm.war /tomcat/webapps/ -# EXPOSE 8080 +EXPOSE 8080 diff --git a/buildImageAndStart.sh b/buildImageAndStart.sh new file mode 100755 index 0000000..62cba19 --- /dev/null +++ b/buildImageAndStart.sh @@ -0,0 +1,5 @@ +mvn clean package + +NAME=idm +docker build -t $NAME . +docker run -p 8080:8080 $NAME diff --git a/buildImageAndStartWithDebug.sh b/buildImageAndStartWithDebug.sh new file mode 100755 index 0000000..f2ed60a --- /dev/null +++ b/buildImageAndStartWithDebug.sh @@ -0,0 +1,8 @@ +mvn clean package + +NAME=idm +PORT=8080 +DEBUG_PORT=5005 +docker build -t $NAME . + +docker run -p $PORT:8080 -p $DEBUG_PORT:5005 -e JAVA_TOOL_OPTIONS="-agentlib:jdwp=transport=dt_socket,address=*:5005,server=y,suspend=y" $NAME diff --git a/docker/container.ini b/docker/container.ini index 23ea2e4..2ae977a 100644 --- a/docker/container.ini +++ b/docker/container.ini @@ -1,6 +1,7 @@ [node] -mode = online -hostname = alfredo-idm-service-dev +mode = offline +hostname = myhostname.isti.cnr.it +#hostname = alfredo-idm-service-dev protocol= http port = 8080 infrastructure = gcube @@ -19,8 +20,6 @@ location = pisa factory = org.gcube.smartgears.security.defaults.DefaultAuthorizationProviderFactory factory.endpoint = https://accounts.dev.d4science.org/auth/realms/d4science/protocol/openid-connect/token credentials.class = org.gcube.smartgears.security.SimpleCredentials -credentials.clientID = alfredo-idm-service-dev +credentials.clientID = node-whn-test-uno-d-d4s.d4science.org +#credentials.clientID = alfredo-idm-service-dev credentials.secret = 979bd3bc-5cc4-11ec-bf63-0242ac130002 - -; credentials.clientID = node-whn-test-uno-d-d4s.d4science.org -; credentials.secret = 979bd3bc-5cc4-11ec-bf63-0242ac130002 \ No newline at end of file diff --git a/docker/logback.xml b/docker/logback.xml index 4799d20..0ecbe3c 100644 --- a/docker/logback.xml +++ b/docker/logback.xml @@ -5,6 +5,11 @@ + + + + + diff --git a/gcube/extra-resources/WEB-INF/application.yaml b/gcube/extra-resources/WEB-INF/application.yaml index 203b78f..09e234f 100644 --- a/gcube/extra-resources/WEB-INF/application.yaml +++ b/gcube/extra-resources/WEB-INF/application.yaml @@ -1,6 +1,8 @@ name: idm -group: DataAccess +group: org.gcube.service version: 1.0.0 description: Identity Manager Service excludes: + - path: /excluded + - path: /guest - path: /api-docs/* \ No newline at end of file diff --git a/gcube/extra-resources/WEB-INF/web.xml b/gcube/extra-resources/WEB-INF/web.xml index 7c5d746..ef75810 100644 --- a/gcube/extra-resources/WEB-INF/web.xml +++ b/gcube/extra-resources/WEB-INF/web.xml @@ -9,10 +9,10 @@ A gcube service - smartgears 4 - org.gcube.idm.IdentityManagerResourceInitializer + org.gcube.service.idm.IdM - org.gcube.idm.IdentityManagerResourceInitializer - /idm/* + org.gcube.service.idm.IdM + /* \ No newline at end of file diff --git a/pom.xml b/pom.xml index d7dee4f..decd48e 100644 --- a/pom.xml +++ b/pom.xml @@ -2,24 +2,33 @@ xmlns:xsi="https://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="https://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 + + org.gcube.idm + idm + 0.0.1-SNAPSHOT + war + Identity Manager Smargears + Identity Manager Smargears Service + + + org.gcube.tools maven-parent 1.2.0 - org.gcube.idm - identity-manager - 1.0.0-SNAPSHOT - war - identity-manager - Identity Manager Smargears Service + + 11 UTF-8 - 11 - 11 - - ${project.basedir}${file.separator}gcube${file.separator}extra-resources${file.separator}WEB-INF + ${java.version} + ${java.version} + + + 1.14.0 + + 2.14.0 @@ -43,17 +52,25 @@ - org.gcube.core common-smartgears + + org.gcube.common + common-security + + + org.gcube.common + authorization-control-library + org.gcube.core common-smartgears-app + javax.ws.rs @@ -63,11 +80,18 @@ org.glassfish.jersey.containers jersey-container-servlet + + + + org.glassfish.jersey.inject + jersey-cdi2-se + javax.servlet javax.servlet-api 3.0.1 + org.glassfish.jersey.media @@ -110,7 +134,10 @@ ${project.artifactId} - + + + + + + + org.codehaus.mojo + aspectj-maven-plugin + ${aspectj-plugin.version} + + 11 + 11 + 11 + + + org.gcube.common + authorization-control-library + + + + + + + compile + + + - - + + - + +