zhouxy108/wisemapping-open-source
1
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Add db creation.

Browse Source
This commit is contained in:
Paulo Gustavo Veiga
2023-12-04 20:00:06 -08:00
parent fa06852806
commit e1b517f657
11 changed files with 74 additions and 177 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
wise-webapp/src/main/java/com/wisemapping/config/Application.java
View File

@@ -14,15 +14,15 @@ import org.springframework.security.web.firewall.StrictHttpFirewall;
@SpringBootApplication
@ImportResource(value = {"classpath:spring/wisemapping-service.xml"})
@ComponentScan({"com.wisemapping.security", "com.wisemapping.service", "com.wisemapping.dao", "com.wisemapping.util"})
@ComponentScan({"com.wisemapping.security", "com.wisemapping.service", "com.wisemapping.dao", "com.wisemapping.util", "com.wisemapping.model"})
public class Application {
public static void main(String[] args) {
new SpringApplicationBuilder()
.parent(Application.class, HibernateConfig.class, MethodSecurityConfig.class).web(WebApplicationType.NONE)
.child(MvcAppConfig.class, MvcSecurityConfig.class, ServletConfig.class).web(WebApplicationType.SERVLET)
.sibling(RestAppConfig.class).web(WebApplicationType.SERVLET)
.parent(Application.class, MethodSecurityConfig.class).web(WebApplicationType.NONE)
.child(MvcAppConfig.class, MvcSecurityConfig.class, HibernateConfig.class, ServletConfig.class).web(WebApplicationType.SERVLET)
// .sibling(RestAppConfig.class).web(WebApplicationType.SERVLET)
.run(args);
}

30
wise-webapp/src/main/java/com/wisemapping/config/HibernateConfig.java
View File

@@ -8,37 +8,7 @@ import org.springframework.transaction.annotation.EnableTransactionManagement;
@EnableTransactionManagement
@EnableJpaRepositories("com.wisemapping.model")
public class HibernateConfig {
// @Value("${database.hibernate.dialect}")
// private String dbDialect;
//
// @Value("${database.driver}")
// private String dbDriver;
//
// @Value("${database.url}")
// private String dbUrl;
//
// @Value("${database.username}")
// private String dbUsername;
// @Value("${database.password}")
// private String dbPassword;
//
// @Value("${database.validation.enabled:true}")
// private boolean dbSetOnBorrow;
//
// @Value("${database.validation.query:SELECT 1}")
// private String dbValQuery;
// @Bean
// public LocalSessionFactoryBean sessionFactory() {
// final LocalSessionFactoryBean result = new LocalSessionFactoryBean();
// result.setPackagesToScan("com.wisemapping.model");
// result.setDataSource(dataSource());
// result.setHibernateProperties(hibernateProperties());
//
// return result;
// }
//
//
// @Bean
// public HibernateTransactionManager hibernateTransactionManager() {
// final HibernateTransactionManager result = new HibernateTransactionManager();

3
wise-webapp/src/main/java/com/wisemapping/dao/LabelManagerImpl.java
View File

@@ -25,6 +25,7 @@ import org.hibernate.SessionFactory;
import org.hibernate.query.SelectionQuery;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Repository;
import java.util.List;
@@ -32,7 +33,7 @@ import java.util.List;
@Repository("labelManager")
public class LabelManagerImpl
implements LabelManager {
@Resource
@Autowired
private SessionFactory sessionFactory;
@Override

7
wise-webapp/src/main/java/com/wisemapping/dao/UserManagerImpl.java
View File

@@ -22,6 +22,7 @@ import com.wisemapping.model.*;
import com.wisemapping.security.DefaultPasswordEncoderFactories;
import com.wisemapping.security.LegacyPasswordEncoder;
import jakarta.annotation.Resource;
import jakarta.persistence.EntityManagerFactory;
import org.hibernate.ObjectNotFoundException;
import org.hibernate.Session;
import org.hibernate.SessionFactory;
@@ -39,8 +40,8 @@ import java.util.concurrent.CopyOnWriteArraySet;
@Repository
public class UserManagerImpl
implements UserManager {
// @Autowired
private SessionFactory sessionFactory;
@Autowired
private EntityManagerFactory entityManagerFactory;
@Autowired
private PasswordEncoder passwordEncoder;
@@ -54,7 +55,7 @@ public class UserManagerImpl
}
private Session getSession() {
return sessionFactory.getCurrentSession();
return entityManagerFactory.unwrap(SessionFactory.class).getCurrentSession();
}

55
wise-webapp/src/main/resources/application.properties
View File

@@ -1,37 +1,17 @@
##################################################################################
# Database Configuration
Springboot Common
##################################################################################
# MySQL 5.X configuration properties
#database.url=jdbc:mysql://localhost/wisemapping?useUnicode=yes&characterEncoding=UTF-8
#database.driver=com.mysql.cj.jdbc.Driver
#database.hibernate.dialect=org.hibernate.dialect.MySQL5Dialect
#database.username=wisemapping
#database.password=password
#database.validation.enabled=true
#database.validation.query=SELECT 1
spring.datasource.initialize=true
spring.jpa.open-in-view=true
#spring.jpa.properties.hibernate.current_session_context_class=org.springframework.orm.hibernate5.SpringSessionContext
spring.sql.init.mode=always
spring.main.allow-circular-references=true
## PostgreSQL configuration properties
#database.url=jdbc:postgresql://<hostname:port>/wisemapping
#database.driver=org.postgresql.Driver
#database.hibernate.dialect=org.hibernate.dialect.PostgreSQLDialect
#database.username=wisemapping
#database.password=password
#database.validation.enabled=true
#database.validation.query=
#database.validation.enabled=false
spring.jpa.properties.hibernate.current_session_context_class=thread
spring.jpa.properties.hibernate.format_sql=true
##database.base.url=/Users/veigap/repos/wisemapping-open-source/wise-webapp
### HSQL Configuration properties
##database.url=jdbc:hsqldb:file:${database.base.url}/db/wisemapping
##database.driver=org.hsqldb.jdbc.JDBCDriver
##database.hibernate.dialect=org.hibernate.dialect.HSQLDialect
#
#database.username=sa
#database.password=
#database.validation.enabled=false
#database.validation.query=
logging.level.root=TRACE
##################################################################################
# Mail configuration. Must be configured to enable user registration confirmation.
@@ -155,8 +135,6 @@ security.oauth2.google.userinfoUrl=https://www.googleapis.com/oauth2/v3/userinfo
security.oauth2.google.url=https//review
#######################################################################################
# User Account filtering policies
#######################################################################################
@@ -165,20 +143,13 @@ security.oauth2.google.url=https//review
#accounts.exclusion.domain=
#######################################################################################
# Spring related configurations
#######################################################################################
spring.main.allow-circular-references=true
##################################################################################
# Database Configuration
##################################################################################
database.base.url=/Users/veigap/repos/wisemapping-open-source/wise-webapp
database.base.url=/Users/veigap/
spring.datasource.url=jdbc:hsqldb:file:${database.base.url}/db/wisemapping
spring.datasource.username=sa
spring.datasource.password=
spring.datasource.driver-class-name = org.hsqldb.jdbc.JDBCDriver
spring.jpa.properties.hibernate.dialect=org.hibernate.dialect.HSQLDialect
spring.jpa.open-in-view=true
spring.h2.console.enabled=true
spring.h2.console.path=/h2-ui
logging.level.root=DEBUG

1
wise-webapp/src/main/resources/data-hsqldb.sql Normal file
View File

@@ -0,0 +1 @@
INSERT INTO COLLABORATOR (id, email, creation_date) VALUES (1, 'test@wisemapping.org', CURDATE());

1
wise-webapp/src/main/resources/schema-hsqldb.sql Normal file
View File

@@ -0,0 +1 @@
CREATE TABLE COLLABORATOR (