[jboss-cvs] Picketlink SVN: r758 - picketlink-seam/trunk/picketlink-seam/src/main/java/org/picketlink/identity/seam/federation/configuration.
jboss-cvs-commits at lists.jboss.org
jboss-cvs-commits at lists.jboss.org
Tue Feb 22 12:33:13 EST 2011
Author: anil.saldhana at jboss.com
Date: 2011-02-22 12:33:12 -0500 (Tue, 22 Feb 2011)
New Revision: 758
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/FacebookConfiguration.java
picketlink-seam/trunk/picketlink-seam/src/main/java/org/picketlink/identity/seam/federation/configuration/OpenIdConfiguration.java
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/SamlEndpoint.java
picketlink-seam/trunk/picketlink-seam/src/main/java/org/picketlink/identity/seam/federation/configuration/SamlIdentityProvider.java
picketlink-seam/trunk/picketlink-seam/src/main/java/org/picketlink/identity/seam/federation/configuration/ServiceProvider.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-22 17:32:17 UTC (rev 757)
+++ picketlink-seam/trunk/picketlink-seam/src/main/java/org/picketlink/identity/seam/federation/configuration/Configuration.java 2011-02-22 17:33:12 UTC (rev 758)
@@ -45,6 +45,7 @@
import org.jboss.seam.annotations.Scope;
import org.jboss.seam.annotations.Startup;
import org.jboss.seam.web.ServletContexts;
+import org.picketlink.identity.federation.core.util.StringUtil;
import org.picketlink.identity.seam.federation.jaxb.config.ExternalAuthenticationConfigType;
import org.picketlink.identity.seam.federation.jaxb.config.ServiceProviderType;
import org.xml.sax.SAXException;
@@ -122,7 +123,7 @@
public void setContextRoot(String contextRoot)
{
- this.contextRoot = contextRoot;
+ this.contextRoot = StringUtil.getSystemPropertyAsString( contextRoot );
}
public String getContextRoot()
@@ -133,7 +134,7 @@
@Factory(scope = ScopeType.EVENT, autoCreate = true, value = "org.picketlink.identity.seam.federation.serviceProvider")
public ServiceProvider getServiceProvider()
{
- String hostname = ServletContexts.instance().getRequest().getServerName();;
+ String hostname = StringUtil.getSystemPropertyAsString( ServletContexts.instance().getRequest().getServerName() );
return serviceProviderMap.get(hostname);
}
Modified: picketlink-seam/trunk/picketlink-seam/src/main/java/org/picketlink/identity/seam/federation/configuration/FacebookConfiguration.java
===================================================================
--- picketlink-seam/trunk/picketlink-seam/src/main/java/org/picketlink/identity/seam/federation/configuration/FacebookConfiguration.java 2011-02-22 17:32:17 UTC (rev 757)
+++ picketlink-seam/trunk/picketlink-seam/src/main/java/org/picketlink/identity/seam/federation/configuration/FacebookConfiguration.java 2011-02-22 17:33:12 UTC (rev 758)
@@ -21,6 +21,7 @@
*/
package org.picketlink.identity.seam.federation.configuration;
+import org.picketlink.identity.federation.core.util.StringUtil;
import org.picketlink.identity.seam.federation.jaxb.config.FacebookConfigType;
/**
@@ -37,9 +38,9 @@
public FacebookConfiguration(FacebookConfigType facebookConfiguration)
{
- clientId = facebookConfiguration.getClientId();
- clientSecret = facebookConfiguration.getClientSecret();
- scope = facebookConfiguration.getScope();
+ clientId = StringUtil.getSystemPropertyAsString( facebookConfiguration.getClientId() );
+ clientSecret = StringUtil.getSystemPropertyAsString( facebookConfiguration.getClientSecret() );
+ scope = StringUtil.getSystemPropertyAsString( facebookConfiguration.getScope() );
}
public String getClientId()
Modified: picketlink-seam/trunk/picketlink-seam/src/main/java/org/picketlink/identity/seam/federation/configuration/OpenIdConfiguration.java
===================================================================
--- picketlink-seam/trunk/picketlink-seam/src/main/java/org/picketlink/identity/seam/federation/configuration/OpenIdConfiguration.java 2011-02-22 17:32:17 UTC (rev 757)
+++ picketlink-seam/trunk/picketlink-seam/src/main/java/org/picketlink/identity/seam/federation/configuration/OpenIdConfiguration.java 2011-02-22 17:33:12 UTC (rev 758)
@@ -23,6 +23,7 @@
import java.util.List;
+import org.picketlink.identity.federation.core.util.StringUtil;
import org.picketlink.identity.seam.federation.jaxb.config.OpenIdAttributeType;
import org.picketlink.identity.seam.federation.jaxb.config.OpenIdConfigType;
@@ -39,7 +40,7 @@
public OpenIdConfiguration(OpenIdConfigType openIdConfig)
{
attributes = openIdConfig.getAttribute();
- defaultOpenIdProvider = openIdConfig.getDefaultOpenIdProvider();
+ defaultOpenIdProvider = StringUtil.getSystemPropertyAsString( openIdConfig.getDefaultOpenIdProvider() );
}
public List<OpenIdAttributeType> getAttributes()
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-22 17:32:17 UTC (rev 757)
+++ picketlink-seam/trunk/picketlink-seam/src/main/java/org/picketlink/identity/seam/federation/configuration/SamlConfiguration.java 2011-02-22 17:33:12 UTC (rev 758)
@@ -38,6 +38,7 @@
import java.util.Map;
import org.picketlink.identity.federation.core.parsers.saml.SAMLParser;
+import org.picketlink.identity.federation.core.util.StringUtil;
import org.picketlink.identity.federation.newmodel.saml.v2.metadata.EntitiesDescriptorType;
import org.picketlink.identity.federation.newmodel.saml.v2.metadata.EntityDescriptorType;
import org.picketlink.identity.federation.newmodel.saml.v2.metadata.EntityDescriptorType.EDTChoiceType;
@@ -75,7 +76,7 @@
{
readSamlMetaInformation();
- this.entityId = samlConfig.getServiceProviderEntityId();
+ this.entityId = StringUtil.getSystemPropertyAsString( samlConfig.getServiceProviderEntityId() );
this.authnRequestsSigned = samlConfig.isAuthnRequestsSigned();
this.wantAssertionsSigned = samlConfig.isWantAssertionsSigned();
Modified: picketlink-seam/trunk/picketlink-seam/src/main/java/org/picketlink/identity/seam/federation/configuration/SamlEndpoint.java
===================================================================
--- picketlink-seam/trunk/picketlink-seam/src/main/java/org/picketlink/identity/seam/federation/configuration/SamlEndpoint.java 2011-02-22 17:32:17 UTC (rev 757)
+++ picketlink-seam/trunk/picketlink-seam/src/main/java/org/picketlink/identity/seam/federation/configuration/SamlEndpoint.java 2011-02-22 17:33:12 UTC (rev 758)
@@ -21,6 +21,8 @@
*/
package org.picketlink.identity.seam.federation.configuration;
+import org.picketlink.identity.federation.core.util.StringUtil;
+
/**
* @author Marcel Kolsteren
* @since Jan 24, 2010
@@ -40,8 +42,8 @@
super();
this.service = service;
this.binding = binding;
- this.location = location;
- this.responseLocation = responseLocation;
+ this.location = StringUtil.getSystemPropertyAsString( location );
+ this.responseLocation = StringUtil.getSystemPropertyAsString( responseLocation );
}
public SamlService getService()
Modified: picketlink-seam/trunk/picketlink-seam/src/main/java/org/picketlink/identity/seam/federation/configuration/SamlIdentityProvider.java
===================================================================
--- picketlink-seam/trunk/picketlink-seam/src/main/java/org/picketlink/identity/seam/federation/configuration/SamlIdentityProvider.java 2011-02-22 17:32:17 UTC (rev 757)
+++ picketlink-seam/trunk/picketlink-seam/src/main/java/org/picketlink/identity/seam/federation/configuration/SamlIdentityProvider.java 2011-02-22 17:33:12 UTC (rev 758)
@@ -27,6 +27,7 @@
import java.util.Map;
import org.picketlink.identity.federation.api.saml.v2.metadata.MetaDataExtractor;
+import org.picketlink.identity.federation.core.util.StringUtil;
import org.picketlink.identity.federation.newmodel.saml.v2.metadata.IDPSSODescriptorType;
import org.picketlink.identity.federation.newmodel.saml.v2.metadata.KeyDescriptorType;
import org.picketlink.identity.federation.newmodel.saml.v2.metadata.KeyTypes;
@@ -52,7 +53,7 @@
public SamlIdentityProvider(String entityId, IDPSSODescriptorType IDPSSODescriptor)
{
- this.entityId = entityId;
+ this.entityId = StringUtil.getSystemPropertyAsString( entityId );
wantAuthnRequestsSigned = IDPSSODescriptor.isWantAuthnRequestsSigned();
Modified: picketlink-seam/trunk/picketlink-seam/src/main/java/org/picketlink/identity/seam/federation/configuration/ServiceProvider.java
===================================================================
--- picketlink-seam/trunk/picketlink-seam/src/main/java/org/picketlink/identity/seam/federation/configuration/ServiceProvider.java 2011-02-22 17:32:17 UTC (rev 757)
+++ picketlink-seam/trunk/picketlink-seam/src/main/java/org/picketlink/identity/seam/federation/configuration/ServiceProvider.java 2011-02-22 17:33:12 UTC (rev 758)
@@ -28,6 +28,7 @@
import org.jboss.seam.core.Expressions;
import org.jboss.seam.core.Expressions.MethodExpression;
+import org.picketlink.identity.federation.core.util.StringUtil;
import org.picketlink.identity.seam.federation.ExternalAuthenticationService;
import org.picketlink.identity.seam.federation.jaxb.config.ServiceProviderType;
@@ -63,15 +64,16 @@
{
this.configuration = configuration;
- hostname = serviceProvider.getHostname();
- protocol = serviceProvider.getProtocol().value();
+ hostname = StringUtil.getSystemPropertyAsString( serviceProvider.getHostname() );
+ protocol = StringUtil.getSystemPropertyAsString( serviceProvider.getProtocol().value() );
- loggedOutUrl = serviceProvider.getLoggedOutUrl();
- unsolicitedAuthenticationUrl = serviceProvider.getUnsolicitedAuthenticationUrl();
- failedAuthenticationUrl = serviceProvider.getFailedAuthenticationUrl();
+ loggedOutUrl = StringUtil.getSystemPropertyAsString( serviceProvider.getLoggedOutUrl() );
+ unsolicitedAuthenticationUrl = StringUtil.getSystemPropertyAsString( serviceProvider.getUnsolicitedAuthenticationUrl() );
+ failedAuthenticationUrl = StringUtil.getSystemPropertyAsString( serviceProvider.getFailedAuthenticationUrl() );
internalAuthenticationMethod = Expressions.instance().createMethodExpression(
- serviceProvider.getInternalAuthenticationMethod(), Boolean.class, Principal.class, List.class);
+ StringUtil.getSystemPropertyAsString( serviceProvider.getInternalAuthenticationMethod() ),
+ Boolean.class, Principal.class, List.class);
if (serviceProvider.getPort() == null)
{
More information about the jboss-cvs-commits
mailing list