Merge authors:
Stian Sandvold (stian-sandvold)
revision-diff.txt (12.3 KB)
···
------------------------------------------------------------
revno: 21522 [merge]
committer: Stian Sandvold <stian.sandvold@gmail.com>
branch nick: dhis2
timestamp: Wed 2015-12-23 15:25:50 +0100
message:
Configuration now uses old DESede encryption; Confidential values are encrypted with AES128bit; Missing required files when trying to encrypt or decrypt will result in exception, relayed by the webserver to the caller trough CRUDControllerAdvice
modified:
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/startup/InitTableAlteror.java
dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/configuration/hibernate/Configuration.hbm.xml
dhis-2/dhis-support/dhis-support-hibernate/src/main/resources/META-INF/dhis/beans.xml
dhis-2/dhis-support/dhis-support-system/src/main/java/org/hisp/dhis/system/startup/DefaultStartupRoutineExecutor.java
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/CrudControllerAdvice.java
--
lp:dhis2
Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to OpenID transaction in progress