diff --git a/compose.yaml b/compose.yaml index cad2c2b..938a166 100644 --- a/compose.yaml +++ b/compose.yaml @@ -6,4 +6,6 @@ services: - 'APP_USER=cnr' - 'APP_USER_PASSWORD=secret' ports: - - '1521:1521' \ No newline at end of file + - '1521:1521' + labels: + org.springframework.boot.ignore: true diff --git a/src/main/java/it/cnr/iit/epas/timesheet/ugovpj/SyncJob.java b/src/main/java/it/cnr/iit/epas/timesheet/ugovpj/jobs/SyncJob.java similarity index 96% rename from src/main/java/it/cnr/iit/epas/timesheet/ugovpj/SyncJob.java rename to src/main/java/it/cnr/iit/epas/timesheet/ugovpj/jobs/SyncJob.java index f1aab75..9e38bfe 100644 --- a/src/main/java/it/cnr/iit/epas/timesheet/ugovpj/SyncJob.java +++ b/src/main/java/it/cnr/iit/epas/timesheet/ugovpj/jobs/SyncJob.java @@ -14,7 +14,7 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . */ -package it.cnr.iit.epas.timesheet.ugovpj; +package it.cnr.iit.epas.timesheet.ugovpj.jobs; import org.springframework.scheduling.annotation.Scheduled; import org.springframework.stereotype.Component; diff --git a/src/main/java/it/cnr/iit/epas/timesheet/ugovpj/model/PersonTimeDetail.java b/src/main/java/it/cnr/iit/epas/timesheet/ugovpj/model/PersonTimeDetail.java index a0891f1..692c450 100644 --- a/src/main/java/it/cnr/iit/epas/timesheet/ugovpj/model/PersonTimeDetail.java +++ b/src/main/java/it/cnr/iit/epas/timesheet/ugovpj/model/PersonTimeDetail.java @@ -42,7 +42,7 @@ @ToString @Data @Entity -@Table(name = "ie_pj_marcature") +@Table(name = "IE_PJ_MARCATURE") public class PersonTimeDetail { @Id diff --git a/src/main/java/it/cnr/iit/epas/timesheet/ugovpj/model/TimeDetailType.java b/src/main/java/it/cnr/iit/epas/timesheet/ugovpj/model/TimeDetailType.java index f4a156a..6043dc9 100644 --- a/src/main/java/it/cnr/iit/epas/timesheet/ugovpj/model/TimeDetailType.java +++ b/src/main/java/it/cnr/iit/epas/timesheet/ugovpj/model/TimeDetailType.java @@ -1,3 +1,19 @@ +/* + * Copyright (C) 2024 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 . + */ package it.cnr.iit.epas.timesheet.ugovpj.model; import jakarta.persistence.Column; @@ -22,7 +38,7 @@ @ToString @Data @Entity -@Table(name = "ie_pj_marcature_tipi") +@Table(name = "IE_PJ_MARCATURE_TIPI") public class TimeDetailType { @Id diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties index a9819ea..d7ffdaf 100644 --- a/src/main/resources/application.properties +++ b/src/main/resources/application.properties @@ -1,14 +1,15 @@ # Oracle configuration -spring.datasource.url=jdbc:oracle:thin:@//oracle:1521/ugov-pj-timesheet -#spring.datasource.username=cnr -#spring.datasource.password=secret +spring.datasource.url=jdbc:oracle:thin:@(DESCRIPTION=(ADDRESS_LIST=(LOAD_BALANCE=ON)(FAILOVER=ON)(ADDRESS=(PROTOCOL=TCP)(HOST=hostname-1-da-impostare.cineca.it)(PORT=5555))(ADDRESS=(PROTOCOL=TCP)(HOST=hostname-2-da-impostare.cineca.it)(PORT=5555)))(CONNECT_DATA=(SERVICE_NAME=service-name-da-impostare.cineca.it))) +spring.datasource.username=username-da-impostare +spring.datasource.password=password-da-impostare spring.datasource.testWhileIdle=true spring.datasource.validationQuery=SELECT 1 spring.datasource.driver-class-name=oracle.jdbc.OracleDriver #hibernate config -spring.jpa.database-platform=org.hibernate.dialect.OracleDialect -#spring.jpa.show-sql=true -spring.jpa.hibernate.ddl-auto=update +spring.jpa.show-sql=true +spring.jpa.hibernate.ddl-auto=none + +spring.jpa.properties.hibernate.default_schema=SIAIE_CNR_PREPROD spring.profiles.active=dev