fixes certs.

.dockerignore

 .idea
 README.md
 docker-compose.yml
+.gitignore
+*.log

.gitignore

@@ -3,8 +3,6 @@ utils/src/main/resources/*
 *.jks
 *.p12
 target/
-.classpath
-.project
 .settings/
 Thumbs.db
 

README.md

@@ -2,71 +2,20 @@
 
 ## Steps to run this project
 
-1. ```COMPOSE_DOCKER_CLI_BUILD=1 DOCKER_BUILDKIT=1  docker-compose  up --build -d```
+1. COMPOSE_DOCKER_CLI_BUILD=1 DOCKER_BUILDKIT=1  docker-compose  up --build -d
 2. Visit 
-   1. ```curl http://localhost:8080/restApp-1.0-SNAPSHOT/resources/sample```
-   2. ```curl http://localhost:8080/restApp-1.0-SNAPSHOT/resources/sample/hello```
-   3. ```curl http://localhost:8080/restApp-1.0-SNAPSHOT/resources/sample/main```
-   4. ```curl http://localhost:8080/restApp-1.0-SNAPSHOT/resources/sample/persons```
-   5. ```
-      curl  -H "Content-Type: application/json" \
+   1. curl http://localhost:8080/restApp/sample
+   2. curl http://localhost:8080/restApp/sample/hello
+   3. curl http://localhost:8080/restApp/sample/main
+   4. curl http://localhost:8080/restApp/sample/persons
+   5. curl  -H "Content-Type: application/json" \
       -X POST \
       -d '{"name":"Jeanne"}'  \
-      http://localhost:8080/restApp-1.0-SNAPSHOT/resources/sample/persons
-   6. ```
-      curl http://localhost:8080/restApp-1.0-SNAPSHOT/resources/sample/persons/843c8236-6c6b-450e-9aa3-211a9b897403```
-   7. ```curl -H "Accept: text/xml" http://localhost:8080/restApp-1.0-SNAPSHOT/resources/sample/persons```
-
-   
-## Use a "real" certificate
-Récupérer le certificat du serveur
-```
-echo quit | openssl s_client \
-            -showcerts -servername localhost -connect localhost:8181 >! localhost.pem
-```
-
-Convertir en keystore java
-```
-keytool -noprompt -storepass storepass -import \
-        -trustcacerts -alias mycert -file localhost.pem -keystore mycert-pub.jks
-```
-
-Il est possible d'utiliser le certificat avec curl
-```
-curl --cacert localhost.pem  \
-   https://localhost:8181/restApp-1.0-SNAPSHOT/resources/sample/persons/843c8236-6c6b-450e-9aa3-211a9b897403
-```
-
-Avec un reverse proxy :
-```
-echo quit | openssl s_client -showcerts \
-            -servername localhost -connect localhost:8888 >! localhost.pem
-
-curl --cacert localhost.pem  \
-      https://localhost:8181/restApp-1.0-SNAPSHOT/resources/sample/persons/843c8236-6c6b-450e-9aa3-211a9b897403
-      
-keytool -noprompt -storepass storepass -import \
-        -trustcacerts -alias mycert -file localhost.pem -keystore mycert-pub.jks      
-```
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+      http://localhost:8080/restApp/sample/persons
+   6. curl http://localhost:8080/restApp-1.0-SNAPSHOT/resources/sample/persons/843c8236-6c6b-450e-9aa3-211a9b897403
+   7. curl -H "Accept: text/xml" http://localhost:8080/restApp-1.0-SNAPSHOT/resources/sample/persons
+## Import "real" certificate
 
+  openssl x509 -outform der -in localhost.pem -out localhost.der
+  keytool -import -noprompt -trustcacerts -storepass storepass -alias localhost -keystore mycert-pub.jks -file localhost.der
 

docker/Dockerfile

-# syntax=docker/dockerfile:1
+# syntax=docker/dockerfile:1.3
 
 ### First we build the application in docker in a controlled env
-FROM maven:3.8.3-eclipse-temurin-11 as build
+FROM maven:3.8.4-eclipse-temurin-11 as build
 WORKDIR /app
-COPY ./ /app/
+# COPY pom.xml /app/pom.xml
+COPY . /app/
+
 RUN --mount=type=cache,id=mvncache,target=/root/.m2/repository,rw \
-	mvn -B clean package
+	mvn -B package
 
 ### Then we add the builded war to a JEE server.
-FROM payara/server-full:5.2021.9-jdk11 as server
+#FROM payara/server-full:5.2021.9-jdk11 as server
+FROM brunoe/payara:jdk11-6 as server
+
 ARG STORE_PASSWORD=changeit
 ## Download the JDBC driver
 USER root
@@ -16,7 +20,9 @@ RUN apt-get update && \
     apt-get install -y wget unzip && \
     rm -rf /var/lib/apt/lists/* && \
     wget https://repo1.maven.org/maven2/com/h2database/h2/1.4.200/h2-1.4.200.jar \
-         -O /tmp/h2.jar 
+         -O /tmp/h2.jar && \
+    cp /tmp/h2.jar /opt/payara/appserver/glassfish/domains/domain1/lib/h2.jar
+
 USER payara
 ## This script adds a jdbc connection pool and ressource
 COPY docker/post-boot-commands.asadmin $POSTBOOT_COMMANDS
@@ -29,8 +35,16 @@ COPY --from=build /app/utils/src/main/resources/mycert-pub.p12  /app/utils/src/m
 RUN keytool -importkeystore -noprompt -destkeystore /opt/payara/appserver/glassfish/domains/domain1/config/keystore.jks -srckeystore /tmp/mycert.p12 -srcstoretype PKCS12 -alias mycert -srcstorepass storepass -deststorepass ${STORE_PASSWORD} -deststoretype pkcs12 && \
     keytool -importcert -noprompt -trustcacerts -destkeystore /opt/payara/appserver/glassfish/domains/domain1/config/cacerts.jks -file /tmp/mycert.crt -alias mycert -srcstorepass storepass -deststorepass ${STORE_PASSWORD} -deststoretype pkcs12
 
+#RUN wget https://github.com/eclipse-ee4j/mojarra/releases/download/3.0.2-RELEASE/jakarta.faces-3.0.2.jar \
+#    -O /opt/payara/appserver/glassfish/modules/jakarta.faces.jar
+#RUN wget https://github.com/eclipse-ee4j/mojarra/releases/download/2.3.17-RELEASE/jakarta.faces-2.3.17.jar \
+#    -O /opt/payara/appserver/glassfish/modules/jakarta.faces.jar
 FROM server as production
-COPY --from=build /app/restApp/target/*.war \
-                  $DEPLOY_DIR
-COPY --from=build /app/wsApp/target/*.war \
+#COPY --from=build /app/jee/restApp/target/*.war \
+#                  $DEPLOY_DIR
+#COPY --from=build /app/jee/wsApp/target/*.war \
+#                  $DEPLOY_DIR
+#COPY --from=build /app/jee/jsf/target/*.war \
+#                  $DEPLOY_DIR
+COPY --from=build /app/jee/ear/target/*.ear \
                   $DEPLOY_DIR
\ No newline at end of file

docker/payara/Dockerfile

+# FROM azul/zulu-openjdk:8u222 as mypayara
+#FROM eclipse-temurin:17-jdk
+FROM eclipse-temurin:11.0.13_8-jdk-focal
+# Default payara ports to expose
+# 4848: admin console
+# 9009: debug port (JPDA)
+# 8080: http
+# 8181: https
+EXPOSE 4848 9009 8080 8181 8686
+
+#ARG PAYARA_VERSION=5.2021.9
+#ARG PAYARA_SHA1=81c43f3c537ec74a813b48172758866615e1e792
+
+ARG PAYARA_VERSION=6.2021.1.Alpha1
+ARG PAYARA_SHA1=0262f8af7e52b318109ed43f8a31a1e93f111bbf
+
+ARG PAYARA_PKG=https://search.maven.org/remotecontent?filepath=fish/payara/distributions/payara/${PAYARA_VERSION}/payara-${PAYARA_VERSION}.zip
+
+
+ARG TINI_VERSION=v0.19.0
+
+# Initialize the configurable environment variables
+ENV HOME_DIR=/opt/payara\
+    PAYARA_DIR=/opt/payara/appserver\
+    SCRIPT_DIR=/opt/payara/scripts\
+    CONFIG_DIR=/opt/payara/config\
+    DEPLOY_DIR=/opt/payara/deployments\
+    PASSWORD_FILE=/opt/payara/passwordFile\
+    # Payara Server Domain options
+    DOMAIN_NAME=domain1\
+    ADMIN_USER=admin\
+    ADMIN_PASSWORD=admin\
+    # Utility environment variables
+    JVM_ARGS=\
+    PAYARA_ARGS=\
+    DEPLOY_PROPS=\
+    POSTBOOT_COMMANDS=/opt/payara/config/post-boot-commands.asadmin\
+    PREBOOT_COMMANDS=/opt/payara/config/pre-boot-commands.asadmin
+ENV PATH="${PATH}:${PAYARA_DIR}/bin"
+
+# Create and set the Payara user and working directory owned by the new user
+RUN groupadd -g 1000 payara && \
+    useradd -u 1000 -M -s /bin/bash -d ${HOME_DIR} payara -g payara && \
+    echo payara:payara | chpasswd && \
+    mkdir -p ${DEPLOY_DIR} && \
+    mkdir -p ${CONFIG_DIR} && \
+    mkdir -p ${SCRIPT_DIR} && \
+    chown -R payara: ${HOME_DIR} && \
+    # Install required packages
+    apt-get update && \
+    apt-get install -y wget unzip gpg && \
+    rm -rf /var/lib/apt/lists/*
+
+# Install tini as minimized init system
+RUN wget --no-verbose -O /tini https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini && \
+    wget --no-verbose -O /tini.asc https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini.asc && \
+    gpg --batch --keyserver "keyserver.ubuntu.com" --recv-keys 595E85A6B1B4779EA4DAAEC70B588DFF0527A9B7 && \
+    gpg --batch --verify /tini.asc /tini && \
+    chmod +x /tini
+
+USER payara
+WORKDIR ${HOME_DIR}
+
+# Download and unzip the Payara distribution
+RUN ulimit -n 1024 ; wget --no-verbose -O payara.zip ${PAYARA_PKG} && \
+    echo "${PAYARA_SHA1} *payara.zip" | sha1sum -c - && \
+    unzip -qq payara.zip -d ./ && \
+    mv payara*/ appserver && \
+    # Configure the password file for configuring Payara
+    echo "AS_ADMIN_PASSWORD=\nAS_ADMIN_NEWPASSWORD=${ADMIN_PASSWORD}" > /tmp/tmpfile && \
+    echo "AS_ADMIN_PASSWORD=${ADMIN_PASSWORD}" >> ${PASSWORD_FILE} && \
+    # Configure the payara domain
+    ${PAYARA_DIR}/bin/asadmin --user ${ADMIN_USER} --passwordfile=/tmp/tmpfile change-admin-password --domain_name=${DOMAIN_NAME} && \
+    ${PAYARA_DIR}/bin/asadmin --user=${ADMIN_USER} --passwordfile=${PASSWORD_FILE} start-domain ${DOMAIN_NAME} && \
+    ${PAYARA_DIR}/bin/asadmin --user=${ADMIN_USER} --passwordfile=${PASSWORD_FILE} enable-secure-admin && \
+    for MEMORY_JVM_OPTION in $(${PAYARA_DIR}/bin/asadmin --user=${ADMIN_USER} --passwordfile=${PASSWORD_FILE} list-jvm-options | grep "Xm[sx]"); do\
+        ${PAYARA_DIR}/bin/asadmin --user=${ADMIN_USER} --passwordfile=${PASSWORD_FILE} delete-jvm-options $MEMORY_JVM_OPTION;\
+    done && \
+    # FIXME: when upgrading this container to Java 10+, this needs to be changed to '-XX:+UseContainerSupport' and '-XX:MaxRAMPercentage'
+#     ${PAYARA_DIR}/bin/asadmin --user=${ADMIN_USER} --passwordfile=${PASSWORD_FILE} create-jvm-options '-XX\:+UnlockExperimentalVMOptions:-XX\:+UseCGroupMemoryLimitForHeap:-XX\:MaxRAMFraction=1' && \
+    ${PAYARA_DIR}/bin/asadmin --user=${ADMIN_USER} --passwordfile=${PASSWORD_FILE} create-jvm-options '-XX\:+UseContainerSupport:-XX\:MaxRAMPercentage=100' && \
+    ${PAYARA_DIR}/bin/asadmin --user=${ADMIN_USER} --passwordfile=${PASSWORD_FILE} set-log-attributes com.sun.enterprise.server.logging.GFFileHandler.logtoFile=false && \
+    ${PAYARA_DIR}/bin/asadmin --user=${ADMIN_USER} --passwordfile=${PASSWORD_FILE} stop-domain ${DOMAIN_NAME} && \
+    # Cleanup unused files
+    rm -rf \
+        /tmp/tmpFile \
+        payara.zip \
+        ${PAYARA_DIR}/glassfish/domains/${DOMAIN_NAME}/osgi-cache \
+        ${PAYARA_DIR}/glassfish/domains/${DOMAIN_NAME}/logs
+#        ${PAYARA_DIR}/glassfish/domains/domain1
+
+# Copy across docker scripts
+COPY --chown=payara:payara bin/*.sh ${SCRIPT_DIR}/
+RUN mkdir -p ${SCRIPT_DIR}/init.d && \
+    chmod +x ${SCRIPT_DIR}/*
+
+ENTRYPOINT ["/tini", "--"]
+CMD ${SCRIPT_DIR}/entrypoint.sh

docker/payara/build.sh

+COMPOSE_DOCKER_CLI_BUILD=1 DOCKER_BUILDKIT=1 docker build -t brunoe/payara:jdk11-6 .

docker/payara/run.sh

+docker run -it -p 4848:4848 -p 8080 brunoe/payara

docker/post-boot-commands.asadmin

 set-hazelcast-configuration --enabled=true --dynamic=true
 
 add-library  /tmp/h2.jar
-create-jdbc-connection-pool --datasourceclassname org.h2.jdbcx.JdbcDataSource --restype javax.sql.ConnectionPoolDataSource --property password=password:user=user:url="jdbc:h2:tcp://db:9092/payara;MODE=PostgreSQL;DATABASE_TO_LOWER=TRUE" H2-pool
-create-jdbc-resource --connectionpoolid H2-pool jdbc/h2-pool
+create-jdbc-connection-pool --datasourceclassname org.h2.jdbcx.JdbcDataSource --restype javax.sql.ConnectionPoolDataSource --property password=password:user=user:url="jdbc:h2:tcp://db:9092/payara;MODE=PostgreSQL;DATABASE_TO_LOWER=TRUE" My-H2-pool
+#create-jdbc-connection-pool --datasourceclassname org.h2.jdbcx.JdbcDataSource --restype javax.sql.ConnectionPoolDataSource --property password=password:user=user:url="jdbc:h2:tcp://db:9092/payara;MODE=PostgreSQL" My-H2-pool
+create-jdbc-resource --connectionpoolid My-H2-pool jdbc/my-h2-pool
 
 # set configs.config.server-config.network-config.protocols.protocol.http-listener-2.ssl.cert-nickname=mycert

entites/pom.xml

@@ -2,7 +2,7 @@
 <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">
     <parent>
-        <artifactId>jee9.1</artifactId>
+        <artifactId>parent</artifactId>
         <groupId>fr.univtln.bruno.samples.jee91</groupId>
         <version>1.0-SNAPSHOT</version>
     </parent>
@@ -11,14 +11,15 @@
     <artifactId>entites</artifactId>
 
     <dependencies>
-        <dependency>
-            <groupId>jakarta.platform</groupId>
-            <artifactId>jakarta.jakartaee-api</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.projectlombok</groupId>
             <artifactId>lombok</artifactId>
         </dependency>
+        <dependency>
+            <groupId>jakarta.platform</groupId>
+            <artifactId>jakarta.jakartaee-api</artifactId>
+            <scope>provided</scope>
+        </dependency>
     </dependencies>
 
 </project>
\ No newline at end of file

entites/src/main/java/fr/univtln/bruno/samples/jee91/dao/Person.java

@@ -2,40 +2,51 @@ package fr.univtln.bruno.samples.jee91.dao;
 
 import jakarta.json.bind.annotation.JsonbTransient;
 import jakarta.persistence.*;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.Pattern;
 import jakarta.xml.bind.annotation.XmlRootElement;
-import lombok.AccessLevel;
-import lombok.Getter;
-import lombok.Setter;
+import lombok.*;
 import lombok.experimental.FieldDefaults;
 
+import java.io.Serializable;
 import java.util.UUID;
 
+@AllArgsConstructor(staticName = "of")
+@NoArgsConstructor
+@ToString(onlyExplicitlyIncluded = true)
 @Table(name = "PERSON")
 @Entity
 @Getter
 @Setter
-@NamedQueries({
 @NamedQuery(name = "Person.findAll",
-                query = "select p from Person p"),
+        query = "select p from Person p")
 @NamedQuery(
         name = "Person.findAllOrderedByName",
-                query = "SELECT p FROM Person p ORDER BY p.name"),
+        query = "SELECT p FROM Person p ORDER BY p.name")
 @NamedQuery(
         name = "Person.findByUUID",
         query = "SELECT p FROM Person p WHERE p.uuid=:uuid")
-})
 @XmlRootElement
 @FieldDefaults(level = AccessLevel.PRIVATE)
-public class Person {
+public class Person implements Serializable {
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     @Column(name = "ID")
     @JsonbTransient
     long id;
 
+    @ToString.Include
     @Column(name = "NAME")
+    @NotBlank
+    @Pattern(regexp = "[A-Z][a-z]+", message = "Le nom doit commencer par une majuscule suivie de minuscules")
     String name;
 
+    @ToString.Include
     @Column(name = "UUID", updatable = false, nullable = false, unique = true)
     UUID uuid = UUID.randomUUID();
+
+    @Builder
+    public Person(String name) {
+        this.name = name;
+    }
 }

entites/src/main/resources/META-INF/beans.xml

+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="https://jakarta.ee/xml/ns/jakartaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+    xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee https://jakarta.ee/xml/ns/jakartaee/beans_3_0.xsd"
+    bean-discovery-mode="all">
+</beans>
\ No newline at end of file

business/pom.xml → jee/business/pom.xml

@@ -30,7 +30,7 @@
                 <artifactId>maven-ejb-plugin</artifactId>
                 <version>3.1.0</version>
                 <configuration>
-                    <ejbVersion>3.0</ejbVersion>
+                    <ejbVersion>3.1</ejbVersion>
                     <generateClient>true</generateClient>
                 </configuration>
             </plugin>

restApp/src/main/webapp/WEB-INF/beans.xml → jee/business/src/test/java/META-INF/beans.xml

 <?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://xmlns.jcp.org/xml/ns/javaee"
+<beans xmlns="https://jakarta.ee/xml/ns/jakartaee"
        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/beans_2_0.xsd"
+       xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee https://jakarta.ee/xml/ns/jakartaee/beans_3_0.xsd"
+       version="3.0"
        bean-discovery-mode="all">
 </beans>
\ No newline at end of file

jee/common-persistence/pom.xml

+<?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">
+    <parent>
+        <artifactId>jee9.1</artifactId>
+        <groupId>fr.univtln.bruno.samples.jee91</groupId>
+        <version>1.0-SNAPSHOT</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>common-persistence</artifactId>
+
+    <build>
+        <resources>
+            <resource>
+                <directory>src/main/resources</directory>
+            </resource>
+        </resources>
+    </build>
+
+    <dependencies>
+        <dependency>
+            <groupId>fr.univtln.bruno.samples.jee91</groupId>
+            <artifactId>entites</artifactId>
+            <version>1.0-SNAPSHOT</version>
+        </dependency>
+    </dependencies>
+
+</project>
\ No newline at end of file

restApp/src/main/resources/META-INF/persistence.xml → jee/common-persistence/src/main/resources/META-INF/persistence.xml

 <?xml version="1.0" encoding="UTF-8"?>
-<persistence version="2.2" xmlns="http://xmlns.jcp.org/xml/ns/persistence"
+<persistence xmlns="https://jakarta.ee/xml/ns/persistence"
     xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/persistence http://xmlns.jcp.org/xml/ns/persistence/persistence_2_2.xsd">
+    xsi:schemaLocation="https://jakarta.ee/xml/ns/persistence https://jakarta.ee/xml/ns/persistence/persistence_3_0.xsd"
+    version="3.0">
     <persistence-unit name="myappPU" transaction-type="JTA">
-        <jta-data-source>jdbc/h2-pool</jta-data-source>
+        <jta-data-source>jdbc/my-h2-pool</jta-data-source>
         <class>fr.univtln.bruno.samples.jee91.dao.Person</class>
-
+        <validation-mode>CALLBACK</validation-mode>
         <properties>
             <property name="jakarta.persistence.schema-generation.database.action" value="drop-and-create" />
             <property name="jakarta.persistence.schema-generation.scripts.action" value="drop-and-create" />