[jboss-cvs] Picketlink SVN: r770 - picketlink-seam/trunk/picketlink-seam/src/main/java/org/picketlink/identity/seam/federation/configuration.

[jboss-cvs-commits at lists.jboss.org]

Author: anil.saldhana at jboss.com
Date: 2011-02-23 11:43:15 -0500 (Wed, 23 Feb 2011)
New Revision: 770

Modified:
   picketlink-seam/trunk/picketlink-seam/src/main/java/org/picketlink/identity/seam/federation/configuration/Configuration.java
   picketlink-seam/trunk/picketlink-seam/src/main/java/org/picketlink/identity/seam/federation/configuration/SamlConfiguration.java
Log:
PLFED-138: add a method to StringUtil to pick a system property if needed

Modified: picketlink-seam/trunk/picketlink-seam/src/main/java/org/picketlink/identity/seam/federation/configuration/Configuration.java
===================================================================
--- picketlink-seam/trunk/picketlink-seam/src/main/java/org/picketlink/identity/seam/federation/configuration/Configuration.java	2011-02-23 16:36:01 UTC (rev 769)
+++ picketlink-seam/trunk/picketlink-seam/src/main/java/org/picketlink/identity/seam/federation/configuration/Configuration.java	2011-02-23 16:43:15 UTC (rev 770)
@@ -79,11 +79,13 @@
 
       for (ServiceProvider sp : serviceProviders)
       {
-         if (serviceProviderMap.containsKey(sp.getHostname()))
+         String hostName = StringUtil.getSystemPropertyAsString( sp.getHostname() );
+         
+         if (serviceProviderMap.containsKey( hostName ))
          {
             throw new RuntimeException("Two service providers have the same hostname");
          }
-         serviceProviderMap.put(sp.getHostname(), sp);
+         serviceProviderMap.put( hostName, sp);
       }
    }
 

Modified: picketlink-seam/trunk/picketlink-seam/src/main/java/org/picketlink/identity/seam/federation/configuration/SamlConfiguration.java
===================================================================
--- picketlink-seam/trunk/picketlink-seam/src/main/java/org/picketlink/identity/seam/federation/configuration/SamlConfiguration.java	2011-02-23 16:36:01 UTC (rev 769)
+++ picketlink-seam/trunk/picketlink-seam/src/main/java/org/picketlink/identity/seam/federation/configuration/SamlConfiguration.java	2011-02-23 16:43:15 UTC (rev 770)
@@ -82,13 +82,14 @@
 
       for (SamlIdentityProviderType samlIdp : samlConfig.getSamlIdentityProvider())
       {
-         IDPSSODescriptorType idpSsoDescriptor = idpMetaInfo.get(samlIdp.getEntityId());
+         String entityID = StringUtil.getSystemPropertyAsString( samlIdp.getEntityId() );
+         IDPSSODescriptorType idpSsoDescriptor = idpMetaInfo.get( entityID );
          if (idpSsoDescriptor == null)
          {
-            throw new RuntimeException("Saml identity provider with entity id \"" + samlIdp.getEntityId()
+            throw new RuntimeException("Saml identity provider with entity id \"" + entityID
                   + "\" not found in metadata.");
          }
-         SamlIdentityProvider samlIdentityProvider = new SamlIdentityProvider(samlIdp.getEntityId(), idpSsoDescriptor);
+         SamlIdentityProvider samlIdentityProvider = new SamlIdentityProvider( entityID, idpSsoDescriptor);
          identityProviders.add(samlIdentityProvider);
 
          samlIdentityProvider.setWantSingleLogoutMessagesSigned(samlIdp.isWantSingleLogoutMessagesSigned());
@@ -106,7 +107,8 @@
                wantAuthnRequestsSigned = true;
             }
          }
-         if (identityProvider.getEntityId().equals(samlConfig.getDefaultIdentityProvider()))
+         String entityID = StringUtil.getSystemPropertyAsString( identityProvider.getEntityId() );
+         if ( entityID.equals( StringUtil.getSystemPropertyAsString( samlConfig.getDefaultIdentityProvider() )))
          {
             defaultIdentityProvider = identityProvider;
          }
@@ -118,10 +120,10 @@
                "Configuration error: at least one identity provider wants the authentication requests signed, but the service provider doesn't sign authentication requests.");
       }
 
-      String keyStoreUrl = samlConfig.getKeyStoreUrl();
-      String keyStorePass = samlConfig.getKeyStorePass();
-      String signingKeyAlias = samlConfig.getSigningKeyAlias();
-      String signingKeyPass = samlConfig.getSigningKeyPass();
+      String keyStoreUrl = StringUtil.getSystemPropertyAsString( samlConfig.getKeyStoreUrl() );
+      String keyStorePass = StringUtil.getSystemPropertyAsString( samlConfig.getKeyStorePass() );
+      String signingKeyAlias = StringUtil.getSystemPropertyAsString( samlConfig.getSigningKeyAlias() );
+      String signingKeyPass = StringUtil.getSystemPropertyAsString( samlConfig.getSigningKeyPass() );
       if (signingKeyPass == null)
       {
          signingKeyPass = keyStorePass;
@@ -288,7 +290,7 @@
          if (identityProvider instanceof SamlIdentityProvider)
          {
             SamlIdentityProvider samlIdentityProvider = (SamlIdentityProvider) identityProvider;
-            if (samlIdentityProvider.getEntityId().equals(entityId))
+            if ( StringUtil.getSystemPropertyAsString( samlIdentityProvider.getEntityId() ).equals(entityId))
             {
                return samlIdentityProvider;
             }