vmario/wisemapping-open-source
1
0
Fork 0
mirror of https://bitbucket.org/wisemapping/wisemapping-open-source.git synced 2024-11-22 14:17:57 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix minor issue in drop tables.

Browse Source
This commit is contained in:
Paulo Gustavo Veiga 2012-06-23 16:31:31 -03:00
parent 3349f2e567
commit ee93a8f7ab
4 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
wise-webapp/src/main/java/com/wisemapping/mail/NotificationService.java
View File

@ -156,7 +156,7 @@ final public class NotificationService {
model.put("userAgent", userAgent); model.put("userAgent", userAgent);
final String errorReporterEmail = mailer.getErrorReporterEmail(); final String errorReporterEmail = mailer.getErrorReporterEmail();
if (errorReporterEmail != null) { if (errorReporterEmail != null && !errorReporterEmail.isEmpty()) {
mailer.sendEmail(mailer.getServerSenderEmail(), errorReporterEmail, "[WiseMapping] Editor error from " + user.getEmail(), model, mailer.sendEmail(mailer.getServerSenderEmail(), errorReporterEmail, "[WiseMapping] Editor error from " + user.getEmail(), model,
"editorErrorReport.vm"); "editorErrorReport.vm");
} }
@ -174,7 +174,7 @@ final public class NotificationService {
model.put("userAgent", userAgent); model.put("userAgent", userAgent);
final String errorReporterEmail = mailer.getErrorReporterEmail(); final String errorReporterEmail = mailer.getErrorReporterEmail();
if (errorReporterEmail != null) { if (errorReporterEmail != null && !errorReporterEmail.isEmpty()) {
mailer.sendEmail(mailer.getServerSenderEmail(), errorReporterEmail, "[WiseMapping] Export error from " + user.getEmail(), model, mailer.sendEmail(mailer.getServerSenderEmail(), errorReporterEmail, "[WiseMapping] Export error from " + user.getEmail(), model,
"editorErrorReport.vm"); "editorErrorReport.vm");
} }

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

@ -3,18 +3,18 @@
################################################################################## ##################################################################################
# MySQL 5.X configuration properties # MySQL 5.X configuration properties
database.url=jdbc:mysql://localhost/wisemapping #database.url=jdbc:mysql://localhost/wisemapping
database.driver=com.mysql.jdbc.Driver #database.driver=com.mysql.jdbc.Driver
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
# HSQL Configuration properties # HSQL Configuration properties
#database.url=jdbc:hsqldb:file:target/db/wisemapping database.url=jdbc:hsqldb:file:target/db/wisemapping
#database.driver=org.hsqldb.jdbc.JDBCDriver 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=
################################################################################## ##################################################################################
@ -51,7 +51,7 @@ mail.serverSendEmail=root@localhost
mail.supportEmail=root@localhost mail.supportEmail=root@localhost
# Optional: Unexpected error will be reported to this address. # Optional: Unexpected error will be reported to this address.
mail.errorReporterEmail=root@localhost mail.errorReporterEmail=
################################################################################## ##################################################################################
# Users Registration Configuration # Users Registration Configuration

2
wise-webapp/src/test/sql/hsql/drop-schemas.sql
View File

@ -1,3 +1,4 @@
DROP TABLE ACCESS_AUDITORY;
DROP TABLE TAG; DROP TABLE TAG;
DROP TABLE COLLABORATION; DROP TABLE COLLABORATION;
DROP TABLE COLLABORATION_PROPERTIES; DROP TABLE COLLABORATION_PROPERTIES;
@ -5,6 +6,5 @@ DROP TABLE MINDMAP_HISTORY;
DROP TABLE MINDMAP; DROP TABLE MINDMAP;
DROP TABLE USER; DROP TABLE USER;
DROP TABLE COLLABORATOR; DROP TABLE COLLABORATOR;
DROP TABLE USER_LOGIN;
COMMIT; COMMIT;
SHUTDOWN; SHUTDOWN;

2
wise-webapp/src/test/sql/mysql/drop-schemas.sql
View File

@ -1,9 +1,9 @@
DROP TABLE TAG; DROP TABLE TAG;
DROP TABLE ACCESS_AUDITORY;
DROP TABLE COLLABORATION; DROP TABLE COLLABORATION;
DROP TABLE COLLABORATION_PROPERTIES; DROP TABLE COLLABORATION_PROPERTIES;
DROP TABLE MINDMAP_HISTORY; DROP TABLE MINDMAP_HISTORY;
DROP TABLE MINDMAP; DROP TABLE MINDMAP;
DROP TABLE USER; DROP TABLE USER;
DROP TABLE COLLABORATOR; DROP TABLE COLLABORATOR;
DROP TABLE USER_LOGIN;
COMMIT; COMMIT;