vmario/wisemapping-open-source
1
0
Fork 0
mirror of https://bitbucket.org/wisemapping/wisemapping-open-source.git synced 2024-11-26 07:44:56 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix error when the connections in the pool has been closed.

Browse Source
This commit is contained in:
Paulo Gustavo Veiga 2012-11-01 23:29:18 -03:00
parent e5e2e86fce
commit 9067a6cff2
3 changed files with 84 additions and 82 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
wise-webapp/src/main/java/com/wisemapping/ncontroller/UsersController.java
View File

@ -52,9 +52,6 @@ public class UsersController {
@Autowired @Autowired
private UserService userService; private UserService userService;
@Value("${registration.email.enabled}")
boolean emailConfirmEnabled;
@Autowired @Autowired
private ReCaptcha captchaService; private ReCaptcha captchaService;
@ -111,11 +108,13 @@ public class UsersController {
user.setFirstname(userBean.getFirstname()); user.setFirstname(userBean.getFirstname());
user.setLastname(userBean.getLastname()); user.setLastname(userBean.getLastname());
user.setPassword(userBean.getPassword()); user.setPassword(userBean.getPassword());
userService.createUser(user, emailConfirmEnabled);
boolean confirmRegistrationByEmail = false;
userService.createUser(user, confirmRegistrationByEmail);
// Forward to the success view ... // Forward to the success view ...
result = new ModelAndView("userRegistrationSuccess"); result = new ModelAndView("userRegistrationSuccess");
result.addObject("confirmByEmail", emailConfirmEnabled); result.addObject("confirmByEmail", confirmRegistrationByEmail);
} }
return result; return result;
} }

7
wise-webapp/src/main/webapp/WEB-INF/app.properties
View File

@ -9,6 +9,8 @@
#database.hibernate.dialect=org.hibernate.dialect.MySQL5Dialect #database.hibernate.dialect=org.hibernate.dialect.MySQL5Dialect
#database.username=wisemapping #database.username=wisemapping
#database.password=password #database.password=password
#database.validation.enabled=true
#database.validation.query=SELECT 1
# HSQL Configuration properties # HSQL Configuration properties
database.url=jdbc:hsqldb:file:target/db/wisemapping database.url=jdbc:hsqldb:file:target/db/wisemapping
@ -16,6 +18,8 @@ database.driver=org.hsqldb.jdbc.JDBCDriver
database.hibernate.dialect=org.hibernate.dialect.HSQLDialect database.hibernate.dialect=org.hibernate.dialect.HSQLDialect
database.username=sa database.username=sa
database.password= database.password=
database.validation.enabled=false
database.validation.query=
################################################################################## ##################################################################################
# Mail configuration. Must be configured to enable user registration confirmation. # Mail configuration. Must be configured to enable user registration confirmation.
@ -60,9 +64,6 @@ mail.errorReporterEmail=
# Users Registration Configuration # Users Registration Configuration
################################################################################## ##################################################################################
# Enable/Disable user registration confirmation by e-mail. If it's enabled, mail must be configured.
registration.email.enabled = false
# Enable captcha confirmation # Enable captcha confirmation
google.recaptcha.enabled = true google.recaptcha.enabled = true

2
wise-webapp/src/main/webapp/WEB-INF/wisemapping-dao.xml
View File

@ -11,6 +11,8 @@
<property name="url" value="${database.url}"/> <property name="url" value="${database.url}"/>
<property name="username" value="${database.username}"/> <property name="username" value="${database.username}"/>
<property name="password" value="${database.password}"/> <property name="password" value="${database.password}"/>
<property name="testOnBorrow" value="${database.validation.enabled}"/>
<property name="validationQuery" value="${database.validation.query}"/>
</bean> </bean>
<!--Descoment this lines for production environments --> <!--Descoment this lines for production environments -->