Merge authors:
Stian Sandvold (stian-sandvold)
revision-diff.txt (19.9 KB)
···
------------------------------------------------------------
revno: 21593 [merge]
committer: Stian Sandvold <stian.sandvold@gmail.com>
branch nick: dhis2
timestamp: Tue 2016-01-05 16:21:39 +0100
message:
Removed smtp and remote instance settings/configuration from Configuration; Now to be defined in dhis.conf, as well as all smtp+remote instance settings(remote:url,user,password; smtp:host,user,pass,sender,tls,port); Refactored other classes to reflect these changes.
modified:
dhis-2/dhis-api/src/main/java/org/hisp/dhis/configuration/Configuration.java
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/message/EmailMessageSender.java
dhis-2/dhis-services/dhis-service-core/src/main/resources/META-INF/dhis/beans.xml
dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/configuration/hibernate/Configuration.hbm.xml
dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/synch/DefaultSynchronizationManager.java
dhis-2/dhis-support/dhis-support-external/src/main/java/org/hisp/dhis/external/conf/ConfigurationKey.java
dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/ConfigurationController.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