April 2009 - jboss-identity-commits

JBoss Identity SVN: r430 - in identity-federation/trunk/identity-bindings/src: main/resources/schema/config and 2 other directories.

by jboss-identity-commits＠lists.jboss.org

Author: sguilhen(a)redhat.com Date: 2009-04-06 16:35:09 -0400 (Mon, 06 Apr 2009) New Revision: 430 Modified: identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/config/AuthPropertyType.java identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/config/EncAlgoType.java identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/config/EncryptionType.java identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/config/IDPType.java identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/config/KeyProviderType.java identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/config/KeyValueType.java identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/config/ObjectFactory.java identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/config/ProviderType.java identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/config/SPType.java identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/config/STSType.java identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/config/ServiceProviderType.java identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/config/ServiceProvidersType.java identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/config/TokenProviderType.java identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/config/TokenProvidersType.java identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/config/TrustType.java identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/config/package-info.java identity-federation/trunk/identity-bindings/src/main/resources/schema/config/jboss-identity-fed.xsd identity-federation/trunk/identity-bindings/src/test/java/org/jboss/test/identity/federation/bindings/config/ConfigUnitTestCase.java identity-federation/trunk/identity-bindings/src/test/resources/config/test-config-4.xml Log: Changed the STS elements in jboss-identity-fed.xsd to use attributes instead of simple elements when default values are needed Modified: identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/config/AuthPropertyType.java =================================================================== --- identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/config/AuthPropertyType.java 2009-04-06 18:34:54 UTC (rev 429) +++ identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/config/AuthPropertyType.java 2009-04-06 20:35:09 UTC (rev 430) @@ -2,7 +2,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.3 in JDK 1.6 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2009.04.06 at 10:56:34 AM GMT-03:00 +// Generated on: 2009.04.06 at 05:23:23 PM GMT-03:00 // Modified: identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/config/EncAlgoType.java =================================================================== --- identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/config/EncAlgoType.java 2009-04-06 18:34:54 UTC (rev 429) +++ identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/config/EncAlgoType.java 2009-04-06 20:35:09 UTC (rev 430) @@ -2,7 +2,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.3 in JDK 1.6 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2009.04.06 at 10:56:34 AM GMT-03:00 +// Generated on: 2009.04.06 at 05:23:23 PM GMT-03:00 // Modified: identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/config/EncryptionType.java =================================================================== --- identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/config/EncryptionType.java 2009-04-06 18:34:54 UTC (rev 429) +++ identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/config/EncryptionType.java 2009-04-06 20:35:09 UTC (rev 430) @@ -2,7 +2,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.3 in JDK 1.6 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2009.04.06 at 10:56:34 AM GMT-03:00 +// Generated on: 2009.04.06 at 05:23:23 PM GMT-03:00 // Modified: identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/config/IDPType.java =================================================================== --- identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/config/IDPType.java 2009-04-06 18:34:54 UTC (rev 429) +++ identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/config/IDPType.java 2009-04-06 20:35:09 UTC (rev 430) @@ -2,7 +2,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.3 in JDK 1.6 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2009.04.06 at 10:56:34 AM GMT-03:00 +// Generated on: 2009.04.06 at 05:23:23 PM GMT-03:00 // Modified: identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/config/KeyProviderType.java =================================================================== --- identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/config/KeyProviderType.java 2009-04-06 18:34:54 UTC (rev 429) +++ identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/config/KeyProviderType.java 2009-04-06 20:35:09 UTC (rev 430) @@ -2,7 +2,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.3 in JDK 1.6 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2009.04.06 at 10:56:34 AM GMT-03:00 +// Generated on: 2009.04.06 at 05:23:23 PM GMT-03:00 // Modified: identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/config/KeyValueType.java =================================================================== --- identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/config/KeyValueType.java 2009-04-06 18:34:54 UTC (rev 429) +++ identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/config/KeyValueType.java 2009-04-06 20:35:09 UTC (rev 430) @@ -2,7 +2,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.3 in JDK 1.6 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2009.04.06 at 10:56:34 AM GMT-03:00 +// Generated on: 2009.04.06 at 05:23:23 PM GMT-03:00 // Modified: identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/config/ObjectFactory.java =================================================================== --- identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/config/ObjectFactory.java 2009-04-06 18:34:54 UTC (rev 429) +++ identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/config/ObjectFactory.java 2009-04-06 20:35:09 UTC (rev 430) @@ -2,7 +2,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.3 in JDK 1.6 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2009.04.06 at 10:56:34 AM GMT-03:00 +// Generated on: 2009.04.06 at 05:23:23 PM GMT-03:00 // @@ -43,6 +43,22 @@ } /** + * Create an instance of {@link ServiceProviderType } + * + */ + public ServiceProviderType createServiceProviderType() { + return new ServiceProviderType(); + } + + /** + * Create an instance of {@link STSType } + * + */ + public STSType createSTSType() { + return new STSType(); + } + + /** * Create an instance of {@link SPType } * */ @@ -51,27 +67,27 @@ } /** - * Create an instance of {@link KeyProviderType } + * Create an instance of {@link TrustType } * */ - public KeyProviderType createKeyProviderType() { - return new KeyProviderType(); + public TrustType createTrustType() { + return new TrustType(); } /** - * Create an instance of {@link ProviderType } + * Create an instance of {@link TokenProvidersType } * */ - public ProviderType createProviderType() { - return new ProviderType(); + public TokenProvidersType createTokenProvidersType() { + return new TokenProvidersType(); } /** - * Create an instance of {@link EncryptionType } + * Create an instance of {@link ProviderType } * */ - public EncryptionType createEncryptionType() { - return new EncryptionType(); + public ProviderType createProviderType() { + return new ProviderType(); } /** @@ -83,22 +99,14 @@ } /** - * Create an instance of {@link TrustType } + * Create an instance of {@link TokenProviderType } * */ - public TrustType createTrustType() { - return new TrustType(); + public TokenProviderType createTokenProviderType() { + return new TokenProviderType(); } /** - * Create an instance of {@link STSType } - * - */ - public STSType createSTSType() { - return new STSType(); - } - - /** * Create an instance of {@link IDPType } * */ @@ -107,19 +115,19 @@ } /** - * Create an instance of {@link ServiceProviderType } + * Create an instance of {@link EncryptionType } * */ - public ServiceProviderType createServiceProviderType() { - return new ServiceProviderType(); + public EncryptionType createEncryptionType() { + return new EncryptionType(); } /** - * Create an instance of {@link TokenProvidersType } + * Create an instance of {@link ServiceProvidersType } * */ - public TokenProvidersType createTokenProvidersType() { - return new TokenProvidersType(); + public ServiceProvidersType createServiceProvidersType() { + return new ServiceProvidersType(); } /** @@ -131,22 +139,14 @@ } /** - * Create an instance of {@link TokenProviderType } + * Create an instance of {@link KeyProviderType } * */ - public TokenProviderType createTokenProviderType() { - return new TokenProviderType(); + public KeyProviderType createKeyProviderType() { + return new KeyProviderType(); } /** - * Create an instance of {@link ServiceProvidersType } - * - */ - public ServiceProvidersType createServiceProvidersType() { - return new ServiceProvidersType(); - } - - /** * Create an instance of {@link JAXBElement }{@code <}{@link IDPType }{@code >}} * */ Modified: identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/config/ProviderType.java =================================================================== --- identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/config/ProviderType.java 2009-04-06 18:34:54 UTC (rev 429) +++ identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/config/ProviderType.java 2009-04-06 20:35:09 UTC (rev 430) @@ -2,7 +2,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.3 in JDK 1.6 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2009.04.06 at 10:56:34 AM GMT-03:00 +// Generated on: 2009.04.06 at 05:23:23 PM GMT-03:00 // Modified: identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/config/SPType.java =================================================================== --- identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/config/SPType.java 2009-04-06 18:34:54 UTC (rev 429) +++ identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/config/SPType.java 2009-04-06 20:35:09 UTC (rev 430) @@ -2,7 +2,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.3 in JDK 1.6 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2009.04.06 at 10:56:34 AM GMT-03:00 +// Generated on: 2009.04.06 at 05:23:23 PM GMT-03:00 // Modified: identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/config/STSType.java =================================================================== --- identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/config/STSType.java 2009-04-06 18:34:54 UTC (rev 429) +++ identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/config/STSType.java 2009-04-06 20:35:09 UTC (rev 430) @@ -2,7 +2,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.3 in JDK 1.6 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2009.04.06 at 10:56:34 AM GMT-03:00 +// Generated on: 2009.04.06 at 05:23:23 PM GMT-03:00 // @@ -10,6 +10,7 @@ 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; @@ -24,14 +25,14 @@ * <complexContent> * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> * <sequence> - * <element name="STSName" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/> - * <element name="TokenTimeout" type="{http://www.w3.org/2001/XMLSchema}int" minOccurs="0"/> - * <element name="EncryptToken" type="{http://www.w3.org/2001/XMLSchema}boolean" minOccurs="0"/> * <element name="KeyProvider" type="{urn:jboss:identity-federation:config:1.0}KeyProviderType" minOccurs="0"/> * <element name="RequestHandler" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/> * <element name="TokenProviders" type="{urn:jboss:identity-federation:config:1.0}TokenProvidersType" minOccurs="0"/> * <element name="ServiceProviders" type="{urn:jboss:identity-federation:config:1.0}ServiceProvidersType" minOccurs="0"/> * </sequence> + * <attribute name="STSName" type="{http://www.w3.org/2001/XMLSchema}string" default="JBossSTS" /> + * <attribute name="TokenTimeout" type="{http://www.w3.org/2001/XMLSchema}int" default="3600" /> + * <attribute name="EncryptToken" type="{http://www.w3.org/2001/XMLSchema}boolean" default="false" /> * </restriction> * </complexContent> * </complexType> @@ -41,9 +42,6 @@ */ @XmlAccessorType(XmlAccessType.FIELD) @XmlType(name = "STSType", propOrder = { - "stsName", - "tokenTimeout", - "encryptToken", "keyProvider", "requestHandler", "tokenProviders", @@ -51,12 +49,6 @@ }) public class STSType { - @XmlElement(name = "STSName", defaultValue = "JBossSTS") - protected String stsName; - @XmlElement(name = "TokenTimeout", defaultValue = "3600") - protected Integer tokenTimeout; - @XmlElement(name = "EncryptToken", defaultValue = "false") - protected Boolean encryptToken; @XmlElement(name = "KeyProvider") protected KeyProviderType keyProvider; @XmlElement(name = "RequestHandler") @@ -65,173 +57,191 @@ protected TokenProvidersType tokenProviders; @XmlElement(name = "ServiceProviders") protected ServiceProvidersType serviceProviders; + @XmlAttribute(name = "STSName") + protected String stsName; + @XmlAttribute(name = "TokenTimeout") + protected Integer tokenTimeout; + @XmlAttribute(name = "EncryptToken") + protected Boolean encryptToken; /** - * Gets the value of the stsName property. + * Gets the value of the keyProvider property. * * @return * possible object is - * {@link String } + * {@link KeyProviderType } * */ - public String getSTSName() { - return stsName; + public KeyProviderType getKeyProvider() { + return keyProvider; } /** - * Sets the value of the stsName property. + * Sets the value of the keyProvider property. * * @param value * allowed object is - * {@link String } + * {@link KeyProviderType } * */ - public void setSTSName(String value) { - this.stsName = value; + public void setKeyProvider(KeyProviderType value) { + this.keyProvider = value; } /** - * Gets the value of the tokenTimeout property. + * Gets the value of the requestHandler property. * * @return * possible object is - * {@link Integer } + * {@link String } * */ - public Integer getTokenTimeout() { - return tokenTimeout; + public String getRequestHandler() { + return requestHandler; } /** - * Sets the value of the tokenTimeout property. + * Sets the value of the requestHandler property. * * @param value * allowed object is - * {@link Integer } + * {@link String } * */ - public void setTokenTimeout(Integer value) { - this.tokenTimeout = value; + public void setRequestHandler(String value) { + this.requestHandler = value; } /** - * Gets the value of the encryptToken property. + * Gets the value of the tokenProviders property. * * @return * possible object is - * {@link Boolean } + * {@link TokenProvidersType } * */ - public Boolean isEncryptToken() { - return encryptToken; + public TokenProvidersType getTokenProviders() { + return tokenProviders; } /** - * Sets the value of the encryptToken property. + * Sets the value of the tokenProviders property. * * @param value * allowed object is - * {@link Boolean } + * {@link TokenProvidersType } * */ - public void setEncryptToken(Boolean value) { - this.encryptToken = value; + public void setTokenProviders(TokenProvidersType value) { + this.tokenProviders = value; } /** - * Gets the value of the keyProvider property. + * Gets the value of the serviceProviders property. * * @return * possible object is - * {@link KeyProviderType } + * {@link ServiceProvidersType } * */ - public KeyProviderType getKeyProvider() { - return keyProvider; + public ServiceProvidersType getServiceProviders() { + return serviceProviders; } /** - * Sets the value of the keyProvider property. + * Sets the value of the serviceProviders property. * * @param value * allowed object is - * {@link KeyProviderType } + * {@link ServiceProvidersType } * */ - public void setKeyProvider(KeyProviderType value) { - this.keyProvider = value; + public void setServiceProviders(ServiceProvidersType value) { + this.serviceProviders = value; } /** - * Gets the value of the requestHandler property. + * Gets the value of the stsName property. * * @return * possible object is * {@link String } * */ - public String getRequestHandler() { - return requestHandler; + public String getSTSName() { + if (stsName == null) { + return "JBossSTS"; + } else { + return stsName; + } } /** - * Sets the value of the requestHandler property. + * Sets the value of the stsName property. * * @param value * allowed object is * {@link String } * */ - public void setRequestHandler(String value) { - this.requestHandler = value; + public void setSTSName(String value) { + this.stsName = value; } /** - * Gets the value of the tokenProviders property. + * Gets the value of the tokenTimeout property. * * @return * possible object is - * {@link TokenProvidersType } + * {@link Integer } * */ - public TokenProvidersType getTokenProviders() { - return tokenProviders; + public int getTokenTimeout() { + if (tokenTimeout == null) { + return 3600; + } else { + return tokenTimeout; + } } /** - * Sets the value of the tokenProviders property. + * Sets the value of the tokenTimeout property. * * @param value * allowed object is - * {@link TokenProvidersType } + * {@link Integer } * */ - public void setTokenProviders(TokenProvidersType value) { - this.tokenProviders = value; + public void setTokenTimeout(Integer value) { + this.tokenTimeout = value; } /** - * Gets the value of the serviceProviders property. + * Gets the value of the encryptToken property. * * @return * possible object is - * {@link ServiceProvidersType } + * {@link Boolean } * */ - public ServiceProvidersType getServiceProviders() { - return serviceProviders; + public boolean isEncryptToken() { + if (encryptToken == null) { + return false; + } else { + return encryptToken; + } } /** - * Sets the value of the serviceProviders property. + * Sets the value of the encryptToken property. * * @param value * allowed object is - * {@link ServiceProvidersType } + * {@link Boolean } * */ - public void setServiceProviders(ServiceProvidersType value) { - this.serviceProviders = value; + public void setEncryptToken(Boolean value) { + this.encryptToken = value; } } Modified: identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/config/ServiceProviderType.java =================================================================== --- identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/config/ServiceProviderType.java 2009-04-06 18:34:54 UTC (rev 429) +++ identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/config/ServiceProviderType.java 2009-04-06 20:35:09 UTC (rev 430) @@ -2,7 +2,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.3 in JDK 1.6 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2009.04.06 at 10:56:34 AM GMT-03:00 +// Generated on: 2009.04.06 at 05:23:23 PM GMT-03:00 // @@ -11,7 +11,6 @@ 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; @@ -31,11 +30,9 @@ * <complexType name="ServiceProviderType"> * <complexContent> * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> - * <sequence> - * <element name="TruststoreAlias" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/> - * <element name="TokenType" type="{http://www.w3.org/2001/XMLSchema}string"/> - * </sequence> - * <attribute name="endpoint" type="{http://www.w3.org/2001/XMLSchema}string" /> + * <attribute name="endpoint" use="required" type="{http://www.w3.org/2001/XMLSchema}string" /> + * <attribute name="TruststoreAlias" use="required" type="{http://www.w3.org/2001/XMLSchema}string" /> + * <attribute name="TokenType" use="required" type="{http://www.w3.org/2001/XMLSchema}string" /> * </restriction> * </complexContent> * </complexType> @@ -44,89 +41,86 @@ * */ @XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "ServiceProviderType", propOrder = { - "truststoreAlias", - "tokenType" -}) +@XmlType(name = "ServiceProviderType") public class ServiceProviderType { - @XmlElement(name = "TruststoreAlias") + @XmlAttribute(required = true) + protected String endpoint; + @XmlAttribute(name = "TruststoreAlias", required = true) protected String truststoreAlias; - @XmlElement(name = "TokenType", required = true) + @XmlAttribute(name = "TokenType", required = true) protected String tokenType; - @XmlAttribute - protected String endpoint; /** - * Gets the value of the truststoreAlias property. + * Gets the value of the endpoint property. * * @return * possible object is * {@link String } * */ - public String getTruststoreAlias() { - return truststoreAlias; + public String getEndpoint() { + return endpoint; } /** - * Sets the value of the truststoreAlias property. + * Sets the value of the endpoint property. * * @param value * allowed object is * {@link String } * */ - public void setTruststoreAlias(String value) { - this.truststoreAlias = value; + public void setEndpoint(String value) { + this.endpoint = 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; } /** - * Gets the value of the endpoint property. + * Gets the value of the tokenType property. * * @return * possible object is * {@link String } * */ - public String getEndpoint() { - return endpoint; + public String getTokenType() { + return tokenType; } /** - * Sets the value of the endpoint property. + * Sets the value of the tokenType property. * * @param value * allowed object is * {@link String } * */ - public void setEndpoint(String value) { - this.endpoint = value; + public void setTokenType(String value) { + this.tokenType = value; } } Modified: identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/config/ServiceProvidersType.java =================================================================== --- identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/config/ServiceProvidersType.java 2009-04-06 18:34:54 UTC (rev 429) +++ identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/config/ServiceProvidersType.java 2009-04-06 20:35:09 UTC (rev 430) @@ -2,7 +2,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.3 in JDK 1.6 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2009.04.06 at 10:56:34 AM GMT-03:00 +// Generated on: 2009.04.06 at 05:23:23 PM GMT-03:00 // Modified: identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/config/TokenProviderType.java =================================================================== --- identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/config/TokenProviderType.java 2009-04-06 18:34:54 UTC (rev 429) +++ identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/config/TokenProviderType.java 2009-04-06 20:35:09 UTC (rev 430) @@ -2,7 +2,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.3 in JDK 1.6 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2009.04.06 at 10:56:34 AM GMT-03:00 +// Generated on: 2009.04.06 at 05:23:23 PM GMT-03:00 // @@ -10,7 +10,7 @@ import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlAttribute; import javax.xml.bind.annotation.XmlType; @@ -23,10 +23,8 @@ * <complexType name="TokenProviderType"> * <complexContent> * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> - * <sequence> - * <element name="ProviderClass" type="{http://www.w3.org/2001/XMLSchema}string"/> - * <element name="TokenType" type="{http://www.w3.org/2001/XMLSchema}string"/> - * </sequence> + * <attribute name="ProviderClass" use="required" type="{http://www.w3.org/2001/XMLSchema}string" /> + * <attribute name="TokenType" use="required" type="{http://www.w3.org/2001/XMLSchema}string" /> * </restriction> * </complexContent> * </complexType> @@ -35,15 +33,12 @@ * */ @XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "TokenProviderType", propOrder = { - "providerClass", - "tokenType" -}) +@XmlType(name = "TokenProviderType") public class TokenProviderType { - @XmlElement(name = "ProviderClass", required = true) + @XmlAttribute(name = "ProviderClass", required = true) protected String providerClass; - @XmlElement(name = "TokenType", required = true) + @XmlAttribute(name = "TokenType", required = true) protected String tokenType; /** Modified: identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/config/TokenProvidersType.java =================================================================== --- identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/config/TokenProvidersType.java 2009-04-06 18:34:54 UTC (rev 429) +++ identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/config/TokenProvidersType.java 2009-04-06 20:35:09 UTC (rev 430) @@ -2,7 +2,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.3 in JDK 1.6 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2009.04.06 at 10:56:34 AM GMT-03:00 +// Generated on: 2009.04.06 at 05:23:23 PM GMT-03:00 // Modified: identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/config/TrustType.java =================================================================== --- identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/config/TrustType.java 2009-04-06 18:34:54 UTC (rev 429) +++ identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/config/TrustType.java 2009-04-06 20:35:09 UTC (rev 430) @@ -2,7 +2,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.3 in JDK 1.6 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2009.04.06 at 10:56:34 AM GMT-03:00 +// Generated on: 2009.04.06 at 05:23:23 PM GMT-03:00 // Modified: identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/config/package-info.java =================================================================== --- identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/config/package-info.java 2009-04-06 18:34:54 UTC (rev 429) +++ identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/config/package-info.java 2009-04-06 20:35:09 UTC (rev 430) @@ -2,7 +2,7 @@ // This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.3 in JDK 1.6 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2009.04.06 at 10:56:34 AM GMT-03:00 +// Generated on: 2009.04.06 at 05:23:23 PM GMT-03:00 // @javax.xml.bind.annotation.XmlSchema(namespace = "urn:jboss:identity-federation:config:1.0", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED) Modified: identity-federation/trunk/identity-bindings/src/main/resources/schema/config/jboss-identity-fed.xsd =================================================================== --- identity-federation/trunk/identity-bindings/src/main/resources/schema/config/jboss-identity-fed.xsd 2009-04-06 18:34:54 UTC (rev 429) +++ identity-federation/trunk/identity-bindings/src/main/resources/schema/config/jboss-identity-fed.xsd 2009-04-06 20:35:09 UTC (rev 430) @@ -158,15 +158,15 @@ <complexType name="STSType"> <sequence> - <element name="STSName" default="JBossSTS" type="string" minOccurs="0"/> - <element name="TokenTimeout" default="3600" type="int" minOccurs="0"/> - <element name="EncryptToken" default="false" type="boolean" minOccurs="0"/> <element name="KeyProvider" type="tns:KeyProviderType" maxOccurs="1" minOccurs="0"/> <element name="RequestHandler" type="string" 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="EncryptToken" default="false" type="boolean" use="optional"/> </complexType> <complexType name="TokenProvidersType"> @@ -183,10 +183,8 @@ </complexType> <complexType name="TokenProviderType"> - <sequence> - <element name="ProviderClass" type="string" minOccurs="1"/> - <element name="TokenType" type="string" minOccurs="1"/> - </sequence> + <attribute name="ProviderClass" type="string" use="required"/> + <attribute name="TokenType" type="string" use="required"/> </complexType> <complexType name="ServiceProvidersType"> @@ -209,11 +207,9 @@ generated token. </documentation> </annotation> - <sequence> - <element name="TruststoreAlias" type="string" minOccurs="0"/> - <element name="TokenType" type="string" minOccurs="1"/> - </sequence> - <attribute name="endpoint" type="string"/> + <attribute name="endpoint" type="string" use="required"/> + <attribute name="TruststoreAlias" type="string" use="required"/> + <attribute name="TokenType" type="string" use="required"/> </complexType> <element name="JBossSTS" type="tns:STSType"/> Modified: identity-federation/trunk/identity-bindings/src/test/java/org/jboss/test/identity/federation/bindings/config/ConfigUnitTestCase.java =================================================================== --- identity-federation/trunk/identity-bindings/src/test/java/org/jboss/test/identity/federation/bindings/config/ConfigUnitTestCase.java 2009-04-06 18:34:54 UTC (rev 429) +++ identity-federation/trunk/identity-bindings/src/test/java/org/jboss/test/identity/federation/bindings/config/ConfigUnitTestCase.java 2009-04-06 20:35:09 UTC (rev 430) @@ -140,7 +140,7 @@ STSType stsType = ((JAXBElement<STSType>) object).getValue(); // general STS configurations. assertEquals("Unexpected STS name", "Test STS", stsType.getSTSName()); - assertEquals("Unexpected token timeout value", 7200, stsType.getTokenTimeout().intValue()); + assertEquals("Unexpected token timeout value", 7200, stsType.getTokenTimeout()); assertTrue("Encryption of tokens should have been enabled", stsType.isEncryptToken()); // we don't verify all values of the key provider config as it has been done in the other test scenarios. assertNotNull("Unexpected null key provider", stsType.getKeyProvider()); Modified: identity-federation/trunk/identity-bindings/src/test/resources/config/test-config-4.xml =================================================================== --- identity-federation/trunk/identity-bindings/src/test/resources/config/test-config-4.xml 2009-04-06 18:34:54 UTC (rev 429) +++ identity-federation/trunk/identity-bindings/src/test/resources/config/test-config-4.xml 2009-04-06 20:35:09 UTC (rev 430) @@ -1,7 +1,5 @@ -<JBossSTS xmlns="urn:jboss:identity-federation:config:1.0"> - <STSName>Test STS</STSName> - <TokenTimeout>7200</TokenTimeout> - <EncryptToken>true</EncryptToken> +<JBossSTS xmlns="urn:jboss:identity-federation:config:1.0" + STSName="Test STS" TokenTimeout="7200" EncryptToken="true"> <KeyProvider ClassName="SomeClass"> <ValidatingAlias Key="localhost" Value="localhostalias"/> <ValidatingAlias Key="jboss.com" Value="jbossalias"/> @@ -9,15 +7,10 @@ </KeyProvider> <RequestHandler>org.jboss.identity.federation.wstrust.Handler</RequestHandler> <TokenProviders> - <TokenProvider> - <ProviderClass>org.jboss.SpecialTokenProvider</ProviderClass> - <TokenType>specialToken</TokenType> - </TokenProvider> + <TokenProvider ProviderClass="org.jboss.SpecialTokenProvider" TokenType="specialToken"/> </TokenProviders> <ServiceProviders> - <ServiceProvider endpoint="http://provider.endpoint/provider"> - <TruststoreAlias>providerAlias</TruststoreAlias> - <TokenType>specialToken</TokenType> - </ServiceProvider> + <ServiceProvider endpoint="http://provider.endpoint/provider" TokenType="specialToken" + TruststoreAlias="providerAlias"/> </ServiceProviders> </JBossSTS> \ No newline at end of file

15 years, 10 months

1
0
0 / 0

JBoss Identity SVN: r429 - in identity-federation/trunk: assembly and 236 other directories.

by jboss-identity-commits＠lists.jboss.org

Author: sguilhen(a)redhat.com Date: 2009-04-06 14:34:54 -0400 (Mon, 06 Apr 2009) New Revision: 429 Removed: identity-federation/trunk/identity-bindings-jboss/.classpath identity-federation/trunk/identity-bindings/.classpath identity-federation/trunk/identity-fed-api/.classpath identity-federation/trunk/identity-fed-core/.classpath identity-federation/trunk/identity-fed-model/.classpath identity-federation/trunk/identity-xmlsecmodel/.classpath Modified: identity-federation/trunk/ identity-federation/trunk/README.txt identity-federation/trunk/assembly/ identity-federation/trunk/identity-bindings-jboss/ identity-federation/trunk/identity-bindings-jboss/src/ identity-federation/trunk/identity-bindings-jboss/src/main/ identity-federation/trunk/identity-bindings-jboss/src/main/java/ identity-federation/trunk/identity-bindings-jboss/src/main/java/org/ identity-federation/trunk/identity-bindings-jboss/src/main/java/org/jboss/ identity-federation/trunk/identity-bindings-jboss/src/main/java/org/jboss/identity/ identity-federation/trunk/identity-bindings-jboss/src/main/java/org/jboss/identity/federation/ identity-federation/trunk/identity-bindings-jboss/src/main/java/org/jboss/identity/federation/bindings/ identity-federation/trunk/identity-bindings-jboss/src/main/java/org/jboss/identity/federation/bindings/jboss/ identity-federation/trunk/identity-bindings-jboss/src/main/java/org/jboss/identity/federation/bindings/jboss/auth/ identity-federation/trunk/identity-bindings-jboss/src/main/java/org/jboss/identity/federation/bindings/jboss/reg/ identity-federation/trunk/identity-bindings-jboss/src/main/resources/ identity-federation/trunk/identity-bindings-jboss/src/test/ identity-federation/trunk/identity-bindings-jboss/src/test/java/ identity-federation/trunk/identity-bindings-jboss/src/test/resources/ identity-federation/trunk/identity-bindings/ identity-federation/trunk/identity-bindings/src/ identity-federation/trunk/identity-bindings/src/main/ identity-federation/trunk/identity-bindings/src/main/java/ identity-federation/trunk/identity-bindings/src/main/java/org/ identity-federation/trunk/identity-bindings/src/main/java/org/jboss/ identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/ identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/ identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/ identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/config/ identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/interfaces/ identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/jboss/ identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/jboss/subject/ identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/jboss/trust/ identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/servlets/ identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/tomcat/ identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/tomcat/idp/ identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/tomcat/sp/ identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/tomcat/sp/holder/ identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/util/ identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/util/cert/ identity-federation/trunk/identity-bindings/src/main/resources/ identity-federation/trunk/identity-bindings/src/main/resources/schema/ identity-federation/trunk/identity-bindings/src/main/resources/schema/config/ identity-federation/trunk/identity-bindings/src/test/ identity-federation/trunk/identity-bindings/src/test/java/ identity-federation/trunk/identity-bindings/src/test/java/org/ identity-federation/trunk/identity-bindings/src/test/java/org/jboss/ identity-federation/trunk/identity-bindings/src/test/java/org/jboss/test/ identity-federation/trunk/identity-bindings/src/test/java/org/jboss/test/identity/ identity-federation/trunk/identity-bindings/src/test/java/org/jboss/test/identity/federation/ identity-federation/trunk/identity-bindings/src/test/java/org/jboss/test/identity/federation/bindings/ identity-federation/trunk/identity-bindings/src/test/java/org/jboss/test/identity/federation/bindings/config/ identity-federation/trunk/identity-bindings/src/test/java/org/jboss/test/identity/federation/bindings/servlets/ identity-federation/trunk/identity-bindings/src/test/java/org/jboss/test/identity/federation/bindings/util/ identity-federation/trunk/identity-bindings/src/test/java/org/jboss/test/tomcat/ identity-federation/trunk/identity-bindings/src/test/java/org/jboss/test/tomcat/bindings/ identity-federation/trunk/identity-bindings/src/test/java/org/jboss/test/tomcat/helpers/ identity-federation/trunk/identity-bindings/src/test/resources/ identity-federation/trunk/identity-bindings/src/test/resources/config/ identity-federation/trunk/identity-bindings/src/test/resources/keystore/ identity-federation/trunk/identity-bindings/src/test/resources/xacml/ identity-federation/trunk/identity-bindings/src/test/resources/xacml/policies/ identity-federation/trunk/identity-bindings/src/test/resources/xacml/policies/config/ identity-federation/trunk/identity-bindings/src/test/resources/xacml/requests/ identity-federation/trunk/identity-fed-api/ identity-federation/trunk/identity-fed-api/src/ identity-federation/trunk/identity-fed-api/src/main/ identity-federation/trunk/identity-fed-api/src/main/java/ identity-federation/trunk/identity-fed-api/src/main/java/org/ identity-federation/trunk/identity-fed-api/src/main/java/org/jboss/ identity-federation/trunk/identity-fed-api/src/main/java/org/jboss/identity/ identity-federation/trunk/identity-fed-api/src/main/java/org/jboss/identity/federation/ identity-federation/trunk/identity-fed-api/src/main/java/org/jboss/identity/federation/api/ identity-federation/trunk/identity-fed-api/src/main/java/org/jboss/identity/federation/api/saml/ identity-federation/trunk/identity-fed-api/src/main/java/org/jboss/identity/federation/api/saml/v2/ identity-federation/trunk/identity-fed-api/src/main/java/org/jboss/identity/federation/api/saml/v2/common/ identity-federation/trunk/identity-fed-api/src/main/java/org/jboss/identity/federation/api/saml/v2/request/ identity-federation/trunk/identity-fed-api/src/main/java/org/jboss/identity/federation/api/saml/v2/response/ identity-federation/trunk/identity-fed-api/src/main/java/org/jboss/identity/federation/api/util/ identity-federation/trunk/identity-fed-api/src/main/java/org/jboss/identity/federation/api/wstrust/ identity-federation/trunk/identity-fed-api/src/main/java/org/jboss/identity/federation/api/wstrust/protocol/ identity-federation/trunk/identity-fed-api/src/main/resources/ identity-federation/trunk/identity-fed-api/src/test/ identity-federation/trunk/identity-fed-api/src/test/java/ identity-federation/trunk/identity-fed-api/src/test/java/org/ identity-federation/trunk/identity-fed-api/src/test/java/org/jboss/ identity-federation/trunk/identity-fed-api/src/test/java/org/jboss/test/ identity-federation/trunk/identity-fed-api/src/test/java/org/jboss/test/identity/ identity-federation/trunk/identity-fed-api/src/test/java/org/jboss/test/identity/federation/ identity-federation/trunk/identity-fed-api/src/test/java/org/jboss/test/identity/federation/api/ identity-federation/trunk/identity-fed-api/src/test/java/org/jboss/test/identity/federation/api/saml/ identity-federation/trunk/identity-fed-api/src/test/java/org/jboss/test/identity/federation/api/saml/v2/ identity-federation/trunk/identity-fed-api/src/test/java/org/jboss/test/identity/federation/api/util/ identity-federation/trunk/identity-fed-api/src/test/resources/ identity-federation/trunk/identity-fed-api/src/test/resources/endorsed/ identity-federation/trunk/identity-fed-api/src/test/resources/saml/ identity-federation/trunk/identity-fed-api/src/test/resources/saml/v2/ identity-federation/trunk/identity-fed-api/src/test/resources/saml/v2/authnrequest/ identity-federation/trunk/identity-fed-api/src/test/resources/xml/ identity-federation/trunk/identity-fed-api/src/test/resources/xml/dom/ identity-federation/trunk/identity-fed-core/ identity-federation/trunk/identity-fed-core/src/ identity-federation/trunk/identity-fed-core/src/main/ identity-federation/trunk/identity-fed-core/src/main/java/ identity-federation/trunk/identity-fed-core/src/main/java/org/ identity-federation/trunk/identity-fed-core/src/main/java/org/jboss/ identity-federation/trunk/identity-fed-core/src/main/java/org/jboss/identity/ identity-federation/trunk/identity-fed-core/src/main/java/org/jboss/identity/federation/ identity-federation/trunk/identity-fed-core/src/main/java/org/jboss/identity/federation/core/ identity-federation/trunk/identity-fed-core/src/main/java/org/jboss/identity/federation/core/constants/ identity-federation/trunk/identity-fed-core/src/main/java/org/jboss/identity/federation/core/saml/ identity-federation/trunk/identity-fed-core/src/main/java/org/jboss/identity/federation/core/saml/v2/ identity-federation/trunk/identity-fed-core/src/main/java/org/jboss/identity/federation/core/saml/v2/constants/ identity-federation/trunk/identity-fed-core/src/main/java/org/jboss/identity/federation/core/saml/v2/exceptions/ identity-federation/trunk/identity-fed-core/src/main/java/org/jboss/identity/federation/core/saml/v2/factories/ identity-federation/trunk/identity-fed-core/src/main/java/org/jboss/identity/federation/core/saml/v2/holders/ identity-federation/trunk/identity-fed-core/src/main/java/org/jboss/identity/federation/core/saml/v2/util/ identity-federation/trunk/identity-fed-core/src/main/java/org/jboss/identity/federation/core/xmlenc/ identity-federation/trunk/identity-fed-core/src/main/java/org/jboss/identity/federation/core/xmlenc/factories/ identity-federation/trunk/identity-fed-core/src/main/resources/ identity-federation/trunk/identity-fed-core/src/test/ identity-federation/trunk/identity-fed-core/src/test/java/ identity-federation/trunk/identity-fed-core/src/test/java/org/ identity-federation/trunk/identity-fed-core/src/test/java/org/jboss/ identity-federation/trunk/identity-fed-core/src/test/java/org/jboss/test/ identity-federation/trunk/identity-fed-core/src/test/java/org/jboss/test/identity/ identity-federation/trunk/identity-fed-core/src/test/java/org/jboss/test/identity/federation/ identity-federation/trunk/identity-fed-core/src/test/java/org/jboss/test/identity/federation/core/ identity-federation/trunk/identity-fed-core/src/test/java/org/jboss/test/identity/federation/core/util/ identity-federation/trunk/identity-fed-core/src/test/resources/ identity-federation/trunk/identity-fed-core/src/test/resources/saml-xacml/ identity-federation/trunk/identity-fed-model/ identity-federation/trunk/identity-fed-model/src/ identity-federation/trunk/identity-fed-model/src/main/ identity-federation/trunk/identity-fed-model/src/main/java/ identity-federation/trunk/identity-fed-model/src/main/java/org/ identity-federation/trunk/identity-fed-model/src/main/java/org/jboss/ identity-federation/trunk/identity-fed-model/src/main/java/org/jboss/identity/ identity-federation/trunk/identity-fed-model/src/main/java/org/jboss/identity/federation/ identity-federation/trunk/identity-fed-model/src/main/java/org/jboss/identity/federation/org/ identity-federation/trunk/identity-fed-model/src/main/java/org/jboss/identity/federation/org/xmlsoap/ identity-federation/trunk/identity-fed-model/src/main/java/org/jboss/identity/federation/org/xmlsoap/schemas/ identity-federation/trunk/identity-fed-model/src/main/java/org/jboss/identity/federation/org/xmlsoap/schemas/soap/ identity-federation/trunk/identity-fed-model/src/main/java/org/jboss/identity/federation/org/xmlsoap/schemas/soap/envelope/ identity-federation/trunk/identity-fed-model/src/main/java/org/jboss/identity/federation/saml/ identity-federation/trunk/identity-fed-model/src/main/java/org/jboss/identity/federation/saml/v2/ identity-federation/trunk/identity-fed-model/src/main/java/org/jboss/identity/federation/saml/v2/ac/ identity-federation/trunk/identity-fed-model/src/main/java/org/jboss/identity/federation/saml/v2/ac/classes/ identity-federation/trunk/identity-fed-model/src/main/java/org/jboss/identity/federation/saml/v2/ac/classes/authenticatedtelephony/ identity-federation/trunk/identity-fed-model/src/main/java/org/jboss/identity/federation/saml/v2/ac/classes/internetprotocol/ identity-federation/trunk/identity-fed-model/src/main/java/org/jboss/identity/federation/saml/v2/ac/classes/internetprotocolpassword/ identity-federation/trunk/identity-fed-model/src/main/java/org/jboss/identity/federation/saml/v2/ac/classes/kerberos/ identity-federation/trunk/identity-fed-model/src/main/java/org/jboss/identity/federation/saml/v2/ac/classes/mobileonefactorcontract/ identity-federation/trunk/identity-fed-model/src/main/java/org/jboss/identity/federation/saml/v2/ac/classes/mobileonefactorunregistered/ identity-federation/trunk/identity-fed-model/src/main/java/org/jboss/identity/federation/saml/v2/ac/classes/mobiletwofactorcontract/ identity-federation/trunk/identity-fed-model/src/main/java/org/jboss/identity/federation/saml/v2/ac/classes/mobiletwofactorunregistered/ identity-federation/trunk/identity-fed-model/src/main/java/org/jboss/identity/federation/saml/v2/ac/classes/nomadtelephony/ identity-federation/trunk/identity-fed-model/src/main/java/org/jboss/identity/federation/saml/v2/ac/classes/password/ identity-federation/trunk/identity-fed-model/src/main/java/org/jboss/identity/federation/saml/v2/ac/classes/passwordprotectedtransport/ identity-federation/trunk/identity-fed-model/src/main/java/org/jboss/identity/federation/saml/v2/ac/classes/personalizedtelephony/ identity-federation/trunk/identity-fed-model/src/main/java/org/jboss/identity/federation/saml/v2/ac/classes/pgp/ identity-federation/trunk/identity-fed-model/src/main/java/org/jboss/identity/federation/saml/v2/ac/classes/previoussession/ identity-federation/trunk/identity-fed-model/src/main/java/org/jboss/identity/federation/saml/v2/ac/classes/secureremotepassword/ identity-federation/trunk/identity-fed-model/src/main/java/org/jboss/identity/federation/saml/v2/ac/classes/smartcard/ identity-federation/trunk/identity-fed-model/src/main/java/org/jboss/identity/federation/saml/v2/ac/classes/smartcardpki/ identity-federation/trunk/identity-fed-model/src/main/java/org/jboss/identity/federation/saml/v2/ac/classes/softwarepki/ identity-federation/trunk/identity-fed-model/src/main/java/org/jboss/identity/federation/saml/v2/ac/classes/spki/ identity-federation/trunk/identity-fed-model/src/main/java/org/jboss/identity/federation/saml/v2/ac/classes/telephony/ identity-federation/trunk/identity-fed-model/src/main/java/org/jboss/identity/federation/saml/v2/ac/classes/timesynctoken/ identity-federation/trunk/identity-fed-model/src/main/java/org/jboss/identity/federation/saml/v2/ac/classes/tlsclient/ identity-federation/trunk/identity-fed-model/src/main/java/org/jboss/identity/federation/saml/v2/ac/classes/x509/ identity-federation/trunk/identity-fed-model/src/main/java/org/jboss/identity/federation/saml/v2/ac/classes/xmldsig/ identity-federation/trunk/identity-fed-model/src/main/java/org/jboss/identity/federation/saml/v2/assertion/ identity-federation/trunk/identity-fed-model/src/main/java/org/jboss/identity/federation/saml/v2/generated/ identity-federation/trunk/identity-fed-model/src/main/java/org/jboss/identity/federation/saml/v2/generated/runtime/ identity-federation/trunk/identity-fed-model/src/main/java/org/jboss/identity/federation/saml/v2/metadata/ identity-federation/trunk/identity-fed-model/src/main/java/org/jboss/identity/federation/saml/v2/profiles/ identity-federation/trunk/identity-fed-model/src/main/java/org/jboss/identity/federation/saml/v2/profiles/attribute/ identity-federation/trunk/identity-fed-model/src/main/java/org/jboss/identity/federation/saml/v2/profiles/attribute/dce/ identity-federation/trunk/identity-fed-model/src/main/java/org/jboss/identity/federation/saml/v2/profiles/sso/ identity-federation/trunk/identity-fed-model/src/main/java/org/jboss/identity/federation/saml/v2/profiles/sso/ecp/ identity-federation/trunk/identity-fed-model/src/main/java/org/jboss/identity/federation/saml/v2/profiles/xacml/ identity-federation/trunk/identity-fed-model/src/main/java/org/jboss/identity/federation/saml/v2/profiles/xacml/assertion/ identity-federation/trunk/identity-fed-model/src/main/java/org/jboss/identity/federation/saml/v2/profiles/xacml/protocol/ identity-federation/trunk/identity-fed-model/src/main/java/org/jboss/identity/federation/saml/v2/protocol/ identity-federation/trunk/identity-fed-model/src/main/java/org/jboss/identity/federation/ws/ identity-federation/trunk/identity-fed-model/src/main/java/org/jboss/identity/federation/ws/addressing/ identity-federation/trunk/identity-fed-model/src/main/java/org/jboss/identity/federation/ws/policy/ identity-federation/trunk/identity-fed-model/src/main/java/org/jboss/identity/federation/ws/trust/ identity-federation/trunk/identity-fed-model/src/main/java/org/jboss/identity/federation/ws/wss/ identity-federation/trunk/identity-fed-model/src/main/java/org/jboss/identity/federation/ws/wss/secext/ identity-federation/trunk/identity-fed-model/src/main/java/org/jboss/identity/federation/ws/wss/utility/ identity-federation/trunk/identity-fed-model/src/main/resources/ identity-federation/trunk/identity-fed-model/src/main/resources/schema/ identity-federation/trunk/identity-fed-model/src/main/resources/schema/saml/ identity-federation/trunk/identity-fed-model/src/main/resources/schema/saml/v2/ identity-federation/trunk/identity-fed-model/src/main/resources/schema/wstrust/ identity-federation/trunk/identity-fed-model/src/main/resources/schema/wstrust/v1_3/ identity-federation/trunk/identity-fed-model/src/test/ identity-federation/trunk/identity-fed-model/src/test/java/ identity-federation/trunk/identity-fed-model/src/test/java/org/ identity-federation/trunk/identity-fed-model/src/test/java/org/jboss/ identity-federation/trunk/identity-fed-model/src/test/java/org/jboss/test/ identity-federation/trunk/identity-fed-model/src/test/java/org/jboss/test/identity/ identity-federation/trunk/identity-fed-model/src/test/java/org/jboss/test/identity/federation/ identity-federation/trunk/identity-fed-model/src/test/java/org/jboss/test/identity/federation/ws/ identity-federation/trunk/identity-fed-model/src/test/java/org/jboss/test/identity/federation/ws/trust/ identity-federation/trunk/identity-fed-model/src/test/resources/ identity-federation/trunk/identity-fed-model/src/test/resources/endorsed/ identity-federation/trunk/identity-fed-model/src/test/resources/saml/ identity-federation/trunk/identity-fed-model/src/test/resources/saml/v2/ identity-federation/trunk/identity-fed-model/src/test/resources/wstrust/ identity-federation/trunk/identity-samples/ identity-federation/trunk/identity-samples/employee/ identity-federation/trunk/identity-samples/employee/resources/ identity-federation/trunk/identity-samples/employee/resources/META-INF/ identity-federation/trunk/identity-samples/employee/resources/WEB-INF/ identity-federation/trunk/identity-samples/sales/ identity-federation/trunk/identity-samples/sales/resources/ identity-federation/trunk/identity-samples/sales/resources/META-INF/ identity-federation/trunk/identity-samples/sales/resources/WEB-INF/ identity-federation/trunk/identity-xmlsecmodel/ identity-federation/trunk/identity-xmlsecmodel/src/ identity-federation/trunk/identity-xmlsecmodel/src/main/ identity-federation/trunk/identity-xmlsecmodel/src/main/java/ identity-federation/trunk/identity-xmlsecmodel/src/main/java/org/ identity-federation/trunk/identity-xmlsecmodel/src/main/java/org/jboss/ identity-federation/trunk/identity-xmlsecmodel/src/main/java/org/jboss/identity/ identity-federation/trunk/identity-xmlsecmodel/src/main/java/org/jboss/identity/xmlsec/ identity-federation/trunk/identity-xmlsecmodel/src/main/java/org/jboss/identity/xmlsec/util/ identity-federation/trunk/identity-xmlsecmodel/src/main/java/org/jboss/identity/xmlsec/w3/ identity-federation/trunk/identity-xmlsecmodel/src/main/java/org/jboss/identity/xmlsec/w3/xmldsig/ identity-federation/trunk/identity-xmlsecmodel/src/main/java/org/jboss/identity/xmlsec/w3/xmlenc/ identity-federation/trunk/identity-xmlsecmodel/src/main/resources/ identity-federation/trunk/identity-xmlsecmodel/src/main/resources/schema/ identity-federation/trunk/identity-xmlsecmodel/src/main/resources/schema/w3c/ identity-federation/trunk/identity-xmlsecmodel/src/main/resources/schema/w3c/xmldsig/ identity-federation/trunk/identity-xmlsecmodel/src/main/resources/schema/w3c/xmlenc/ identity-federation/trunk/parent/ Log: Removed eclipse files from the SVN repository. Added .classpath to the SVN ignore list. Updated README with info on how to setup a workspace for the project Property changes on: identity-federation/trunk ___________________________________________________________________ Name: svn:ignore - .settings target target-eclipse .metadata .project + .classpath .project .metadata .settings target target-eclipse Modified: identity-federation/trunk/README.txt =================================================================== --- identity-federation/trunk/README.txt 2009-04-06 17:59:41 UTC (rev 428) +++ identity-federation/trunk/README.txt 2009-04-06 18:34:54 UTC (rev 429) @@ -14,3 +14,11 @@ 7) assembly: Builds up the models, core and api consolidated jars. DOES NOT CONTAIN THE BINDINGS (please look at the platform-build project of JBID where zips are built). +============================================== +Eclipse workspaces + +The SVN repository for the identity project doesn't contain any IDE-specific files. This means that it is up to the developer to setup the workspace for his/her preferred IDE. Maven has plugins that generate the project files for a number of IDEs, which speeds up the process of setting up a workspace for the project. As an example, this section illustrates how to generate the Eclipse .project and .classpath files: + +$ mvn eclipse:eclipse + +The command above will cause maven to build the eclipse files based on the dependencies declared in the modules pom.xml file. After generating the .project and .classpath files, all that is needed is to import the projects (each module will result in a separate eclipse project) in the Eclipse IDE. Property changes on: identity-federation/trunk/assembly ___________________________________________________________________ Name: svn:ignore - .settings target target-eclipse .metadata .project + .classpath .project .metadata .settings target target-eclipse Property changes on: identity-federation/trunk/identity-bindings ___________________________________________________________________ Name: svn:ignore - .settings target target-eclipse .metadata .project + .classpath .project .metadata .settings target target-eclipse Deleted: identity-federation/trunk/identity-bindings/.classpath =================================================================== --- identity-federation/trunk/identity-bindings/.classpath 2009-04-06 17:59:41 UTC (rev 428) +++ identity-federation/trunk/identity-bindings/.classpath 2009-04-06 18:34:54 UTC (rev 429) @@ -1,32 +0,0 @@ -<classpath> - <classpathentry kind="src" path="src/main/java"/> - <classpathentry kind="src" path="src/main/resources" excluding="**/*.java"/> - <classpathentry kind="src" path="src/test/java" output="target/test-classes"/> - <classpathentry kind="src" path="src/test/resources" output="target/test-classes" excluding="**/*.java"/> - <classpathentry kind="output" path="target/classes"/> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> - <classpathentry kind="var" path="M2_REPO/sun-jaf/activation/1.1/activation-1.1.jar"/> - <classpathentry kind="var" path="M2_REPO/org/apache/tomcat/annotations-api/6.0.18/annotations-api-6.0.18.jar"/> - <classpathentry kind="var" path="M2_REPO/org/apache/tomcat/catalina/6.0.18/catalina-6.0.18.jar"/> - <classpathentry kind="var" path="M2_REPO/apache-logging/commons-logging-api/1.0.3/commons-logging-api-1.0.3.jar"/> - <classpathentry kind="var" path="M2_REPO/apache-modeler/commons-modeler/1.1patch/commons-modeler-1.1patch.jar"/> - <classpathentry kind="var" path="M2_REPO/org/apache/tomcat/coyote/6.0.18/coyote-6.0.18.jar"/> - <classpathentry kind="var" path="M2_REPO/sun-jaxb/jaxb-api/2.1.9/jaxb-api-2.1.9.jar" sourcepath="M2_REPO/sun-jaxb/jaxb-api/2.1.9/jaxb-api-2.1.9-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/sun-jaxb/jaxb-impl/2.1.9/jaxb-impl-2.1.9.jar" sourcepath="M2_REPO/sun-jaxb/jaxb-impl/2.1.9/jaxb-impl-2.1.9-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/sun-jaxws/jaxws-api/2.1.1/jaxws-api-2.1.1.jar"/> - <classpathentry kind="src" path="/jboss-identity-fed-api"/> - <classpathentry kind="src" path="/jboss-identity-fed-core"/> - <classpathentry kind="src" path="/jboss-identity-fed-model"/> - <classpathentry kind="src" path="/jboss-identity-xmlsec-model"/> - <classpathentry kind="var" path="M2_REPO/org/jboss/security/jbossxacml/2.0.3.CR1/jbossxacml-2.0.3.CR1.jar" sourcepath="M2_REPO/org/jboss/security/jbossxacml/2.0.3.CR1/jbossxacml-2.0.3.CR1-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/org/apache/tomcat/juli/6.0.18/juli-6.0.18.jar"/> - <classpathentry kind="var" path="M2_REPO/junit/junit/4.4/junit-4.4.jar"/> - <classpathentry kind="var" path="M2_REPO/apache-log4j/log4j/1.2.14/log4j-1.2.14.jar" sourcepath="M2_REPO/apache-log4j/log4j/1.2.14/log4j-1.2.14-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/apache-tomcat/naming-resources/5.5.12/naming-resources-5.5.12.jar"/> - <classpathentry kind="var" path="M2_REPO/javax/servlet/servlet-api/2.4/servlet-api-2.4.jar"/> - <classpathentry kind="var" path="M2_REPO/org/apache/tomcat/servlet-api/6.0.18/servlet-api-6.0.18.jar"/> - <classpathentry kind="var" path="M2_REPO/stax/stax-api/1.0/stax-api-1.0.jar"/> - <classpathentry kind="var" path="M2_REPO/apache-tomcat/tomcat-http/5.5.12/tomcat-http-5.5.12.jar"/> - <classpathentry kind="var" path="M2_REPO/apache-tomcat/tomcat-util/5.5.12/tomcat-util-5.5.12.jar"/> - <classpathentry kind="var" path="M2_REPO/org/apache/xmlsec/1.4.2/xmlsec-1.4.2.jar"/> -</classpath> \ No newline at end of file Property changes on: identity-federation/trunk/identity-bindings/src ___________________________________________________________________ Name: svn:ignore - .settings target target-eclipse .metadata .project + .classpath .project .metadata .settings target target-eclipse Property changes on: identity-federation/trunk/identity-bindings/src/main ___________________________________________________________________ Name: svn:ignore - .settings target target-eclipse .metadata .project + .classpath .project .metadata .settings target target-eclipse Property changes on: identity-federation/trunk/identity-bindings/src/main/java ___________________________________________________________________ Name: svn:ignore - .settings target target-eclipse .metadata .project + .classpath .project .metadata .settings target target-eclipse Property changes on: identity-federation/trunk/identity-bindings/src/main/java/org ___________________________________________________________________ Name: svn:ignore - .settings target target-eclipse .metadata .project + .classpath .project .metadata .settings target target-eclipse Property changes on: identity-federation/trunk/identity-bindings/src/main/java/org/jboss ___________________________________________________________________ Name: svn:ignore - .settings target target-eclipse .metadata .project + .classpath .project .metadata .settings target target-eclipse Property changes on: identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity ___________________________________________________________________ Name: svn:ignore - .settings target target-eclipse .metadata .project + .classpath .project .metadata .settings target target-eclipse Property changes on: identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation ___________________________________________________________________ Name: svn:ignore - .settings target target-eclipse .metadata .project + .classpath .project .metadata .settings target target-eclipse Property changes on: identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings ___________________________________________________________________ Name: svn:ignore - .settings target target-eclipse .metadata .project + .classpath .project .metadata .settings target target-eclipse Property changes on: identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/config ___________________________________________________________________ Name: svn:ignore - .settings target target-eclipse .metadata .project + .classpath .project .metadata .settings target target-eclipse Property changes on: identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/interfaces ___________________________________________________________________ Name: svn:ignore - .settings target target-eclipse .metadata .project + .classpath .project .metadata .settings target target-eclipse Property changes on: identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/jboss ___________________________________________________________________ Name: svn:ignore - .settings target target-eclipse .metadata .project + .classpath .project .metadata .settings target target-eclipse Property changes on: identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/jboss/subject ___________________________________________________________________ Name: svn:ignore - .settings target target-eclipse .metadata .project + .classpath .project .metadata .settings target target-eclipse Property changes on: identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/jboss/trust ___________________________________________________________________ Name: svn:ignore - .settings target target-eclipse .metadata .project + .classpath .project .metadata .settings target target-eclipse Property changes on: identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/servlets ___________________________________________________________________ Name: svn:ignore - .settings target target-eclipse .metadata .project + .classpath .project .metadata .settings target target-eclipse Property changes on: identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/tomcat ___________________________________________________________________ Name: svn:ignore - .settings target target-eclipse .metadata .project + .classpath .project .metadata .settings target target-eclipse Property changes on: identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/tomcat/idp ___________________________________________________________________ Name: svn:ignore - .settings target target-eclipse .metadata .project + .classpath .project .metadata .settings target target-eclipse Property changes on: identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/tomcat/sp ___________________________________________________________________ Name: svn:ignore - .settings target target-eclipse .metadata .project + .classpath .project .metadata .settings target target-eclipse Property changes on: identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/tomcat/sp/holder ___________________________________________________________________ Name: svn:ignore - .settings target target-eclipse .metadata .project + .classpath .project .metadata .settings target target-eclipse Property changes on: identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/util ___________________________________________________________________ Name: svn:ignore - .settings target target-eclipse .metadata .project + .classpath .project .metadata .settings target target-eclipse Property changes on: identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/util/cert ___________________________________________________________________ Name: svn:ignore - .settings target target-eclipse .metadata .project + .classpath .project .metadata .settings target target-eclipse Property changes on: identity-federation/trunk/identity-bindings/src/main/resources ___________________________________________________________________ Name: svn:ignore - .settings target target-eclipse .metadata .project + .classpath .project .metadata .settings target target-eclipse Property changes on: identity-federation/trunk/identity-bindings/src/main/resources/schema ___________________________________________________________________ Name: svn:ignore - .settings target target-eclipse .metadata .project + .classpath .project .metadata .settings target target-eclipse Property changes on: identity-federation/trunk/identity-bindings/src/main/resources/schema/config ___________________________________________________________________ Name: svn:ignore - .settings target target-eclipse .metadata .project + .classpath .project .metadata .settings target target-eclipse Property changes on: identity-federation/trunk/identity-bindings/src/test ___________________________________________________________________ Name: svn:ignore - .settings target target-eclipse .metadata .project + .classpath .project .metadata .settings target target-eclipse Property changes on: identity-federation/trunk/identity-bindings/src/test/java ___________________________________________________________________ Name: svn:ignore - .settings target target-eclipse .metadata .project + .classpath .project .metadata .settings target target-eclipse Property changes on: identity-federation/trunk/identity-bindings/src/test/java/org ___________________________________________________________________ Name: svn:ignore - .settings target target-eclipse .metadata .project + .classpath .project .metadata .settings target target-eclipse Property changes on: identity-federation/trunk/identity-bindings/src/test/java/org/jboss ___________________________________________________________________ Name: svn:ignore - .settings target target-eclipse .metadata .project + .classpath .project .metadata .settings target target-eclipse Property changes on: identity-federation/trunk/identity-bindings/src/test/java/org/jboss/test ___________________________________________________________________ Name: svn:ignore - .settings target target-eclipse .metadata .project + .classpath .project .metadata .settings target target-eclipse Property changes on: identity-federation/trunk/identity-bindings/src/test/java/org/jboss/test/identity ___________________________________________________________________ Name: svn:ignore - .settings target target-eclipse .metadata .project + .classpath .project .metadata .settings target target-eclipse Property changes on: identity-federation/trunk/identity-bindings/src/test/java/org/jboss/test/identity/federation ___________________________________________________________________ Name: svn:ignore - .settings target target-eclipse .metadata .project + .classpath .project .metadata .settings target target-eclipse Property changes on: identity-federation/trunk/identity-bindings/src/test/java/org/jboss/test/identity/federation/bindings ___________________________________________________________________ Name: svn:ignore - .settings target target-eclipse .metadata .project + .classpath .project .metadata .settings target target-eclipse Property changes on: identity-federation/trunk/identity-bindings/src/test/java/org/jboss/test/identity/federation/bindings/config ___________________________________________________________________ Name: svn:ignore - .settings target target-eclipse .metadata .project + .classpath .project .metadata .settings target target-eclipse Property changes on: identity-federation/trunk/identity-bindings/src/test/java/org/jboss/test/identity/federation/bindings/servlets ___________________________________________________________________ Name: svn:ignore - .settings target target-eclipse .metadata .project + .classpath .project .metadata .settings target target-eclipse Property changes on: identity-federation/trunk/identity-bindings/src/test/java/org/jboss/test/identity/federation/bindings/util ___________________________________________________________________ Name: svn:ignore - .settings target target-eclipse .metadata .project + .classpath .project .metadata .settings target target-eclipse Property changes on: identity-federation/trunk/identity-bindings/src/test/java/org/jboss/test/tomcat ___________________________________________________________________ Name: svn:ignore - .settings target target-eclipse .metadata .project + .classpath .project .metadata .settings target target-eclipse Property changes on: identity-federation/trunk/identity-bindings/src/test/java/org/jboss/test/tomcat/bindings ___________________________________________________________________ Name: svn:ignore - .settings target target-eclipse .metadata .project + .classpath .project .metadata .settings target target-eclipse Property changes on: identity-federation/trunk/identity-bindings/src/test/java/org/jboss/test/tomcat/helpers ___________________________________________________________________ Name: svn:ignore - .settings target target-eclipse .metadata .project + .classpath .project .metadata .settings target target-eclipse Property changes on: identity-federation/trunk/identity-bindings/src/test/resources ___________________________________________________________________ Name: svn:ignore - .settings target target-eclipse .metadata .project + .classpath .project .metadata .settings target target-eclipse Property changes on: identity-federation/trunk/identity-bindings/src/test/resources/config ___________________________________________________________________ Name: svn:ignore - .settings target target-eclipse .metadata .project + .classpath .project .metadata .settings target target-eclipse Property changes on: identity-federation/trunk/identity-bindings/src/test/resources/keystore ___________________________________________________________________ Name: svn:ignore - .settings target target-eclipse .metadata .project + .classpath .project .metadata .settings target target-eclipse Property changes on: identity-federation/trunk/identity-bindings/src/test/resources/xacml ___________________________________________________________________ Name: svn:ignore - .settings target target-eclipse .metadata .project + .classpath .project .metadata .settings target target-eclipse Property changes on: identity-federation/trunk/identity-bindings/src/test/resources/xacml/policies ___________________________________________________________________ Name: svn:ignore - .settings target target-eclipse .metadata .project + .classpath .project .metadata .settings target target-eclipse Property changes on: identity-federation/trunk/identity-bindings/src/test/resources/xacml/policies/config ___________________________________________________________________ Name: svn:ignore - .settings target target-eclipse .metadata .project + .classpath .project .metadata .settings target target-eclipse Property changes on: identity-federation/trunk/identity-bindings/src/test/resources/xacml/requests ___________________________________________________________________ Name: svn:ignore - .settings target target-eclipse .metadata .project + .classpath .project .metadata .settings target target-eclipse Property changes on: identity-federation/trunk/identity-bindings-jboss ___________________________________________________________________ Name: svn:ignore - .settings target target-eclipse .metadata .project + .classpath .project .metadata .settings target target-eclipse Deleted: identity-federation/trunk/identity-bindings-jboss/.classpath =================================================================== --- identity-federation/trunk/identity-bindings-jboss/.classpath 2009-04-06 17:59:41 UTC (rev 428) +++ identity-federation/trunk/identity-bindings-jboss/.classpath 2009-04-06 18:34:54 UTC (rev 429) @@ -1,28 +0,0 @@ -<classpath> - <classpathentry kind="src" path="src/main/java"/> - <classpathentry kind="src" path="src/main/resources" excluding="**/*.java"/> - <classpathentry kind="src" path="src/test/java" output="target/test-classes"/> - <classpathentry kind="src" path="src/test/resources" output="target/test-classes" excluding="**/*.java"/> - <classpathentry kind="output" path="target/classes"/> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> - <classpathentry kind="var" path="M2_REPO/org/apache/tomcat/annotations-api/6.0.18/annotations-api-6.0.18.jar"/> - <classpathentry kind="var" path="M2_REPO/org/apache/tomcat/catalina/6.0.18/catalina-6.0.18.jar"/> - <classpathentry kind="var" path="M2_REPO/apache-logging/commons-logging-api/1.0.3/commons-logging-api-1.0.3.jar"/> - <classpathentry kind="var" path="M2_REPO/sun-jaxb/jaxb-api/2.1.9/jaxb-api-2.1.9.jar" sourcepath="M2_REPO/sun-jaxb/jaxb-api/2.1.9/jaxb-api-2.1.9-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/sun-jaxb/jaxb-impl/2.1.9/jaxb-impl-2.1.9.jar" sourcepath="M2_REPO/sun-jaxb/jaxb-impl/2.1.9/jaxb-impl-2.1.9-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/sun-jaxws/jaxws-api/2.1.1/jaxws-api-2.1.1.jar"/> - <classpathentry kind="src" path="/jboss-identity-bindings"/> - <classpathentry kind="src" path="/jboss-identity-fed-api"/> - <classpathentry kind="src" path="/jboss-identity-fed-core"/> - <classpathentry kind="src" path="/jboss-identity-fed-model"/> - <classpathentry kind="src" path="/jboss-identity-xmlsec-model"/> - <classpathentry kind="var" path="M2_REPO/org/jboss/security/jbosssx/2.0.2.SP6/jbosssx-2.0.2.SP6.jar" sourcepath="M2_REPO/org/jboss/security/jbosssx/2.0.2.SP6/jbosssx-2.0.2.SP6-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/org/jboss/security/jbossxacml/2.0.3.CR1/jbossxacml-2.0.3.CR1.jar" sourcepath="M2_REPO/org/jboss/security/jbossxacml/2.0.3.CR1/jbossxacml-2.0.3.CR1-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/org/apache/tomcat/juli/6.0.18/juli-6.0.18.jar"/> - <classpathentry kind="var" path="M2_REPO/junit/junit/4.4/junit-4.4.jar"/> - <classpathentry kind="var" path="M2_REPO/apache-log4j/log4j/1.2.14/log4j-1.2.14.jar" sourcepath="M2_REPO/apache-log4j/log4j/1.2.14/log4j-1.2.14-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/javax/servlet/servlet-api/2.4/servlet-api-2.4.jar"/> - <classpathentry kind="var" path="M2_REPO/org/apache/tomcat/servlet-api/6.0.18/servlet-api-6.0.18.jar"/> - <classpathentry kind="var" path="M2_REPO/stax/stax-api/1.0/stax-api-1.0.jar"/> - <classpathentry kind="var" path="M2_REPO/org/apache/xmlsec/1.4.2/xmlsec-1.4.2.jar"/> -</classpath> \ No newline at end of file Property changes on: identity-federation/trunk/identity-bindings-jboss/src ___________________________________________________________________ Name: svn:ignore - .settings target target-eclipse .metadata .project + .classpath .project .metadata .settings target target-eclipse Property changes on: identity-federation/trunk/identity-bindings-jboss/src/main ___________________________________________________________________ Name: svn:ignore - .settings target target-eclipse .metadata .project + .classpath .project .metadata .settings target target-eclipse Property changes on: identity-federation/trunk/identity-bindings-jboss/src/main/java ___________________________________________________________________ Name: svn:ignore - .settings target target-eclipse .metadata .project + .classpath .project .metadata .settings target target-eclipse Property changes on: identity-federation/trunk/identity-bindings-jboss/src/main/java/org ___________________________________________________________________ Name: svn:ignore - .settings target target-eclipse .metadata .project + .classpath .project .metadata .settings target target-eclipse Property changes on: identity-federation/trunk/identity-bindings-jboss/src/main/java/org/jboss ___________________________________________________________________ Name: svn:ignore - .settings target target-eclipse .metadata .project + .classpath .project .metadata .settings target target-eclipse Property changes on: identity-federation/trunk/identity-bindings-jboss/src/main/java/org/jboss/identity ___________________________________________________________________ Name: svn:ignore - .settings target target-eclipse .metadata .project + .classpath .project .metadata .settings target target-eclipse Property changes on: identity-federation/trunk/identity-bindings-jboss/src/main/java/org/jboss/identity/federation ___________________________________________________________________ Name: svn:ignore - .settings target target-eclipse .metadata .project + .classpath .project .metadata .settings target target-eclipse Property changes on: identity-federation/trunk/identity-bindings-jboss/src/main/java/org/jboss/identity/federation/bindings ___________________________________________________________________ Name: svn:ignore - .settings target target-eclipse .metadata .project + .classpath .project .metadata .settings target target-eclipse Property changes on: identity-federation/trunk/identity-bindings-jboss/src/main/java/org/jboss/identity/federation/bindings/jboss ___________________________________________________________________ Name: svn:ignore - .settings target target-eclipse .metadata .project + .classpath .project .metadata .settings target target-eclipse Property changes on: identity-federation/trunk/identity-bindings-jboss/src/main/java/org/jboss/identity/federation/bindings/jboss/auth ___________________________________________________________________ Name: svn:ignore - .settings target target-eclipse .metadata .project + .classpath .project .metadata .settings target target-eclipse Property changes on: identity-federation/trunk/identity-bindings-jboss/src/main/java/org/jboss/identity/federation/bindings/jboss/reg ___________________________________________________________________ Name: svn:ignore - .settings target target-eclipse .metadata .project + .classpath .project .metadata .settings target target-eclipse Property changes on: identity-federation/trunk/identity-bindings-jboss/src/main/resources ___________________________________________________________________ Name: svn:ignore - .settings target target-eclipse .metadata .project + .classpath .project .metadata .settings target target-eclipse Property changes on: identity-federation/trunk/identity-bindings-jboss/src/test ___________________________________________________________________ Name: svn:ignore - .settings target target-eclipse .metadata .project + .classpath .project .metadata .settings target target-eclipse Property changes on: identity-federation/trunk/identity-bindings-jboss/src/test/java ___________________________________________________________________ Name: svn:ignore - .settings target target-eclipse .metadata .project + .classpath .project .metadata .settings target target-eclipse Property changes on: identity-federation/trunk/identity-bindings-jboss/src/test/resources ___________________________________________________________________ Name: svn:ignore - .settings target target-eclipse .metadata .project + .classpath .project .metadata .settings target target-eclipse Property changes on: identity-federation/trunk/identity-fed-api ___________________________________________________________________ Name: svn:ignore - .settings target target-eclipse .metadata .project + .classpath .project .metadata .settings target target-eclipse Deleted: identity-federation/trunk/identity-fed-api/.classpath =================================================================== --- identity-federation/trunk/identity-fed-api/.classpath 2009-04-06 17:59:41 UTC (rev 428) +++ identity-federation/trunk/identity-fed-api/.classpath 2009-04-06 18:34:54 UTC (rev 429) @@ -1,22 +0,0 @@ -<classpath> - <classpathentry kind="src" path="src/main/java"/> - <classpathentry kind="src" path="src/main/resources" excluding="**/*.java"/> - <classpathentry kind="src" path="src/test/java" output="target/test-classes"/> - <classpathentry kind="src" path="src/test/resources" output="target/test-classes" excluding="**/*.java"/> - <classpathentry kind="output" path="target/classes"/> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> - <classpathentry kind="var" path="M2_REPO/sun-jaf/activation/1.1/activation-1.1.jar"/> - <classpathentry kind="var" path="M2_REPO/apache-logging/commons-logging-api/1.0.3/commons-logging-api-1.0.3.jar"/> - <classpathentry kind="var" path="M2_REPO/sun-jaxb/jaxb-api/2.1.9/jaxb-api-2.1.9.jar" sourcepath="M2_REPO/sun-jaxb/jaxb-api/2.1.9/jaxb-api-2.1.9-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/sun-jaxb/jaxb-impl/2.1.9/jaxb-impl-2.1.9.jar" sourcepath="M2_REPO/sun-jaxb/jaxb-impl/2.1.9/jaxb-impl-2.1.9-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/sun-jaxws/jaxws-api/2.1.1/jaxws-api-2.1.1.jar"/> - <classpathentry kind="src" path="/jboss-identity-fed-core"/> - <classpathentry kind="src" path="/jboss-identity-fed-model"/> - <classpathentry kind="src" path="/jboss-identity-xmlsec-model"/> - <classpathentry kind="var" path="M2_REPO/org/jboss/security/jbossxacml/2.0.3.CR1/jbossxacml-2.0.3.CR1.jar" sourcepath="M2_REPO/org/jboss/security/jbossxacml/2.0.3.CR1/jbossxacml-2.0.3.CR1-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/junit/junit/4.4/junit-4.4.jar"/> - <classpathentry kind="var" path="M2_REPO/apache-log4j/log4j/1.2.14/log4j-1.2.14.jar" sourcepath="M2_REPO/apache-log4j/log4j/1.2.14/log4j-1.2.14-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/codehaus-stax/stax/1.1.1/stax-1.1.1.jar"/> - <classpathentry kind="var" path="M2_REPO/stax/stax-api/1.0/stax-api-1.0.jar"/> - <classpathentry kind="var" path="M2_REPO/org/apache/xmlsec/1.4.2/xmlsec-1.4.2.jar"/> -</classpath> \ No newline at end of file Property changes on: identity-federation/trunk/identity-fed-api/src ___________________________________________________________________ Name: svn:ignore - .settings target target-eclipse .metadata .project + .classpath .project .metadata .settings target target-eclipse Property changes on: identity-federation/trunk/identity-fed-api/src/main ___________________________________________________________________ Name: svn:ignore - .settings target target-eclipse .metadata .project + .classpath .project .metadata .settings target target-eclipse Property changes on: identity-federation/trunk/identity-fed-api/src/main/java ___________________________________________________________________ Name: svn:ignore - .settings target target-eclipse .metadata .project + .classpath .project .metadata .settings target target-eclipse Property changes on: identity-federation/trunk/identity-fed-api/src/main/java/org ___________________________________________________________________ Name: svn:ignore - .settings target target-eclipse .metadata .project + .classpath .project .metadata .settings target target-eclipse Property changes on: identity-federation/trunk/identity-fed-api/src/main/java/org/jboss ___________________________________________________________________ Name: svn:ignore - .settings target target-eclipse .metadata .project + .classpath .project .metadata .settings target target-eclipse Property changes on: identity-federation/trunk/identity-fed-api/src/main/java/org/jboss/identity ___________________________________________________________________ Name: svn:ignore - .settings target target-eclipse .metadata .project + .classpath .project .metadata .settings target target-eclipse Property changes on: identity-federation/trunk/identity-fed-api/src/main/java/org/jboss/identity/federation ___________________________________________________________________ Name: svn:ignore - .settings target target-eclipse .metadata .project + .classpath .project .metadata .settings target target-eclipse Property changes on: identity-federation/trunk/identity-fed-api/src/main/java/org/jboss/identity/federation/api ___________________________________________________________________ Name: svn:ignore - .settings target target-eclipse .metadata .project + .classpath .project .metadata .settings target target-eclipse Property changes on: identity-federation/trunk/identity-fed-api/src/main/java/org/jboss/identity/federation/api/saml ___________________________________________________________________ Name: svn:ignore - .settings target target-eclipse .metadata .project + .classpath .project .metadata .settings target target-eclipse Property changes on: identity-federation/trunk/identity-fed-api/src/main/java/org/jboss/identity/federation/api/saml/v2 ___________________________________________________________________ Name: svn:ignore - .settings target target-eclipse .metadata .project + .classpath .project .metadata .settings target target-eclipse Property changes on: identity-federation/trunk/identity-fed-api/src/main/java/org/jboss/identity/federation/api/saml/v2/common ___________________________________________________________________ Name: svn:ignore - .settings target target-eclipse .metadata .project + .classpath .project .metadata .settings target target-eclipse Property changes on: identity-federation/trunk/identity-fed-api/src/main/java/org/jboss/identity/federation/api/saml/v2/request ___________________________________________________________________ Name: svn:ignore - .settings target target-eclipse .metadata .project + .classpath .project .metadata .settings target target-eclipse Property changes on: identity-federation/trunk/identity-fed-api/src/main/java/org/jboss/identity/federation/api/saml/v2/response ___________________________________________________________________ Name: svn:ignore - .settings target target-eclipse .metadata .project + .classpath .project .metadata .settings target target-eclipse Property changes on: identity-federation/trunk/identity-fed-api/src/main/java/org/jboss/identity/federation/api/util ___________________________________________________________________ Name: svn:ignore - .settings target target-eclipse .metadata .project + .classpath .project .metadata .settings target target-eclipse Property changes on: identity-federation/trunk/identity-fed-api/src/main/java/org/jboss/identity/federation/api/wstrust ___________________________________________________________________ Name: svn:ignore - .settings target target-eclipse .metadata .project + .classpath .project .metadata .settings target target-eclipse Property changes on: identity-federation/trunk/identity-fed-api/src/main/java/org/jboss/identity/federation/api/wstrust/protocol ___________________________________________________________________ Name: svn:ignore - .settings target target-eclipse .metadata .project + .classpath .project .metadata .settings target target-eclipse Property changes on: identity-federation/trunk/identity-fed-api/src/main/resources ___________________________________________________________________ Name: svn:ignore - .settings target target-eclipse .metadata .project + .classpath .project .metadata .settings target target-eclipse Property changes on: identity-federation/trunk/identity-fed-api/src/test ___________________________________________________________________ Name: svn:ignore - .settings target target-eclipse .metadata .project + .classpath .project .metadata .settings target target-eclipse Property changes on: identity-federation/trunk/identity-fed-api/src/test/java ___________________________________________________________________ Name: svn:ignore - .settings target target-eclipse .metadata .project + .classpath .project .metadata .settings target target-eclipse Property changes on: identity-federation/trunk/identity-fed-api/src/test/java/org ___________________________________________________________________ Name: svn:ignore - .settings target target-eclipse .metadata .project + .classpath .project .metadata .settings target target-eclipse Property changes on: identity-federation/trunk/identity-fed-api/src/test/java/org/jboss ___________________________________________________________________ Name: svn:ignore - .settings target target-eclipse .metadata .project + .classpath .project .metadata .settings target target-eclipse Property changes on: identity-federation/trunk/identity-fed-api/src/test/java/org/jboss/test ___________________________________________________________________ Name: svn:ignore - .settings target target-eclipse .metadata .project + .classpath .project .metadata .settings target target-eclipse Property changes on: identity-federation/trunk/identity-fed-api/src/test/java/org/jboss/test/identity ___________________________________________________________________ Name: svn:ignore - .settings target target-eclipse .metadata .project + .classpath .project .metadata .settings target target-eclipse Property changes on: identity-federation/trunk/identity-fed-api/src/test/java/org/jboss/test/identity/federation ___________________________________________________________________ Name: svn:ignore - .settings target target-eclipse .metadata .project + .classpath .project .metadata .settings target target-eclipse Property changes on: identity-federation/trunk/identity-fed-api/src/test/java/org/jboss/test/identity/federation/api ___________________________________________________________________ Name: svn:ignore - .settings target target-eclipse .metadata .project + .classpath .project .metadata .settings target target-eclipse Property changes on: identity-federation/trunk/identity-fed-api/src/test/java/org/jboss/test/identity/federation/api/saml ___________________________________________________________________ Name: svn:ignore - .settings target target-eclipse .metadata .project + .classpath .project .metadata .settings target target-eclipse Property changes on: identity-federation/trunk/identity-fed-api/src/test/java/org/jboss/test/identity/federation/api/saml/v2 ___________________________________________________________________ Name: svn:ignore - .settings target target-eclipse .metadata .project + .classpath .project .metadata .settings target target-eclipse Property changes on: identity-federation/trunk/identity-fed-api/src/test/java/org/jboss/test/identity/federation/api/util ___________________________________________________________________ Name: svn:ignore - .settings target target-eclipse .metadata .project + .classpath .project .metadata .settings target target-eclipse Property changes on: identity-federation/trunk/identity-fed-api/src/test/resources ___________________________________________________________________ Name: svn:ignore - .settings target target-eclipse .metadata .project + .classpath .project .metadata .settings target target-eclipse Property changes on: identity-federation/trunk/identity-fed-api/src/test/resources/endorsed ___________________________________________________________________ Name: svn:ignore - .settings target target-eclipse .metadata .project + .classpath .project .metadata .settings target target-eclipse Property changes on: identity-federation/trunk/identity-fed-api/src/test/resources/saml ___________________________________________________________________ Name: svn:ignore - .settings target target-eclipse .metadata .project + .classpath .project .metadata .settings target target-eclipse Property changes on: identity-federation/trunk/identity-fed-api/src/test/resources/saml/v2 ___________________________________________________________________ Name: svn:ignore - .settings target target-eclipse .metadata .project + .classpath .project .metadata .settings target target-eclipse Property changes on: identity-federation/trunk/identity-fed-api/src/test/resources/saml/v2/authnrequest ___________________________________________________________________ Name: svn:ignore - .settings target target-eclipse .metadata .project + .classpath .project .metadata .settings target target-eclipse Property changes on: identity-federation/trunk/identity-fed-api/src/test/resources/xml ___________________________________________________________________ Name: svn:ignore - .settings target target-eclipse .metadata .project + .classpath .project .metadata .settings target target-eclipse Property changes on: identity-federation/trunk/identity-fed-api/src/test/resources/xml/dom ___________________________________________________________________ Name: svn:ignore - .settings target target-eclipse .metadata .project + .classpath .project .metadata .settings target target-eclipse Property changes on: identity-federation/trunk/identity-fed-core ___________________________________________________________________ Name: svn:ignore - .settings target target-eclipse .metadata .project + .classpath .project .metadata .settings target target-eclipse Deleted: identity-federation/trunk/identity-fed-core/.classpath =================================================================== --- identity-federation/trunk/identity-fed-core/.classpath 2009-04-06 17:59:41 UTC (rev 428) +++ identity-federation/trunk/identity-fed-core/.classpath 2009-04-06 18:34:54 UTC (rev 429) @@ -1,20 +0,0 @@ -<classpath> - <classpathentry kind="src" path="src/main/java"/> - <classpathentry kind="src" path="src/main/resources" excluding="**/*.java"/> - <classpathentry kind="src" path="src/test/java" output="target/test-classes"/> - <classpathentry kind="src" path="src/test/resources" output="target/test-classes" excluding="**/*.java"/> - <classpathentry kind="output" path="target/classes"/> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> - <classpathentry kind="var" path="M2_REPO/sun-jaf/activation/1.1/activation-1.1.jar"/> - <classpathentry kind="var" path="M2_REPO/apache-logging/commons-logging-api/1.0.3/commons-logging-api-1.0.3.jar"/> - <classpathentry kind="var" path="M2_REPO/sun-jaxb/jaxb-api/2.1.9/jaxb-api-2.1.9.jar" sourcepath="M2_REPO/sun-jaxb/jaxb-api/2.1.9/jaxb-api-2.1.9-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/sun-jaxb/jaxb-impl/2.1.9/jaxb-impl-2.1.9.jar" sourcepath="M2_REPO/sun-jaxb/jaxb-impl/2.1.9/jaxb-impl-2.1.9-sources.jar"/> - <classpathentry kind="src" path="/jboss-identity-fed-model"/> - <classpathentry kind="src" path="/jboss-identity-xmlsec-model"/> - <classpathentry kind="var" path="M2_REPO/org/jboss/security/jbossxacml/2.0.3.CR1/jbossxacml-2.0.3.CR1.jar" sourcepath="M2_REPO/org/jboss/security/jbossxacml/2.0.3.CR1/jbossxacml-2.0.3.CR1-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/junit/junit/4.4/junit-4.4.jar"/> - <classpathentry kind="var" path="M2_REPO/apache-log4j/log4j/1.2.14/log4j-1.2.14.jar" sourcepath="M2_REPO/apache-log4j/log4j/1.2.14/log4j-1.2.14-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/codehaus-stax/stax/1.1.1/stax-1.1.1.jar"/> - <classpathentry kind="var" path="M2_REPO/stax/stax-api/1.0/stax-api-1.0.jar"/> - <classpathentry kind="var" path="M2_REPO/org/apache/xmlsec/1.4.2/xmlsec-1.4.2.jar"/> -</classpath> \ No newline at end of file Property changes on: identity-federation/trunk/identity-fed-core/src ___________________________________________________________________ Name: svn:ignore - .settings target target-eclipse .metadata .project + .classpath .project .metadata .settings target target-eclipse Property changes on: identity-federation/trunk/identity-fed-core/src/main ___________________________________________________________________ Name: svn:ignore - .settings target target-eclipse .metadata .project + .classpath .project .metadata .settings target target-eclipse Property changes on: identity-federation/trunk/identity-fed-core/src/main/java ___________________________________________________________________ Name: svn:ignore - .settings target target-eclipse .metadata .project + .classpath .project .metadata .settings target target-eclipse Property changes on: identity-federation/trunk/identity-fed-core/src/main/java/org ___________________________________________________________________ Name: svn:ignore - .settings target target-eclipse .metadata .project + .classpath .project .metadata .settings target target-eclipse Property changes on: identity-federation/trunk/identity-fed-core/src/main/java/org/jboss ___________________________________________________________________ Name: svn:ignore - .settings target target-eclipse .metadata .project + .classpath .project .metadata .settings target target-eclipse Property changes on: identity-federation/trunk/identity-fed-core/src/main/java/org/jboss/identity ___________________________________________________________________ Name: svn:ignore - .settings target target-eclipse .metadata .project + .classpath .project .metadata .settings target target-eclipse Property changes on: identity-federation/trunk/identity-fed-core/src/main/java/org/jboss/identity/federation ___________________________________________________________________ Name: svn:ignore - .settings target target-eclipse .metadata .project + .classpath .project .metadata .settings target target-eclipse Property changes on: identity-federation/trunk/identity-fed-core/src/main/java/org/jboss/identity/federation/core ___________________________________________________________________ Name: svn:ignore - .settings target target-eclipse .metadata .project + .classpath .project .metadata .settings target target-eclipse Property changes on: identity-federation/trunk/identity-fed-core/src/main/java/org/jboss/identity/federation/core/constants ___________________________________________________________________ Name: svn:ignore - .settings target target-eclipse .metadata .project + .classpath .project .metadata .settings target target-eclipse Property changes on: identity-federation/trunk/identity-fed-core/src/main/java/org/jboss/identity/federation/core/saml ___________________________________________________________________ Name: svn:ignore - .settings target target-eclipse .metadata .project + .classpath .project .metadata .settings target target-eclipse Property changes on: identity-federation/trunk/identity-fed-core/src/main/java/org/jboss/identity/federation/core/saml/v2 ___________________________________________________________________ Name: svn:ignore - .settings target target-eclipse .metadata .project + .classpath .project .metadata .settings target target-eclipse Property changes on: identity-federation/trunk/identity-fed-core/src/main/java/org/jboss/identity/federation/core/saml/v2/constants ___________________________________________________________________ Name: svn:ignore - .settings target target-eclipse .metadata .project + .classpath .project .metadata .settings target target-eclipse Property changes on: identity-federation/trunk/identity-fed-core/src/main/java/org/jboss/identity/federation/core/saml/v2/exceptions ___________________________________________________________________ Name: svn:ignore - .settings target target-eclipse .metadata .project + .classpath .project .metadata .settings target target-eclipse Property changes on: identity-federation/trunk/identity-fed-core/src/main/java/org/jboss/identity/federation/core/saml/v2/factories ___________________________________________________________________ Name: svn:ignore - .settings target target-eclipse .metadata .project + .classpath .project .metadata .settings target target-eclipse Property changes on: identity-federation/trunk/identity-fed-core/src/main/java/org/jboss/identity/federation/core/saml/v2/holders ___________________________________________________________________ Name: svn:ignore - .settings target target-eclipse .metadata .project + .classpath .project .metadata .settings target target-eclipse Property changes on: identity-federation/trunk/identity-fed-core/src/main/java/org/jboss/identity/federation/core/saml/v2/util ___________________________________________________________________ Name: svn:ignore - .settings target target-eclipse .metadata .project + .classpath .project .metadata .settings target target-eclipse Property changes on: identity-federation/trunk/identity-fed-core/src/main/java/org/jboss/identity/federation/core/xmlenc ___________________________________________________________________ Name: svn:ignore - .settings target target-eclipse .metadata .project + .classpath .project .metadata .settings target target-eclipse Property changes on: identity-federation/trunk/identity-fed-core/src/main/java/org/jboss/identity/federation/core/xmlenc/factories ___________________________________________________________________ Name: svn:ignore - .settings target target-eclipse .metadata .project + .classpath .project .metadata .settings target target-eclipse Property changes on: identity-federation/trunk/identity-fed-core/src/main/resources ___________________________________________________________________ Name: svn:ignore - .settings target target-eclipse .metadata .project + .classpath .project .metadata .settings target target-eclipse Property changes on: identity-federation/trunk/identity-fed-core/src/test ___________________________________________________________________ Name: svn:ignore - .settings target target-eclipse .metadata .project + .classpath .project .metadata .settings target target-eclipse Property changes on: identity-federation/trunk/identity-fed-core/src/test/java ___________________________________________________________________ Name: svn:ignore - .settings target target-eclipse .metadata .project + .classpath .project .metadata .settings target target-eclipse Property changes on: identity-federation/trunk/identity-fed-core/src/test/java/org ___________________________________________________________________ Name: svn:ignore - .settings target target-eclipse .metadata .project + .classpath .project .metadata .settings target target-eclipse Property changes on: identity-federation/trunk/identity-fed-core/src/test/java/org/jboss ___________________________________________________________________ Name: svn:ignore - .settings target target-eclipse .metadata .project + .classpath .project .metadata .settings target target-eclipse Property changes on: identity-federation/trunk/identity-fed-core/src/test/java/org/jboss/test ___________________________________________________________________ Name: svn:ignore - .settings target target-eclipse .metadata .project + .classpath .project .metadata .settings target target-eclipse Property changes on: identity-federation/trunk/identity-fed-core/src/test/java/org/jboss/test/identity ___________________________________________________________________ Name: svn:ignore - .settings target target-eclipse .metadata .project + .classpath .project .metadata .settings target target-eclipse Property changes on: identity-federation/trunk/identity-fed-core/src/test/java/org/jboss/test/identity/federation ___________________________________________________________________ Name: svn:ignore - .settings target target-eclipse .metadata .project + .classpath .project .metadata .settings target target-eclipse Property changes on: identity-federation/trunk/identity-fed-core/src/test/java/org/jboss/test/identity/federation/core ___________________________________________________________________ Name: svn:ignore - .settings target target-eclipse .metadata .project + .classpath .project .metadata .settings target target-eclipse Property changes on: identity-federation/trunk/identity-fed-core/src/test/java/org/jboss/test/identity/federation/core/util ___________________________________________________________________ Name: svn:ignore - .settings target target-eclipse .metadata .project + .classpath .project .metadata .settings target target-eclipse Property changes on: identity-federation/trunk/identity-fed-core/src/test/resources ___________________________________________________________________ Name: svn:ignore - .settings target target-eclipse .metadata .project + .classpath .project .metadata .settings target target-eclipse Property changes on: identity-federation/trunk/identity-fed-core/src/test/resources/saml-xacml ___________________________________________________________________ Name: svn:ignore - .settings target target-eclipse .metadata .project + .classpath .project .metadata .settings target target-eclipse Property changes on: identity-federation/trunk/identity-fed-model ___________________________________________________________________ Name: svn:ignore - .settings target target-eclipse .metadata .project + .classpath .project .metadata .settings target target-eclipse Deleted: identity-federation/trunk/identity-fed-model/.classpath =================================================================== --- identity-federation/trunk/identity-fed-model/.classpath 2009-04-06 17:59:41 UTC (rev 428) +++ identity-federation/trunk/identity-fed-model/.classpath 2009-04-06 18:34:54 UTC (rev 429) @@ -1,20 +0,0 @@ -<classpath> - <classpathentry kind="src" path="src/main/java"/> - <classpathentry kind="src" path="src/main/resources" excluding="**/*.java"/> - <classpathentry kind="src" path="src/test/java" output="target/test-classes"/> - <classpathentry kind="src" path="src/test/resources" output="target/test-classes" excluding="**/*.java"/> - <classpathentry kind="output" path="target/classes"/> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> - <classpathentry kind="var" path="M2_REPO/sun-jaf/activation/1.1/activation-1.1.jar"/> - <classpathentry kind="var" path="M2_REPO/apache-logging/commons-logging-api/1.0.3/commons-logging-api-1.0.3.jar"/> - <classpathentry kind="var" path="M2_REPO/sun-jaxb/jaxb-api/2.1.9/jaxb-api-2.1.9.jar" sourcepath="M2_REPO/sun-jaxb/jaxb-api/2.1.9/jaxb-api-2.1.9-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/sun-jaxb/jaxb-impl/2.1.9/jaxb-impl-2.1.9.jar" sourcepath="M2_REPO/sun-jaxb/jaxb-impl/2.1.9/jaxb-impl-2.1.9-sources.jar"/> - <classpathentry kind="src" path="/jboss-identity-xmlsec-model"/> - <classpathentry kind="var" path="M2_REPO/org/jboss/security/jbossxacml/2.0.3.CR1/jbossxacml-2.0.3.CR1.jar" sourcepath="M2_REPO/org/jboss/security/jbossxacml/2.0.3.CR1/jbossxacml-2.0.3.CR1-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/junit/junit/4.4/junit-4.4.jar"/> - <classpathentry kind="var" path="M2_REPO/apache-log4j/log4j/1.2.14/log4j-1.2.14.jar" sourcepath="M2_REPO/apache-log4j/log4j/1.2.14/log4j-1.2.14-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/apache-xalan/serializer/2.7.0.patch01-brew/serializer-2.7.0.patch01-brew.jar"/> - <classpathentry kind="var" path="M2_REPO/codehaus-stax/stax/1.1.1/stax-1.1.1.jar"/> - <classpathentry kind="var" path="M2_REPO/stax/stax-api/1.0/stax-api-1.0.jar"/> - <classpathentry kind="var" path="M2_REPO/org/apache/xmlsec/1.4.2/xmlsec-1.4.2.jar"/> -</classpath> \ No newline at end of file Property changes on: identity-federation/trunk/identity-fed-model/src ___________________________________________________________________ Name: svn:ignore - .settings target target-eclipse .metadata .project + .classpath .project .metadata .settings target target-eclipse Property changes on: identity-federation/trunk/identity-fed-model/src/main ___________________________________________________________________ Name: svn:ignore - .settings target target-eclipse .metadata .project + .classpath .project .metadata .settings target target-eclipse Property changes on: identity-federation/trunk/identity-fed-model/src/main/java ___________________________________________________________________ Name: svn:ignore - .settings target target-eclipse .metadata .project + .classpath .project .metadata .settings target target-eclipse Property changes on: identity-federation/trunk/identity-fed-model/src/main/java/org ___________________________________________________________________ Name: svn:ignore - .settings target target-eclipse .metadata .project + .classpath .project .metadata .settings target target-eclipse Property changes on: identity-federation/trunk/identity-fed-model/src/main/java/org/jboss ___________________________________________________________________ Name: svn:ignore - .settings target target-eclipse .metadata .project + .classpath .project .metadata .settings target target-eclipse Property changes on: identity-federation/trunk/identity-fed-model/src/main/java/org/jboss/identity ___________________________________________________________________ Name: svn:ignore - .settings target target-eclipse .metadata .project + .classpath .project .metadata .settings target target-eclipse Property changes on: identity-federation/trunk/identity-fed-model/src/main/java/org/jboss/identity/federation ___________________________________________________________________ Name: svn:ignore - .settings target target-eclipse .metadata .project + .classpath .project .metadata .settings target target-eclipse Property changes on: identity-federation/trunk/identity-fed-model/src/main/java/org/jboss/identity/federation/org ___________________________________________________________________ Name: svn:ignore - .settings target target-eclipse .metadata .project + .classpath .project .metadata .settings target target-eclipse Property changes on: identity-federation/trunk/identity-fed-model/src/main/java/org/jboss/identity/federation/org/xmlsoap ___________________________________________________________________ Name: svn:ignore - .settings target target-eclipse .metadata .project + .classpath .project .metadata .settings target target-eclipse Property changes on: identity-federation/trunk/identity-fed-model/src/main/java/org/jboss/identity/federation/org/xmlsoap/schemas ___________________________________________________________________ Name: svn:ignore - .settings target target-eclipse .metadata .project + .classpath .project .metadata .settings target target-eclipse Property changes on: identity-federation/trunk/identity-fed-model/src/main/java/org/jboss/identity/federation/org/xmlsoap/schemas/soap ___________________________________________________________________ Name: svn:ignore - .settings target target-eclipse .metadata .project + .classpath .project .metadata .settings target target-eclipse Property changes on: identity-federation/trunk/identity-fed-model/src/main/java/org/jboss/identity/federation/org/xmlsoap/schemas/soap/envelope ___________________________________________________________________ Name: svn:ignore - .settings target target-eclipse .metadata .project + .classpath .project .metadata .settings target target-eclipse Property changes on: identity-federation/trunk/identity-fed-model/src/main/java/org/jboss/identity/federation/saml ___________________________________________________________________ Name: svn:ignore - .settings target target-eclipse .metadata .project + .classpath .project .metadata .settings target target-eclipse Property changes on: identity-federation/trunk/identity-fed-model/src/main/java/org/jboss/identity/federation/saml/v2 ___________________________________________________________________ Name: svn:ignore - .settings target target-eclipse .metadata .project + .classpath .project .metadata .settings target target-eclipse Property changes on: identity-federation/trunk/identity-fed-model/src/main/java/org/jboss/identity/federation/saml/v2/ac ___________________________________________________________________ Name: svn:ignore - .settings target target-eclipse .metadata .project + .classpath .project .metadata .settings target target-eclipse Property changes on: identity-federation/trunk/identity-fed-model/src/main/java/org/jboss/identity/federation/saml/v2/ac/classes ___________________________________________________________________ Name: svn:ignore - .settings target target-eclipse .metadata .project + .classpath .project .metadata .settings target target-eclipse Property changes on: identity-federation/trunk/identity-fed-model/src/main/java/org/jboss/identity/federation/saml/v2/ac/classes/authenticatedtelephony ___________________________________________________________________ Name: svn:ignore - .settings target target-eclipse .metadata .project + .classpath .project .metadata .settings target target-eclipse Property changes on: identity-federation/trunk/identity-fed-model/src/main/java/org/jboss/identity/federation/saml/v2/ac/classes/internetprotocol ___________________________________________________________________ Name: svn:ignore - .settings target target-eclipse .metadata .project + .classpath .project .metadata .settings target target-eclipse Property changes on: identity-federation/trunk/identity-fed-model/src/main/java/org/jboss/identity/federation/saml/v2/ac/classes/internetprotocolpassword ___________________________________________________________________ Name: svn:ignore - .settings target target-eclipse .metadata .project + .classpath .project .metadata .settings target target-eclipse Property changes on: identity-federation/trunk/identity-fed-model/src/main/java/org/jboss/identity/federation/saml/v2/ac/classes/kerberos ___________________________________________________________________ Name: svn:ignore - .settings target target-eclipse .metadata .project + .classpath .project .metadata .settings target target-eclipse Property changes on: identity-federation/trunk/identity-fed-model/src/main/java/org/jboss/identity/federation/saml/v2/ac/classes/mobileonefactorcontract ___________________________________________________________________ Name: svn:ignore - .settings target target-eclipse .metadata .project + .classpath .project .metadata .settings target target-eclipse Property changes on: identity-federation/trunk/identity-fed-model/src/main/java/org/jboss/identity/federation/saml/v2/ac/classes/mobileonefactorunregistered ___________________________________________________________________ Name: svn:ignore - .settings target target-eclipse .metadata .project + .classpath .project .metadata .settings target target-eclipse Property changes on: identity-federation/trunk/identity-fed-model/src/main/java/org/jboss/identity/federation/saml/v2/ac/classes/mobiletwofactorcontract ___________________________________________________________________ Name: svn:ignore - .settings target target-eclipse .metadata .project + .classpath .project .metadata .settings target target-eclipse Property changes on: identity-federation/trunk/identity-fed-model/src/main/java/org/jboss/identity/federation/saml/v2/ac/classes/mobiletwofactorunregistered ___________________________________________________________________ Name: svn:ignore - .settings target target-eclipse .metadata .project + .classpath .project .metadata .settings target target-eclipse Property changes on: identity-federation/trunk/identity-fed-model/src/main/java/org/jboss/identity/federation/saml/v2/ac/classes/nomadtelephony ___________________________________________________________________ Name: svn:ignore - .settings target target-eclipse .metadata .project + .classpath .project .metadata .settings target target-eclipse Property changes on: identity-federation/trunk/identity-fed-model/src/main/java/org/jboss/identity/federation/saml/v2/ac/classes/password ___________________________________________________________________ Name: svn:ignore - .settings target target-eclipse .metadata .project + .classpath .project .metadata .settings target target-eclipse Property changes on: identity-federation/trunk/identity-fed-model/src/main/java/org/jboss/identity/federation/saml/v2/ac/classes/passwordprotectedtransport ___________________________________________________________________ Name: svn:ignore - .settings target target-eclipse .metadata .project + .classpath .project .metadata .settings target target-eclipse Property changes on: identity-federation/trunk/identity-fed-model/src/main/java/org/jboss/identity/federation/saml/v2/ac/classes/personalizedtelephony ___________________________________________________________________ Name: svn:ignore - .settings target target-eclipse .metadata .project + .classpath .project .metadata .settings target target-eclipse Property changes on: identity-federation/trunk/identity-fed-model/src/main/java/org/jboss/identity/federation/saml/v2/ac/classes/pgp ___________________________________________________________________ Name: svn:ignore - .settings target target-eclipse .metadata .project + .classpath .project .metadata .settings target target-eclipse Property changes on: identity-federation/trunk/identity-fed-model/src/main/java/org/jboss/identity/federation/saml/v2/ac/classes/previoussession ___________________________________________________________________ Name: svn:ignore - .settings target target-eclipse .metadata .project + .classpath .project .metadata .settings target target-eclipse Property changes on: identity-federation/trunk/identity-fed-model/src/main/java/org/jboss/identity/federation/saml/v2/ac/classes/secureremotepassword ___________________________________________________________________ Name: svn:ignore - .settings target target-eclipse .metadata .project + .classpath .project .metadata .settings target target-eclipse Property changes on: identity-federation/trunk/identity-fed-model/src/main/java/org/jboss/identity/federation/saml/v2/ac/classes/smartcard ___________________________________________________________________ Name: svn:ignore - .settings target target-eclipse .metadata .project + .classpath .project .metadata .settings target target-eclipse Property changes on: identity-federation/trunk/identity-fed-model/src/main/java/org/jboss/identity/federation/saml/v2/ac/classes/smartcardpki ___________________________________________________________________ Name: svn:ignore - .settings target target-eclipse .metadata .project + .classpath .project .metadata .settings target target-eclipse Property changes on: identity-federation/trunk/identity-fed-model/src/main/java/org/jboss/identity/federation/saml/v2/ac/classes/softwarepki ___________________________________________________________________ Name: svn:ignore - .settings target target-eclipse .metadata .project + .classpath .project .metadata .settings target target-eclipse Property changes on: identity-federation/trunk/identity-fed-model/src/main/java/org/jboss/identity/federation/saml/v2/ac/classes/spki ___________________________________________________________________ Name: svn:ignore - .settings target target-eclipse .metadata .project + .classpath .project .metadata .settings target target-eclipse Property changes on: identity-federation/trunk/identity-fed-model/src/main/java/org/jboss/identity/federation/saml/v2/ac/classes/telephony ___________________________________________________________________ Name: svn:ignore - .settings target target-eclipse .metadata .project + .classpath .project .metadata .settings target target-eclipse Property changes on: identity-federation/trunk/identity-fed-model/src/main/java/org/jboss/identity/federation/saml/v2/ac/classes/timesynctoken ___________________________________________________________________ Name: svn:ignore - .settings target target-eclipse .metadata .project + .classpath .project .metadata .settings target target-eclipse Property changes on: identity-federation/trunk/identity-fed-model/src/main/java/org/jboss/identity/federation/saml/v2/ac/classes/tlsclient ___________________________________________________________________ Name: svn:ignore - .settings target target-eclipse .metadata .project + .classpath .project .metadata .settings target target-eclipse Property changes on: identity-federation/trunk/identity-fed-model/src/main/java/org/jboss/identity/federation/saml/v2/ac/classes/x509 ___________________________________________________________________ Name: svn:ignore - .settings target target-eclipse .metadata .project + .classpath .project .metadata .settings target target-eclipse Property changes on: identity-federation/trunk/identity-fed-model/src/main/java/org/jboss/identity/federation/saml/v2/ac/classes/xmldsig ___________________________________________________________________ Name: svn:ignore - .settings target target-eclipse .metadata .project + .classpath .project .metadata .settings target target-eclipse Property changes on: identity-federation/trunk/identity-fed-model/src/main/java/org/jboss/identity/federation/saml/v2/assertion ___________________________________________________________________ Name: svn:ignore - .settings target target-eclipse .metadata .project + .classpath .project .metadata .settings target target-eclipse Property changes on: identity-federation/trunk/identity-fed-model/src/main/java/org/jboss/identity/federation/saml/v2/generated ___________________________________________________________________ Name: svn:ignore - .settings target target-eclipse .metadata .project + .classpath .project .metadata .settings target target-eclipse Property changes on: identity-federation/trunk/identity-fed-model/src/main/java/org/jboss/identity/federation/saml/v2/generated/runtime ___________________________________________________________________ Name: svn:ignore - .settings target target-eclipse .metadata .project + .classpath .project .metadata .settings target target-eclipse Property changes on: identity-federation/trunk/identity-fed-model/src/main/java/org/jboss/identity/federation/saml/v2/metadata ___________________________________________________________________ Name: svn:ignore - .settings target target-eclipse .metadata .project + .classpath .project .metadata .settings target target-eclipse Property changes on: identity-federation/trunk/identity-fed-model/src/main/java/org/jboss/identity/federation/saml/v2/profiles ___________________________________________________________________ Name: svn:ignore - .settings target target-eclipse .metadata .project + .classpath .project .metadata .settings target target-eclipse Property changes on: identity-federation/trunk/identity-fed-model/src/main/java/org/jboss/identity/federation/saml/v2/profiles/attribute ___________________________________________________________________ Name: svn:ignore - .settings target target-eclipse .metadata .project + .classpath .project .metadata .settings target target-eclipse Property changes on: identity-federation/trunk/identity-fed-model/src/main/java/org/jboss/identity/federation/saml/v2/profiles/attribute/dce ___________________________________________________________________ Name: svn:ignore - .settings target target-eclipse .metadata .project + .classpath .project .metadata .settings target target-eclipse Property changes on: identity-federation/trunk/identity-fed-model/src/main/java/org/jboss/identity/federation/saml/v2/profiles/sso ___________________________________________________________________ Name: svn:ignore - .settings target target-eclipse .metadata .project + .classpath .project .metadata .settings target target-eclipse Property changes on: identity-federation/trunk/identity-fed-model/src/main/java/org/jboss/identity/federation/saml/v2/profiles/sso/ecp ___________________________________________________________________ Name: svn:ignore - .settings target target-eclipse .metadata .project + .classpath .project .metadata .settings target target-eclipse Property changes on: identity-federation/trunk/identity-fed-model/src/main/java/org/jboss/identity/federation/saml/v2/profiles/xacml ___________________________________________________________________ Name: svn:ignore - .settings target target-eclipse .metadata .project + .classpath .project .metadata .settings target target-eclipse Property changes on: identity-federation/trunk/identity-fed-model/src/main/java/org/jboss/identity/federation/saml/v2/profiles/xacml/assertion ___________________________________________________________________ Name: svn:ignore - .settings target target-eclipse .metadata .project + .classpath .project .metadata .settings target target-eclipse Property changes on: identity-federation/trunk/identity-fed-model/src/main/java/org/jboss/identity/federation/saml/v2/profiles/xacml/protocol ___________________________________________________________________ Name: svn:ignore - .settings target target-eclipse .metadata .project + .classpath .project .metadata .settings target target-eclipse Property changes on: identity-federation/trunk/identity-fed-model/src/main/java/org/jboss/identity/federation/saml/v2/protocol ___________________________________________________________________ Name: svn:ignore - .settings target target-eclipse .metadata .project + .classpath .project .metadata .settings target target-eclipse Property changes on: identity-federation/trunk/identity-fed-model/src/main/java/org/jboss/identity/federation/ws ___________________________________________________________________ Name: svn:ignore - .settings target target-eclipse .metadata .project + .classpath .project .metadata .settings target target-eclipse Property changes on: identity-federation/trunk/identity-fed-model/src/main/java/org/jboss/identity/federation/ws/addressing ___________________________________________________________________ Name: svn:ignore - .settings target target-eclipse .metadata .project + .classpath .project .metadata .settings target target-eclipse Property changes on: identity-federation/trunk/identity-fed-model/src/main/java/org/jboss/identity/federation/ws/policy ___________________________________________________________________ Name: svn:ignore - .settings target target-eclipse .metadata .project + .classpath .project .metadata .settings target target-eclipse Property changes on: identity-federation/trunk/identity-fed-model/src/main/java/org/jboss/identity/federation/ws/trust ___________________________________________________________________ Name: svn:ignore - .settings target target-eclipse .metadata .project + .classpath .project .metadata .settings target target-eclipse Property changes on: identity-federation/trunk/identity-fed-model/src/main/java/org/jboss/identity/federation/ws/wss ___________________________________________________________________ Name: svn:ignore - .settings target target-eclipse .metadata .project + .classpath .project .metadata .settings target target-eclipse Property changes on: identity-federation/trunk/identity-fed-model/src/main/java/org/jboss/identity/federation/ws/wss/secext ___________________________________________________________________ Name: svn:ignore - .settings target target-eclipse .metadata .project + .classpath .project .metadata .settings target target-eclipse Property changes on: identity-federation/trunk/identity-fed-model/src/main/java/org/jboss/identity/federation/ws/wss/utility ___________________________________________________________________ Name: svn:ignore - .settings target target-eclipse .metadata .project + .classpath .project .metadata .settings target target-eclipse Property changes on: identity-federation/trunk/identity-fed-model/src/main/resources ___________________________________________________________________ Name: svn:ignore - .settings target target-eclipse .metadata .project + .classpath .project .metadata .settings target target-eclipse Property changes on: identity-federation/trunk/identity-fed-model/src/main/resources/schema ___________________________________________________________________ Name: svn:ignore - .settings target target-eclipse .metadata .project + .classpath .project .metadata .settings target target-eclipse Property changes on: identity-federation/trunk/identity-fed-model/src/main/resources/schema/saml ___________________________________________________________________ Name: svn:ignore - .settings target target-eclipse .metadata .project + .classpath .project .metadata .settings target target-eclipse Property changes on: identity-federation/trunk/identity-fed-model/src/main/resources/schema/saml/v2 ___________________________________________________________________ Name: svn:ignore - .settings target target-eclipse .metadata .project + .classpath .project .metadata .settings target target-eclipse Property changes on: identity-federation/trunk/identity-fed-model/src/main/resources/schema/wstrust ___________________________________________________________________ Name: svn:ignore - .settings target target-eclipse .metadata .project + .classpath .project .metadata .settings target target-eclipse Property changes on: identity-federation/trunk/identity-fed-model/src/main/resources/schema/wstrust/v1_3 ___________________________________________________________________ Name: svn:ignore - .settings target target-eclipse .metadata .project + .classpath .project .metadata .settings target target-eclipse Property changes on: identity-federation/trunk/identity-fed-model/src/test ___________________________________________________________________ Name: svn:ignore - .settings target target-eclipse .metadata .project + .classpath .project .metadata .settings target target-eclipse Property changes on: identity-federation/trunk/identity-fed-model/src/test/java ___________________________________________________________________ Name: svn:ignore - .settings target target-eclipse .metadata .project + .classpath .project .metadata .settings target target-eclipse Property changes on: identity-federation/trunk/identity-fed-model/src/test/java/org ___________________________________________________________________ Name: svn:ignore - .settings target target-eclipse .metadata .project + .classpath .project .metadata .settings target target-eclipse Property changes on: identity-federation/trunk/identity-fed-model/src/test/java/org/jboss ___________________________________________________________________ Name: svn:ignore - .settings target target-eclipse .metadata .project + .classpath .project .metadata .settings target target-eclipse Property changes on: identity-federation/trunk/identity-fed-model/src/test/java/org/jboss/test ___________________________________________________________________ Name: svn:ignore - .settings target target-eclipse .metadata .project + .classpath .project .metadata .settings target target-eclipse Property changes on: identity-federation/trunk/identity-fed-model/src/test/java/org/jboss/test/identity ___________________________________________________________________ Name: svn:ignore - .settings target target-eclipse .metadata .project + .classpath .project .metadata .settings target target-eclipse Property changes on: identity-federation/trunk/identity-fed-model/src/test/java/org/jboss/test/identity/federation ___________________________________________________________________ Name: svn:ignore - .settings target target-eclipse .metadata .project + .classpath .project .metadata .settings target target-eclipse Property changes on: identity-federation/trunk/identity-fed-model/src/test/java/org/jboss/test/identity/federation/ws ___________________________________________________________________ Name: svn:ignore - .settings target target-eclipse .metadata .project + .classpath .project .metadata .settings target target-eclipse Property changes on: identity-federation/trunk/identity-fed-model/src/test/java/org/jboss/test/identity/federation/ws/trust ___________________________________________________________________ Name: svn:ignore - .settings target target-eclipse .metadata .project + .classpath .project .metadata .settings target target-eclipse Property changes on: identity-federation/trunk/identity-fed-model/src/test/resources ___________________________________________________________________ Name: svn:ignore - .settings target target-eclipse .metadata .project + .classpath .project .metadata .settings target target-eclipse Property changes on: identity-federation/trunk/identity-fed-model/src/test/resources/endorsed ___________________________________________________________________ Name: svn:ignore - .settings target target-eclipse .metadata .project + .classpath .project .metadata .settings target target-eclipse Property changes on: identity-federation/trunk/identity-fed-model/src/test/resources/saml ___________________________________________________________________ Name: svn:ignore - .settings target target-eclipse .metadata .project + .classpath .project .metadata .settings target target-eclipse Property changes on: identity-federation/trunk/identity-fed-model/src/test/resources/saml/v2 ___________________________________________________________________ Name: svn:ignore - .settings target target-eclipse .metadata .project + .classpath .project .metadata .settings target target-eclipse Property changes on: identity-federation/trunk/identity-fed-model/src/test/resources/wstrust ___________________________________________________________________ Name: svn:ignore - .settings target target-eclipse .metadata .project + .classpath .project .metadata .settings target target-eclipse Property changes on: identity-federation/trunk/identity-samples ___________________________________________________________________ Name: svn:ignore - .settings target target-eclipse .metadata .project + .classpath .project .metadata .settings target target-eclipse Property changes on: identity-federation/trunk/identity-samples/employee ___________________________________________________________________ Name: svn:ignore - .settings target target-eclipse .metadata .project + .classpath .project .metadata .settings target target-eclipse Property changes on: identity-federation/trunk/identity-samples/employee/resources ___________________________________________________________________ Name: svn:ignore - .settings target target-eclipse .metadata .project + .classpath .project .metadata .settings target target-eclipse Property changes on: identity-federation/trunk/identity-samples/employee/resources/META-INF ___________________________________________________________________ Name: svn:ignore - .settings target target-eclipse .metadata .project + .classpath .project .metadata .settings target target-eclipse Property changes on: identity-federation/trunk/identity-samples/employee/resources/WEB-INF ___________________________________________________________________ Name: svn:ignore - .settings target target-eclipse .metadata .project + .classpath .project .metadata .settings target target-eclipse Property changes on: identity-federation/trunk/identity-samples/sales ___________________________________________________________________ Name: svn:ignore - .settings target target-eclipse .metadata .project + .classpath .project .metadata .settings target target-eclipse Property changes on: identity-federation/trunk/identity-samples/sales/resources ___________________________________________________________________ Name: svn:ignore - .settings target target-eclipse .metadata .project + .classpath .project .metadata .settings target target-eclipse Property changes on: identity-federation/trunk/identity-samples/sales/resources/META-INF ___________________________________________________________________ Name: svn:ignore - .settings target target-eclipse .metadata .project + .classpath .project .metadata .settings target target-eclipse Property changes on: identity-federation/trunk/identity-samples/sales/resources/WEB-INF ___________________________________________________________________ Name: svn:ignore - .settings target target-eclipse .metadata .project + .classpath .project .metadata .settings target target-eclipse Property changes on: identity-federation/trunk/identity-xmlsecmodel ___________________________________________________________________ Name: svn:ignore - .settings target target-eclipse .metadata .project + .classpath .project .metadata .settings target target-eclipse Deleted: identity-federation/trunk/identity-xmlsecmodel/.classpath =================================================================== --- identity-federation/trunk/identity-xmlsecmodel/.classpath 2009-04-06 17:59:41 UTC (rev 428) +++ identity-federation/trunk/identity-xmlsecmodel/.classpath 2009-04-06 18:34:54 UTC (rev 429) @@ -1,13 +0,0 @@ -<classpath> - <classpathentry kind="src" path="src/main/java"/> - <classpathentry kind="src" path="src/main/resources" excluding="**/*.java"/> - <classpathentry kind="output" path="target/classes"/> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> - <classpathentry kind="var" path="M2_REPO/sun-jaf/activation/1.1/activation-1.1.jar"/> - <classpathentry kind="var" path="M2_REPO/sun-jaxb/jaxb-api/2.1.9/jaxb-api-2.1.9.jar" sourcepath="M2_REPO/sun-jaxb/jaxb-api/2.1.9/jaxb-api-2.1.9-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/junit/junit/4.4/junit-4.4.jar"/> - <classpathentry kind="var" path="M2_REPO/apache-log4j/log4j/1.2.14/log4j-1.2.14.jar" sourcepath="M2_REPO/apache-log4j/log4j/1.2.14/log4j-1.2.14-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/codehaus-stax/stax/1.1.1/stax-1.1.1.jar"/> - <classpathentry kind="var" path="M2_REPO/stax/stax-api/1.0/stax-api-1.0.jar"/> - <classpathentry kind="var" path="M2_REPO/org/apache/xmlsec/1.4.2/xmlsec-1.4.2.jar"/> -</classpath> \ No newline at end of file Property changes on: identity-federation/trunk/identity-xmlsecmodel/src ___________________________________________________________________ Name: svn:ignore - .settings target target-eclipse .metadata .project + .classpath .project .metadata .settings target target-eclipse Property changes on: identity-federation/trunk/identity-xmlsecmodel/src/main ___________________________________________________________________ Name: svn:ignore - .settings target target-eclipse .metadata .project + .classpath .project .metadata .settings target target-eclipse Property changes on: identity-federation/trunk/identity-xmlsecmodel/src/main/java ___________________________________________________________________ Name: svn:ignore - .settings target target-eclipse .metadata .project + .classpath .project .metadata .settings target target-eclipse Property changes on: identity-federation/trunk/identity-xmlsecmodel/src/main/java/org ___________________________________________________________________ Name: svn:ignore - .settings target target-eclipse .metadata .project + .classpath .project .metadata .settings target target-eclipse Property changes on: identity-federation/trunk/identity-xmlsecmodel/src/main/java/org/jboss ___________________________________________________________________ Name: svn:ignore - .settings target target-eclipse .metadata .project + .classpath .project .metadata .settings target target-eclipse Property changes on: identity-federation/trunk/identity-xmlsecmodel/src/main/java/org/jboss/identity ___________________________________________________________________ Name: svn:ignore - .settings target target-eclipse .metadata .project + .classpath .project .metadata .settings target target-eclipse Property changes on: identity-federation/trunk/identity-xmlsecmodel/src/main/java/org/jboss/identity/xmlsec ___________________________________________________________________ Name: svn:ignore - .settings target target-eclipse .metadata .project + .classpath .project .metadata .settings target target-eclipse Property changes on: identity-federation/trunk/identity-xmlsecmodel/src/main/java/org/jboss/identity/xmlsec/util ___________________________________________________________________ Name: svn:ignore - .settings target target-eclipse .metadata .project + .classpath .project .metadata .settings target target-eclipse Property changes on: identity-federation/trunk/identity-xmlsecmodel/src/main/java/org/jboss/identity/xmlsec/w3 ___________________________________________________________________ Name: svn:ignore - .settings target target-eclipse .metadata .project + .classpath .project .metadata .settings target target-eclipse Property changes on: identity-federation/trunk/identity-xmlsecmodel/src/main/java/org/jboss/identity/xmlsec/w3/xmldsig ___________________________________________________________________ Name: svn:ignore - .settings target target-eclipse .metadata .project + .classpath .project .metadata .settings target target-eclipse Property changes on: identity-federation/trunk/identity-xmlsecmodel/src/main/java/org/jboss/identity/xmlsec/w3/xmlenc ___________________________________________________________________ Name: svn:ignore - .settings target target-eclipse .metadata .project + .classpath .project .metadata .settings target target-eclipse Property changes on: identity-federation/trunk/identity-xmlsecmodel/src/main/resources ___________________________________________________________________ Name: svn:ignore - .settings target target-eclipse .metadata .project + .classpath .project .metadata .settings target target-eclipse Property changes on: identity-federation/trunk/identity-xmlsecmodel/src/main/resources/schema ___________________________________________________________________ Name: svn:ignore - .settings target target-eclipse .metadata .project + .classpath .project .metadata .settings target target-eclipse Property changes on: identity-federation/trunk/identity-xmlsecmodel/src/main/resources/schema/w3c ___________________________________________________________________ Name: svn:ignore - .settings target target-eclipse .metadata .project + .classpath .project .metadata .settings target target-eclipse Property changes on: identity-federation/trunk/identity-xmlsecmodel/src/main/resources/schema/w3c/xmldsig ___________________________________________________________________ Name: svn:ignore - .settings target target-eclipse .metadata .project + .classpath .project .metadata .settings target target-eclipse Property changes on: identity-federation/trunk/identity-xmlsecmodel/src/main/resources/schema/w3c/xmlenc ___________________________________________________________________ Name: svn:ignore - .settings target target-eclipse .metadata .project + .classpath .project .metadata .settings target target-eclipse Property changes on: identity-federation/trunk/parent ___________________________________________________________________ Name: svn:ignore - .settings target target-eclipse .metadata .project + .classpath .project .metadata .settings target target-eclipse

15 years, 10 months

1
0
0 / 0

JBoss Identity SVN: r428 - in identity-federation/trunk: identity-bindings/src/main/java/org/jboss/identity/federation/bindings/config and 7 other directories.

by jboss-identity-commits＠lists.jboss.org

Author: sguilhen(a)redhat.com Date: 2009-04-06 13:59:41 -0400 (Mon, 06 Apr 2009) New Revision: 428 Added: identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/config/STSType.java identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/config/ServiceProviderType.java identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/config/ServiceProvidersType.java identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/config/TokenProviderType.java identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/config/TokenProvidersType.java Removed: identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/config/trust/ identity-federation/trunk/identity-bindings/src/main/resources/schema/config/jboss-sts.xsd Modified: identity-federation/trunk/identity-bindings-jboss/.classpath identity-federation/trunk/identity-bindings/.classpath identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/config/AuthPropertyType.java identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/config/EncAlgoType.java identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/config/EncryptionType.java identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/config/IDPType.java identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/config/KeyProviderType.java identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/config/KeyValueType.java identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/config/ObjectFactory.java identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/config/ProviderType.java identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/config/SPType.java identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/config/TrustType.java identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/config/package-info.java identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/jboss/trust/JBossSTS.java identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/jboss/trust/JBossSTSConfiguration.java identity-federation/trunk/identity-bindings/src/main/resources/schema/config/jboss-identity-fed.xsd identity-federation/trunk/identity-fed-api/.classpath identity-federation/trunk/identity-fed-core/.classpath identity-federation/trunk/identity-fed-model/.classpath identity-federation/trunk/identity-xmlsecmodel/.classpath Log: JBID-75: Merged the STS configuration schema into jboss-identity-fed.xsd, generated the new object model and updated the STS classes accordingly. Modified: identity-federation/trunk/identity-bindings/.classpath =================================================================== --- identity-federation/trunk/identity-bindings/.classpath 2009-04-06 17:57:14 UTC (rev 427) +++ identity-federation/trunk/identity-bindings/.classpath 2009-04-06 17:59:41 UTC (rev 428) @@ -1,26 +1,32 @@ -<?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="src" path="src/main/resources"/> - <classpathentry kind="src" path="src/test/java"/> - <classpathentry kind="src" path="src/test/resources"/> - <classpathentry kind="src" path="src/main/java"/> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> - <classpathentry combineaccessrules="false" kind="src" path="/identity-fed-api"/> - <classpathentry combineaccessrules="false" kind="src" path="/identity-fed-core"/> - <classpathentry combineaccessrules="false" kind="src" path="/identity-fed-model"/> - <classpathentry combineaccessrules="false" kind="src" path="/identity-xmlsecmodel"/> - <classpathentry kind="var" path="M2_REPO/sun-jaxb/jaxb-api/2.1.9/jaxb-api-2.1.9.jar"/> - <classpathentry kind="var" path="M2_REPO/sun-jaxb/jaxb-impl/2.1.9/jaxb-impl-2.1.9.jar"/> - <classpathentry kind="var" path="M2_REPO/org/jboss/security/jboss-xacml/2.0.3.CR4"/> - <classpathentry kind="var" path="M2_REPO/org/jboss/security/jboss-xacml/2.0.3.CR4/jboss-xacml-2.0.3.CR4.jar" sourcepath="/M2_REPO/org/jboss/security/jboss-xacml/2.0.3.CR4/jboss-xacml-2.0.3.CR4-sources.jar"/> - <classpathentry kind="var" path="M2_REPO/javax/servlet/servlet-api/2.5/servlet-api-2.5.jar"/> - <classpathentry kind="var" path="M2_REPO/apache-log4j/log4j/1.2.14/log4j-1.2.14.jar"/> - <classpathentry kind="var" path="M2_REPO/stax/stax-api/1.0.1/stax-api-1.0.1.jar"/> - <classpathentry kind="var" path="M2_REPO/sun-jaxws/jaxws-api/2.1.1/jaxws-api-2.1.1.jar"/> - <classpathentry kind="var" path="M2_REPO/org/apache/tomcat/catalina/6.0.18/catalina-6.0.18.jar"/> - <classpathentry kind="var" path="M2_REPO/junit/junit/4.5/junit-4.5.jar"/> - <classpathentry kind="var" path="M2_REPO/sun-jaf/activation/1.1/activation-1.1.jar"/> - <classpathentry kind="var" path="M2_REPO/org/apache/tomcat/annotations-api/6.0.18/annotations-api-6.0.18.jar"/> - <classpathentry kind="var" path="M2_REPO/apache-tomcat/tomcat-util/5.5.12/tomcat-util-5.5.12.jar"/> - <classpathentry kind="output" path="target-eclipse"/> -</classpath> + <classpathentry kind="src" path="src/main/java"/> + <classpathentry kind="src" path="src/main/resources" excluding="**/*.java"/> + <classpathentry kind="src" path="src/test/java" output="target/test-classes"/> + <classpathentry kind="src" path="src/test/resources" output="target/test-classes" excluding="**/*.java"/> + <classpathentry kind="output" path="target/classes"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> + <classpathentry kind="var" path="M2_REPO/sun-jaf/activation/1.1/activation-1.1.jar"/> + <classpathentry kind="var" path="M2_REPO/org/apache/tomcat/annotations-api/6.0.18/annotations-api-6.0.18.jar"/> + <classpathentry kind="var" path="M2_REPO/org/apache/tomcat/catalina/6.0.18/catalina-6.0.18.jar"/> + <classpathentry kind="var" path="M2_REPO/apache-logging/commons-logging-api/1.0.3/commons-logging-api-1.0.3.jar"/> + <classpathentry kind="var" path="M2_REPO/apache-modeler/commons-modeler/1.1patch/commons-modeler-1.1patch.jar"/> + <classpathentry kind="var" path="M2_REPO/org/apache/tomcat/coyote/6.0.18/coyote-6.0.18.jar"/> + <classpathentry kind="var" path="M2_REPO/sun-jaxb/jaxb-api/2.1.9/jaxb-api-2.1.9.jar" sourcepath="M2_REPO/sun-jaxb/jaxb-api/2.1.9/jaxb-api-2.1.9-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/sun-jaxb/jaxb-impl/2.1.9/jaxb-impl-2.1.9.jar" sourcepath="M2_REPO/sun-jaxb/jaxb-impl/2.1.9/jaxb-impl-2.1.9-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/sun-jaxws/jaxws-api/2.1.1/jaxws-api-2.1.1.jar"/> + <classpathentry kind="src" path="/jboss-identity-fed-api"/> + <classpathentry kind="src" path="/jboss-identity-fed-core"/> + <classpathentry kind="src" path="/jboss-identity-fed-model"/> + <classpathentry kind="src" path="/jboss-identity-xmlsec-model"/> + <classpathentry kind="var" path="M2_REPO/org/jboss/security/jbossxacml/2.0.3.CR1/jbossxacml-2.0.3.CR1.jar" sourcepath="M2_REPO/org/jboss/security/jbossxacml/2.0.3.CR1/jbossxacml-2.0.3.CR1-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/apache/tomcat/juli/6.0.18/juli-6.0.18.jar"/> + <classpathentry kind="var" path="M2_REPO/junit/junit/4.4/junit-4.4.jar"/> + <classpathentry kind="var" path="M2_REPO/apache-log4j/log4j/1.2.14/log4j-1.2.14.jar" sourcepath="M2_REPO/apache-log4j/log4j/1.2.14/log4j-1.2.14-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/apache-tomcat/naming-resources/5.5.12/naming-resources-5.5.12.jar"/> + <classpathentry kind="var" path="M2_REPO/javax/servlet/servlet-api/2.4/servlet-api-2.4.jar"/> + <classpathentry kind="var" path="M2_REPO/org/apache/tomcat/servlet-api/6.0.18/servlet-api-6.0.18.jar"/> + <classpathentry kind="var" path="M2_REPO/stax/stax-api/1.0/stax-api-1.0.jar"/> + <classpathentry kind="var" path="M2_REPO/apache-tomcat/tomcat-http/5.5.12/tomcat-http-5.5.12.jar"/> + <classpathentry kind="var" path="M2_REPO/apache-tomcat/tomcat-util/5.5.12/tomcat-util-5.5.12.jar"/> + <classpathentry kind="var" path="M2_REPO/org/apache/xmlsec/1.4.2/xmlsec-1.4.2.jar"/> +</classpath> \ No newline at end of file Modified: identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/config/AuthPropertyType.java =================================================================== --- identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/config/AuthPropertyType.java 2009-04-06 17:57:14 UTC (rev 427) +++ identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/config/AuthPropertyType.java 2009-04-06 17:59:41 UTC (rev 428) @@ -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.3 in JDK 1.6 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2009.02.12 at 11:14:14 AM CST +// Generated on: 2009.04.06 at 10:56:34 AM GMT-03:00 // Modified: identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/config/EncAlgoType.java =================================================================== --- identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/config/EncAlgoType.java 2009-04-06 17:57:14 UTC (rev 427) +++ identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/config/EncAlgoType.java 2009-04-06 17:59:41 UTC (rev 428) @@ -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.3 in JDK 1.6 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2009.02.12 at 11:14:14 AM CST +// Generated on: 2009.04.06 at 10:56:34 AM GMT-03:00 // Modified: identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/config/EncryptionType.java =================================================================== --- identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/config/EncryptionType.java 2009-04-06 17:57:14 UTC (rev 427) +++ identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/config/EncryptionType.java 2009-04-06 17:59:41 UTC (rev 428) @@ -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.3 in JDK 1.6 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2009.02.12 at 11:14:14 AM CST +// Generated on: 2009.04.06 at 10:56:34 AM GMT-03:00 // Modified: identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/config/IDPType.java =================================================================== --- identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/config/IDPType.java 2009-04-06 17:57:14 UTC (rev 427) +++ identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/config/IDPType.java 2009-04-06 17:59:41 UTC (rev 428) @@ -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.3 in JDK 1.6 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2009.02.12 at 11:14:14 AM CST +// Generated on: 2009.04.06 at 10:56:34 AM GMT-03:00 // Modified: identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/config/KeyProviderType.java =================================================================== --- identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/config/KeyProviderType.java 2009-04-06 17:57:14 UTC (rev 427) +++ identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/config/KeyProviderType.java 2009-04-06 17:59:41 UTC (rev 428) @@ -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.3 in JDK 1.6 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2009.02.12 at 11:14:14 AM CST +// Generated on: 2009.04.06 at 10:56:34 AM GMT-03:00 // Modified: identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/config/KeyValueType.java =================================================================== --- identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/config/KeyValueType.java 2009-04-06 17:57:14 UTC (rev 427) +++ identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/config/KeyValueType.java 2009-04-06 17:59:41 UTC (rev 428) @@ -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.3 in JDK 1.6 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2009.02.12 at 11:14:14 AM CST +// Generated on: 2009.04.06 at 10:56:34 AM GMT-03:00 // Modified: identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/config/ObjectFactory.java =================================================================== --- identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/config/ObjectFactory.java 2009-04-06 17:57:14 UTC (rev 427) +++ identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/config/ObjectFactory.java 2009-04-06 17:59:41 UTC (rev 428) @@ -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.3 in JDK 1.6 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2009.02.12 at 11:14:14 AM CST +// Generated on: 2009.04.06 at 10:56:34 AM GMT-03:00 // @@ -17,7 +17,7 @@ /** * This object contains factory methods for each * Java content interface and Java element interface - * generated in the org.jboss.identity.federation.bindings.config package. + * generated in the jboss.identity_federation.config._1 package. * An ObjectFactory allows you to programatically * construct new instances of the Java representation * for XML content. The Java representation of XML @@ -32,21 +32,22 @@ 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 _JBossSP_QNAME = new QName("urn:jboss:identity-federation:config:1.0", "JBossSP"); /** - * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: org.jboss.identity.federation.bindings.config + * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: jboss.identity_federation.config._1 * */ public ObjectFactory() { } /** - * Create an instance of {@link AuthPropertyType } + * Create an instance of {@link SPType } * */ - public AuthPropertyType createAuthPropertyType() { - return new AuthPropertyType(); + public SPType createSPType() { + return new SPType(); } /** @@ -58,6 +59,14 @@ } /** + * Create an instance of {@link ProviderType } + * + */ + public ProviderType createProviderType() { + return new ProviderType(); + } + + /** * Create an instance of {@link EncryptionType } * */ @@ -66,14 +75,30 @@ } /** - * Create an instance of {@link KeyValueType } + * Create an instance of {@link AuthPropertyType } * */ - public KeyValueType createKeyValueType() { - return new KeyValueType(); + public AuthPropertyType createAuthPropertyType() { + return new AuthPropertyType(); } /** + * Create an instance of {@link TrustType } + * + */ + public TrustType createTrustType() { + return new TrustType(); + } + + /** + * Create an instance of {@link STSType } + * + */ + public STSType createSTSType() { + return new STSType(); + } + + /** * Create an instance of {@link IDPType } * */ @@ -82,30 +107,46 @@ } /** - * Create an instance of {@link SPType } + * Create an instance of {@link ServiceProviderType } * */ - public SPType createSPType() { - return new SPType(); + public ServiceProviderType createServiceProviderType() { + return new ServiceProviderType(); } /** - * Create an instance of {@link TrustType } + * Create an instance of {@link TokenProvidersType } * */ - public TrustType createTrustType() { - return new TrustType(); + public TokenProvidersType createTokenProvidersType() { + return new TokenProvidersType(); } /** - * Create an instance of {@link ProviderType } + * Create an instance of {@link KeyValueType } * */ - public ProviderType createProviderType() { - return new ProviderType(); + public KeyValueType createKeyValueType() { + return new KeyValueType(); } /** + * Create an instance of {@link TokenProviderType } + * + */ + public TokenProviderType createTokenProviderType() { + return new TokenProviderType(); + } + + /** + * Create an instance of {@link ServiceProvidersType } + * + */ + public ServiceProvidersType createServiceProvidersType() { + return new ServiceProvidersType(); + } + + /** * Create an instance of {@link JAXBElement }{@code <}{@link IDPType }{@code >}} * */ @@ -115,6 +156,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 >}} * */ Modified: identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/config/ProviderType.java =================================================================== --- identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/config/ProviderType.java 2009-04-06 17:57:14 UTC (rev 427) +++ identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/config/ProviderType.java 2009-04-06 17:59:41 UTC (rev 428) @@ -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.3 in JDK 1.6 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2009.02.12 at 11:14:14 AM CST +// Generated on: 2009.04.06 at 10:56:34 AM GMT-03:00 // @@ -54,8 +54,8 @@ "keyProvider" }) @XmlSeeAlso({ - IDPType.class, - SPType.class + SPType.class, + IDPType.class }) public class ProviderType { Modified: identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/config/SPType.java =================================================================== --- identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/config/SPType.java 2009-04-06 17:57:14 UTC (rev 427) +++ identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/config/SPType.java 2009-04-06 17:59:41 UTC (rev 428) @@ -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.3 in JDK 1.6 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2009.02.12 at 11:14:14 AM CST +// Generated on: 2009.04.06 at 10:56:34 AM GMT-03:00 // Added: identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/config/STSType.java =================================================================== --- identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/config/STSType.java (rev 0) +++ identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/config/STSType.java 2009-04-06 17:59:41 UTC (rev 428) @@ -0,0 +1,237 @@ +// +// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.3 in JDK 1.6 +// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> +// Any modifications to this file will be lost upon recompilation of the source schema. +// Generated on: 2009.04.06 at 10:56:34 AM GMT-03:00 +// + + +package org.jboss.identity.federation.bindings.config; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlType; + + +/** + * Java class for STSType complex type. + * + * The following schema fragment specifies the expected content contained within this class. + * + * <pre> + * <complexType name="STSType"> + * <complexContent> + * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> + * <sequence> + * <element name="STSName" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/> + * <element name="TokenTimeout" type="{http://www.w3.org/2001/XMLSchema}int" minOccurs="0"/> + * <element name="EncryptToken" type="{http://www.w3.org/2001/XMLSchema}boolean" minOccurs="0"/> + * <element name="KeyProvider" type="{urn:jboss:identity-federation:config:1.0}KeyProviderType" minOccurs="0"/> + * <element name="RequestHandler" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/> + * <element name="TokenProviders" type="{urn:jboss:identity-federation:config:1.0}TokenProvidersType" minOccurs="0"/> + * <element name="ServiceProviders" type="{urn:jboss:identity-federation:config:1.0}ServiceProvidersType" minOccurs="0"/> + * </sequence> + * </restriction> + * </complexContent> + * </complexType> + * </pre> + * + * + */ +(a)XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "STSType", propOrder = { + "stsName", + "tokenTimeout", + "encryptToken", + "keyProvider", + "requestHandler", + "tokenProviders", + "serviceProviders" +}) +public class STSType { + + @XmlElement(name = "STSName", defaultValue = "JBossSTS") + protected String stsName; + @XmlElement(name = "TokenTimeout", defaultValue = "3600") + protected Integer tokenTimeout; + @XmlElement(name = "EncryptToken", defaultValue = "false") + protected Boolean encryptToken; + @XmlElement(name = "KeyProvider") + protected KeyProviderType keyProvider; + @XmlElement(name = "RequestHandler") + protected String requestHandler; + @XmlElement(name = "TokenProviders") + protected TokenProvidersType tokenProviders; + @XmlElement(name = "ServiceProviders") + protected ServiceProvidersType serviceProviders; + + /** + * Gets the value of the stsName property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getSTSName() { + return stsName; + } + + /** + * Sets the value of the stsName property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setSTSName(String value) { + this.stsName = value; + } + + /** + * Gets the value of the tokenTimeout property. + * + * @return + * possible object is + * {@link Integer } + * + */ + public Integer getTokenTimeout() { + return tokenTimeout; + } + + /** + * Sets the value of the tokenTimeout property. + * + * @param value + * allowed object is + * {@link Integer } + * + */ + public void setTokenTimeout(Integer value) { + this.tokenTimeout = value; + } + + /** + * Gets the value of the encryptToken property. + * + * @return + * possible object is + * {@link Boolean } + * + */ + public Boolean isEncryptToken() { + return encryptToken; + } + + /** + * Sets the value of the encryptToken property. + * + * @param value + * allowed object is + * {@link Boolean } + * + */ + public void setEncryptToken(Boolean value) { + this.encryptToken = value; + } + + /** + * Gets the value of the keyProvider property. + * + * @return + * possible object is + * {@link KeyProviderType } + * + */ + public KeyProviderType getKeyProvider() { + return keyProvider; + } + + /** + * Sets the value of the keyProvider property. + * + * @param value + * allowed object is + * {@link KeyProviderType } + * + */ + public void setKeyProvider(KeyProviderType value) { + this.keyProvider = value; + } + + /** + * Gets the value of the requestHandler property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getRequestHandler() { + return requestHandler; + } + + /** + * Sets the value of the requestHandler property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setRequestHandler(String value) { + this.requestHandler = value; + } + + /** + * Gets the value of the tokenProviders property. + * + * @return + * possible object is + * {@link TokenProvidersType } + * + */ + public TokenProvidersType getTokenProviders() { + return tokenProviders; + } + + /** + * Sets the value of the tokenProviders property. + * + * @param value + * allowed object is + * {@link TokenProvidersType } + * + */ + public void setTokenProviders(TokenProvidersType value) { + this.tokenProviders = value; + } + + /** + * Gets the value of the serviceProviders property. + * + * @return + * possible object is + * {@link ServiceProvidersType } + * + */ + public ServiceProvidersType getServiceProviders() { + return serviceProviders; + } + + /** + * Sets the value of the serviceProviders property. + * + * @param value + * allowed object is + * {@link ServiceProvidersType } + * + */ + public void setServiceProviders(ServiceProvidersType value) { + this.serviceProviders = value; + } + +} Added: identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/config/ServiceProviderType.java =================================================================== --- identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/config/ServiceProviderType.java (rev 0) +++ identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/config/ServiceProviderType.java 2009-04-06 17:59:41 UTC (rev 428) @@ -0,0 +1,132 @@ +// +// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.3 in JDK 1.6 +// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> +// Any modifications to this file will be lost upon recompilation of the source schema. +// Generated on: 2009.04.06 at 10:56:34 AM GMT-03:00 +// + + +package org.jboss.identity.federation.bindings.config; + +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; + + +/** + * + * The service provider type contains information about a specific service provider. In particular, + * it specifies the type of the token that must be issued for the provider and the alias of the + * provider's PKC in the truststore. This is used by the STS to locate the PKC when encrypting the + * generated token. + * + * + * Java class for ServiceProviderType complex type. + * + * The following schema fragment specifies the expected content contained within this class. + * + * <pre> + * <complexType name="ServiceProviderType"> + * <complexContent> + * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> + * <sequence> + * <element name="TruststoreAlias" type="{http://www.w3.org/2001/XMLSchema}string" minOccurs="0"/> + * <element name="TokenType" type="{http://www.w3.org/2001/XMLSchema}string"/> + * </sequence> + * <attribute name="endpoint" type="{http://www.w3.org/2001/XMLSchema}string" /> + * </restriction> + * </complexContent> + * </complexType> + * </pre> + * + * + */ +(a)XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "ServiceProviderType", propOrder = { + "truststoreAlias", + "tokenType" +}) +public class ServiceProviderType { + + @XmlElement(name = "TruststoreAlias") + protected String truststoreAlias; + @XmlElement(name = "TokenType", required = true) + protected String tokenType; + @XmlAttribute + protected String endpoint; + + /** + * Gets the value of the truststoreAlias property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getTruststoreAlias() { + return truststoreAlias; + } + + /** + * Sets the value of the truststoreAlias property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setTruststoreAlias(String value) { + this.truststoreAlias = value; + } + + /** + * Gets the value of the tokenType property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getTokenType() { + return tokenType; + } + + /** + * Sets the value of the tokenType property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setTokenType(String value) { + this.tokenType = value; + } + + /** + * Gets the value of the endpoint property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getEndpoint() { + return endpoint; + } + + /** + * Sets the value of the endpoint property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setEndpoint(String value) { + this.endpoint = value; + } + +} Added: identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/config/ServiceProvidersType.java =================================================================== --- identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/config/ServiceProvidersType.java (rev 0) +++ identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/config/ServiceProvidersType.java 2009-04-06 17:59:41 UTC (rev 428) @@ -0,0 +1,80 @@ +// +// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.3 in JDK 1.6 +// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> +// Any modifications to this file will be lost upon recompilation of the source schema. +// Generated on: 2009.04.06 at 10:56:34 AM GMT-03:00 +// + + +package org.jboss.identity.federation.bindings.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 service providers specify the token type expected by each service provider. + * + * + * Java class for ServiceProvidersType complex type. + * + * The following schema fragment specifies the expected content contained within this class. + * + * <pre> + * <complexType name="ServiceProvidersType"> + * <complexContent> + * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> + * <sequence> + * <element name="ServiceProvider" type="{urn:jboss:identity-federation:config:1.0}ServiceProviderType" maxOccurs="unbounded"/> + * </sequence> + * </restriction> + * </complexContent> + * </complexType> + * </pre> + * + * + */ +(a)XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "ServiceProvidersType", propOrder = { + "serviceProvider" +}) +public class ServiceProvidersType { + + @XmlElement(name = "ServiceProvider", required = true) + protected List<ServiceProviderType> serviceProvider; + + /** + * Gets the value of the serviceProvider property. + * + * + * 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 serviceProvider property. + * + * + * For example, to add a new item, do as follows: + * <pre> + * getServiceProvider().add(newItem); + * </pre> + * + * + * + * Objects of the following type(s) are allowed in the list + * {@link ServiceProviderType } + * + * + */ + public List<ServiceProviderType> getServiceProvider() { + if (serviceProvider == null) { + serviceProvider = new ArrayList<ServiceProviderType>(); + } + return this.serviceProvider; + } + +} Added: identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/config/TokenProviderType.java =================================================================== --- identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/config/TokenProviderType.java (rev 0) +++ identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/config/TokenProviderType.java 2009-04-06 17:59:41 UTC (rev 428) @@ -0,0 +1,97 @@ +// +// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.3 in JDK 1.6 +// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> +// Any modifications to this file will be lost upon recompilation of the source schema. +// Generated on: 2009.04.06 at 10:56:34 AM GMT-03:00 +// + + +package org.jboss.identity.federation.bindings.config; + +import javax.xml.bind.annotation.XmlAccessType; +import javax.xml.bind.annotation.XmlAccessorType; +import javax.xml.bind.annotation.XmlElement; +import javax.xml.bind.annotation.XmlType; + + +/** + * Java class for TokenProviderType complex type. + * + * The following schema fragment specifies the expected content contained within this class. + * + * <pre> + * <complexType name="TokenProviderType"> + * <complexContent> + * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> + * <sequence> + * <element name="ProviderClass" type="{http://www.w3.org/2001/XMLSchema}string"/> + * <element name="TokenType" type="{http://www.w3.org/2001/XMLSchema}string"/> + * </sequence> + * </restriction> + * </complexContent> + * </complexType> + * </pre> + * + * + */ +(a)XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "TokenProviderType", propOrder = { + "providerClass", + "tokenType" +}) +public class TokenProviderType { + + @XmlElement(name = "ProviderClass", required = true) + protected String providerClass; + @XmlElement(name = "TokenType", required = true) + protected String tokenType; + + /** + * 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 tokenType property. + * + * @return + * possible object is + * {@link String } + * + */ + public String getTokenType() { + return tokenType; + } + + /** + * Sets the value of the tokenType property. + * + * @param value + * allowed object is + * {@link String } + * + */ + public void setTokenType(String value) { + this.tokenType = value; + } + +} Added: identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/config/TokenProvidersType.java =================================================================== --- identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/config/TokenProvidersType.java (rev 0) +++ identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/config/TokenProvidersType.java 2009-04-06 17:59:41 UTC (rev 428) @@ -0,0 +1,82 @@ +// +// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.3 in JDK 1.6 +// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> +// Any modifications to this file will be lost upon recompilation of the source schema. +// Generated on: 2009.04.06 at 10:56:34 AM GMT-03:00 +// + + +package org.jboss.identity.federation.bindings.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 token providers specify the classes that handle the requests for each type of security Token. + * For example, a SAMLTokenProvider may be used to generate SAML token, while a X509TokenProvider + * may be used to generate X.509 tokens (certificates). + * + * + * Java class for TokenProvidersType complex type. + * + * The following schema fragment specifies the expected content contained within this class. + * + * <pre> + * <complexType name="TokenProvidersType"> + * <complexContent> + * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> + * <sequence> + * <element name="TokenProvider" type="{urn:jboss:identity-federation:config:1.0}TokenProviderType" maxOccurs="unbounded"/> + * </sequence> + * </restriction> + * </complexContent> + * </complexType> + * </pre> + * + * + */ +(a)XmlAccessorType(XmlAccessType.FIELD) +@XmlType(name = "TokenProvidersType", propOrder = { + "tokenProvider" +}) +public class TokenProvidersType { + + @XmlElement(name = "TokenProvider", required = true) + protected List<TokenProviderType> tokenProvider; + + /** + * Gets the value of the tokenProvider property. + * + * + * 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 tokenProvider property. + * + * + * For example, to add a new item, do as follows: + * <pre> + * getTokenProvider().add(newItem); + * </pre> + * + * + * + * Objects of the following type(s) are allowed in the list + * {@link TokenProviderType } + * + * + */ + public List<TokenProviderType> getTokenProvider() { + if (tokenProvider == null) { + tokenProvider = new ArrayList<TokenProviderType>(); + } + return this.tokenProvider; + } + +} Modified: identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/config/TrustType.java =================================================================== --- identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/config/TrustType.java 2009-04-06 17:57:14 UTC (rev 427) +++ identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/config/TrustType.java 2009-04-06 17:59:41 UTC (rev 428) @@ -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.3 in JDK 1.6 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2009.02.12 at 11:14:14 AM CST +// Generated on: 2009.04.06 at 10:56:34 AM GMT-03:00 // Modified: identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/config/package-info.java =================================================================== --- identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/config/package-info.java 2009-04-06 17:57:14 UTC (rev 427) +++ identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/config/package-info.java 2009-04-06 17:59:41 UTC (rev 428) @@ -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.3 in JDK 1.6 // See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> // Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2009.02.12 at 11:14:14 AM CST +// Generated on: 2009.04.06 at 10:56:34 AM GMT-03:00 // @javax.xml.bind.annotation.XmlSchema(namespace = "urn:jboss:identity-federation:config:1.0", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED) Modified: identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/jboss/trust/JBossSTS.java =================================================================== --- identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/jboss/trust/JBossSTS.java 2009-04-06 17:57:14 UTC (rev 427) +++ identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/jboss/trust/JBossSTS.java 2009-04-06 17:59:41 UTC (rev 428) @@ -26,7 +26,7 @@ import javax.annotation.Resource; import javax.xml.bind.JAXBContext; -import javax.xml.bind.Unmarshaller; +import javax.xml.bind.JAXBElement; import javax.xml.transform.Source; import javax.xml.ws.Service; import javax.xml.ws.ServiceMode; @@ -46,7 +46,7 @@ import org.jboss.identity.federation.api.wstrust.protocol.RequestSecurityTokenCollection; import org.jboss.identity.federation.api.wstrust.protocol.RequestSecurityTokenResponse; import org.jboss.identity.federation.api.wstrust.protocol.RequestSecurityTokenResponseCollection; -import org.jboss.identity.federation.bindings.config.trust.JBossSTSConfig; +import org.jboss.identity.federation.bindings.config.STSType; /** * @@ -153,6 +153,7 @@ * * @return an instance of {@code STSConfiguration} containing the STS configuration properties. */ + @SuppressWarnings("unchecked") protected STSConfiguration getConfiguration() { // get the configuration file and parse it. @@ -164,9 +165,9 @@ { InputStream stream = configurationFile.openStream(); JAXBContext context = JAXBContext.newInstance("org.jboss.identity.federation.bindings.config.trust"); - Unmarshaller unmarshaller = context.createUnmarshaller(); - JBossSTSConfig jbossConfig = (JBossSTSConfig) unmarshaller.unmarshal(stream); - return new JBossSTSConfiguration(jbossConfig); + JAXBElement element = (JAXBElement) context.createUnmarshaller().unmarshal(stream); + STSType stsConfig = (STSType) element.getValue(); + return new JBossSTSConfiguration(stsConfig); } catch (Exception e) { Modified: identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/jboss/trust/JBossSTSConfiguration.java =================================================================== --- identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/jboss/trust/JBossSTSConfiguration.java 2009-04-06 17:57:14 UTC (rev 427) +++ identity-federation/trunk/identity-bindings/src/main/java/org/jboss/identity/federation/bindings/jboss/trust/JBossSTSConfiguration.java 2009-04-06 17:59:41 UTC (rev 428) @@ -27,11 +27,11 @@ import org.jboss.identity.federation.api.wstrust.STSConfiguration; import org.jboss.identity.federation.api.wstrust.SecurityTokenProvider; -import org.jboss.identity.federation.bindings.config.trust.JBossSTSConfig; -import org.jboss.identity.federation.bindings.config.trust.ServiceProvider; -import org.jboss.identity.federation.bindings.config.trust.ServiceProviders; -import org.jboss.identity.federation.bindings.config.trust.TokenProvider; -import org.jboss.identity.federation.bindings.config.trust.TokenProviders; +import org.jboss.identity.federation.bindings.config.STSType; +import org.jboss.identity.federation.bindings.config.ServiceProviderType; +import org.jboss.identity.federation.bindings.config.ServiceProvidersType; +import org.jboss.identity.federation.bindings.config.TokenProviderType; +import org.jboss.identity.federation.bindings.config.TokenProvidersType; /** * @@ -43,11 +43,11 @@ { // the delegate contains all the information extracted from the jboss-sts.xml configuration file. - private final JBossSTSConfig delegate; + private final STSType delegate; private final Map<String, SecurityTokenProvider> tokenProviders = new HashMap<String, SecurityTokenProvider>(); - private final Map<String, ServiceProvider> spMetadata = new HashMap<String, ServiceProvider>(); + private final Map<String, ServiceProviderType> spMetadata = new HashMap<String, ServiceProviderType>(); private final Map<String, Object> options = new HashMap<String, Object>(); @@ -56,7 +56,7 @@ */ public JBossSTSConfiguration() { - this.delegate = new JBossSTSConfig(); + this.delegate = new STSType(); // set the default values in the delegate. this.delegate.setSTSName("JBossSTS"); this.delegate.setEncryptToken(false); @@ -68,7 +68,7 @@ * * @param config */ - public JBossSTSConfiguration(JBossSTSConfig config) + public JBossSTSConfiguration(STSType config) { this.delegate = config; // set the default request handler if one hasn't been specified. @@ -76,10 +76,10 @@ this.delegate.setRequestHandler("org.jboss.identity.federation.api.wstrust.StandardRequestHandler"); // build the token-provider and service-metadata maps. - TokenProviders providers = this.delegate.getTokenProviders(); + TokenProvidersType providers = this.delegate.getTokenProviders(); if (providers != null) { - for (TokenProvider provider : providers.getTokenProvider()) + for (TokenProviderType provider : providers.getTokenProvider()) { try { @@ -93,10 +93,10 @@ } } } - ServiceProviders serviceProviders = this.delegate.getServiceProviders(); + ServiceProvidersType serviceProviders = this.delegate.getServiceProviders(); if(serviceProviders != null) { - for (ServiceProvider provider : serviceProviders.getServiceProvider()) + for (ServiceProviderType provider : serviceProviders.getServiceProvider()) this.spMetadata.put(provider.getEndpoint(), provider); } } @@ -158,7 +158,7 @@ */ public SecurityTokenProvider getProviderForService(String serviceName) { - ServiceProvider provider = this.spMetadata.get(serviceName); + ServiceProviderType provider = this.spMetadata.get(serviceName); if (provider != null) { return this.tokenProviders.get(provider.getTokenType()); @@ -183,7 +183,7 @@ */ public String getTokenTypeForService(String serviceName) { - ServiceProvider provider = this.spMetadata.get(serviceName); + ServiceProviderType provider = this.spMetadata.get(serviceName); if (provider != null) return provider.getTokenType(); return null; Modified: identity-federation/trunk/identity-bindings/src/main/resources/schema/config/jboss-identity-fed.xsd =================================================================== --- identity-federation/trunk/identity-bindings/src/main/resources/schema/config/jboss-identity-fed.xsd 2009-04-06 17:57:14 UTC (rev 427) +++ identity-federation/trunk/identity-bindings/src/main/resources/schema/config/jboss-identity-fed.xsd 2009-04-06 17:59:41 UTC (rev 428) @@ -153,4 +153,69 @@ <element name="KeySize" type="int"></element> </sequence> </complexType> + +  + + <complexType name="STSType"> + <sequence> + <element name="STSName" default="JBossSTS" type="string" minOccurs="0"/> + <element name="TokenTimeout" default="3600" type="int" minOccurs="0"/> + <element name="EncryptToken" default="false" type="boolean" minOccurs="0"/> + <element name="KeyProvider" type="tns:KeyProviderType" + maxOccurs="1" minOccurs="0"/> + <element name="RequestHandler" type="string" minOccurs="0"/> + <element name="TokenProviders" type="tns:TokenProvidersType" minOccurs="0"/> + <element name="ServiceProviders" type="tns:ServiceProvidersType" minOccurs="0"/> + </sequence> + </complexType> + + <complexType name="TokenProvidersType"> + <annotation> + <documentation> + The token providers specify the classes that handle the requests for each type of security Token. + For example, a SAMLTokenProvider may be used to generate SAML token, while a X509TokenProvider + may be used to generate X.509 tokens (certificates). + </documentation> + </annotation> + <sequence> + <element name="TokenProvider" type="tns:TokenProviderType" minOccurs="1" maxOccurs="unbounded"/> + </sequence> + </complexType> + + <complexType name="TokenProviderType"> + <sequence> + <element name="ProviderClass" type="string" minOccurs="1"/> + <element name="TokenType" type="string" minOccurs="1"/> + </sequence> + </complexType> + + <complexType name="ServiceProvidersType"> + <annotation> + <documentation> + The service providers specify the token type expected by each service provider. + </documentation> + </annotation> + <sequence> + <element name="ServiceProvider" type="tns:ServiceProviderType" minOccurs="1" maxOccurs="unbounded"/> + </sequence> + </complexType> + + <complexType name="ServiceProviderType"> + <annotation> + <documentation> + The service provider type contains information about a specific service provider. In particular, + it specifies the type of the token that must be issued for the provider and the alias of the + provider's PKC in the truststore. This is used by the STS to locate the PKC when encrypting the + generated token. + </documentation> + </annotation> + <sequence> + <element name="TruststoreAlias" type="string" minOccurs="0"/> + <element name="TokenType" type="string" minOccurs="1"/> + </sequence> + <attribute name="endpoint" type="string"/> + </complexType> + + <element name="JBossSTS" type="tns:STSType"/> + </schema> \ No newline at end of file Deleted: identity-federation/trunk/identity-bindings/src/main/resources/schema/config/jboss-sts.xsd =================================================================== --- identity-federation/trunk/identity-bindings/src/main/resources/schema/config/jboss-sts.xsd 2009-04-06 17:57:14 UTC (rev 427) +++ identity-federation/trunk/identity-bindings/src/main/resources/schema/config/jboss-sts.xsd 2009-04-06 17:59:41 UTC (rev 428) @@ -1,122 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" - xmlns:sts="urn:jboss:identity-trust:config:1.0" - targetNamespace="urn:jboss:identity-trust:config:1.0" - elementFormDefault="qualified"> - - <xsd:element name="JBossSTSConfig"> - <xsd:complexType> - <xsd:sequence> - <xsd:element ref="sts:STSName" minOccurs="0"/> - <xsd:element ref="sts:TokenTimeout" minOccurs="0"/> - <xsd:element ref="sts:EncryptToken" minOccurs="0"/> - <xsd:element ref="sts:SecurityDomain" minOccurs="0"/> - <xsd:element ref="sts:Keystore" minOccurs="0"/> - <xsd:element ref="sts:Truststore" minOccurs="0"/> - <xsd:element ref="sts:RequestHandler" minOccurs="0"/> - <xsd:element ref="sts:TokenProviders" minOccurs="0"/> - <xsd:element ref="sts:ServiceProviders" minOccurs="0"/> - </xsd:sequence> - </xsd:complexType> - </xsd:element> - - <xsd:element name="STSName" default="JBossSTS" type="xsd:string"/> - - <xsd:element name="TokenTimeout" default="3600" type="xsd:int"/> - - <xsd:element name="EncryptToken" default="false" type="xsd:boolean"/> - -  - <xsd:element name="SecurityDomain" type="xsd:string"/> - - <xsd:element name="Keystore"> - <xsd:complexType> - <xsd:annotation> - <xsd:documentation> - The Keystore type contains information about the keystore that holds the STS PKC and associated - private key. These are used to sign tokens, like SAML assertions. - </xsd:documentation> - </xsd:annotation> - <xsd:attribute name="location" type="xsd:string" use="required"/> - <xsd:attribute name="password" type="xsd:string" use="required"/> - <xsd:attribute name="alias" type="xsd:string" use="optional"/> - </xsd:complexType> - </xsd:element> - - <xsd:element name="Truststore"> - <xsd:complexType> - <xsd:annotation> - <xsd:documentation> - The Truststore type contains information about the truststore that holds the service providers - PKCs (public key certificates). When tokens need to be encrypted, the service provider's PKC - is used to perform the encryption. - </xsd:documentation> - </xsd:annotation> - <xsd:attribute name="location" type="xsd:string" use="required"/> - <xsd:attribute name="password" type="xsd:string" use="required"/> - </xsd:complexType> - </xsd:element> - - <xsd:element name="RequestHandler" type="xsd:string"/> - - <xsd:element name="TokenProviders"> - <xsd:complexType> - <xsd:annotation> - <xsd:documentation> - The token providers specify the classes that handle the requests for each type of security Token. - For example, a SAMLTokenProvider may be used to generate SAML token, while a X509TokenProvider - may be used to generate X.509 tokens (certificates). - </xsd:documentation> - </xsd:annotation> - <xsd:sequence> - <xsd:element ref="sts:TokenProvider" minOccurs="1" maxOccurs="unbounded"/> - </xsd:sequence> - </xsd:complexType> - </xsd:element> - - <xsd:element name="TokenProvider"> - <xsd:complexType> - <xsd:sequence> - <xsd:element ref="sts:ProviderClass" minOccurs="1"/> - <xsd:element ref="sts:TokenType" minOccurs="1"/> - </xsd:sequence> - </xsd:complexType> - </xsd:element> - - <xsd:element name="ProviderClass" type="xsd:string"/> - - <xsd:element name="TokenType" type="xsd:string"/> - - <xsd:element name="ServiceProviders"> - <xsd:complexType> - <xsd:annotation> - <xsd:documentation> - The service providers specify the token type expected by each service provider. - </xsd:documentation> - </xsd:annotation> - <xsd:sequence> - <xsd:element ref="sts:ServiceProvider" minOccurs="1" maxOccurs="unbounded"/> - </xsd:sequence> - </xsd:complexType> - </xsd:element> - - <xsd:element name="ServiceProvider"> - <xsd:complexType> - <xsd:annotation> - <xsd:documentation> - The service provider type contains information about a specific service provider. In particular, - it specifies the type of the token that must be issued for the provider and the alias of the - provider's PKC in the truststore. This is used by the STS to locate the PKC when encrypting the - generated token. - </xsd:documentation> - </xsd:annotation> - <xsd:sequence> - <xsd:element ref="sts:TruststoreAlias" minOccurs="0"/> - <xsd:element ref="sts:TokenType" minOccurs="1"/> - </xsd:sequence> - <xsd:attribute name="endpoint" type="xsd:string"/> - </xsd:complexType> - </xsd:element> - - <xsd:element name="TruststoreAlias" type="xsd:string"/> -</xsd:schema> \ No newline at end of file Modified: identity-federation/trunk/identity-bindings-jboss/.classpath =================================================================== --- identity-federation/trunk/identity-bindings-jboss/.classpath 2009-04-06 17:57:14 UTC (rev 427) +++ identity-federation/trunk/identity-bindings-jboss/.classpath 2009-04-06 17:59:41 UTC (rev 428) @@ -1,13 +1,28 @@ -<?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="src" path="src/main/resources"/> - <classpathentry kind="src" path="src/main/java"/> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> - <classpathentry combineaccessrules="false" kind="src" path="/identity-bindings"/> - <classpathentry combineaccessrules="false" kind="src" path="/identity-fed-api"/> - <classpathentry combineaccessrules="false" kind="src" path="/identity-fed-core"/> - <classpathentry combineaccessrules="false" kind="src" path="/identity-fed-model"/> - <classpathentry combineaccessrules="false" kind="src" path="/identity-xmlsecmodel"/> - <classpathentry kind="var" path="M2_REPO/org/jboss/security/jbosssx/2.0.3.SP1/jbosssx-2.0.3.SP1.jar"/> - <classpathentry kind="output" path="target-eclipse"/> -</classpath> + <classpathentry kind="src" path="src/main/java"/> + <classpathentry kind="src" path="src/main/resources" excluding="**/*.java"/> + <classpathentry kind="src" path="src/test/java" output="target/test-classes"/> + <classpathentry kind="src" path="src/test/resources" output="target/test-classes" excluding="**/*.java"/> + <classpathentry kind="output" path="target/classes"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> + <classpathentry kind="var" path="M2_REPO/org/apache/tomcat/annotations-api/6.0.18/annotations-api-6.0.18.jar"/> + <classpathentry kind="var" path="M2_REPO/org/apache/tomcat/catalina/6.0.18/catalina-6.0.18.jar"/> + <classpathentry kind="var" path="M2_REPO/apache-logging/commons-logging-api/1.0.3/commons-logging-api-1.0.3.jar"/> + <classpathentry kind="var" path="M2_REPO/sun-jaxb/jaxb-api/2.1.9/jaxb-api-2.1.9.jar" sourcepath="M2_REPO/sun-jaxb/jaxb-api/2.1.9/jaxb-api-2.1.9-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/sun-jaxb/jaxb-impl/2.1.9/jaxb-impl-2.1.9.jar" sourcepath="M2_REPO/sun-jaxb/jaxb-impl/2.1.9/jaxb-impl-2.1.9-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/sun-jaxws/jaxws-api/2.1.1/jaxws-api-2.1.1.jar"/> + <classpathentry kind="src" path="/jboss-identity-bindings"/> + <classpathentry kind="src" path="/jboss-identity-fed-api"/> + <classpathentry kind="src" path="/jboss-identity-fed-core"/> + <classpathentry kind="src" path="/jboss-identity-fed-model"/> + <classpathentry kind="src" path="/jboss-identity-xmlsec-model"/> + <classpathentry kind="var" path="M2_REPO/org/jboss/security/jbosssx/2.0.2.SP6/jbosssx-2.0.2.SP6.jar" sourcepath="M2_REPO/org/jboss/security/jbosssx/2.0.2.SP6/jbosssx-2.0.2.SP6-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/jboss/security/jbossxacml/2.0.3.CR1/jbossxacml-2.0.3.CR1.jar" sourcepath="M2_REPO/org/jboss/security/jbossxacml/2.0.3.CR1/jbossxacml-2.0.3.CR1-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/org/apache/tomcat/juli/6.0.18/juli-6.0.18.jar"/> + <classpathentry kind="var" path="M2_REPO/junit/junit/4.4/junit-4.4.jar"/> + <classpathentry kind="var" path="M2_REPO/apache-log4j/log4j/1.2.14/log4j-1.2.14.jar" sourcepath="M2_REPO/apache-log4j/log4j/1.2.14/log4j-1.2.14-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/javax/servlet/servlet-api/2.4/servlet-api-2.4.jar"/> + <classpathentry kind="var" path="M2_REPO/org/apache/tomcat/servlet-api/6.0.18/servlet-api-6.0.18.jar"/> + <classpathentry kind="var" path="M2_REPO/stax/stax-api/1.0/stax-api-1.0.jar"/> + <classpathentry kind="var" path="M2_REPO/org/apache/xmlsec/1.4.2/xmlsec-1.4.2.jar"/> +</classpath> \ No newline at end of file Modified: identity-federation/trunk/identity-fed-api/.classpath =================================================================== --- identity-federation/trunk/identity-fed-api/.classpath 2009-04-06 17:57:14 UTC (rev 427) +++ identity-federation/trunk/identity-fed-api/.classpath 2009-04-06 17:59:41 UTC (rev 428) @@ -1,14 +1,22 @@ -<?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="src" path="src/main/resources"/> - <classpathentry kind="src" path="src/main/java"/> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> - <classpathentry combineaccessrules="false" kind="src" path="/identity-fed-core"/> - <classpathentry combineaccessrules="false" kind="src" path="/identity-fed-model"/> - <classpathentry combineaccessrules="false" kind="src" path="/identity-xmlsecmodel"/> - <classpathentry kind="var" path="M2_REPO/sun-jaxb/jaxb-api/2.1.9/jaxb-api-2.1.9.jar"/> - <classpathentry kind="var" path="M2_REPO/org/apache/xmlsec/1.4.2/xmlsec-1.4.2.jar"/> - <classpathentry kind="var" path="M2_REPO/stax/stax-api/1.0.1/stax-api-1.0.1.jar"/> - <classpathentry kind="var" path="M2_REPO/sun-jaxws/jaxws-api/2.1.1/jaxws-api-2.1.1.jar"/> - <classpathentry kind="output" path="target-eclipse"/> -</classpath> + <classpathentry kind="src" path="src/main/java"/> + <classpathentry kind="src" path="src/main/resources" excluding="**/*.java"/> + <classpathentry kind="src" path="src/test/java" output="target/test-classes"/> + <classpathentry kind="src" path="src/test/resources" output="target/test-classes" excluding="**/*.java"/> + <classpathentry kind="output" path="target/classes"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> + <classpathentry kind="var" path="M2_REPO/sun-jaf/activation/1.1/activation-1.1.jar"/> + <classpathentry kind="var" path="M2_REPO/apache-logging/commons-logging-api/1.0.3/commons-logging-api-1.0.3.jar"/> + <classpathentry kind="var" path="M2_REPO/sun-jaxb/jaxb-api/2.1.9/jaxb-api-2.1.9.jar" sourcepath="M2_REPO/sun-jaxb/jaxb-api/2.1.9/jaxb-api-2.1.9-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/sun-jaxb/jaxb-impl/2.1.9/jaxb-impl-2.1.9.jar" sourcepath="M2_REPO/sun-jaxb/jaxb-impl/2.1.9/jaxb-impl-2.1.9-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/sun-jaxws/jaxws-api/2.1.1/jaxws-api-2.1.1.jar"/> + <classpathentry kind="src" path="/jboss-identity-fed-core"/> + <classpathentry kind="src" path="/jboss-identity-fed-model"/> + <classpathentry kind="src" path="/jboss-identity-xmlsec-model"/> + <classpathentry kind="var" path="M2_REPO/org/jboss/security/jbossxacml/2.0.3.CR1/jbossxacml-2.0.3.CR1.jar" sourcepath="M2_REPO/org/jboss/security/jbossxacml/2.0.3.CR1/jbossxacml-2.0.3.CR1-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/junit/junit/4.4/junit-4.4.jar"/> + <classpathentry kind="var" path="M2_REPO/apache-log4j/log4j/1.2.14/log4j-1.2.14.jar" sourcepath="M2_REPO/apache-log4j/log4j/1.2.14/log4j-1.2.14-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/codehaus-stax/stax/1.1.1/stax-1.1.1.jar"/> + <classpathentry kind="var" path="M2_REPO/stax/stax-api/1.0/stax-api-1.0.jar"/> + <classpathentry kind="var" path="M2_REPO/org/apache/xmlsec/1.4.2/xmlsec-1.4.2.jar"/> +</classpath> \ No newline at end of file Modified: identity-federation/trunk/identity-fed-core/.classpath =================================================================== --- identity-federation/trunk/identity-fed-core/.classpath 2009-04-06 17:57:14 UTC (rev 427) +++ identity-federation/trunk/identity-fed-core/.classpath 2009-04-06 17:59:41 UTC (rev 428) @@ -1,13 +1,20 @@ -<?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="src" path="src/main/resources"/> - <classpathentry kind="src" path="src/main/java"/> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> - <classpathentry combineaccessrules="false" kind="src" path="/identity-fed-model"/> - <classpathentry combineaccessrules="false" kind="src" path="/identity-xmlsecmodel"/> - <classpathentry kind="var" path="M2_REPO/sun-jaxb/jaxb-api/2.1.9/jaxb-api-2.1.9.jar"/> - <classpathentry kind="var" path="M2_REPO/sun-jaxb/jaxb-impl/2.1.9/jaxb-impl-2.1.9.jar"/> - <classpathentry kind="var" path="M2_REPO/stax/stax-api/1.0.1/stax-api-1.0.1.jar"/> - <classpathentry kind="var" path="M2_REPO/apache-log4j/log4j/1.2.14/log4j-1.2.14.jar"/> - <classpathentry kind="output" path="target-eclipse"/> -</classpath> + <classpathentry kind="src" path="src/main/java"/> + <classpathentry kind="src" path="src/main/resources" excluding="**/*.java"/> + <classpathentry kind="src" path="src/test/java" output="target/test-classes"/> + <classpathentry kind="src" path="src/test/resources" output="target/test-classes" excluding="**/*.java"/> + <classpathentry kind="output" path="target/classes"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> + <classpathentry kind="var" path="M2_REPO/sun-jaf/activation/1.1/activation-1.1.jar"/> + <classpathentry kind="var" path="M2_REPO/apache-logging/commons-logging-api/1.0.3/commons-logging-api-1.0.3.jar"/> + <classpathentry kind="var" path="M2_REPO/sun-jaxb/jaxb-api/2.1.9/jaxb-api-2.1.9.jar" sourcepath="M2_REPO/sun-jaxb/jaxb-api/2.1.9/jaxb-api-2.1.9-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/sun-jaxb/jaxb-impl/2.1.9/jaxb-impl-2.1.9.jar" sourcepath="M2_REPO/sun-jaxb/jaxb-impl/2.1.9/jaxb-impl-2.1.9-sources.jar"/> + <classpathentry kind="src" path="/jboss-identity-fed-model"/> + <classpathentry kind="src" path="/jboss-identity-xmlsec-model"/> + <classpathentry kind="var" path="M2_REPO/org/jboss/security/jbossxacml/2.0.3.CR1/jbossxacml-2.0.3.CR1.jar" sourcepath="M2_REPO/org/jboss/security/jbossxacml/2.0.3.CR1/jbossxacml-2.0.3.CR1-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/junit/junit/4.4/junit-4.4.jar"/> + <classpathentry kind="var" path="M2_REPO/apache-log4j/log4j/1.2.14/log4j-1.2.14.jar" sourcepath="M2_REPO/apache-log4j/log4j/1.2.14/log4j-1.2.14-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/codehaus-stax/stax/1.1.1/stax-1.1.1.jar"/> + <classpathentry kind="var" path="M2_REPO/stax/stax-api/1.0/stax-api-1.0.jar"/> + <classpathentry kind="var" path="M2_REPO/org/apache/xmlsec/1.4.2/xmlsec-1.4.2.jar"/> +</classpath> \ No newline at end of file Modified: identity-federation/trunk/identity-fed-model/.classpath =================================================================== --- identity-federation/trunk/identity-fed-model/.classpath 2009-04-06 17:57:14 UTC (rev 427) +++ identity-federation/trunk/identity-fed-model/.classpath 2009-04-06 17:59:41 UTC (rev 428) @@ -1,12 +1,20 @@ -<?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="src" path="src/main/java"/> - <classpathentry kind="src" path="src/main/resources"/> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> - <classpathentry combineaccessrules="false" kind="src" path="/identity-xmlsecmodel"/> - <classpathentry kind="var" path="M2_REPO/sun-jaxb/jaxb-api/2.1.9/jaxb-api-2.1.9.jar"/> - <classpathentry kind="var" path="M2_REPO/sun-jaxb/jaxb-impl/2.1.9/jaxb-impl-2.1.9.jar"/> - <classpathentry kind="var" path="M2_REPO/stax/stax-api/1.0.1/stax-api-1.0.1.jar"/> - <classpathentry kind="var" path="M2_REPO/org/jboss/security/jboss-xacml/2.0.3.CR4/jboss-xacml-2.0.3.CR4.jar"/> - <classpathentry kind="output" path="target-eclipse"/> -</classpath> + <classpathentry kind="src" path="src/main/java"/> + <classpathentry kind="src" path="src/main/resources" excluding="**/*.java"/> + <classpathentry kind="src" path="src/test/java" output="target/test-classes"/> + <classpathentry kind="src" path="src/test/resources" output="target/test-classes" excluding="**/*.java"/> + <classpathentry kind="output" path="target/classes"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> + <classpathentry kind="var" path="M2_REPO/sun-jaf/activation/1.1/activation-1.1.jar"/> + <classpathentry kind="var" path="M2_REPO/apache-logging/commons-logging-api/1.0.3/commons-logging-api-1.0.3.jar"/> + <classpathentry kind="var" path="M2_REPO/sun-jaxb/jaxb-api/2.1.9/jaxb-api-2.1.9.jar" sourcepath="M2_REPO/sun-jaxb/jaxb-api/2.1.9/jaxb-api-2.1.9-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/sun-jaxb/jaxb-impl/2.1.9/jaxb-impl-2.1.9.jar" sourcepath="M2_REPO/sun-jaxb/jaxb-impl/2.1.9/jaxb-impl-2.1.9-sources.jar"/> + <classpathentry kind="src" path="/jboss-identity-xmlsec-model"/> + <classpathentry kind="var" path="M2_REPO/org/jboss/security/jbossxacml/2.0.3.CR1/jbossxacml-2.0.3.CR1.jar" sourcepath="M2_REPO/org/jboss/security/jbossxacml/2.0.3.CR1/jbossxacml-2.0.3.CR1-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/junit/junit/4.4/junit-4.4.jar"/> + <classpathentry kind="var" path="M2_REPO/apache-log4j/log4j/1.2.14/log4j-1.2.14.jar" sourcepath="M2_REPO/apache-log4j/log4j/1.2.14/log4j-1.2.14-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/apache-xalan/serializer/2.7.0.patch01-brew/serializer-2.7.0.patch01-brew.jar"/> + <classpathentry kind="var" path="M2_REPO/codehaus-stax/stax/1.1.1/stax-1.1.1.jar"/> + <classpathentry kind="var" path="M2_REPO/stax/stax-api/1.0/stax-api-1.0.jar"/> + <classpathentry kind="var" path="M2_REPO/org/apache/xmlsec/1.4.2/xmlsec-1.4.2.jar"/> +</classpath> \ No newline at end of file Modified: identity-federation/trunk/identity-xmlsecmodel/.classpath =================================================================== --- identity-federation/trunk/identity-xmlsecmodel/.classpath 2009-04-06 17:57:14 UTC (rev 427) +++ identity-federation/trunk/identity-xmlsecmodel/.classpath 2009-04-06 17:59:41 UTC (rev 428) @@ -1,11 +1,13 @@ -<?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="src" path="src/main/java"/> - <classpathentry kind="src" path="src/main/resources"/> - <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> - <classpathentry kind="var" path="M2_REPO/sun-jaxb/jaxb-api/2.1.9/jaxb-api-2.1.9.jar"/> - <classpathentry kind="var" path="M2_REPO/sun-jaxb/jaxb-impl/2.1.9/jaxb-impl-2.1.9.jar"/> - <classpathentry kind="var" path="M2_REPO/stax/stax-api/1.0.1/stax-api-1.0.1.jar"/> - <classpathentry kind="var" path="M2_REPO/org/apache/xmlsec/1.4.2/xmlsec-1.4.2.jar"/> - <classpathentry kind="output" path="target-eclipse"/> -</classpath> + <classpathentry kind="src" path="src/main/java"/> + <classpathentry kind="src" path="src/main/resources" excluding="**/*.java"/> + <classpathentry kind="output" path="target/classes"/> + <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> + <classpathentry kind="var" path="M2_REPO/sun-jaf/activation/1.1/activation-1.1.jar"/> + <classpathentry kind="var" path="M2_REPO/sun-jaxb/jaxb-api/2.1.9/jaxb-api-2.1.9.jar" sourcepath="M2_REPO/sun-jaxb/jaxb-api/2.1.9/jaxb-api-2.1.9-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/junit/junit/4.4/junit-4.4.jar"/> + <classpathentry kind="var" path="M2_REPO/apache-log4j/log4j/1.2.14/log4j-1.2.14.jar" sourcepath="M2_REPO/apache-log4j/log4j/1.2.14/log4j-1.2.14-sources.jar"/> + <classpathentry kind="var" path="M2_REPO/codehaus-stax/stax/1.1.1/stax-1.1.1.jar"/> + <classpathentry kind="var" path="M2_REPO/stax/stax-api/1.0/stax-api-1.0.jar"/> + <classpathentry kind="var" path="M2_REPO/org/apache/xmlsec/1.4.2/xmlsec-1.4.2.jar"/> +</classpath> \ No newline at end of file

15 years, 10 months

1
0
0 / 0

JBoss Identity SVN: r427 - in identity-federation/trunk/identity-bindings/src/test: resources/config and 1 other directory.

by jboss-identity-commits＠lists.jboss.org

Author: sguilhen(a)redhat.com Date: 2009-04-06 13:57:14 -0400 (Mon, 06 Apr 2009) New Revision: 427 Added: identity-federation/trunk/identity-bindings/src/test/resources/config/test-config-4.xml Modified: identity-federation/trunk/identity-bindings/src/test/java/org/jboss/test/identity/federation/bindings/config/ConfigUnitTestCase.java Log: JBID-76: Added an STS configuration sample and included a new test in the ConfigUnitTestCase that parses this configuration file. Modified: identity-federation/trunk/identity-bindings/src/test/java/org/jboss/test/identity/federation/bindings/config/ConfigUnitTestCase.java =================================================================== --- identity-federation/trunk/identity-bindings/src/test/java/org/jboss/test/identity/federation/bindings/config/ConfigUnitTestCase.java 2009-04-06 09:59:50 UTC (rev 426) +++ identity-federation/trunk/identity-bindings/src/test/java/org/jboss/test/identity/federation/bindings/config/ConfigUnitTestCase.java 2009-04-06 17:57:14 UTC (rev 427) @@ -34,37 +34,52 @@ import org.jboss.identity.federation.bindings.config.KeyProviderType; import org.jboss.identity.federation.bindings.config.KeyValueType; import org.jboss.identity.federation.bindings.config.SPType; +import org.jboss.identity.federation.bindings.config.STSType; +import org.jboss.identity.federation.bindings.config.ServiceProviderType; +import org.jboss.identity.federation.bindings.config.ServiceProvidersType; +import org.jboss.identity.federation.bindings.config.TokenProviderType; +import org.jboss.identity.federation.bindings.config.TokenProvidersType; import org.jboss.identity.federation.bindings.config.TrustType; import org.jboss.identity.federation.core.saml.v2.factories.JBossSAMLBaseFactory; /** * Unit Test the various config + * * @author Anil.Saldhana(a)redhat.com * @since Jan 21, 2009 */ public class ConfigUnitTestCase extends TestCase { String config = "config/test-config-"; - + + @SuppressWarnings("unchecked") public void test01() throws Exception - { - IDPType idp = this.getIDP(config + "1.xml"); - assertEquals("300000",300000L,idp.getAssertionValidity()); - assertEquals("org.jboss.identity.federation.bindings.tomcat.TomcatRoleGenerator",idp.getRoleGenerator()); - - TrustType trust = idp.getTrust(); - assertNotNull("Trust is not null", trust); - String domains = trust.getDomains(); - assertTrue("localhost trusted", domains.indexOf("localhost") > -1); - assertTrue("jboss.com trusted", domains.indexOf("jboss.com") > -1); + { + Object object = this.unmarshall(config + "1.xml"); + assertNotNull("IDP is not null", object); + assertTrue(object instanceof JAXBElement); + + IDPType idp = ((JAXBElement<IDPType>) object).getValue(); + assertEquals("300000", 300000L, idp.getAssertionValidity()); + assertEquals("org.jboss.identity.federation.bindings.tomcat.TomcatRoleGenerator", idp.getRoleGenerator()); + + TrustType trust = idp.getTrust(); + assertNotNull("Trust is not null", trust); + String domains = trust.getDomains(); + assertTrue("localhost trusted", domains.indexOf("localhost") > -1); + assertTrue("jboss.com trusted", domains.indexOf("jboss.com") > -1); } - + + @SuppressWarnings("unchecked") public void test02() throws Exception { - IDPType idp = this.getIDP(config + "2.xml"); - - assertEquals("20000",20000L,idp.getAssertionValidity()); - assertEquals("somefqn",idp.getRoleGenerator()); + Object object = this.unmarshall(config + "2.xml"); + assertNotNull("IDP is not null", object); + assertTrue(object instanceof JAXBElement); + + IDPType idp = ((JAXBElement<IDPType>) object).getValue(); + assertEquals("20000", 20000L, idp.getAssertionValidity()); + assertEquals("somefqn", idp.getRoleGenerator()); assertTrue(idp.isEncrypt()); KeyProviderType kp = idp.getKeyProvider(); assertNotNull("KeyProvider is not null", kp); @@ -72,63 +87,95 @@ List<AuthPropertyType> authProps = kp.getAuth(); AuthPropertyType authProp = authProps.get(0); assertEquals("SomeKey", "SomeKey", authProp.getKey()); - assertEquals("SomeValue", "SomeValue", authProp.getValue()); - + assertEquals("SomeValue", "SomeValue", authProp.getValue()); + authProp = authProps.get(1); assertEquals("DBURL", "DBURL", authProp.getKey()); - assertEquals("SomeDBURL", "SomeDBURL", authProp.getValue()); - + assertEquals("SomeDBURL", "SomeDBURL", authProp.getValue()); + List<KeyValueType> validatingAliases = kp.getValidatingAlias(); assertEquals("Validating Alias length is 2", 2, validatingAliases.size()); - + KeyValueType kv = validatingAliases.get(0); assertEquals("localhost", kv.getKey()); assertEquals("localhostalias", kv.getValue()); - + kv = validatingAliases.get(1); assertEquals("jboss.com", kv.getKey()); assertEquals("jbossalias", kv.getValue()); - + TrustType trust = idp.getTrust(); assertNotNull("Trust is not null", trust); String domains = trust.getDomains(); assertTrue("localhost trusted", domains.indexOf("localhost") > -1); assertTrue("jboss.com trusted", domains.indexOf("jboss.com") > -1); } - + + @SuppressWarnings("unchecked") public void test03() throws Exception { - SPType sp = getSP(config + "3.xml"); + Object object = this.unmarshall(config + "3.xml"); + assertNotNull("SP is null", object); + assertTrue(object instanceof JAXBElement); + + SPType sp = ((JAXBElement<SPType>) object).getValue(); assertEquals("http://localhost:8080/idp", sp.getIdentityURL()); assertEquals("http://localhost:8080/sales", sp.getServiceURL()); } - + + /** + * + * Tests the parsing of a Security Token Service configuration. + * + * + * @throws Exception if an error occurs while running the test. + */ @SuppressWarnings("unchecked") - private SPType getSP(String configFile) throws Exception + public void test04() throws Exception { - String schema = "schema/config/jboss-identity-fed.xsd"; - - ClassLoader tcl = Thread.currentThread().getContextClassLoader(); - InputStream is = tcl.getResourceAsStream(configFile); - assertNotNull("Inputstream not null", is); - - Unmarshaller un = JBossSAMLBaseFactory.getValidatingUnmarshaller("org.jboss.identity.federation.bindings.config", schema); - JAXBElement<SPType> jaxbSp = (JAXBElement<SPType>) un.unmarshal(is); - assertNotNull("SP is not null", jaxbSp); - return jaxbSp.getValue(); + Object object = this.unmarshall(this.config + "4.xml"); + assertNotNull("Found a null STS configuration", object); + assertTrue("Unexpected configuration type", object instanceof JAXBElement); + + STSType stsType = ((JAXBElement<STSType>) object).getValue(); + // general STS configurations. + assertEquals("Unexpected STS name", "Test STS", stsType.getSTSName()); + assertEquals("Unexpected token timeout value", 7200, stsType.getTokenTimeout().intValue()); + assertTrue("Encryption of tokens should have been enabled", stsType.isEncryptToken()); + // we don't verify all values of the key provider config as it has been done in the other test scenarios. + assertNotNull("Unexpected null key provider", stsType.getKeyProvider()); + // request handler and configurations based on the token type. + assertEquals("Unexpected request handler class", "org.jboss.identity.federation.wstrust.Handler", stsType + .getRequestHandler()); + // configuration of the token providers. + TokenProvidersType tokenProviders = stsType.getTokenProviders(); + assertNotNull("Unexpected null list of token providers", tokenProviders); + assertEquals("Unexpected number of token providers", 1, tokenProviders.getTokenProvider().size()); + TokenProviderType tokenProvider = tokenProviders.getTokenProvider().get(0); + assertNotNull("Unexpected null token provider", tokenProvider); + assertEquals("Unexpected provider class name", "org.jboss.SpecialTokenProvider", tokenProvider.getProviderClass()); + assertEquals("Unexpected token type", "specialToken", tokenProvider.getTokenType()); + // configuration of the service providers. + ServiceProvidersType serviceProviders = stsType.getServiceProviders(); + assertNotNull("Unexpected null list of service providers", serviceProviders); + assertEquals("Unexpected number of service providers", 1, serviceProviders.getServiceProvider().size()); + ServiceProviderType serviceProvider = serviceProviders.getServiceProvider().get(0); + assertNotNull("Unexpected null service provider", serviceProvider); + assertEquals("Unexpected provider endpoint", "http://provider.endpoint/provider", serviceProvider.getEndpoint()); + assertEquals("Unexpected truststore alias", "providerAlias", serviceProvider.getTruststoreAlias()); + assertEquals("Unexpected token type", "specialToken", serviceProvider.getTokenType()); } - @SuppressWarnings("unchecked") - private IDPType getIDP(String configFile) throws Exception + + private Object unmarshall(String configFile) throws Exception { String schema = "schema/config/jboss-identity-fed.xsd"; - + ClassLoader tcl = Thread.currentThread().getContextClassLoader(); InputStream is = tcl.getResourceAsStream(configFile); assertNotNull("Inputstream not null", is); - - Unmarshaller un = JBossSAMLBaseFactory.getValidatingUnmarshaller("org.jboss.identity.federation.bindings.config", schema); - JAXBElement<IDPType> jaxbIdp = (JAXBElement<IDPType>) un.unmarshal(is); - assertNotNull("IDP is not null", jaxbIdp); - return jaxbIdp.getValue(); + + Unmarshaller un = JBossSAMLBaseFactory.getValidatingUnmarshaller("org.jboss.identity.federation.bindings.config", + schema); + return un.unmarshal(is); } } \ No newline at end of file Added: identity-federation/trunk/identity-bindings/src/test/resources/config/test-config-4.xml =================================================================== --- identity-federation/trunk/identity-bindings/src/test/resources/config/test-config-4.xml (rev 0) +++ identity-federation/trunk/identity-bindings/src/test/resources/config/test-config-4.xml 2009-04-06 17:57:14 UTC (rev 427) @@ -0,0 +1,23 @@ +<JBossSTS xmlns="urn:jboss:identity-federation:config:1.0"> + <STSName>Test STS</STSName> + <TokenTimeout>7200</TokenTimeout> + <EncryptToken>true</EncryptToken> + <KeyProvider ClassName="SomeClass"> + <ValidatingAlias Key="localhost" Value="localhostalias"/> + <ValidatingAlias Key="jboss.com" Value="jbossalias"/> + <SigningAlias>issueralias</SigningAlias> + </KeyProvider> + <RequestHandler>org.jboss.identity.federation.wstrust.Handler</RequestHandler> + <TokenProviders> + <TokenProvider> + <ProviderClass>org.jboss.SpecialTokenProvider</ProviderClass> + <TokenType>specialToken</TokenType> + </TokenProvider> + </TokenProviders> + <ServiceProviders> + <ServiceProvider endpoint="http://provider.endpoint/provider"> + <TruststoreAlias>providerAlias</TruststoreAlias> + <TokenType>specialToken</TokenType> + </ServiceProvider> + </ServiceProviders> +</JBossSTS> \ No newline at end of file

15 years, 10 months

1
0
0 / 0

JBoss Identity SVN: r426 - idm/trunk/idm/src/test/resources/datasources.

by jboss-identity-commits＠lists.jboss.org

Author: bdaw Date: 2009-04-06 05:59:50 -0400 (Mon, 06 Apr 2009) New Revision: 426 Modified: idm/trunk/idm/src/test/resources/datasources/datasources.xml Log: wrong mysql4 connection url Modified: idm/trunk/idm/src/test/resources/datasources/datasources.xml =================================================================== --- idm/trunk/idm/src/test/resources/datasources/datasources.xml 2009-04-06 09:47:36 UTC (rev 425) +++ idm/trunk/idm/src/test/resources/datasources/datasources.xml 2009-04-06 09:59:50 UTC (rev 426) @@ -98,7 +98,7 @@ <datasource> <datasource-name>mysql4</datasource-name> - <connection-url>jdbc:mysql://dev02.qa.atl.jboss.com/portal</connection-url> + <connection-url>jdbc:mysql://dev01.qa.atl.jboss.com/portal</connection-url> <driver-class>com.mysql.jdbc.Driver</driver-class> <user-name>portal</user-name> <password>password</password>

15 years, 10 months

1
0
0 / 0

JBoss Identity SVN: r425 - in idm/trunk/idm/src: test/java/org/jboss/identity/idm/impl/api and 1 other directories.

by jboss-identity-commits＠lists.jboss.org

Author: bdaw Date: 2009-04-06 05:47:36 -0400 (Mon, 06 Apr 2009) New Revision: 425 Added: idm/trunk/idm/src/main/java/org/jboss/identity/idm/impl/model/hibernate/MaterializedBlobType.java Modified: idm/trunk/idm/src/main/java/org/jboss/identity/idm/impl/model/hibernate/HibernateIdentityObjectBinaryAttribute.java idm/trunk/idm/src/main/java/org/jboss/identity/idm/impl/model/hibernate/HibernateIdentityObjectCredential.java idm/trunk/idm/src/test/java/org/jboss/identity/idm/impl/api/OrganizationTest.java idm/trunk/idm/src/test/java/org/jboss/identity/idm/impl/store/CommonIdentityStoreTest.java Log: - use MaterializedBlobType to fix binary data handling and test with 500 and 900 kilobytes attributes/credentials Modified: idm/trunk/idm/src/main/java/org/jboss/identity/idm/impl/model/hibernate/HibernateIdentityObjectBinaryAttribute.java =================================================================== --- idm/trunk/idm/src/main/java/org/jboss/identity/idm/impl/model/hibernate/HibernateIdentityObjectBinaryAttribute.java 2009-04-03 11:53:45 UTC (rev 424) +++ idm/trunk/idm/src/main/java/org/jboss/identity/idm/impl/model/hibernate/HibernateIdentityObjectBinaryAttribute.java 2009-04-06 09:47:36 UTC (rev 425) @@ -43,7 +43,7 @@ public class HibernateIdentityObjectBinaryAttribute extends HibernateIdentityObjectAttribute { - @CollectionOfElements(targetElement = byte[].class) + @CollectionOfElements(targetElement = org.jboss.identity.idm.impl.model.hibernate.MaterializedBlobType.class) private Set<byte[]> values = new HashSet<byte[]>(); public HibernateIdentityObjectBinaryAttribute() Modified: idm/trunk/idm/src/main/java/org/jboss/identity/idm/impl/model/hibernate/HibernateIdentityObjectCredential.java =================================================================== --- idm/trunk/idm/src/main/java/org/jboss/identity/idm/impl/model/hibernate/HibernateIdentityObjectCredential.java 2009-04-03 11:53:45 UTC (rev 424) +++ idm/trunk/idm/src/main/java/org/jboss/identity/idm/impl/model/hibernate/HibernateIdentityObjectCredential.java 2009-04-06 09:47:36 UTC (rev 425) @@ -69,7 +69,7 @@ private String textValue; @Column(name= "BINARY_VALUE", nullable = true) - //@Type(type = "binary") + @Type(type = "org.jboss.identity.idm.impl.model.hibernate.MaterializedBlobType") private byte[] binaryValue; @CollectionOfElements Added: idm/trunk/idm/src/main/java/org/jboss/identity/idm/impl/model/hibernate/MaterializedBlobType.java =================================================================== --- idm/trunk/idm/src/main/java/org/jboss/identity/idm/impl/model/hibernate/MaterializedBlobType.java (rev 0) +++ idm/trunk/idm/src/main/java/org/jboss/identity/idm/impl/model/hibernate/MaterializedBlobType.java 2009-04-06 09:47:36 UTC (rev 425) @@ -0,0 +1,61 @@ +/* +* JBoss, a division of Red Hat +* Copyright 2006, Red Hat Middleware, LLC, and individual contributors as indicated +* by the @authors tag. See the copyright.txt in the distribution for a +* full listing of individual contributors. +* +* This is free software; you can redistribute it and/or modify it +* under the terms of the GNU Lesser General Public License as +* published by the Free Software Foundation; either version 2.1 of +* the License, or (at your option) any later version. +* +* This software is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +* Lesser General Public License for more details. +* +* You should have received a copy of the GNU Lesser General Public +* License along with this software; if not, write to the Free +* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA +* 02110-1301 USA, or see the FSF site: http://www.fsf.org. +*/ + +package org.jboss.identity.idm.impl.model.hibernate; + +import org.hibernate.type.AbstractBynaryType; + +import java.sql.Types; + +/** + * {@inheritDoc} + * + * @author Steve Ebersole + */ +public class MaterializedBlobType extends AbstractBynaryType +{ + + public int sqlType() + { + return Types.BLOB; + } + + public String getName() + { + return "materialized-blob"; + } + + public Class getReturnedClass() + { + return byte[].class; + } + + protected Object toExternalFormat(byte[] bytes) + { + return bytes; + } + + protected byte[] toInternalFormat(Object bytes) + { + return ( byte[] ) bytes; + } +} \ No newline at end of file Modified: idm/trunk/idm/src/test/java/org/jboss/identity/idm/impl/api/OrganizationTest.java =================================================================== --- idm/trunk/idm/src/test/java/org/jboss/identity/idm/impl/api/OrganizationTest.java 2009-04-03 11:53:45 UTC (rev 424) +++ idm/trunk/idm/src/test/java/org/jboss/identity/idm/impl/api/OrganizationTest.java 2009-04-06 09:47:36 UTC (rev 425) @@ -282,7 +282,8 @@ // Generate random binary data for binary attribute Random random = new Random(); - byte[] picture = new byte[255]; + // 900 kilobytes + byte[] picture = new byte[921600]; random.nextBytes(picture); // User attributes @@ -335,7 +336,8 @@ if (session.getAttributesManager().hasCredential(anotherOne, BinaryCredential.TYPE)) { - byte[] cert = new byte[255]; + // 500 kilobytes + byte[] cert = new byte[512000]; random.nextBytes(cert); Credential binaryCredential = new BinaryCredential(cert); session.getAttributesManager().updateCredential(anotherOne, binaryCredential); Modified: idm/trunk/idm/src/test/java/org/jboss/identity/idm/impl/store/CommonIdentityStoreTest.java =================================================================== --- idm/trunk/idm/src/test/java/org/jboss/identity/idm/impl/store/CommonIdentityStoreTest.java 2009-04-03 11:53:45 UTC (rev 424) +++ idm/trunk/idm/src/test/java/org/jboss/identity/idm/impl/store/CommonIdentityStoreTest.java 2009-04-06 09:47:36 UTC (rev 425) @@ -330,9 +330,10 @@ Random random = new Random(); - byte[] data1 = new byte[255]; + + byte[] data1 = new byte[512000]; random.nextBytes(data1); - byte[] data2 = new byte[128]; + byte[] data2 = new byte[921600]; random.nextBytes(data2); IdentityObjectCredential binaryCredential1 = new BinaryCredential(data1);

15 years, 10 months

1
0
0 / 0

JBoss Identity SVN: r424 - in idm/trunk/idm/src/test: resources and 1 other directories.

by jboss-identity-commits＠lists.jboss.org

Author: bdaw Date: 2009-04-03 07:53:45 -0400 (Fri, 03 Apr 2009) New Revision: 424 Added: idm/trunk/idm/src/test/java/org/jboss/identity/idm/impl/store/hibernate/HibernateModelTestCase.java Removed: idm/trunk/idm/src/test/java/org/jboss/identity/idm/impl/store/hibernate/HibernateModelJBossTestCase.java Modified: idm/trunk/idm/src/test/resources/datasources/datasources.xml idm/trunk/idm/src/test/resources/datasources/hibernates.xml idm/trunk/idm/src/test/resources/jboss-unit.xml Log: - test fix for oracle and postgres behaviour Deleted: idm/trunk/idm/src/test/java/org/jboss/identity/idm/impl/store/hibernate/HibernateModelJBossTestCase.java =================================================================== --- idm/trunk/idm/src/test/java/org/jboss/identity/idm/impl/store/hibernate/HibernateModelJBossTestCase.java 2009-04-03 10:03:06 UTC (rev 423) +++ idm/trunk/idm/src/test/java/org/jboss/identity/idm/impl/store/hibernate/HibernateModelJBossTestCase.java 2009-04-03 11:53:45 UTC (rev 424) @@ -1,341 +0,0 @@ -/* -* JBoss, a division of Red Hat -* Copyright 2006, Red Hat Middleware, LLC, and individual contributors as indicated -* by the @authors tag. See the copyright.txt in the distribution for a -* full listing of individual contributors. -* -* This is free software; you can redistribute it and/or modify it -* under the terms of the GNU Lesser General Public License as -* published by the Free Software Foundation; either version 2.1 of -* the License, or (at your option) any later version. -* -* This software is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -* Lesser General Public License for more details. -* -* You should have received a copy of the GNU Lesser General Public -* License along with this software; if not, write to the Free -* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA -* 02110-1301 USA, or see the FSF site: http://www.fsf.org. -*/ - -package org.jboss.identity.idm.impl.store.hibernate; - -import org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectRelationshipType; -import org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObject; -import org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectType; -import org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectRelationship; -import org.jboss.identity.idm.impl.model.hibernate.HibernateRealm; -import org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectTextAttribute; -import org.jboss.identity.idm.impl.IdentityTestPOJO; -import org.jboss.unit.api.pojo.annotations.Destroy; -import org.jboss.unit.api.pojo.annotations.Create; -import org.jboss.unit.api.pojo.annotations.Test; -import org.hibernate.Session; -import org.hibernate.Query; -import static org.jboss.unit.api.Assert.*; - - -/** - * @author <a href="mailto:boleslaw.dawidowicz at redhat.com">Boleslaw Dawidowicz</a> - * @version : 0.1 $ - */ -public class HibernateModelJBossTestCase extends IdentityTestPOJO -{ - public HibernateModelJBossTestCase() - { - } - - - @Create - public void setUp() throws Exception - { - super.start(); - } - - @Destroy - public void tearDown() throws Exception - { - super.stop(); - } - - @Test - public void testPersistence() { - - - begin(); - Session session = getSessionFactory().getCurrentSession(); - - - HibernateRealm realm = new HibernateRealm("default"); - session.persist(realm); - - // - - HibernateIdentityObjectType iot = new HibernateIdentityObjectType(); - iot.setName("User"); - - session.persist(iot); - assertTrue(session.contains(iot)); - - - HibernateIdentityObject io = new HibernateIdentityObject(); - io.setName("John Kowalski"); - io.setRealm(realm); - io.setIdentityType(iot); - - session.persist(io); - assertTrue(session.contains(io)); - - session.delete(io); - assertFalse(session.contains(io)); - - // - - - - // - - HibernateIdentityObjectRelationshipType iort = new HibernateIdentityObjectRelationshipType(); - iort.setName("Member"); - - session.persist(iort); - assertTrue(session.contains(iort)); - - // - -// JPAIdentityObjectRelationship ior = new JPAIdentityObjectRelationship(); -// ior.setType(iort); -// -// em.persist(ior); -// assertTrue(em.contains(ior)); - -// em.remove(ior); -// assertFalse(em.contains(ior)); - - // - - assertTrue(session.contains(iort)); - - session.delete(iort); - assertFalse(session.contains(iort)); - - commit(); - - - } - - @Test - public void testRelationships() - { - begin(); - - - Session session = getSessionFactory().getCurrentSession(); - - - HibernateRealm realm = new HibernateRealm("default"); - session.persist(realm); - - HibernateIdentityObjectType groupType = new HibernateIdentityObjectType("Group"); - session.persist(groupType); - HibernateIdentityObjectType userType = new HibernateIdentityObjectType("User"); - session.persist(userType); - - HibernateIdentityObject user1 = new HibernateIdentityObject("user1", userType, realm); - session.persist(user1); - HibernateIdentityObject user2 = new HibernateIdentityObject("user2", userType, realm); - session.persist(user2); - HibernateIdentityObject user3 = new HibernateIdentityObject("user3", userType, realm); - session.persist(user3); - - HibernateIdentityObject group1 = new HibernateIdentityObject("group1", groupType, realm); - session.persist(group1); - HibernateIdentityObject group2 = new HibernateIdentityObject("group2", groupType, realm); - session.persist(group2); - HibernateIdentityObject group3 = new HibernateIdentityObject("group3", groupType, realm); - session.persist(group3); - - HibernateIdentityObjectRelationshipType memberType = new HibernateIdentityObjectRelationshipType("member"); - session.persist(memberType); - - HibernateIdentityObjectRelationship relationship = new HibernateIdentityObjectRelationship(memberType, group1, user1); - session.persist(relationship); - relationship = new HibernateIdentityObjectRelationship(memberType, group1, user2); - session.persist(relationship); - relationship = new HibernateIdentityObjectRelationship(memberType, group2, user3); - session.persist(relationship); - relationship = new HibernateIdentityObjectRelationship(memberType, group2, group1); - session.persist(relationship); - - commit(); - - // - - - begin(); - - session = getSessionFactory().getCurrentSession(); - - Query ioQuery = session.createQuery("select o from HibernateIdentityObject o where o.name like :name"); - - group1 = (HibernateIdentityObject)ioQuery.setParameter("name", "group1").uniqueResult(); - assertEquals(2, group1.getFromRelationships().size()); - assertEquals(1, group1.getToRelationships().size()); - group2 = (HibernateIdentityObject)ioQuery.setParameter("name", "group2").uniqueResult(); - assertEquals(2, group2.getFromRelationships().size()); - assertEquals(0, group2.getToRelationships().size()); - - user3 = (HibernateIdentityObject)ioQuery.setParameter("name", "user3").uniqueResult(); - assertEquals(1, user3.getToRelationships().size()); - assertEquals(0, user3.getFromRelationships().size()); - assertEquals("group2", user3.getToRelationships().iterator().next().getFromIdentityObject().getName()); - commit(); - - } - - @Test - public void testNameTypeConstraint() throws Exception - { - - begin(); - Session session = getSessionFactory().getCurrentSession(); - - - - HibernateRealm realm = new HibernateRealm("default"); - session.persist(realm); - - HibernateIdentityObjectType groupType = new HibernateIdentityObjectType("Group"); - session.persist(groupType); - HibernateIdentityObjectType userType = new HibernateIdentityObjectType("User"); - session.persist(userType); - - HibernateIdentityObject user1 = new HibernateIdentityObject("user1", userType, realm); - session.persist(user1); - HibernateIdentityObject user2 = new HibernateIdentityObject("user2", userType, realm); - session.persist(user2); - - commit(); - - - - begin(); - - session = getSessionFactory().getCurrentSession(); - - try - { - - HibernateIdentityObject user3 = new HibernateIdentityObject("user2", userType, realm); - session.persist(user3); - - // Should fail - fail(); - } - catch (Exception e) - { - //expected - getHibernateSupport().commitTransaction(); - } - - - - begin(); - - session = getSessionFactory().getCurrentSession(); - - - HibernateIdentityObject user4 = new HibernateIdentityObject("group1", userType, realm); - session.persist(user4); - - - HibernateIdentityObject group1 = new HibernateIdentityObject("group1", groupType, realm); - session.persist(group1); - HibernateIdentityObject group2 = new HibernateIdentityObject("group2", groupType, realm); - session.persist(group2); - - //session.flush(); - - try - { - - HibernateIdentityObject group3 = new HibernateIdentityObject("group2", groupType, realm); - session.persist(group3); - - // Should fail - fail(); - } - catch (Exception e) - { - //expected - getHibernateSupport().commitTransaction(); - } - - - - begin(); - - session = getSessionFactory().getCurrentSession(); - - HibernateIdentityObject group4 = new HibernateIdentityObject("user1", groupType, realm); - session.persist(group4); - - session.flush(); - - commit(); - - - - - - } - - @Test - public void testAttributes() throws Exception - { - begin(); - - Session session = getSessionFactory().getCurrentSession(); - - - - - HibernateRealm realm = new HibernateRealm("default"); - session.persist(realm); - - HibernateIdentityObjectType userType = new HibernateIdentityObjectType("User"); - session.persist(userType); - HibernateIdentityObject user1 = new HibernateIdentityObject("user1", userType, realm); - session.persist(user1); - -// Set<String> values1 = new HashSet<String>(); -// values1.add("Val1"); -// values1.add("Val2"); -// values1.add("Val3"); - - - user1.getAttributes().add(new HibernateIdentityObjectTextAttribute(user1, "simple1", new String[]{"Val1", "Val2", "Val3"})); - user1.getAttributes().add(new HibernateIdentityObjectTextAttribute(user1, "simple2", new String[]{"Val1", "Val2", "Val3"})); - - - commit(); - - - - begin(); - - session = getSessionFactory().getCurrentSession(); - - user1 = (HibernateIdentityObject)session.get(HibernateIdentityObject.class, new Long(user1.getId())); - assertEquals(2, user1.getAttributes().size() ); -// assertNotNull(user1.getProfileAttributes().get("simple1")); -// assertEquals(3, user1.getProfileAttributes().get("simple1").length); - - - commit(); - - } - -} \ No newline at end of file Copied: idm/trunk/idm/src/test/java/org/jboss/identity/idm/impl/store/hibernate/HibernateModelTestCase.java (from rev 422, idm/trunk/idm/src/test/java/org/jboss/identity/idm/impl/store/hibernate/HibernateModelJBossTestCase.java) =================================================================== --- idm/trunk/idm/src/test/java/org/jboss/identity/idm/impl/store/hibernate/HibernateModelTestCase.java (rev 0) +++ idm/trunk/idm/src/test/java/org/jboss/identity/idm/impl/store/hibernate/HibernateModelTestCase.java 2009-04-03 11:53:45 UTC (rev 424) @@ -0,0 +1,341 @@ +/* +* JBoss, a division of Red Hat +* Copyright 2006, Red Hat Middleware, LLC, and individual contributors as indicated +* by the @authors tag. See the copyright.txt in the distribution for a +* full listing of individual contributors. +* +* This is free software; you can redistribute it and/or modify it +* under the terms of the GNU Lesser General Public License as +* published by the Free Software Foundation; either version 2.1 of +* the License, or (at your option) any later version. +* +* This software is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +* Lesser General Public License for more details. +* +* You should have received a copy of the GNU Lesser General Public +* License along with this software; if not, write to the Free +* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA +* 02110-1301 USA, or see the FSF site: http://www.fsf.org. +*/ + +package org.jboss.identity.idm.impl.store.hibernate; + +import org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectRelationshipType; +import org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObject; +import org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectType; +import org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectRelationship; +import org.jboss.identity.idm.impl.model.hibernate.HibernateRealm; +import org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectTextAttribute; +import org.jboss.identity.idm.impl.IdentityTestPOJO; +import org.jboss.unit.api.pojo.annotations.Destroy; +import org.jboss.unit.api.pojo.annotations.Create; +import org.jboss.unit.api.pojo.annotations.Test; +import org.hibernate.Session; +import org.hibernate.Query; +import static org.jboss.unit.api.Assert.*; + + +/** + * @author <a href="mailto:boleslaw.dawidowicz at redhat.com">Boleslaw Dawidowicz</a> + * @version : 0.1 $ + */ +public class HibernateModelTestCase extends IdentityTestPOJO +{ + public HibernateModelTestCase() + { + } + + + @Create + public void setUp() throws Exception + { + super.start(); + } + + @Destroy + public void tearDown() throws Exception + { + super.stop(); + } + + @Test + public void testPersistence() { + + + begin(); + Session session = getSessionFactory().getCurrentSession(); + + + HibernateRealm realm = new HibernateRealm("default"); + session.persist(realm); + + // + + HibernateIdentityObjectType iot = new HibernateIdentityObjectType(); + iot.setName("User"); + + session.persist(iot); + assertTrue(session.contains(iot)); + + + HibernateIdentityObject io = new HibernateIdentityObject(); + io.setName("John Kowalski"); + io.setRealm(realm); + io.setIdentityType(iot); + + session.persist(io); + assertTrue(session.contains(io)); + + session.delete(io); + assertFalse(session.contains(io)); + + // + + + + // + + HibernateIdentityObjectRelationshipType iort = new HibernateIdentityObjectRelationshipType(); + iort.setName("Member"); + + session.persist(iort); + assertTrue(session.contains(iort)); + + // + +// JPAIdentityObjectRelationship ior = new JPAIdentityObjectRelationship(); +// ior.setType(iort); +// +// em.persist(ior); +// assertTrue(em.contains(ior)); + +// em.remove(ior); +// assertFalse(em.contains(ior)); + + // + + assertTrue(session.contains(iort)); + + session.delete(iort); + assertFalse(session.contains(iort)); + + commit(); + + + } + + @Test + public void testRelationships() + { + begin(); + + + Session session = getSessionFactory().getCurrentSession(); + + + HibernateRealm realm = new HibernateRealm("default"); + session.persist(realm); + + HibernateIdentityObjectType groupType = new HibernateIdentityObjectType("Group"); + session.persist(groupType); + HibernateIdentityObjectType userType = new HibernateIdentityObjectType("User"); + session.persist(userType); + + HibernateIdentityObject user1 = new HibernateIdentityObject("user1", userType, realm); + session.persist(user1); + HibernateIdentityObject user2 = new HibernateIdentityObject("user2", userType, realm); + session.persist(user2); + HibernateIdentityObject user3 = new HibernateIdentityObject("user3", userType, realm); + session.persist(user3); + + HibernateIdentityObject group1 = new HibernateIdentityObject("group1", groupType, realm); + session.persist(group1); + HibernateIdentityObject group2 = new HibernateIdentityObject("group2", groupType, realm); + session.persist(group2); + HibernateIdentityObject group3 = new HibernateIdentityObject("group3", groupType, realm); + session.persist(group3); + + HibernateIdentityObjectRelationshipType memberType = new HibernateIdentityObjectRelationshipType("member"); + session.persist(memberType); + + HibernateIdentityObjectRelationship relationship = new HibernateIdentityObjectRelationship(memberType, group1, user1); + session.persist(relationship); + relationship = new HibernateIdentityObjectRelationship(memberType, group1, user2); + session.persist(relationship); + relationship = new HibernateIdentityObjectRelationship(memberType, group2, user3); + session.persist(relationship); + relationship = new HibernateIdentityObjectRelationship(memberType, group2, group1); + session.persist(relationship); + + commit(); + + // + + + begin(); + + session = getSessionFactory().getCurrentSession(); + + Query ioQuery = session.createQuery("select o from HibernateIdentityObject o where o.name like :name"); + + group1 = (HibernateIdentityObject)ioQuery.setParameter("name", "group1").uniqueResult(); + assertEquals(2, group1.getFromRelationships().size()); + assertEquals(1, group1.getToRelationships().size()); + group2 = (HibernateIdentityObject)ioQuery.setParameter("name", "group2").uniqueResult(); + assertEquals(2, group2.getFromRelationships().size()); + assertEquals(0, group2.getToRelationships().size()); + + user3 = (HibernateIdentityObject)ioQuery.setParameter("name", "user3").uniqueResult(); + assertEquals(1, user3.getToRelationships().size()); + assertEquals(0, user3.getFromRelationships().size()); + assertEquals("group2", user3.getToRelationships().iterator().next().getFromIdentityObject().getName()); + commit(); + + } + + @Test + public void testNameTypeConstraint() throws Exception + { + + begin(); + Session session = getSessionFactory().getCurrentSession(); + + + + HibernateRealm realm = new HibernateRealm("default"); + session.persist(realm); + + HibernateIdentityObjectType groupType = new HibernateIdentityObjectType("Group"); + session.persist(groupType); + HibernateIdentityObjectType userType = new HibernateIdentityObjectType("User"); + session.persist(userType); + + HibernateIdentityObject user1 = new HibernateIdentityObject("user1", userType, realm); + session.persist(user1); + HibernateIdentityObject user2 = new HibernateIdentityObject("user2", userType, realm); + session.persist(user2); + + commit(); + + + + begin(); + + session = getSessionFactory().getCurrentSession(); + + try + { + + HibernateIdentityObject user3 = new HibernateIdentityObject("user2", userType, realm); + session.persist(user3); + + assertFalse(getHibernateSupport().commitTransaction()); + + } + catch (Exception e) + { + // may be expected + getHibernateSupport().rollbackTransaction(); + } + + + + begin(); + + session = getSessionFactory().getCurrentSession(); + + + HibernateIdentityObject user4 = new HibernateIdentityObject("group1", userType, realm); + session.persist(user4); + + + HibernateIdentityObject group1 = new HibernateIdentityObject("group1", groupType, realm); + session.persist(group1); + HibernateIdentityObject group2 = new HibernateIdentityObject("group2", groupType, realm); + session.persist(group2); + + //session.flush(); + + try + { + + HibernateIdentityObject group3 = new HibernateIdentityObject("group2", groupType, realm); + session.persist(group3); + + // Should fail + assertFalse(getHibernateSupport().commitTransaction()); + } + catch (Exception e) + { + //expected + getHibernateSupport().rollbackTransaction(); + } + + + + begin(); + + session = getSessionFactory().getCurrentSession(); + + HibernateIdentityObject group4 = new HibernateIdentityObject("user1", groupType, realm); + session.persist(group4); + + session.flush(); + + commit(); + + + + + + } + + @Test + public void testAttributes() throws Exception + { + begin(); + + Session session = getSessionFactory().getCurrentSession(); + + + + + HibernateRealm realm = new HibernateRealm("default"); + session.persist(realm); + + HibernateIdentityObjectType userType = new HibernateIdentityObjectType("User"); + session.persist(userType); + HibernateIdentityObject user1 = new HibernateIdentityObject("user1", userType, realm); + session.persist(user1); + +// Set<String> values1 = new HashSet<String>(); +// values1.add("Val1"); +// values1.add("Val2"); +// values1.add("Val3"); + + + user1.getAttributes().add(new HibernateIdentityObjectTextAttribute(user1, "simple1", new String[]{"Val1", "Val2", "Val3"})); + user1.getAttributes().add(new HibernateIdentityObjectTextAttribute(user1, "simple2", new String[]{"Val1", "Val2", "Val3"})); + + + commit(); + + + + begin(); + + session = getSessionFactory().getCurrentSession(); + + user1 = (HibernateIdentityObject)session.get(HibernateIdentityObject.class, new Long(user1.getId())); + assertEquals(2, user1.getAttributes().size() ); +// assertNotNull(user1.getProfileAttributes().get("simple1")); +// assertEquals(3, user1.getProfileAttributes().get("simple1").length); + + + commit(); + + } + +} \ No newline at end of file Modified: idm/trunk/idm/src/test/resources/datasources/datasources.xml =================================================================== --- idm/trunk/idm/src/test/resources/datasources/datasources.xml 2009-04-03 10:03:06 UTC (rev 423) +++ idm/trunk/idm/src/test/resources/datasources/datasources.xml 2009-04-03 11:53:45 UTC (rev 424) @@ -32,14 +32,31 @@ </datasource> <datasource> + <datasource-name>mysql4-local</datasource-name> + <connection-url>jdbc:mysql://192.168.1.101:3306/jbid?useServerPrepStmts=false&jdbcCompliantTruncation=false</connection-url> + <driver-class>com.mysql.jdbc.Driver</driver-class> + <user-name>root</user-name> + <password>password</password> + </datasource> + + + <datasource> <datasource-name>mysql5-local</datasource-name> <connection-url>jdbc:mysql://localhost:3306/jbid?useServerPrepStmts=false&jdbcCompliantTruncation=false</connection-url> <driver-class>com.mysql.jdbc.Driver</driver-class> <user-name>root</user-name> <password></password> - </datasource> + </datasource> <datasource> + <datasource-name>postgresql8-local</datasource-name> + <connection-url>jdbc:postgresql://192.168.1.101:5432:jbid</connection-url> + <driver-class>org.postgresql.Driver</driver-class> + <user-name>postgres</user-name> + <password>password</password> + </datasource> + + <datasource> <datasource-name>hsqldb</datasource-name> <connection-url>jdbc:hsqldb:file:test</connection-url> <driver-class>org.hsqldb.jdbcDriver</driver-class> Modified: idm/trunk/idm/src/test/resources/datasources/hibernates.xml =================================================================== --- idm/trunk/idm/src/test/resources/datasources/hibernates.xml 2009-04-03 10:03:06 UTC (rev 423) +++ idm/trunk/idm/src/test/resources/datasources/hibernates.xml 2009-04-03 11:53:45 UTC (rev 424) @@ -125,6 +125,15 @@ </property> </properties> </configuration> + <configuration> + <configuration-name>mysql4-local</configuration-name> + <properties> + <property> + <name>hibernate.dialect</name> + <value>org.hibernate.dialect.MySQLInnoDBDialect</value> + </property> + </properties> + </configuration>  <configuration> <configuration-name>mysql5</configuration-name> @@ -154,4 +163,13 @@ </property> </properties> </configuration> + <configuration> + <configuration-name>postgresql8-local</configuration-name> + <properties> + <property> + <name>hibernate.dialect</name> + <value>org.hibernate.dialect.PostgreSQLDialect</value> + </property> + </properties> + </configuration> </configurations> Modified: idm/trunk/idm/src/test/resources/jboss-unit.xml =================================================================== --- idm/trunk/idm/src/test/resources/jboss-unit.xml 2009-04-03 10:03:06 UTC (rev 423) +++ idm/trunk/idm/src/test/resources/jboss-unit.xml 2009-04-03 11:53:45 UTC (rev 424) @@ -46,7 +46,7 @@  <test > - <class name="org.jboss.identity.idm.impl.store.hibernate.HibernateModelJBossTestCase"/> + <class name="org.jboss.identity.idm.impl.store.hibernate.HibernateModelTestCase"/> </test>

15 years, 10 months

1
0
0 / 0

JBoss Identity SVN: r423 - in idm/trunk/idm/src/test/java/org/jboss/identity/idm/impl: store and 1 other directories.

by jboss-identity-commits＠lists.jboss.org

Author: bdaw Date: 2009-04-03 06:03:06 -0400 (Fri, 03 Apr 2009) New Revision: 423 Removed: idm/trunk/idm/src/test/java/org/jboss/identity/idm/impl/api/APIJBossUnitTest.java idm/trunk/idm/src/test/java/org/jboss/identity/idm/impl/api/APILDAPJBossUnitTest.java idm/trunk/idm/src/test/java/org/jboss/identity/idm/impl/api/OrganizationJBossUnitTest.java idm/trunk/idm/src/test/java/org/jboss/identity/idm/impl/api/OrganizationLDAPJBossUnitTest.java idm/trunk/idm/src/test/java/org/jboss/identity/idm/impl/store/hibernate/HibernateIdentityStoreJBossUnitTest.java Modified: idm/trunk/idm/src/test/java/org/jboss/identity/idm/impl/api/OrganizationTest.java idm/trunk/idm/src/test/java/org/jboss/identity/idm/impl/store/CommonIdentityStoreTest.java Log: - some cleanup - limit binary data size in tests so testsuite passes on oracle (need config option to check the limits) Deleted: idm/trunk/idm/src/test/java/org/jboss/identity/idm/impl/api/APIJBossUnitTest.java =================================================================== --- idm/trunk/idm/src/test/java/org/jboss/identity/idm/impl/api/APIJBossUnitTest.java 2009-04-03 08:52:13 UTC (rev 422) +++ idm/trunk/idm/src/test/java/org/jboss/identity/idm/impl/api/APIJBossUnitTest.java 2009-04-03 10:03:06 UTC (rev 423) @@ -1,110 +0,0 @@ -/* -* JBoss, a division of Red Hat -* Copyright 2006, Red Hat Middleware, LLC, and individual contributors as indicated -* by the @authors tag. See the copyright.txt in the distribution for a -* full listing of individual contributors. -* -* This is free software; you can redistribute it and/or modify it -* under the terms of the GNU Lesser General Public License as -* published by the Free Software Foundation; either version 2.1 of -* the License, or (at your option) any later version. -* -* This software is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -* Lesser General Public License for more details. -* -* You should have received a copy of the GNU Lesser General Public -* License along with this software; if not, write to the Free -* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA -* 02110-1301 USA, or see the FSF site: http://www.fsf.org. -*/ - -package org.jboss.identity.idm.impl.api; - -import junit.framework.TestCase; -import org.jboss.identity.idm.impl.HibernateTestSupport; -import org.jboss.identity.idm.impl.IdentityTestPOJO; -import org.jboss.identity.idm.impl.configuration.IdentityConfigurationImpl; -import org.jboss.identity.idm.api.IdentitySessionFactory; -import org.jboss.identity.idm.api.cfg.IdentityConfiguration; -import org.jboss.identity.idm.opends.OpenDSService; -import org.jboss.unit.api.pojo.annotations.Create; -import org.jboss.unit.api.pojo.annotations.Destroy; -import org.jboss.unit.api.pojo.annotations.Test; -import org.opends.server.tools.LDAPModify; - -import javax.naming.directory.DirContext; -import javax.naming.Context; -import javax.naming.NamingEnumeration; -import javax.naming.Binding; -import javax.naming.ldap.InitialLdapContext; -import java.util.Hashtable; -import java.io.File; - -/** - * @author <a href="mailto:boleslaw.dawidowicz at redhat.com">Boleslaw Dawidowicz</a> - * @version : 0.1 $ - */ -public class APIJBossUnitTest extends IdentityTestPOJO implements APITestContext -{ - - PersistenceManagerTest persistenceManagerTest; - - RelationshipManagerTest relationshipManagerTest; - - RoleManagerTest roleManagerTest; - - IdentitySessionFactory identitySessionFactory; - - @Create - public void start() throws Exception - { - super.start(); - persistenceManagerTest = new PersistenceManagerTest(this); - relationshipManagerTest = new RelationshipManagerTest(this); - roleManagerTest = new RoleManagerTest(this); - - begin(); - - identitySessionFactory = new IdentityConfigurationImpl(). - configure(getIdentityConfig()).buildIdentitySessionFactory(); - - commit(); - } - - @Destroy - public void stop() throws Exception - { - super.stop(); - } - - public IdentitySessionFactory getIdentitySessionFactory() - { - return identitySessionFactory; - } - - @Test - public void testPersistenceManager() throws Exception - { - persistenceManagerTest.testMethods(getRealmName()); - } - - @Test - public void testRelationshipManager() throws Exception - { - relationshipManagerTest.testMethods(getRealmName()); - } - - @Test - public void testRelationshipManagerMergedRoleAssociations() throws Exception - { - relationshipManagerTest.testMergedRoleAssociations(getRealmName()); - } - - @Test - public void testRoleManager() throws Exception - { - roleManagerTest.testMethods(getRealmName()); - } -} \ No newline at end of file Deleted: idm/trunk/idm/src/test/java/org/jboss/identity/idm/impl/api/APILDAPJBossUnitTest.java =================================================================== --- idm/trunk/idm/src/test/java/org/jboss/identity/idm/impl/api/APILDAPJBossUnitTest.java 2009-04-03 08:52:13 UTC (rev 422) +++ idm/trunk/idm/src/test/java/org/jboss/identity/idm/impl/api/APILDAPJBossUnitTest.java 2009-04-03 10:03:06 UTC (rev 423) @@ -1,113 +0,0 @@ -/* -* JBoss, a division of Red Hat -* Copyright 2006, Red Hat Middleware, LLC, and individual contributors as indicated -* by the @authors tag. See the copyright.txt in the distribution for a -* full listing of individual contributors. -* -* This is free software; you can redistribute it and/or modify it -* under the terms of the GNU Lesser General Public License as -* published by the Free Software Foundation; either version 2.1 of -* the License, or (at your option) any later version. -* -* This software is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -* Lesser General Public License for more details. -* -* You should have received a copy of the GNU Lesser General Public -* License along with this software; if not, write to the Free -* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA -* 02110-1301 USA, or see the FSF site: http://www.fsf.org. -*/ - -package org.jboss.identity.idm.impl.api; - -import junit.framework.TestCase; -import org.jboss.identity.idm.impl.HibernateTestSupport; -import org.jboss.identity.idm.impl.IdentityTestPOJO; -import org.jboss.identity.idm.impl.LDAPTestPOJO; -import org.jboss.identity.idm.impl.configuration.IdentityConfigurationImpl; -import org.jboss.identity.idm.api.IdentitySessionFactory; -import org.jboss.identity.idm.api.cfg.IdentityConfiguration; -import org.jboss.identity.idm.opends.OpenDSService; -import org.jboss.unit.api.pojo.annotations.Create; -import org.jboss.unit.api.pojo.annotations.Destroy; -import org.jboss.unit.api.pojo.annotations.Test; -import org.opends.server.tools.LDAPModify; - -import javax.naming.directory.DirContext; -import javax.naming.Context; -import javax.naming.NamingEnumeration; -import javax.naming.Binding; -import javax.naming.ldap.InitialLdapContext; -import java.util.Hashtable; -import java.io.File; - -/** - * @author <a href="mailto:boleslaw.dawidowicz at redhat.com">Boleslaw Dawidowicz</a> - * @version : 0.1 $ - */ -public class APILDAPJBossUnitTest extends LDAPTestPOJO implements APITestContext -{ - - PersistenceManagerTest persistenceManagerTest; - - RelationshipManagerTest relationshipManagerTest; - - RoleManagerTest roleManagerTest; - - IdentitySessionFactory identitySessionFactory; - - @Create - public void start() throws Exception - { - super.start(); - persistenceManagerTest = new PersistenceManagerTest(this); - relationshipManagerTest = new RelationshipManagerTest(this); - roleManagerTest = new RoleManagerTest(this); - - populateClean(); - - begin(); - - identitySessionFactory = new IdentityConfigurationImpl(). - configure(getIdentityConfig()).buildIdentitySessionFactory(); - - commit(); - } - - @Destroy - public void stop() throws Exception - { - super.stop(); - } - - public IdentitySessionFactory getIdentitySessionFactory() - { - return identitySessionFactory; - } - - @Test - public void testPersistenceManager() throws Exception - { - persistenceManagerTest.testMethods(getRealmName()); - } - - @Test - public void testRelationshipManager() throws Exception - { - relationshipManagerTest.testMethods(getRealmName()); - } - - @Test - public void testRelationshipManagerMergedRoleAssociations() throws Exception - { - relationshipManagerTest.testMergedRoleAssociations(getRealmName()); - } - - @Test - public void testRoleManager() throws Exception - { - roleManagerTest.testMethods(getRealmName()); - } -} \ No newline at end of file Deleted: idm/trunk/idm/src/test/java/org/jboss/identity/idm/impl/api/OrganizationJBossUnitTest.java =================================================================== --- idm/trunk/idm/src/test/java/org/jboss/identity/idm/impl/api/OrganizationJBossUnitTest.java 2009-04-03 08:52:13 UTC (rev 422) +++ idm/trunk/idm/src/test/java/org/jboss/identity/idm/impl/api/OrganizationJBossUnitTest.java 2009-04-03 10:03:06 UTC (rev 423) @@ -1,110 +0,0 @@ -/* -* JBoss, a division of Red Hat -* Copyright 2006, Red Hat Middleware, LLC, and individual contributors as indicated -* by the @authors tag. See the copyright.txt in the distribution for a -* full listing of individual contributors. -* -* This is free software; you can redistribute it and/or modify it -* under the terms of the GNU Lesser General Public License as -* published by the Free Software Foundation; either version 2.1 of -* the License, or (at your option) any later version. -* -* This software is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -* Lesser General Public License for more details. -* -* You should have received a copy of the GNU Lesser General Public -* License along with this software; if not, write to the Free -* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA -* 02110-1301 USA, or see the FSF site: http://www.fsf.org. -*/ - -package org.jboss.identity.idm.impl.api; - -import org.jboss.identity.idm.impl.IdentityTestPOJO; -import org.jboss.identity.idm.impl.configuration.IdentityConfigurationImpl; -import org.jboss.identity.idm.api.IdentitySessionFactory; -import org.jboss.unit.api.pojo.annotations.Create; -import org.jboss.unit.api.pojo.annotations.Destroy; -import org.jboss.unit.api.pojo.annotations.Test; -import org.jboss.unit.api.pojo.annotations.Parameter; - -/** - * @author <a href="mailto:boleslaw.dawidowicz at redhat.com">Boleslaw Dawidowicz</a> - * @version : 0.1 $ - */ -public class OrganizationJBossUnitTest extends IdentityTestPOJO implements APITestContext -{ - private OrganizationTest orgTest; - - private IdentitySessionFactory identitySessionFactory; - - private String samplePortalRealmName; - - private String sampleOrganizationRealmName; - - - @Create - public void start() throws Exception - { - super.start(); - - orgTest = new OrganizationTest(this); - - begin(); - - identitySessionFactory = new IdentityConfigurationImpl(). - configure(getIdentityConfig()).buildIdentitySessionFactory(); - - commit(); - } - - @Destroy - public void stop() throws Exception - { - super.stop(); - } - - public IdentitySessionFactory getIdentitySessionFactory() - { - return identitySessionFactory; - } - - @Test - public void testOrganization() throws Exception - { - - orgTest.testRedHatOrganization(getSampleOrganizationRealmName()); - } - - @Test - public void testSamplePortal() throws Exception - { - - orgTest.testSamplePortal(getSamplePortalRealmName()); - - } - - public String getSamplePortalRealmName() - { - return samplePortalRealmName; - } - - @Parameter - public void setSamplePortalRealmName(String samplePortalRealmName) - { - this.samplePortalRealmName = samplePortalRealmName; - } - - public String getSampleOrganizationRealmName() - { - return sampleOrganizationRealmName; - } - - @Parameter - public void setSampleOrganizationRealmName(String sampleOrganizationRealmName) - { - this.sampleOrganizationRealmName = sampleOrganizationRealmName; - } -} \ No newline at end of file Deleted: idm/trunk/idm/src/test/java/org/jboss/identity/idm/impl/api/OrganizationLDAPJBossUnitTest.java =================================================================== --- idm/trunk/idm/src/test/java/org/jboss/identity/idm/impl/api/OrganizationLDAPJBossUnitTest.java 2009-04-03 08:52:13 UTC (rev 422) +++ idm/trunk/idm/src/test/java/org/jboss/identity/idm/impl/api/OrganizationLDAPJBossUnitTest.java 2009-04-03 10:03:06 UTC (rev 423) @@ -1,113 +0,0 @@ -/* -* JBoss, a division of Red Hat -* Copyright 2006, Red Hat Middleware, LLC, and individual contributors as indicated -* by the @authors tag. See the copyright.txt in the distribution for a -* full listing of individual contributors. -* -* This is free software; you can redistribute it and/or modify it -* under the terms of the GNU Lesser General Public License as -* published by the Free Software Foundation; either version 2.1 of -* the License, or (at your option) any later version. -* -* This software is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -* Lesser General Public License for more details. -* -* You should have received a copy of the GNU Lesser General Public -* License along with this software; if not, write to the Free -* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA -* 02110-1301 USA, or see the FSF site: http://www.fsf.org. -*/ - -package org.jboss.identity.idm.impl.api; - -import org.jboss.identity.idm.impl.IdentityTestPOJO; -import org.jboss.identity.idm.impl.LDAPTestPOJO; -import org.jboss.identity.idm.impl.configuration.IdentityConfigurationImpl; -import org.jboss.identity.idm.api.IdentitySessionFactory; -import org.jboss.unit.api.pojo.annotations.Create; -import org.jboss.unit.api.pojo.annotations.Destroy; -import org.jboss.unit.api.pojo.annotations.Test; -import org.jboss.unit.api.pojo.annotations.Parameter; - -/** - * @author <a href="mailto:boleslaw.dawidowicz at redhat.com">Boleslaw Dawidowicz</a> - * @version : 0.1 $ - */ -public class OrganizationLDAPJBossUnitTest extends LDAPTestPOJO implements APITestContext -{ - private OrganizationTest orgTest; - - private IdentitySessionFactory identitySessionFactory; - - private String samplePortalRealmName; - - private String sampleOrganizationRealmName; - - - @Create - public void start() throws Exception - { - super.start(); - - orgTest = new OrganizationTest(this); - - populateClean(); - - begin(); - - identitySessionFactory = new IdentityConfigurationImpl(). - configure(getIdentityConfig()).buildIdentitySessionFactory(); - - commit(); - } - - @Destroy - public void stop() throws Exception - { - super.stop(); - } - - public IdentitySessionFactory getIdentitySessionFactory() - { - return identitySessionFactory; - } - - @Test - public void testOrganization() throws Exception - { - - orgTest.testRedHatOrganization(getSampleOrganizationRealmName()); - } - - @Test - public void testSamplePortal() throws Exception - { - - orgTest.testSamplePortal(getSamplePortalRealmName()); - - } - - public String getSamplePortalRealmName() - { - return samplePortalRealmName; - } - - @Parameter - public void setSamplePortalRealmName(String samplePortalRealmName) - { - this.samplePortalRealmName = samplePortalRealmName; - } - - public String getSampleOrganizationRealmName() - { - return sampleOrganizationRealmName; - } - - @Parameter - public void setSampleOrganizationRealmName(String sampleOrganizationRealmName) - { - this.sampleOrganizationRealmName = sampleOrganizationRealmName; - } -} \ No newline at end of file Modified: idm/trunk/idm/src/test/java/org/jboss/identity/idm/impl/api/OrganizationTest.java =================================================================== --- idm/trunk/idm/src/test/java/org/jboss/identity/idm/impl/api/OrganizationTest.java 2009-04-03 08:52:13 UTC (rev 422) +++ idm/trunk/idm/src/test/java/org/jboss/identity/idm/impl/api/OrganizationTest.java 2009-04-03 10:03:06 UTC (rev 423) @@ -282,7 +282,7 @@ // Generate random binary data for binary attribute Random random = new Random(); - byte[] picture = new byte[5120]; + byte[] picture = new byte[255]; random.nextBytes(picture); // User attributes @@ -335,7 +335,7 @@ if (session.getAttributesManager().hasCredential(anotherOne, BinaryCredential.TYPE)) { - byte[] cert = new byte[5120]; + byte[] cert = new byte[255]; random.nextBytes(cert); Credential binaryCredential = new BinaryCredential(cert); session.getAttributesManager().updateCredential(anotherOne, binaryCredential); Modified: idm/trunk/idm/src/test/java/org/jboss/identity/idm/impl/store/CommonIdentityStoreTest.java =================================================================== --- idm/trunk/idm/src/test/java/org/jboss/identity/idm/impl/store/CommonIdentityStoreTest.java 2009-04-03 08:52:13 UTC (rev 422) +++ idm/trunk/idm/src/test/java/org/jboss/identity/idm/impl/store/CommonIdentityStoreTest.java 2009-04-03 10:03:06 UTC (rev 423) @@ -330,9 +330,9 @@ Random random = new Random(); - byte[] data1 = new byte[5120]; + byte[] data1 = new byte[255]; random.nextBytes(data1); - byte[] data2 = new byte[1024]; + byte[] data2 = new byte[128]; random.nextBytes(data2); IdentityObjectCredential binaryCredential1 = new BinaryCredential(data1); Deleted: idm/trunk/idm/src/test/java/org/jboss/identity/idm/impl/store/hibernate/HibernateIdentityStoreJBossUnitTest.java =================================================================== --- idm/trunk/idm/src/test/java/org/jboss/identity/idm/impl/store/hibernate/HibernateIdentityStoreJBossUnitTest.java 2009-04-03 08:52:13 UTC (rev 422) +++ idm/trunk/idm/src/test/java/org/jboss/identity/idm/impl/store/hibernate/HibernateIdentityStoreJBossUnitTest.java 2009-04-03 10:03:06 UTC (rev 423) @@ -1,301 +0,0 @@ -/* -* JBoss, a division of Red Hat -* Copyright 2006, Red Hat Middleware, LLC, and individual contributors as indicated -* by the @authors tag. See the copyright.txt in the distribution for a -* full listing of individual contributors. -* -* This is free software; you can redistribute it and/or modify it -* under the terms of the GNU Lesser General Public License as -* published by the Free Software Foundation; either version 2.1 of -* the License, or (at your option) any later version. -* -* This software is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -* Lesser General Public License for more details. -* -* You should have received a copy of the GNU Lesser General Public -* License along with this software; if not, write to the Free -* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA -* 02110-1301 USA, or see the FSF site: http://www.fsf.org. -*/ - -package org.jboss.identity.idm.impl.store.hibernate; - -import org.jboss.identity.idm.spi.model.IdentityObject; -import org.jboss.identity.idm.spi.model.IdentityObjectAttribute; -import org.jboss.identity.idm.spi.store.IdentityStoreInvocationContext; -import org.jboss.identity.idm.spi.store.IdentityStore; -import org.jboss.identity.idm.spi.store.IdentityStoreSession; -import org.jboss.identity.idm.spi.configuration.metadata.IdentityStoreConfigurationMetaData; -import org.jboss.identity.idm.spi.configuration.metadata.IdentityConfigurationMetaData; -import org.jboss.identity.idm.spi.configuration.IdentityStoreConfigurationContext; -import org.jboss.identity.idm.spi.configuration.IdentityConfigurationContextRegistry; -import org.jboss.identity.idm.impl.store.hibernate.HibernateIdentityStoreImpl; -import org.jboss.identity.idm.impl.store.IdentityTypeEnum; -import org.jboss.identity.idm.impl.store.CommonIdentityStoreTest; -import org.jboss.identity.idm.impl.store.IdentityStoreTestContext; -import org.jboss.identity.idm.impl.configuration.jaxb2.JAXB2IdentityConfiguration; -import org.jboss.identity.idm.impl.configuration.IdentityStoreConfigurationContextImpl; -import org.jboss.identity.idm.impl.configuration.IdentityConfigurationImpl; -import org.jboss.identity.idm.impl.api.SimpleAttribute; -import org.jboss.identity.idm.impl.IdentityTestPOJO; -import org.jboss.identity.idm.exception.IdentityException; -import org.jboss.identity.idm.api.cfg.IdentityConfiguration; -import org.jboss.unit.api.pojo.annotations.Create; -import org.jboss.unit.api.pojo.annotations.Test; -import static org.jboss.unit.api.Assert.*; -import org.hibernate.Session; -import org.hibernate.SessionFactory; - -import java.util.Map; -import java.io.File; - -/** - * @author <a href="mailto:boleslaw.dawidowicz at redhat.com">Boleslaw Dawidowicz</a> - * @version : 0.1 $ - */ -public class HibernateIdentityStoreJBossUnitTest extends IdentityTestPOJO implements IdentityStoreTestContext -{ - - protected HibernateIdentityStoreImpl store; - - protected IdentityStoreInvocationContext ctx; - - protected CommonIdentityStoreTest commonTest; - - public HibernateIdentityStoreJBossUnitTest() - { - - } - - @Create - public void start() throws Exception - { - super.start(); - - commonTest = new CommonIdentityStoreTest(this); - - begin(); - - IdentityConfigurationMetaData configurationMD = JAXB2IdentityConfiguration - .createConfigurationMetaData(getIdentityConfig()); - - IdentityConfigurationContextRegistry identityConfiguration = (IdentityConfigurationContextRegistry) - new IdentityConfigurationImpl().configure(configurationMD); - - IdentityStoreConfigurationMetaData storeMD = null; - - for (IdentityStoreConfigurationMetaData metaData : configurationMD.getIdentityStores()) - { - if (metaData.getId().equals("HibernateTestStore")) - { - storeMD = metaData; - break; - } - } - - IdentityStoreConfigurationContext context = - new IdentityStoreConfigurationContextImpl(configurationMD, identityConfiguration, storeMD); - - store = new HibernateIdentityStoreImpl("HibernateTestStore") - { - - @Override - protected Session getHibernateSession(IdentityStoreInvocationContext ctx) - { - return getHibernateSupport().getSessionFactory().getCurrentSession(); - } - - @Override - protected SessionFactory bootstrapHibernateSessionFactory(IdentityStoreConfigurationContext configurationContext) throws IdentityException - { - return getHibernateSupport().getSessionFactory(); - } - - }; - - store.bootstrap(context); - - - ctx = new IdentityStoreInvocationContext() - { - public IdentityStoreSession getIdentityStoreSession() - { - return null; - } - - public String getRealmId() - { - return "testRealm"; - } - }; - - commit(); - - - } - - public void begin() - { - getHibernateSupport().openSession(); - } - - public void commit() - { - assertTrue(getHibernateSupport().commitTransaction()); - } - - public void flush() throws Exception - { - - getHibernateSupport().getSessionFactory().getCurrentSession().flush(); - } - - public IdentityStore getStore() - { - return store; - } - - public IdentityStoreInvocationContext getCtx() - { - return ctx; - } - - // Tests - - @Test - public void testStorePersistence() throws Exception - { - - commonTest.testStorePersistence(); - - } - - @Test - public void testFindMethods() throws Exception - { - - commonTest.testFindMethods(); - - } - - @Test - public void testAttributes() throws Exception - { - - begin(); - - IdentityObject user1 = store.createIdentityObject(ctx, "Adam", IdentityTypeEnum.USER); - IdentityObject user2 = store.createIdentityObject(ctx, "Eva", IdentityTypeEnum.USER); - - flush(); - - IdentityObjectAttribute[] attrs = new IdentityObjectAttribute[]{ - new SimpleAttribute("key1", new String[]{"val1", "val2", "val3"}), - new SimpleAttribute("key2", new String[]{"val1", "val2", "val3", "val4"}) - }; - - store.addAttributes(ctx, user1, attrs); - - flush(); - - Map<String, IdentityObjectAttribute> persistedAttrs = store.getAttributes(ctx, user1); - - assertEquals(2, persistedAttrs.keySet().size()); - - assertTrue(persistedAttrs.containsKey("key1")); - assertEquals(3, persistedAttrs.get("key1").getSize()); - - assertTrue(persistedAttrs.containsKey("key2")); - assertEquals(4, persistedAttrs.get("key2").getSize()); - - flush(); - - attrs = new IdentityObjectAttribute[]{ - new SimpleAttribute("key3", new String[]{"val1"}) - }; - - - store.addAttributes(ctx, user1, attrs); - - flush(); - - persistedAttrs = store.getAttributes(ctx, user1); - - assertEquals(3, persistedAttrs.keySet().size()); - - assertTrue(persistedAttrs.containsKey("key1")); - assertEquals(3, persistedAttrs.get("key1").getSize()); - - assertTrue(persistedAttrs.containsKey("key2")); - assertEquals(4, persistedAttrs.get("key2").getSize()); - - assertTrue(persistedAttrs.containsKey("key3")); - assertEquals(1, persistedAttrs.get("key3").getSize()); - - flush(); - - attrs = new IdentityObjectAttribute[]{ - new SimpleAttribute("key3", new String[]{"val2"}) - }; - - store.addAttributes(ctx, user1, attrs); - - flush(); - - persistedAttrs = store.getAttributes(ctx, user1); - - assertEquals(3, persistedAttrs.keySet().size()); - - assertTrue(persistedAttrs.containsKey("key3")); - assertEquals(2, persistedAttrs.get("key3").getSize()); - - flush(); - - store.updateAttributes(ctx, user1, attrs); - - flush(); - - persistedAttrs = store.getAttributes(ctx, user1); - - assertEquals(3, persistedAttrs.keySet().size()); - - assertTrue(persistedAttrs.containsKey("key3")); - assertEquals(1, persistedAttrs.get("key3").getSize()); - - flush(); - - store.removeAttributes(ctx, user1, new String[] {"key3"}); - - flush(); - - persistedAttrs = store.getAttributes(ctx, user1); - - assertEquals(2, persistedAttrs.keySet().size()); - - - commit(); - - } - - @Test - public void testRelationships() throws Exception - { - commonTest.testRelationships(); - } - - @Test - public void testCredentials() throws Exception - { - commonTest.testPasswordCredential(); - commonTest.testBinaryCredential(); - } - - @Test - public void testControls() throws Exception - { - commonTest.testControls(); - } - -} \ No newline at end of file

15 years, 10 months

1
0
0 / 0

JBoss Identity SVN: r422 - in idm/trunk: idm and 5 other directories.

by jboss-identity-commits＠lists.jboss.org

Author: bdaw Date: 2009-04-03 04:52:13 -0400 (Fri, 03 Apr 2009) New Revision: 422 Added: idm/trunk/idm/src/test/java/org/jboss/identity/idm/impl/api/APILDAPTestCase.java idm/trunk/idm/src/test/java/org/jboss/identity/idm/impl/api/OrganizationLDAPTestCase.java idm/trunk/idm/src/test/java/org/jboss/identity/idm/impl/api/OrganizationTestCase.java idm/trunk/idm/src/test/java/org/jboss/identity/idm/impl/store/hibernate/HibernateModelJBossTestCase.java idm/trunk/idm/src/test/java/org/jboss/identity/idm/impl/store/ldap/LDAPIdentityStoreTestCase.java Removed: idm/trunk/idm/src/test/java/org/jboss/identity/idm/impl/api/APITestBase.java idm/trunk/idm/src/test/java/org/jboss/identity/idm/impl/api/OrganizationTestCase.java idm/trunk/idm/src/test/java/org/jboss/identity/idm/impl/store/hibernate/HibernateModelJBossUnitTest.java idm/trunk/idm/src/test/java/org/jboss/identity/idm/impl/store/hibernate/HibernateModelTestCase.java idm/trunk/idm/src/test/java/org/jboss/identity/idm/impl/store/hibernate/HibernateTestBase.java idm/trunk/idm/src/test/java/org/jboss/identity/idm/impl/store/ldap/LDAPIdentityStoreJBossUnitTest.java Modified: idm/trunk/ idm/trunk/idm/pom.xml idm/trunk/idm/src/test/java/org/jboss/identity/idm/impl/IdentityTestPOJO.java idm/trunk/idm/src/test/java/org/jboss/identity/idm/impl/LDAPTestPOJO.java idm/trunk/idm/src/test/java/org/jboss/identity/idm/impl/api/APIJBossUnitTest.java idm/trunk/idm/src/test/java/org/jboss/identity/idm/impl/api/APILDAPJBossUnitTest.java idm/trunk/idm/src/test/java/org/jboss/identity/idm/impl/api/APITestCase.java idm/trunk/idm/src/test/java/org/jboss/identity/idm/impl/api/OrganizationJBossUnitTest.java idm/trunk/idm/src/test/java/org/jboss/identity/idm/impl/api/OrganizationLDAPJBossUnitTest.java idm/trunk/idm/src/test/java/org/jboss/identity/idm/impl/store/hibernate/HibernateIdentityStoreJBossUnitTest.java idm/trunk/idm/src/test/java/org/jboss/identity/idm/impl/store/hibernate/HibernateIdentityStoreTestCase.java idm/trunk/idm/src/test/resources/jboss-unit.xml Log: sync proto changes to trunk Property changes on: idm/trunk ___________________________________________________________________ Name: svn:mergeinfo - Modified: idm/trunk/idm/pom.xml =================================================================== --- idm/trunk/idm/pom.xml 2009-04-03 07:53:28 UTC (rev 421) +++ idm/trunk/idm/pom.xml 2009-04-03 08:52:13 UTC (rev 422) @@ -216,57 +216,67 @@ <plugin> <artifactId>maven-surefire-plugin</artifactId> <configuration> - <skip>true</skip> +  + <systemProperties> + <property> + <name>dataSourceName</name> + <value>${dataSourceName}</value> + </property> + <property> + <name>directoryName</name> + <value>${directoryName}</value> + </property> + </systemProperties> </configuration> </plugin> - <plugin> - <groupId>org.jboss.unit</groupId> - <artifactId>jboss-unit-tooling-maven2</artifactId> - <executions> - <execution> - <phase>test</phase> - <goals> - <goal>execute</goal> - </goals> - </execution> - </executions> - <configuration> +  +  +  +  +  +  +  +  +  +  +  +   - <jpdaPort>5005</jpdaPort> - <jpdaSuspend>true</jpdaSuspend> +  +  - <failOnError>true</failOnError> +  - <testsuites> - <testsuite> - <config>jboss-unit.xml</config> - <parameters> - <parameter> - <name>dataSourceName</name> - <values> - <value>hsqldb</value> +  +  +  +  +  +  +  +        - </values> - </parameter> - </parameters> +  +  +  - </testsuite> - </testsuites> +  +  - <reports> - <xml>idm/target/tests/reports/xml</xml> - <html>idm/target/tests/reports/html</html> - </reports> - </configuration> - </plugin> +  +  +  +  +  +  </plugins> </build> Modified: idm/trunk/idm/src/test/java/org/jboss/identity/idm/impl/IdentityTestPOJO.java =================================================================== --- idm/trunk/idm/src/test/java/org/jboss/identity/idm/impl/IdentityTestPOJO.java 2009-04-03 07:53:28 UTC (rev 421) +++ idm/trunk/idm/src/test/java/org/jboss/identity/idm/impl/IdentityTestPOJO.java 2009-04-03 08:52:13 UTC (rev 422) @@ -56,21 +56,23 @@ import java.util.Hashtable; import java.io.File; +import junit.framework.TestCase; + /** * @author <a href="mailto:boleslaw.dawidowicz at redhat.com">Boleslaw Dawidowicz</a> * @version : 0.1 $ */ -public class IdentityTestPOJO +public class IdentityTestPOJO extends TestCase { - private String identityConfig; + private String identityConfig = "organization-test-jboss-unit-config.xml"; private String realmName; - private String dataSourceName; + private String dataSourceName = "hsqldb"; - private String hibernateConfig; + private String hibernateConfig = "datasources/hibernates.xml"; private String datasources = "datasources/datasources.xml"; @@ -88,6 +90,8 @@ public void start() throws Exception { + overrideFromProperties(); + jndiSupport = new JNDISupport(); jndiSupport.start(); transactonManagerSupport = new TransactionManagerSupport(); @@ -143,6 +147,17 @@ } + public void overrideFromProperties() throws Exception + { + String dsName =System.getProperties().getProperty("dataSourceName"); + + if (dsName != null && !dsName.startsWith("$")) + { + setDataSourceName(dsName); + } + + } + public SessionFactory getSessionFactory() { return getHibernateSupport().getSessionFactory(); @@ -222,4 +237,6 @@ } + + } Modified: idm/trunk/idm/src/test/java/org/jboss/identity/idm/impl/LDAPTestPOJO.java =================================================================== --- idm/trunk/idm/src/test/java/org/jboss/identity/idm/impl/LDAPTestPOJO.java 2009-04-03 07:53:28 UTC (rev 421) +++ idm/trunk/idm/src/test/java/org/jboss/identity/idm/impl/LDAPTestPOJO.java 2009-04-03 08:52:13 UTC (rev 422) @@ -44,7 +44,7 @@ public class LDAPTestPOJO extends IdentityTestPOJO { - private String directoryName; + private String directoryName = "EmbeddedOpenDS"; public static final String LDAP_HOST = "localhost"; @@ -90,6 +90,19 @@ } + public void overrideFromProperties() throws Exception + { + super.overrideFromProperties(); + + String dirName = System.getProperties().getProperty("directoryName"); + + if (dirName != null && !dirName.startsWith("$")) + { + setDirectoryName(dirName); + } + + } + @Parameter public void setDirectoryName(String directoryName) { Modified: idm/trunk/idm/src/test/java/org/jboss/identity/idm/impl/api/APIJBossUnitTest.java =================================================================== --- idm/trunk/idm/src/test/java/org/jboss/identity/idm/impl/api/APIJBossUnitTest.java 2009-04-03 07:53:28 UTC (rev 421) +++ idm/trunk/idm/src/test/java/org/jboss/identity/idm/impl/api/APIJBossUnitTest.java 2009-04-03 08:52:13 UTC (rev 422) @@ -65,9 +65,12 @@ relationshipManagerTest = new RelationshipManagerTest(this); roleManagerTest = new RoleManagerTest(this); + begin(); identitySessionFactory = new IdentityConfigurationImpl(). configure(getIdentityConfig()).buildIdentitySessionFactory(); + + commit(); } @Destroy Modified: idm/trunk/idm/src/test/java/org/jboss/identity/idm/impl/api/APILDAPJBossUnitTest.java =================================================================== --- idm/trunk/idm/src/test/java/org/jboss/identity/idm/impl/api/APILDAPJBossUnitTest.java 2009-04-03 07:53:28 UTC (rev 421) +++ idm/trunk/idm/src/test/java/org/jboss/identity/idm/impl/api/APILDAPJBossUnitTest.java 2009-04-03 08:52:13 UTC (rev 422) @@ -68,9 +68,12 @@ populateClean(); + begin(); identitySessionFactory = new IdentityConfigurationImpl(). configure(getIdentityConfig()).buildIdentitySessionFactory(); + + commit(); } @Destroy Copied: idm/trunk/idm/src/test/java/org/jboss/identity/idm/impl/api/APILDAPTestCase.java (from rev 421, idm/branches/proto/idm/src/test/java/org/jboss/identity/idm/impl/api/APILDAPTestCase.java) =================================================================== --- idm/trunk/idm/src/test/java/org/jboss/identity/idm/impl/api/APILDAPTestCase.java (rev 0) +++ idm/trunk/idm/src/test/java/org/jboss/identity/idm/impl/api/APILDAPTestCase.java 2009-04-03 08:52:13 UTC (rev 422) @@ -0,0 +1,112 @@ +/* +* JBoss, a division of Red Hat +* Copyright 2006, Red Hat Middleware, LLC, and individual contributors as indicated +* by the @authors tag. See the copyright.txt in the distribution for a +* full listing of individual contributors. +* +* This is free software; you can redistribute it and/or modify it +* under the terms of the GNU Lesser General Public License as +* published by the Free Software Foundation; either version 2.1 of +* the License, or (at your option) any later version. +* +* This software is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +* Lesser General Public License for more details. +* +* You should have received a copy of the GNU Lesser General Public +* License along with this software; if not, write to the Free +* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA +* 02110-1301 USA, or see the FSF site: http://www.fsf.org. +*/ + +package org.jboss.identity.idm.impl.api; + +import junit.framework.TestCase; +import org.jboss.identity.idm.impl.HibernateTestSupport; +import org.jboss.identity.idm.impl.IdentityTestPOJO; +import org.jboss.identity.idm.impl.LDAPTestPOJO; +import org.jboss.identity.idm.impl.configuration.IdentityConfigurationImpl; +import org.jboss.identity.idm.api.IdentitySessionFactory; +import org.jboss.identity.idm.api.cfg.IdentityConfiguration; +import org.jboss.identity.idm.opends.OpenDSService; +import org.jboss.unit.api.pojo.annotations.Create; +import org.jboss.unit.api.pojo.annotations.Destroy; +import org.jboss.unit.api.pojo.annotations.Test; +import org.opends.server.tools.LDAPModify; + +import javax.naming.directory.DirContext; +import javax.naming.Context; +import javax.naming.NamingEnumeration; +import javax.naming.Binding; +import javax.naming.ldap.InitialLdapContext; +import java.util.Hashtable; +import java.io.File; + +/** + * @author <a href="mailto:boleslaw.dawidowicz at redhat.com">Boleslaw Dawidowicz</a> + * @version : 0.1 $ + */ +public class APILDAPTestCase extends LDAPTestPOJO implements APITestContext +{ + + PersistenceManagerTest persistenceManagerTest; + + RelationshipManagerTest relationshipManagerTest; + + RoleManagerTest roleManagerTest; + + IdentitySessionFactory identitySessionFactory; + + @Create + public void setUp() throws Exception + { + super.start(); + persistenceManagerTest = new PersistenceManagerTest(this); + relationshipManagerTest = new RelationshipManagerTest(this); + roleManagerTest = new RoleManagerTest(this); + + setRealmName("realm://RedHat/DB_LDAP"); + + populateClean(); + + + identitySessionFactory = new IdentityConfigurationImpl(). + configure(getIdentityConfig()).buildIdentitySessionFactory(); + } + + @Destroy + public void tearDown() throws Exception + { + super.stop(); + } + + public IdentitySessionFactory getIdentitySessionFactory() + { + return identitySessionFactory; + } + + @Test + public void testPersistenceManager() throws Exception + { + persistenceManagerTest.testMethods(getRealmName()); + } + + @Test + public void testRelationshipManager() throws Exception + { + relationshipManagerTest.testMethods(getRealmName()); + } + + @Test + public void testRelationshipManagerMergedRoleAssociations() throws Exception + { + relationshipManagerTest.testMergedRoleAssociations(getRealmName()); + } + + @Test + public void testRoleManager() throws Exception + { + roleManagerTest.testMethods(getRealmName()); + } +} \ No newline at end of file Deleted: idm/trunk/idm/src/test/java/org/jboss/identity/idm/impl/api/APITestBase.java =================================================================== --- idm/trunk/idm/src/test/java/org/jboss/identity/idm/impl/api/APITestBase.java 2009-04-03 07:53:28 UTC (rev 421) +++ idm/trunk/idm/src/test/java/org/jboss/identity/idm/impl/api/APITestBase.java 2009-04-03 08:52:13 UTC (rev 422) @@ -1,165 +0,0 @@ -///* -//* JBoss, a division of Red Hat -//* Copyright 2006, Red Hat Middleware, LLC, and individual contributors as indicated -//* by the @authors tag. See the copyright.txt in the distribution for a -//* full listing of individual contributors. -//* -//* This is free software; you can redistribute it and/or modify it -//* under the terms of the GNU Lesser General Public License as -//* published by the Free Software Foundation; either version 2.1 of -//* the License, or (at your option) any later version. -//* -//* This software is distributed in the hope that it will be useful, -//* but WITHOUT ANY WARRANTY; without even the implied warranty of -//* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -//* Lesser General Public License for more details. -//* -//* You should have received a copy of the GNU Lesser General Public -//* License along with this software; if not, write to the Free -//* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA -//* 02110-1301 USA, or see the FSF site: http://www.fsf.org. -//*/ -// -//package org.jboss.identity.idm.impl.api; -// -//import junit.framework.TestCase; -//import org.jboss.identity.idm.impl.HibernateTestSupport; -//import org.jboss.identity.idm.impl.configuration.IdentityConfigurationImpl; -//import org.jboss.identity.idm.api.IdentitySessionFactory; -//import org.jboss.identity.idm.api.cfg.IdentityConfiguration; -//import org.jboss.identity.idm.opends.OpenDSService; -//import org.opends.server.tools.LDAPModify; -// -//import javax.naming.directory.DirContext; -//import javax.naming.Context; -//import javax.naming.NamingEnumeration; -//import javax.naming.Binding; -//import javax.naming.ldap.InitialLdapContext; -//import java.util.Hashtable; -//import java.io.File; -// -///** -// * @author <a href="mailto:boleslaw.dawidowicz at redhat.com">Boleslaw Dawidowicz</a> -// * @version : 0.1 $ -// */ -//public class APITestBase extends TestCase implements APITestContext -//{ -// HibernateTestSupport hibernateSupport = -// new HibernateTestSupport("unit-testing-jpa1", "hibernate-jboss-identity-classes.cfg.xml"); -// -// IdentitySessionFactory identitySessionFactory; -// -// public static final String LDAP_HOST = "localhost"; -// -// public static final String LDAP_PORT = "10389"; -// -// public static final String LDAP_PROVIDER_URL = "ldap://" + LDAP_HOST + ":" + LDAP_PORT; -// -// public static final String LDAP_PRINCIPAL = "cn=Directory Manager"; -// -// public static final String LDAP_CREDENTIALS = "password"; -// -// static Hashtable<String,String> env = new Hashtable<String,String>(); -// -// static -// { -// env.put(Context.INITIAL_CONTEXT_FACTORY, "com.sun.jndi.ldap.LdapCtxFactory"); -// env.put(Context.PROVIDER_URL, LDAP_PROVIDER_URL); -// env.put(Context.SECURITY_AUTHENTICATION, "simple"); -// env.put(Context.SECURITY_PRINCIPAL, LDAP_PRINCIPAL); -// env.put(Context.SECURITY_CREDENTIALS, LDAP_CREDENTIALS); -// } -// -// OpenDSService openDSService = new OpenDSService("target/test-classes/opends"); -// -// protected void setUp() throws Exception -// { -// super.setUp(); -// hibernateSupport.start(); -// openDSService.start(); -// -// } -// -// protected void tearDown() throws Exception -// { -// hibernateSupport.stop(); -// -// cleanUp(new InitialLdapContext(env, null)); -// -// openDSService.stop(); -// } -// -// public IdentitySessionFactory getIdentitySessionFactory() -// { -// return identitySessionFactory; -// } -// -// public void populate() throws Exception -// { -// populateLDIF("target/test-classes/ldap/initial-opends.ldif"); -// } -// -// public void populateClean() throws Exception -// { -// populateLDIF("target/test-classes/ldap/initial-empty-opends.ldif"); -// } -// -// public void populateLDIF(String ldifRelativePath) throws Exception -// { -// File ldif = new File(ldifRelativePath); -// -// System.out.println("LDIF: " + ldif.getAbsolutePath()); -// -// String[] cmd = new String[] {"-h", LDAP_HOST, -// "-p", LDAP_PORT, -// "-D", LDAP_PRINCIPAL, -// "-w", LDAP_CREDENTIALS, -// "-a", "-f", ldif.getPath()}; -// -// System.out.println("Populate success: " + (LDAPModify.mainModify(cmd, false, System.out, System.err) == 0)); -// -// } -// -// protected void cleanUp(DirContext ldapCtx) throws Exception -// { -// try -// { -// String dn = "dc=portal,dc=example,dc=com"; -// -// System.out.println("Removing: " + dn); -// -// removeContext(ldapCtx, dn); -// } -// catch (Exception e) -// { -// // -// } -// } -// -// //subsequent remove of javax.naming.Context -// protected void removeContext(Context mainCtx, String name) throws Exception -// { -// Context deleteCtx = (Context)mainCtx.lookup(name); -// NamingEnumeration subDirs = mainCtx.listBindings(name); -// -// while (subDirs.hasMoreElements()) -// { -// Binding binding = (Binding)subDirs.nextElement(); -// String subName = binding.getName(); -// -// removeContext(deleteCtx, subName); -// } -// -// mainCtx.unbind(name); -// } -// -// public void begin() -// { -// -// } -// -// public void commit() -// { -// -// } -//} \ No newline at end of file Modified: idm/trunk/idm/src/test/java/org/jboss/identity/idm/impl/api/APITestCase.java =================================================================== --- idm/trunk/idm/src/test/java/org/jboss/identity/idm/impl/api/APITestCase.java 2009-04-03 07:53:28 UTC (rev 421) +++ idm/trunk/idm/src/test/java/org/jboss/identity/idm/impl/api/APITestCase.java 2009-04-03 08:52:13 UTC (rev 422) @@ -1,144 +1,109 @@ -///* -//* JBoss, a division of Red Hat -//* Copyright 2006, Red Hat Middleware, LLC, and individual contributors as indicated -//* by the @authors tag. See the copyright.txt in the distribution for a -//* full listing of individual contributors. -//* -//* This is free software; you can redistribute it and/or modify it -//* under the terms of the GNU Lesser General Public License as -//* published by the Free Software Foundation; either version 2.1 of -//* the License, or (at your option) any later version. -//* -//* This software is distributed in the hope that it will be useful, -//* but WITHOUT ANY WARRANTY; without even the implied warranty of -//* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -//* Lesser General Public License for more details. -//* -//* You should have received a copy of the GNU Lesser General Public -//* License along with this software; if not, write to the Free -//* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA -//* 02110-1301 USA, or see the FSF site: http://www.fsf.org. -//*/ -// -//package org.jboss.identity.idm.impl.api; -// -//import junit.framework.TestCase; -//import org.jboss.identity.idm.impl.HibernateTestSupport; -//import org.jboss.identity.idm.impl.configuration.IdentityConfigurationImpl; -//import org.jboss.identity.idm.api.IdentitySessionFactory; -//import org.jboss.identity.idm.api.cfg.IdentityConfiguration; -//import org.jboss.identity.idm.opends.OpenDSService; -//import org.opends.server.tools.LDAPModify; -// -//import javax.naming.directory.DirContext; -//import javax.naming.Context; -//import javax.naming.NamingEnumeration; -//import javax.naming.Binding; -//import javax.naming.ldap.InitialLdapContext; -//import java.util.Hashtable; -//import java.io.File; -// -///** -// * @author <a href="mailto:boleslaw.dawidowicz at redhat.com">Boleslaw Dawidowicz</a> -// * @version : 0.1 $ -// */ -//public class APITestCase extends APITestBase -//{ -// -// PersistenceManagerTest persistenceManagerTest; -// -// RelationshipManagerTest relationshipManagerTest; -// -// RoleManagerTest roleManagerTest; -// -// protected void setUp() throws Exception -// { -// super.setUp(); -// persistenceManagerTest = new PersistenceManagerTest(this); -// relationshipManagerTest = new RelationshipManagerTest(this); -// roleManagerTest = new RoleManagerTest(this); -// } -// -// protected void tearDown() throws Exception -// { -// super.tearDown(); -// } -// -// public void testDBPersistenceManager() throws Exception -// { -// identitySessionFactory = new IdentityConfigurationImpl(). -// configure(new File("src/test/resources/organization-test-config.xml")).buildIdentitySessionFactory(); -// -// persistenceManagerTest.testMethods("realm://RedHat/DB"); -// } -// -// public void testLDAPMixedPersistenceManager() throws Exception -// { -// populateClean(); -// -// identitySessionFactory = new IdentityConfigurationImpl(). -// configure(new File("src/test/resources/organization-test-config.xml")).buildIdentitySessionFactory(); -// -// -// persistenceManagerTest.testMethods("realm://RedHat/DB_LDAP"); -// } -// -// public void testDBRelationshipManager() throws Exception -// { -// identitySessionFactory = new IdentityConfigurationImpl(). -// configure(new File("src/test/resources/organization-test-config.xml")).buildIdentitySessionFactory(); -// -// relationshipManagerTest.testMethods("realm://RedHat/DB"); -// } -// -// public void testLDAPMixedRelationshipManager() throws Exception -// { -// populateClean(); -// -// identitySessionFactory = new IdentityConfigurationImpl(). -// configure(new File("src/test/resources/organization-test-config.xml")).buildIdentitySessionFactory(); -// -// -// relationshipManagerTest.testMethods("realm://RedHat/DB_LDAP"); -// } -// -// public void testDBRelationshipManagerMergedRoleAssociations() throws Exception -// { -// identitySessionFactory = new IdentityConfigurationImpl(). -// configure(new File("src/test/resources/organization-test-config.xml")).buildIdentitySessionFactory(); -// -// relationshipManagerTest.testMergedRoleAssociations("realm://RedHat/DB"); -// } -// -// public void testLDAPMixedRelationshipManagerMergedRoleAssociations() throws Exception -// { -// populateClean(); -// -// identitySessionFactory = new IdentityConfigurationImpl(). -// configure(new File("src/test/resources/organization-test-config.xml")).buildIdentitySessionFactory(); -// -// -// relationshipManagerTest.testMergedRoleAssociations("realm://RedHat/DB_LDAP"); -// } -// -// public void testDBRoleManager() throws Exception -// { -// identitySessionFactory = new IdentityConfigurationImpl(). -// configure(new File("src/test/resources/organization-test-config.xml")).buildIdentitySessionFactory(); -// -// roleManagerTest.testMethods("realm://RedHat/DB"); -// } -// -// public void testLDAPMixedRoleManager() throws Exception -// { -// populateClean(); -// -// identitySessionFactory = new IdentityConfigurationImpl(). -// configure(new File("src/test/resources/organization-test-config.xml")).buildIdentitySessionFactory(); -// -// -// roleManagerTest.testMethods("realm://RedHat/DB_LDAP"); -// } -// -//} -// +/* +* JBoss, a division of Red Hat +* Copyright 2006, Red Hat Middleware, LLC, and individual contributors as indicated +* by the @authors tag. See the copyright.txt in the distribution for a +* full listing of individual contributors. +* +* This is free software; you can redistribute it and/or modify it +* under the terms of the GNU Lesser General Public License as +* published by the Free Software Foundation; either version 2.1 of +* the License, or (at your option) any later version. +* +* This software is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +* Lesser General Public License for more details. +* +* You should have received a copy of the GNU Lesser General Public +* License along with this software; if not, write to the Free +* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA +* 02110-1301 USA, or see the FSF site: http://www.fsf.org. +*/ + +package org.jboss.identity.idm.impl.api; + +import junit.framework.TestCase; +import org.jboss.identity.idm.impl.HibernateTestSupport; +import org.jboss.identity.idm.impl.IdentityTestPOJO; +import org.jboss.identity.idm.impl.configuration.IdentityConfigurationImpl; +import org.jboss.identity.idm.api.IdentitySessionFactory; +import org.jboss.identity.idm.api.cfg.IdentityConfiguration; +import org.jboss.identity.idm.opends.OpenDSService; +import org.jboss.unit.api.pojo.annotations.Create; +import org.jboss.unit.api.pojo.annotations.Destroy; +import org.jboss.unit.api.pojo.annotations.Test; +import org.opends.server.tools.LDAPModify; + +import javax.naming.directory.DirContext; +import javax.naming.Context; +import javax.naming.NamingEnumeration; +import javax.naming.Binding; +import javax.naming.ldap.InitialLdapContext; +import java.util.Hashtable; +import java.io.File; + +/** + * @author <a href="mailto:boleslaw.dawidowicz at redhat.com">Boleslaw Dawidowicz</a> + * @version : 0.1 $ + */ +public class APITestCase extends IdentityTestPOJO implements APITestContext +{ + + PersistenceManagerTest persistenceManagerTest; + + RelationshipManagerTest relationshipManagerTest; + + RoleManagerTest roleManagerTest; + + IdentitySessionFactory identitySessionFactory; + + @Create + public void setUp() throws Exception + { + super.start(); + persistenceManagerTest = new PersistenceManagerTest(this); + relationshipManagerTest = new RelationshipManagerTest(this); + roleManagerTest = new RoleManagerTest(this); + + setRealmName("realm://RedHat/DB"); + + + identitySessionFactory = new IdentityConfigurationImpl(). + configure(getIdentityConfig()).buildIdentitySessionFactory(); + } + + @Destroy + public void tearDown() throws Exception + { + super.stop(); + } + + public IdentitySessionFactory getIdentitySessionFactory() + { + return identitySessionFactory; + } + + @Test + public void testPersistenceManager() throws Exception + { + persistenceManagerTest.testMethods(getRealmName()); + } + + @Test + public void testRelationshipManager() throws Exception + { + relationshipManagerTest.testMethods(getRealmName()); + } + + @Test + public void testRelationshipManagerMergedRoleAssociations() throws Exception + { + relationshipManagerTest.testMergedRoleAssociations(getRealmName()); + } + + @Test + public void testRoleManager() throws Exception + { + roleManagerTest.testMethods(getRealmName()); + } +} \ No newline at end of file Modified: idm/trunk/idm/src/test/java/org/jboss/identity/idm/impl/api/OrganizationJBossUnitTest.java =================================================================== --- idm/trunk/idm/src/test/java/org/jboss/identity/idm/impl/api/OrganizationJBossUnitTest.java 2009-04-03 07:53:28 UTC (rev 421) +++ idm/trunk/idm/src/test/java/org/jboss/identity/idm/impl/api/OrganizationJBossUnitTest.java 2009-04-03 08:52:13 UTC (rev 422) @@ -52,8 +52,12 @@ orgTest = new OrganizationTest(this); + begin(); + identitySessionFactory = new IdentityConfigurationImpl(). configure(getIdentityConfig()).buildIdentitySessionFactory(); + + commit(); } @Destroy Modified: idm/trunk/idm/src/test/java/org/jboss/identity/idm/impl/api/OrganizationLDAPJBossUnitTest.java =================================================================== --- idm/trunk/idm/src/test/java/org/jboss/identity/idm/impl/api/OrganizationLDAPJBossUnitTest.java 2009-04-03 07:53:28 UTC (rev 421) +++ idm/trunk/idm/src/test/java/org/jboss/identity/idm/impl/api/OrganizationLDAPJBossUnitTest.java 2009-04-03 08:52:13 UTC (rev 422) @@ -55,8 +55,12 @@ populateClean(); + begin(); + identitySessionFactory = new IdentityConfigurationImpl(). configure(getIdentityConfig()).buildIdentitySessionFactory(); + + commit(); } @Destroy Copied: idm/trunk/idm/src/test/java/org/jboss/identity/idm/impl/api/OrganizationLDAPTestCase.java (from rev 421, idm/branches/proto/idm/src/test/java/org/jboss/identity/idm/impl/api/OrganizationLDAPTestCase.java) =================================================================== --- idm/trunk/idm/src/test/java/org/jboss/identity/idm/impl/api/OrganizationLDAPTestCase.java (rev 0) +++ idm/trunk/idm/src/test/java/org/jboss/identity/idm/impl/api/OrganizationLDAPTestCase.java 2009-04-03 08:52:13 UTC (rev 422) @@ -0,0 +1,109 @@ +/* +* JBoss, a division of Red Hat +* Copyright 2006, Red Hat Middleware, LLC, and individual contributors as indicated +* by the @authors tag. See the copyright.txt in the distribution for a +* full listing of individual contributors. +* +* This is free software; you can redistribute it and/or modify it +* under the terms of the GNU Lesser General Public License as +* published by the Free Software Foundation; either version 2.1 of +* the License, or (at your option) any later version. +* +* This software is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +* Lesser General Public License for more details. +* +* You should have received a copy of the GNU Lesser General Public +* License along with this software; if not, write to the Free +* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA +* 02110-1301 USA, or see the FSF site: http://www.fsf.org. +*/ + +package org.jboss.identity.idm.impl.api; + +import org.jboss.identity.idm.impl.IdentityTestPOJO; +import org.jboss.identity.idm.impl.LDAPTestPOJO; +import org.jboss.identity.idm.impl.configuration.IdentityConfigurationImpl; +import org.jboss.identity.idm.api.IdentitySessionFactory; +import org.jboss.unit.api.pojo.annotations.Create; +import org.jboss.unit.api.pojo.annotations.Destroy; +import org.jboss.unit.api.pojo.annotations.Test; +import org.jboss.unit.api.pojo.annotations.Parameter; + +/** + * @author <a href="mailto:boleslaw.dawidowicz at redhat.com">Boleslaw Dawidowicz</a> + * @version : 0.1 $ + */ +public class OrganizationLDAPTestCase extends LDAPTestPOJO implements APITestContext +{ + private OrganizationTest orgTest; + + private IdentitySessionFactory identitySessionFactory; + + private String samplePortalRealmName = "realm://portal/SamplePortal/DB_LDAP"; + + private String sampleOrganizationRealmName = "realm://RedHat/DB_LDAP"; + + + @Create + public void setUp() throws Exception + { + super.start(); + + orgTest = new OrganizationTest(this); + + populateClean(); + + identitySessionFactory = new IdentityConfigurationImpl(). + configure(getIdentityConfig()).buildIdentitySessionFactory(); + } + + @Destroy + public void tearDown() throws Exception + { + super.stop(); + } + + public IdentitySessionFactory getIdentitySessionFactory() + { + return identitySessionFactory; + } + + @Test + public void testOrganization() throws Exception + { + + orgTest.testRedHatOrganization(getSampleOrganizationRealmName()); + } + + @Test + public void testSamplePortal() throws Exception + { + + orgTest.testSamplePortal(getSamplePortalRealmName()); + + } + + public String getSamplePortalRealmName() + { + return samplePortalRealmName; + } + + @Parameter + public void setSamplePortalRealmName(String samplePortalRealmName) + { + this.samplePortalRealmName = samplePortalRealmName; + } + + public String getSampleOrganizationRealmName() + { + return sampleOrganizationRealmName; + } + + @Parameter + public void setSampleOrganizationRealmName(String sampleOrganizationRealmName) + { + this.sampleOrganizationRealmName = sampleOrganizationRealmName; + } +} \ No newline at end of file Deleted: idm/trunk/idm/src/test/java/org/jboss/identity/idm/impl/api/OrganizationTestCase.java =================================================================== --- idm/trunk/idm/src/test/java/org/jboss/identity/idm/impl/api/OrganizationTestCase.java 2009-04-03 07:53:28 UTC (rev 421) +++ idm/trunk/idm/src/test/java/org/jboss/identity/idm/impl/api/OrganizationTestCase.java 2009-04-03 08:52:13 UTC (rev 422) @@ -1,104 +0,0 @@ -///* -//* JBoss, a division of Red Hat -//* Copyright 2006, Red Hat Middleware, LLC, and individual contributors as indicated -//* by the @authors tag. See the copyright.txt in the distribution for a -//* full listing of individual contributors. -//* -//* This is free software; you can redistribute it and/or modify it -//* under the terms of the GNU Lesser General Public License as -//* published by the Free Software Foundation; either version 2.1 of -//* the License, or (at your option) any later version. -//* -//* This software is distributed in the hope that it will be useful, -//* but WITHOUT ANY WARRANTY; without even the implied warranty of -//* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -//* Lesser General Public License for more details. -//* -//* You should have received a copy of the GNU Lesser General Public -//* License along with this software; if not, write to the Free -//* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA -//* 02110-1301 USA, or see the FSF site: http://www.fsf.org. -//*/ -// -//package org.jboss.identity.idm.impl.api; -// -//import junit.framework.TestCase; -//import org.jboss.identity.idm.impl.HibernateTestSupport; -//import org.jboss.identity.idm.impl.configuration.IdentityConfigurationImpl; -//import org.jboss.identity.idm.api.IdentitySessionFactory; -//import org.jboss.identity.idm.api.cfg.IdentityConfiguration; -//import org.jboss.identity.idm.opends.OpenDSService; -//import org.opends.server.tools.LDAPModify; -// -//import javax.naming.directory.DirContext; -//import javax.naming.Context; -//import javax.naming.NamingEnumeration; -//import javax.naming.Binding; -//import javax.naming.ldap.InitialLdapContext; -//import java.util.Hashtable; -//import java.io.File; -// -///** -// * @author <a href="mailto:boleslaw.dawidowicz at redhat.com">Boleslaw Dawidowicz</a> -// * @version : 0.1 $ -// */ -//public class OrganizationTestCase extends APITestBase -//{ -// OrganizationTest orgTest; -// -// protected void setUp() throws Exception -// { -// super.setUp(); -// orgTest = new OrganizationTest(this); -// } -// -// protected void tearDown() throws Exception -// { -// super.tearDown(); -// } -// -// public void testDBOrganization() throws Exception -// { -// identitySessionFactory = new IdentityConfigurationImpl(). -// configure(new File("src/test/resources/organization-test-config.xml")).buildIdentitySessionFactory(); -// -// orgTest.testRedHatOrganization("realm://RedHat/DB"); -// } -// -// public void testDBSamplePortal() throws Exception -// { -// -// identitySessionFactory = new IdentityConfigurationImpl(). -// configure(new File("src/test/resources/organization-test-config.xml")).buildIdentitySessionFactory(); -// -// orgTest.testSamplePortal("realm://portal/SamplePortal/DB"); -// } -// -// public void testLDAPMixedOrganization() throws Exception -// { -// populateClean(); -// -// identitySessionFactory = new IdentityConfigurationImpl(). -// configure(new File("src/test/resources/organization-test-config.xml")).buildIdentitySessionFactory(); -// -// -// orgTest.testRedHatOrganization("realm://RedHat/DB_LDAP"); -// } -// -// public void testLDAPMixedSamplePortal() throws Exception -// { -// populateClean(); -// -// identitySessionFactory = new IdentityConfigurationImpl(). -// configure(new File("src/test/resources/organization-test-config.xml")).buildIdentitySessionFactory(); -// -// -// orgTest.testSamplePortal("realm://portal/SamplePortal/DB_LDAP"); -// } -// -// -// -// -// -// -//} \ No newline at end of file Copied: idm/trunk/idm/src/test/java/org/jboss/identity/idm/impl/api/OrganizationTestCase.java (from rev 421, idm/branches/proto/idm/src/test/java/org/jboss/identity/idm/impl/api/OrganizationTestCase.java) =================================================================== --- idm/trunk/idm/src/test/java/org/jboss/identity/idm/impl/api/OrganizationTestCase.java (rev 0) +++ idm/trunk/idm/src/test/java/org/jboss/identity/idm/impl/api/OrganizationTestCase.java 2009-04-03 08:52:13 UTC (rev 422) @@ -0,0 +1,106 @@ +/* +* JBoss, a division of Red Hat +* Copyright 2006, Red Hat Middleware, LLC, and individual contributors as indicated +* by the @authors tag. See the copyright.txt in the distribution for a +* full listing of individual contributors. +* +* This is free software; you can redistribute it and/or modify it +* under the terms of the GNU Lesser General Public License as +* published by the Free Software Foundation; either version 2.1 of +* the License, or (at your option) any later version. +* +* This software is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +* Lesser General Public License for more details. +* +* You should have received a copy of the GNU Lesser General Public +* License along with this software; if not, write to the Free +* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA +* 02110-1301 USA, or see the FSF site: http://www.fsf.org. +*/ + +package org.jboss.identity.idm.impl.api; + +import org.jboss.identity.idm.impl.IdentityTestPOJO; +import org.jboss.identity.idm.impl.configuration.IdentityConfigurationImpl; +import org.jboss.identity.idm.api.IdentitySessionFactory; +import org.jboss.unit.api.pojo.annotations.Create; +import org.jboss.unit.api.pojo.annotations.Destroy; +import org.jboss.unit.api.pojo.annotations.Test; +import org.jboss.unit.api.pojo.annotations.Parameter; + +/** + * @author <a href="mailto:boleslaw.dawidowicz at redhat.com">Boleslaw Dawidowicz</a> + * @version : 0.1 $ + */ +public class OrganizationTestCase extends IdentityTestPOJO implements APITestContext +{ + private OrganizationTest orgTest; + + private IdentitySessionFactory identitySessionFactory; + + private String samplePortalRealmName = "realm://portal/SamplePortal/DB"; + + private String sampleOrganizationRealmName = "realm://RedHat/DB"; + + + @Create + public void setUp() throws Exception + { + super.start(); + + orgTest = new OrganizationTest(this); + + identitySessionFactory = new IdentityConfigurationImpl(). + configure(getIdentityConfig()).buildIdentitySessionFactory(); + } + + @Destroy + public void tearDown() throws Exception + { + super.stop(); + } + + public IdentitySessionFactory getIdentitySessionFactory() + { + return identitySessionFactory; + } + + @Test + public void testOrganization() throws Exception + { + + orgTest.testRedHatOrganization(getSampleOrganizationRealmName()); + } + + @Test + public void testSamplePortal() throws Exception + { + + orgTest.testSamplePortal(getSamplePortalRealmName()); + + } + + public String getSamplePortalRealmName() + { + return samplePortalRealmName; + } + + @Parameter + public void setSamplePortalRealmName(String samplePortalRealmName) + { + this.samplePortalRealmName = samplePortalRealmName; + } + + public String getSampleOrganizationRealmName() + { + return sampleOrganizationRealmName; + } + + @Parameter + public void setSampleOrganizationRealmName(String sampleOrganizationRealmName) + { + this.sampleOrganizationRealmName = sampleOrganizationRealmName; + } +} \ No newline at end of file Modified: idm/trunk/idm/src/test/java/org/jboss/identity/idm/impl/store/hibernate/HibernateIdentityStoreJBossUnitTest.java =================================================================== --- idm/trunk/idm/src/test/java/org/jboss/identity/idm/impl/store/hibernate/HibernateIdentityStoreJBossUnitTest.java 2009-04-03 07:53:28 UTC (rev 421) +++ idm/trunk/idm/src/test/java/org/jboss/identity/idm/impl/store/hibernate/HibernateIdentityStoreJBossUnitTest.java 2009-04-03 08:52:13 UTC (rev 422) @@ -76,6 +76,8 @@ commonTest = new CommonIdentityStoreTest(this); + begin(); + IdentityConfigurationMetaData configurationMD = JAXB2IdentityConfiguration .createConfigurationMetaData(getIdentityConfig()); @@ -129,7 +131,9 @@ } }; + commit(); + } public void begin() Modified: idm/trunk/idm/src/test/java/org/jboss/identity/idm/impl/store/hibernate/HibernateIdentityStoreTestCase.java =================================================================== --- idm/trunk/idm/src/test/java/org/jboss/identity/idm/impl/store/hibernate/HibernateIdentityStoreTestCase.java 2009-04-03 07:53:28 UTC (rev 421) +++ idm/trunk/idm/src/test/java/org/jboss/identity/idm/impl/store/hibernate/HibernateIdentityStoreTestCase.java 2009-04-03 08:52:13 UTC (rev 422) @@ -1,291 +1,305 @@ -///* -//* JBoss, a division of Red Hat -//* Copyright 2006, Red Hat Middleware, LLC, and individual contributors as indicated -//* by the @authors tag. See the copyright.txt in the distribution for a -//* full listing of individual contributors. -//* -//* This is free software; you can redistribute it and/or modify it -//* under the terms of the GNU Lesser General Public License as -//* published by the Free Software Foundation; either version 2.1 of -//* the License, or (at your option) any later version. -//* -//* This software is distributed in the hope that it will be useful, -//* but WITHOUT ANY WARRANTY; without even the implied warranty of -//* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -//* Lesser General Public License for more details. -//* -//* You should have received a copy of the GNU Lesser General Public -//* License along with this software; if not, write to the Free -//* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA -//* 02110-1301 USA, or see the FSF site: http://www.fsf.org. -//*/ -// -//package org.jboss.identity.idm.impl.store.hibernate; -// -//import org.jboss.identity.idm.spi.model.IdentityObject; -//import org.jboss.identity.idm.spi.model.IdentityObjectAttribute; -//import org.jboss.identity.idm.spi.store.IdentityStoreInvocationContext; -//import org.jboss.identity.idm.spi.store.IdentityStore; -//import org.jboss.identity.idm.spi.store.IdentityStoreSession; -//import org.jboss.identity.idm.spi.configuration.metadata.IdentityStoreConfigurationMetaData; -//import org.jboss.identity.idm.spi.configuration.metadata.IdentityConfigurationMetaData; -//import org.jboss.identity.idm.spi.configuration.IdentityStoreConfigurationContext; -//import org.jboss.identity.idm.spi.configuration.IdentityConfigurationContextRegistry; -//import org.jboss.identity.idm.impl.store.hibernate.HibernateIdentityStoreImpl; -//import org.jboss.identity.idm.impl.store.hibernate.HibernateTestBase; -//import org.jboss.identity.idm.impl.store.IdentityTypeEnum; -//import org.jboss.identity.idm.impl.store.CommonIdentityStoreTest; -//import org.jboss.identity.idm.impl.store.IdentityStoreTestContext; -//import org.jboss.identity.idm.impl.configuration.jaxb2.JAXB2IdentityConfiguration; -//import org.jboss.identity.idm.impl.configuration.IdentityStoreConfigurationContextImpl; -//import org.jboss.identity.idm.impl.configuration.IdentityConfigurationImpl; -//import org.jboss.identity.idm.impl.api.SimpleAttribute; -//import org.jboss.identity.idm.exception.IdentityException; -//import org.jboss.identity.idm.api.cfg.IdentityConfiguration; -//import org.hibernate.Session; -//import org.hibernate.SessionFactory; -// -//import java.util.Map; -//import java.io.File; -// -///** -// * @author <a href="mailto:boleslaw.dawidowicz at redhat.com">Boleslaw Dawidowicz</a> -// * @version : 0.1 $ -// */ -//public class HibernateIdentityStoreTestCase extends HibernateTestBase implements IdentityStoreTestContext -//{ -// -// protected HibernateIdentityStoreImpl store; -// -// protected IdentityStoreInvocationContext ctx; -// -// protected CommonIdentityStoreTest commonTest; -// -// public HibernateIdentityStoreTestCase(String testName) -// { -// super(testName); -// commonTest = new CommonIdentityStoreTest(this); -// } -// -// -// -// @Override -// protected void setUp() throws Exception -// { -// super.setUp(); -// -// IdentityConfigurationMetaData configurationMD = JAXB2IdentityConfiguration -// .createConfigurationMetaData(new File("src/test/resources/store-test-config.xml")); -// -// IdentityConfigurationContextRegistry identityConfiguration = (IdentityConfigurationContextRegistry) -// new IdentityConfigurationImpl().configure(configurationMD); -// -// -// -// IdentityStoreConfigurationMetaData storeMD = null; -// -// for (IdentityStoreConfigurationMetaData metaData : configurationMD.getIdentityStores()) -// { -// if (metaData.getId().equals("HibernateTestStore")) -// { -// storeMD = metaData; -// break; -// } -// } -// -// IdentityStoreConfigurationContext context = -// new IdentityStoreConfigurationContextImpl(configurationMD, identityConfiguration, storeMD); -// -// store = new HibernateIdentityStoreImpl("HibernateTestStore") -// { -// -// @Override -// protected Session getHibernateSession(IdentityStoreInvocationContext ctx) -// { -// return sessionFactory.getCurrentSession(); -// } -// -// @Override -// protected SessionFactory bootstrapHibernateSessionFactory(IdentityStoreConfigurationContext configurationContext) throws IdentityException -// { -// return sessionFactory; -// } -// -// }; -// -// store.bootstrap(context); -// -// -// ctx = new IdentityStoreInvocationContext() -// { -// public IdentityStoreSession getIdentityStoreSession() -// { -// return null; -// } -// -// public String getRealmId() -// { -// return "testRealm"; -// } -// }; -// -// -// } -// -// public void begin() throws Exception -// { -// sessionFactory.getCurrentSession().getTransaction().begin(); -// -// } -// -// public void commit() throws Exception -// { -// sessionFactory.getCurrentSession().getTransaction().commit(); -// } -// -// public void flush() throws Exception -// { -// sessionFactory.getCurrentSession().flush(); -// } -// -// public IdentityStore getStore() -// { -// return store; -// } -// -// public IdentityStoreInvocationContext getCtx() -// { -// return ctx; -// } -// -// // Tests -// -// public void testStorePersistence() throws Exception -// { -// -// commonTest.testStorePersistence(); -// -// } -// -// public void testFindMethods() throws Exception -// { -// -// commonTest.testFindMethods(); -// -// } -// -// public void testAttributes() throws Exception -// { -// -// begin(); -// -// IdentityObject user1 = store.createIdentityObject(ctx, "Adam", IdentityTypeEnum.USER); -// IdentityObject user2 = store.createIdentityObject(ctx, "Eva", IdentityTypeEnum.USER); -// -// sessionFactory.getCurrentSession().flush(); -// -// IdentityObjectAttribute[] attrs = new IdentityObjectAttribute[]{ -// new SimpleAttribute("key1", new String[]{"val1", "val2", "val3"}), -// new SimpleAttribute("key2", new String[]{"val1", "val2", "val3", "val4"}) -// }; -// -// store.addAttributes(ctx, user1, attrs); -// -// sessionFactory.getCurrentSession().flush(); -// -// Map<String, IdentityObjectAttribute> persistedAttrs = store.getAttributes(ctx, user1); -// -// assertEquals(2, persistedAttrs.keySet().size()); -// -// assertTrue(persistedAttrs.containsKey("key1")); -// assertEquals(3, persistedAttrs.get("key1").getSize()); -// -// assertTrue(persistedAttrs.containsKey("key2")); -// assertEquals(4, persistedAttrs.get("key2").getSize()); -// -// sessionFactory.getCurrentSession().flush(); -// -// attrs = new IdentityObjectAttribute[]{ -// new SimpleAttribute("key3", new String[]{"val1"}) -// }; -// -// -// store.addAttributes(ctx, user1, attrs); -// -// sessionFactory.getCurrentSession().flush(); -// -// persistedAttrs = store.getAttributes(ctx, user1); -// -// assertEquals(3, persistedAttrs.keySet().size()); -// -// assertTrue(persistedAttrs.containsKey("key1")); -// assertEquals(3, persistedAttrs.get("key1").getSize()); -// -// assertTrue(persistedAttrs.containsKey("key2")); -// assertEquals(4, persistedAttrs.get("key2").getSize()); -// -// assertTrue(persistedAttrs.containsKey("key3")); -// assertEquals(1, persistedAttrs.get("key3").getSize()); -// -// sessionFactory.getCurrentSession().flush(); -// -// attrs = new IdentityObjectAttribute[]{ -// new SimpleAttribute("key3", new String[]{"val2"}) -// }; -// -// store.addAttributes(ctx, user1, attrs); -// -// sessionFactory.getCurrentSession().flush(); -// -// persistedAttrs = store.getAttributes(ctx, user1); -// -// assertEquals(3, persistedAttrs.keySet().size()); -// -// assertTrue(persistedAttrs.containsKey("key3")); -// assertEquals(2, persistedAttrs.get("key3").getSize()); -// -// sessionFactory.getCurrentSession().flush(); -// -// store.updateAttributes(ctx, user1, attrs); -// -// sessionFactory.getCurrentSession().flush(); -// -// persistedAttrs = store.getAttributes(ctx, user1); -// -// assertEquals(3, persistedAttrs.keySet().size()); -// -// assertTrue(persistedAttrs.containsKey("key3")); -// assertEquals(1, persistedAttrs.get("key3").getSize()); -// -// sessionFactory.getCurrentSession().flush(); -// -// store.removeAttributes(ctx, user1, new String[] {"key3"}); -// -// sessionFactory.getCurrentSession().flush(); -// -// persistedAttrs = store.getAttributes(ctx, user1); -// -// assertEquals(2, persistedAttrs.keySet().size()); -// -// -// sessionFactory.getCurrentSession().getTransaction().commit(); -// -// } -// -// public void testRelationships() throws Exception -// { -// commonTest.testRelationships(); -// } -// -// public void testCredentials() throws Exception -// { -// commonTest.testPasswordCredential(); -// commonTest.testBinaryCredential(); -// } -// -// public void testControls() throws Exception -// { -// commonTest.testControls(); -// } -// -//} +/* +* JBoss, a division of Red Hat +* Copyright 2006, Red Hat Middleware, LLC, and individual contributors as indicated +* by the @authors tag. See the copyright.txt in the distribution for a +* full listing of individual contributors. +* +* This is free software; you can redistribute it and/or modify it +* under the terms of the GNU Lesser General Public License as +* published by the Free Software Foundation; either version 2.1 of +* the License, or (at your option) any later version. +* +* This software is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +* Lesser General Public License for more details. +* +* You should have received a copy of the GNU Lesser General Public +* License along with this software; if not, write to the Free +* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA +* 02110-1301 USA, or see the FSF site: http://www.fsf.org. +*/ + +package org.jboss.identity.idm.impl.store.hibernate; + +import org.jboss.identity.idm.spi.model.IdentityObject; +import org.jboss.identity.idm.spi.model.IdentityObjectAttribute; +import org.jboss.identity.idm.spi.store.IdentityStoreInvocationContext; +import org.jboss.identity.idm.spi.store.IdentityStore; +import org.jboss.identity.idm.spi.store.IdentityStoreSession; +import org.jboss.identity.idm.spi.configuration.metadata.IdentityStoreConfigurationMetaData; +import org.jboss.identity.idm.spi.configuration.metadata.IdentityConfigurationMetaData; +import org.jboss.identity.idm.spi.configuration.IdentityStoreConfigurationContext; +import org.jboss.identity.idm.spi.configuration.IdentityConfigurationContextRegistry; +import org.jboss.identity.idm.impl.store.hibernate.HibernateIdentityStoreImpl; +import org.jboss.identity.idm.impl.store.IdentityTypeEnum; +import org.jboss.identity.idm.impl.store.CommonIdentityStoreTest; +import org.jboss.identity.idm.impl.store.IdentityStoreTestContext; +import org.jboss.identity.idm.impl.configuration.jaxb2.JAXB2IdentityConfiguration; +import org.jboss.identity.idm.impl.configuration.IdentityStoreConfigurationContextImpl; +import org.jboss.identity.idm.impl.configuration.IdentityConfigurationImpl; +import org.jboss.identity.idm.impl.api.SimpleAttribute; +import org.jboss.identity.idm.impl.IdentityTestPOJO; +import org.jboss.identity.idm.exception.IdentityException; +import org.jboss.identity.idm.api.cfg.IdentityConfiguration; +import org.jboss.unit.api.pojo.annotations.Create; +import org.jboss.unit.api.pojo.annotations.Test; +import static org.jboss.unit.api.Assert.*; +import org.hibernate.Session; +import org.hibernate.SessionFactory; + +import java.util.Map; +import java.io.File; + +/** + * @author <a href="mailto:boleslaw.dawidowicz at redhat.com">Boleslaw Dawidowicz</a> + * @version : 0.1 $ + */ +public class HibernateIdentityStoreTestCase extends IdentityTestPOJO implements IdentityStoreTestContext +{ + + protected HibernateIdentityStoreImpl store; + + protected IdentityStoreInvocationContext ctx; + + protected CommonIdentityStoreTest commonTest; + + public HibernateIdentityStoreTestCase() + { + + } + + @Create + public void setUp() throws Exception + { + super.start(); + + setIdentityConfig("store-test-config.xml"); + + commonTest = new CommonIdentityStoreTest(this); + + IdentityConfigurationMetaData configurationMD = JAXB2IdentityConfiguration + .createConfigurationMetaData(getIdentityConfig()); + + IdentityConfigurationContextRegistry identityConfiguration = (IdentityConfigurationContextRegistry) + new IdentityConfigurationImpl().configure(configurationMD); + + IdentityStoreConfigurationMetaData storeMD = null; + + for (IdentityStoreConfigurationMetaData metaData : configurationMD.getIdentityStores()) + { + if (metaData.getId().equals("HibernateTestStore")) + { + storeMD = metaData; + break; + } + } + + IdentityStoreConfigurationContext context = + new IdentityStoreConfigurationContextImpl(configurationMD, identityConfiguration, storeMD); + + store = new HibernateIdentityStoreImpl("HibernateTestStore") + { + + @Override + protected Session getHibernateSession(IdentityStoreInvocationContext ctx) + { + return getHibernateSupport().getSessionFactory().getCurrentSession(); + } + + @Override + protected SessionFactory bootstrapHibernateSessionFactory(IdentityStoreConfigurationContext configurationContext) throws IdentityException + { + return getHibernateSupport().getSessionFactory(); + } + + }; + + store.bootstrap(context); + + + ctx = new IdentityStoreInvocationContext() + { + public IdentityStoreSession getIdentityStoreSession() + { + return null; + } + + public String getRealmId() + { + return "testRealm"; + } + }; + + + } + + @Override + protected void tearDown() throws Exception + { + super.stop(); + } + + public void begin() + { + getHibernateSupport().openSession(); + } + + public void commit() + { + assertTrue(getHibernateSupport().commitTransaction()); + } + + public void flush() throws Exception + { + + getHibernateSupport().getSessionFactory().getCurrentSession().flush(); + } + + public IdentityStore getStore() + { + return store; + } + + public IdentityStoreInvocationContext getCtx() + { + return ctx; + } + + // Tests + + @Test + public void testStorePersistence() throws Exception + { + + commonTest.testStorePersistence(); + + } + + @Test + public void testFindMethods() throws Exception + { + + commonTest.testFindMethods(); + + } + + @Test + public void testAttributes() throws Exception + { + + begin(); + + IdentityObject user1 = store.createIdentityObject(ctx, "Adam", IdentityTypeEnum.USER); + IdentityObject user2 = store.createIdentityObject(ctx, "Eva", IdentityTypeEnum.USER); + + flush(); + + IdentityObjectAttribute[] attrs = new IdentityObjectAttribute[]{ + new SimpleAttribute("key1", new String[]{"val1", "val2", "val3"}), + new SimpleAttribute("key2", new String[]{"val1", "val2", "val3", "val4"}) + }; + + store.addAttributes(ctx, user1, attrs); + + flush(); + + Map<String, IdentityObjectAttribute> persistedAttrs = store.getAttributes(ctx, user1); + + assertEquals(2, persistedAttrs.keySet().size()); + + assertTrue(persistedAttrs.containsKey("key1")); + assertEquals(3, persistedAttrs.get("key1").getSize()); + + assertTrue(persistedAttrs.containsKey("key2")); + assertEquals(4, persistedAttrs.get("key2").getSize()); + + flush(); + + attrs = new IdentityObjectAttribute[]{ + new SimpleAttribute("key3", new String[]{"val1"}) + }; + + + store.addAttributes(ctx, user1, attrs); + + flush(); + + persistedAttrs = store.getAttributes(ctx, user1); + + assertEquals(3, persistedAttrs.keySet().size()); + + assertTrue(persistedAttrs.containsKey("key1")); + assertEquals(3, persistedAttrs.get("key1").getSize()); + + assertTrue(persistedAttrs.containsKey("key2")); + assertEquals(4, persistedAttrs.get("key2").getSize()); + + assertTrue(persistedAttrs.containsKey("key3")); + assertEquals(1, persistedAttrs.get("key3").getSize()); + + flush(); + + attrs = new IdentityObjectAttribute[]{ + new SimpleAttribute("key3", new String[]{"val2"}) + }; + + store.addAttributes(ctx, user1, attrs); + + flush(); + + persistedAttrs = store.getAttributes(ctx, user1); + + assertEquals(3, persistedAttrs.keySet().size()); + + assertTrue(persistedAttrs.containsKey("key3")); + assertEquals(2, persistedAttrs.get("key3").getSize()); + + flush(); + + store.updateAttributes(ctx, user1, attrs); + + flush(); + + persistedAttrs = store.getAttributes(ctx, user1); + + assertEquals(3, persistedAttrs.keySet().size()); + + assertTrue(persistedAttrs.containsKey("key3")); + assertEquals(1, persistedAttrs.get("key3").getSize()); + + flush(); + + store.removeAttributes(ctx, user1, new String[] {"key3"}); + + flush(); + + persistedAttrs = store.getAttributes(ctx, user1); + + assertEquals(2, persistedAttrs.keySet().size()); + + + commit(); + + } + + @Test + public void testRelationships() throws Exception + { + commonTest.testRelationships(); + } + + @Test + public void testCredentials() throws Exception + { + commonTest.testPasswordCredential(); + commonTest.testBinaryCredential(); + } + + @Test + public void testControls() throws Exception + { + commonTest.testControls(); + } + +} \ No newline at end of file Copied: idm/trunk/idm/src/test/java/org/jboss/identity/idm/impl/store/hibernate/HibernateModelJBossTestCase.java (from rev 421, idm/branches/proto/idm/src/test/java/org/jboss/identity/idm/impl/store/hibernate/HibernateModelJBossTestCase.java) =================================================================== --- idm/trunk/idm/src/test/java/org/jboss/identity/idm/impl/store/hibernate/HibernateModelJBossTestCase.java (rev 0) +++ idm/trunk/idm/src/test/java/org/jboss/identity/idm/impl/store/hibernate/HibernateModelJBossTestCase.java 2009-04-03 08:52:13 UTC (rev 422) @@ -0,0 +1,341 @@ +/* +* JBoss, a division of Red Hat +* Copyright 2006, Red Hat Middleware, LLC, and individual contributors as indicated +* by the @authors tag. See the copyright.txt in the distribution for a +* full listing of individual contributors. +* +* This is free software; you can redistribute it and/or modify it +* under the terms of the GNU Lesser General Public License as +* published by the Free Software Foundation; either version 2.1 of +* the License, or (at your option) any later version. +* +* This software is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +* Lesser General Public License for more details. +* +* You should have received a copy of the GNU Lesser General Public +* License along with this software; if not, write to the Free +* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA +* 02110-1301 USA, or see the FSF site: http://www.fsf.org. +*/ + +package org.jboss.identity.idm.impl.store.hibernate; + +import org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectRelationshipType; +import org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObject; +import org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectType; +import org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectRelationship; +import org.jboss.identity.idm.impl.model.hibernate.HibernateRealm; +import org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectTextAttribute; +import org.jboss.identity.idm.impl.IdentityTestPOJO; +import org.jboss.unit.api.pojo.annotations.Destroy; +import org.jboss.unit.api.pojo.annotations.Create; +import org.jboss.unit.api.pojo.annotations.Test; +import org.hibernate.Session; +import org.hibernate.Query; +import static org.jboss.unit.api.Assert.*; + + +/** + * @author <a href="mailto:boleslaw.dawidowicz at redhat.com">Boleslaw Dawidowicz</a> + * @version : 0.1 $ + */ +public class HibernateModelJBossTestCase extends IdentityTestPOJO +{ + public HibernateModelJBossTestCase() + { + } + + + @Create + public void setUp() throws Exception + { + super.start(); + } + + @Destroy + public void tearDown() throws Exception + { + super.stop(); + } + + @Test + public void testPersistence() { + + + begin(); + Session session = getSessionFactory().getCurrentSession(); + + + HibernateRealm realm = new HibernateRealm("default"); + session.persist(realm); + + // + + HibernateIdentityObjectType iot = new HibernateIdentityObjectType(); + iot.setName("User"); + + session.persist(iot); + assertTrue(session.contains(iot)); + + + HibernateIdentityObject io = new HibernateIdentityObject(); + io.setName("John Kowalski"); + io.setRealm(realm); + io.setIdentityType(iot); + + session.persist(io); + assertTrue(session.contains(io)); + + session.delete(io); + assertFalse(session.contains(io)); + + // + + + + // + + HibernateIdentityObjectRelationshipType iort = new HibernateIdentityObjectRelationshipType(); + iort.setName("Member"); + + session.persist(iort); + assertTrue(session.contains(iort)); + + // + +// JPAIdentityObjectRelationship ior = new JPAIdentityObjectRelationship(); +// ior.setType(iort); +// +// em.persist(ior); +// assertTrue(em.contains(ior)); + +// em.remove(ior); +// assertFalse(em.contains(ior)); + + // + + assertTrue(session.contains(iort)); + + session.delete(iort); + assertFalse(session.contains(iort)); + + commit(); + + + } + + @Test + public void testRelationships() + { + begin(); + + + Session session = getSessionFactory().getCurrentSession(); + + + HibernateRealm realm = new HibernateRealm("default"); + session.persist(realm); + + HibernateIdentityObjectType groupType = new HibernateIdentityObjectType("Group"); + session.persist(groupType); + HibernateIdentityObjectType userType = new HibernateIdentityObjectType("User"); + session.persist(userType); + + HibernateIdentityObject user1 = new HibernateIdentityObject("user1", userType, realm); + session.persist(user1); + HibernateIdentityObject user2 = new HibernateIdentityObject("user2", userType, realm); + session.persist(user2); + HibernateIdentityObject user3 = new HibernateIdentityObject("user3", userType, realm); + session.persist(user3); + + HibernateIdentityObject group1 = new HibernateIdentityObject("group1", groupType, realm); + session.persist(group1); + HibernateIdentityObject group2 = new HibernateIdentityObject("group2", groupType, realm); + session.persist(group2); + HibernateIdentityObject group3 = new HibernateIdentityObject("group3", groupType, realm); + session.persist(group3); + + HibernateIdentityObjectRelationshipType memberType = new HibernateIdentityObjectRelationshipType("member"); + session.persist(memberType); + + HibernateIdentityObjectRelationship relationship = new HibernateIdentityObjectRelationship(memberType, group1, user1); + session.persist(relationship); + relationship = new HibernateIdentityObjectRelationship(memberType, group1, user2); + session.persist(relationship); + relationship = new HibernateIdentityObjectRelationship(memberType, group2, user3); + session.persist(relationship); + relationship = new HibernateIdentityObjectRelationship(memberType, group2, group1); + session.persist(relationship); + + commit(); + + // + + + begin(); + + session = getSessionFactory().getCurrentSession(); + + Query ioQuery = session.createQuery("select o from HibernateIdentityObject o where o.name like :name"); + + group1 = (HibernateIdentityObject)ioQuery.setParameter("name", "group1").uniqueResult(); + assertEquals(2, group1.getFromRelationships().size()); + assertEquals(1, group1.getToRelationships().size()); + group2 = (HibernateIdentityObject)ioQuery.setParameter("name", "group2").uniqueResult(); + assertEquals(2, group2.getFromRelationships().size()); + assertEquals(0, group2.getToRelationships().size()); + + user3 = (HibernateIdentityObject)ioQuery.setParameter("name", "user3").uniqueResult(); + assertEquals(1, user3.getToRelationships().size()); + assertEquals(0, user3.getFromRelationships().size()); + assertEquals("group2", user3.getToRelationships().iterator().next().getFromIdentityObject().getName()); + commit(); + + } + + @Test + public void testNameTypeConstraint() throws Exception + { + + begin(); + Session session = getSessionFactory().getCurrentSession(); + + + + HibernateRealm realm = new HibernateRealm("default"); + session.persist(realm); + + HibernateIdentityObjectType groupType = new HibernateIdentityObjectType("Group"); + session.persist(groupType); + HibernateIdentityObjectType userType = new HibernateIdentityObjectType("User"); + session.persist(userType); + + HibernateIdentityObject user1 = new HibernateIdentityObject("user1", userType, realm); + session.persist(user1); + HibernateIdentityObject user2 = new HibernateIdentityObject("user2", userType, realm); + session.persist(user2); + + commit(); + + + + begin(); + + session = getSessionFactory().getCurrentSession(); + + try + { + + HibernateIdentityObject user3 = new HibernateIdentityObject("user2", userType, realm); + session.persist(user3); + + // Should fail + fail(); + } + catch (Exception e) + { + //expected + getHibernateSupport().commitTransaction(); + } + + + + begin(); + + session = getSessionFactory().getCurrentSession(); + + + HibernateIdentityObject user4 = new HibernateIdentityObject("group1", userType, realm); + session.persist(user4); + + + HibernateIdentityObject group1 = new HibernateIdentityObject("group1", groupType, realm); + session.persist(group1); + HibernateIdentityObject group2 = new HibernateIdentityObject("group2", groupType, realm); + session.persist(group2); + + //session.flush(); + + try + { + + HibernateIdentityObject group3 = new HibernateIdentityObject("group2", groupType, realm); + session.persist(group3); + + // Should fail + fail(); + } + catch (Exception e) + { + //expected + getHibernateSupport().commitTransaction(); + } + + + + begin(); + + session = getSessionFactory().getCurrentSession(); + + HibernateIdentityObject group4 = new HibernateIdentityObject("user1", groupType, realm); + session.persist(group4); + + session.flush(); + + commit(); + + + + + + } + + @Test + public void testAttributes() throws Exception + { + begin(); + + Session session = getSessionFactory().getCurrentSession(); + + + + + HibernateRealm realm = new HibernateRealm("default"); + session.persist(realm); + + HibernateIdentityObjectType userType = new HibernateIdentityObjectType("User"); + session.persist(userType); + HibernateIdentityObject user1 = new HibernateIdentityObject("user1", userType, realm); + session.persist(user1); + +// Set<String> values1 = new HashSet<String>(); +// values1.add("Val1"); +// values1.add("Val2"); +// values1.add("Val3"); + + + user1.getAttributes().add(new HibernateIdentityObjectTextAttribute(user1, "simple1", new String[]{"Val1", "Val2", "Val3"})); + user1.getAttributes().add(new HibernateIdentityObjectTextAttribute(user1, "simple2", new String[]{"Val1", "Val2", "Val3"})); + + + commit(); + + + + begin(); + + session = getSessionFactory().getCurrentSession(); + + user1 = (HibernateIdentityObject)session.get(HibernateIdentityObject.class, new Long(user1.getId())); + assertEquals(2, user1.getAttributes().size() ); +// assertNotNull(user1.getProfileAttributes().get("simple1")); +// assertEquals(3, user1.getProfileAttributes().get("simple1").length); + + + commit(); + + } + +} \ No newline at end of file Deleted: idm/trunk/idm/src/test/java/org/jboss/identity/idm/impl/store/hibernate/HibernateModelJBossUnitTest.java =================================================================== --- idm/trunk/idm/src/test/java/org/jboss/identity/idm/impl/store/hibernate/HibernateModelJBossUnitTest.java 2009-04-03 07:53:28 UTC (rev 421) +++ idm/trunk/idm/src/test/java/org/jboss/identity/idm/impl/store/hibernate/HibernateModelJBossUnitTest.java 2009-04-03 08:52:13 UTC (rev 422) @@ -1,341 +0,0 @@ -/* -* JBoss, a division of Red Hat -* Copyright 2006, Red Hat Middleware, LLC, and individual contributors as indicated -* by the @authors tag. See the copyright.txt in the distribution for a -* full listing of individual contributors. -* -* This is free software; you can redistribute it and/or modify it -* under the terms of the GNU Lesser General Public License as -* published by the Free Software Foundation; either version 2.1 of -* the License, or (at your option) any later version. -* -* This software is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -* Lesser General Public License for more details. -* -* You should have received a copy of the GNU Lesser General Public -* License along with this software; if not, write to the Free -* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA -* 02110-1301 USA, or see the FSF site: http://www.fsf.org. -*/ - -package org.jboss.identity.idm.impl.store.hibernate; - -import org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectRelationshipType; -import org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObject; -import org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectType; -import org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectRelationship; -import org.jboss.identity.idm.impl.model.hibernate.HibernateRealm; -import org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectTextAttribute; -import org.jboss.identity.idm.impl.IdentityTestPOJO; -import org.jboss.unit.api.pojo.annotations.Destroy; -import org.jboss.unit.api.pojo.annotations.Create; -import org.jboss.unit.api.pojo.annotations.Test; -import org.hibernate.Session; -import org.hibernate.Query; -import static org.jboss.unit.api.Assert.*; - - -/** - * @author <a href="mailto:boleslaw.dawidowicz at redhat.com">Boleslaw Dawidowicz</a> - * @version : 0.1 $ - */ -public class HibernateModelJBossUnitTest extends IdentityTestPOJO -{ - public HibernateModelJBossUnitTest() - { - } - - - @Create - public void start() throws Exception - { - super.start(); - } - - @Destroy - public void stop() throws Exception - { - super.stop(); - } - - @Test - public void testPersistence() { - - - begin(); - Session session = getSessionFactory().getCurrentSession(); - - - HibernateRealm realm = new HibernateRealm("default"); - session.persist(realm); - - // - - HibernateIdentityObjectType iot = new HibernateIdentityObjectType(); - iot.setName("User"); - - session.persist(iot); - assertTrue(session.contains(iot)); - - - HibernateIdentityObject io = new HibernateIdentityObject(); - io.setName("John Kowalski"); - io.setRealm(realm); - io.setIdentityType(iot); - - session.persist(io); - assertTrue(session.contains(io)); - - session.delete(io); - assertFalse(session.contains(io)); - - // - - - - // - - HibernateIdentityObjectRelationshipType iort = new HibernateIdentityObjectRelationshipType(); - iort.setName("Member"); - - session.persist(iort); - assertTrue(session.contains(iort)); - - // - -// JPAIdentityObjectRelationship ior = new JPAIdentityObjectRelationship(); -// ior.setType(iort); -// -// em.persist(ior); -// assertTrue(em.contains(ior)); - -// em.remove(ior); -// assertFalse(em.contains(ior)); - - // - - assertTrue(session.contains(iort)); - - session.delete(iort); - assertFalse(session.contains(iort)); - - commit(); - - - } - - @Test - public void testRelationships() - { - begin(); - - - Session session = getSessionFactory().getCurrentSession(); - - - HibernateRealm realm = new HibernateRealm("default"); - session.persist(realm); - - HibernateIdentityObjectType groupType = new HibernateIdentityObjectType("Group"); - session.persist(groupType); - HibernateIdentityObjectType userType = new HibernateIdentityObjectType("User"); - session.persist(userType); - - HibernateIdentityObject user1 = new HibernateIdentityObject("user1", userType, realm); - session.persist(user1); - HibernateIdentityObject user2 = new HibernateIdentityObject("user2", userType, realm); - session.persist(user2); - HibernateIdentityObject user3 = new HibernateIdentityObject("user3", userType, realm); - session.persist(user3); - - HibernateIdentityObject group1 = new HibernateIdentityObject("group1", groupType, realm); - session.persist(group1); - HibernateIdentityObject group2 = new HibernateIdentityObject("group2", groupType, realm); - session.persist(group2); - HibernateIdentityObject group3 = new HibernateIdentityObject("group3", groupType, realm); - session.persist(group3); - - HibernateIdentityObjectRelationshipType memberType = new HibernateIdentityObjectRelationshipType("member"); - session.persist(memberType); - - HibernateIdentityObjectRelationship relationship = new HibernateIdentityObjectRelationship(memberType, group1, user1); - session.persist(relationship); - relationship = new HibernateIdentityObjectRelationship(memberType, group1, user2); - session.persist(relationship); - relationship = new HibernateIdentityObjectRelationship(memberType, group2, user3); - session.persist(relationship); - relationship = new HibernateIdentityObjectRelationship(memberType, group2, group1); - session.persist(relationship); - - commit(); - - // - - - begin(); - - session = getSessionFactory().getCurrentSession(); - - Query ioQuery = session.createQuery("select o from HibernateIdentityObject o where o.name like :name"); - - group1 = (HibernateIdentityObject)ioQuery.setParameter("name", "group1").uniqueResult(); - assertEquals(2, group1.getFromRelationships().size()); - assertEquals(1, group1.getToRelationships().size()); - group2 = (HibernateIdentityObject)ioQuery.setParameter("name", "group2").uniqueResult(); - assertEquals(2, group2.getFromRelationships().size()); - assertEquals(0, group2.getToRelationships().size()); - - user3 = (HibernateIdentityObject)ioQuery.setParameter("name", "user3").uniqueResult(); - assertEquals(1, user3.getToRelationships().size()); - assertEquals(0, user3.getFromRelationships().size()); - assertEquals("group2", user3.getToRelationships().iterator().next().getFromIdentityObject().getName()); - commit(); - - } - - @Test - public void testNameTypeConstraint() throws Exception - { - - begin(); - Session session = getSessionFactory().getCurrentSession(); - - - - HibernateRealm realm = new HibernateRealm("default"); - session.persist(realm); - - HibernateIdentityObjectType groupType = new HibernateIdentityObjectType("Group"); - session.persist(groupType); - HibernateIdentityObjectType userType = new HibernateIdentityObjectType("User"); - session.persist(userType); - - HibernateIdentityObject user1 = new HibernateIdentityObject("user1", userType, realm); - session.persist(user1); - HibernateIdentityObject user2 = new HibernateIdentityObject("user2", userType, realm); - session.persist(user2); - - commit(); - - - - begin(); - - session = getSessionFactory().getCurrentSession(); - - try - { - - HibernateIdentityObject user3 = new HibernateIdentityObject("user2", userType, realm); - session.persist(user3); - - // Should fail - fail(); - } - catch (Exception e) - { - //expected - getHibernateSupport().commitTransaction(); - } - - - - begin(); - - session = getSessionFactory().getCurrentSession(); - - - HibernateIdentityObject user4 = new HibernateIdentityObject("group1", userType, realm); - session.persist(user4); - - - HibernateIdentityObject group1 = new HibernateIdentityObject("group1", groupType, realm); - session.persist(group1); - HibernateIdentityObject group2 = new HibernateIdentityObject("group2", groupType, realm); - session.persist(group2); - - //session.flush(); - - try - { - - HibernateIdentityObject group3 = new HibernateIdentityObject("group2", groupType, realm); - session.persist(group3); - - // Should fail - fail(); - } - catch (Exception e) - { - //expected - getHibernateSupport().commitTransaction(); - } - - - - begin(); - - session = getSessionFactory().getCurrentSession(); - - HibernateIdentityObject group4 = new HibernateIdentityObject("user1", groupType, realm); - session.persist(group4); - - session.flush(); - - commit(); - - - - - - } - - @Test - public void testAttributes() throws Exception - { - begin(); - - Session session = getSessionFactory().getCurrentSession(); - - - - - HibernateRealm realm = new HibernateRealm("default"); - session.persist(realm); - - HibernateIdentityObjectType userType = new HibernateIdentityObjectType("User"); - session.persist(userType); - HibernateIdentityObject user1 = new HibernateIdentityObject("user1", userType, realm); - session.persist(user1); - -// Set<String> values1 = new HashSet<String>(); -// values1.add("Val1"); -// values1.add("Val2"); -// values1.add("Val3"); - - - user1.getAttributes().add(new HibernateIdentityObjectTextAttribute(user1, "simple1", new String[]{"Val1", "Val2", "Val3"})); - user1.getAttributes().add(new HibernateIdentityObjectTextAttribute(user1, "simple2", new String[]{"Val1", "Val2", "Val3"})); - - - commit(); - - - - begin(); - - session = getSessionFactory().getCurrentSession(); - - user1 = (HibernateIdentityObject)session.get(HibernateIdentityObject.class, new Long(user1.getId())); - assertEquals(2, user1.getAttributes().size() ); -// assertNotNull(user1.getProfileAttributes().get("simple1")); -// assertEquals(3, user1.getProfileAttributes().get("simple1").length); - - - commit(); - - } - -} \ No newline at end of file Deleted: idm/trunk/idm/src/test/java/org/jboss/identity/idm/impl/store/hibernate/HibernateModelTestCase.java =================================================================== --- idm/trunk/idm/src/test/java/org/jboss/identity/idm/impl/store/hibernate/HibernateModelTestCase.java 2009-04-03 07:53:28 UTC (rev 421) +++ idm/trunk/idm/src/test/java/org/jboss/identity/idm/impl/store/hibernate/HibernateModelTestCase.java 2009-04-03 08:52:13 UTC (rev 422) @@ -1,304 +0,0 @@ -///* -//* JBoss, a division of Red Hat -//* Copyright 2006, Red Hat Middleware, LLC, and individual contributors as indicated -//* by the @authors tag. See the copyright.txt in the distribution for a -//* full listing of individual contributors. -//* -//* This is free software; you can redistribute it and/or modify it -//* under the terms of the GNU Lesser General Public License as -//* published by the Free Software Foundation; either version 2.1 of -//* the License, or (at your option) any later version. -//* -//* This software is distributed in the hope that it will be useful, -//* but WITHOUT ANY WARRANTY; without even the implied warranty of -//* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -//* Lesser General Public License for more details. -//* -//* You should have received a copy of the GNU Lesser General Public -//* License along with this software; if not, write to the Free -//* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA -//* 02110-1301 USA, or see the FSF site: http://www.fsf.org. -//*/ -// -//package org.jboss.identity.idm.impl.store.hibernate; -// -//import org.jboss.identity.idm.impl.store.hibernate.HibernateTestBase; -//import org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectRelationshipType; -//import org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObject; -//import org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectType; -//import org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectRelationship; -//import org.jboss.identity.idm.impl.model.hibernate.HibernateRealm; -//import org.jboss.identity.idm.impl.model.hibernate.HibernateIdentityObjectTextAttribute; -//import org.hibernate.Session; -//import org.hibernate.Query; -// -///** -// * @author <a href="mailto:boleslaw.dawidowicz at redhat.com">Boleslaw Dawidowicz</a> -// * @version : 0.1 $ -// */ -//public class HibernateModelTestCase extends HibernateTestBase -//{ -// public HibernateModelTestCase(String testName) -// { -// super(testName); -// } -// -// public void testPersistence() { -// -// Session session = sessionFactory.getCurrentSession(); -// session.getTransaction().begin(); -// -// HibernateRealm realm = new HibernateRealm("default"); -// session.persist(realm); -// -// // -// -// HibernateIdentityObjectType iot = new HibernateIdentityObjectType(); -// iot.setName("User"); -// -// session.persist(iot); -// assertTrue(session.contains(iot)); -// -// -// HibernateIdentityObject io = new HibernateIdentityObject(); -// io.setName("John Kowalski"); -// io.setRealm(realm); -// io.setIdentityType(iot); -// -// session.persist(io); -// assertTrue(session.contains(io)); -// -// session.delete(io); -// assertFalse(session.contains(io)); -// -// // -// -// -// -// // -// -// HibernateIdentityObjectRelationshipType iort = new HibernateIdentityObjectRelationshipType(); -// iort.setName("Member"); -// -// session.persist(iort); -// assertTrue(session.contains(iort)); -// -// // -// -//// JPAIdentityObjectRelationship ior = new JPAIdentityObjectRelationship(); -//// ior.setType(iort); -//// -//// em.persist(ior); -//// assertTrue(em.contains(ior)); -// -//// em.remove(ior); -//// assertFalse(em.contains(ior)); -// -// // -// -// assertTrue(session.contains(iort)); -// -// session.delete(iort); -// assertFalse(session.contains(iort)); -// -// session.getTransaction().commit(); -// -// -// } -// -// public void testRelationships() -// { -// Session session = sessionFactory.getCurrentSession(); -// -// session.getTransaction().begin(); -// -// HibernateRealm realm = new HibernateRealm("default"); -// session.persist(realm); -// -// HibernateIdentityObjectType groupType = new HibernateIdentityObjectType("Group"); -// session.persist(groupType); -// HibernateIdentityObjectType userType = new HibernateIdentityObjectType("User"); -// session.persist(userType); -// -// HibernateIdentityObject user1 = new HibernateIdentityObject("user1", userType, realm); -// session.persist(user1); -// HibernateIdentityObject user2 = new HibernateIdentityObject("user2", userType, realm); -// session.persist(user2); -// HibernateIdentityObject user3 = new HibernateIdentityObject("user3", userType, realm); -// session.persist(user3); -// -// HibernateIdentityObject group1 = new HibernateIdentityObject("group1", groupType, realm); -// session.persist(group1); -// HibernateIdentityObject group2 = new HibernateIdentityObject("group2", groupType, realm); -// session.persist(group2); -// HibernateIdentityObject group3 = new HibernateIdentityObject("group3", groupType, realm); -// session.persist(group3); -// -// HibernateIdentityObjectRelationshipType memberType = new HibernateIdentityObjectRelationshipType("member"); -// session.persist(memberType); -// -// HibernateIdentityObjectRelationship relationship = new HibernateIdentityObjectRelationship(memberType, group1, user1); -// session.persist(relationship); -// relationship = new HibernateIdentityObjectRelationship(memberType, group1, user2); -// session.persist(relationship); -// relationship = new HibernateIdentityObjectRelationship(memberType, group2, user3); -// session.persist(relationship); -// relationship = new HibernateIdentityObjectRelationship(memberType, group2, group1); -// session.persist(relationship); -// -// session.getTransaction().commit(); -// -// // -// session = sessionFactory.getCurrentSession(); -// -// session.getTransaction().begin(); -// -// Query ioQuery = session.createQuery("select o from HibernateIdentityObject o where o.name like :name"); -// -// group1 = (HibernateIdentityObject)ioQuery.setParameter("name", "group1").uniqueResult(); -// assertEquals(2, group1.getFromRelationships().size()); -// assertEquals(1, group1.getToRelationships().size()); -// group2 = (HibernateIdentityObject)ioQuery.setParameter("name", "group2").uniqueResult(); -// assertEquals(2, group2.getFromRelationships().size()); -// assertEquals(0, group2.getToRelationships().size()); -// -// user3 = (HibernateIdentityObject)ioQuery.setParameter("name", "user3").uniqueResult(); -// assertEquals(1, user3.getToRelationships().size()); -// assertEquals(0, user3.getFromRelationships().size()); -// assertEquals("group2", user3.getToRelationships().iterator().next().getFromIdentityObject().getName()); -// session.getTransaction().commit(); -// -// } -// -// public void testNameTypeConstraint() throws Exception -// { -// -// Session session = sessionFactory.getCurrentSession(); -// -// session.getTransaction().begin(); -// -// HibernateRealm realm = new HibernateRealm("default"); -// session.persist(realm); -// -// HibernateIdentityObjectType groupType = new HibernateIdentityObjectType("Group"); -// session.persist(groupType); -// HibernateIdentityObjectType userType = new HibernateIdentityObjectType("User"); -// session.persist(userType); -// -// HibernateIdentityObject user1 = new HibernateIdentityObject("user1", userType, realm); -// session.persist(user1); -// HibernateIdentityObject user2 = new HibernateIdentityObject("user2", userType, realm); -// session.persist(user2); -// -// session.getTransaction().commit(); -// -// session = sessionFactory.getCurrentSession(); -// -// session.getTransaction().begin(); -// -// try -// { -// -// HibernateIdentityObject user3 = new HibernateIdentityObject("user2", userType, realm); -// session.persist(user3); -// -// // Should fail -// fail(); -// } -// catch (Exception e) -// { -// //expected -// session.getTransaction().rollback(); -// } -// -// session = sessionFactory.getCurrentSession(); -// -// session.getTransaction().begin(); -// -// -// HibernateIdentityObject user4 = new HibernateIdentityObject("group1", userType, realm); -// session.persist(user4); -// -// -// HibernateIdentityObject group1 = new HibernateIdentityObject("group1", groupType, realm); -// session.persist(group1); -// HibernateIdentityObject group2 = new HibernateIdentityObject("group2", groupType, realm); -// session.persist(group2); -// -// //session.flush(); -// -// try -// { -// -// HibernateIdentityObject group3 = new HibernateIdentityObject("group2", groupType, realm); -// session.persist(group3); -// -// // Should fail -// fail(); -// } -// catch (Exception e) -// { -// //expected -// session.getTransaction().rollback(); -// } -// -// session = sessionFactory.getCurrentSession(); -// -// session.getTransaction().begin(); -// -// HibernateIdentityObject group4 = new HibernateIdentityObject("user1", groupType, realm); -// session.persist(group4); -// -// session.flush(); -// -// session.getTransaction().commit(); -// -// -// -// -// -// } -// -// -// public void testAttributes() throws Exception -// { -// Session session = sessionFactory.getCurrentSession(); -// -// -// session.getTransaction().begin(); -// -// HibernateRealm realm = new HibernateRealm("default"); -// session.persist(realm); -// -// HibernateIdentityObjectType userType = new HibernateIdentityObjectType("User"); -// session.persist(userType); -// HibernateIdentityObject user1 = new HibernateIdentityObject("user1", userType, realm); -// session.persist(user1); -// -//// Set<String> values1 = new HashSet<String>(); -//// values1.add("Val1"); -//// values1.add("Val2"); -//// values1.add("Val3"); -// -// -// user1.getAttributes().add(new HibernateIdentityObjectTextAttribute(user1, "simple1", new String[]{"Val1", "Val2", "Val3"})); -// user1.getAttributes().add(new HibernateIdentityObjectTextAttribute(user1, "simple2", new String[]{"Val1", "Val2", "Val3"})); -// -// -// session.getTransaction().commit(); -// -// session = sessionFactory.getCurrentSession(); -// -// session.getTransaction().begin(); -// -// user1 = (HibernateIdentityObject)session.get(HibernateIdentityObject.class, new Long(user1.getId())); -// assertEquals(2, user1.getAttributes().size() ); -//// assertNotNull(user1.getProfileAttributes().get("simple1")); -//// assertEquals(3, user1.getProfileAttributes().get("simple1").length); -// -// -// session.getTransaction().commit(); -// -// } -// -//} Deleted: idm/trunk/idm/src/test/java/org/jboss/identity/idm/impl/store/hibernate/HibernateTestBase.java =================================================================== --- idm/trunk/idm/src/test/java/org/jboss/identity/idm/impl/store/hibernate/HibernateTestBase.java 2009-04-03 07:53:28 UTC (rev 421) +++ idm/trunk/idm/src/test/java/org/jboss/identity/idm/impl/store/hibernate/HibernateTestBase.java 2009-04-03 08:52:13 UTC (rev 422) @@ -1,64 +0,0 @@ -///* -//* JBoss, a division of Red Hat -//* Copyright 2006, Red Hat Middleware, LLC, and individual contributors as indicated -//* by the @authors tag. See the copyright.txt in the distribution for a -//* full listing of individual contributors. -//* -//* This is free software; you can redistribute it and/or modify it -//* under the terms of the GNU Lesser General Public License as -//* published by the Free Software Foundation; either version 2.1 of -//* the License, or (at your option) any later version. -//* -//* This software is distributed in the hope that it will be useful, -//* but WITHOUT ANY WARRANTY; without even the implied warranty of -//* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -//* Lesser General Public License for more details. -//* -//* You should have received a copy of the GNU Lesser General Public -//* License along with this software; if not, write to the Free -//* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA -//* 02110-1301 USA, or see the FSF site: http://www.fsf.org. -//*/ -// -//package org.jboss.identity.idm.impl.store.hibernate; -// -//import junit.framework.TestCase; -// -//import java.util.logging.Logger; -// -//import org.hibernate.SessionFactory; -//import org.jboss.identity.idm.impl.HibernateTestSupport; -// -///** -// * @author <a href="mailto:boleslaw.dawidowicz at redhat.com">Boleslaw Dawidowicz</a> -// * @version : 0.1 $ -// */ -//public abstract class HibernateTestBase extends TestCase -//{ -// private static Logger logger = Logger.getLogger(HibernateModelTestCase.class.getName()); -// -// private HibernateTestSupport hibernateSupport = -// new HibernateTestSupport("unit-testing-jpa", "hibernate-jboss-identity-classes.cfg.xml"); -// -// protected SessionFactory sessionFactory; -// -// -// -// -// public HibernateTestBase(String testName) { -// super(testName); -// } -// -// @Override -// protected void setUp() throws Exception { -// super.setUp(); -// hibernateSupport.start(); -// sessionFactory = hibernateSupport.getSessionFactory(); -// } -// -// @Override -// protected void tearDown() throws Exception { -// super.tearDown(); -// hibernateSupport.stop(); -// } -//} Deleted: idm/trunk/idm/src/test/java/org/jboss/identity/idm/impl/store/ldap/LDAPIdentityStoreJBossUnitTest.java =================================================================== --- idm/trunk/idm/src/test/java/org/jboss/identity/idm/impl/store/ldap/LDAPIdentityStoreJBossUnitTest.java 2009-04-03 07:53:28 UTC (rev 421) +++ idm/trunk/idm/src/test/java/org/jboss/identity/idm/impl/store/ldap/LDAPIdentityStoreJBossUnitTest.java 2009-04-03 08:52:13 UTC (rev 422) @@ -1,437 +0,0 @@ -/* -* JBoss, a division of Red Hat -* Copyright 2006, Red Hat Middleware, LLC, and individual contributors as indicated -* by the @authors tag. See the copyright.txt in the distribution for a -* full listing of individual contributors. -* -* This is free software; you can redistribute it and/or modify it -* under the terms of the GNU Lesser General Public License as -* published by the Free Software Foundation; either version 2.1 of -* the License, or (at your option) any later version. -* -* This software is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -* Lesser General Public License for more details. -* -* You should have received a copy of the GNU Lesser General Public -* License along with this software; if not, write to the Free -* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA -* 02110-1301 USA, or see the FSF site: http://www.fsf.org. -*/ - -package org.jboss.identity.idm.impl.store.ldap; - -import junit.framework.TestCase; -import org.jboss.identity.idm.opends.OpenDSService; -import org.jboss.identity.idm.spi.store.IdentityStore; -import org.jboss.identity.idm.spi.store.IdentityStoreInvocationContext; -import org.jboss.identity.idm.spi.store.IdentityStoreSession; -import org.jboss.identity.idm.spi.model.IdentityObject; -import org.jboss.identity.idm.spi.model.IdentityObjectAttribute; -import org.jboss.identity.idm.spi.configuration.metadata.IdentityConfigurationMetaData; -import org.jboss.identity.idm.spi.configuration.metadata.IdentityStoreConfigurationMetaData; -import org.jboss.identity.idm.spi.configuration.IdentityConfigurationContextRegistry; -import org.jboss.identity.idm.spi.configuration.IdentityStoreConfigurationContext; -import org.jboss.identity.idm.impl.store.IdentityTypeEnum; -import org.jboss.identity.idm.impl.store.CommonIdentityStoreTest; -import org.jboss.identity.idm.impl.store.IdentityStoreTestContext; -import org.jboss.identity.idm.impl.configuration.jaxb2.JAXB2IdentityConfiguration; -import org.jboss.identity.idm.impl.configuration.IdentityConfigurationImpl; -import org.jboss.identity.idm.impl.configuration.IdentityStoreConfigurationContextImpl; -import org.jboss.identity.idm.impl.api.SimpleAttribute; -import org.jboss.identity.idm.impl.LDAPTestPOJO; -import org.jboss.identity.idm.exception.IdentityException; -import org.jboss.unit.api.pojo.annotations.Create; -import org.jboss.unit.api.pojo.annotations.Destroy; -import org.jboss.unit.api.pojo.annotations.Test; -import org.opends.server.tools.LDAPModify; - -import javax.naming.Context; -import javax.naming.NamingException; -import javax.naming.NamingEnumeration; -import javax.naming.Binding; -import javax.naming.directory.DirContext; -import javax.naming.ldap.LdapContext; -import javax.naming.ldap.InitialLdapContext; -import java.util.Hashtable; -import java.util.Map; -import java.io.File; -import static org.jboss.unit.api.Assert.*; - - -/** - * @author <a href="mailto:boleslaw.dawidowicz at redhat.com">Boleslaw Dawidowicz</a> - * @version : 0.1 $ - */ -public class - LDAPIdentityStoreJBossUnitTest extends LDAPTestPOJO implements IdentityStoreTestContext -{ - - CommonIdentityStoreTest commonTest; - - IdentityStoreInvocationContext ctx; - - IdentityStore store; - - public LDAPIdentityStoreJBossUnitTest() - { - - } - - @Create - public void start() throws Exception - { - super.start(); - - commonTest = new CommonIdentityStoreTest(this); - - IdentityConfigurationMetaData configurationMD = JAXB2IdentityConfiguration - .createConfigurationMetaData(getIdentityConfig()); - - IdentityConfigurationContextRegistry registry = (IdentityConfigurationContextRegistry) new IdentityConfigurationImpl(). - configure(configurationMD); - - IdentityStoreConfigurationMetaData storeMD = null; - - for (IdentityStoreConfigurationMetaData metaData : configurationMD.getIdentityStores()) - { - if (metaData.getId().equals("LDAPTestStore")) - { - storeMD = metaData; - break; - } - } - - IdentityStoreConfigurationContext context = new IdentityStoreConfigurationContextImpl(configurationMD, registry, storeMD); - - ctx = new IdentityStoreInvocationContext() - { - public IdentityStoreSession getIdentityStoreSession() - { - return new IdentityStoreSession(){ - - public Object getSessionContext() throws IdentityException - { - try - { - return getLdapContext(); - } - catch (Exception e) - { - throw new IdentityException("Failed to obtain LDAP connection: ", e); - } - } - - public void close() throws IdentityException - { - - } - - public void save() throws IdentityException - { - - } - - public void clear() throws IdentityException - { - - } - - public boolean isOpen() - { - return false; - } - - public boolean isTransactionSupported() - { - return false; - } - - public void startTransaction() - { - - } - - public void commitTransaction() - { - - } - - public void rollbackTransaction() - { - - } - - public boolean isTransactionActive() - { - return false; - } - }; - } - - public String getRealmId() - { - return "testRealm"; - } - }; - - //populate(); - - store = new LDAPIdentityStoreImpl("LDAPTestStore"); - - store.bootstrap(context); - } - - @Destroy - public void stop() throws Exception - { - super.stop(); - } - - - public void flush() throws Exception - { - //nothing - } - - public IdentityStore getStore() - { - return store; - } - - public IdentityStoreInvocationContext getCtx() - { - return ctx; - } - - - // Tests - -// Just test if OpenDS is running and was populated... - @Test - public void testSimple() throws Exception - { - populate(); - - Hashtable<String,String> env = new Hashtable<String,String>(); - env.put(Context.INITIAL_CONTEXT_FACTORY, "com.sun.jndi.ldap.LdapCtxFactory"); - env.put(Context.PROVIDER_URL, LDAP_PROVIDER_URL); - env.put(Context.SECURITY_AUTHENTICATION, "simple"); - env.put(Context.SECURITY_PRINCIPAL, LDAP_PRINCIPAL); - env.put(Context.SECURITY_CREDENTIALS, LDAP_CREDENTIALS); - - LdapContext ldapCtx = null; - try - { - ldapCtx = new InitialLdapContext(env, null); - -// Do something ... - System.out.println("Attributes: " + ldapCtx.getAttributes("o=test,dc=portal,dc=example,dc=com")); - - } - catch (NamingException e) - { - e.printStackTrace(); - } - finally - { - try - { - if (ldapCtx != null) - { - ldapCtx.close(); - } - } - catch (NamingException e) - { - e.printStackTrace(); - } - } - } - - @Test - public void testIdentityObjectCount() throws Exception - { - populate(); - - assertEquals(7, store.getIdentityObjectsCount(ctx, IdentityTypeEnum.USER)); - assertEquals(5, store.getIdentityObjectsCount(ctx, IdentityTypeEnum.ROLE)); - assertEquals(2, store.getIdentityObjectsCount(ctx, IdentityTypeEnum.GROUP)); - } - - @Test - public void testFindCreateRemove() throws Exception - { - populate(); - - assertEquals(7, store.getIdentityObjectsCount(ctx, IdentityTypeEnum.USER)); - - IdentityObject io = store.findIdentityObject(ctx, "admin", IdentityTypeEnum.USER); - assertEquals("admin", io.getName()); - assertEquals("uid=admin,ou=People,o=test,dc=portal,dc=example,dc=com", io.getId().toString()); - - // - - store.removeIdentityObject(ctx, io); - - assertEquals(6, store.getIdentityObjectsCount(ctx, IdentityTypeEnum.USER)); - - store.createIdentityObject(ctx, "newUserA", IdentityTypeEnum.USER); - - assertEquals(7, store.getIdentityObjectsCount(ctx, IdentityTypeEnum.USER)); - - // - - assertEquals(2, store.getIdentityObjectsCount(ctx, IdentityTypeEnum.GROUP)); - - store.createIdentityObject(ctx, "newGroupA", IdentityTypeEnum.GROUP); - - assertEquals(3, store.getIdentityObjectsCount(ctx, IdentityTypeEnum.GROUP)); - - // - - io = store.findIdentityObject(ctx, "cn=newGroupA,ou=Groups,o=test,dc=portal,dc=example,dc=com"); - assertEquals("newGroupA", io.getName()); - - } - - @Test - public void testAttributes() throws Exception{ - - populate(); - - IdentityObject user1 = store.createIdentityObject(ctx, "Adam", IdentityTypeEnum.USER); - IdentityObject user2 = store.createIdentityObject(ctx, "Eva", IdentityTypeEnum.USER); - - // - - IdentityObjectAttribute[] attrs = new IdentityObjectAttribute[]{ - new SimpleAttribute("phone", new String[]{"val1", "val2", "val3"}), - new SimpleAttribute("description", new String[]{"val1", "val2", "val3", "val4"}), - - }; - - store.addAttributes(ctx, user1, attrs); - - // - - Map<String, IdentityObjectAttribute> persistedAttrs = store.getAttributes(ctx, user1); - - assertEquals(2, persistedAttrs.keySet().size()); - - assertTrue(persistedAttrs.containsKey("phone")); - assertEquals(3, persistedAttrs.get("phone").getSize()); - - assertTrue(persistedAttrs.containsKey("description")); - assertEquals(4, persistedAttrs.get("description").getSize()); - - // - - attrs = new IdentityObjectAttribute[]{ - new SimpleAttribute("carLicense", new String[]{"val1"}) - }; - - store.addAttributes(ctx, user1, attrs); - - // - - persistedAttrs = store.getAttributes(ctx, user1); - - assertEquals(3, persistedAttrs.keySet().size()); - - assertTrue(persistedAttrs.containsKey("phone")); - assertEquals(3, persistedAttrs.get("phone").getSize()); - - assertTrue(persistedAttrs.containsKey("description")); - assertEquals(4, persistedAttrs.get("description").getSize()); - - assertTrue(persistedAttrs.containsKey("carLicense")); - assertEquals(1, persistedAttrs.get("carLicense").getSize()); - - attrs = new IdentityObjectAttribute[]{ - new SimpleAttribute("carLicense", new String[]{"val2"}) - }; - - store.addAttributes(ctx, user1, attrs); - - // - - persistedAttrs = store.getAttributes(ctx, user1); - - assertEquals(3, persistedAttrs.keySet().size()); - - assertTrue(persistedAttrs.containsKey("carLicense")); - assertEquals(2, persistedAttrs.get("carLicense").getSize()); - - // - - store.updateAttributes(ctx, user1, attrs); - - // - - persistedAttrs = store.getAttributes(ctx, user1); - - assertEquals(3, persistedAttrs.keySet().size()); - - assertTrue(persistedAttrs.containsKey("carLicense")); - assertEquals(1, persistedAttrs.get("carLicense").getSize()); - - // - - String[] names = new String[]{"carLicense"}; - store.removeAttributes(ctx, user1, names); - - // - - persistedAttrs = store.getAttributes(ctx, user1); - - assertEquals(2, persistedAttrs.keySet().size()); - - } - - @Test - public void testRelationships() throws Exception - { - populateClean(); - - commonTest.testRelationships(); - - } - - @Test - public void testStorePersistence() throws Exception - { - populateClean(); - - commonTest.testStorePersistence(); - - } - - @Test - public void testFindMethods() throws Exception - { - populateClean(); - - commonTest.testFindMethods(); - - } - - @Test - public void testControls() throws Exception - { - populateClean(); - - commonTest.testControls(); - } - - - @Test - public void testCredentials() throws Exception - { - populateClean(); - - commonTest.testPasswordCredential(); - } - -} Copied: idm/trunk/idm/src/test/java/org/jboss/identity/idm/impl/store/ldap/LDAPIdentityStoreTestCase.java (from rev 421, idm/branches/proto/idm/src/test/java/org/jboss/identity/idm/impl/store/ldap/LDAPIdentityStoreTestCase.java) =================================================================== --- idm/trunk/idm/src/test/java/org/jboss/identity/idm/impl/store/ldap/LDAPIdentityStoreTestCase.java (rev 0) +++ idm/trunk/idm/src/test/java/org/jboss/identity/idm/impl/store/ldap/LDAPIdentityStoreTestCase.java 2009-04-03 08:52:13 UTC (rev 422) @@ -0,0 +1,438 @@ +/* +* JBoss, a division of Red Hat +* Copyright 2006, Red Hat Middleware, LLC, and individual contributors as indicated +* by the @authors tag. See the copyright.txt in the distribution for a +* full listing of individual contributors. +* +* This is free software; you can redistribute it and/or modify it +* under the terms of the GNU Lesser General Public License as +* published by the Free Software Foundation; either version 2.1 of +* the License, or (at your option) any later version. +* +* This software is distributed in the hope that it will be useful, +* but WITHOUT ANY WARRANTY; without even the implied warranty of +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +* Lesser General Public License for more details. +* +* You should have received a copy of the GNU Lesser General Public +* License along with this software; if not, write to the Free +* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA +* 02110-1301 USA, or see the FSF site: http://www.fsf.org. +*/ + +package org.jboss.identity.idm.impl.store.ldap; + +import junit.framework.TestCase; +import org.jboss.identity.idm.opends.OpenDSService; +import org.jboss.identity.idm.spi.store.IdentityStore; +import org.jboss.identity.idm.spi.store.IdentityStoreInvocationContext; +import org.jboss.identity.idm.spi.store.IdentityStoreSession; +import org.jboss.identity.idm.spi.model.IdentityObject; +import org.jboss.identity.idm.spi.model.IdentityObjectAttribute; +import org.jboss.identity.idm.spi.configuration.metadata.IdentityConfigurationMetaData; +import org.jboss.identity.idm.spi.configuration.metadata.IdentityStoreConfigurationMetaData; +import org.jboss.identity.idm.spi.configuration.IdentityConfigurationContextRegistry; +import org.jboss.identity.idm.spi.configuration.IdentityStoreConfigurationContext; +import org.jboss.identity.idm.impl.store.IdentityTypeEnum; +import org.jboss.identity.idm.impl.store.CommonIdentityStoreTest; +import org.jboss.identity.idm.impl.store.IdentityStoreTestContext; +import org.jboss.identity.idm.impl.configuration.jaxb2.JAXB2IdentityConfiguration; +import org.jboss.identity.idm.impl.configuration.IdentityConfigurationImpl; +import org.jboss.identity.idm.impl.configuration.IdentityStoreConfigurationContextImpl; +import org.jboss.identity.idm.impl.api.SimpleAttribute; +import org.jboss.identity.idm.impl.LDAPTestPOJO; +import org.jboss.identity.idm.exception.IdentityException; +import org.jboss.unit.api.pojo.annotations.Create; +import org.jboss.unit.api.pojo.annotations.Destroy; +import org.jboss.unit.api.pojo.annotations.Test; +import org.opends.server.tools.LDAPModify; + +import javax.naming.Context; +import javax.naming.NamingException; +import javax.naming.NamingEnumeration; +import javax.naming.Binding; +import javax.naming.directory.DirContext; +import javax.naming.ldap.LdapContext; +import javax.naming.ldap.InitialLdapContext; +import java.util.Hashtable; +import java.util.Map; +import java.io.File; +import static org.jboss.unit.api.Assert.*; + + +/** + * @author <a href="mailto:boleslaw.dawidowicz at redhat.com">Boleslaw Dawidowicz</a> + * @version : 0.1 $ + */ +public class LDAPIdentityStoreTestCase extends LDAPTestPOJO implements IdentityStoreTestContext +{ + + CommonIdentityStoreTest commonTest; + + IdentityStoreInvocationContext ctx; + + IdentityStore store; + + public LDAPIdentityStoreTestCase() + { + + } + + @Create + public void setUp() throws Exception + { + super.start(); + + setIdentityConfig("store-test-config.xml"); + + commonTest = new CommonIdentityStoreTest(this); + + IdentityConfigurationMetaData configurationMD = JAXB2IdentityConfiguration + .createConfigurationMetaData(getIdentityConfig()); + + IdentityConfigurationContextRegistry registry = (IdentityConfigurationContextRegistry) new IdentityConfigurationImpl(). + configure(configurationMD); + + IdentityStoreConfigurationMetaData storeMD = null; + + for (IdentityStoreConfigurationMetaData metaData : configurationMD.getIdentityStores()) + { + if (metaData.getId().equals("LDAPTestStore")) + { + storeMD = metaData; + break; + } + } + + IdentityStoreConfigurationContext context = new IdentityStoreConfigurationContextImpl(configurationMD, registry, storeMD); + + ctx = new IdentityStoreInvocationContext() + { + public IdentityStoreSession getIdentityStoreSession() + { + return new IdentityStoreSession(){ + + public Object getSessionContext() throws IdentityException + { + try + { + return getLdapContext(); + } + catch (Exception e) + { + throw new IdentityException("Failed to obtain LDAP connection: ", e); + } + } + + public void close() throws IdentityException + { + + } + + public void save() throws IdentityException + { + + } + + public void clear() throws IdentityException + { + + } + + public boolean isOpen() + { + return false; + } + + public boolean isTransactionSupported() + { + return false; + } + + public void startTransaction() + { + + } + + public void commitTransaction() + { + + } + + public void rollbackTransaction() + { + + } + + public boolean isTransactionActive() + { + return false; + } + }; + } + + public String getRealmId() + { + return "testRealm"; + } + }; + + //populate(); + + store = new LDAPIdentityStoreImpl("LDAPTestStore"); + + store.bootstrap(context); + } + + @Destroy + public void tearDown() throws Exception + { + super.stop(); + } + + + public void flush() throws Exception + { + //nothing + } + + public IdentityStore getStore() + { + return store; + } + + public IdentityStoreInvocationContext getCtx() + { + return ctx; + } + + + // Tests + +// Just test if OpenDS is running and was populated... + @Test + public void testSimple() throws Exception + { + populate(); + + Hashtable<String,String> env = new Hashtable<String,String>(); + env.put(Context.INITIAL_CONTEXT_FACTORY, "com.sun.jndi.ldap.LdapCtxFactory"); + env.put(Context.PROVIDER_URL, LDAP_PROVIDER_URL); + env.put(Context.SECURITY_AUTHENTICATION, "simple"); + env.put(Context.SECURITY_PRINCIPAL, LDAP_PRINCIPAL); + env.put(Context.SECURITY_CREDENTIALS, LDAP_CREDENTIALS); + + LdapContext ldapCtx = null; + try + { + ldapCtx = new InitialLdapContext(env, null); + +// Do something ... + System.out.println("Attributes: " + ldapCtx.getAttributes("o=test,dc=portal,dc=example,dc=com")); + + } + catch (NamingException e) + { + e.printStackTrace(); + } + finally + { + try + { + if (ldapCtx != null) + { + ldapCtx.close(); + } + } + catch (NamingException e) + { + e.printStackTrace(); + } + } + } + + @Test + public void testIdentityObjectCount() throws Exception + { + populate(); + + assertEquals(7, store.getIdentityObjectsCount(ctx, IdentityTypeEnum.USER)); + assertEquals(5, store.getIdentityObjectsCount(ctx, IdentityTypeEnum.ROLE)); + assertEquals(2, store.getIdentityObjectsCount(ctx, IdentityTypeEnum.GROUP)); + } + + @Test + public void testFindCreateRemove() throws Exception + { + populate(); + + assertEquals(7, store.getIdentityObjectsCount(ctx, IdentityTypeEnum.USER)); + + IdentityObject io = store.findIdentityObject(ctx, "admin", IdentityTypeEnum.USER); + assertEquals("admin", io.getName()); + assertEquals("uid=admin,ou=People,o=test,dc=portal,dc=example,dc=com", io.getId().toString()); + + // + + store.removeIdentityObject(ctx, io); + + assertEquals(6, store.getIdentityObjectsCount(ctx, IdentityTypeEnum.USER)); + + store.createIdentityObject(ctx, "newUserA", IdentityTypeEnum.USER); + + assertEquals(7, store.getIdentityObjectsCount(ctx, IdentityTypeEnum.USER)); + + // + + assertEquals(2, store.getIdentityObjectsCount(ctx, IdentityTypeEnum.GROUP)); + + store.createIdentityObject(ctx, "newGroupA", IdentityTypeEnum.GROUP); + + assertEquals(3, store.getIdentityObjectsCount(ctx, IdentityTypeEnum.GROUP)); + + // + + io = store.findIdentityObject(ctx, "cn=newGroupA,ou=Groups,o=test,dc=portal,dc=example,dc=com"); + assertEquals("newGroupA", io.getName()); + + } + + @Test + public void testAttributes() throws Exception{ + + populate(); + + IdentityObject user1 = store.createIdentityObject(ctx, "Adam", IdentityTypeEnum.USER); + IdentityObject user2 = store.createIdentityObject(ctx, "Eva", IdentityTypeEnum.USER); + + // + + IdentityObjectAttribute[] attrs = new IdentityObjectAttribute[]{ + new SimpleAttribute("phone", new String[]{"val1", "val2", "val3"}), + new SimpleAttribute("description", new String[]{"val1", "val2", "val3", "val4"}), + + }; + + store.addAttributes(ctx, user1, attrs); + + // + + Map<String, IdentityObjectAttribute> persistedAttrs = store.getAttributes(ctx, user1); + + assertEquals(2, persistedAttrs.keySet().size()); + + assertTrue(persistedAttrs.containsKey("phone")); + assertEquals(3, persistedAttrs.get("phone").getSize()); + + assertTrue(persistedAttrs.containsKey("description")); + assertEquals(4, persistedAttrs.get("description").getSize()); + + // + + attrs = new IdentityObjectAttribute[]{ + new SimpleAttribute("carLicense", new String[]{"val1"}) + }; + + store.addAttributes(ctx, user1, attrs); + + // + + persistedAttrs = store.getAttributes(ctx, user1); + + assertEquals(3, persistedAttrs.keySet().size()); + + assertTrue(persistedAttrs.containsKey("phone")); + assertEquals(3, persistedAttrs.get("phone").getSize()); + + assertTrue(persistedAttrs.containsKey("description")); + assertEquals(4, persistedAttrs.get("description").getSize()); + + assertTrue(persistedAttrs.containsKey("carLicense")); + assertEquals(1, persistedAttrs.get("carLicense").getSize()); + + attrs = new IdentityObjectAttribute[]{ + new SimpleAttribute("carLicense", new String[]{"val2"}) + }; + + store.addAttributes(ctx, user1, attrs); + + // + + persistedAttrs = store.getAttributes(ctx, user1); + + assertEquals(3, persistedAttrs.keySet().size()); + + assertTrue(persistedAttrs.containsKey("carLicense")); + assertEquals(2, persistedAttrs.get("carLicense").getSize()); + + // + + store.updateAttributes(ctx, user1, attrs); + + // + + persistedAttrs = store.getAttributes(ctx, user1); + + assertEquals(3, persistedAttrs.keySet().size()); + + assertTrue(persistedAttrs.containsKey("carLicense")); + assertEquals(1, persistedAttrs.get("carLicense").getSize()); + + // + + String[] names = new String[]{"carLicense"}; + store.removeAttributes(ctx, user1, names); + + // + + persistedAttrs = store.getAttributes(ctx, user1); + + assertEquals(2, persistedAttrs.keySet().size()); + + } + + @Test + public void testRelationships() throws Exception + { + populateClean(); + + commonTest.testRelationships(); + + } + + @Test + public void testStorePersistence() throws Exception + { + populateClean(); + + commonTest.testStorePersistence(); + + } + + @Test + public void testFindMethods() throws Exception + { + populateClean(); + + commonTest.testFindMethods(); + + } + + @Test + public void testControls() throws Exception + { + populateClean(); + + commonTest.testControls(); + } + + + @Test + public void testCredentials() throws Exception + { + populateClean(); + + commonTest.testPasswordCredential(); + } + +} Modified: idm/trunk/idm/src/test/resources/jboss-unit.xml =================================================================== --- idm/trunk/idm/src/test/resources/jboss-unit.xml 2009-04-03 07:53:28 UTC (rev 421) +++ idm/trunk/idm/src/test/resources/jboss-unit.xml 2009-04-03 08:52:13 UTC (rev 422) @@ -12,14 +12,14 @@  <test > - <class name="org.jboss.identity.idm.impl.api.OrganizationJBossUnitTest"/> + <class name="org.jboss.identity.idm.impl.api.OrganizationTestCase"/> <parameter name="sampleOrganizationRealmName" value="realm://RedHat/DB"/> <parameter name="samplePortalRealmName" value="realm://portal/SamplePortal/DB"/> </test>  <test > - <class name="org.jboss.identity.idm.impl.api.OrganizationLDAPJBossUnitTest"/> + <class name="org.jboss.identity.idm.impl.api.OrganizationLDAPTestCase"/> <parameter name="directoryName" value="EmbeddedOpenDS"/> <parameter name="sampleOrganizationRealmName" value="realm://RedHat/DB_LDAP"/> <parameter name="samplePortalRealmName" value="realm://portal/SamplePortal/DB_LDAP"/> @@ -27,31 +27,31 @@  <test > - <class name="org.jboss.identity.idm.impl.api.APIJBossUnitTest"/> + <class name="org.jboss.identity.idm.impl.api.APITestCase"/> <parameter name="realmName" value="realm://RedHat/DB"/> </test>  <test > - <class name="org.jboss.identity.idm.impl.api.APILDAPJBossUnitTest"/> + <class name="org.jboss.identity.idm.impl.api.APILDAPTestCase"/> <parameter name="directoryName" value="EmbeddedOpenDS"/> <parameter name="realmName" value="realm://RedHat/DB_LDAP"/> </test>  <test > - <class name="org.jboss.identity.idm.impl.store.hibernate.HibernateIdentityStoreJBossUnitTest"/> + <class name="org.jboss.identity.idm.impl.store.hibernate.HibernateIdentityStoreTestCase"/> <parameter name="identityConfig" value="store-test-config.xml"/> </test>  <test > - <class name="org.jboss.identity.idm.impl.store.hibernate.HibernateModelJBossUnitTest"/> + <class name="org.jboss.identity.idm.impl.store.hibernate.HibernateModelJBossTestCase"/> </test>  <test > - <class name="org.jboss.identity.idm.impl.store.ldap.LDAPIdentityStoreJBossUnitTest"/> + <class name="org.jboss.identity.idm.impl.store.ldap.LDAPIdentityStoreTestCase"/> <parameter name="directoryName" value="EmbeddedOpenDS"/> <parameter name="identityConfig" value="store-test-config.xml"/> </test>

15 years, 10 months

1
0
0 / 0

JBoss Identity SVN: r421 - idm/branches/proto/idm/src/test/java/org/jboss/identity/idm/impl.

by jboss-identity-commits＠lists.jboss.org

Author: bdaw Date: 2009-04-03 03:53:28 -0400 (Fri, 03 Apr 2009) New Revision: 421 Modified: idm/branches/proto/idm/src/test/java/org/jboss/identity/idm/impl/IdentityTestPOJO.java idm/branches/proto/idm/src/test/java/org/jboss/identity/idm/impl/LDAPTestPOJO.java Log: proto Modified: idm/branches/proto/idm/src/test/java/org/jboss/identity/idm/impl/IdentityTestPOJO.java =================================================================== --- idm/branches/proto/idm/src/test/java/org/jboss/identity/idm/impl/IdentityTestPOJO.java 2009-04-02 22:33:10 UTC (rev 420) +++ idm/branches/proto/idm/src/test/java/org/jboss/identity/idm/impl/IdentityTestPOJO.java 2009-04-03 07:53:28 UTC (rev 421) @@ -151,7 +151,7 @@ { String dsName =System.getProperties().getProperty("dataSourceName"); - if (dsName != null) + if (dsName != null && !dsName.startsWith("$")) { setDataSourceName(dsName); } Modified: idm/branches/proto/idm/src/test/java/org/jboss/identity/idm/impl/LDAPTestPOJO.java =================================================================== --- idm/branches/proto/idm/src/test/java/org/jboss/identity/idm/impl/LDAPTestPOJO.java 2009-04-02 22:33:10 UTC (rev 420) +++ idm/branches/proto/idm/src/test/java/org/jboss/identity/idm/impl/LDAPTestPOJO.java 2009-04-03 07:53:28 UTC (rev 421) @@ -94,7 +94,7 @@ { super.overrideFromProperties(); - String dirName =System.getProperties().getProperty("directoryName"); + String dirName = System.getProperties().getProperty("directoryName"); if (dirName != null && !dirName.startsWith("$")) {

15 years, 10 months

1
0
0 / 0

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

jboss-identity-commits April 2009