vmario/wisemapping-open-source
1
0
Fork 0
mirror of https://bitbucket.org/wisemapping/wisemapping-open-source.git synced 2024-07-15 12:40:43 +02:00
Code Issues Packages Projects Releases Wiki Activity

- Fix unit tests ...

Browse Source
This commit is contained in:
Paulo Gustavo Veiga 2012-07-12 23:56:04 -03:00
parent 6582f073bd
commit a82439975d
5 changed files with 106 additions and 101 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
wise-webapp/pom.xml
View File

@ -307,7 +307,7 @@
<configuration>
<driver>org.hsqldb.jdbc.JDBCDriver</driver>
<url>jdbc:hsqldb:file:${basedir}/target/db/wisemapping</url>
<url>jdbc:hsqldb:file:${project.basedir}/target/db/wisemapping</url>
<username>sa</username>
<!--all executions are ignored if -Dmaven.test.skipDB=true
Use this flag if you want to reuse an already created HSQL database instance
@ -339,7 +339,7 @@
<onError>continue</onError>
<orderFile>ascending</orderFile>
<fileset>
<basedir>${basedir}</basedir>
<basedir>${project.basedir}</basedir>
<includes>
<include>src/test/sql/hsql/drop-schemas.sql</include>
</includes>
@ -356,7 +356,7 @@
<configuration>
<orderFile>ascending</orderFile>
<fileset>
<basedir>${basedir}</basedir>
<basedir>${project.basedir}</basedir>
<includes>
<include>src/test/sql/hsql/create-schemas.sql</include>
</includes>
@ -372,7 +372,7 @@
<configuration>
<orderFile>ascending</orderFile>
<fileset>
<basedir>${basedir}</basedir>
<basedir>${project.basedir}</basedir>
<includes>
<include>src/test/sql/hsql/test-data.sql</include>
</includes>
@ -461,13 +461,17 @@
<war>${project.build.directory}/wisemapping.war</war>
<reload>automatic</reload>
<webAppConfig>
<overrideDescriptor>webdefault.xml</overrideDescriptor>
<overrideDescriptor>${project.basedir}/webdefault.xml</overrideDescriptor>
</webAppConfig>
<systemProperties>
<systemProperty>
<name>org.mortbay.util.FileResource.checkAliases</name>
<value>false</value>
</systemProperty>
<systemProperty>
<name>org.mortbay.util.FileResource.checkAliases</name>
<value>false</value>
</systemProperty>
</systemProperties>
<!--<scanIntervalSeconds>10</scanIntervalSeconds>-->
</configuration>

5
wise-webapp/src/main/java/com/wisemapping/model/User.java
View File

@ -18,7 +18,7 @@
package com.wisemapping.model;
import org.jetbrains.annotations.NotNull;
import org.jetbrains.annotations.Nullable;
import java.io.Serializable;
import java.util.*;
@ -141,11 +141,12 @@ public class User
this.username = username;
}
@Nullable
public String getLocale() {
return locale;
}
public void setLocale(@NotNull String locale) {
public void setLocale(@Nullable String locale) {
this.locale = locale;
}
}

2
wise-webapp/src/main/java/com/wisemapping/rest/AdminController.java
View File

@ -122,7 +122,7 @@ public class AdminController extends BaseController {
userService.changePassword(user);
}
@RequestMapping(method = RequestMethod.DELETE)
@RequestMapping(method = RequestMethod.DELETE,value = "admin/users/{id}")
@ResponseStatus(value = HttpStatus.NO_CONTENT)
public void getUserByEmail(@PathVariable long id) throws IOException, WiseMappingException {
final User user = userService.getUserBy(id);

2
wise-webapp/src/main/java/com/wisemapping/rest/model/RestUser.java
View File

@ -78,7 +78,7 @@ public class RestUser {
return user.getId();
}
public void setId(int id) {
public void setId(long id) {
user.setId(id);
}

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

@ -1,3 +1,4 @@
##################################################################################
# Database Configuration
##################################################################################
@ -16,7 +17,6 @@ database.hibernate.dialect=org.hibernate.dialect.HSQLDialect
database.username=sa
database.password=
##################################################################################
# Mail configuration. Must be configured to enable user registration confirmation.
##################################################################################
@ -57,7 +57,7 @@ mail.serverSendEmail=root@localhost
# Optional: Support account that the users could use to contact you. This address will appear in emails and in some places in the site.
mail.supportEmail=root@localhost
# Optional: Unexpected error will be reported to this address.
# Optional: Unexpected errors will be reported to this address.
mail.errorReporterEmail=
##################################################################################