diff --git a/dmp-backend/src/main/java/rest/entities/Projects.java b/dmp-backend/src/main/java/rest/entities/Projects.java index 4405fafa7..2679270ba 100644 --- a/dmp-backend/src/main/java/rest/entities/Projects.java +++ b/dmp-backend/src/main/java/rest/entities/Projects.java @@ -263,19 +263,19 @@ public class Projects { Project newproj = projectDao.create(project); - DMP newdmp = new DMP(); - newdmp.setId(null); - newdmp.setLabel("Auto-Generated"); - newdmp.setCreated(new Date()); - newdmp.setVersion(1); - newdmp.setStatus(new Short("0")); - newdmp.setProject(newproj); - - Set users = new HashSet(); - users.add(userInfo); - newdmp.setUsers(users); - - newdmp = dMPDao.create(newdmp); +// DMP newdmp = new DMP(); +// newdmp.setId(null); +// newdmp.setLabel("Auto-Generated"); +// newdmp.setCreated(new Date()); +// newdmp.setVersion(1); +// newdmp.setStatus(new Short("0")); +// newdmp.setProject(newproj); +// +// Set users = new HashSet(); +// users.add(userInfo); +// newdmp.setUsers(users); +// +// newdmp = dMPDao.create(newdmp); return ResponseEntity.status(HttpStatus.OK).body(SerializerProvider.toJson(newproj)); } diff --git a/dmp-backend/src/main/java/rest/entities/Users.java b/dmp-backend/src/main/java/rest/entities/Users.java index 9b97ee93b..4360c68d8 100644 --- a/dmp-backend/src/main/java/rest/entities/Users.java +++ b/dmp-backend/src/main/java/rest/entities/Users.java @@ -75,7 +75,7 @@ public class Users { - @RequestMapping(method = RequestMethod.GET, value = { "/user/whoami" }, produces="application/json") + @RequestMapping(method = RequestMethod.GET, value = { "/user/whoami" }, produces="application/json;charset=UTF-8") public @ResponseBody ResponseEntity whoami(){ @@ -88,6 +88,7 @@ public class Users { UserInfo userInfo = userInfoDao.getUserInfo(userID); + System.out.println(userInfo.getName()); if(userInfo==null) //this should normally never happer return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).body("There's no such a user on the system. You shouldn't be here"); diff --git a/dmp-backend/src/main/webapp/WEB-INF/web.xml b/dmp-backend/src/main/webapp/WEB-INF/web.xml index 6de4a1563..8cc95c48c 100644 --- a/dmp-backend/src/main/webapp/WEB-INF/web.xml +++ b/dmp-backend/src/main/webapp/WEB-INF/web.xml @@ -65,16 +65,16 @@ - - contextConfigLocation - /WEB-INF/applicationContext.xml,/WEB-INF/spring-security.xml - - - - 30 - + + + contextConfigLocation + /WEB-INF/applicationContext.xml,/WEB-INF/spring-security.xml + + + + 30 + - springSecurityFilterChain org.springframework.web.filter.DelegatingFilterProxy @@ -85,6 +85,23 @@ + + + encodingFilter + org.springframework.web.filter.CharacterEncodingFilter + + encoding + UTF-8 + + + forceEncoding + true + + + + encodingFilter + /* + \ No newline at end of file