Revize b5ce4e16

application properties prepared for docker

pom.xml

@@ -238 +238 @@
 			<scope>test</scope>
 		</dependency>
 
-		<!-- MS SQL Server DataBase -->
-
+		<!-- MS SQL Server DataBase
 		<dependency>
 			<groupId>com.microsoft.sqlserver</groupId>
 			<artifactId>mssql-jdbc</artifactId>
 			<version>12.2.0.jre11</version>
 		</dependency>
+		-->
         <dependency>
             <groupId>com.google.code.gson</groupId>
             <artifactId>gson</artifactId>

src/main/resources/application-docker.properties

@@ +1 @@
+spring.datasource.jdbc-url=jdbc:mysql://mysql-db:3306/spade
+spring.second-datasource.jdbc-url=jdbc:mysql://mysql-db:3306/authspade
+spring.security.oauth2.resourceserver.jwt.jwk-set-uri=http://keycloak:9080/auth/realms/spade/protocol/openid-connect/certs

src/main/resources/application-local.properties

@@ +1 @@
+spring.datasource.jdbc-url=jdbc:mysql://localhost:3306/spade
+spring.second-datasource.jdbc-url=jdbc:mysql://localhost:3306/authspade
+spring.security.oauth2.resourceserver.jwt.issuer-uri=http://localhost:9080/auth/realms/spade

src/main/resources/application.properties

@@ +1 @@
+spring.config.name=application,application-${spring.profiles.active}
+
 # jpa settings
 spring.jpa.hibernate.ddl-auto=update
 spring.jpa.show-sql=true
 spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.SQLServerDialect
 
 # first mysql database connection:
-spring.datasource.jdbc-url=jdbc:mysql://localhost:3306/spade
+#spring.datasource.jdbc-url=jdbc:mysql://localhost:3306/spade
 spring.datasource.username=root
 spring.datasource.password=
 spring.datasource.driverClassName=com.mysql.cj.jdbc.Driver
 
 # second mysql database connection:
-spring.second-datasource.jdbc-url=jdbc:mysql://localhost:3306/authspade
+#spring.second-datasource.jdbc-url=jdbc:mysql://localhost:3306/authspade
 spring.second-datasource.username=root
 spring.second-datasource.password=
 spring.second-datasource.driverClassName=com.mysql.cj.jdbc.Driver
@@ -24 +26 @@
 logging.level.root=INFO
 logging.level.cz.zcu.fav.kiv.antipatterndetectionapp=TRACE
 
-# security
-auth.realm.login=http://localhost:8081/login
-auth.realm.logout=http://localhost:8081/logout
-auth.realm.authenticate=http://localhost:8081/authenticate
-
-#default configuration user
-default_user_id = 2
-
-## oauth2 -> keycloak
-
-# localhost is here thanks to KC_HOSTNAME_URL property in the docker-compose. Otherwise, there should be docker service name.
+# keycloak
 spring.security.oauth2.resourceserver.jwt.issuer-uri=http://localhost:9080/auth/realms/spade
-#spring.security.oauth2.resourceserver.jwt.jwk-set-uri=http://localhost:9080/auth/realms/spade/protocol/openid-connect/certs
-
-
-#keycloak.auth-server-url=http://localhost:9080/auth
-#keycloak.realm=spade
-#keycloak.resource=spade-client
 
-logging.level.org.springframework.security=debug
+#logging.level.org.springframework.security=debug