[teiid-commits] teiid SVN: r950 - in trunk: console/src/main/java/com/metamatrix/console/ui/views/authorization and 1 other directory.

[teiid-commits at lists.jboss.org]

Author: shawkins
Date: 2009-05-15 13:04:01 -0400 (Fri, 15 May 2009)
New Revision: 950

Modified:
   trunk/common-internal/src/main/java/com/metamatrix/common/config/util/ConfigurationPropertyNames.java
   trunk/console/src/main/java/com/metamatrix/console/ui/views/authorization/ProvidersMain.java
Log:
TEIID-603 console was not using the common property key.  updated and used the old property key just to be safe.

Modified: trunk/common-internal/src/main/java/com/metamatrix/common/config/util/ConfigurationPropertyNames.java
===================================================================
--- trunk/common-internal/src/main/java/com/metamatrix/common/config/util/ConfigurationPropertyNames.java	2009-05-15 16:40:17 UTC (rev 949)
+++ trunk/common-internal/src/main/java/com/metamatrix/common/config/util/ConfigurationPropertyNames.java	2009-05-15 17:04:01 UTC (rev 950)
@@ -40,6 +40,6 @@
     public static final String MEMBERSHIP_ADMIN_PASSWORD = "security.membership.admin.password"; //$NON-NLS-1$
     public static final String MEMBERSHIP_ADMIN_USERNAME = "security.membership.admin.username"; //$NON-NLS-1$
     public static final String MEMBERSHIP_SECURITY_ENABLED = "security.membership.security.enabled"; //$NON-NLS-1$
-    public static final String MEMBERSHIP_DOMAIN_ORDER = "security.membership.security.DomainOrder"; //$NON-NLS-1$
+    public static final String MEMBERSHIP_DOMAIN_ORDER = "security.membership.DomainOrder"; //$NON-NLS-1$
     
 }

Modified: trunk/console/src/main/java/com/metamatrix/console/ui/views/authorization/ProvidersMain.java
===================================================================
--- trunk/console/src/main/java/com/metamatrix/console/ui/views/authorization/ProvidersMain.java	2009-05-15 16:40:17 UTC (rev 949)
+++ trunk/console/src/main/java/com/metamatrix/console/ui/views/authorization/ProvidersMain.java	2009-05-15 17:04:01 UTC (rev 950)
@@ -59,6 +59,7 @@
 import com.metamatrix.common.config.api.AuthenticationProvider;
 import com.metamatrix.common.config.api.Configuration;
 import com.metamatrix.common.config.api.ServiceComponentDefn;
+import com.metamatrix.common.config.util.ConfigurationPropertyNames;
 import com.metamatrix.common.log.LogManager;
 import com.metamatrix.console.connections.ConnectionInfo;
 import com.metamatrix.console.models.AuthenticationProviderManager;
@@ -415,7 +416,7 @@
         ServiceComponentDefn serviceDefn = config.getServiceComponentDefn(ResourceNames.MEMBERSHIP_SERVICE);
         Properties currentProps = serviceDefn.getProperties();
         
-        currentProps.put("security.membership.DomainOrder",sb.toString()); //$NON-NLS-1$
+        currentProps.put(ConfigurationPropertyNames.MEMBERSHIP_DOMAIN_ORDER,sb.toString()); 
     	
 		getConfigurationManager().modifyService(serviceDefn,currentProps);
     }