Merge branch 'develop' of ssh://haisulike01/oskari-server into develop
Merge branch 'develop' of ssh://haisulike01/oskari-server into develop
Fixed merge conflicts
[AH-1435] analysis improvements
Merge branch 'develop' of ssh://haisulike01/oskari-server into develop
[AH-1477] Removed jndi-login.conf, added to oskari-env instead. Added session path to cookie to ensure transport works as intended. Fixed myplaces jndi name.
Added support for untyped list query
Removed unnecessary variable
Added methods for generating uuid for user
Now generated uuid for user on create if not set for user object to be created
Added uuid for user insert SQL
[AH-1447] Added admin-users loading for Admin role for the servlet
Merge branch 'develop' of ssh://haisulike01/oskari-server into develop
Added external role mapping capability to RoleService
Added upgrade documentation about external role mappings
Merge branch 'develop' of ssh://haisulike01/oskari-server into develop
Merge branch 'develop' of ssh://haisulike01/oskari-server into develop
Merge branch 'develop' of ssh://haisulike01/oskari-server into develop
Changed role mapping to be linked by user id instead of user_name. Added service method to link role for user
DatabaseUserService now links roles for user on createUser