Merge pull request #69 from Sudwest-Fryslan/session-research

Session research

Dockerfile

@@ -4,18 +4,19 @@ FROM frankframework/frankframework:7.9-20231028.143509
 
 
 # Copy dependencies
-# COPY --chown=tomcat lib/server/ /usr/local/tomcat/lib/
-# COPY --chown=tomcat lib/webapp/ /usr/local/tomcat/webapps/ROOT/WEB-INF/lib/
-
-# Compile custom class, this should be changed to a buildstep in the future 
-# COPY --chown=tomcat java /tmp/java
-# RUN javac \
-#       /tmp/java/nl/nn/adapterframework/http/HttpSenderBase.java \
-#       /tmp/java/nl/nn/adapterframework/http/HttpSessionBase.java \
-#       -classpath "/usr/local/tomcat/webapps/ROOT/WEB-INF/lib/*:/usr/local/tomcat/lib/*" \
-#       -verbose -d /usr/local/tomcat/webapps/ROOT/WEB-INF/classes
-# RUN rm -rf /tmp/java
+COPY --chown=tomcat lib/server/ /usr/local/tomcat/lib/
+COPY --chown=tomcat lib/webapp/ /usr/local/tomcat/webapps/ROOT/WEB-INF/lib/
 
+# Compile custom class, this should be changed to a buildstep in the future
+# Add lombok.jar to lib/server to be able to compile custom code with Lombok annotations
+COPY --chown=tomcat java /tmp/java
+RUN javac \
+      /tmp/java/nl/nn/adapterframework/http/HttpSenderBase.java \
+      /tmp/java/nl/nn/adapterframework/http/HttpSessionBase.java \
+      /tmp/java/nl/nn/adapterframework/http/HttpSession.java \
+      -classpath "/usr/local/tomcat/webapps/ROOT/WEB-INF/lib/*:/usr/local/tomcat/lib/*" \
+      -verbose -d /usr/local/tomcat/webapps/ROOT/WEB-INF/classes
+RUN rm -rf /tmp/java
 # Copy database connection settings
 COPY --chown=tomcat context.xml /usr/local/tomcat/conf/Catalina/localhost/ROOT.xml