Author: sguilhen(a)redhat.com Date: 2009-10-27 16:59:22 -0400 (Tue, 27 Oct 2009) New Revision: 877 Removed: identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/config/PropertyType.java Modified: 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/ObjectFactory.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/wstrust/JBossSTSConfiguration.java identity-federation/trunk/jboss-identity-fed-core/src/main/resources/schema/config/jboss-identity-fed.xsd identity-federation/trunk/jboss-identity-fed-core/src/test/java/org/jboss/test/identity/federation/core/config/ConfigUnitTestCase.java identity-federation/trunk/jboss-identity-fed-core/src/test/resources/config/test-config-4.xml identity-federation/trunk/jboss-identity-fed-core/src/test/resources/jboss-sts.xml identity-federation/trunk/jboss-identity-web/src/test/java/org/jboss/test/identity/federation/web/mock/MockFilterConfig.java Log: JBID-204: removed PropertyType as we already had KeyValueType for key-value associations. Modified: 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 2009-10-27 20:13:07 UTC (rev 876) +++ identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/config/ClaimProviderType.java 2009-10-27 20:59:22 UTC (rev 877) @@ -27,7 +27,7 @@ * &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;element name="Property" type="{urn:jboss:identity-federation:config:1.0}KeyValueType" 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" /> @@ -45,7 +45,7 @@ public class ClaimProviderType { @XmlElement(name = "Property") - protected List<PropertyType> property; + protected List<KeyValueType> property; @XmlAttribute(name = "ProviderClass", required = true) protected String providerClass; @XmlAttribute(name = "Dialect", required = true) @@ -69,13 +69,13 @@ * * <p> * Objects of the following type(s) are allowed in the list - * {@link PropertyType } + * {@link KeyValueType } * * */ - public List<PropertyType> getProperty() { + public List<KeyValueType> getProperty() { if (property == null) { - property = new ArrayList<PropertyType>(); + property = new ArrayList<KeyValueType>(); } return this.property; } 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-10-27 20:13:07 UTC (rev 876) +++ identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/config/ObjectFactory.java 2009-10-27 20:59:22 UTC (rev 877) @@ -125,15 +125,6 @@ } /** - * Create an instance of {@link PropertyType } - * - */ - - public PropertyType createPropertyType() { - return new PropertyType(); - } - - /** * Create an instance of {@link KeyValueType } * */ Deleted: 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 2009-10-27 20:13:07 UTC (rev 876) +++ identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/config/PropertyType.java 2009-10-27 20:59:22 UTC (rev 877) @@ -1,92 +0,0 @@ -// -// 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/TokenProviderType.java =================================================================== --- identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/config/TokenProviderType.java 2009-10-27 20:13:07 UTC (rev 876) +++ identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/config/TokenProviderType.java 2009-10-27 20:59:22 UTC (rev 877) @@ -27,7 +27,7 @@ * &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;element name="Property" type="{urn:jboss:identity-federation:config:1.0}KeyValueType" 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" /> @@ -47,7 +47,7 @@ public class TokenProviderType { @XmlElement(name = "Property") - protected List<PropertyType> property; + protected List<KeyValueType> property; @XmlAttribute(name = "ProviderClass", required = true) protected String providerClass; @XmlAttribute(name = "TokenType", required = true) @@ -75,13 +75,13 @@ * * <p> * Objects of the following type(s) are allowed in the list - * {@link PropertyType } + * {@link KeyValueType } * * */ - public List<PropertyType> getProperty() { + public List<KeyValueType> getProperty() { if (property == null) { - property = new ArrayList<PropertyType>(); + property = new ArrayList<KeyValueType>(); } return this.property; } Modified: identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/wstrust/JBossSTSConfiguration.java =================================================================== --- identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/wstrust/JBossSTSConfiguration.java 2009-10-27 20:13:07 UTC (rev 876) +++ identity-federation/trunk/jboss-identity-fed-core/src/main/java/org/jboss/identity/federation/core/wstrust/JBossSTSConfiguration.java 2009-10-27 20:59:22 UTC (rev 877) @@ -28,13 +28,12 @@ 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.KeyValueType; import org.jboss.identity.federation.core.config.STSType; import org.jboss.identity.federation.core.config.ServiceProviderType; import org.jboss.identity.federation.core.config.ServiceProvidersType; import org.jboss.identity.federation.core.config.TokenProviderType; import org.jboss.identity.federation.core.config.TokenProvidersType; -import org.jboss.identity.federation.core.interfaces.TrustKeyConfigurationException; import org.jboss.identity.federation.core.interfaces.TrustKeyManager; /** @@ -94,8 +93,8 @@ // 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()); + for (KeyValueType propertyType : provider.getProperty()) + properties.put(propertyType.getKey(), 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); Modified: identity-federation/trunk/jboss-identity-fed-core/src/main/resources/schema/config/jboss-identity-fed.xsd =================================================================== --- identity-federation/trunk/jboss-identity-fed-core/src/main/resources/schema/config/jboss-identity-fed.xsd 2009-10-27 20:13:07 UTC (rev 876) +++ identity-federation/trunk/jboss-identity-fed-core/src/main/resources/schema/config/jboss-identity-fed.xsd 2009-10-27 20:59:22 UTC (rev 877) @@ -195,7 +195,7 @@ <complexType name="ClaimProviderType"> <sequence> - <element name="Property" type="tns:PropertyType" minOccurs="0" maxOccurs="unbounded"/> + <element name="Property" type="tns:KeyValueType" minOccurs="0" maxOccurs="unbounded"/> </sequence> <attribute name="ProviderClass" type="string" use="required"/> <attribute name="Dialect" type="string" use="required"/> @@ -216,7 +216,7 @@ <complexType name="TokenProviderType"> <sequence> - <element name="Property" type="tns:PropertyType" minOccurs="0" maxOccurs="unbounded"/> + <element name="Property" type="tns:KeyValueType" minOccurs="0" maxOccurs="unbounded"/> </sequence> <attribute name="ProviderClass" type="string" use="required"/> <attribute name="TokenType" type="string" use="required"/> @@ -251,8 +251,4 @@ <element name="JBossSTS" type="tns:STSType"/> - <complexType name="PropertyType"> - <attribute name="Name" type="string" use="required"/> - <attribute name="Value" type="string" use="required"/> - </complexType> </schema> \ No newline at end of file Modified: identity-federation/trunk/jboss-identity-fed-core/src/test/java/org/jboss/test/identity/federation/core/config/ConfigUnitTestCase.java =================================================================== --- identity-federation/trunk/jboss-identity-fed-core/src/test/java/org/jboss/test/identity/federation/core/config/ConfigUnitTestCase.java 2009-10-27 20:13:07 UTC (rev 876) +++ identity-federation/trunk/jboss-identity-fed-core/src/test/java/org/jboss/test/identity/federation/core/config/ConfigUnitTestCase.java 2009-10-27 20:59:22 UTC (rev 877) @@ -33,7 +33,6 @@ 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; @@ -160,7 +159,7 @@ 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(); + List<KeyValueType> properties = tokenProvider.getProperty(); assertEquals("Invalid number of properties", 2, properties.size()); // configuration of the service providers. ServiceProvidersType serviceProviders = stsType.getServiceProviders(); Modified: identity-federation/trunk/jboss-identity-fed-core/src/test/resources/config/test-config-4.xml =================================================================== --- identity-federation/trunk/jboss-identity-fed-core/src/test/resources/config/test-config-4.xml 2009-10-27 20:13:07 UTC (rev 876) +++ identity-federation/trunk/jboss-identity-fed-core/src/test/resources/config/test-config-4.xml 2009-10-27 20:59:22 UTC (rev 877) @@ -12,8 +12,8 @@ TokenType="specialToken" TokenElement="SpecialToken" TokenElementNS="http://www.tokens.org"> - <Property Name="Property1" Value="Value1"/> - <Property Name="Property2" Value="Value2"/> + <Property Key="Property1" Value="Value1"/> + <Property Key="Property2" Value="Value2"/> </TokenProvider> </TokenProviders> <ServiceProviders> Modified: identity-federation/trunk/jboss-identity-fed-core/src/test/resources/jboss-sts.xml =================================================================== --- identity-federation/trunk/jboss-identity-fed-core/src/test/resources/jboss-sts.xml 2009-10-27 20:13:07 UTC (rev 876) +++ identity-federation/trunk/jboss-identity-fed-core/src/test/resources/jboss-sts.xml 2009-10-27 20:59:22 UTC (rev 877) @@ -14,8 +14,8 @@ TokenType="http://www.tokens.org/SpecialToken" TokenElement="SpecialToken" TokenElementNS="http://www.tokens.org"> - <Property Name="Property1" Value="Value1"/> - <Property Name="Property2" Value="Value2"/> + <Property Key="Property1" Value="Value1"/> + <Property Key="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... Modified: identity-federation/trunk/jboss-identity-web/src/test/java/org/jboss/test/identity/federation/web/mock/MockFilterConfig.java =================================================================== --- identity-federation/trunk/jboss-identity-web/src/test/java/org/jboss/test/identity/federation/web/mock/MockFilterConfig.java 2009-10-27 20:13:07 UTC (rev 876) +++ identity-federation/trunk/jboss-identity-web/src/test/java/org/jboss/test/identity/federation/web/mock/MockFilterConfig.java 2009-10-27 20:59:22 UTC (rev 877) @@ -58,7 +58,7 @@ return params.get(arg0); } - public Enumeration getInitParameterNames() + public Enumeration<?> getInitParameterNames() { throw new RuntimeException("NYI"); }