Update to thorntail and application of the GNU AFFERO GENERAL PUBLIC …

…license

.dockerignore

@@ -1,4 +1,3 @@
-SIGLA/
 .git/
 sigla-*/
-!SIGLA/target/*.ear
+!sigla-web/target/*-thorntail.jar

.gitignore

@@ -5,4 +5,5 @@
 .project
 .settings
 target/
-build/
+build/
+*audit-log.log*

Dockerfile

@@ -1,21 +1,9 @@
 # DOCKER-VERSION 17.10.0-ce
-FROM jboss/wildfly:10.0.0.Final
-WORKDIR /opt/jboss/wildfly
+FROM anapsix/alpine-java:jdk8
+MAINTAINER Marco Spasiano <marco.spasiano@cnr.it>
 
-ENV SIGLA it/cnr/sigla-ear/4.0.1/sigla-ear-4.0.1-wildfly.ear
+COPY sigla-web/target/sigla-thorntail.jar /opt/sigla-thorntail.jar
 
-COPY SIGLA/target/SIGLA.ear standalone/deployments/SIGLA.ear
+EXPOSE 8080
 
-CMD ["./bin/standalone.sh", "-b", "0.0.0.0", "--debug", "8787", "-bmanagement", "0.0.0.0"]
-
-COPY src/main/docker/bin/standalone.conf  ./standalone-custom.conf
-COPY src/main/docker/standalone/configuration/  standalone/configuration/
-COPY src/main/docker/domain/configuration/  domain/configuration/
-COPY src/main/docker/modules/system/layers/base/org/postgresql/postgresql/ modules/system/layers/base/org/postgresql/postgresql/
-COPY src/main/docker/modules/system/layers/base/com/oracle/jdbc/ modules/system/layers/base/com/oracle/jdbc/
-COPY src/main/docker/modules/system/layers/base/com/informix/jdbc/ modules/system/layers/base/com/informix/jdbc/
-COPY src/main/docker/modules/system/layers/base/it/cnr/sigla/configuration/main/ modules/system/layers/base/it/cnr/sigla/configuration/main/
-
-EXPOSE 9990
-
-RUN ./bin/add-user.sh admin admin --silent
+CMD java -Djava.security.egd=file:/dev/./urandom -Dremote.maven.repo=https://repository.jboss.org/nexus/content/groups/public/ -jar /opt/sigla-thorntail.jar

docker-compose.yml.tpl

@@ -1,10 +1,5 @@
 sigla:
   image: docker.si.cnr.it/##{CONTAINER_ID}##
   mem_limit: 1024m
-  environment:
-  - 'RUN_CONF=./standalone-custom.conf'
-  - 'SIGLA_CONNECTION_URL=jdbc:oracle:thin:@dbtest.cedrc.cnr.it:1521:SIGLAF'
-  - 'SIGLA_CONNECTION_USERNAME=PCIR009'
-  - 'SIGLA_CONNECTION_PASSWORD=dbform'
   labels:
    SERVICE_NAME: "##{SERVICE_NAME}##"

pom.xml

@@ -1,41 +1,64 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Copyright (C) 2019  Consiglio Nazionale delle Ricerche
+  ~
+  ~     This program is free software: you can redistribute it and/or modify
+  ~     it under the terms of the GNU Affero General Public License as
+  ~     published by the Free Software Foundation, either version 3 of the
+  ~     License, or (at your option) any later version.
+  ~
+  ~     This program is distributed in the hope that it will be useful,
+  ~     but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~     GNU Affero General Public License for more details.
+  ~
+  ~     You should have received a copy of the GNU Affero General Public License
+  ~     along with this program.  If not, see <https://www.gnu.org/licenses/>.
+  -->
+
 <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/maven-v4_0_0.xsd">
 	<modelVersion>4.0.0</modelVersion>
-	<groupId>it.cnr</groupId>
+	<groupId>it.cnr.si.sigla</groupId>
 	<version>5.3.66-SNAPSHOT</version>
-	<artifactId>sigla</artifactId>
-	<name>sigla</name>
+	<artifactId>sigla-parent</artifactId>
+	<description>Sistema Informativo per la Gestione delle Linee di Attività</description>
 	<packaging>pom</packaging>
 	<parent>
     	<artifactId>archetype</artifactId>
     	<groupId>it.cnr.si</groupId>
-    	<version>1.0.3</version>
+    	<version>1.0.15</version>
   	</parent>
 	<modules>
-		<module>sigla-ws-client</module>
+		<module>sigla-backend</module>
 		<module>sigla-ejb</module>
-		<module>sigla-sdi</module>
 		<module>sigla-ws</module>
 		<module>sigla-web</module>
-		<module>sigla-backend</module>
-		<module>SIGLA</module>
 	</modules>
 	<properties>
     	<sonar.skip>true</sonar.skip>
 		<java.version>1.8</java.version>
-		<siopeplus.version>0.0.1</siopeplus.version>
-		<spring.version>4.3.3.RELEASE</spring.version>
-		<jada.version>6.0.56</jada.version>
+		<siopeplus.version>0.0.3</siopeplus.version>
+		<sdi.fatturapa.version>0.0.1</sdi.fatturapa.version>
+		<ws.client.version>0.0.1</ws.client.version>
+		<spring.version>5.1.8.RELEASE</spring.version>
+		<jada.version>7.0.1</jada.version>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 		<sigla.build.number>${maven.build.timestamp}</sigla.build.number>
 		<slf4j.version>1.7.21</slf4j.version>
 		<maven.javadoc.skip>true</maven.javadoc.skip>
 		<liquibase.version>3.5.3</liquibase.version>
 		<pdfbox.version>2.0.0</pdfbox.version>
-		<storage.cloud.version>1.0.2</storage.cloud.version>
+		<storage.cloud.version>1.0.5</storage.cloud.version>
+		<version.thorntail>2.5.0.Final</version.thorntail>
+
+		<version.arquillian>1.2.1.Final</version.arquillian>
+		<version.arquillian-drone>2.0.1.Final</version.arquillian-drone>
+		<version.arquillian-graphene>2.3.2</version.arquillian-graphene>
+		<arquillian.shrinkwrap.resolver>3.1.3</arquillian.shrinkwrap.resolver>
+		<version.junit>4.12</version.junit>
+		<fluent-hc.version>4.5</fluent-hc.version>
 	</properties>
 	<build>
-
 		<pluginManagement>
 			<plugins>
 				<plugin>
@@ -52,6 +75,6 @@
   <scm>
     <connection>scm:git:ssh://git@git.si.cnr.it/dev/sigla-main.git</connection>
     <developerConnection>scm:git:ssh://git@git.si.cnr.it/dev/sigla-main.git</developerConnection>
-    <tag>sigla-5.3.26-SNAPSHOT</tag>
+    <tag>HEAD</tag>
   </scm>
 </project>

sigla-backend/initdb-oracle/int-db.sql

@@ -2,18 +2,19 @@
 CREATE TABLESPACE tbs_01 DATAFILE 'tbs_f2.dbf' SIZE 500M ONLINE;
 
 -- USER SQL
-CREATE USER "PCIR009" identified by dbform
+CREATE USER "SIGLA" identified by siglapw
 DEFAULT TABLESPACE "TBS_01"
 TEMPORARY TABLESPACE "TEMP"
 ACCOUNT UNLOCK;
 
 -- QUOTAS
-ALTER USER "PCIR009" QUOTA UNLIMITED ON TBS_01;
+ALTER USER "SIGLA" QUOTA UNLIMITED ON TBS_01;
 
 -- ROLES
-GRANT CONNECT, RESOURCE TO "PCIR009";
+GRANT CONNECT, RESOURCE TO "SIGLA";
 
 -- SYSTEM PRIVILEGES
-GRANT CREATE ANY VIEW TO "PCIR009" WITH ADMIN OPTION;
-GRANT SELECT ANY DICTIONARY TO "PCIR009";
-GRANT EXECUTE ON DBMS_PIPE TO "PCIR009";
+GRANT CREATE ANY VIEW TO "SIGLA" WITH ADMIN OPTION;
+GRANT SELECT ANY DICTIONARY TO "SIGLA";
+GRANT EXECUTE ON DBMS_PIPE TO "SIGLA";
+

sigla-backend/pom.xml

@@ -1,10 +1,27 @@
+<!--
+  ~ Copyright (C) 2019  Consiglio Nazionale delle Ricerche
+  ~
+  ~     This program is free software: you can redistribute it and/or modify
+  ~     it under the terms of the GNU Affero General Public License as
+  ~     published by the Free Software Foundation, either version 3 of the
+  ~     License, or (at your option) any later version.
+  ~
+  ~     This program is distributed in the hope that it will be useful,
+  ~     but WITHOUT ANY WARRANTY; without even the implied warranty of
+  ~     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  ~     GNU Affero General Public License for more details.
+  ~
+  ~     You should have received a copy of the GNU Affero General Public License
+  ~     along with this program.  If not, see <https://www.gnu.org/licenses/>.
+  -->
+
 <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/maven-v4_0_0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<artifactId>sigla-backend</artifactId>
 	<packaging>jar</packaging>
 	<parent>
-		<groupId>it.cnr</groupId>
-		<artifactId>sigla</artifactId>
+		<groupId>it.cnr.si.sigla</groupId>
+		<artifactId>sigla-parent</artifactId>
 		<version>5.3.66-SNAPSHOT</version>
 	</parent>
 	<build>
@@ -27,8 +44,13 @@
 			<artifactId>liquibase-core</artifactId>
             <version>${liquibase.version}</version>
 		</dependency>
+		<dependency>
+			<groupId>org.liquibase.ext</groupId>
+			<artifactId>liquibase-javalogger</artifactId>
+			<version>3.0</version>
+		</dependency>
         <dependency>
-            <groupId>it.cnr</groupId>
+            <groupId>it.cnr.si</groupId>
             <artifactId>jada</artifactId>
             <version>${jada.version}</version>
             <type>ejb</type>
@@ -46,6 +68,13 @@
             <version>3.0</version>
             <scope>provided</scope>
         </dependency>
+		<dependency>
+			<groupId>javax.persistence</groupId>
+			<artifactId>persistence-api</artifactId>
+			<version>1.0</version>
+			<type>jar</type>
+			<scope>provided</scope>
+		</dependency>
 		<dependency>
 			<groupId>org.springframework</groupId>
 			<artifactId>spring-web</artifactId>
@@ -68,7 +97,14 @@
 			<groupId>com.oracle</groupId>
 			<artifactId>ojdbc7</artifactId>
 			<version>12.1.0.2.0</version>
-			<scope>test</scope>
+			<scope>system</scope>
+			<systemPath>${project.basedir}/../sigla-web/src/main/resources/modules/com/oracle/jdbc/main/ojdbc7-12.1.0.2.0.jar</systemPath>
+		</dependency>
+		<dependency>
+			<groupId>org.slf4j</groupId>
+			<artifactId>slf4j-api</artifactId>
+			<version>${slf4j.version}</version>
+			<scope>provided</scope>
 		</dependency>
 	</dependencies>
 	<profiles>

sigla-backend/src/main/java/it/cnr/contab/spring/configuration/AbstractLiquibaseConfiguration.java

@@ -1,3 +1,20 @@
+/*
+ * Copyright (C) 2019  Consiglio Nazionale delle Ricerche
+ *
+ *     This program is free software: you can redistribute it and/or modify
+ *     it under the terms of the GNU Affero General Public License as
+ *     published by the Free Software Foundation, either version 3 of the
+ *     License, or (at your option) any later version.
+ *
+ *     This program is distributed in the hope that it will be useful,
+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *     GNU Affero General Public License for more details.
+ *
+ *     You should have received a copy of the GNU Affero General Public License
+ *     along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
 package it.cnr.contab.spring.configuration;
 
 import liquibase.Contexts;