dhis2-devs team mailing list archive

[noreply@xxxxxxxxxxxxx]

------------------------------------------------------------
revno: 20926
committer: Lars Helge Overland <larshelge@xxxxxxxxx>
branch nick: dhis2
timestamp: Mon 2015-11-02 12:34:22 -0500
message:
  ConfigurationKey, removed KEY from enums
modified:
  dhis-2/dhis-services/dhis-service-core/src/main/resources/META-INF/dhis/security.xml
  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/test/java/org/hisp/dhis/external/conf/DhisConfigurationProviderTest.java


--
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

=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/resources/META-INF/dhis/security.xml'
--- dhis-2/dhis-services/dhis-service-core/src/main/resources/META-INF/dhis/security.xml	2015-10-27 14:11:44 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/resources/META-INF/dhis/security.xml	2015-11-02 17:34:22 +0000
@@ -51,14 +51,14 @@
     </constructor-arg>
   </bean>
   
-  <bean id="ldapUrl" class="org.hisp.dhis.external.conf.ConfigurationPropertyFactoryBean"><constructor-arg value="KEY_LDAP_URL" /></bean>
-  
-  <bean id="ldapManagerDn" class="org.hisp.dhis.external.conf.ConfigurationPropertyFactoryBean"><constructor-arg value="KEY_LDAP_MANAGER_DN" /></bean>
-  
-  <bean id="ldapManagerPassword" class="org.hisp.dhis.external.conf.ConfigurationPropertyFactoryBean"><constructor-arg value="KEY_LDAP_MANAGER_PASSWORD" /></bean>
+  <bean id="ldapUrl" class="org.hisp.dhis.external.conf.ConfigurationPropertyFactoryBean"><constructor-arg value="LDAP_URL" /></bean>
+  
+  <bean id="ldapManagerDn" class="org.hisp.dhis.external.conf.ConfigurationPropertyFactoryBean"><constructor-arg value="LDAP_MANAGER_DN" /></bean>
+  
+  <bean id="ldapManagerPassword" class="org.hisp.dhis.external.conf.ConfigurationPropertyFactoryBean"><constructor-arg value="LDAP_MANAGER_PASSWORD" /></bean>
     
   <bean id="ldapDnPatterns" class="org.hisp.dhis.external.conf.ConfigurationPropertyFactoryBean">
-    <constructor-arg value="KEY_LDAP_DN_PATTERNS" />
+    <constructor-arg value="LDAP_DN_PATTERNS" />
     <property name="list" value="true" />
   </bean>  
     

=== modified file '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/ConfigurationKey.java	2015-10-27 14:11:44 +0000
+++ dhis-2/dhis-support/dhis-support-external/src/main/java/org/hisp/dhis/external/conf/ConfigurationKey.java	2015-11-02 17:34:22 +0000
@@ -33,15 +33,15 @@
  */
 public enum ConfigurationKey
 {
-    KEY_LDAP_URL( "ldap.url", "ldaps://0:1" ),
-    KEY_LDAP_MANAGER_DN( "ldap.manager.dn" ),
-    KEY_LDAP_MANAGER_PASSWORD( "ldap.manager.password" ),
-    KEY_LDAP_DN_PATTERNS( "ldap.dn.patterns", "" ),    
-    KEY_FILESTORE_PROVIDER( "filestore.provider", "filesystem" ),
-    KEY_FILE_STORE_CONTAINER( "filestore.container" ),
-    KEY_FILE_STORE_LOCATION( "filestore.location" ),
-    KEY_FILE_STORE_IDENTITY( "filestore.identity" ),
-    KEY_FILE_STORE_SECRET( "filestore.secret" );
+    LDAP_URL( "ldap.url", "ldaps://0:1" ),
+    LDAP_MANAGER_DN( "ldap.manager.dn" ),
+    LDAP_MANAGER_PASSWORD( "ldap.manager.password" ),
+    LDAP_DN_PATTERNS( "ldap.dn.patterns", "" ),    
+    FILESTORE_PROVIDER( "filestore.provider", "filesystem" ),
+    FILE_STORE_CONTAINER( "filestore.container" ),
+    FILE_STORE_LOCATION( "filestore.location" ),
+    FILE_STORE_IDENTITY( "filestore.identity" ),
+    FILE_STORE_SECRET( "filestore.secret" );
 
     private final String key;
     

=== modified file '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/DefaultDhisConfigurationProvider.java	2015-10-28 04:33:57 +0000
+++ dhis-2/dhis-support/dhis-support-external/src/main/java/org/hisp/dhis/external/conf/DefaultDhisConfigurationProvider.java	2015-11-02 17:34:22 +0000
@@ -127,12 +127,12 @@
     @Override
     public boolean isLdapConfigured()
     {
-        String ldapUrl = getProperty( ConfigurationKey.KEY_LDAP_URL );
-        String managerDn = getProperty( ConfigurationKey.KEY_LDAP_MANAGER_DN );
-        String dnPatterns = getProperty( ConfigurationKey.KEY_LDAP_DN_PATTERNS );
+        String ldapUrl = getProperty( ConfigurationKey.LDAP_URL );
+        String managerDn = getProperty( ConfigurationKey.LDAP_MANAGER_DN );
+        String dnPatterns = getProperty( ConfigurationKey.LDAP_DN_PATTERNS );
         
-        return !( ConfigurationKey.KEY_LDAP_URL.getDefaultValue().equals( ldapUrl ) ||
-            ConfigurationKey.KEY_LDAP_MANAGER_DN.getDefaultValue().equals( managerDn ) ||
-            ConfigurationKey.KEY_LDAP_DN_PATTERNS.getDefaultValue().equals( dnPatterns ) );
+        return !( ConfigurationKey.LDAP_URL.getDefaultValue().equals( ldapUrl ) ||
+            ConfigurationKey.LDAP_MANAGER_DN.getDefaultValue().equals( managerDn ) ||
+            ConfigurationKey.LDAP_DN_PATTERNS.getDefaultValue().equals( dnPatterns ) );
     }
 }

=== modified file 'dhis-2/dhis-support/dhis-support-external/src/test/java/org/hisp/dhis/external/conf/DhisConfigurationProviderTest.java'
--- dhis-2/dhis-support/dhis-support-external/src/test/java/org/hisp/dhis/external/conf/DhisConfigurationProviderTest.java	2015-11-02 17:28:47 +0000
+++ dhis-2/dhis-support/dhis-support-external/src/test/java/org/hisp/dhis/external/conf/DhisConfigurationProviderTest.java	2015-11-02 17:34:22 +0000
@@ -52,6 +52,6 @@
     @Test
     public void testGetProperty()
     {
-        assertEquals( ConfigurationKey.KEY_FILESTORE_PROVIDER.getDefaultValue(), provider.getProperty( ConfigurationKey.KEY_FILESTORE_PROVIDER ) );
+        assertEquals( ConfigurationKey.FILESTORE_PROVIDER.getDefaultValue(), provider.getProperty( ConfigurationKey.FILESTORE_PROVIDER ) );
     }
 }