=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/setting/SystemSettingManager.java' --- dhis-2/dhis-api/src/main/java/org/hisp/dhis/setting/SystemSettingManager.java 2012-10-23 08:01:42 +0000 +++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/setting/SystemSettingManager.java 2012-10-23 08:04:24 +0000 @@ -44,7 +44,6 @@ { final String ID = SystemSettingManager.class.getName(); - final String KEY_SYSTEM_IDENTIFIER = "keySystemIdentifier"; final String KEY_APPLICATION_TITLE = "applicationTitle"; final String KEY_APPLICATION_INTRO = "applicationIntro"; final String KEY_FLAG = "keyFlag"; @@ -105,9 +104,7 @@ void deleteSystemSetting( String name ); List getFlags(); - - String getSystemIdentifier(); - + String getFlagImage(); String getEmailHostName(); === modified file 'dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/setting/DefaultSystemSettingManager.java' --- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/setting/DefaultSystemSettingManager.java 2012-03-05 16:37:17 +0000 +++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/setting/DefaultSystemSettingManager.java 2012-10-23 08:04:24 +0000 @@ -126,11 +126,6 @@ return flags; } - public String getSystemIdentifier() - { - return (String) getSystemSetting( KEY_SYSTEM_IDENTIFIER ); - } - public String getFlagImage() { String flag = (String) getSystemSetting( KEY_FLAG ); === modified file 'dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/interceptor/SystemSettingInterceptor.java' --- dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/interceptor/SystemSettingInterceptor.java 2012-10-23 08:01:42 +0000 +++ dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/interceptor/SystemSettingInterceptor.java 2012-10-23 08:04:24 +0000 @@ -39,7 +39,6 @@ import static org.hisp.dhis.setting.SystemSettingManager.KEY_FLAG_IMAGE; import static org.hisp.dhis.setting.SystemSettingManager.KEY_OMIT_INDICATORS_ZERO_NUMERATOR_DATAMART; import static org.hisp.dhis.setting.SystemSettingManager.KEY_START_MODULE; -import static org.hisp.dhis.setting.SystemSettingManager.KEY_SYSTEM_IDENTIFIER; import static org.hisp.dhis.setting.SystemSettingManager.KEY_PHONE_NUMBER_AREA_CODE; import static org.hisp.dhis.setting.SystemSettingManager.KEY_CONFIGURATION; @@ -94,7 +93,6 @@ { Map map = new HashMap(); - map.put( KEY_SYSTEM_IDENTIFIER, systemSettingManager.getSystemIdentifier() ); //TODO remove map.put( KEY_CACHE_STRATEGY, systemSettingManager.getSystemSetting( KEY_CACHE_STRATEGY ) ); map.put( KEY_APPLICATION_TITLE, systemSettingManager.getSystemSetting( KEY_APPLICATION_TITLE ) ); map.put( KEY_APPLICATION_INTRO, systemSettingManager.getSystemSetting( KEY_APPLICATION_INTRO ) );