From 2158e0a5e81e486f388ae36d694be21cb8d78b92 Mon Sep 17 00:00:00 2001 From: Dmitriy Kopylenko Date: Mon, 22 Feb 2021 10:07:28 -0500 Subject: [PATCH] WIP1 --- ...tityDescriptorEnversVersioningTests.groovy | 1 - .../resources/application.properties | 102 +----------------- .../src/main/resources/application.properties | 4 +- 3 files changed, 4 insertions(+), 103 deletions(-) diff --git a/backend/src/enversTest/groovy/edu/internet2/tier/shibboleth/admin/ui/repository/envers/EntityDescriptorEnversVersioningTests.groovy b/backend/src/enversTest/groovy/edu/internet2/tier/shibboleth/admin/ui/repository/envers/EntityDescriptorEnversVersioningTests.groovy index 03bfe5661..034b0a67c 100644 --- a/backend/src/enversTest/groovy/edu/internet2/tier/shibboleth/admin/ui/repository/envers/EntityDescriptorEnversVersioningTests.groovy +++ b/backend/src/enversTest/groovy/edu/internet2/tier/shibboleth/admin/ui/repository/envers/EntityDescriptorEnversVersioningTests.groovy @@ -66,7 +66,6 @@ import static edu.internet2.tier.shibboleth.admin.ui.repository.envers.EnversTes @ContextConfiguration(classes = [CoreShibUiConfiguration, InternationalizationConfiguration, SearchConfiguration, TestConfiguration]) @EnableJpaRepositories(basePackages = ["edu.internet2.tier.shibboleth.admin.ui"]) @EntityScan("edu.internet2.tier.shibboleth.admin.ui") -@AutoConfigureTestDatabase(replace = AutoConfigureTestDatabase.Replace.NONE) class EntityDescriptorEnversVersioningTests extends Specification { @Autowired diff --git a/backend/src/enversTest/resources/application.properties b/backend/src/enversTest/resources/application.properties index 4d88d62df..5e1533c70 100644 --- a/backend/src/enversTest/resources/application.properties +++ b/backend/src/enversTest/resources/application.properties @@ -1,104 +1,4 @@ -# Server Configuration -#server.port=8080 - -# Logging Configuration -#logging.config=classpath:log4j2.xml - -#logging.level.org.springframework.security=DEBUG -logging.level.org.springframework=INFO -logging.level.edu.internet2.tier.shibboleth.admin.ui=INFO - -spring.main.allow-bean-definition-overriding=true - -# Database Credentials -spring.datasource.username=shibui -spring.datasource.password=shibui - -# Database Configuration H2 -spring.datasource.url=jdbc:h2:mem:shibui;DB_CLOSE_DELAY=-1;DB_CLOSE_ON_EXIT=FALSE -spring.datasource.platform=h2 -spring.datasource.driverClassName=org.h2.Driver -spring.jpa.database-platform=org.hibernate.dialect.H2Dialect -spring.h2.console.enabled=true - -# spring.jackson.default-property-inclusion=non_absent -spring.jackson.default-property-inclusion=NON_NULL - -# Database Configuration PostgreSQL -#spring.datasource.url=jdbc:postgresql://localhost:5432/shibui -#spring.datasource.driverClassName=org.postgresql.Driver -#spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.PostgreSQLDialect - -#Maria/MySQL DB -#spring.datasource.url=jdbc:mariadb://localhost:3306/shibui -#spring.datasource.driverClassName=org.mariadb.jdbc.Driver -#spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.MariaDBDialect - -# Liquibase properties spring.liquibase.enabled=false -#spring.liquibase.change-log=classpath:edu/internet2/tier/shibboleth/admin/ui/database/masterchangelog.xml - -# Hibernate properties -# for production never ever use create, create-drop. It's BEST to use validate -spring.jpa.hibernate.ddl-auto=update -spring.jpa.hibernate.naming.implicit-strategy=org.hibernate.boot.model.naming.ImplicitNamingStrategyJpaCompliantImpl -spring.jpa.show-sql=false -spring.jpa.properties.hibernate.format_sql=false - -spring.jpa.hibernate.use-new-id-generator-mappings=true - -#Envers versioning -spring.jpa.properties.org.hibernate.envers.store_data_at_delete=true - -# Set the following property to periodically write out the generated metadata files. There is no default value; the following is just an example -# shibui.metadata-dir=/opt/shibboleth-idp/metadata/generated -shibui.logout-url=/dashboard - -# spring.profiles.active=default - -#shibui.default-password= - -shibui.metadata-sources-ui-schema-location=classpath:metadata-sources-ui-schema.json -shibui.entity-attributes-filters-ui-schema-location=classpath:entity-attributes-filters-ui-schema.json -shibui.nameid-filter-ui-schema-location=classpath:nameid-filter.schema.json - -#Actuator endpoints (info) -# Un-comment to get full git details exposed like author, abbreviated SHA-1, commit message -#management.info.git.mode=full - -### -# metadata-providers.xml write configuration - -# Set the following property to periodically write out metadata providers configuration. There is no default value; the following is just an example -# shibui.metadataProviders.target=file:/opt/shibboleth-idp/conf/shibui-metadata-providers.xml -# shibui.metadataProviders.taskRunRate=30000 - -# Email configuration (local mailhog) -# spring.mail.host=mailhog -# spring.mail.port=1025 -# spring.mail.username=username -# spring.mail.password=password -# spring.mail.properties.mail.smtp.auth=false -# spring.mail.properties.mail.smtp.starttls.enable=false - -shibui.mail.text-email-template-path-prefix=/mail/text/ -shibui.mail.html.email-template-path-prefix=/mail/html/ -shibui.mail.system-email-address=doNotReply@shibui.org - -shibui.roles=ROLE_ADMIN,ROLE_USER,ROLE_NONE - -#In order to enable authentication via configured pac4j library (with external SAMl Idp, for example) -#This property must be set to true and pac4j properties configured. For sample pac4j properties, see application.yml -#for an example pac4j configuration -#shibui.pac4j-enabled=true - -#This property must be set to true in order to enable posting stats to beacon endpoint. Furthermore, appropriate -#environment variables must be set for beacon publisher to be used (the ones that are set when running shib-ui in -#docker container -shibui.beacon-enabled=true - - - - +#Needed in the latest versions of Spring Boot when doing manual transaction management like we do in envers versioning code spring.jpa.properties.hibernate.current_session_context_class=org.springframework.orm.hibernate5.SpringSessionContext diff --git a/backend/src/main/resources/application.properties b/backend/src/main/resources/application.properties index fd85c0aee..390a99981 100644 --- a/backend/src/main/resources/application.properties +++ b/backend/src/main/resources/application.properties @@ -36,7 +36,6 @@ spring.jackson.default-property-inclusion=NON_NULL # Liquibase properties spring.liquibase.enabled=false -#spring.liquibase.change-log=classpath:edu/internet2/tier/shibboleth/admin/ui/database/masterchangelog.xml # Hibernate properties # for production never ever use create, create-drop. It's BEST to use validate @@ -50,6 +49,9 @@ spring.jpa.hibernate.use-new-id-generator-mappings=true #Envers versioning spring.jpa.properties.org.hibernate.envers.store_data_at_delete=true +#Needed in the latest versions of Spring Boot when doing manual transaction management like we do in envers versioning code +spring.jpa.properties.hibernate.current_session_context_class=org.springframework.orm.hibernate5.SpringSessionContext + # Set the following property to periodically write out the generated metadata files. There is no default value; the following is just an example # shibui.metadata-dir=/opt/shibboleth-idp/metadata/generated shibui.logout-url=/dashboard