Code development platform for open source projects from the European Union institutions

Skip to content
Snippets Groups Projects
Commit e79ddb17 authored by Joze RIHTARSIC's avatar Joze RIHTARSIC
Browse files

fix pull comments

parent b26479ca
No related branches found
No related tags found
No related merge requests found
......@@ -24,7 +24,7 @@
<modules>
<module>smp-parent-pom</module>
<module>smp-api</module>
<!-- module>smp-angular</module -->
<module>smp-angular</module>
<module>smp-server-library</module>
<module>smp-webapp</module>
</modules>
......
......@@ -67,11 +67,11 @@ public class DatabaseConfig {
@Bean(name = "dataSource")
public DataSource jndiDataSource() {
public DataSource getDataSource() {
DataSource dataSource = null;
if (!StringUtils.isBlank(url)) {
LOG.info("Retrieve datasource with JNDI: " + jndiDatasourceName);
LOG.info("create datasource with URL: " + url);
DriverManagerDataSource driverManagerDataSource = new DriverManagerDataSource();
driverManagerDataSource.setDriverClassName(driver);
driverManagerDataSource.setUrl(url);
......@@ -116,7 +116,7 @@ public class DatabaseConfig {
public JpaVendorAdapter jpaVendorAdapter() {
HibernateJpaVendorAdapter hibernateJpaVendorAdapter = new HibernateJpaVendorAdapter();
if (!StringUtils.isBlank(hibernateDialect)) {
// hibernateJpaVendorAdapter.setDatabasePlatform(hibernateDialect);
hibernateJpaVendorAdapter.setDatabasePlatform(hibernateDialect);
}
hibernateJpaVendorAdapter.setGenerateDdl(true);
return hibernateJpaVendorAdapter;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment