Author: sguilhen(a)redhat.com Date: 2009-09-03 14:17:00 -0400 (Thu, 03 Sep 2009) New Revision: 759 Added: identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/config/ClaimProviderType.java identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/config/ClaimProvidersType.java identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/config/PropertyType.java Modified: identity-federation/trunk/jboss-identity-bindings/src/main/java/org/jboss/identity/federation/bindings/jboss/wstrust/JBossSTS.java identity-federation/trunk/jboss-identity-bindings/src/main/java/org/jboss/identity/federation/bindings/jboss/wstrust/JBossSTSConfiguration.java identity-federation/trunk/jboss-identity-bindings/src/test/java/org/jboss/test/identity/federation/bindings/config/ConfigUnitTestCase.java identity-federation/trunk/jboss-identity-bindings/src/test/java/org/jboss/test/identity/federation/bindings/wstrust/JBossSTSUnitTestCase.java identity-federation/trunk/jboss-identity-bindings/src/test/java/org/jboss/test/identity/federation/bindings/wstrust/SpecialTokenProvider.java identity-federation/trunk/jboss-identity-bindings/src/test/resources/config/test-config-4.xml identity-federation/trunk/jboss-identity-bindings/src/test/resources/jboss-sts.xml identity-federation/trunk/jboss-identity-fed-api/ identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/config/AuthPropertyType.java identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/config/EncAlgoType.java identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/config/EncryptionType.java identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/config/IDPType.java identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/config/KeyProviderType.java identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/config/KeyValueType.java identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/config/MetadataProviderType.java identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/config/ObjectFactory.java identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/config/ProviderType.java identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/config/SPType.java identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/config/STSType.java identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/config/ServiceProviderType.java identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/config/ServiceProvidersType.java identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/config/TokenProviderType.java identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/config/TokenProvidersType.java identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/config/TrustType.java identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/config/package-info.java identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/wstrust/STSConfiguration.java identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/wstrust/SecurityTokenProvider.java identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/wstrust/StandardRequestHandler.java identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/wstrust/StandardSecurityToken.java identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/wstrust/plugins/saml/SAML20TokenProvider.java identity-federation/trunk/jboss-identity-fed-core/src/test/java/org/jboss/test/identity/federation/core/wstrust/MockSTSConfiguration.java identity-federation/trunk/jboss-identity-fed-core/src/test/java/org/jboss/test/identity/federation/core/wstrust/SpecialTokenProvider.java identity-federation/trunk/jboss-identity-web/src/main/resources/schema/config/jboss-identity-fed.xsd Log: JBID-137: changed the schema to allow for the specification of general properties for the token providers. Providers must also specify the token element name and namespace so that a token provider can be located when the request contains no token type (example: validate requests) Modified: identity-federation/trunk/jboss-identity-bindings/src/main/java/org/jboss/identity/federation/bindings/jboss/wstrust/JBossSTS.java =================================================================== --- identity-federation/trunk/jboss-identity-bindings/src/main/java/org/jboss/identity/federation/bindings/jboss/wstrust/JBossSTS.java 2009-09-03 01:56:21 UTC (rev 758) +++ identity-federation/trunk/jboss-identity-bindings/src/main/java/org/jboss/identity/federation/bindings/jboss/wstrust/JBossSTS.java 2009-09-03 18:17:00 UTC (rev 759) @@ -72,7 +72,7 @@ /* * (non-Javadoc) * - * @see org.jboss.identity.federation.api.wstrust.SecurityTokenService#invoke(javax.xml.transform.Source) + * @see org.jboss.identity.federation.core.wstrust.SecurityTokenService#invoke(javax.xml.transform.Source) */ public Source invoke(Source request) { Modified: identity-federation/trunk/jboss-identity-bindings/src/main/java/org/jboss/identity/federation/bindings/jboss/wstrust/JBossSTSConfiguration.java =================================================================== --- identity-federation/trunk/jboss-identity-bindings/src/main/java/org/jboss/identity/federation/bindings/jboss/wstrust/JBossSTSConfiguration.java 2009-09-03 01:56:21 UTC (rev 758) +++ identity-federation/trunk/jboss-identity-bindings/src/main/java/org/jboss/identity/federation/bindings/jboss/wstrust/JBossSTSConfiguration.java 2009-09-03 18:17:00 UTC (rev 759) @@ -27,6 +27,7 @@ import java.util.Map; import org.jboss.identity.federation.core.config.KeyProviderType; +import org.jboss.identity.federation.core.config.PropertyType; import org.jboss.identity.federation.core.config.STSType; import org.jboss.identity.federation.core.config.ServiceProviderType; import org.jboss.identity.federation.core.config.ServiceProvidersType; @@ -55,12 +56,10 @@ private final Map<String, ServiceProviderType> spMetadata = new HashMap<String, ServiceProviderType>(); - private final Map<String, Object> options = new HashMap<String, Object>(); - private TrustKeyManager trustManager; private WSTrustRequestHandler handler; - + /** * <p> * Creates an instance of {@code JBossSTSConfiguration} with default configuration values. @@ -69,11 +68,7 @@ public JBossSTSConfiguration() { this.delegate = new STSType(); - // set the default values in the delegate. - this.delegate.setSTSName("JBossSTS"); - this.delegate.setEncryptToken(false); - this.delegate.setTokenTimeout(3600); - this.delegate.setRequestHandler("org.jboss.identity.federation.api.wstrust.StandardRequestHandler"); + this.delegate.setRequestHandler("org.jboss.identity.federation.core.wstrust.StandardRequestHandler"); // TODO: add default token provider classes. } @@ -89,7 +84,7 @@ this.delegate = config; // set the default request handler if one hasn't been specified. if (this.delegate.getRequestHandler() == null) - this.delegate.setRequestHandler("org.jboss.identity.federation.api.wstrust.StandardRequestHandler"); + this.delegate.setRequestHandler("org.jboss.identity.federation.core.wstrust.StandardRequestHandler"); // build the token-provider and service-metadata maps. TokenProvidersType providers = this.delegate.getTokenProviders(); @@ -98,8 +93,16 @@ WSTrustServiceFactory serviceFactory = WSTrustServiceFactory.getInstance(); for (TokenProviderType provider : providers.getTokenProvider()) { - this.tokenProviders.put(provider.getTokenType(), serviceFactory.createTokenProvider(provider - .getProviderClass())); + // create and initialize the token provider. + SecurityTokenProvider tokenProvider = serviceFactory.createTokenProvider(provider.getProviderClass()); + Map<String, String> properties = new HashMap<String, String>(); + for(PropertyType propertyType : provider.getProperty()) + properties.put(propertyType.getName(), propertyType.getValue()); + tokenProvider.initialize(properties); + // token providers can be keyed by the token type and by token element + namespace. + this.tokenProviders.put(provider.getTokenType(), tokenProvider); + String tokenElementAndNS = provider.getTokenElement() + "$" + provider.getTokenElementNS(); + this.tokenProviders.put(tokenElementAndNS, tokenProvider); } } ServiceProvidersType serviceProviders = this.delegate.getServiceProviders(); @@ -129,7 +132,7 @@ /* * (non-Javadoc) * - * @see org.jboss.identity.federation.api.wstrust.STSConfiguration#getSTSName() + * @see org.jboss.identity.federation.core.wstrust.STSConfiguration#getSTSName() */ public String getSTSName() { @@ -139,7 +142,7 @@ /* * (non-Javadoc) * - * @see org.jboss.identity.federation.api.wstrust.STSConfiguration#getEncryptIssuedToken() + * @see org.jboss.identity.federation.core.wstrust.STSConfiguration#getEncryptIssuedToken() */ public boolean encryptIssuedToken() { @@ -149,18 +152,17 @@ /* * (non-Javadoc) * - * @see org.jboss.identity.federation.api.wstrust.STSConfiguration#signIssuedToken() + * @see org.jboss.identity.federation.core.wstrust.STSConfiguration#signIssuedToken() */ public boolean signIssuedToken() { - //TODO: add the sign-by-default property to the configuration schema. - return true; + return this.delegate.isSignToken(); } - + /* * (non-Javadoc) * - * @see org.jboss.identity.federation.api.wstrust.STSConfiguration#getIssuedTokenTimeout() + * @see org.jboss.identity.federation.core.wstrust.STSConfiguration#getIssuedTokenTimeout() */ public long getIssuedTokenTimeout() { @@ -171,31 +173,21 @@ /* * (non-Javadoc) * - * @see org.jboss.identity.federation.api.wstrust.STSConfiguration#getRequestHandlerClass() + * @see org.jboss.identity.federation.core.wstrust.STSConfiguration#getRequestHandlerClass() */ public WSTrustRequestHandler getRequestHandler() { if (this.handler == null) - this.handler = WSTrustServiceFactory.getInstance().createRequestHandler( - this.delegate.getRequestHandler(), this); + this.handler = WSTrustServiceFactory.getInstance().createRequestHandler(this.delegate.getRequestHandler(), + this); return this.handler; } /* * (non-Javadoc) * - * @see org.jboss.identity.federation.api.wstrust.STSConfiguration#getOptions() + * @see org.jboss.identity.federation.core.wstrust.STSConfiguration#getProviderForService(java.lang.String) */ - public Map<String, Object> getOptions() - { - return this.options; - } - - /* - * (non-Javadoc) - * - * @see org.jboss.identity.federation.api.wstrust.STSConfiguration#getProviderForService(java.lang.String) - */ public SecurityTokenProvider getProviderForService(String serviceName) { ServiceProviderType provider = this.spMetadata.get(serviceName); @@ -209,7 +201,7 @@ /* * (non-Javadoc) * - * @see org.jboss.identity.federation.api.wstrust.STSConfiguration#getProviderForTokenType(java.lang.String) + * @see org.jboss.identity.federation.core.wstrust.STSConfiguration#getProviderForTokenType(java.lang.String) */ public SecurityTokenProvider getProviderForTokenType(String tokenType) { @@ -219,8 +211,18 @@ /* * (non-Javadoc) * - * @see org.jboss.identity.federation.api.wstrust.STSConfiguration#getTokenTypeForService(java.lang.String) + * @see org.jboss.identity.federation.core.wstrust.STSConfiguration#getProviderForTokenElementNS(java.lang.String, java.lang.String) */ + public SecurityTokenProvider getProviderForTokenElementNS(String tokenLocalName, String tokenNamespace) + { + return this.tokenProviders.get(tokenLocalName + "$" + tokenNamespace); + } + + /* + * (non-Javadoc) + * + * @see org.jboss.identity.federation.core.wstrust.STSConfiguration#getTokenTypeForService(java.lang.String) + */ public String getTokenTypeForService(String serviceName) { ServiceProviderType provider = this.spMetadata.get(serviceName); @@ -231,7 +233,7 @@ /* * (non-Javadoc) - * @see org.jboss.identity.federation.api.wstrust.STSConfiguration#getServiceProviderPublicKey(java.lang.String) + * @see org.jboss.identity.federation.core.wstrust.STSConfiguration#getServiceProviderPublicKey(java.lang.String) */ public PublicKey getServiceProviderPublicKey(String serviceName) { @@ -252,7 +254,7 @@ /* * (non-Javadoc) - * @see org.jboss.identity.federation.api.wstrust.STSConfiguration#getSTSKeyPair() + * @see org.jboss.identity.federation.core.wstrust.STSConfiguration#getSTSKeyPair() */ public KeyPair getSTSKeyPair() { Modified: identity-federation/trunk/jboss-identity-bindings/src/test/java/org/jboss/test/identity/federation/bindings/config/ConfigUnitTestCase.java =================================================================== --- identity-federation/trunk/jboss-identity-bindings/src/test/java/org/jboss/test/identity/federation/bindings/config/ConfigUnitTestCase.java 2009-09-03 01:56:21 UTC (rev 758) +++ identity-federation/trunk/jboss-identity-bindings/src/test/java/org/jboss/test/identity/federation/bindings/config/ConfigUnitTestCase.java 2009-09-03 18:17:00 UTC (rev 759) @@ -33,6 +33,7 @@ import org.jboss.identity.federation.core.config.IDPType; import org.jboss.identity.federation.core.config.KeyProviderType; import org.jboss.identity.federation.core.config.KeyValueType; +import org.jboss.identity.federation.core.config.PropertyType; import org.jboss.identity.federation.core.config.SPType; import org.jboss.identity.federation.core.config.STSType; import org.jboss.identity.federation.core.config.ServiceProviderType; @@ -155,6 +156,10 @@ assertNotNull("Unexpected null token provider", tokenProvider); assertEquals("Unexpected provider class name", "org.jboss.SpecialTokenProvider", tokenProvider.getProviderClass()); assertEquals("Unexpected token type", "specialToken", tokenProvider.getTokenType()); + assertEquals("Unexpected token element name", "SpecialToken", tokenProvider.getTokenElement()); + assertEquals("Unexpected token namespace", "http://www.tokens.org", tokenProvider.getTokenElementNS()); + List<PropertyType> properties = tokenProvider.getProperty(); + assertEquals("Invalid number of properties", 2, properties.size()); // configuration of the service providers. ServiceProvidersType serviceProviders = stsType.getServiceProviders(); assertNotNull("Unexpected null list of service providers", serviceProviders); Modified: identity-federation/trunk/jboss-identity-bindings/src/test/java/org/jboss/test/identity/federation/bindings/wstrust/JBossSTSUnitTestCase.java =================================================================== --- identity-federation/trunk/jboss-identity-bindings/src/test/java/org/jboss/test/identity/federation/bindings/wstrust/JBossSTSUnitTestCase.java 2009-09-03 01:56:21 UTC (rev 758) +++ identity-federation/trunk/jboss-identity-bindings/src/test/java/org/jboss/test/identity/federation/bindings/wstrust/JBossSTSUnitTestCase.java 2009-09-03 18:17:00 UTC (rev 759) @@ -24,6 +24,7 @@ import java.net.URI; import java.security.Principal; import java.util.List; +import java.util.Map; import javax.xml.bind.JAXBContext; import javax.xml.bind.JAXBElement; @@ -116,11 +117,11 @@ * &lt;ValidatingAlias Key=&quot;http://services.testcorp.org/provider1&quot; Value=&quot;service1&quot;/&gt; * &lt;ValidatingAlias Key=&quot;http://services.testcorp.org/provider2&quot; Value=&quot;service2&quot;/&gt; * &lt;/KeyProvider&gt; - * &lt;RequestHandler&gt;org.jboss.identity.federation.api.wstrust.StandardRequestHandler&lt;/RequestHandler&gt; + * &lt;RequestHandler&gt;org.jboss.identity.federation.core.wstrust.StandardRequestHandler&lt;/RequestHandler&gt; * &lt;TokenProviders&gt; * &lt;TokenProvider ProviderClass=&quot;org.jboss.test.identity.federation.bindings.trust.SpecialTokenProvider&quot; * TokenType=&quot;http://www.tokens.org/SpecialToken&quot;/&gt; - * &lt;TokenProvider ProviderClass=&quot;org.jboss.identity.federation.api.wstrust.SAML20TokenProvider&quot; + * &lt;TokenProvider ProviderClass=&quot;org.jboss.identity.federation.core.wstrust.SAML20TokenProvider&quot; * TokenType=&quot;http://docs.oasis-open.org/wss/oasis-wss-saml-token-p... * &lt;/TokenProviders&gt; * &lt;ServiceProviders&gt; @@ -154,18 +155,16 @@ SecurityTokenProvider provider = config.getProviderForTokenType("http://www.tokens.org/SpecialToken&q...; assertNotNull("Unexpected null token provider", provider); assertTrue("Unexpected token provider type", provider instanceof SpecialTokenProvider); + Map<String, String> properties = ((SpecialTokenProvider) provider).getProperties(); + assertNotNull("Unexpected null properties map", properties); + assertEquals("Unexpected number of properties", 2, properties.size()); + assertEquals("Invalid property found", "Value1", properties.get("Property1")); + assertEquals("Invalid property found", "Value2", properties.get("Property2")); provider = config.getProviderForTokenType(SAMLUtil.SAML2_TOKEN_TYPE); assertNotNull("Unexpected null token provider", provider); assertTrue("Unexpected token provider type", provider instanceof SAML20TokenProvider); assertNull(config.getProviderForTokenType("unexistentType")); - // check the service provider -> token type mapping. - assertEquals("Invalid token type for service provider 1", "http://www.tokens.org/SpecialToken", config - .getTokenTypeForService("http://services.testcorp.org/provider1")); - assertEquals("Invalid token type for service provider 2", SAMLUtil.SAML2_TOKEN_TYPE, config - .getTokenTypeForService("http://services.testcorp.org/provider2")); - assertNull(config.getTokenTypeForService("http://invalid.service/service")); - // check the service provider -> token provider mapping. provider = config.getProviderForService("http://services.testcorp.org/provider1...; assertNotNull("Unexpected null token provider", provider); @@ -175,6 +174,22 @@ assertTrue("Unexpected token provider type", provider instanceof SAML20TokenProvider); assertNull(config.getProviderForService("http://invalid.service/service")); + // check the token element and namespace -> token provider mapping. + provider = config.getProviderForTokenElementNS("SpecialToken", "http://www.tokens.org"); + assertNotNull("Unexpected null token provider", provider); + assertTrue("Unexpected token provider type", provider instanceof SpecialTokenProvider); + provider = config.getProviderForTokenElementNS("Assertion", "urn:oasis:names:tc:SAML:2.0:assertion"); + assertNotNull("Unexpected null token provider", provider); + assertTrue("Unexpected token provider type", provider instanceof SAML20TokenProvider); + assertNull(config.getProviderForTokenElementNS("SpecialToken", "InvalidNamespace")); + + // check the service provider -> token type mapping. + assertEquals("Invalid token type for service provider 1", "http://www.tokens.org/SpecialToken", config + .getTokenTypeForService("http://services.testcorp.org/provider1")); + assertEquals("Invalid token type for service provider 2", SAMLUtil.SAML2_TOKEN_TYPE, config + .getTokenTypeForService("http://services.testcorp.org/provider2")); + assertNull(config.getTokenTypeForService("http://invalid.service/service")); + // check the keystore configuration. assertNotNull("Invalid null STS key pair", config.getSTSKeyPair()); assertNotNull("Invalid null STS public key", config.getSTSKeyPair().getPublic()); Modified: identity-federation/trunk/jboss-identity-bindings/src/test/java/org/jboss/test/identity/federation/bindings/wstrust/SpecialTokenProvider.java =================================================================== --- identity-federation/trunk/jboss-identity-bindings/src/test/java/org/jboss/test/identity/federation/bindings/wstrust/SpecialTokenProvider.java 2009-09-03 01:56:21 UTC (rev 758) +++ identity-federation/trunk/jboss-identity-bindings/src/test/java/org/jboss/test/identity/federation/bindings/wstrust/SpecialTokenProvider.java 2009-09-03 18:17:00 UTC (rev 759) @@ -23,6 +23,7 @@ import java.net.URI; import java.net.URISyntaxException; +import java.util.Map; import javax.xml.parsers.ParserConfigurationException; @@ -45,11 +46,23 @@ */ public class SpecialTokenProvider implements SecurityTokenProvider { + + private Map<String, String> properties; + + /* + * (non-Javadoc) + * + * @see org.jboss.identity.federation.core.wstrust.SecurityTokenProvider#initialize(java.util.Map) + */ + public void initialize(Map<String, String> properties) + { + this.properties = properties; + } /* * (non-Javadoc) * - * @see org.jboss.identity.federation.api.wstrust.SecurityTokenProvider#cancelToken(org.jboss.identity.federation.api.wstrust.WSTrustRequestContext) + * @see org.jboss.identity.federation.core.wstrust.SecurityTokenProvider#cancelToken(org.jboss.identity.federation.core.wstrust.WSTrustRequestContext) */ public void cancelToken(WSTrustRequestContext context) throws WSTrustException { @@ -58,27 +71,27 @@ /* * (non-Javadoc) * - * @see org.jboss.identity.federation.api.wstrust.SecurityTokenProvider#issueToken(org.jboss.identity.federation.api.wstrust.WSTrustRequestContext) + * @see org.jboss.identity.federation.core.wstrust.SecurityTokenProvider#issueToken(org.jboss.identity.federation.core.wstrust.WSTrustRequestContext) */ public void issueToken(WSTrustRequestContext context) throws WSTrustException { // create a simple sample token using the info from the request. - String caller = context.getCallerPrincipal() == null? "anonymous" : context.getCallerPrincipal().getName(); + String caller = context.getCallerPrincipal() == null ? "anonymous" : context.getCallerPrincipal().getName(); URI tokenType = context.getRequestSecurityToken().getTokenType(); - if(tokenType == null) + if (tokenType == null) { try { tokenType = new URI("http://www.tokens.org/SpecialToken"); } catch (URISyntaxException ignore) - { + { } } - + // we will use DOM to create the token. try - { + { Document doc = DocumentUtil.createDocument(); String namespaceURI = "http://www.tokens.org"; @@ -88,11 +101,11 @@ root.setAttributeNS(namespaceURI, "ID", id); root.setAttributeNS(namespaceURI, "TokenType", tokenType.toString()); doc.appendChild(root); - + SecurityToken token = new StandardSecurityToken(tokenType.toString(), root, id); context.setSecurityToken(token); } - catch(ParserConfigurationException pce) + catch (ParserConfigurationException pce) { pce.printStackTrace(); } @@ -101,7 +114,7 @@ /* * (non-Javadoc) * - * @see org.jboss.identity.federation.api.wstrust.SecurityTokenProvider#renewToken(org.jboss.identity.federation.api.wstrust.WSTrustRequestContext) + * @see org.jboss.identity.federation.core.wstrust.SecurityTokenProvider#renewToken(org.jboss.identity.federation.core.wstrust.WSTrustRequestContext) */ public void renewToken(WSTrustRequestContext context) throws WSTrustException { @@ -110,9 +123,21 @@ /* * (non-Javadoc) * - * @see org.jboss.identity.federation.api.wstrust.SecurityTokenProvider#validateToken(org.jboss.identity.federation.api.wstrust.WSTrustRequestContext) + * @see org.jboss.identity.federation.core.wstrust.SecurityTokenProvider#validateToken(org.jboss.identity.federation.core.wstrust.WSTrustRequestContext) */ public void validateToken(WSTrustRequestContext context) throws WSTrustException { } + + /** + * <p> + * Just returns a reference to the properties that have been configured for testing purposes. + * </p> + * + * @return a reference to the properties map. + */ + public Map<String, String> getProperties() + { + return this.properties; + } } Modified: identity-federation/trunk/jboss-identity-bindings/src/test/resources/config/test-config-4.xml =================================================================== --- identity-federation/trunk/jboss-identity-bindings/src/test/resources/config/test-config-4.xml 2009-09-03 01:56:21 UTC (rev 758) +++ identity-federation/trunk/jboss-identity-bindings/src/test/resources/config/test-config-4.xml 2009-09-03 18:17:00 UTC (rev 759) @@ -7,7 +7,11 @@ </KeyProvider> <RequestHandler>org.jboss.identity.federation.wstrust.Handler</RequestHandler> <TokenProviders> - <TokenProvider ProviderClass="org.jboss.SpecialTokenProvider" TokenType="specialToken"/> + <TokenProvider ProviderClass="org.jboss.SpecialTokenProvider" TokenType="specialToken" + TokenElement="SpecialToken" TokenElementNS="http://www.tokens.org"> + <Property Name="Property1" Value="Value1"/> + <Property Name="Property2" Value="Value2"/> + </TokenProvider> </TokenProviders> <ServiceProviders> <ServiceProvider Endpoint="http://provider.endpoint/provider" TokenType="specialToken" Modified: identity-federation/trunk/jboss-identity-bindings/src/test/resources/jboss-sts.xml =================================================================== --- identity-federation/trunk/jboss-identity-bindings/src/test/resources/jboss-sts.xml 2009-09-03 01:56:21 UTC (rev 758) +++ identity-federation/trunk/jboss-identity-bindings/src/test/resources/jboss-sts.xml 2009-09-03 18:17:00 UTC (rev 759) @@ -11,9 +11,16 @@ <RequestHandler>org.jboss.identity.federation.core.wstrust.StandardRequestHandler</RequestHandler> <TokenProviders> <TokenProvider ProviderClass="org.jboss.test.identity.federation.bindings.wstrust.SpecialTokenProvider" - TokenType="http://www.tokens.org/SpecialToken"/> + TokenType="http://www.tokens.org/SpecialToken" + TokenElement="SpecialToken" + TokenElementNS="http://www.tokens.org"> + <Property Name="Property1" Value="Value1"/> + <Property Name="Property2" Value="Value2"/> + </TokenProvider> <TokenProvider ProviderClass="org.jboss.identity.federation.core.wstrust.plugins.saml.SAML20TokenProvider" - TokenType="http://docs.oasis-open.org/wss/oasis-wss-saml-token-profi... + TokenType="http://docs.oasis-open.org/wss/oasis-wss-saml-token-profi... + TokenElement="Assertion" + TokenElementNS="urn:oasis:names:tc:SAML:2.0:assertion"/> </TokenProviders> <ServiceProviders> <ServiceProvider Endpoint="http://services.testcorp.org/provider1" TokenType="http://www.tokens.org/SpecialToken" Property changes on: identity-federation/trunk/jboss-identity-fed-api ___________________________________________________________________ Name: svn:ignore - .metadata target .settings target-eclipse eclipse-target .classpath .project + test.log .classpath .project .settings target Modified: identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/config/AuthPropertyType.java =================================================================== --- identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/config/AuthPropertyType.java 2009-09-03 01:56:21 UTC (rev 758) +++ identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/config/AuthPropertyType.java 2009-09-03 18:17:00 UTC (rev 759) @@ -1,8 +1,8 @@ // -// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.1-661 +// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.10 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/... // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2009.04.21 at 04:51:39 PM CDT +// Generated on: 2009.09.03 at 01:21:42 PM BRT // Added: identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/config/ClaimProviderType.java =================================================================== --- identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/config/ClaimProviderType.java (rev 0) +++ identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/config/ClaimProviderType.java 2009-09-03 18:17:00 UTC (rev 759) @@ -0,0 +1,131 @@ +// +// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.10 +// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/... +// Any modifications to this file will be lost upon recompilation of the source schema. +// Generated on: 2009.09.03 at 01:21:42 PM BRT +// + + +package org.jboss.identity.federation.core.config; + +import java.util.ArrayList; +import java.util.List; +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlAttribute; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlType; + + +/** + * <p>Java class for ClaimProviderType complex type. + * + * <p>The following schema fragment specifies the expected content contained within this class. + * + * <pre> + * &lt;complexType name="ClaimProviderType"> + * &lt;complexContent> + * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> + * &lt;sequence> + * &lt;element name="Property" type="{urn:jboss:identity-federation:config:1.0}PropertyType" maxOccurs="unbounded" minOccurs="0"/> + * &lt;/sequence> + * &lt;attribute name="ProviderClass" use="required" type="{http://www.w3.org/2001/XMLSchema}string" /> + * &lt;attribute name="Dialect" use="required" type="{http://www.w3.org/2001/XMLSchema}string" /> + * &lt;/restriction> + * &lt;/complexContent> + * &lt;/complexType> + * </pre> + * + * + */ +(a)XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "ClaimProviderType", propOrder = { + "property" +}) +public class ClaimProviderType { + + @XmlElement(name = "Property") + protected List<PropertyType> property; + @XmlAttribute(name = "ProviderClass", required = true) + protected String providerClass; + @XmlAttribute(name = "Dialect", required = true) + protected String dialect; + + /** + * Gets the value of the property property. + * + * <p> + * This accessor method returns a reference to the live list, + * not a snapshot. Therefore any modification you make to the + * returned list will be present inside the JAXB object. + * This is why there is not a <CODE>set</CODE> method for the property property. + * + * <p> + * For example, to add a new item, do as follows: + * <pre> + * getProperty().add(newItem); + * </pre> + * + * + * <p> + * Objects of the following type(s) are allowed in the list + * {@link PropertyType } + * + * + */ + public List<PropertyType> getProperty() { + if (property == null) { + property = new ArrayList<PropertyType>(); + } + return this.property; + } + + /** + * Gets the value of the providerClass property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getProviderClass() { + return providerClass; + } + + /** + * Sets the value of the providerClass property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setProviderClass(String value) { + this.providerClass = value; + } + + /** + * Gets the value of the dialect property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getDialect() { + return dialect; + } + + /** + * Sets the value of the dialect property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setDialect(String value) { + this.dialect = value; + } + +} Added: identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/config/ClaimProvidersType.java =================================================================== --- identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/config/ClaimProvidersType.java (rev 0) +++ identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/config/ClaimProvidersType.java 2009-09-03 18:17:00 UTC (rev 759) @@ -0,0 +1,80 @@ +// +// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.10 +// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/... +// Any modifications to this file will be lost upon recompilation of the source schema. +// Generated on: 2009.09.03 at 01:21:42 PM BRT +// + + +package org.jboss.identity.federation.core.config; + +import java.util.ArrayList; +import java.util.List; +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlType; + + +/** + * + * The claim providers specify the classes that are capable of handling specific claims dialects. + * + * + * <p>Java class for ClaimProvidersType complex type. + * + * <p>The following schema fragment specifies the expected content contained within this class. + * + * <pre> + * &lt;complexType name="ClaimProvidersType"> + * &lt;complexContent> + * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> + * &lt;sequence> + * &lt;element name="ClaimProvider" type="{urn:jboss:identity-federation:config:1.0}ClaimProviderType" maxOccurs="unbounded"/> + * &lt;/sequence> + * &lt;/restriction> + * &lt;/complexContent> + * &lt;/complexType> + * </pre> + * + * + */ +(a)XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "ClaimProvidersType", propOrder = { + "claimProvider" +}) +public class ClaimProvidersType { + + @XmlElement(name = "ClaimProvider", required = true) + protected List<ClaimProviderType> claimProvider; + + /** + * Gets the value of the claimProvider property. + * + * <p> + * This accessor method returns a reference to the live list, + * not a snapshot. Therefore any modification you make to the + * returned list will be present inside the JAXB object. + * This is why there is not a <CODE>set</CODE> method for the claimProvider property. + * + * <p> + * For example, to add a new item, do as follows: + * <pre> + * getClaimProvider().add(newItem); + * </pre> + * + * + * <p> + * Objects of the following type(s) are allowed in the list + * {@link ClaimProviderType } + * + * + */ + public List<ClaimProviderType> getClaimProvider() { + if (claimProvider == null) { + claimProvider = new ArrayList<ClaimProviderType>(); + } + return this.claimProvider; + } + +} Modified: identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/config/EncAlgoType.java =================================================================== --- identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/config/EncAlgoType.java 2009-09-03 01:56:21 UTC (rev 758) +++ identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/config/EncAlgoType.java 2009-09-03 18:17:00 UTC (rev 759) @@ -1,8 +1,8 @@ // -// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.1-661 +// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.10 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/... // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2009.04.21 at 04:51:39 PM CDT +// Generated on: 2009.09.03 at 01:21:42 PM BRT // Modified: identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/config/EncryptionType.java =================================================================== --- identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/config/EncryptionType.java 2009-09-03 01:56:21 UTC (rev 758) +++ identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/config/EncryptionType.java 2009-09-03 18:17:00 UTC (rev 759) @@ -1,8 +1,8 @@ // -// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.1-661 +// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.10 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/... // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2009.04.21 at 04:51:39 PM CDT +// Generated on: 2009.09.03 at 01:21:42 PM BRT // Modified: identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/config/IDPType.java =================================================================== --- identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/config/IDPType.java 2009-09-03 01:56:21 UTC (rev 758) +++ identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/config/IDPType.java 2009-09-03 18:17:00 UTC (rev 759) @@ -1,8 +1,8 @@ // -// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.1-661 +// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.10 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/... // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2009.04.21 at 04:51:39 PM CDT +// Generated on: 2009.09.03 at 01:21:42 PM BRT // Modified: identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/config/KeyProviderType.java =================================================================== --- identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/config/KeyProviderType.java 2009-09-03 01:56:21 UTC (rev 758) +++ identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/config/KeyProviderType.java 2009-09-03 18:17:00 UTC (rev 759) @@ -1,8 +1,8 @@ // -// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.1-661 +// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.10 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/... // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2009.04.21 at 04:51:39 PM CDT +// Generated on: 2009.09.03 at 01:21:42 PM BRT // @@ -10,7 +10,6 @@ import java.util.ArrayList; import java.util.List; - import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlAttribute; Modified: identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/config/KeyValueType.java =================================================================== --- identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/config/KeyValueType.java 2009-09-03 01:56:21 UTC (rev 758) +++ identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/config/KeyValueType.java 2009-09-03 18:17:00 UTC (rev 759) @@ -1,8 +1,8 @@ // -// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.1-661 +// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.10 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/... // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2009.04.21 at 04:51:39 PM CDT +// Generated on: 2009.09.03 at 01:21:42 PM BRT // Modified: identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/config/MetadataProviderType.java =================================================================== --- identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/config/MetadataProviderType.java 2009-09-03 01:56:21 UTC (rev 758) +++ identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/config/MetadataProviderType.java 2009-09-03 18:17:00 UTC (rev 759) @@ -1,8 +1,8 @@ // -// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.1-661 +// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.10 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/... // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2009.04.22 at 01:16:08 PM CDT +// Generated on: 2009.09.03 at 01:21:42 PM BRT // @@ -10,7 +10,6 @@ import java.util.ArrayList; import java.util.List; - import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlAttribute; Modified: identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/config/ObjectFactory.java =================================================================== --- identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/config/ObjectFactory.java 2009-09-03 01:56:21 UTC (rev 758) +++ identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/config/ObjectFactory.java 2009-09-03 18:17:00 UTC (rev 759) @@ -1,8 +1,8 @@ // -// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.1-661 +// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.10 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/... // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2009.04.21 at 04:51:39 PM CDT +// Generated on: 2009.09.03 at 01:21:42 PM BRT // @@ -31,8 +31,8 @@ @XmlRegistry public class ObjectFactory { + private final static QName _JBossIDP_QNAME = new QName("urn:jboss:identity-federation:config:1.0", "JBossIDP"); private final static QName _JBossSTS_QNAME = new QName("urn:jboss:identity-federation:config:1.0", "JBossSTS"); - private final static QName _JBossIDP_QNAME = new QName("urn:jboss:identity-federation:config:1.0", "JBossIDP"); private final static QName _JBossSP_QNAME = new QName("urn:jboss:identity-federation:config:1.0", "JBossSP"); /** @@ -43,127 +43,142 @@ } /** - * Create an instance of {@link STSType } + * Create an instance of {@link KeyProviderType } * */ - public STSType createSTSType() { - return new STSType(); + public KeyProviderType createKeyProviderType() { + return new KeyProviderType(); } /** - * Create an instance of {@link KeyValueType } + * Create an instance of {@link TokenProviderType } * */ - public KeyValueType createKeyValueType() { - return new KeyValueType(); + public TokenProviderType createTokenProviderType() { + return new TokenProviderType(); } /** - * Create an instance of {@link ServiceProviderType } + * Create an instance of {@link SPType } * */ - public ServiceProviderType createServiceProviderType() { - return new ServiceProviderType(); + public SPType createSPType() { + return new SPType(); } /** - * Create an instance of {@link KeyProviderType } + * Create an instance of {@link ServiceProvidersType } * */ - public KeyProviderType createKeyProviderType() { - return new KeyProviderType(); + public ServiceProvidersType createServiceProvidersType() { + return new ServiceProvidersType(); } /** - * Create an instance of {@link TokenProvidersType } + * Create an instance of {@link AuthPropertyType } * */ - public TokenProvidersType createTokenProvidersType() { - return new TokenProvidersType(); + public AuthPropertyType createAuthPropertyType() { + return new AuthPropertyType(); } /** - * Create an instance of {@link TokenProviderType } + * Create an instance of {@link ClaimProvidersType } * */ - public TokenProviderType createTokenProviderType() { - return new TokenProviderType(); + public ClaimProvidersType createClaimProvidersType() { + return new ClaimProvidersType(); } /** - * Create an instance of {@link IDPType } + * Create an instance of {@link ClaimProviderType } * */ - public IDPType createIDPType() { - return new IDPType(); + public ClaimProviderType createClaimProviderType() { + return new ClaimProviderType(); } /** - * Create an instance of {@link ServiceProvidersType } + * Create an instance of {@link STSType } * */ - public ServiceProvidersType createServiceProvidersType() { - return new ServiceProvidersType(); + public STSType createSTSType() { + return new STSType(); } /** - * Create an instance of {@link MetadataProviderType } + * Create an instance of {@link PropertyType } * */ - public MetadataProviderType createMetadataProviderType() { - return new MetadataProviderType(); + public PropertyType createPropertyType() { + return new PropertyType(); } /** - * Create an instance of {@link ProviderType } + * Create an instance of {@link EncryptionType } * */ - public ProviderType createProviderType() { - return new ProviderType(); + public EncryptionType createEncryptionType() { + return new EncryptionType(); } /** - * Create an instance of {@link AuthPropertyType } + * Create an instance of {@link TrustType } * */ - public AuthPropertyType createAuthPropertyType() { - return new AuthPropertyType(); + public TrustType createTrustType() { + return new TrustType(); } /** - * Create an instance of {@link TrustType } + * Create an instance of {@link MetadataProviderType } * */ - public TrustType createTrustType() { - return new TrustType(); + public MetadataProviderType createMetadataProviderType() { + return new MetadataProviderType(); } /** - * Create an instance of {@link SPType } + * Create an instance of {@link KeyValueType } * */ - public SPType createSPType() { - return new SPType(); + public KeyValueType createKeyValueType() { + return new KeyValueType(); } /** - * Create an instance of {@link EncryptionType } + * Create an instance of {@link IDPType } * */ - public EncryptionType createEncryptionType() { - return new EncryptionType(); + public IDPType createIDPType() { + return new IDPType(); } /** - * Create an instance of {@link JAXBElement }{@code <}{@link STSType }{@code >}} + * Create an instance of {@link ProviderType } * */ - @XmlElementDecl(namespace = "urn:jboss:identity-federation:config:1.0", name = "JBossSTS") - public JAXBElement<STSType> createJBossSTS(STSType value) { - return new JAXBElement<STSType>(_JBossSTS_QNAME, STSType.class, null, value); + public ProviderType createProviderType() { + return new ProviderType(); } /** + * Create an instance of {@link ServiceProviderType } + * + */ + public ServiceProviderType createServiceProviderType() { + return new ServiceProviderType(); + } + + /** + * Create an instance of {@link TokenProvidersType } + * + */ + public TokenProvidersType createTokenProvidersType() { + return new TokenProvidersType(); + } + + /** * Create an instance of {@link JAXBElement }{@code <}{@link IDPType }{@code >}} * */ @@ -173,6 +188,15 @@ } /** + * Create an instance of {@link JAXBElement }{@code <}{@link STSType }{@code >}} + * + */ + @XmlElementDecl(namespace = "urn:jboss:identity-federation:config:1.0", name = "JBossSTS") + public JAXBElement<STSType> createJBossSTS(STSType value) { + return new JAXBElement<STSType>(_JBossSTS_QNAME, STSType.class, null, value); + } + + /** * Create an instance of {@link JAXBElement }{@code <}{@link SPType }{@code >}} * */ Added: identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/config/PropertyType.java =================================================================== --- identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/config/PropertyType.java (rev 0) +++ identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/config/PropertyType.java 2009-09-03 18:17:00 UTC (rev 759) @@ -0,0 +1,92 @@ +// +// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.10 +// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/... +// Any modifications to this file will be lost upon recompilation of the source schema. +// Generated on: 2009.09.03 at 01:21:42 PM BRT +// + + +package org.jboss.identity.federation.core.config; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlAttribute; +import javax.xml.bind.annotation.XmlType; + + +/** + * <p>Java class for PropertyType complex type. + * + * <p>The following schema fragment specifies the expected content contained within this class. + * + * <pre> + * &lt;complexType name="PropertyType"> + * &lt;complexContent> + * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> + * &lt;attribute name="Name" use="required" type="{http://www.w3.org/2001/XMLSchema}string" /> + * &lt;attribute name="Value" use="required" type="{http://www.w3.org/2001/XMLSchema}string" /> + * &lt;/restriction> + * &lt;/complexContent> + * &lt;/complexType> + * </pre> + * + * + */ +(a)XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "PropertyType") +public class PropertyType { + + @XmlAttribute(name = "Name", required = true) + protected String name; + @XmlAttribute(name = "Value", required = true) + protected String value; + + /** + * Gets the value of the name property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getName() { + return name; + } + + /** + * Sets the value of the name property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setName(String value) { + this.name = value; + } + + /** + * Gets the value of the value property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getValue() { + return value; + } + + /** + * Sets the value of the value property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setValue(String value) { + this.value = value; + } + +} Modified: identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/config/ProviderType.java =================================================================== --- identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/config/ProviderType.java 2009-09-03 01:56:21 UTC (rev 758) +++ identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/config/ProviderType.java 2009-09-03 18:17:00 UTC (rev 759) @@ -1,8 +1,8 @@ // -// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.1-661 +// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.10 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/... // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2009.04.21 at 04:51:39 PM CDT +// Generated on: 2009.09.03 at 01:21:42 PM BRT // @@ -56,8 +56,8 @@ "metaDataProvider" }) @XmlSeeAlso({ - IDPType.class, - SPType.class + SPType.class, + IDPType.class }) public class ProviderType { Modified: identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/config/SPType.java =================================================================== --- identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/config/SPType.java 2009-09-03 01:56:21 UTC (rev 758) +++ identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/config/SPType.java 2009-09-03 18:17:00 UTC (rev 759) @@ -1,8 +1,8 @@ // -// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.1-661 +// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.10 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/... // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2009.04.21 at 04:51:39 PM CDT +// Generated on: 2009.09.03 at 01:21:42 PM BRT // Modified: identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/config/STSType.java =================================================================== --- identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/config/STSType.java 2009-09-03 01:56:21 UTC (rev 758) +++ identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/config/STSType.java 2009-09-03 18:17:00 UTC (rev 759) @@ -1,8 +1,8 @@ // -// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.1-661 +// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.10 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/... // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2009.04.21 at 04:51:39 PM CDT +// Generated on: 2009.09.03 at 01:21:42 PM BRT // @@ -27,11 +27,13 @@ * &lt;sequence> * &lt;element name="KeyProvider" type="{urn:jboss:identity-federation:config:1.0}KeyProviderType" minOccurs="0"/> * &lt;element name="RequestHandler" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/> + * &lt;element name="ClaimProviders" type="{urn:jboss:identity-federation:config:1.0}ClaimProvidersType" minOccurs="0"/> * &lt;element name="TokenProviders" type="{urn:jboss:identity-federation:config:1.0}TokenProvidersType" minOccurs="0"/> * &lt;element name="ServiceProviders" type="{urn:jboss:identity-federation:config:1.0}ServiceProvidersType" minOccurs="0"/> * &lt;/sequence> * &lt;attribute name="STSName" type="{http://www.w3.org/2001/XMLSchema}string" default="JBossSTS" /> * &lt;attribute name="TokenTimeout" type="{http://www.w3.org/2001/XMLSchema}int" default="3600" /> + * &lt;attribute name="SignToken" type="{http://www.w3.org/2001/XMLSchema}boolean" default="true" /> * &lt;attribute name="EncryptToken" type="{http://www.w3.org/2001/XMLSchema}boolean" default="false" /> * &lt;/restriction> * &lt;/complexContent> @@ -44,6 +46,7 @@ @XmlType(name = "STSType", propOrder = { "keyProvider", "requestHandler", + "claimProviders", "tokenProviders", "serviceProviders" }) @@ -53,6 +56,8 @@ protected KeyProviderType keyProvider; @XmlElement(name = "RequestHandler") protected String requestHandler; + @XmlElement(name = "ClaimProviders") + protected ClaimProvidersType claimProviders; @XmlElement(name = "TokenProviders") protected TokenProvidersType tokenProviders; @XmlElement(name = "ServiceProviders") @@ -61,6 +66,8 @@ protected String stsName; @XmlAttribute(name = "TokenTimeout") protected Integer tokenTimeout; + @XmlAttribute(name = "SignToken") + protected Boolean signToken; @XmlAttribute(name = "EncryptToken") protected Boolean encryptToken; @@ -113,6 +120,30 @@ } /** + * Gets the value of the claimProviders property. + * + * @return + * possible object is + * {@link ClaimProvidersType } + * + */ + public ClaimProvidersType getClaimProviders() { + return claimProviders; + } + + /** + * Sets the value of the claimProviders property. + * + * @param value + * allowed object is + * {@link ClaimProvidersType } + * + */ + public void setClaimProviders(ClaimProvidersType value) { + this.claimProviders = value; + } + + /** * Gets the value of the tokenProviders property. * * @return @@ -217,6 +248,34 @@ } /** + * Gets the value of the signToken property. + * + * @return + * possible object is + * {@link Boolean } + * + */ + public boolean isSignToken() { + if (signToken == null) { + return true; + } else { + return signToken; + } + } + + /** + * Sets the value of the signToken property. + * + * @param value + * allowed object is + * {@link Boolean } + * + */ + public void setSignToken(Boolean value) { + this.signToken = value; + } + + /** * Gets the value of the encryptToken property. * * @return Modified: identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/config/ServiceProviderType.java =================================================================== --- identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/config/ServiceProviderType.java 2009-09-03 01:56:21 UTC (rev 758) +++ identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/config/ServiceProviderType.java 2009-09-03 18:17:00 UTC (rev 759) @@ -1,8 +1,8 @@ // -// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.1-661 +// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.10 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/... // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2009.04.21 at 04:51:39 PM CDT +// Generated on: 2009.09.03 at 01:21:42 PM BRT // @@ -30,9 +30,9 @@ * &lt;complexType name="ServiceProviderType"> * &lt;complexContent> * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> - * &lt;attribute name="endpoint" use="required" type="{http://www.w3.org/2001/XMLSchema}string" /> - * &lt;attribute name="TruststoreAlias" use="required" type="{http://www.w3.org/2001/XMLSchema}string" /> + * &lt;attribute name="Endpoint" use="required" type="{http://www.w3.org/2001/XMLSchema}string" /> * &lt;attribute name="TokenType" use="required" type="{http://www.w3.org/2001/XMLSchema}string" /> + * &lt;attribute name="TruststoreAlias" type="{http://www.w3.org/2001/XMLSchema}string" /> * &lt;/restriction> * &lt;/complexContent> * &lt;/complexType> @@ -46,10 +46,10 @@ @XmlAttribute(name = "Endpoint", required = true) protected String endpoint; - @XmlAttribute(name = "TruststoreAlias", required = true) - protected String truststoreAlias; @XmlAttribute(name = "TokenType", required = true) protected String tokenType; + @XmlAttribute(name = "TruststoreAlias") + protected String truststoreAlias; /** * Gets the value of the endpoint property. @@ -76,51 +76,51 @@ } /** - * Gets the value of the truststoreAlias property. + * Gets the value of the tokenType property. * * @return * possible object is * {@link String } * */ - public String getTruststoreAlias() { - return truststoreAlias; + public String getTokenType() { + return tokenType; } /** - * Sets the value of the truststoreAlias property. + * Sets the value of the tokenType property. * * @param value * allowed object is * {@link String } * */ - public void setTruststoreAlias(String value) { - this.truststoreAlias = value; + public void setTokenType(String value) { + this.tokenType = value; } /** - * Gets the value of the tokenType property. + * Gets the value of the truststoreAlias property. * * @return * possible object is * {@link String } * */ - public String getTokenType() { - return tokenType; + public String getTruststoreAlias() { + return truststoreAlias; } /** - * Sets the value of the tokenType property. + * Sets the value of the truststoreAlias property. * * @param value * allowed object is * {@link String } * */ - public void setTokenType(String value) { - this.tokenType = value; + public void setTruststoreAlias(String value) { + this.truststoreAlias = value; } } Modified: identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/config/ServiceProvidersType.java =================================================================== --- identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/config/ServiceProvidersType.java 2009-09-03 01:56:21 UTC (rev 758) +++ identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/config/ServiceProvidersType.java 2009-09-03 18:17:00 UTC (rev 759) @@ -1,8 +1,8 @@ // -// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.1-661 +// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.10 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/... // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2009.04.21 at 04:51:39 PM CDT +// Generated on: 2009.09.03 at 01:21:42 PM BRT // @@ -10,7 +10,6 @@ import java.util.ArrayList; import java.util.List; - import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlElement; Modified: identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/config/TokenProviderType.java =================================================================== --- identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/config/TokenProviderType.java 2009-09-03 01:56:21 UTC (rev 758) +++ identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/config/TokenProviderType.java 2009-09-03 18:17:00 UTC (rev 759) @@ -1,16 +1,19 @@ // -// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.1-661 +// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.10 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/... // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2009.04.21 at 04:51:39 PM CDT +// Generated on: 2009.09.03 at 01:21:42 PM BRT // package org.jboss.identity.federation.core.config; +import java.util.ArrayList; +import java.util.List; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlAttribute; +import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlType; @@ -23,8 +26,13 @@ * &lt;complexType name="TokenProviderType"> * &lt;complexContent> * &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> + * &lt;sequence> + * &lt;element name="Property" type="{urn:jboss:identity-federation:config:1.0}PropertyType" maxOccurs="unbounded" minOccurs="0"/> + * &lt;/sequence> * &lt;attribute name="ProviderClass" use="required" type="{http://www.w3.org/2001/XMLSchema}string" /> * &lt;attribute name="TokenType" use="required" type="{http://www.w3.org/2001/XMLSchema}string" /> + * &lt;attribute name="TokenElement" use="required" type="{http://www.w3.org/2001/XMLSchema}string" /> + * &lt;attribute name="TokenElementNS" use="required" type="{http://www.w3.org/2001/XMLSchema}string" /> * &lt;/restriction> * &lt;/complexContent> * &lt;/complexType> @@ -33,15 +41,52 @@ * */ @XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "TokenProviderType") +@XmlType(name = "TokenProviderType", propOrder = { + "property" +}) public class TokenProviderType { + @XmlElement(name = "Property") + protected List<PropertyType> property; @XmlAttribute(name = "ProviderClass", required = true) protected String providerClass; @XmlAttribute(name = "TokenType", required = true) protected String tokenType; + @XmlAttribute(name = "TokenElement", required = true) + protected String tokenElement; + @XmlAttribute(name = "TokenElementNS", required = true) + protected String tokenElementNS; /** + * Gets the value of the property property. + * + * <p> + * This accessor method returns a reference to the live list, + * not a snapshot. Therefore any modification you make to the + * returned list will be present inside the JAXB object. + * This is why there is not a <CODE>set</CODE> method for the property property. + * + * <p> + * For example, to add a new item, do as follows: + * <pre> + * getProperty().add(newItem); + * </pre> + * + * + * <p> + * Objects of the following type(s) are allowed in the list + * {@link PropertyType } + * + * + */ + public List<PropertyType> getProperty() { + if (property == null) { + property = new ArrayList<PropertyType>(); + } + return this.property; + } + + /** * Gets the value of the providerClass property. * * @return @@ -89,4 +134,52 @@ this.tokenType = value; } + /** + * Gets the value of the tokenElement property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getTokenElement() { + return tokenElement; + } + + /** + * Sets the value of the tokenElement property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setTokenElement(String value) { + this.tokenElement = value; + } + + /** + * Gets the value of the tokenElementNS property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getTokenElementNS() { + return tokenElementNS; + } + + /** + * Sets the value of the tokenElementNS property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setTokenElementNS(String value) { + this.tokenElementNS = value; + } + } Modified: identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/config/TokenProvidersType.java =================================================================== --- identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/config/TokenProvidersType.java 2009-09-03 01:56:21 UTC (rev 758) +++ identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/config/TokenProvidersType.java 2009-09-03 18:17:00 UTC (rev 759) @@ -1,8 +1,8 @@ // -// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.1-661 +// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.10 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/... // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2009.04.21 at 04:51:39 PM CDT +// Generated on: 2009.09.03 at 01:21:42 PM BRT // @@ -10,7 +10,6 @@ import java.util.ArrayList; import java.util.List; - import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; import javax.xml.bind.annotation.XmlElement; Modified: identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/config/TrustType.java =================================================================== --- identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/config/TrustType.java 2009-09-03 01:56:21 UTC (rev 758) +++ identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/config/TrustType.java 2009-09-03 18:17:00 UTC (rev 759) @@ -1,8 +1,8 @@ // -// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.1-661 +// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.10 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/... // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2009.04.21 at 04:51:39 PM CDT +// Generated on: 2009.09.03 at 01:21:42 PM BRT // Modified: identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/config/package-info.java =================================================================== --- identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/config/package-info.java 2009-09-03 01:56:21 UTC (rev 758) +++ identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/config/package-info.java 2009-09-03 18:17:00 UTC (rev 759) @@ -1,8 +1,8 @@ // -// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.1-661 +// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.10 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/... // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2009.04.21 at 04:51:39 PM CDT +// Generated on: 2009.09.03 at 01:21:42 PM BRT // @javax.xml.bind.annotation.XmlSchema(namespace = "urn:jboss:identity-federation:config:1.0", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED) Modified: identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/wstrust/STSConfiguration.java =================================================================== --- identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/wstrust/STSConfiguration.java 2009-09-03 01:56:21 UTC (rev 758) +++ identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/wstrust/STSConfiguration.java 2009-09-03 18:17:00 UTC (rev 759) @@ -23,7 +23,6 @@ import java.security.KeyPair; import java.security.PublicKey; -import java.util.Map; /** * <p> @@ -61,7 +60,7 @@ * @return {@code true} if the issued token is to be signed; {@code false} otherwise. */ public boolean signIssuedToken(); - + /** * <p> * Obtains the timeout value (in milliseconds) for issued tokens. @@ -121,12 +120,18 @@ /** * <p> - * Obtains a {@code Map} that contains the non-standard configuration options. + * Obtains the token provider that can handle tokens that have the specified local name and namespace. When a + * validate, renew, or cancel request is made, the token type is not set in the WS-Trust request. In these cases + * the {@code SecurityTokenProvider} must be determined using the security token itself. * </p> * - * @return a {@code Map<String, Object>} containing the additional configuration options. + * @param tokenLocalName a {@code String} representing the token element name. (e.g. {@code Assertion}). + * @param tokenNamespace a {@code String} representing the token element namespace. (e.g. + * {@code urn:oasis:names:tc:SAML:2.0:assertion}). + * @return a reference to the {@code SecurityTokenProvider} that must be used to handle the request that contains + * only the security token. */ - public Map<String, Object> getOptions(); + public SecurityTokenProvider getProviderForTokenElementNS(String tokenLocalName, String tokenNamespace); /** * <p> Modified: identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/wstrust/SecurityTokenProvider.java =================================================================== --- identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/wstrust/SecurityTokenProvider.java 2009-09-03 01:56:21 UTC (rev 758) +++ identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/wstrust/SecurityTokenProvider.java 2009-09-03 18:17:00 UTC (rev 759) @@ -21,6 +21,7 @@ */ package org.jboss.identity.federation.core.wstrust; +import java.util.Map; /** * <p> @@ -33,6 +34,16 @@ { /** * <p> + * Initializes the {@code SecurityTokenProvider} using the specified properties map. + * </p> + * + * @param properties a {@code Map<String, String>} that contains the properties that have been configured for + * this {@code SecurityTokenProvider}. + */ + public void initialize(Map<String, String> properties); + + /** + * <p> * Generates a security token using the information contained in the specified request context and stores the * newly-created token in the context itself. * </p> Modified: identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/wstrust/StandardRequestHandler.java =================================================================== --- identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/wstrust/StandardRequestHandler.java 2009-09-03 01:56:21 UTC (rev 758) +++ identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/wstrust/StandardRequestHandler.java 2009-09-03 18:17:00 UTC (rev 759) @@ -54,16 +54,15 @@ public class StandardRequestHandler implements WSTrustRequestHandler { private static Logger log = Logger.getLogger(StandardRequestHandler.class); + private boolean trace = log.isTraceEnabled(); private STSConfiguration configuration; /* * (non-Javadoc) - * - * @see - * org.jboss.identity.federation.api.wstrust.WSTrustRequestHandler#initialize(org.jboss.identity.federation.api.wstrust - * .STSConfiguration) + * @see org.jboss.identity.federation.core.wstrust.WSTrustRequestHandler#initialize( + * org.jboss.identity.federation.core.wstrust.STSConfiguration) */ public void initialize(STSConfiguration configuration) { @@ -72,18 +71,16 @@ /* * (non-Javadoc) - * - * @see - * org.jboss.identity.federation.api.wstrust.WSTrustRequestHandler#issue(org.jboss.identity.federation.api.wstrust - * .protocol.RequestSecurityToken, java.security.Principal) + * @see org.jboss.identity.federation.core.wstrust.WSTrustRequestHandler#issue( + * org.jboss.identity.federation.core.wstrust.wrappers.RequestSecurityToken, java.security.Principal) */ public RequestSecurityTokenResponse issue(RequestSecurityToken request, Principal callerPrincipal) throws WSTrustException { Document rstDocument = request.getRSTDocument(); - if( rstDocument == null) + if (rstDocument == null) throw new IllegalArgumentException("Request does not contain the DOM Document"); - + SecurityTokenProvider provider = null; // first try to obtain the security token provider using the applies-to contents. @@ -95,8 +92,11 @@ if (serviceName != null) { provider = this.configuration.getProviderForService(serviceName); - request.setTokenType(URI.create(this.configuration.getTokenTypeForService(serviceName))); - providerPublicKey = this.configuration.getServiceProviderPublicKey(serviceName); + if (provider != null) + { + request.setTokenType(URI.create(this.configuration.getTokenTypeForService(serviceName))); + providerPublicKey = this.configuration.getServiceProviderPublicKey(serviceName); + } } } // if applies-to is not available or if no provider was found for the service, use the token type. @@ -185,18 +185,16 @@ /* * (non-Javadoc) - * - * @see - * org.jboss.identity.federation.api.wstrust.WSTrustRequestHandler#renew(org.jboss.identity.federation.api.wstrust - * .protocol.RequestSecurityToken, java.security.Principal) + * @see org.jboss.identity.federation.core.wstrust.WSTrustRequestHandler#renew( + * org.jboss.identity.federation.core.wstrust.wrappers.RequestSecurityToken, java.security.Principal) */ public RequestSecurityTokenResponse renew(RequestSecurityToken request, Principal callerPrincipal) throws WSTrustException { Document rstDocument = request.getRSTDocument(); - if( rstDocument == null) + if (rstDocument == null) throw new IllegalArgumentException("Request does not contain the DOM Document"); - + SecurityTokenProvider provider = null; // first try to obtain the security token provider using the applies-to contents. @@ -220,9 +218,9 @@ else if (appliesTo == null && request.getTokenType() == null) throw new WSTrustException("Either AppliesTo or TokenType must be present in a security token request"); - // TODO: get the provider using the token from the request. - provider = this.configuration.getProviderForTokenType(SAMLUtil.SAML2_TOKEN_TYPE); - + // TODO: get the provider using the token from the request. + provider = this.configuration.getProviderForTokenType(SAMLUtil.SAML2_TOKEN_TYPE); + if (provider != null) { // create the request context and delegate token generation to the provider. @@ -238,7 +236,6 @@ if (requestContext.getSecurityToken() == null) throw new WSTrustException("Token issued by provider " + provider.getClass().getName() + " is null"); - // construct the ws-trust security token response. RequestedSecurityTokenType requestedSecurityToken = new RequestedSecurityTokenType(); @@ -269,53 +266,47 @@ /* * (non-Javadoc) - * - * @see - * org.jboss.identity.federation.api.wstrust.WSTrustRequestHandler#validate(org.jboss.identity.federation.api.wstrust - * .protocol.RequestSecurityToken, java.security.Principal) + * @see org.jboss.identity.federation.core.wstrust.WSTrustRequestHandler#validate( + * org.jboss.identity.federation.core.wstrust.wrappers.RequestSecurityToken, java.security.Principal) */ public RequestSecurityTokenResponse validate(RequestSecurityToken request, Principal callerPrincipal) throws WSTrustException { Document rstDocument = request.getRSTDocument(); - if( rstDocument == null) + if (rstDocument == null) throw new IllegalArgumentException("Request does not contain the DOM Document"); - + if (request.getValidateTarget() == null) throw new WSTrustException("Unable to validate token: validate target is null"); - + if (request.getTokenType() == null) request.setTokenType(URI.create(WSTrustConstants.STATUS_TYPE)); - // TODO: get the provider using the token from the request. - SecurityTokenProvider provider = this.configuration.getProviderForTokenType(SAMLUtil.SAML2_TOKEN_TYPE); + Node securityToken = request.getValidateTargetElement().getFirstChild(); + SecurityTokenProvider provider = this.configuration.getProviderForTokenElementNS( + securityToken.getLocalName(), securityToken.getNamespaceURI()); WSTrustRequestContext context = new WSTrustRequestContext(request, callerPrincipal); StatusType status = null; - + // validate the security token digital signature. if (this.configuration.signIssuedToken() && this.configuration.getSTSKeyPair() != null) { KeyPair keyPair = this.configuration.getSTSKeyPair(); try { - //Element tokenElement = (Element) request.getValidateTarget().getAny(); - Element tokenElement = request.getValidateTargetElement(); - - Node securityToken = tokenElement.getFirstChild(); - - if(trace) + if (trace) { try { log.trace("Going to validate:" + DocumentUtil.getNodeAsString(securityToken)); } catch (Exception e) - { + { } } Document tokenDocument = DocumentUtil.createDocument(); - Node importedNode = tokenDocument.importNode(securityToken, true); + Node importedNode = tokenDocument.importNode(securityToken, true); tokenDocument.appendChild(importedNode); if (!XMLSignatureUtil.validate(tokenDocument, keyPair.getPublic())) { @@ -331,10 +322,10 @@ status.setReason("Validation failure: unable to verify digital signature: " + e.getMessage()); } } - // TODO: add logging statements alerting that signature validation was not perfomed. - + // TODO: add logging statements alerting that signature validation was not performed. + // if the signature is valid, then let the provider handle perform any additional validation checks. - if(status == null) + if (status == null) { provider.validateToken(context); status = context.getStatus(); @@ -352,29 +343,27 @@ /* * (non-Javadoc) - * - * @see - * org.jboss.identity.federation.api.wstrust.WSTrustRequestHandler#cancel(org.jboss.identity.federation.api.wstrust - * .protocol.RequestSecurityToken, java.security.Principal) + * @see org.jboss.identity.federation.core.wstrust.WSTrustRequestHandler#cancel( + * org.jboss.identity.federation.core.wstrust.wrappers.RequestSecurityToken, java.security.Principal) */ public RequestSecurityTokenResponse cancel(RequestSecurityToken request, Principal callerPrincipal) throws WSTrustException { Document rstDocument = request.getRSTDocument(); - if( rstDocument == null) + if (rstDocument == null) throw new IllegalArgumentException("Request does not contain the DOM Document"); - + // TODO: implement cancel logic. throw new UnsupportedOperationException(); } public Document postProcess(Document rstrDocument, RequestSecurityToken request) throws WSTrustException { - if(WSTrustConstants.ISSUE_REQUEST.equals(request.getRequestType().toString()) + if (WSTrustConstants.ISSUE_REQUEST.equals(request.getRequestType().toString()) || WSTrustConstants.RENEW_REQUEST.equals(request.getRequestType().toString())) { - rstrDocument = DocumentUtil.normalizeNamespaces(rstrDocument); - + rstrDocument = DocumentUtil.normalizeNamespaces(rstrDocument); + //Sign and encrypt if (this.configuration.signIssuedToken() && this.configuration.getSTSKeyPair() != null) { @@ -385,29 +374,32 @@ String signatureMethod = signatureURI != null ? signatureURI.toString() : SignatureMethod.RSA_SHA1; try { - Node rst = rstrDocument.getElementsByTagNameNS(WSTrustConstants.BASE_NAMESPACE, + Node rst = rstrDocument.getElementsByTagNameNS(WSTrustConstants.BASE_NAMESPACE, "RequestedSecurityToken").item(0); Element tokenElement = (Element) rst.getFirstChild(); - if(trace) + if (trace) { - log.trace("NamespaceURI of element to be signed:" +tokenElement.getNamespaceURI() ); + log.trace("NamespaceURI of element to be signed:" + tokenElement.getNamespaceURI()); } - /* XMLSignatureUtil.sign(tokenElement.getOwnerDocument(), keyPair, DigestMethod.SHA1, signatureMethod, - "#" + tokenElement.getAttribute("ID")); - */ - rstrDocument = XMLSignatureUtil.sign(rstrDocument, tokenElement, keyPair, - DigestMethod.SHA1, signatureMethod, "#" + tokenElement.getAttribute("ID")); - if(trace) + /* XMLSignatureUtil.sign(tokenElement.getOwnerDocument(), keyPair, DigestMethod.SHA1, signatureMethod, + "#" + tokenElement.getAttribute("ID")); + */ + rstrDocument = XMLSignatureUtil.sign(rstrDocument, tokenElement, keyPair, DigestMethod.SHA1, + signatureMethod, "#" + tokenElement.getAttribute("ID")); + if (trace) { try { log.trace("Signed Token:" + DocumentUtil.getNodeAsString(tokenElement)); - + Document tokenDocument = DocumentUtil.createDocument(); tokenDocument.appendChild(tokenDocument.importNode(tokenElement, true)); log.trace("valid=" + XMLSignatureUtil.validate(tokenDocument, keyPair.getPublic())); - - }catch(Exception ignore){} + + } + catch (Exception ignore) + { + } } } catch (Exception e) Modified: identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/wstrust/StandardSecurityToken.java =================================================================== --- identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/wstrust/StandardSecurityToken.java 2009-09-03 01:56:21 UTC (rev 758) +++ identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/wstrust/StandardSecurityToken.java 2009-09-03 18:17:00 UTC (rev 759) @@ -64,7 +64,7 @@ /* * (non-Javadoc) * - * @see org.jboss.identity.federation.api.wstrust.SecurityToken#getTokenType() + * @see org.jboss.identity.federation.core.wstrust.SecurityToken#getTokenType() */ public String getTokenType() { @@ -74,7 +74,7 @@ /* * (non-Javadoc) * - * @see org.jboss.identity.federation.api.wstrust.SecurityToken#getTokenValue() + * @see org.jboss.identity.federation.core.wstrust.SecurityToken#getTokenValue() */ public Object getTokenValue() { @@ -84,7 +84,7 @@ /* * (non-Javadoc) * - * @see org.jboss.identity.federation.api.wstrust.SecurityToken#getTokenID() + * @see org.jboss.identity.federation.core.wstrust.SecurityToken#getTokenID() */ public String getTokenID() { Modified: identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/wstrust/plugins/saml/SAML20TokenProvider.java =================================================================== --- identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/wstrust/plugins/saml/SAML20TokenProvider.java 2009-09-03 01:56:21 UTC (rev 758) +++ identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/wstrust/plugins/saml/SAML20TokenProvider.java 2009-09-03 18:17:00 UTC (rev 759) @@ -63,11 +63,23 @@ public class SAML20TokenProvider implements SecurityTokenProvider { + private Map<String, String> properties; + /* * (non-Javadoc) * - * @see org.jboss.identity.federation.api.wstrust.SecurityTokenProvider#cancelToken(org.jboss.identity.federation.api.wstrust.WSTrustRequestContext) + * @see org.jboss.identity.federation.core.wstrust.SecurityTokenProvider#initialize(java.util.Map) */ + public void initialize(Map<String, String> properties) + { + this.properties = properties; + } + + /* + * (non-Javadoc) + * + * @see org.jboss.identity.federation.core.wstrust.SecurityTokenProvider#cancelToken(org.jboss.identity.federation.core.wstrust.WSTrustRequestContext) + */ public void cancelToken(WSTrustRequestContext context) throws WSTrustException { // TODO: implement cancel logic. @@ -76,7 +88,7 @@ /* * (non-Javadoc) * - * @see org.jboss.identity.federation.api.wstrust.SecurityTokenProvider#issueToken(org.jboss.identity.federation.api.wstrust.WSTrustRequestContext) + * @see org.jboss.identity.federation.core.wstrust.SecurityTokenProvider#issueToken(org.jboss.identity.federation.core.wstrust.WSTrustRequestContext) */ public void issueToken(WSTrustRequestContext context) throws WSTrustException { @@ -89,7 +101,7 @@ /* * (non-Javadoc) * - * @see org.jboss.identity.federation.api.wstrust.SecurityTokenProvider#renewToken(org.jboss.identity.federation.api.wstrust.WSTrustRequestContext) + * @see org.jboss.identity.federation.core.wstrust.SecurityTokenProvider#renewToken(org.jboss.identity.federation.core.wstrust.WSTrustRequestContext) */ public void renewToken(WSTrustRequestContext context) throws WSTrustException { @@ -103,7 +115,7 @@ /* * (non-Javadoc) * - * @see org.jboss.identity.federation.api.wstrust.SecurityTokenProvider#validateToken(org.jboss.identity.federation.api.wstrust.WSTrustRequestContext) + * @see org.jboss.identity.federation.core.wstrust.SecurityTokenProvider#validateToken(org.jboss.identity.federation.core.wstrust.WSTrustRequestContext) */ @SuppressWarnings("unchecked") public void validateToken(WSTrustRequestContext context) throws WSTrustException Modified: identity-federation/trunk/jboss-identity-fed-core/src/test/java/org/jboss/test/identity/federation/core/wstrust/MockSTSConfiguration.java =================================================================== --- identity-federation/trunk/jboss-identity-fed-core/src/test/java/org/jboss/test/identity/federation/core/wstrust/MockSTSConfiguration.java 2009-09-03 01:56:21 UTC (rev 758) +++ identity-federation/trunk/jboss-identity-fed-core/src/test/java/org/jboss/test/identity/federation/core/wstrust/MockSTSConfiguration.java 2009-09-03 18:17:00 UTC (rev 759) @@ -23,7 +23,6 @@ import java.security.KeyPair; import java.security.PublicKey; -import java.util.Map; import org.jboss.identity.federation.core.wstrust.STSConfiguration; import org.jboss.identity.federation.core.wstrust.SecurityTokenProvider; @@ -43,7 +42,7 @@ /* * (non-Javadoc) * - * @see org.jboss.identity.federation.api.wstrust.STSConfiguration#getEncryptIssuedToken() + * @see org.jboss.identity.federation.core.wstrust.STSConfiguration#getEncryptIssuedToken() */ public boolean encryptIssuedToken() { @@ -52,17 +51,17 @@ /* * (non-Javadoc) - * @see org.jboss.identity.federation.api.wstrust.STSConfiguration#signIssuedToken() + * @see org.jboss.identity.federation.core.wstrust.STSConfiguration#signIssuedToken() */ - public boolean signIssuedToken() + public boolean signIssuedToken() { - return true; + return true; } - + /* * (non-Javadoc) * - * @see org.jboss.identity.federation.api.wstrust.STSConfiguration#getIssuedTokenTimeout() + * @see org.jboss.identity.federation.core.wstrust.STSConfiguration#getIssuedTokenTimeout() */ public long getIssuedTokenTimeout() { @@ -72,9 +71,9 @@ /* * (non-Javadoc) * - * @see org.jboss.identity.federation.api.wstrust.STSConfiguration#getOptions() + * @see org.jboss.identity.federation.core.wstrust.STSConfiguration#getProviderForService(java.lang.String) */ - public Map<String, Object> getOptions() + public SecurityTokenProvider getProviderForService(String serviceName) { return null; } @@ -82,9 +81,9 @@ /* * (non-Javadoc) * - * @see org.jboss.identity.federation.api.wstrust.STSConfiguration#getProviderForService(java.lang.String) + * @see org.jboss.identity.federation.core.wstrust.STSConfiguration#getProviderForTokenType(java.lang.String) */ - public SecurityTokenProvider getProviderForService(String serviceName) + public SecurityTokenProvider getProviderForTokenType(String tokenType) { return null; } @@ -92,9 +91,9 @@ /* * (non-Javadoc) * - * @see org.jboss.identity.federation.api.wstrust.STSConfiguration#getProviderForTokenType(java.lang.String) + * @see org.jboss.identity.federation.core.wstrust.STSConfiguration#getProviderForTokenElementNS(java.lang.String, java.lang.String) */ - public SecurityTokenProvider getProviderForTokenType(String tokenType) + public SecurityTokenProvider getProviderForTokenElementNS(String tokenLocalName, String tokenNamespace) { return null; } @@ -102,7 +101,7 @@ /* * (non-Javadoc) * - * @see org.jboss.identity.federation.api.wstrust.STSConfiguration#getTokenTypeForService(java.lang.String) + * @see org.jboss.identity.federation.core.wstrust.STSConfiguration#getTokenTypeForService(java.lang.String) */ public String getTokenTypeForService(String serviceName) { @@ -112,7 +111,7 @@ /* * (non-Javadoc) * - * @see org.jboss.identity.federation.api.wstrust.STSConfiguration#getRequestHandler() + * @see org.jboss.identity.federation.core.wstrust.STSConfiguration#getRequestHandler() */ public WSTrustRequestHandler getRequestHandler() { @@ -122,7 +121,7 @@ /* * (non-Javadoc) * - * @see org.jboss.identity.federation.api.wstrust.STSConfiguration#getSTSName() + * @see org.jboss.identity.federation.core.wstrust.STSConfiguration#getSTSName() */ public String getSTSName() { @@ -132,7 +131,7 @@ /* * (non-Javadoc) * - * @see org.jboss.identity.federation.api.wstrust.STSConfiguration#getServiceProviderPublicKey(java.lang.String) + * @see org.jboss.identity.federation.core.wstrust.STSConfiguration#getServiceProviderPublicKey(java.lang.String) */ public PublicKey getServiceProviderPublicKey(String serviceName) { @@ -142,7 +141,7 @@ /* * (non-Javadoc) * - * @see org.jboss.identity.federation.api.wstrust.STSConfiguration#getSTSKeyPair() + * @see org.jboss.identity.federation.core.wstrust.STSConfiguration#getSTSKeyPair() */ public KeyPair getSTSKeyPair() { Modified: identity-federation/trunk/jboss-identity-fed-core/src/test/java/org/jboss/test/identity/federation/core/wstrust/SpecialTokenProvider.java =================================================================== --- identity-federation/trunk/jboss-identity-fed-core/src/test/java/org/jboss/test/identity/federation/core/wstrust/SpecialTokenProvider.java 2009-09-03 01:56:21 UTC (rev 758) +++ identity-federation/trunk/jboss-identity-fed-core/src/test/java/org/jboss/test/identity/federation/core/wstrust/SpecialTokenProvider.java 2009-09-03 18:17:00 UTC (rev 759) @@ -21,6 +21,8 @@ */ package org.jboss.test.identity.federation.core.wstrust; +import java.util.Map; + import org.jboss.identity.federation.core.wstrust.SecurityTokenProvider; import org.jboss.identity.federation.core.wstrust.WSTrustException; import org.jboss.identity.federation.core.wstrust.WSTrustRequestContext; @@ -38,8 +40,17 @@ /* * (non-Javadoc) * - * @see org.jboss.identity.federation.api.wstrust.SecurityTokenProvider#cancelToken(org.jboss.identity.federation.api.wstrust.WSTrustRequestContext) + * @see org.jboss.identity.federation.core.wstrust.SecurityTokenProvider#initialize(java.util.Map) */ + public void initialize(Map<String, String> properties) + { + } + + /* + * (non-Javadoc) + * + * @see org.jboss.identity.federation.core.wstrust.SecurityTokenProvider#cancelToken(org.jboss.identity.federation.core.wstrust.WSTrustRequestContext) + */ public void cancelToken(WSTrustRequestContext context) throws WSTrustException { } @@ -47,7 +58,7 @@ /* * (non-Javadoc) * - * @see org.jboss.identity.federation.api.wstrust.SecurityTokenProvider#issueToken(org.jboss.identity.federation.api.wstrust.WSTrustRequestContext) + * @see org.jboss.identity.federation.core.wstrust.SecurityTokenProvider#issueToken(org.jboss.identity.federation.core.wstrust.WSTrustRequestContext) */ public void issueToken(WSTrustRequestContext context) throws WSTrustException { @@ -56,7 +67,7 @@ /* * (non-Javadoc) * - * @see org.jboss.identity.federation.api.wstrust.SecurityTokenProvider#renewToken(org.jboss.identity.federation.api.wstrust.WSTrustRequestContext) + * @see org.jboss.identity.federation.core.wstrust.SecurityTokenProvider#renewToken(org.jboss.identity.federation.core.wstrust.WSTrustRequestContext) */ public void renewToken(WSTrustRequestContext context) throws WSTrustException { @@ -65,7 +76,7 @@ /* * (non-Javadoc) * - * @see org.jboss.identity.federation.api.wstrust.SecurityTokenProvider#validateToken(org.jboss.identity.federation.api.wstrust.WSTrustRequestContext) + * @see org.jboss.identity.federation.core.wstrust.SecurityTokenProvider#validateToken(org.jboss.identity.federation.core.wstrust.WSTrustRequestContext) */ public void validateToken(WSTrustRequestContext context) throws WSTrustException { Modified: identity-federation/trunk/jboss-identity-web/src/main/resources/schema/config/jboss-identity-fed.xsd =================================================================== --- identity-federation/trunk/jboss-identity-web/src/main/resources/schema/config/jboss-identity-fed.xsd 2009-09-03 01:56:21 UTC (rev 758) +++ identity-federation/trunk/jboss-identity-web/src/main/resources/schema/config/jboss-identity-fed.xsd 2009-09-03 18:17:00 UTC (rev 759) @@ -159,17 +159,37 @@ <complexType name="STSType"> <sequence> - <element name="KeyProvider" type="tns:KeyProviderType" - maxOccurs="1" minOccurs="0"/> + <element name="KeyProvider" type="tns:KeyProviderType" minOccurs="0"/> <element name="RequestHandler" type="string" minOccurs="0"/> + <element name="ClaimProviders" type="tns:ClaimProvidersType" minOccurs="0"/> <element name="TokenProviders" type="tns:TokenProvidersType" minOccurs="0"/> <element name="ServiceProviders" type="tns:ServiceProvidersType" minOccurs="0"/> </sequence> <attribute name="STSName" default="JBossSTS" type="string" use="optional"/> <attribute name="TokenTimeout" default="3600" type="int" use="optional"/> + <attribute name="SignToken" default="true" type="boolean" use="optional"/> <attribute name="EncryptToken" default="false" type="boolean" use="optional"/> </complexType> + <complexType name="ClaimProvidersType"> + <annotation> + <documentation> + The claim providers specify the classes that are capable of handling specific claims dialects. + </documentation> + </annotation> + <sequence> + <element name="ClaimProvider" type="tns:ClaimProviderType" minOccurs="1" maxOccurs="unbounded"/> + </sequence> + </complexType> + + <complexType name="ClaimProviderType"> + <sequence> + <element name="Property" type="tns:PropertyType" minOccurs="0" maxOccurs="unbounded"/> + </sequence> + <attribute name="ProviderClass" type="string" use="required"/> + <attribute name="Dialect" type="string" use="required"/> + </complexType> + <complexType name="TokenProvidersType"> <annotation> <documentation> @@ -184,8 +204,13 @@ </complexType> <complexType name="TokenProviderType"> + <sequence> + <element name="Property" type="tns:PropertyType" minOccurs="0" maxOccurs="unbounded"/> + </sequence> <attribute name="ProviderClass" type="string" use="required"/> <attribute name="TokenType" type="string" use="required"/> + <attribute name="TokenElement" type="string" use="required"/> + <attribute name="TokenElementNS" type="string" use="required"/> </complexType> <complexType name="ServiceProvidersType"> @@ -209,12 +234,16 @@ </documentation> </annotation> <attribute name="Endpoint" type="string" use="required"/> - <attribute name="TruststoreAlias" type="string" use="required"/> <attribute name="TokenType" type="string" use="required"/> + <attribute name="TruststoreAlias" type="string" use="optional"/> </complexType> <element name="JBossSTS" type="tns:STSType"/> + <complexType name="PropertyType"> + <attribute name="Name" type="string" use="required"/> + <attribute name="Value" type="string" use="required"/> + </complexType> <complexType name="MetadataProviderType"> <sequence>