lingwei.kong/hawkbit
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

Remove unnecessary static driver definition. Spring figures this out. (#470)

Browse Source 
Signed-off-by: kaizimmerm <kai.zimmermann@bosch-si.com>
This commit is contained in:
Kai Zimmermann
2017-04-03 15:38:17 +02:00
committed by GitHub
parent b49bb6522e
commit 1b68c5fa54
4 changed files with 2 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
hawkbit-dmf-amqp/src/test/resources/application-test.properties
View File

@@ -10,34 +10,9 @@
# RabbitMQ # RabbitMQ
spring.rabbitmq.host=localhost spring.rabbitmq.host=localhost
# supported: H2, MYSQL spring.jpa.database=H2
hawkbit.server.database=H2
spring.jpa.database=${hawkbit.server.database}
flyway.sqlMigrationSuffix=${spring.jpa.database}.sql flyway.sqlMigrationSuffix=${spring.jpa.database}.sql
# effective DB setting
spring.datasource.url=${${hawkbit.server.database}.spring.datasource.url}
spring.datasource.driverClassName=${${hawkbit.server.database}.spring.datasource.driverClassName}
spring.datasource.username=${${hawkbit.server.database}.spring.datasource.username}
spring.datasource.password=${${hawkbit.server.database}.spring.datasource.password}
# H2
##;AUTOCOMMIT=ON
H2.spring.datasource.url=jdbc:h2:mem:sp-db;DB_CLOSE_ON_EXIT=FALSE
#H2.spring.datasource.url=jdbc:h2:./db/sp-db;AUTO_SERVER=TRUE;DB_CLOSE_ON_EXIT=FALSE;MVCC=TRUE
H2.spring.datasource.driverClassName=org.h2.Driver
H2.spring.datasource.username=sa
H2.spring.datasource.password=sa
# MYSQL
MYSQL.spring.datasource.url=jdbc:mysql://localhost:3306/sp_test
MYSQL.spring.datasource.driverClassName=org.mariadb.jdbc.Driver
MYSQL.spring.datasource.username=root
MYSQL.spring.datasource.password=
# Default tenant configuration properties # Default tenant configuration properties
hawkbit.server.tenant.configuration.authentication-header-enabled.keyName=authentication.header.enabled hawkbit.server.tenant.configuration.authentication-header-enabled.keyName=authentication.header.enabled
hawkbit.server.tenant.configuration.authentication-header-enabled.defaultValue=false hawkbit.server.tenant.configuration.authentication-header-enabled.defaultValue=false

28
hawkbit-mgmt-resource/src/test/resources/application-test.properties
View File

@@ -11,9 +11,6 @@
logging.level.=INFO logging.level.=INFO
logging.level.org.eclipse.persistence=ERROR logging.level.org.eclipse.persistence=ERROR
# supported: H2, MYSQL
hawkbit.server.database=H2
hawkbit.server.ddi.security.authentication.header=true hawkbit.server.ddi.security.authentication.header=true
hawkbit.server.artifact.repo.upload.maxFileSize=5MB hawkbit.server.artifact.repo.upload.maxFileSize=5MB
@@ -22,32 +19,9 @@ hawkbit.server.security.dos.maxStatusEntriesPerAction=100
hawkbit.server.security.dos.maxAttributeEntriesPerTarget=10 hawkbit.server.security.dos.maxAttributeEntriesPerTarget=10
spring.jpa.database=${hawkbit.server.database} spring.jpa.database=H2
#spring.jpa.show-sql=true
flyway.sqlMigrationSuffix=${spring.jpa.database}.sql flyway.sqlMigrationSuffix=${spring.jpa.database}.sql
# effective DB setting
spring.datasource.url=${${hawkbit.server.database}.spring.datasource.url}
spring.datasource.driverClassName=${${hawkbit.server.database}.spring.datasource.driverClassName}
spring.datasource.username=${${hawkbit.server.database}.spring.datasource.username}
spring.datasource.password=${${hawkbit.server.database}.spring.datasource.password}
# H2
##;AUTOCOMMIT=ON
H2.spring.datasource.url=jdbc:h2:mem:sp-db;DB_CLOSE_ON_EXIT=FALSE
#H2.spring.datasource.url=jdbc:h2:./db/sp-db;AUTO_SERVER=TRUE;DB_CLOSE_ON_EXIT=FALSE;MVCC=TRUE
H2.spring.datasource.driverClassName=org.h2.Driver
H2.spring.datasource.username=sa
H2.spring.datasource.password=sa
# MYSQL
MYSQL.spring.datasource.url=jdbc:mysql://localhost:3306/sp_test
MYSQL.spring.datasource.driverClassName=org.mariadb.jdbc.Driver
MYSQL.spring.datasource.username=root
MYSQL.spring.datasource.password=
# SP Controller configuration # SP Controller configuration
hawkbit.controller.pollingTime=00:01:00 hawkbit.controller.pollingTime=00:01:00
hawkbit.controller.pollingOverdueTime=00:01:00 hawkbit.controller.pollingOverdueTime=00:01:00

12
hawkbit-repository/hawkbit-repository-test/src/main/java/org/eclipse/hawkbit/repository/test/util/CIMySqlTestDatabase.java
View File

@@ -37,12 +37,6 @@ public class CIMySqlTestDatabase implements Testdatabase {
this.password = System.getProperty("spring.datasource.password"); this.password = System.getProperty("spring.datasource.password");
this.uri = System.getProperty("spring.datasource.url"); this.uri = System.getProperty("spring.datasource.url");
createSchemaUri(); createSchemaUri();
initSystemProperties();
}
private final void initSystemProperties() {
System.setProperty("spring.datasource.driverClassName", getDriverClassName());
System.setProperty("spring.jpa.database", "MYSQL");
} }
private void createSchemaUri() { private void createSchemaUri() {
@@ -85,12 +79,6 @@ public class CIMySqlTestDatabase implements Testdatabase {
} }
} }
@Override
public String getDriverClassName() {
return "org.mariadb.jdbc.Driver";
}
@Override @Override
public String getUri() { public String getUri() {
return uri; return uri;

2
hawkbit-repository/hawkbit-repository-test/src/main/java/org/eclipse/hawkbit/repository/test/util/Testdatabase.java
View File

@@ -20,6 +20,4 @@ public interface Testdatabase {
public String getUri(); public String getUri();
String getDriverClassName();
} }