[Branch ~dhis2-devs-core/dhis2/trunk] Rev 21602: EncryptionStatus added to report on the configuration required to use encryption; Startuproute no...

Merge authors:
  Stian Sandvold (stian-sandvold)

revision-diff.txt (18.4 KB)

···

------------------------------------------------------------
revno: 21602 [merge]
committer: Stian Sandvold <stian.sandvold@gmail.com>
branch nick: dhis2
timestamp: Tue 2016-01-05 19:32:18 +0100
message:
  EncryptionStatus added to report on the configuration required to use encryption; Startuproute now checks EncryptionStatus and reports any missing configuration; adding and updating attributes (tracker) now stops users from using the confidential checkbox if EncryptionStatus != OK; InitTableAlteror now removes all deprecated columns from the old Configuration; DhisConfigurationProvider handles the logic to check is Encryption is configured correctly
added:
  dhis-2/dhis-api/src/main/java/org/hisp/dhis/encryption/
  dhis-2/dhis-api/src/main/java/org/hisp/dhis/encryption/EncryptionStatus.java
modified:
  dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/startup/ConfigurationPopulator.java
  dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/startup/InitTableAlteror.java
  dhis-2/dhis-support/dhis-support-external/src/main/java/org/hisp/dhis/external/conf/ConfigurationKey.java
  dhis-2/dhis-support/dhis-support-external/src/main/java/org/hisp/dhis/external/conf/DefaultDhisConfigurationProvider.java
  dhis-2/dhis-support/dhis-support-external/src/main/java/org/hisp/dhis/external/conf/DhisConfigurationProvider.java
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/trackedentityattribute/AddAttributeAction.java
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/java/org/hisp/dhis/trackedentity/action/trackedentityattribute/ShowAddUpdateAttributeAction.java
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/resources/org/hisp/dhis/trackedentity/i18n_module.properties
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/addAttributeForm.vm
  dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-program/src/main/webapp/dhis-web-maintenance-program/updateAttibuteForm.vm

--
lp:dhis2
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk

Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription