February 2011 - picketlink-commits

Picketlink SVN: r700 - in federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2: profiles/attribute/dce and 1 other directories.

by picketlink-commits＠lists.jboss.org

Author: anil.saldhana(a)jboss.com Date: 2011-02-03 16:18:49 -0500 (Thu, 03 Feb 2011) New Revision: 700 Removed: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/ac/ObjectFactory.java federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/profiles/attribute/dce/ObjectFactory.java federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/profiles/sso/ecp/ObjectFactory.java Modified: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/ac/ActivationLimitDurationType.java federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/ac/ActivationLimitSessionType.java federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/profiles/attribute/dce/DCEValueType.java federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/profiles/attribute/dce/package-info.java federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/profiles/sso/ecp/RelayStateType.java federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/profiles/sso/ecp/RequestType.java federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/profiles/sso/ecp/ResponseType.java federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/profiles/sso/ecp/package-info.java Log: remove addtln jaxb object model Modified: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/ac/ActivationLimitDurationType.java =================================================================== --- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/ac/ActivationLimitDurationType.java 2011-02-03 21:11:08 UTC (rev 699) +++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/ac/ActivationLimitDurationType.java 2011-02-03 21:18:49 UTC (rev 700) @@ -1,17 +1,5 @@ -// -// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.1-661 -// 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: 2008.12.08 at 05:45:20 PM CST -// - - package org.picketlink.identity.federation.saml.v2.ac; - -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlType; + import javax.xml.datatype.Duration; @@ -31,14 +19,16 @@ * </pre> * * - */ -(a)XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "ActivationLimitDurationType") -public class ActivationLimitDurationType { - - @XmlAttribute(required = true) + */ +public class ActivationLimitDurationType +{ protected Duration duration; + public ActivationLimitDurationType( Duration theDuration ) + { + this.duration = theDuration; + } + /** * Gets the value of the duration property. * @@ -50,17 +40,4 @@ public Duration getDuration() { return duration; } - - /** - * Sets the value of the duration property. - * - * @param value - * allowed object is - * {@link Duration } - * - */ - public void setDuration(Duration value) { - this.duration = value; - } - -} +} \ No newline at end of file Modified: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/ac/ActivationLimitSessionType.java =================================================================== --- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/ac/ActivationLimitSessionType.java 2011-02-03 21:11:08 UTC (rev 699) +++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/ac/ActivationLimitSessionType.java 2011-02-03 21:18:49 UTC (rev 700) @@ -1,18 +1,4 @@ -// -// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.1-661 -// 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: 2008.12.08 at 05:45:20 PM CST -// - - -package org.picketlink.identity.federation.saml.v2.ac; - -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlType; - - +package org.picketlink.identity.federation.saml.v2.ac; /** * Java class for ActivationLimitSessionType complex type. * @@ -28,9 +14,7 @@ * </pre> * * - */ -(a)XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "ActivationLimitSessionType") + */ public class ActivationLimitSessionType { Deleted: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/ac/ObjectFactory.java =================================================================== --- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/ac/ObjectFactory.java 2011-02-03 21:11:08 UTC (rev 699) +++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/ac/ObjectFactory.java 2011-02-03 21:18:49 UTC (rev 700) @@ -1,862 +0,0 @@ -// -// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.1-661 -// 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: 2008.12.08 at 05:45:20 PM CST -// - - -package org.picketlink.identity.federation.saml.v2.ac; - -import javax.xml.bind.JAXBElement; -import javax.xml.bind.annotation.XmlElementDecl; -import javax.xml.bind.annotation.XmlRegistry; -import javax.xml.namespace.QName; - - -/** - * This object contains factory methods for each - * Java content interface and Java element interface - * generated in the oasis.names.tc.saml._2_0.ac package. - * An ObjectFactory allows you to programatically - * construct new instances of the Java representation - * for XML content. The Java representation of XML - * content can consist of schema derived interfaces - * and classes representing the binding of schema - * type definitions, element declarations and model - * groups. Factory methods for each of these are - * provided in this class. - * - */ -@XmlRegistry -public class ObjectFactory { - - private final static QName _GoverningAgreements_QNAME = new QName("urn:oasis:names:tc:SAML:2.0:ac", "GoverningAgreements"); - private final static QName _Length_QNAME = new QName("urn:oasis:names:tc:SAML:2.0:ac", "Length"); - private final static QName _TechnicalProtection_QNAME = new QName("urn:oasis:names:tc:SAML:2.0:ac", "TechnicalProtection"); - private final static QName _MobileNetworkRadioEncryption_QNAME = new QName("urn:oasis:names:tc:SAML:2.0:ac", "MobileNetworkRadioEncryption"); - private final static QName _ComplexAuthenticator_QNAME = new QName("urn:oasis:names:tc:SAML:2.0:ac", "ComplexAuthenticator"); - private final static QName _WTLS_QNAME = new QName("urn:oasis:names:tc:SAML:2.0:ac", "WTLS"); - private final static QName _AsymmetricDecryption_QNAME = new QName("urn:oasis:names:tc:SAML:2.0:ac", "AsymmetricDecryption"); - private final static QName _KeyStorage_QNAME = new QName("urn:oasis:names:tc:SAML:2.0:ac", "KeyStorage"); - private final static QName _PreviousSession_QNAME = new QName("urn:oasis:names:tc:SAML:2.0:ac", "PreviousSession"); - private final static QName _ZeroKnowledge_QNAME = new QName("urn:oasis:names:tc:SAML:2.0:ac", "ZeroKnowledge"); - private final static QName _AuthenticatorTransportProtocol_QNAME = new QName("urn:oasis:names:tc:SAML:2.0:ac", "AuthenticatorTransportProtocol"); - private final static QName _AuthnMethod_QNAME = new QName("urn:oasis:names:tc:SAML:2.0:ac", "AuthnMethod"); - private final static QName _ActivationLimitUsages_QNAME = new QName("urn:oasis:names:tc:SAML:2.0:ac", "ActivationLimitUsages"); - private final static QName _KeySharing_QNAME = new QName("urn:oasis:names:tc:SAML:2.0:ac", "KeySharing"); - private final static QName _MobileNetworkEndToEndEncryption_QNAME = new QName("urn:oasis:names:tc:SAML:2.0:ac", "MobileNetworkEndToEndEncryption"); - private final static QName _SharedSecretChallengeResponse_QNAME = new QName("urn:oasis:names:tc:SAML:2.0:ac", "SharedSecretChallengeResponse"); - private final static QName _DigSig_QNAME = new QName("urn:oasis:names:tc:SAML:2.0:ac", "DigSig"); - private final static QName _SSL_QNAME = new QName("urn:oasis:names:tc:SAML:2.0:ac", "SSL"); - private final static QName _ActivationPin_QNAME = new QName("urn:oasis:names:tc:SAML:2.0:ac", "ActivationPin"); - private final static QName _Token_QNAME = new QName("urn:oasis:names:tc:SAML:2.0:ac", "Token"); - private final static QName _PrivateKeyProtection_QNAME = new QName("urn:oasis:names:tc:SAML:2.0:ac", "PrivateKeyProtection"); - private final static QName _AuthenticationContextDeclaration_QNAME = new QName("urn:oasis:names:tc:SAML:2.0:ac", "AuthenticationContextDeclaration"); - private final static QName _Extension_QNAME = new QName("urn:oasis:names:tc:SAML:2.0:ac", "Extension"); - private final static QName _IPSec_QNAME = new QName("urn:oasis:names:tc:SAML:2.0:ac", "IPSec"); - private final static QName _UserSuffix_QNAME = new QName("urn:oasis:names:tc:SAML:2.0:ac", "UserSuffix"); - private final static QName _SwitchAudit_QNAME = new QName("urn:oasis:names:tc:SAML:2.0:ac", "SwitchAudit"); - private final static QName _Password_QNAME = new QName("urn:oasis:names:tc:SAML:2.0:ac", "Password"); - private final static QName _SecurityAudit_QNAME = new QName("urn:oasis:names:tc:SAML:2.0:ac", "SecurityAudit"); - private final static QName _IPAddress_QNAME = new QName("urn:oasis:names:tc:SAML:2.0:ac", "IPAddress"); - private final static QName _Smartcard_QNAME = new QName("urn:oasis:names:tc:SAML:2.0:ac", "Smartcard"); - private final static QName _OperationalProtection_QNAME = new QName("urn:oasis:names:tc:SAML:2.0:ac", "OperationalProtection"); - private final static QName _WrittenConsent_QNAME = new QName("urn:oasis:names:tc:SAML:2.0:ac", "WrittenConsent"); - private final static QName _AsymmetricKeyAgreement_QNAME = new QName("urn:oasis:names:tc:SAML:2.0:ac", "AsymmetricKeyAgreement"); - private final static QName _SecretKeyProtection_QNAME = new QName("urn:oasis:names:tc:SAML:2.0:ac", "SecretKeyProtection"); - private final static QName _SharedSecretDynamicPlaintext_QNAME = new QName("urn:oasis:names:tc:SAML:2.0:ac", "SharedSecretDynamicPlaintext"); - private final static QName _ADSL_QNAME = new QName("urn:oasis:names:tc:SAML:2.0:ac", "ADSL"); - private final static QName _Authenticator_QNAME = new QName("urn:oasis:names:tc:SAML:2.0:ac", "Authenticator"); - private final static QName _PSTN_QNAME = new QName("urn:oasis:names:tc:SAML:2.0:ac", "PSTN"); - private final static QName _ActivationLimitDuration_QNAME = new QName("urn:oasis:names:tc:SAML:2.0:ac", "ActivationLimitDuration"); - private final static QName _ActivationLimit_QNAME = new QName("urn:oasis:names:tc:SAML:2.0:ac", "ActivationLimit"); - private final static QName _PrincipalAuthenticationMechanism_QNAME = new QName("urn:oasis:names:tc:SAML:2.0:ac", "PrincipalAuthenticationMechanism"); - private final static QName _ActivationLimitSession_QNAME = new QName("urn:oasis:names:tc:SAML:2.0:ac", "ActivationLimitSession"); - private final static QName _MobileNetworkNoEncryption_QNAME = new QName("urn:oasis:names:tc:SAML:2.0:ac", "MobileNetworkNoEncryption"); - private final static QName _Identification_QNAME = new QName("urn:oasis:names:tc:SAML:2.0:ac", "Identification"); - private final static QName _GoverningAgreementRef_QNAME = new QName("urn:oasis:names:tc:SAML:2.0:ac", "GoverningAgreementRef"); - private final static QName _RestrictedPassword_QNAME = new QName("urn:oasis:names:tc:SAML:2.0:ac", "RestrictedPassword"); - private final static QName _TimeSyncToken_QNAME = new QName("urn:oasis:names:tc:SAML:2.0:ac", "TimeSyncToken"); - private final static QName _KeyActivation_QNAME = new QName("urn:oasis:names:tc:SAML:2.0:ac", "KeyActivation"); - private final static QName _ResumeSession_QNAME = new QName("urn:oasis:names:tc:SAML:2.0:ac", "ResumeSession"); - private final static QName _SubscriberLineNumber_QNAME = new QName("urn:oasis:names:tc:SAML:2.0:ac", "SubscriberLineNumber"); - private final static QName _DeactivationCallCenter_QNAME = new QName("urn:oasis:names:tc:SAML:2.0:ac", "DeactivationCallCenter"); - private final static QName _ISDN_QNAME = new QName("urn:oasis:names:tc:SAML:2.0:ac", "ISDN"); - private final static QName _Alphabet_QNAME = new QName("urn:oasis:names:tc:SAML:2.0:ac", "Alphabet"); - private final static QName _HTTP_QNAME = new QName("urn:oasis:names:tc:SAML:2.0:ac", "HTTP"); - - /** - * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: oasis.names.tc.saml._2_0.ac - * - */ - public ObjectFactory() { - } - - /** - * Create an instance of {@link RestrictedPasswordType } - * - */ - public RestrictedPasswordType createRestrictedPasswordType() { - return new RestrictedPasswordType(); - } - - /** - * Create an instance of {@link Generation } - * - */ - public Generation createGeneration() { - return new Generation(); - } - - /** - * Create an instance of {@link LengthType } - * - */ - public LengthType createLengthType() { - return new LengthType(); - } - - /** - * Create an instance of {@link ActivationLimitDurationType } - * - */ - public ActivationLimitDurationType createActivationLimitDurationType() { - return new ActivationLimitDurationType(); - } - - /** - * Create an instance of {@link ActivationLimitType } - * - */ - public ActivationLimitType createActivationLimitType() { - return new ActivationLimitType(); - } - - /** - * Create an instance of {@link AuthnContextDeclarationBaseType } - * - */ - public AuthnContextDeclarationBaseType createAuthnContextDeclarationBaseType() { - return new AuthnContextDeclarationBaseType(); - } - - /** - * Create an instance of {@link TimeSyncTokenType } - * - */ - public TimeSyncTokenType createTimeSyncTokenType() { - return new TimeSyncTokenType(); - } - - /** - * Create an instance of {@link OperationalProtectionType } - * - */ - public OperationalProtectionType createOperationalProtectionType() { - return new OperationalProtectionType(); - } - - /** - * Create an instance of {@link IdentificationType } - * - */ - public IdentificationType createIdentificationType() { - return new IdentificationType(); - } - - /** - * Create an instance of {@link AuthenticatorTransportProtocolType } - * - */ - public AuthenticatorTransportProtocolType createAuthenticatorTransportProtocolType() { - return new AuthenticatorTransportProtocolType(); - } - - /** - * Create an instance of {@link RestrictedLengthType } - * - */ - public RestrictedLengthType createRestrictedLengthType() { - return new RestrictedLengthType(); - } - - /** - * Create an instance of {@link AuthenticatorBaseType } - * - */ - public AuthenticatorBaseType createAuthenticatorBaseType() { - return new AuthenticatorBaseType(); - } - - /** - * Create an instance of {@link ExtensionOnlyType } - * - */ - public ExtensionOnlyType createExtensionOnlyType() { - return new ExtensionOnlyType(); - } - - /** - * Create an instance of {@link PrincipalAuthenticationMechanismType } - * - */ - public PrincipalAuthenticationMechanismType createPrincipalAuthenticationMechanismType() { - return new PrincipalAuthenticationMechanismType(); - } - - /** - * Create an instance of {@link GoverningAgreementRefType } - * - */ - public GoverningAgreementRefType createGoverningAgreementRefType() { - return new GoverningAgreementRefType(); - } - - /** - * Create an instance of {@link KeySharingType } - * - */ - public KeySharingType createKeySharingType() { - return new KeySharingType(); - } - - /** - * Create an instance of {@link KeyStorageType } - * - */ - public KeyStorageType createKeyStorageType() { - return new KeyStorageType(); - } - - /** - * Create an instance of {@link ActivationLimitUsagesType } - * - */ - public ActivationLimitUsagesType createActivationLimitUsagesType() { - return new ActivationLimitUsagesType(); - } - - /** - * Create an instance of {@link AuthnMethodBaseType } - * - */ - public AuthnMethodBaseType createAuthnMethodBaseType() { - return new AuthnMethodBaseType(); - } - - /** - * Create an instance of {@link PhysicalVerification } - * - */ - public PhysicalVerification createPhysicalVerification() { - return new PhysicalVerification(); - } - - /** - * Create an instance of {@link TokenType } - * - */ - public TokenType createTokenType() { - return new TokenType(); - } - - /** - * Create an instance of {@link GoverningAgreementsType } - * - */ - public GoverningAgreementsType createGoverningAgreementsType() { - return new GoverningAgreementsType(); - } - - /** - * Create an instance of {@link TechnicalProtectionBaseType } - * - */ - public TechnicalProtectionBaseType createTechnicalProtectionBaseType() { - return new TechnicalProtectionBaseType(); - } - - /** - * Create an instance of {@link ActivationPinType } - * - */ - public ActivationPinType createActivationPinType() { - return new ActivationPinType(); - } - - /** - * Create an instance of {@link PublicKeyType } - * - */ - public PublicKeyType createPublicKeyType() { - return new PublicKeyType(); - } - - /** - * Create an instance of {@link SecurityAuditType } - * - */ - public SecurityAuditType createSecurityAuditType() { - return new SecurityAuditType(); - } - - /** - * Create an instance of {@link PrivateKeyProtectionType } - * - */ - public PrivateKeyProtectionType createPrivateKeyProtectionType() { - return new PrivateKeyProtectionType(); - } - - /** - * Create an instance of {@link ComplexAuthenticatorType } - * - */ - public ComplexAuthenticatorType createComplexAuthenticatorType() { - return new ComplexAuthenticatorType(); - } - - /** - * Create an instance of {@link AlphabetType } - * - */ - public AlphabetType createAlphabetType() { - return new AlphabetType(); - } - - /** - * Create an instance of {@link PasswordType } - * - */ - public PasswordType createPasswordType() { - return new PasswordType(); - } - - /** - * Create an instance of {@link ActivationLimitSessionType } - * - */ - public ActivationLimitSessionType createActivationLimitSessionType() { - return new ActivationLimitSessionType(); - } - - /** - * Create an instance of {@link ExtensionType } - * - */ - public ExtensionType createExtensionType() { - return new ExtensionType(); - } - - /** - * Create an instance of {@link KeyActivationType } - * - */ - public KeyActivationType createKeyActivationType() { - return new KeyActivationType(); - } - - /** - * Create an instance of {@link SecretKeyProtectionType } - * - */ - public SecretKeyProtectionType createSecretKeyProtectionType() { - return new SecretKeyProtectionType(); - } - - /** - * Create an instance of {@link SharedSecretChallengeResponseType } - * - */ - public SharedSecretChallengeResponseType createSharedSecretChallengeResponseType() { - return new SharedSecretChallengeResponseType(); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link GoverningAgreementsType }{@code >}} - * - */ - @XmlElementDecl(namespace = "urn:oasis:names:tc:SAML:2.0:ac", name = "GoverningAgreements") - public JAXBElement<GoverningAgreementsType> createGoverningAgreements(GoverningAgreementsType value) { - return new JAXBElement<GoverningAgreementsType>(_GoverningAgreements_QNAME, GoverningAgreementsType.class, null, value); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link LengthType }{@code >}} - * - */ - @XmlElementDecl(namespace = "urn:oasis:names:tc:SAML:2.0:ac", name = "Length") - public JAXBElement<LengthType> createLength(LengthType value) { - return new JAXBElement<LengthType>(_Length_QNAME, LengthType.class, null, value); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link TechnicalProtectionBaseType }{@code >}} - * - */ - @XmlElementDecl(namespace = "urn:oasis:names:tc:SAML:2.0:ac", name = "TechnicalProtection") - public JAXBElement<TechnicalProtectionBaseType> createTechnicalProtection(TechnicalProtectionBaseType value) { - return new JAXBElement<TechnicalProtectionBaseType>(_TechnicalProtection_QNAME, TechnicalProtectionBaseType.class, null, value); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link ExtensionOnlyType }{@code >}} - * - */ - @XmlElementDecl(namespace = "urn:oasis:names:tc:SAML:2.0:ac", name = "MobileNetworkRadioEncryption") - public JAXBElement<ExtensionOnlyType> createMobileNetworkRadioEncryption(ExtensionOnlyType value) { - return new JAXBElement<ExtensionOnlyType>(_MobileNetworkRadioEncryption_QNAME, ExtensionOnlyType.class, null, value); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link ComplexAuthenticatorType }{@code >}} - * - */ - @XmlElementDecl(namespace = "urn:oasis:names:tc:SAML:2.0:ac", name = "ComplexAuthenticator") - public JAXBElement<ComplexAuthenticatorType> createComplexAuthenticator(ComplexAuthenticatorType value) { - return new JAXBElement<ComplexAuthenticatorType>(_ComplexAuthenticator_QNAME, ComplexAuthenticatorType.class, null, value); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link ExtensionOnlyType }{@code >}} - * - */ - @XmlElementDecl(namespace = "urn:oasis:names:tc:SAML:2.0:ac", name = "WTLS") - public JAXBElement<ExtensionOnlyType> createWTLS(ExtensionOnlyType value) { - return new JAXBElement<ExtensionOnlyType>(_WTLS_QNAME, ExtensionOnlyType.class, null, value); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link PublicKeyType }{@code >}} - * - */ - @XmlElementDecl(namespace = "urn:oasis:names:tc:SAML:2.0:ac", name = "AsymmetricDecryption") - public JAXBElement<PublicKeyType> createAsymmetricDecryption(PublicKeyType value) { - return new JAXBElement<PublicKeyType>(_AsymmetricDecryption_QNAME, PublicKeyType.class, null, value); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link KeyStorageType }{@code >}} - * - */ - @XmlElementDecl(namespace = "urn:oasis:names:tc:SAML:2.0:ac", name = "KeyStorage") - public JAXBElement<KeyStorageType> createKeyStorage(KeyStorageType value) { - return new JAXBElement<KeyStorageType>(_KeyStorage_QNAME, KeyStorageType.class, null, value); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link ExtensionOnlyType }{@code >}} - * - */ - @XmlElementDecl(namespace = "urn:oasis:names:tc:SAML:2.0:ac", name = "PreviousSession") - public JAXBElement<ExtensionOnlyType> createPreviousSession(ExtensionOnlyType value) { - return new JAXBElement<ExtensionOnlyType>(_PreviousSession_QNAME, ExtensionOnlyType.class, null, value); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link ExtensionOnlyType }{@code >}} - * - */ - @XmlElementDecl(namespace = "urn:oasis:names:tc:SAML:2.0:ac", name = "ZeroKnowledge") - public JAXBElement<ExtensionOnlyType> createZeroKnowledge(ExtensionOnlyType value) { - return new JAXBElement<ExtensionOnlyType>(_ZeroKnowledge_QNAME, ExtensionOnlyType.class, null, value); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link AuthenticatorTransportProtocolType }{@code >}} - * - */ - @XmlElementDecl(namespace = "urn:oasis:names:tc:SAML:2.0:ac", name = "AuthenticatorTransportProtocol") - public JAXBElement<AuthenticatorTransportProtocolType> createAuthenticatorTransportProtocol(AuthenticatorTransportProtocolType value) { - return new JAXBElement<AuthenticatorTransportProtocolType>(_AuthenticatorTransportProtocol_QNAME, AuthenticatorTransportProtocolType.class, null, value); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link AuthnMethodBaseType }{@code >}} - * - */ - @XmlElementDecl(namespace = "urn:oasis:names:tc:SAML:2.0:ac", name = "AuthnMethod") - public JAXBElement<AuthnMethodBaseType> createAuthnMethod(AuthnMethodBaseType value) { - return new JAXBElement<AuthnMethodBaseType>(_AuthnMethod_QNAME, AuthnMethodBaseType.class, null, value); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link ActivationLimitUsagesType }{@code >}} - * - */ - @XmlElementDecl(namespace = "urn:oasis:names:tc:SAML:2.0:ac", name = "ActivationLimitUsages") - public JAXBElement<ActivationLimitUsagesType> createActivationLimitUsages(ActivationLimitUsagesType value) { - return new JAXBElement<ActivationLimitUsagesType>(_ActivationLimitUsages_QNAME, ActivationLimitUsagesType.class, null, value); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link KeySharingType }{@code >}} - * - */ - @XmlElementDecl(namespace = "urn:oasis:names:tc:SAML:2.0:ac", name = "KeySharing") - public JAXBElement<KeySharingType> createKeySharing(KeySharingType value) { - return new JAXBElement<KeySharingType>(_KeySharing_QNAME, KeySharingType.class, null, value); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link ExtensionOnlyType }{@code >}} - * - */ - @XmlElementDecl(namespace = "urn:oasis:names:tc:SAML:2.0:ac", name = "MobileNetworkEndToEndEncryption") - public JAXBElement<ExtensionOnlyType> createMobileNetworkEndToEndEncryption(ExtensionOnlyType value) { - return new JAXBElement<ExtensionOnlyType>(_MobileNetworkEndToEndEncryption_QNAME, ExtensionOnlyType.class, null, value); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link SharedSecretChallengeResponseType }{@code >}} - * - */ - @XmlElementDecl(namespace = "urn:oasis:names:tc:SAML:2.0:ac", name = "SharedSecretChallengeResponse") - public JAXBElement<SharedSecretChallengeResponseType> createSharedSecretChallengeResponse(SharedSecretChallengeResponseType value) { - return new JAXBElement<SharedSecretChallengeResponseType>(_SharedSecretChallengeResponse_QNAME, SharedSecretChallengeResponseType.class, null, value); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link PublicKeyType }{@code >}} - * - */ - @XmlElementDecl(namespace = "urn:oasis:names:tc:SAML:2.0:ac", name = "DigSig") - public JAXBElement<PublicKeyType> createDigSig(PublicKeyType value) { - return new JAXBElement<PublicKeyType>(_DigSig_QNAME, PublicKeyType.class, null, value); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link ExtensionOnlyType }{@code >}} - * - */ - @XmlElementDecl(namespace = "urn:oasis:names:tc:SAML:2.0:ac", name = "SSL") - public JAXBElement<ExtensionOnlyType> createSSL(ExtensionOnlyType value) { - return new JAXBElement<ExtensionOnlyType>(_SSL_QNAME, ExtensionOnlyType.class, null, value); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link ActivationPinType }{@code >}} - * - */ - @XmlElementDecl(namespace = "urn:oasis:names:tc:SAML:2.0:ac", name = "ActivationPin") - public JAXBElement<ActivationPinType> createActivationPin(ActivationPinType value) { - return new JAXBElement<ActivationPinType>(_ActivationPin_QNAME, ActivationPinType.class, null, value); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link TokenType }{@code >}} - * - */ - @XmlElementDecl(namespace = "urn:oasis:names:tc:SAML:2.0:ac", name = "Token") - public JAXBElement<TokenType> createToken(TokenType value) { - return new JAXBElement<TokenType>(_Token_QNAME, TokenType.class, null, value); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link PrivateKeyProtectionType }{@code >}} - * - */ - @XmlElementDecl(namespace = "urn:oasis:names:tc:SAML:2.0:ac", name = "PrivateKeyProtection") - public JAXBElement<PrivateKeyProtectionType> createPrivateKeyProtection(PrivateKeyProtectionType value) { - return new JAXBElement<PrivateKeyProtectionType>(_PrivateKeyProtection_QNAME, PrivateKeyProtectionType.class, null, value); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link AuthnContextDeclarationBaseType }{@code >}} - * - */ - @XmlElementDecl(namespace = "urn:oasis:names:tc:SAML:2.0:ac", name = "AuthenticationContextDeclaration") - public JAXBElement<AuthnContextDeclarationBaseType> createAuthenticationContextDeclaration(AuthnContextDeclarationBaseType value) { - return new JAXBElement<AuthnContextDeclarationBaseType>(_AuthenticationContextDeclaration_QNAME, AuthnContextDeclarationBaseType.class, null, value); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link ExtensionType }{@code >}} - * - */ - @XmlElementDecl(namespace = "urn:oasis:names:tc:SAML:2.0:ac", name = "Extension") - public JAXBElement<ExtensionType> createExtension(ExtensionType value) { - return new JAXBElement<ExtensionType>(_Extension_QNAME, ExtensionType.class, null, value); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link ExtensionOnlyType }{@code >}} - * - */ - @XmlElementDecl(namespace = "urn:oasis:names:tc:SAML:2.0:ac", name = "IPSec") - public JAXBElement<ExtensionOnlyType> createIPSec(ExtensionOnlyType value) { - return new JAXBElement<ExtensionOnlyType>(_IPSec_QNAME, ExtensionOnlyType.class, null, value); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link ExtensionOnlyType }{@code >}} - * - */ - @XmlElementDecl(namespace = "urn:oasis:names:tc:SAML:2.0:ac", name = "UserSuffix") - public JAXBElement<ExtensionOnlyType> createUserSuffix(ExtensionOnlyType value) { - return new JAXBElement<ExtensionOnlyType>(_UserSuffix_QNAME, ExtensionOnlyType.class, null, value); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link ExtensionOnlyType }{@code >}} - * - */ - @XmlElementDecl(namespace = "urn:oasis:names:tc:SAML:2.0:ac", name = "SwitchAudit") - public JAXBElement<ExtensionOnlyType> createSwitchAudit(ExtensionOnlyType value) { - return new JAXBElement<ExtensionOnlyType>(_SwitchAudit_QNAME, ExtensionOnlyType.class, null, value); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link PasswordType }{@code >}} - * - */ - @XmlElementDecl(namespace = "urn:oasis:names:tc:SAML:2.0:ac", name = "Password") - public JAXBElement<PasswordType> createPassword(PasswordType value) { - return new JAXBElement<PasswordType>(_Password_QNAME, PasswordType.class, null, value); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link SecurityAuditType }{@code >}} - * - */ - @XmlElementDecl(namespace = "urn:oasis:names:tc:SAML:2.0:ac", name = "SecurityAudit") - public JAXBElement<SecurityAuditType> createSecurityAudit(SecurityAuditType value) { - return new JAXBElement<SecurityAuditType>(_SecurityAudit_QNAME, SecurityAuditType.class, null, value); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link ExtensionOnlyType }{@code >}} - * - */ - @XmlElementDecl(namespace = "urn:oasis:names:tc:SAML:2.0:ac", name = "IPAddress") - public JAXBElement<ExtensionOnlyType> createIPAddress(ExtensionOnlyType value) { - return new JAXBElement<ExtensionOnlyType>(_IPAddress_QNAME, ExtensionOnlyType.class, null, value); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link ExtensionOnlyType }{@code >}} - * - */ - @XmlElementDecl(namespace = "urn:oasis:names:tc:SAML:2.0:ac", name = "Smartcard") - public JAXBElement<ExtensionOnlyType> createSmartcard(ExtensionOnlyType value) { - return new JAXBElement<ExtensionOnlyType>(_Smartcard_QNAME, ExtensionOnlyType.class, null, value); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link OperationalProtectionType }{@code >}} - * - */ - @XmlElementDecl(namespace = "urn:oasis:names:tc:SAML:2.0:ac", name = "OperationalProtection") - public JAXBElement<OperationalProtectionType> createOperationalProtection(OperationalProtectionType value) { - return new JAXBElement<OperationalProtectionType>(_OperationalProtection_QNAME, OperationalProtectionType.class, null, value); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link ExtensionOnlyType }{@code >}} - * - */ - @XmlElementDecl(namespace = "urn:oasis:names:tc:SAML:2.0:ac", name = "WrittenConsent") - public JAXBElement<ExtensionOnlyType> createWrittenConsent(ExtensionOnlyType value) { - return new JAXBElement<ExtensionOnlyType>(_WrittenConsent_QNAME, ExtensionOnlyType.class, null, value); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link PublicKeyType }{@code >}} - * - */ - @XmlElementDecl(namespace = "urn:oasis:names:tc:SAML:2.0:ac", name = "AsymmetricKeyAgreement") - public JAXBElement<PublicKeyType> createAsymmetricKeyAgreement(PublicKeyType value) { - return new JAXBElement<PublicKeyType>(_AsymmetricKeyAgreement_QNAME, PublicKeyType.class, null, value); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link SecretKeyProtectionType }{@code >}} - * - */ - @XmlElementDecl(namespace = "urn:oasis:names:tc:SAML:2.0:ac", name = "SecretKeyProtection") - public JAXBElement<SecretKeyProtectionType> createSecretKeyProtection(SecretKeyProtectionType value) { - return new JAXBElement<SecretKeyProtectionType>(_SecretKeyProtection_QNAME, SecretKeyProtectionType.class, null, value); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link ExtensionOnlyType }{@code >}} - * - */ - @XmlElementDecl(namespace = "urn:oasis:names:tc:SAML:2.0:ac", name = "SharedSecretDynamicPlaintext") - public JAXBElement<ExtensionOnlyType> createSharedSecretDynamicPlaintext(ExtensionOnlyType value) { - return new JAXBElement<ExtensionOnlyType>(_SharedSecretDynamicPlaintext_QNAME, ExtensionOnlyType.class, null, value); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link ExtensionOnlyType }{@code >}} - * - */ - @XmlElementDecl(namespace = "urn:oasis:names:tc:SAML:2.0:ac", name = "ADSL") - public JAXBElement<ExtensionOnlyType> createADSL(ExtensionOnlyType value) { - return new JAXBElement<ExtensionOnlyType>(_ADSL_QNAME, ExtensionOnlyType.class, null, value); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link AuthenticatorBaseType }{@code >}} - * - */ - @XmlElementDecl(namespace = "urn:oasis:names:tc:SAML:2.0:ac", name = "Authenticator") - public JAXBElement<AuthenticatorBaseType> createAuthenticator(AuthenticatorBaseType value) { - return new JAXBElement<AuthenticatorBaseType>(_Authenticator_QNAME, AuthenticatorBaseType.class, null, value); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link ExtensionOnlyType }{@code >}} - * - */ - @XmlElementDecl(namespace = "urn:oasis:names:tc:SAML:2.0:ac", name = "PSTN") - public JAXBElement<ExtensionOnlyType> createPSTN(ExtensionOnlyType value) { - return new JAXBElement<ExtensionOnlyType>(_PSTN_QNAME, ExtensionOnlyType.class, null, value); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link ActivationLimitDurationType }{@code >}} - * - */ - @XmlElementDecl(namespace = "urn:oasis:names:tc:SAML:2.0:ac", name = "ActivationLimitDuration") - public JAXBElement<ActivationLimitDurationType> createActivationLimitDuration(ActivationLimitDurationType value) { - return new JAXBElement<ActivationLimitDurationType>(_ActivationLimitDuration_QNAME, ActivationLimitDurationType.class, null, value); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link ActivationLimitType }{@code >}} - * - */ - @XmlElementDecl(namespace = "urn:oasis:names:tc:SAML:2.0:ac", name = "ActivationLimit") - public JAXBElement<ActivationLimitType> createActivationLimit(ActivationLimitType value) { - return new JAXBElement<ActivationLimitType>(_ActivationLimit_QNAME, ActivationLimitType.class, null, value); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link PrincipalAuthenticationMechanismType }{@code >}} - * - */ - @XmlElementDecl(namespace = "urn:oasis:names:tc:SAML:2.0:ac", name = "PrincipalAuthenticationMechanism") - public JAXBElement<PrincipalAuthenticationMechanismType> createPrincipalAuthenticationMechanism(PrincipalAuthenticationMechanismType value) { - return new JAXBElement<PrincipalAuthenticationMechanismType>(_PrincipalAuthenticationMechanism_QNAME, PrincipalAuthenticationMechanismType.class, null, value); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link ActivationLimitSessionType }{@code >}} - * - */ - @XmlElementDecl(namespace = "urn:oasis:names:tc:SAML:2.0:ac", name = "ActivationLimitSession") - public JAXBElement<ActivationLimitSessionType> createActivationLimitSession(ActivationLimitSessionType value) { - return new JAXBElement<ActivationLimitSessionType>(_ActivationLimitSession_QNAME, ActivationLimitSessionType.class, null, value); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link ExtensionOnlyType }{@code >}} - * - */ - @XmlElementDecl(namespace = "urn:oasis:names:tc:SAML:2.0:ac", name = "MobileNetworkNoEncryption") - public JAXBElement<ExtensionOnlyType> createMobileNetworkNoEncryption(ExtensionOnlyType value) { - return new JAXBElement<ExtensionOnlyType>(_MobileNetworkNoEncryption_QNAME, ExtensionOnlyType.class, null, value); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link IdentificationType }{@code >}} - * - */ - @XmlElementDecl(namespace = "urn:oasis:names:tc:SAML:2.0:ac", name = "Identification") - public JAXBElement<IdentificationType> createIdentification(IdentificationType value) { - return new JAXBElement<IdentificationType>(_Identification_QNAME, IdentificationType.class, null, value); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link GoverningAgreementRefType }{@code >}} - * - */ - @XmlElementDecl(namespace = "urn:oasis:names:tc:SAML:2.0:ac", name = "GoverningAgreementRef") - public JAXBElement<GoverningAgreementRefType> createGoverningAgreementRef(GoverningAgreementRefType value) { - return new JAXBElement<GoverningAgreementRefType>(_GoverningAgreementRef_QNAME, GoverningAgreementRefType.class, null, value); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link RestrictedPasswordType }{@code >}} - * - */ - @XmlElementDecl(namespace = "urn:oasis:names:tc:SAML:2.0:ac", name = "RestrictedPassword") - public JAXBElement<RestrictedPasswordType> createRestrictedPassword(RestrictedPasswordType value) { - return new JAXBElement<RestrictedPasswordType>(_RestrictedPassword_QNAME, RestrictedPasswordType.class, null, value); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link TimeSyncTokenType }{@code >}} - * - */ - @XmlElementDecl(namespace = "urn:oasis:names:tc:SAML:2.0:ac", name = "TimeSyncToken") - public JAXBElement<TimeSyncTokenType> createTimeSyncToken(TimeSyncTokenType value) { - return new JAXBElement<TimeSyncTokenType>(_TimeSyncToken_QNAME, TimeSyncTokenType.class, null, value); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link KeyActivationType }{@code >}} - * - */ - @XmlElementDecl(namespace = "urn:oasis:names:tc:SAML:2.0:ac", name = "KeyActivation") - public JAXBElement<KeyActivationType> createKeyActivation(KeyActivationType value) { - return new JAXBElement<KeyActivationType>(_KeyActivation_QNAME, KeyActivationType.class, null, value); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link ExtensionOnlyType }{@code >}} - * - */ - @XmlElementDecl(namespace = "urn:oasis:names:tc:SAML:2.0:ac", name = "ResumeSession") - public JAXBElement<ExtensionOnlyType> createResumeSession(ExtensionOnlyType value) { - return new JAXBElement<ExtensionOnlyType>(_ResumeSession_QNAME, ExtensionOnlyType.class, null, value); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link ExtensionOnlyType }{@code >}} - * - */ - @XmlElementDecl(namespace = "urn:oasis:names:tc:SAML:2.0:ac", name = "SubscriberLineNumber") - public JAXBElement<ExtensionOnlyType> createSubscriberLineNumber(ExtensionOnlyType value) { - return new JAXBElement<ExtensionOnlyType>(_SubscriberLineNumber_QNAME, ExtensionOnlyType.class, null, value); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link ExtensionOnlyType }{@code >}} - * - */ - @XmlElementDecl(namespace = "urn:oasis:names:tc:SAML:2.0:ac", name = "DeactivationCallCenter") - public JAXBElement<ExtensionOnlyType> createDeactivationCallCenter(ExtensionOnlyType value) { - return new JAXBElement<ExtensionOnlyType>(_DeactivationCallCenter_QNAME, ExtensionOnlyType.class, null, value); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link ExtensionOnlyType }{@code >}} - * - */ - @XmlElementDecl(namespace = "urn:oasis:names:tc:SAML:2.0:ac", name = "ISDN") - public JAXBElement<ExtensionOnlyType> createISDN(ExtensionOnlyType value) { - return new JAXBElement<ExtensionOnlyType>(_ISDN_QNAME, ExtensionOnlyType.class, null, value); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link AlphabetType }{@code >}} - * - */ - @XmlElementDecl(namespace = "urn:oasis:names:tc:SAML:2.0:ac", name = "Alphabet") - public JAXBElement<AlphabetType> createAlphabet(AlphabetType value) { - return new JAXBElement<AlphabetType>(_Alphabet_QNAME, AlphabetType.class, null, value); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link ExtensionOnlyType }{@code >}} - * - */ - @XmlElementDecl(namespace = "urn:oasis:names:tc:SAML:2.0:ac", name = "HTTP") - public JAXBElement<ExtensionOnlyType> createHTTP(ExtensionOnlyType value) { - return new JAXBElement<ExtensionOnlyType>(_HTTP_QNAME, ExtensionOnlyType.class, null, value); - } - -} Modified: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/profiles/attribute/dce/DCEValueType.java =================================================================== --- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/profiles/attribute/dce/DCEValueType.java 2011-02-03 21:11:08 UTC (rev 699) +++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/profiles/attribute/dce/DCEValueType.java 2011-02-03 21:18:49 UTC (rev 700) @@ -1,19 +1,5 @@ -// -// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.1-661 -// 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: 2008.12.08 at 05:45:20 PM CST -// - - package org.picketlink.identity.federation.saml.v2.profiles.attribute.dce; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlSchemaType; -import javax.xml.bind.annotation.XmlType; -import javax.xml.bind.annotation.XmlValue; /** @@ -33,20 +19,11 @@ * </pre> * * - */ -(a)XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "DCEValueType", propOrder = { - "value" -}) + */ public class DCEValueType { - - @XmlValue - @XmlSchemaType(name = "anyURI") - protected String value; - @XmlAttribute(name = "Realm", namespace = "urn:oasis:names:tc:SAML:2.0:profiles:attribute:DCE") - @XmlSchemaType(name = "anyURI") - protected String realm; - @XmlAttribute(name = "FriendlyName", namespace = "urn:oasis:names:tc:SAML:2.0:profiles:attribute:DCE") + + protected String value; + protected String realm; protected String friendlyName; /** Deleted: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/profiles/attribute/dce/ObjectFactory.java =================================================================== --- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/profiles/attribute/dce/ObjectFactory.java 2011-02-03 21:11:08 UTC (rev 699) +++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/profiles/attribute/dce/ObjectFactory.java 2011-02-03 21:18:49 UTC (rev 700) @@ -1,47 +0,0 @@ -// -// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.1-661 -// 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: 2008.12.08 at 05:45:20 PM CST -// - - -package org.picketlink.identity.federation.saml.v2.profiles.attribute.dce; - -import javax.xml.bind.annotation.XmlRegistry; - - -/** - * This object contains factory methods for each - * Java content interface and Java element interface - * generated in the oasis.names.tc.saml._2_0.profiles.attribute.dce package. - * An ObjectFactory allows you to programatically - * construct new instances of the Java representation - * for XML content. The Java representation of XML - * content can consist of schema derived interfaces - * and classes representing the binding of schema - * type definitions, element declarations and model - * groups. Factory methods for each of these are - * provided in this class. - * - */ -@XmlRegistry -public class ObjectFactory { - - - /** - * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: oasis.names.tc.saml._2_0.profiles.attribute.dce - * - */ - public ObjectFactory() { - } - - /** - * Create an instance of {@link DCEValueType } - * - */ - public DCEValueType createDCEValueType() { - return new DCEValueType(); - } - -} Modified: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/profiles/attribute/dce/package-info.java =================================================================== --- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/profiles/attribute/dce/package-info.java 2011-02-03 21:11:08 UTC (rev 699) +++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/profiles/attribute/dce/package-info.java 2011-02-03 21:18:49 UTC (rev 700) @@ -1,9 +1 @@ -// -// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.1-661 -// 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: 2008.12.08 at 05:45:20 PM CST -// - -(a)javax.xml.bind.annotation.XmlSchema(namespace = "urn:oasis:names:tc:SAML:2.0:profiles:attribute:DCE") package org.picketlink.identity.federation.saml.v2.profiles.attribute.dce; Deleted: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/profiles/sso/ecp/ObjectFactory.java =================================================================== --- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/profiles/sso/ecp/ObjectFactory.java 2011-02-03 21:11:08 UTC (rev 699) +++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/profiles/sso/ecp/ObjectFactory.java 2011-02-03 21:18:49 UTC (rev 700) @@ -1,96 +0,0 @@ -// -// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.1-661 -// 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: 2008.12.08 at 05:45:20 PM CST -// - - -package org.picketlink.identity.federation.saml.v2.profiles.sso.ecp; - -import javax.xml.bind.JAXBElement; -import javax.xml.bind.annotation.XmlElementDecl; -import javax.xml.bind.annotation.XmlRegistry; -import javax.xml.namespace.QName; - - -/** - * This object contains factory methods for each - * Java content interface and Java element interface - * generated in the oasis.names.tc.saml._2_0.profiles.sso.ecp package. - * An ObjectFactory allows you to programatically - * construct new instances of the Java representation - * for XML content. The Java representation of XML - * content can consist of schema derived interfaces - * and classes representing the binding of schema - * type definitions, element declarations and model - * groups. Factory methods for each of these are - * provided in this class. - * - */ -@XmlRegistry -public class ObjectFactory { - - private final static QName _Response_QNAME = new QName("urn:oasis:names:tc:SAML:2.0:profiles:SSO:ecp", "Response"); - private final static QName _Request_QNAME = new QName("urn:oasis:names:tc:SAML:2.0:profiles:SSO:ecp", "Request"); - private final static QName _RelayState_QNAME = new QName("urn:oasis:names:tc:SAML:2.0:profiles:SSO:ecp", "RelayState"); - - /** - * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: oasis.names.tc.saml._2_0.profiles.sso.ecp - * - */ - public ObjectFactory() { - } - - /** - * Create an instance of {@link RelayStateType } - * - */ - public RelayStateType createRelayStateType() { - return new RelayStateType(); - } - - /** - * Create an instance of {@link ResponseType } - * - */ - public ResponseType createResponseType() { - return new ResponseType(); - } - - /** - * Create an instance of {@link RequestType } - * - */ - public RequestType createRequestType() { - return new RequestType(); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link ResponseType }{@code >}} - * - */ - @XmlElementDecl(namespace = "urn:oasis:names:tc:SAML:2.0:profiles:SSO:ecp", name = "Response") - public JAXBElement<ResponseType> createResponse(ResponseType value) { - return new JAXBElement<ResponseType>(_Response_QNAME, ResponseType.class, null, value); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link RequestType }{@code >}} - * - */ - @XmlElementDecl(namespace = "urn:oasis:names:tc:SAML:2.0:profiles:SSO:ecp", name = "Request") - public JAXBElement<RequestType> createRequest(RequestType value) { - return new JAXBElement<RequestType>(_Request_QNAME, RequestType.class, null, value); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link RelayStateType }{@code >}} - * - */ - @XmlElementDecl(namespace = "urn:oasis:names:tc:SAML:2.0:profiles:SSO:ecp", name = "RelayState") - public JAXBElement<RelayStateType> createRelayState(RelayStateType value) { - return new JAXBElement<RelayStateType>(_RelayState_QNAME, RelayStateType.class, null, value); - } - -} Modified: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/profiles/sso/ecp/RelayStateType.java =================================================================== --- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/profiles/sso/ecp/RelayStateType.java 2011-02-03 21:11:08 UTC (rev 699) +++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/profiles/sso/ecp/RelayStateType.java 2011-02-03 21:18:49 UTC (rev 700) @@ -1,24 +1,6 @@ -// -// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.1-661 -// 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: 2008.12.08 at 05:45:20 PM CST -// - - package org.picketlink.identity.federation.saml.v2.profiles.sso.ecp; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlSchemaType; -import javax.xml.bind.annotation.XmlType; -import javax.xml.bind.annotation.XmlValue; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; -import org.picketlink.identity.federation.saml.v2.generated.runtime.ZeroOneBooleanAdapter; - - /** * Java class for RelayStateType complex type. * @@ -36,20 +18,11 @@ * </pre> * * - */ -(a)XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "RelayStateType", propOrder = { - "value" -}) + */ public class RelayStateType { - - @XmlValue - protected String value; - @XmlAttribute(namespace = "http://schemas.xmlsoap.org/soap/envelope/", required = true) - @XmlJavaTypeAdapter(ZeroOneBooleanAdapter.class) - protected Boolean mustUnderstand; - @XmlAttribute(namespace = "http://schemas.xmlsoap.org/soap/envelope/", required = true) - @XmlSchemaType(name = "anyURI") + + protected String value; + protected Boolean mustUnderstand; protected String actor; /** Modified: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/profiles/sso/ecp/RequestType.java =================================================================== --- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/profiles/sso/ecp/RequestType.java 2011-02-03 21:11:08 UTC (rev 699) +++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/profiles/sso/ecp/RequestType.java 2011-02-03 21:18:49 UTC (rev 700) @@ -1,24 +1,7 @@ -// -// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.1-661 -// 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: 2008.12.08 at 05:45:20 PM CST -// - - package org.picketlink.identity.federation.saml.v2.profiles.sso.ecp; -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.XmlSchemaType; -import javax.xml.bind.annotation.XmlType; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; - -//import org.picketlink.identity.federation.saml.v2.assertion.NameIDType; -import org.picketlink.identity.federation.saml.v2.generated.runtime.ZeroOneBooleanAdapter; -//import org.picketlink.identity.federation.saml.v2.protocol.IDPListType; +import org.picketlink.identity.federation.newmodel.saml.v2.assertion.NameIDType; +import org.picketlink.identity.federation.newmodel.saml.v2.protocol.IDPListType; @@ -45,27 +28,14 @@ * </pre> * * - */ -(a)XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "RequestType", propOrder = { - "issuer", - "idpList" -}) + */ public class RequestType { - /* @XmlElement(name = "Issuer", namespace = "urn:oasis:names:tc:SAML:2.0:assertion", required = true) - protected NameIDType issuer; - @XmlElement(name = "IDPList", namespace = "urn:oasis:names:tc:SAML:2.0:protocol") - protected IDPListType idpList;*/ - @XmlAttribute(namespace = "http://schemas.xmlsoap.org/soap/envelope/", required = true) - @XmlJavaTypeAdapter(ZeroOneBooleanAdapter.class) - protected Boolean mustUnderstand; - @XmlAttribute(namespace = "http://schemas.xmlsoap.org/soap/envelope/", required = true) - @XmlSchemaType(name = "anyURI") - protected String actor; - @XmlAttribute(name = "ProviderName") - protected String providerName; - @XmlAttribute(name = "IsPassive") + protected NameIDType issuer; + protected IDPListType idpList; + protected Boolean mustUnderstand; + protected String actor; + protected String providerName; protected Boolean isPassive; /** @@ -76,9 +46,9 @@ * {@link NameIDType } * */ - /*public NameIDType getIssuer() { + public NameIDType getIssuer() { return issuer; - }*/ + } /** * Sets the value of the issuer property. @@ -88,9 +58,9 @@ * {@link NameIDType } * */ - /*public void setIssuer(NameIDType value) { + public void setIssuer(NameIDType value) { this.issuer = value; - }*/ + } /** * Gets the value of the idpList property. @@ -100,9 +70,9 @@ * {@link IDPListType } * */ - /*public IDPListType getIDPList() { + public IDPListType getIDPList() { return idpList; - }*/ + } /** * Sets the value of the idpList property. @@ -112,9 +82,9 @@ * {@link IDPListType } * */ - /*public void setIDPList(IDPListType value) { + public void setIDPList(IDPListType value) { this.idpList = value; - }*/ + } /** * Gets the value of the mustUnderstand property. Modified: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/profiles/sso/ecp/ResponseType.java =================================================================== --- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/profiles/sso/ecp/ResponseType.java 2011-02-03 21:11:08 UTC (rev 699) +++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/profiles/sso/ecp/ResponseType.java 2011-02-03 21:18:49 UTC (rev 700) @@ -1,23 +1,7 @@ -// -// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.1-661 -// 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: 2008.12.08 at 05:45:20 PM CST -// - - package org.picketlink.identity.federation.saml.v2.profiles.sso.ecp; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlSchemaType; -import javax.xml.bind.annotation.XmlType; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; -import org.picketlink.identity.federation.saml.v2.generated.runtime.ZeroOneBooleanAdapter; - /** * Java class for ResponseType complex type. * @@ -36,19 +20,10 @@ * </pre> * * - */ -(a)XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "ResponseType") -public class ResponseType { - - @XmlAttribute(namespace = "http://schemas.xmlsoap.org/soap/envelope/", required = true) - @XmlJavaTypeAdapter(ZeroOneBooleanAdapter.class) - protected Boolean mustUnderstand; - @XmlAttribute(namespace = "http://schemas.xmlsoap.org/soap/envelope/", required = true) - @XmlSchemaType(name = "anyURI") - protected String actor; - @XmlAttribute(name = "AssertionConsumerServiceURL", required = true) - @XmlSchemaType(name = "anyURI") + */ +public class ResponseType { + protected Boolean mustUnderstand; + protected String actor; protected String assertionConsumerServiceURL; /** Modified: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/profiles/sso/ecp/package-info.java =================================================================== --- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/profiles/sso/ecp/package-info.java 2011-02-03 21:11:08 UTC (rev 699) +++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/profiles/sso/ecp/package-info.java 2011-02-03 21:18:49 UTC (rev 700) @@ -1,9 +1 @@ -// -// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.1-661 -// 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: 2008.12.08 at 05:45:20 PM CST -// - -(a)javax.xml.bind.annotation.XmlSchema(namespace = "urn:oasis:names:tc:SAML:2.0:profiles:SSO:ecp", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED) package org.picketlink.identity.federation.saml.v2.profiles.sso.ecp;

13 years, 2 months

1
0
0 / 0

Picketlink SVN: r699 - in federation/trunk: picketlink-fed-api/src/main/java/org/picketlink/identity/federation/api/soap and 2 other directories.

by picketlink-commits＠lists.jboss.org

Author: anil.saldhana(a)jboss.com Date: 2011-02-03 16:11:08 -0500 (Thu, 03 Feb 2011) New Revision: 699 Removed: federation/trunk/picketlink-bindings/src/test/java/org/picketlink/test/identity/federation/bindings/servlets/InteropEndpointDebugTestCase.java federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/factories/SOAPFactory.java federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/org/xmlsoap/schemas/soap/envelope/Body.java federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/org/xmlsoap/schemas/soap/envelope/Detail.java federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/org/xmlsoap/schemas/soap/envelope/Envelope.java federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/org/xmlsoap/schemas/soap/envelope/Fault.java federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/org/xmlsoap/schemas/soap/envelope/Header.java federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/org/xmlsoap/schemas/soap/envelope/ObjectFactory.java federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/org/xmlsoap/schemas/soap/envelope/package-info.java Modified: federation/trunk/picketlink-fed-api/src/main/java/org/picketlink/identity/federation/api/soap/SOAPSAMLXACML.java Log: remove the soap jaxb object model Deleted: federation/trunk/picketlink-bindings/src/test/java/org/picketlink/test/identity/federation/bindings/servlets/InteropEndpointDebugTestCase.java =================================================================== --- federation/trunk/picketlink-bindings/src/test/java/org/picketlink/test/identity/federation/bindings/servlets/InteropEndpointDebugTestCase.java 2011-02-02 13:45:06 UTC (rev 698) +++ federation/trunk/picketlink-bindings/src/test/java/org/picketlink/test/identity/federation/bindings/servlets/InteropEndpointDebugTestCase.java 2011-02-03 21:11:08 UTC (rev 699) @@ -1,134 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * Copyright 2008, Red Hat Middleware LLC, and individual contributors - * as indicated by the @author tags. See the copyright.txt file 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.picketlink.test.identity.federation.bindings.servlets; - -import java.io.InputStream; - -import javax.xml.bind.JAXBElement; - -import junit.framework.TestCase; - -import org.jboss.security.xacml.core.model.context.RequestType; -import org.picketlink.identity.federation.core.saml.v2.util.DocumentUtil; -import org.picketlink.identity.federation.core.saml.v2.util.SOAPSAMLXACMLUtil; -import org.picketlink.identity.federation.newmodel.saml.v2.profiles.xacml.protocol.XACMLAuthzDecisionQueryType; -import org.picketlink.identity.federation.org.xmlsoap.schemas.soap.envelope.Envelope; -import org.w3c.dom.Document; - - -/** - * Test Case that acts as a debug tool - * for the endpoint for interop - * @author Anil.Saldhana(a)redhat.com - * @since Mar 16, 2009 - */ -public class InteropEndpointDebugTestCase extends TestCase -{ - String endpoint = null; - - //String endpoint = "http://interop.demo.jboss.com/test/SOAPServlet"; - //String endpoint = "http://localhost:8080/test/SOAPServlet"; - - - public void testUseCase1() throws Exception - { - if(endpoint != null) - { - JAXBElement<?> jb = getResponse("xacml/requests/interop-request.xml"); - Envelope env = (Envelope) jb.getValue(); - check(env, true); - } - } - - public void testUseCase2() throws Exception - { - if(endpoint != null) - { - JAXBElement<?> jb = getResponse("xacml/requests/soap-request.xml"); - Envelope env = (Envelope) jb.getValue(); - check(env, true); - } - } - - public void testSAMLXACML() throws Exception - { - //Read the saml request from the file - ClassLoader tcl = Thread.currentThread().getContextClassLoader(); - InputStream is = tcl.getResourceAsStream("xacml/requests/samlxacml.xml"); - - Document doc = DocumentUtil.getDocument(is); - - /*Unmarshaller um = JAXBUtil.getUnmarshaller(SOAPSAMLXACMLUtil.getPackage()); - um.setEventHandler(new javax.xml.bind.helpers.DefaultValidationEventHandler()); - - JAXBElement<?> obj = (JAXBElement<?>) um.unmarshal(is);*/ - XACMLAuthzDecisionQueryType xat = SOAPSAMLXACMLUtil.getXACMLQueryType(doc.getDocumentElement() ); - assertNotNull(xat); - RequestType requestType = xat.getRequest(); - assertTrue(requestType.getEnvironment().getAttribute().size() > 0); - } - - private void check(Envelope env, boolean permit) - { - throw new RuntimeException(); - - /*JAXBElement<?> samlResponse = (JAXBElement<?>) env.getBody().getAny().get(0); - Object response = samlResponse.getValue(); - if(response instanceof Fault) - { - Fault fault = (Fault) response; - System.out.println(fault.getFaultstring()); - fail("fault"); - } - ResponseType responseType = (ResponseType) response; - AssertionType at = (AssertionType) responseType.getAssertionOrEncryptedAssertion().get(0); - XACMLAuthzDecisionStatementType xst = (XACMLAuthzDecisionStatementType) at.getStatementOrAuthnStatementOrAuthzDecisionStatement().get(0); - ResultType rt = xst.getResponse().getResult().get(0); - DecisionType dt = rt.getDecision(); - - if(permit) - assertEquals(DecisionType.PERMIT, dt); - else - assertEquals(DecisionType.DENY, dt);*/ - } - - private JAXBElement<?> getResponse(String fileName) throws Exception - { - throw new RuntimeException( "FIX" ); - /*//Read the saml request from the file - ClassLoader tcl = Thread.currentThread().getContextClassLoader(); - InputStream is = tcl.getResourceAsStream(fileName); - - Unmarshaller um = JAXBUtil.getUnmarshaller(SOAPSAMLXACMLUtil.getPackage()); - Object soapRequest = um.unmarshal(is); - - Marshaller m = JAXBUtil.getMarshaller(SOAPSAMLXACMLUtil.getPackage()); - - URL url = new URL(endpoint); - URLConnection conn = url.openConnection(); - conn.setDoOutput(true); - m.marshal(soapRequest, System.out); - m.marshal(soapRequest, conn.getOutputStream()); - - return (JAXBElement<?>) um.unmarshal(conn.getInputStream()); */ - } -} \ No newline at end of file Modified: federation/trunk/picketlink-fed-api/src/main/java/org/picketlink/identity/federation/api/soap/SOAPSAMLXACML.java =================================================================== --- federation/trunk/picketlink-fed-api/src/main/java/org/picketlink/identity/federation/api/soap/SOAPSAMLXACML.java 2011-02-02 13:45:06 UTC (rev 698) +++ federation/trunk/picketlink-fed-api/src/main/java/org/picketlink/identity/federation/api/soap/SOAPSAMLXACML.java 2011-02-03 21:11:08 UTC (rev 699) @@ -54,8 +54,8 @@ import org.picketlink.identity.federation.newmodel.saml.v2.profiles.xacml.assertion.XACMLAuthzDecisionStatementType; import org.picketlink.identity.federation.newmodel.saml.v2.profiles.xacml.protocol.XACMLAuthzDecisionQueryType; import org.picketlink.identity.federation.newmodel.saml.v2.protocol.ResponseType; -import org.picketlink.identity.federation.org.xmlsoap.schemas.soap.envelope.Fault; import org.w3c.dom.Document; +import org.w3c.dom.Element; import org.w3c.dom.Node; import org.w3c.dom.NodeList; @@ -129,23 +129,8 @@ //Send it across the wire URL url = new URL(endpoint); - SOAPMessage response = connection.call(soapMessage, url); + SOAPMessage response = connection.call(soapMessage, url); - /*URLConnection conn = url.openConnection(); - conn.setDoOutput(true); - marshaller.marshal(soapRequest, conn.getOutputStream()); - - JAXBElement<?> result = (JAXBElement<?>) unmarshaller.unmarshal(conn.getInputStream()); - Envelope resultEnvelope = (Envelope) result.getValue(); - - JAXBElement<?> samlResponse = (JAXBElement<?>) resultEnvelope.getBody().getAny().get(0); - Object response = samlResponse.getValue(); - if(response instanceof Fault) - { - Fault fault = (Fault) response; - return new Result(null,fault); - }*/ - NodeList nl = response.getSOAPBody().getChildNodes(); Node node = null; @@ -184,23 +169,14 @@ { throw new ProcessingException(e); } - } - /* - private Envelope createEnvelope(JAXBElement<?> jaxbElement) - { - Envelope envelope = SOAPFactory.getObjectFactory().createEnvelope(); - Body body = SOAPFactory.getObjectFactory().createBody(); - body.getAny().add(jaxbElement); - envelope.setBody(body); - return envelope; - } */ + } public static class Result { - private Fault fault = null; + private Element fault = null; private DecisionType decisionType; - Result(DecisionType decision, Fault fault) + Result(DecisionType decision, Element fault) { this.decisionType = decision; this.fault = fault; @@ -221,7 +197,7 @@ return decisionType; } - public Fault getFault() + public Element getFault() { return fault; } Deleted: federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/factories/SOAPFactory.java =================================================================== --- federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/factories/SOAPFactory.java 2011-02-02 13:45:06 UTC (rev 698) +++ federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/factories/SOAPFactory.java 2011-02-03 21:11:08 UTC (rev 699) @@ -1,55 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * Copyright 2008, Red Hat Middleware LLC, and individual contributors - * as indicated by the @author tags. See the copyright.txt file 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.picketlink.identity.federation.core.factories; - -import javax.xml.bind.JAXBException; -import javax.xml.bind.Marshaller; -import javax.xml.bind.Unmarshaller; - -import org.picketlink.identity.federation.core.util.JAXBUtil; -import org.picketlink.identity.federation.org.xmlsoap.schemas.soap.envelope.ObjectFactory; - -/** - * Provides an handle to the ObjectFactory that is capable - * of creating SOAP objects - * @author Anil.Saldhana(a)redhat.com - * @since Jan 28, 2009 - */ -public class SOAPFactory -{ - private static ObjectFactory factory = new ObjectFactory(); - - public static ObjectFactory getObjectFactory() - { - return factory; - } - - public static Marshaller getMarshaller() throws JAXBException - { - return JAXBUtil.getMarshaller("org.picketlink.identity.federation.org.xmlsoap.schemas.soap.envelope"); - } - - public static Unmarshaller getUnmarshaller() throws JAXBException - { - return JAXBUtil.getUnmarshaller("org.picketlink.identity.federation.org.xmlsoap.schemas.soap.envelope"); - } -} \ No newline at end of file Deleted: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/org/xmlsoap/schemas/soap/envelope/Body.java =================================================================== --- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/org/xmlsoap/schemas/soap/envelope/Body.java 2011-02-02 13:45:06 UTC (rev 698) +++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/org/xmlsoap/schemas/soap/envelope/Body.java 2011-02-03 21:11:08 UTC (rev 699) @@ -1,104 +0,0 @@ -// -// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.1-661 -// 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: 2008.12.08 at 05:45:20 PM CST -// - - -package org.picketlink.identity.federation.org.xmlsoap.schemas.soap.envelope; - -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAnyAttribute; -import javax.xml.bind.annotation.XmlAnyElement; -import javax.xml.bind.annotation.XmlType; -import javax.xml.namespace.QName; - -import org.w3c.dom.Element; - - -/** - * Java class for Body complex type. - * - * The following schema fragment specifies the expected content contained within this class. - * - * <pre> - * <complexType name="Body"> - * <complexContent> - * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> - * <sequence> - * <any/> - * </sequence> - * </restriction> - * </complexContent> - * </complexType> - * </pre> - * - * - */ -(a)XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "Body", propOrder = { - "any" -}) -public class Body { - - @XmlAnyElement(lax = true) - protected List<Object> any; - @XmlAnyAttribute - private Map<QName, String> otherAttributes = new HashMap<QName, String>(); - - /** - * Gets the value of the any 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 any property. - * - * - * For example, to add a new item, do as follows: - * <pre> - * getAny().add(newItem); - * </pre> - * - * - * - * Objects of the following type(s) are allowed in the list - * {@link Element } - * {@link Object } - * - * - */ - public List<Object> getAny() { - if (any == null) { - any = new ArrayList<Object>(); - } - return this.any; - } - - /** - * Gets a map that contains attributes that aren't bound to any typed property on this class. - * - * - * the map is keyed by the name of the attribute and - * the value is the string value of the attribute. - * - * the map returned by this method is live, and you can add new attribute - * by updating the map directly. Because of this design, there's no setter. - * - * - * @return - * always non-null - */ - public Map<QName, String> getOtherAttributes() { - return otherAttributes; - } - -} Deleted: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/org/xmlsoap/schemas/soap/envelope/Detail.java =================================================================== --- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/org/xmlsoap/schemas/soap/envelope/Detail.java 2011-02-02 13:45:06 UTC (rev 698) +++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/org/xmlsoap/schemas/soap/envelope/Detail.java 2011-02-03 21:11:08 UTC (rev 699) @@ -1,104 +0,0 @@ -// -// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.1-661 -// 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: 2008.12.08 at 05:45:20 PM CST -// - - -package org.picketlink.identity.federation.org.xmlsoap.schemas.soap.envelope; - -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAnyAttribute; -import javax.xml.bind.annotation.XmlAnyElement; -import javax.xml.bind.annotation.XmlType; -import javax.xml.namespace.QName; - -import org.w3c.dom.Element; - - -/** - * Java class for detail complex type. - * - * The following schema fragment specifies the expected content contained within this class. - * - * <pre> - * <complexType name="detail"> - * <complexContent> - * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> - * <sequence> - * <any/> - * </sequence> - * </restriction> - * </complexContent> - * </complexType> - * </pre> - * - * - */ -(a)XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "detail", propOrder = { - "any" -}) -public class Detail { - - @XmlAnyElement(lax = true) - protected List<Object> any; - @XmlAnyAttribute - private Map<QName, String> otherAttributes = new HashMap<QName, String>(); - - /** - * Gets the value of the any 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 any property. - * - * - * For example, to add a new item, do as follows: - * <pre> - * getAny().add(newItem); - * </pre> - * - * - * - * Objects of the following type(s) are allowed in the list - * {@link Element } - * {@link Object } - * - * - */ - public List<Object> getAny() { - if (any == null) { - any = new ArrayList<Object>(); - } - return this.any; - } - - /** - * Gets a map that contains attributes that aren't bound to any typed property on this class. - * - * - * the map is keyed by the name of the attribute and - * the value is the string value of the attribute. - * - * the map returned by this method is live, and you can add new attribute - * by updating the map directly. Because of this design, there's no setter. - * - * - * @return - * always non-null - */ - public Map<QName, String> getOtherAttributes() { - return otherAttributes; - } - -} Deleted: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/org/xmlsoap/schemas/soap/envelope/Envelope.java =================================================================== --- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/org/xmlsoap/schemas/soap/envelope/Envelope.java 2011-02-02 13:45:06 UTC (rev 698) +++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/org/xmlsoap/schemas/soap/envelope/Envelope.java 2011-02-03 21:11:08 UTC (rev 699) @@ -1,161 +0,0 @@ -// -// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.1-661 -// 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: 2008.12.08 at 05:45:20 PM CST -// - - -package org.picketlink.identity.federation.org.xmlsoap.schemas.soap.envelope; - -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAnyAttribute; -import javax.xml.bind.annotation.XmlAnyElement; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlType; -import javax.xml.namespace.QName; - -import org.w3c.dom.Element; - - -/** - * Java class for Envelope complex type. - * - * The following schema fragment specifies the expected content contained within this class. - * - * <pre> - * <complexType name="Envelope"> - * <complexContent> - * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> - * <sequence> - * <element ref="{http://schemas.xmlsoap.org/soap/envelope/}Header" minOccurs="0"/> - * <element ref="{http://schemas.xmlsoap.org/soap/envelope/}Body"/> - * <any/> - * </sequence> - * </restriction> - * </complexContent> - * </complexType> - * </pre> - * - * - */ -(a)XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "Envelope", propOrder = { - "header", - "body", - "any" -}) -public class Envelope { - - @XmlElement(name = "Header", namespace = "http://schemas.xmlsoap.org/soap/envelope/") - protected Header header; - @XmlElement(name = "Body", namespace = "http://schemas.xmlsoap.org/soap/envelope/", required = true) - protected Body body; - @XmlAnyElement(lax = true) - protected List<Object> any; - @XmlAnyAttribute - private Map<QName, String> otherAttributes = new HashMap<QName, String>(); - - /** - * Gets the value of the header property. - * - * @return - * possible object is - * {@link Header } - * - */ - public Header getHeader() { - return header; - } - - /** - * Sets the value of the header property. - * - * @param value - * allowed object is - * {@link Header } - * - */ - public void setHeader(Header value) { - this.header = value; - } - - /** - * Gets the value of the body property. - * - * @return - * possible object is - * {@link Body } - * - */ - public Body getBody() { - return body; - } - - /** - * Sets the value of the body property. - * - * @param value - * allowed object is - * {@link Body } - * - */ - public void setBody(Body value) { - this.body = value; - } - - /** - * Gets the value of the any 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 any property. - * - * - * For example, to add a new item, do as follows: - * <pre> - * getAny().add(newItem); - * </pre> - * - * - * - * Objects of the following type(s) are allowed in the list - * {@link Element } - * {@link Object } - * - * - */ - public List<Object> getAny() { - if (any == null) { - any = new ArrayList<Object>(); - } - return this.any; - } - - /** - * Gets a map that contains attributes that aren't bound to any typed property on this class. - * - * - * the map is keyed by the name of the attribute and - * the value is the string value of the attribute. - * - * the map returned by this method is live, and you can add new attribute - * by updating the map directly. Because of this design, there's no setter. - * - * - * @return - * always non-null - */ - public Map<QName, String> getOtherAttributes() { - return otherAttributes; - } - -} Deleted: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/org/xmlsoap/schemas/soap/envelope/Fault.java =================================================================== --- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/org/xmlsoap/schemas/soap/envelope/Fault.java 2011-02-02 13:45:06 UTC (rev 698) +++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/org/xmlsoap/schemas/soap/envelope/Fault.java 2011-02-03 21:11:08 UTC (rev 699) @@ -1,158 +0,0 @@ -// -// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.1-661 -// 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: 2008.12.08 at 05:45:20 PM CST -// - - -package org.picketlink.identity.federation.org.xmlsoap.schemas.soap.envelope; - -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlSchemaType; -import javax.xml.bind.annotation.XmlType; -import javax.xml.namespace.QName; - - -/** - * - * Fault reporting structure - * - * - * Java class for Fault complex type. - * - * The following schema fragment specifies the expected content contained within this class. - * - * <pre> - * <complexType name="Fault"> - * <complexContent> - * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> - * <sequence> - * <element name="faultcode" type="{http://www.w3.org/2001/XMLSchema}QName"/> - * <element name="faultstring" type="{http://www.w3.org/2001/XMLSchema}string"/> - * <element name="faultactor" type="{http://www.w3.org/2001/XMLSchema}anyURI" minOccurs="0"/> - * <element name="detail" type="{http://schemas.xmlsoap.org/soap/envelope/}detail" minOccurs="0"/> - * </sequence> - * </restriction> - * </complexContent> - * </complexType> - * </pre> - * - * - */ -(a)XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "Fault", propOrder = { - "faultcode", - "faultstring", - "faultactor", - "detail" -}) -public class Fault { - - @XmlElement(required = true) - protected QName faultcode; - @XmlElement(required = true) - protected String faultstring; - @XmlSchemaType(name = "anyURI") - protected String faultactor; - protected Detail detail; - - /** - * Gets the value of the faultcode property. - * - * @return - * possible object is - * {@link QName } - * - */ - public QName getFaultcode() { - return faultcode; - } - - /** - * Sets the value of the faultcode property. - * - * @param value - * allowed object is - * {@link QName } - * - */ - public void setFaultcode(QName value) { - this.faultcode = value; - } - - /** - * Gets the value of the faultstring property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getFaultstring() { - return faultstring; - } - - /** - * Sets the value of the faultstring property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setFaultstring(String value) { - this.faultstring = value; - } - - /** - * Gets the value of the faultactor property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getFaultactor() { - return faultactor; - } - - /** - * Sets the value of the faultactor property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setFaultactor(String value) { - this.faultactor = value; - } - - /** - * Gets the value of the detail property. - * - * @return - * possible object is - * {@link Detail } - * - */ - public Detail getDetail() { - return detail; - } - - /** - * Sets the value of the detail property. - * - * @param value - * allowed object is - * {@link Detail } - * - */ - public void setDetail(Detail value) { - this.detail = value; - } - -} Deleted: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/org/xmlsoap/schemas/soap/envelope/Header.java =================================================================== --- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/org/xmlsoap/schemas/soap/envelope/Header.java 2011-02-02 13:45:06 UTC (rev 698) +++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/org/xmlsoap/schemas/soap/envelope/Header.java 2011-02-03 21:11:08 UTC (rev 699) @@ -1,104 +0,0 @@ -// -// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.1-661 -// 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: 2008.12.08 at 05:45:20 PM CST -// - - -package org.picketlink.identity.federation.org.xmlsoap.schemas.soap.envelope; - -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAnyAttribute; -import javax.xml.bind.annotation.XmlAnyElement; -import javax.xml.bind.annotation.XmlType; -import javax.xml.namespace.QName; - -import org.w3c.dom.Element; - - -/** - * Java class for Header complex type. - * - * The following schema fragment specifies the expected content contained within this class. - * - * <pre> - * <complexType name="Header"> - * <complexContent> - * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> - * <sequence> - * <any/> - * </sequence> - * </restriction> - * </complexContent> - * </complexType> - * </pre> - * - * - */ -(a)XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "Header", propOrder = { - "any" -}) -public class Header { - - @XmlAnyElement(lax = true) - protected List<Object> any; - @XmlAnyAttribute - private Map<QName, String> otherAttributes = new HashMap<QName, String>(); - - /** - * Gets the value of the any 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 any property. - * - * - * For example, to add a new item, do as follows: - * <pre> - * getAny().add(newItem); - * </pre> - * - * - * - * Objects of the following type(s) are allowed in the list - * {@link Element } - * {@link Object } - * - * - */ - public List<Object> getAny() { - if (any == null) { - any = new ArrayList<Object>(); - } - return this.any; - } - - /** - * Gets a map that contains attributes that aren't bound to any typed property on this class. - * - * - * the map is keyed by the name of the attribute and - * the value is the string value of the attribute. - * - * the map returned by this method is live, and you can add new attribute - * by updating the map directly. Because of this design, there's no setter. - * - * - * @return - * always non-null - */ - public Map<QName, String> getOtherAttributes() { - return otherAttributes; - } - -} Deleted: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/org/xmlsoap/schemas/soap/envelope/ObjectFactory.java =================================================================== --- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/org/xmlsoap/schemas/soap/envelope/ObjectFactory.java 2011-02-02 13:45:06 UTC (rev 698) +++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/org/xmlsoap/schemas/soap/envelope/ObjectFactory.java 2011-02-03 21:11:08 UTC (rev 699) @@ -1,122 +0,0 @@ -// -// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.1-661 -// 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: 2008.12.08 at 05:45:20 PM CST -// - - -package org.picketlink.identity.federation.org.xmlsoap.schemas.soap.envelope; - -import javax.xml.bind.JAXBElement; -import javax.xml.bind.annotation.XmlElementDecl; -import javax.xml.bind.annotation.XmlRegistry; -import javax.xml.namespace.QName; - - -/** - * This object contains factory methods for each - * Java content interface and Java element interface - * generated in the org.xmlsoap.schemas.soap.envelope package. - * An ObjectFactory allows you to programatically - * construct new instances of the Java representation - * for XML content. The Java representation of XML - * content can consist of schema derived interfaces - * and classes representing the binding of schema - * type definitions, element declarations and model - * groups. Factory methods for each of these are - * provided in this class. - * - */ -@XmlRegistry -public class ObjectFactory { - - private final static QName _Envelope_QNAME = new QName("http://schemas.xmlsoap.org/soap/envelope/", "Envelope"); - private final static QName _Fault_QNAME = new QName("http://schemas.xmlsoap.org/soap/envelope/", "Fault"); - private final static QName _Header_QNAME = new QName("http://schemas.xmlsoap.org/soap/envelope/", "Header"); - private final static QName _Body_QNAME = new QName("http://schemas.xmlsoap.org/soap/envelope/", "Body"); - - /** - * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: org.xmlsoap.schemas.soap.envelope - * - */ - public ObjectFactory() { - } - - /** - * Create an instance of {@link Body } - * - */ - public Body createBody() { - return new Body(); - } - - /** - * Create an instance of {@link Detail } - * - */ - public Detail createDetail() { - return new Detail(); - } - - /** - * Create an instance of {@link Header } - * - */ - public Header createHeader() { - return new Header(); - } - - /** - * Create an instance of {@link Fault } - * - */ - public Fault createFault() { - return new Fault(); - } - - /** - * Create an instance of {@link Envelope } - * - */ - public Envelope createEnvelope() { - return new Envelope(); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link Envelope }{@code >}} - * - */ - @XmlElementDecl(namespace = "http://schemas.xmlsoap.org/soap/envelope/", name = "Envelope") - public JAXBElement<Envelope> createEnvelope(Envelope value) { - return new JAXBElement<Envelope>(_Envelope_QNAME, Envelope.class, null, value); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link Fault }{@code >}} - * - */ - @XmlElementDecl(namespace = "http://schemas.xmlsoap.org/soap/envelope/", name = "Fault") - public JAXBElement<Fault> createFault(Fault value) { - return new JAXBElement<Fault>(_Fault_QNAME, Fault.class, null, value); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link Header }{@code >}} - * - */ - @XmlElementDecl(namespace = "http://schemas.xmlsoap.org/soap/envelope/", name = "Header") - public JAXBElement<Header> createHeader(Header value) { - return new JAXBElement<Header>(_Header_QNAME, Header.class, null, value); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link Body }{@code >}} - * - */ - @XmlElementDecl(namespace = "http://schemas.xmlsoap.org/soap/envelope/", name = "Body") - public JAXBElement<Body> createBody(Body value) { - return new JAXBElement<Body>(_Body_QNAME, Body.class, null, value); - } - -} Deleted: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/org/xmlsoap/schemas/soap/envelope/package-info.java =================================================================== --- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/org/xmlsoap/schemas/soap/envelope/package-info.java 2011-02-02 13:45:06 UTC (rev 698) +++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/org/xmlsoap/schemas/soap/envelope/package-info.java 2011-02-03 21:11:08 UTC (rev 699) @@ -1,9 +0,0 @@ -// -// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.1-661 -// 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: 2008.12.08 at 05:45:20 PM CST -// - -(a)javax.xml.bind.annotation.XmlSchema(namespace = "http://schemas.xmlsoap.org/soap/envelope/") -package org.picketlink.identity.federation.org.xmlsoap.schemas.soap.envelope;

13 years, 2 months

1
0
0 / 0

Picketlink SVN: r698 - in idm/branches/1.2.0: assembly and 30 other directories.

by picketlink-commits＠lists.jboss.org

Author: bdaw Date: 2011-02-02 08:45:06 -0500 (Wed, 02 Feb 2011) New Revision: 698 Modified: idm/branches/1.2.0/assembly/pom.xml idm/branches/1.2.0/example/auth-simple/pom.xml idm/branches/1.2.0/example/auth/pom.xml idm/branches/1.2.0/example/simple/pom.xml idm/branches/1.2.0/integration/deployer/pom.xml idm/branches/1.2.0/integration/jboss5/pom.xml idm/branches/1.2.0/integration/pom.xml idm/branches/1.2.0/parent/pom.xml idm/branches/1.2.0/picketlink-idm-api/pom.xml idm/branches/1.2.0/picketlink-idm-api/src/main/java/org/picketlink/idm/api/IdentitySessionFactory.java idm/branches/1.2.0/picketlink-idm-auth/pom.xml idm/branches/1.2.0/picketlink-idm-cache/pom.xml idm/branches/1.2.0/picketlink-idm-common/pom.xml idm/branches/1.2.0/picketlink-idm-core/pom.xml idm/branches/1.2.0/picketlink-idm-core/src/main/java/org/picketlink/idm/impl/api/IdentitySessionFactoryImpl.java idm/branches/1.2.0/picketlink-idm-core/src/main/java/org/picketlink/idm/impl/api/session/IdentitySessionImpl.java idm/branches/1.2.0/picketlink-idm-core/src/main/java/org/picketlink/idm/impl/cache/JBossCacheAttributeStoreWrapper.java idm/branches/1.2.0/picketlink-idm-core/src/main/java/org/picketlink/idm/impl/configuration/IdentityConfigurationImpl.java idm/branches/1.2.0/picketlink-idm-core/src/main/java/org/picketlink/idm/impl/configuration/jaxb2/JAXB2IdentityConfiguration.java idm/branches/1.2.0/picketlink-idm-core/src/main/java/org/picketlink/idm/impl/configuration/metadata/IdentityRepositoryConfigurationMetaDataImpl.java idm/branches/1.2.0/picketlink-idm-core/src/main/java/org/picketlink/idm/impl/repository/FallbackIdentityStoreRepository.java idm/branches/1.2.0/picketlink-idm-core/src/main/java/org/picketlink/idm/impl/repository/WrapperIdentityStoreRepository.java idm/branches/1.2.0/picketlink-idm-docs/ReferenceGuide/pom.xml idm/branches/1.2.0/picketlink-idm-docs/pom.xml idm/branches/1.2.0/picketlink-idm-hibernate/pom.xml idm/branches/1.2.0/picketlink-idm-hibernate/src/main/java/org/picketlink/idm/impl/store/hibernate/HibernateIdentityStoreImpl.java idm/branches/1.2.0/picketlink-idm-ldap/pom.xml idm/branches/1.2.0/picketlink-idm-ldap/src/main/java/org/picketlink/idm/impl/store/ldap/LDAPIdentityStoreImpl.java idm/branches/1.2.0/picketlink-idm-spi/pom.xml idm/branches/1.2.0/picketlink-idm-spi/src/main/java/org/picketlink/idm/spi/configuration/metadata/RelationshipMetaData.java idm/branches/1.2.0/picketlink-idm-spi/src/main/java/org/picketlink/idm/spi/store/IdentityStoreSessionFactory.java idm/branches/1.2.0/picketlink-idm-testsuite/pom.xml idm/branches/1.2.0/pom.xml Log: - Set version for 1.2.0.CR01-SNAPSHOT - Merge all changes that matter for Seam Security from trunk Modified: idm/branches/1.2.0/assembly/pom.xml =================================================================== --- idm/branches/1.2.0/assembly/pom.xml 2011-02-01 18:23:25 UTC (rev 697) +++ idm/branches/1.2.0/assembly/pom.xml 2011-02-02 13:45:06 UTC (rev 698) @@ -8,7 +8,7 @@ <parent> <groupId>org.picketlink.idm</groupId> <artifactId>picketlink-idm-parent</artifactId> - <version>1.1.8.CR02-SNAPSHOT</version> + <version>1.2.0.CR01-SNAPSHOT</version> <relativePath>../parent</relativePath> </parent> Modified: idm/branches/1.2.0/example/auth/pom.xml =================================================================== --- idm/branches/1.2.0/example/auth/pom.xml 2011-02-01 18:23:25 UTC (rev 697) +++ idm/branches/1.2.0/example/auth/pom.xml 2011-02-02 13:45:06 UTC (rev 698) @@ -1,7 +1,7 @@ <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <groupId>org.picketlink.idm.example</groupId> - <version>1.1.8.CR02-SNAPSHOT</version> + <version>1.2.0.CR01-SNAPSHOT</version> <artifactId>example-auth</artifactId> <packaging>jar</packaging> <name>Example - JEE authentication</name> Modified: idm/branches/1.2.0/example/auth-simple/pom.xml =================================================================== --- idm/branches/1.2.0/example/auth-simple/pom.xml 2011-02-01 18:23:25 UTC (rev 697) +++ idm/branches/1.2.0/example/auth-simple/pom.xml 2011-02-02 13:45:06 UTC (rev 698) @@ -1,7 +1,7 @@ <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <groupId>org.picketlink.idm.example</groupId> - <version>1.1.8.CR02-SNAPSHOT</version> + <version>1.2.0.CR01-SNAPSHOT</version> <artifactId>example-auth-simple</artifactId> <packaging>jar</packaging> <name>Example - JEE authentication (using deployer)</name> Modified: idm/branches/1.2.0/example/simple/pom.xml =================================================================== --- idm/branches/1.2.0/example/simple/pom.xml 2011-02-01 18:23:25 UTC (rev 697) +++ idm/branches/1.2.0/example/simple/pom.xml 2011-02-02 13:45:06 UTC (rev 698) @@ -1,7 +1,7 @@ <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> <modelVersion>4.0.0</modelVersion> <groupId>org.picketlink.idm.example</groupId> - <version>1.1.8.CR02-SNAPSHOT</version> + <version>1.2.0.CR01-SNAPSHOT</version> <artifactId>example-simple</artifactId> <packaging>jar</packaging> <name>Example - Simple PicketLink IDM Maven2 project</name> Modified: idm/branches/1.2.0/integration/deployer/pom.xml =================================================================== --- idm/branches/1.2.0/integration/deployer/pom.xml 2011-02-01 18:23:25 UTC (rev 697) +++ idm/branches/1.2.0/integration/deployer/pom.xml 2011-02-02 13:45:06 UTC (rev 698) @@ -10,7 +10,7 @@ <parent> <groupId>org.picketlink.idm</groupId> <artifactId>picketlink-idm-integration</artifactId> - <version>1.1.8.CR02-SNAPSHOT</version> + <version>1.2.0.CR01-SNAPSHOT</version> </parent> <properties> Modified: idm/branches/1.2.0/integration/jboss5/pom.xml =================================================================== --- idm/branches/1.2.0/integration/jboss5/pom.xml 2011-02-01 18:23:25 UTC (rev 697) +++ idm/branches/1.2.0/integration/jboss5/pom.xml 2011-02-02 13:45:06 UTC (rev 698) @@ -10,7 +10,7 @@ <parent> <groupId>org.picketlink.idm</groupId> <artifactId>picketlink-idm-integration</artifactId> - <version>1.1.8.CR02-SNAPSHOT</version> + <version>1.2.0.CR01-SNAPSHOT</version> </parent> <dependencies> Modified: idm/branches/1.2.0/integration/pom.xml =================================================================== --- idm/branches/1.2.0/integration/pom.xml 2011-02-01 18:23:25 UTC (rev 697) +++ idm/branches/1.2.0/integration/pom.xml 2011-02-02 13:45:06 UTC (rev 698) @@ -12,7 +12,7 @@ <parent> <groupId>org.picketlink.idm</groupId> <artifactId>picketlink-idm-parent</artifactId> - <version>1.1.8.CR02-SNAPSHOT</version> + <version>1.2.0.CR01-SNAPSHOT</version> <relativePath>../parent/pom.xml</relativePath> </parent> Modified: idm/branches/1.2.0/parent/pom.xml =================================================================== --- idm/branches/1.2.0/parent/pom.xml 2011-02-01 18:23:25 UTC (rev 697) +++ idm/branches/1.2.0/parent/pom.xml 2011-02-02 13:45:06 UTC (rev 698) @@ -8,7 +8,7 @@ <groupId>org.picketlink.idm</groupId> <artifactId>picketlink-idm-parent</artifactId> <packaging>pom</packaging> - <version>1.1.8.CR02-SNAPSHOT</version> + <version>1.2.0.CR01-SNAPSHOT</version> <name>PicketLink IDM- Parent</name> <url>http://labs.jboss.org/portal/jbosssecurity/</url> <description>PicketLink is a cross-cutting project that handles identity needs for the JEMS projects</description> Modified: idm/branches/1.2.0/picketlink-idm-api/pom.xml =================================================================== --- idm/branches/1.2.0/picketlink-idm-api/pom.xml 2011-02-01 18:23:25 UTC (rev 697) +++ idm/branches/1.2.0/picketlink-idm-api/pom.xml 2011-02-02 13:45:06 UTC (rev 698) @@ -2,7 +2,7 @@ <parent> <groupId>org.picketlink.idm</groupId> <artifactId>picketlink-idm-parent</artifactId> - <version>1.1.8.CR02-SNAPSHOT</version> + <version>1.2.0.CR01-SNAPSHOT</version> <relativePath>../parent</relativePath> </parent> <modelVersion>4.0.0</modelVersion> Modified: idm/branches/1.2.0/picketlink-idm-api/src/main/java/org/picketlink/idm/api/IdentitySessionFactory.java =================================================================== --- idm/branches/1.2.0/picketlink-idm-api/src/main/java/org/picketlink/idm/api/IdentitySessionFactory.java 2011-02-01 18:23:25 UTC (rev 697) +++ idm/branches/1.2.0/picketlink-idm-api/src/main/java/org/picketlink/idm/api/IdentitySessionFactory.java 2011-02-02 13:45:06 UTC (rev 698) @@ -22,12 +22,17 @@ package org.picketlink.idm.api; +import java.util.Map; + import org.picketlink.idm.common.exception.IdentityException; /** - * Creates IdentitySession objects for a given Realm. + * Creates IdentitySession objects for a given Realm. An IdentitySessionFactory + * is typically created from an IdentityConfiguration. * + * @see org.picketlink.idm.api.cfg.IdentityConfiguration#buildIdentitySessionFactory() * @author <a href="mailto:boleslaw.dawidowicz at redhat.com">Boleslaw Dawidowicz</a> + * @author Shane Bryzak * @version : 0.1 $ */ public interface IdentitySessionFactory @@ -43,13 +48,28 @@ boolean isClosed(); /** - * Create IdentitySession - * @return + * Creates a new IdentitySession. + * + * @param realmName The name of the realm + * @return The new IdentitySession */ IdentitySession createIdentitySession(String realmName) throws IdentityException; /** + * Creates a new IdentitySession for the given realm. This method accepts + * a sessionOptions parameter which may be used to customize the IdentitySession + * instance returned. + * + * @param realmName The name of the realm + * @param sessionOptions A Map containing session options + * @return The new IdentitySession + * @throws IdentityException + */ + IdentitySession createIdentitySession(String realmName, + Map<String,Object> sessionOptions) throws IdentityException; + + /** * Get current open session associated with a realm. If not present, creates one * @return */ Modified: idm/branches/1.2.0/picketlink-idm-auth/pom.xml =================================================================== --- idm/branches/1.2.0/picketlink-idm-auth/pom.xml 2011-02-01 18:23:25 UTC (rev 697) +++ idm/branches/1.2.0/picketlink-idm-auth/pom.xml 2011-02-02 13:45:06 UTC (rev 698) @@ -2,7 +2,7 @@ <parent> <groupId>org.picketlink.idm</groupId> <artifactId>picketlink-idm-parent</artifactId> - <version>1.1.8.CR02-SNAPSHOT</version> + <version>1.2.0.CR01-SNAPSHOT</version> <relativePath>../parent</relativePath> </parent> <modelVersion>4.0.0</modelVersion> Modified: idm/branches/1.2.0/picketlink-idm-cache/pom.xml =================================================================== --- idm/branches/1.2.0/picketlink-idm-cache/pom.xml 2011-02-01 18:23:25 UTC (rev 697) +++ idm/branches/1.2.0/picketlink-idm-cache/pom.xml 2011-02-02 13:45:06 UTC (rev 698) @@ -2,7 +2,7 @@ <parent> <groupId>org.picketlink.idm</groupId> <artifactId>picketlink-idm-parent</artifactId> - <version>1.1.8.CR02-SNAPSHOT</version> + <version>1.2.0.CR01-SNAPSHOT</version> <relativePath>../parent</relativePath> </parent> <modelVersion>4.0.0</modelVersion> Modified: idm/branches/1.2.0/picketlink-idm-common/pom.xml =================================================================== --- idm/branches/1.2.0/picketlink-idm-common/pom.xml 2011-02-01 18:23:25 UTC (rev 697) +++ idm/branches/1.2.0/picketlink-idm-common/pom.xml 2011-02-02 13:45:06 UTC (rev 698) @@ -2,7 +2,7 @@ <parent> <groupId>org.picketlink.idm</groupId> <artifactId>picketlink-idm-parent</artifactId> - <version>1.1.8.CR02-SNAPSHOT</version> + <version>1.2.0.CR01-SNAPSHOT</version> <relativePath>../parent</relativePath> </parent> <modelVersion>4.0.0</modelVersion> Modified: idm/branches/1.2.0/picketlink-idm-core/pom.xml =================================================================== --- idm/branches/1.2.0/picketlink-idm-core/pom.xml 2011-02-01 18:23:25 UTC (rev 697) +++ idm/branches/1.2.0/picketlink-idm-core/pom.xml 2011-02-02 13:45:06 UTC (rev 698) @@ -2,13 +2,13 @@ <parent> <groupId>org.picketlink.idm</groupId> <artifactId>picketlink-idm-parent</artifactId> - <version>1.1.8.CR02-SNAPSHOT</version> + <version>1.2.0.CR01-SNAPSHOT</version> <relativePath>../parent</relativePath> </parent> <modelVersion>4.0.0</modelVersion> <artifactId>picketlink-idm-core</artifactId> <packaging>jar</packaging> - <name>PicketLink IDM Implemnentation</name> + <name>PicketLink IDM Implementation</name> <url>http://labs.jboss.org/portal/jbosssecurity/</url> <description>PicketLink IDM IMPL contains the implementation of the API and the Identity Model.</description> <licenses> Modified: idm/branches/1.2.0/picketlink-idm-core/src/main/java/org/picketlink/idm/impl/api/IdentitySessionFactoryImpl.java =================================================================== --- idm/branches/1.2.0/picketlink-idm-core/src/main/java/org/picketlink/idm/impl/api/IdentitySessionFactoryImpl.java 2011-02-01 18:23:25 UTC (rev 697) +++ idm/branches/1.2.0/picketlink-idm-core/src/main/java/org/picketlink/idm/impl/api/IdentitySessionFactoryImpl.java 2011-02-02 13:45:06 UTC (rev 698) @@ -69,9 +69,13 @@ public IdentitySession createIdentitySession(String realmName) throws IdentityException { + return createIdentitySession(realmName, null); + } + public IdentitySession createIdentitySession(String realmName, + Map<String,Object> sessionOptions) throws IdentityException + { IdentitySessionConfigurationContext sessionConfigCtx = sessionContextMap.get(realmName); - // If no realm mapped then look for a template which name is a prefix of realmName if (sessionConfigCtx == null) { @@ -112,7 +116,8 @@ sessionConfigCtx.getTypeMapper(), sessionConfigCtx.getApiCacheProvider(), sessionConfigCtx.getIdentityConfigurationContext(), - sessionConfigCtx.getRealmOptions()); + sessionConfigCtx.getRealmOptions(), + sessionOptions); realmMap.put(realmName, newSession); Modified: idm/branches/1.2.0/picketlink-idm-core/src/main/java/org/picketlink/idm/impl/api/session/IdentitySessionImpl.java =================================================================== --- idm/branches/1.2.0/picketlink-idm-core/src/main/java/org/picketlink/idm/impl/api/session/IdentitySessionImpl.java 2011-02-01 18:23:25 UTC (rev 697) +++ idm/branches/1.2.0/picketlink-idm-core/src/main/java/org/picketlink/idm/impl/api/session/IdentitySessionImpl.java 2011-02-02 13:45:06 UTC (rev 698) @@ -121,9 +121,21 @@ IdentityConfigurationContext configurationContext, Map<String, List<String>> realmOptions) throws IdentityException { + this(realmName, repository, typeMapper, apiCacheProvider, + configurationContext, realmOptions, null); + } + + public IdentitySessionImpl(String realmName, + IdentityStoreRepository repository, + IdentityObjectTypeMapper typeMapper, + APICacheProvider apiCacheProvider, + IdentityConfigurationContext configurationContext, + Map<String, List<String>> realmOptions, + Map<String,Object> sessionOptions) throws IdentityException + { this.realmName = realmName; - IdentityStoreSession storeSession = repository.createIdentityStoreSession(); + IdentityStoreSession storeSession = repository.createIdentityStoreSession(sessionOptions); final IdentityStoreInvocationContext invocationCtx = new SimpleIdentityStoreInvocationContext(storeSession, realmName, String.valueOf(this.hashCode())); IdentityStoreInvocationContextResolver resolver = new IdentityStoreInvocationContextResolver() Modified: idm/branches/1.2.0/picketlink-idm-core/src/main/java/org/picketlink/idm/impl/cache/JBossCacheAttributeStoreWrapper.java =================================================================== --- idm/branches/1.2.0/picketlink-idm-core/src/main/java/org/picketlink/idm/impl/cache/JBossCacheAttributeStoreWrapper.java 2011-02-01 18:23:25 UTC (rev 697) +++ idm/branches/1.2.0/picketlink-idm-core/src/main/java/org/picketlink/idm/impl/cache/JBossCacheAttributeStoreWrapper.java 2011-02-02 13:45:06 UTC (rev 698) @@ -84,6 +84,13 @@ return attributeStore.createIdentityStoreSession(); } + public IdentityStoreSession createIdentityStoreSession( + Map<String, Object> sessionOptions) throws IdentityException + { + return attributeStore.createIdentityStoreSession(sessionOptions); + } + + public Set<String> getSupportedAttributeNames(IdentityStoreInvocationContext invocationContext, IdentityObjectType identityType) throws IdentityException { Modified: idm/branches/1.2.0/picketlink-idm-core/src/main/java/org/picketlink/idm/impl/configuration/IdentityConfigurationImpl.java =================================================================== --- idm/branches/1.2.0/picketlink-idm-core/src/main/java/org/picketlink/idm/impl/configuration/IdentityConfigurationImpl.java 2011-02-01 18:23:25 UTC (rev 697) +++ idm/branches/1.2.0/picketlink-idm-core/src/main/java/org/picketlink/idm/impl/configuration/IdentityConfigurationImpl.java 2011-02-02 13:45:06 UTC (rev 698) @@ -256,22 +256,25 @@ String cacheRegistryName = null; // Parse all 'cache.' prefixed options - for (String key : metaData.getOptions().keySet()) + if (metaData.getOptions() != null) { - if (key.startsWith("cache.")) + for (String key : metaData.getOptions().keySet()) { - if (metaData.getOptions().get(key).size() > 0) + if (key.startsWith("cache.")) { - cacheProps.put(key, metaData.getOptions().get(key).get(0)); - } - if (key.equals("cache.providerClass") && metaData.getOptions().get(key).size() > 0) - { - cacheClassName = metaData.getOptions().get(key).get(0); - } + if (metaData.getOptions().get(key).size() > 0) + { + cacheProps.put(key, metaData.getOptions().get(key).get(0)); + } + if (key.equals("cache.providerClass") && metaData.getOptions().get(key).size() > 0) + { + cacheClassName = metaData.getOptions().get(key).get(0); + } - if (key.equals("cache.providerRegistryName") && metaData.getOptions().get(key).size() > 0) - { - cacheRegistryName = metaData.getOptions().get(key).get(0); + if (key.equals("cache.providerRegistryName") && metaData.getOptions().get(key).size() > 0) + { + cacheRegistryName = metaData.getOptions().get(key).get(0); + } } } } Modified: idm/branches/1.2.0/picketlink-idm-core/src/main/java/org/picketlink/idm/impl/configuration/jaxb2/JAXB2IdentityConfiguration.java =================================================================== --- idm/branches/1.2.0/picketlink-idm-core/src/main/java/org/picketlink/idm/impl/configuration/jaxb2/JAXB2IdentityConfiguration.java 2011-02-01 18:23:25 UTC (rev 697) +++ idm/branches/1.2.0/picketlink-idm-core/src/main/java/org/picketlink/idm/impl/configuration/jaxb2/JAXB2IdentityConfiguration.java 2011-02-02 13:45:06 UTC (rev 698) @@ -217,7 +217,7 @@ { repoMD.setExternalConfig(repositoryType.getExternalConfig().getValue()); } - repoMD.setDefaultAttributeStroeId(repositoryType.getDefaultAttributeStoreId()); + repoMD.setDefaultAttributeStoreId(repositoryType.getDefaultAttributeStoreId()); repoMD.setDefaultIdentityStoreId(repositoryType.getDefaultIdentityStoreId()); List<IdentityStoreMappingMetaData> storeMappings = new LinkedList<IdentityStoreMappingMetaData>(); Modified: idm/branches/1.2.0/picketlink-idm-core/src/main/java/org/picketlink/idm/impl/configuration/metadata/IdentityRepositoryConfigurationMetaDataImpl.java =================================================================== --- idm/branches/1.2.0/picketlink-idm-core/src/main/java/org/picketlink/idm/impl/configuration/metadata/IdentityRepositoryConfigurationMetaDataImpl.java 2011-02-01 18:23:25 UTC (rev 697) +++ idm/branches/1.2.0/picketlink-idm-core/src/main/java/org/picketlink/idm/impl/configuration/metadata/IdentityRepositoryConfigurationMetaDataImpl.java 2011-02-02 13:45:06 UTC (rev 698) @@ -44,7 +44,7 @@ private String defaultIdentityStoreId; - private String defaultAttributeStroeId; + private String defaultAttributeStoreId; private List<IdentityStoreMappingMetaData> identityStoreToIdentityObjectTypeMappings; @@ -97,12 +97,12 @@ public String getDefaultAttributeStoreId() { - return defaultAttributeStroeId; + return defaultAttributeStoreId; } - public void setDefaultAttributeStroeId(String defaultAttributeStroeId) + public void setDefaultAttributeStoreId(String defaultAttributeStroeId) { - this.defaultAttributeStroeId = defaultAttributeStroeId; + this.defaultAttributeStoreId = defaultAttributeStroeId; } public List<IdentityStoreMappingMetaData> getIdentityStoreToIdentityObjectTypeMappings() Modified: idm/branches/1.2.0/picketlink-idm-core/src/main/java/org/picketlink/idm/impl/repository/FallbackIdentityStoreRepository.java =================================================================== --- idm/branches/1.2.0/picketlink-idm-core/src/main/java/org/picketlink/idm/impl/repository/FallbackIdentityStoreRepository.java 2011-02-01 18:23:25 UTC (rev 697) +++ idm/branches/1.2.0/picketlink-idm-core/src/main/java/org/picketlink/idm/impl/repository/FallbackIdentityStoreRepository.java 2011-02-02 13:45:06 UTC (rev 698) @@ -300,6 +300,37 @@ return new RepositoryIdentityStoreSessionImpl(sessions); } + public IdentityStoreSession createIdentityStoreSession( + Map<String, Object> sessionOptions) throws IdentityException + { + Map<String, IdentityStoreSession> sessions = new HashMap<String, IdentityStoreSession>(); + + for (IdentityStore identityStore : identityStoreMappings.values()) + { + sessions.put(identityStore.getId(), identityStore.createIdentityStoreSession(sessionOptions)); + } + + for (AttributeStore attributeStore : attributeStoreMappings.values()) + { + if (!sessions.containsKey(attributeStore.getId())) + { + sessions.put(attributeStore.getId(), attributeStore.createIdentityStoreSession(sessionOptions)); + } + } + + if (!sessions.containsKey(defaultAttributeStore.getId())) + { + sessions.put(defaultAttributeStore.getId(), defaultAttributeStore.createIdentityStoreSession(sessionOptions)); + } + + if (!sessions.containsKey(defaultIdentityStore.getId())) + { + sessions.put(defaultIdentityStore.getId(), defaultIdentityStore.createIdentityStoreSession(sessionOptions)); + } + + return new RepositoryIdentityStoreSessionImpl(sessions); + } + public String getId() { return id; Modified: idm/branches/1.2.0/picketlink-idm-core/src/main/java/org/picketlink/idm/impl/repository/WrapperIdentityStoreRepository.java =================================================================== --- idm/branches/1.2.0/picketlink-idm-core/src/main/java/org/picketlink/idm/impl/repository/WrapperIdentityStoreRepository.java 2011-02-01 18:23:25 UTC (rev 697) +++ idm/branches/1.2.0/picketlink-idm-core/src/main/java/org/picketlink/idm/impl/repository/WrapperIdentityStoreRepository.java 2011-02-02 13:45:06 UTC (rev 698) @@ -90,6 +90,22 @@ return new RepositoryIdentityStoreSessionImpl(sessions); } + + public IdentityStoreSession createIdentityStoreSession( + Map<String, Object> sessionOptions) throws IdentityException + { + Map<String, IdentityStoreSession> sessions = new HashMap<String, IdentityStoreSession>(); + + sessions.put(defaultAttributeStore.getId(), defaultAttributeStore.createIdentityStoreSession(sessionOptions)); + + if (!sessions.containsKey(defaultIdentityStore.getId())) + { + sessions.put(defaultIdentityStore.getId(), defaultIdentityStore.createIdentityStoreSession(sessionOptions)); + } + + return new RepositoryIdentityStoreSessionImpl(sessions); + } + IdentityStoreInvocationContext resolveIdentityStoreInvocationContext(IdentityStoreInvocationContext invocationCtx) { return resolveInvocationContext(defaultIdentityStore.getId(), invocationCtx); Modified: idm/branches/1.2.0/picketlink-idm-docs/ReferenceGuide/pom.xml =================================================================== --- idm/branches/1.2.0/picketlink-idm-docs/ReferenceGuide/pom.xml 2011-02-01 18:23:25 UTC (rev 697) +++ idm/branches/1.2.0/picketlink-idm-docs/ReferenceGuide/pom.xml 2011-02-02 13:45:06 UTC (rev 698) @@ -2,7 +2,7 @@ <parent> <groupId>org.picketlink.idm</groupId> <artifactId>picketlink-idm-parent</artifactId> - <version>1.1.8.CR02-SNAPSHOT</version> + <version>1.2.0.CR01-SNAPSHOT</version> <relativePath>../../parent</relativePath> </parent> Modified: idm/branches/1.2.0/picketlink-idm-docs/pom.xml =================================================================== --- idm/branches/1.2.0/picketlink-idm-docs/pom.xml 2011-02-01 18:23:25 UTC (rev 697) +++ idm/branches/1.2.0/picketlink-idm-docs/pom.xml 2011-02-02 13:45:06 UTC (rev 698) @@ -2,7 +2,7 @@ <parent> <groupId>org.picketlink.idm</groupId> <artifactId>picketlink-idm-parent</artifactId> - <version>1.1.8.CR02-SNAPSHOT</version> + <version>1.2.0.CR01-SNAPSHOT</version> <relativePath>../parent</relativePath> </parent> <modelVersion>4.0.0</modelVersion> Modified: idm/branches/1.2.0/picketlink-idm-hibernate/pom.xml =================================================================== --- idm/branches/1.2.0/picketlink-idm-hibernate/pom.xml 2011-02-01 18:23:25 UTC (rev 697) +++ idm/branches/1.2.0/picketlink-idm-hibernate/pom.xml 2011-02-02 13:45:06 UTC (rev 698) @@ -2,7 +2,7 @@ <parent> <groupId>org.picketlink.idm</groupId> <artifactId>picketlink-idm-parent</artifactId> - <version>1.1.8.CR02-SNAPSHOT</version> + <version>1.2.0.CR01-SNAPSHOT</version> <relativePath>../parent</relativePath> </parent> <modelVersion>4.0.0</modelVersion> Modified: idm/branches/1.2.0/picketlink-idm-hibernate/src/main/java/org/picketlink/idm/impl/store/hibernate/HibernateIdentityStoreImpl.java =================================================================== --- idm/branches/1.2.0/picketlink-idm-hibernate/src/main/java/org/picketlink/idm/impl/store/hibernate/HibernateIdentityStoreImpl.java 2011-02-01 18:23:25 UTC (rev 697) +++ idm/branches/1.2.0/picketlink-idm-hibernate/src/main/java/org/picketlink/idm/impl/store/hibernate/HibernateIdentityStoreImpl.java 2011-02-02 13:45:06 UTC (rev 698) @@ -485,6 +485,12 @@ } } + public IdentityStoreSession createIdentityStoreSession( + Map<String, Object> sessionOptions) throws IdentityException + { + return createIdentityStoreSession(); + } + public String getId() { return id; Modified: idm/branches/1.2.0/picketlink-idm-ldap/pom.xml =================================================================== --- idm/branches/1.2.0/picketlink-idm-ldap/pom.xml 2011-02-01 18:23:25 UTC (rev 697) +++ idm/branches/1.2.0/picketlink-idm-ldap/pom.xml 2011-02-02 13:45:06 UTC (rev 698) @@ -2,7 +2,7 @@ <parent> <groupId>org.picketlink.idm</groupId> <artifactId>picketlink-idm-parent</artifactId> - <version>1.1.8.CR02-SNAPSHOT</version> + <version>1.2.0.CR01-SNAPSHOT</version> <relativePath>../parent</relativePath> </parent> <modelVersion>4.0.0</modelVersion> Modified: idm/branches/1.2.0/picketlink-idm-ldap/src/main/java/org/picketlink/idm/impl/store/ldap/LDAPIdentityStoreImpl.java =================================================================== --- idm/branches/1.2.0/picketlink-idm-ldap/src/main/java/org/picketlink/idm/impl/store/ldap/LDAPIdentityStoreImpl.java 2011-02-01 18:23:25 UTC (rev 697) +++ idm/branches/1.2.0/picketlink-idm-ldap/src/main/java/org/picketlink/idm/impl/store/ldap/LDAPIdentityStoreImpl.java 2011-02-02 13:45:06 UTC (rev 698) @@ -307,6 +307,13 @@ return new LDAPIdentityStoreSessionImpl(configuration); } + public IdentityStoreSession createIdentityStoreSession( + Map<String, Object> sessionOptions) throws IdentityException + { + return createIdentityStoreSession(); + } + + public String getId() { return id; Modified: idm/branches/1.2.0/picketlink-idm-spi/pom.xml =================================================================== --- idm/branches/1.2.0/picketlink-idm-spi/pom.xml 2011-02-01 18:23:25 UTC (rev 697) +++ idm/branches/1.2.0/picketlink-idm-spi/pom.xml 2011-02-02 13:45:06 UTC (rev 698) @@ -2,7 +2,7 @@ <parent> <groupId>org.picketlink.idm</groupId> <artifactId>picketlink-idm-parent</artifactId> - <version>1.1.8.CR02-SNAPSHOT</version> + <version>1.2.0.CR01-SNAPSHOT</version> <relativePath>../parent</relativePath> </parent> <modelVersion>4.0.0</modelVersion> Modified: idm/branches/1.2.0/picketlink-idm-spi/src/main/java/org/picketlink/idm/spi/configuration/metadata/RelationshipMetaData.java =================================================================== --- idm/branches/1.2.0/picketlink-idm-spi/src/main/java/org/picketlink/idm/spi/configuration/metadata/RelationshipMetaData.java 2011-02-01 18:23:25 UTC (rev 697) +++ idm/branches/1.2.0/picketlink-idm-spi/src/main/java/org/picketlink/idm/spi/configuration/metadata/RelationshipMetaData.java 2011-02-02 13:45:06 UTC (rev 698) @@ -23,19 +23,26 @@ package org.picketlink.idm.spi.configuration.metadata; /** - * Relationship meta data + *Relationship meta data, used to represent a single allowed relationship type. * + * This metadata is used by the configuration to define a set of allowable + * relationship types for a single identity store. + * * @author <a href="mailto:boleslaw.dawidowicz at redhat.com">Boleslaw Dawidowicz</a> * @version : 0.1 $ */ public interface RelationshipMetaData { /** + * Returns the name of the relationship type, e.g. MEMBER_OF, ROLE, etc + * * @return RelationshipType name */ String getRelationshipTypeRef(); /** + * Returns the name of the allowed identity object type on the "to" side of + * * @return IdentityObjectType name */ String getIdentityObjectTypeRef(); Modified: idm/branches/1.2.0/picketlink-idm-spi/src/main/java/org/picketlink/idm/spi/store/IdentityStoreSessionFactory.java =================================================================== --- idm/branches/1.2.0/picketlink-idm-spi/src/main/java/org/picketlink/idm/spi/store/IdentityStoreSessionFactory.java 2011-02-01 18:23:25 UTC (rev 697) +++ idm/branches/1.2.0/picketlink-idm-spi/src/main/java/org/picketlink/idm/spi/store/IdentityStoreSessionFactory.java 2011-02-02 13:45:06 UTC (rev 698) @@ -25,17 +25,37 @@ import org.picketlink.idm.common.exception.IdentityException; import java.io.Serializable; +import java.util.Map; /** + * Factory interface for creating IdentityStoreSession instances. + * * @author <a href="mailto:boleslaw.dawidowicz at redhat.com">Boleslaw Dawidowicz</a> + * @author Shane Bryzak * @version : 0.1 $ */ public interface IdentityStoreSessionFactory extends Serializable { + /** * @return + * Creates a new IdentityStoreSession. + * + * @return The new IdentityStoreSession + * @throws IdentityException */ IdentityStoreSession createIdentityStoreSession() throws IdentityException; - + + /** + * Creates an IdentityStoreSession. This factory method allows additional + * session options to be passed in which may be used by the factory method + * implementation to customise the IdentityStoreSession returned. + * + * @param sessionOptions A Map containing the session option values + * @return The new IdentityStoreSession + * @throws IdentityException + */ + IdentityStoreSession createIdentityStoreSession(Map<String,Object> sessionOptions) throws IdentityException; + } Modified: idm/branches/1.2.0/picketlink-idm-testsuite/pom.xml =================================================================== --- idm/branches/1.2.0/picketlink-idm-testsuite/pom.xml 2011-02-01 18:23:25 UTC (rev 697) +++ idm/branches/1.2.0/picketlink-idm-testsuite/pom.xml 2011-02-02 13:45:06 UTC (rev 698) @@ -2,7 +2,7 @@ <parent> <groupId>org.picketlink.idm</groupId> <artifactId>picketlink-idm-parent</artifactId> - <version>1.1.8.CR02-SNAPSHOT</version> + <version>1.2.0.CR01-SNAPSHOT</version> <relativePath>../parent</relativePath> </parent> <modelVersion>4.0.0</modelVersion> Modified: idm/branches/1.2.0/pom.xml =================================================================== --- idm/branches/1.2.0/pom.xml 2011-02-01 18:23:25 UTC (rev 697) +++ idm/branches/1.2.0/pom.xml 2011-02-02 13:45:06 UTC (rev 698) @@ -2,7 +2,7 @@ <parent> <groupId>org.picketlink.idm</groupId> <artifactId>picketlink-idm-parent</artifactId> - <version>1.1.8.CR02-SNAPSHOT</version> + <version>1.2.0.CR01-SNAPSHOT</version> <relativePath>parent</relativePath> </parent> <modelVersion>4.0.0</modelVersion>

13 years, 2 months

1
0
0 / 0

Picketlink SVN: r697 - integration-tests/trunk/picketlink-sts-tests/src/test/java/org/picketlink/test/integration/sts.

by picketlink-commits＠lists.jboss.org

Author: sguilhen(a)redhat.com Date: 2011-02-01 13:23:25 -0500 (Tue, 01 Feb 2011) New Revision: 697 Modified: integration-tests/trunk/picketlink-sts-tests/src/test/java/org/picketlink/test/integration/sts/PicketLinkSTSIntegrationUnitTestCase.java Log: PLFED-126: Fixed integration tests that were failing Modified: integration-tests/trunk/picketlink-sts-tests/src/test/java/org/picketlink/test/integration/sts/PicketLinkSTSIntegrationUnitTestCase.java =================================================================== --- integration-tests/trunk/picketlink-sts-tests/src/test/java/org/picketlink/test/integration/sts/PicketLinkSTSIntegrationUnitTestCase.java 2011-02-01 18:22:40 UTC (rev 696) +++ integration-tests/trunk/picketlink-sts-tests/src/test/java/org/picketlink/test/integration/sts/PicketLinkSTSIntegrationUnitTestCase.java 2011-02-01 18:23:25 UTC (rev 697) @@ -455,8 +455,8 @@ } catch (WebServiceException we) { - /*Assert.assertEquals("Unexpected exception message", "Exception in handling token request: Assertion with id " - + assertionElement.getAttribute("ID") + " has been canceled and cannot be renewed", we.getMessage());*/ + Assert.assertEquals("Unexpected exception message", "Exception in handling token request: Assertion with id " + + assertionElement.getAttribute("ID") + " has been canceled and cannot be renewed", we.getMessage()); } } @@ -480,9 +480,8 @@ } catch (WebServiceException we) { - /*Assert.assertEquals("Unexpected exception message", - "Exception in handling token request: Unable to find a token provider for the token request", we - .getMessage());*/ + Assert.assertTrue("Unexpected exception message", we.getMessage().startsWith( + "Exception in handling token request: No Security Token Provider found in configuration:")); } } @@ -579,7 +578,8 @@ KeyValueType keyValue = (KeyValueType) keyInfo.getContent().get(0); List<Object> keyValueContent = keyValue.getContent(); Assert.assertEquals("Unexpected key value content size", 1, keyValueContent.size()); - Assert.assertEquals("Unexpected key value content type", RSAKeyValueType.class, keyValueContent.get(0).getClass()); + Assert.assertEquals("Unexpected key value content type", RSAKeyValueType.class, keyValueContent.get(0) + .getClass()); RSAKeyValueType rsaKeyValue = (RSAKeyValueType) keyValueContent.get(0); // reconstruct the public key and check if it matches the public key of the provided certificate.

13 years, 2 months

1
0
0 / 0

Picketlink SVN: r696 - in federation/trunk/picketlink-fed-core/src: main/java/org/picketlink/identity/federation/core/parsers/sts and 5 other directories.

by picketlink-commits＠lists.jboss.org

Author: sguilhen(a)redhat.com Date: 2011-02-01 13:22:40 -0500 (Tue, 01 Feb 2011) New Revision: 696 Added: federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/parsers/sts/ federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/parsers/sts/STSConfigParser.java federation/trunk/picketlink-fed-core/src/test/java/org/picketlink/test/identity/federation/core/config/STSConfigParserUnitTestCase.java Modified: federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/sts/PicketLinkCoreSTS.java federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/wstrust/PicketLinkSTS.java federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/wstrust/StandardRequestHandler.java federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/wstrust/WSTrustUtil.java federation/trunk/picketlink-fed-core/src/test/java/org/picketlink/test/identity/federation/core/wstrust/PicketLinkSTSUnitTestCase.java federation/trunk/picketlink-fed-core/src/test/resources/parser/config/picketlink-sts.xml Log: PLFED-126: Implemented Stax-based parser for the STS configuration Added: federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/parsers/sts/STSConfigParser.java =================================================================== --- federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/parsers/sts/STSConfigParser.java (rev 0) +++ federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/parsers/sts/STSConfigParser.java 2011-02-01 18:22:40 UTC (rev 696) @@ -0,0 +1,557 @@ +/* + * JBoss, Home of Professional Open Source. Copyright 2009, Red Hat Middleware LLC, and individual contributors as + * indicated by the @author tags. See the copyright.txt file 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.picketlink.identity.federation.core.parsers.sts; + +import javax.xml.namespace.QName; +import javax.xml.stream.XMLEventReader; +import javax.xml.stream.events.Attribute; +import javax.xml.stream.events.EndElement; +import javax.xml.stream.events.StartElement; +import javax.xml.stream.events.XMLEvent; + +import org.picketlink.identity.federation.core.config.AuthPropertyType; +import org.picketlink.identity.federation.core.config.ClaimsProcessorType; +import org.picketlink.identity.federation.core.config.ClaimsProcessorsType; +import org.picketlink.identity.federation.core.config.KeyProviderType; +import org.picketlink.identity.federation.core.config.KeyValueType; +import org.picketlink.identity.federation.core.config.STSType; +import org.picketlink.identity.federation.core.config.ServiceProviderType; +import org.picketlink.identity.federation.core.config.ServiceProvidersType; +import org.picketlink.identity.federation.core.config.TokenProviderType; +import org.picketlink.identity.federation.core.config.TokenProvidersType; +import org.picketlink.identity.federation.core.exceptions.ParsingException; +import org.picketlink.identity.federation.core.parsers.AbstractParser; +import org.picketlink.identity.federation.core.parsers.util.StaxParserUtil; + +/** + * + * A Stax parser for the STS configuration. + * + * + * @author <a href="mailto:sguilhen@redhat.com">Stefan Guilhen</a> + */ +public class STSConfigParser extends AbstractParser +{ + + private static final String CONFIG_NS = "urn:picketlink:identity-federation:config:1.0"; + + // XML configuration elements. + private static final String ROOT_ELEMENT = "PicketLinkSTS"; + private static final String KEY_PROVIDER_ELEMENT = "KeyProvider"; + private static final String AUTH_ELEMENT = "Auth"; + private static final String SIGNING_ALIAS_ELEMENT = "SigningAlias"; + private static final String VALIDATING_ALIAS_ELEMENT = "ValidatingAlias"; + private static final String REQUEST_HANDLER_ELEMENT = "RequestHandler"; + private static final String PROPERTY_ELEMENT = "Property"; + private static final String CLAIMS_PROCESSORS_ELEMENT = "ClaimsProcessors"; + private static final String CLAIMS_PROCESSOR_ELEMENT = "ClaimsProcessor"; + private static final String TOKEN_PROVIDERS_ELEMENT = "TokenProviders"; + private static final String TOKEN_PROVIDER_ELEMENT = "TokenProvider"; + private static final String SERVICE_PROVIDERS_ELEMENT = "ServiceProviders"; + private static final String SERVICE_PROVIDER_ELEMENT = "ServiceProvider"; + + // XML configuration attributes. + private static final String STS_NAME_ATTRIB = "STSName"; + private static final String TOKEN_TIMEOUT_ATTRIB = "TokenTimeout"; + private static final String SIGN_TOKEN_ATTRIB = "SignToken"; + private static final String ENCRYPT_TOKEN_ATTRIB = "EncryptToken"; + private static final String CANON_METHOD_ATTRIB = "CanonicalizationMethod"; + private static final String CLASS_NAME_ATTRIB = "ClassName"; + private static final String KEY_ATTRIB = "Key"; + private static final String VALUE_ATTRIB = "Value"; + private static final String DIALECT_ATTRIB = "Dialect"; + private static final String PROCESSOR_CLASS_ATTRIB = "ProcessorClass"; + private static final String PROVIDER_CLASS_ATTRIB = "ProviderClass"; + private static final String TOKEN_TYPE_ATTRIB = "TokenType"; + private static final String TOKEN_ELEMENT_ATTRIB = "TokenElement"; + private static final String TOKEN_ELEMENT_NS_ATTRIB = "TokenElementNS"; + private static final String ENDPOINT_ATTRIB = "Endpoint"; + private static final String TRUSTSTORE_ALIAS_ATTRIB = "TruststoreAlias"; + + /* + * (non-Javadoc) + * + * @see org.picketlink.identity.federation.core.parsers.ParserNamespaceSupport#parse(javax.xml.stream.XMLEventReader) + */ + @Override + public Object parse(XMLEventReader xmlEventReader) throws ParsingException + { + StartElement startElement = StaxParserUtil.getNextStartElement(xmlEventReader); + StaxParserUtil.validate(startElement, ROOT_ELEMENT); + STSType configType = new STSType(); + + // parse and set the root element attributes. + QName attributeQName = new QName("", STS_NAME_ATTRIB); + Attribute attribute = startElement.getAttributeByName(attributeQName); + if (attribute != null) + configType.setSTSName(StaxParserUtil.getAttributeValue(attribute)); + + attributeQName = new QName("", TOKEN_TIMEOUT_ATTRIB); + attribute = startElement.getAttributeByName(attributeQName); + if (attribute != null) + configType.setTokenTimeout(Integer.valueOf(StaxParserUtil.getAttributeValue(attribute))); + + attributeQName = new QName("", SIGN_TOKEN_ATTRIB); + attribute = startElement.getAttributeByName(attributeQName); + if (attribute != null) + configType.setSignToken(Boolean.valueOf(StaxParserUtil.getAttributeValue(attribute))); + + attributeQName = new QName("", ENCRYPT_TOKEN_ATTRIB); + attribute = startElement.getAttributeByName(attributeQName); + if (attribute != null) + configType.setEncryptToken(Boolean.valueOf(StaxParserUtil.getAttributeValue(attribute))); + + attributeQName = new QName("", CANON_METHOD_ATTRIB); + attribute = startElement.getAttributeByName(attributeQName); + if (attribute != null) + configType.setCanonicalizationMethod(StaxParserUtil.getAttributeValue(attribute)); + + // parse the inner elements. + while (xmlEventReader.hasNext()) + { + XMLEvent xmlEvent = StaxParserUtil.peek(xmlEventReader); + if (xmlEvent == null) + break; + if (xmlEvent instanceof EndElement) + { + EndElement endElement = (EndElement) StaxParserUtil.getNextEvent(xmlEventReader); + String endElementName = StaxParserUtil.getEndElementName(endElement); + if (endElementName.equals(ROOT_ELEMENT)) + break; + else + throw new RuntimeException("Unknown End Element:" + endElementName); + } + + StartElement subEvent = StaxParserUtil.peekNextStartElement(xmlEventReader); + if (subEvent == null) + break; + String elementName = StaxParserUtil.getStartElementName(subEvent); + if (KEY_PROVIDER_ELEMENT.equalsIgnoreCase(elementName)) + { + configType.setKeyProvider(this.parseKeyProvider(xmlEventReader)); + } + else if (REQUEST_HANDLER_ELEMENT.equalsIgnoreCase(elementName)) + { + subEvent = StaxParserUtil.getNextStartElement(xmlEventReader); + if (!StaxParserUtil.hasTextAhead(xmlEventReader)) + throw new ParsingException("Request handler class expected as element value"); + configType.setRequestHandler(StaxParserUtil.getElementText(xmlEventReader)); + } + else if (CLAIMS_PROCESSORS_ELEMENT.equalsIgnoreCase(elementName)) + { + configType.setClaimsProcessors(this.parseClaimsProcessors(xmlEventReader)); + } + else if (TOKEN_PROVIDERS_ELEMENT.equalsIgnoreCase(elementName)) + { + configType.setTokenProviders(this.parseTokenProviders(xmlEventReader)); + } + else if (SERVICE_PROVIDERS_ELEMENT.equalsIgnoreCase(elementName)) + { + configType.setServiceProviders(this.parseServiceProviders(xmlEventReader)); + } + else + throw new ParsingException("Unknown Element: " + elementName); + } + return configType; + } + + /* + * (non-Javadoc) + * + * @see org.picketlink.identity.federation.core.parsers.ParserNamespaceSupport#supports(javax.xml.namespace.QName) + */ + @Override + public boolean supports(QName qname) + { + return CONFIG_NS.equals(qname.getNamespaceURI()); + } + + /** + * + * Parses the {@code KeyProvider} section of the STS configuration file. This section is used to setup the keystore \ + * that will be used to sign and encrypt security tokens. + * + * + * @param xmlEventReader the reader used to parse the XML configuration file. + * @return a {@code KeyProviderType} instance that contains the parsed data. + * @throws ParsingException if an error occurs while parsing the XML file. + */ + private KeyProviderType parseKeyProvider(XMLEventReader xmlEventReader) throws ParsingException + { + StartElement startElement = StaxParserUtil.getNextStartElement(xmlEventReader); + StaxParserUtil.validate(startElement, KEY_PROVIDER_ELEMENT); + + KeyProviderType keyProvider = new KeyProviderType(); + // get the key provider class name attribute. + QName attributeQName = new QName("", CLASS_NAME_ATTRIB); + Attribute attribute = startElement.getAttributeByName(attributeQName); + if (attribute == null) + throw new ParsingException("The KeyProvider class name attribute must be specified"); + keyProvider.setClassName(StaxParserUtil.getAttributeValue(attribute)); + + // parse the inner elements. + while (xmlEventReader.hasNext()) + { + XMLEvent xmlEvent = StaxParserUtil.peek(xmlEventReader); + if (xmlEvent == null) + break; + if (xmlEvent instanceof EndElement) + { + EndElement endElement = (EndElement) StaxParserUtil.getNextEvent(xmlEventReader); + String endElementName = StaxParserUtil.getEndElementName(endElement); + if (endElementName.equals(KEY_PROVIDER_ELEMENT)) + break; + else + throw new RuntimeException("Unknown End Element:" + endElementName); + } + + StartElement subEvent = StaxParserUtil.peekNextStartElement(xmlEventReader); + if (subEvent == null) + break; + String elementName = StaxParserUtil.getStartElementName(subEvent); + + if (SIGNING_ALIAS_ELEMENT.equalsIgnoreCase(elementName)) + { + subEvent = StaxParserUtil.getNextStartElement(xmlEventReader); + if (!StaxParserUtil.hasTextAhead(xmlEventReader)) + throw new ParsingException("Signing alias expected as element value"); + keyProvider.setSigningAlias(StaxParserUtil.getElementText(xmlEventReader)); + } + else if (VALIDATING_ALIAS_ELEMENT.equalsIgnoreCase(elementName)) + { + subEvent = StaxParserUtil.getNextStartElement(xmlEventReader); + KeyValueType keyValue = new KeyValueType(); + // parse the key and value attributes. + attributeQName = new QName("", KEY_ATTRIB); + attribute = subEvent.getAttributeByName(attributeQName); + if (attribute != null) + keyValue.setKey(StaxParserUtil.getAttributeValue(attribute)); + attributeQName = new QName("", VALUE_ATTRIB); + attribute = subEvent.getAttributeByName(attributeQName); + if (attribute != null) + keyValue.setValue(StaxParserUtil.getAttributeValue(attribute)); + + EndElement endElement = StaxParserUtil.getNextEndElement(xmlEventReader); + StaxParserUtil.validate(endElement, VALIDATING_ALIAS_ELEMENT); + keyProvider.getValidatingAlias().add(keyValue); + } + else if (AUTH_ELEMENT.equalsIgnoreCase(elementName)) + { + subEvent = StaxParserUtil.getNextStartElement(xmlEventReader); + AuthPropertyType authProperty = new AuthPropertyType(); + // parse the key and value attributes. + attributeQName = new QName("", KEY_ATTRIB); + attribute = subEvent.getAttributeByName(attributeQName); + if (attribute != null) + authProperty.setKey(StaxParserUtil.getAttributeValue(attribute)); + attributeQName = new QName("", VALUE_ATTRIB); + attribute = subEvent.getAttributeByName(attributeQName); + if (attribute != null) + authProperty.setValue(StaxParserUtil.getAttributeValue(attribute)); + + EndElement endElement = StaxParserUtil.getNextEndElement(xmlEventReader); + StaxParserUtil.validate(endElement, AUTH_ELEMENT); + keyProvider.getAuth().add(authProperty); + } + else + throw new ParsingException("Unknown Element: " + elementName); + } + return keyProvider; + } + + /** + * + * Parses the {@code ClaimsProcessors} section of the STS configuration file. + * + * + * @param xmlEventReader the reader used to parse the XML configuration file. + * @return a {@code ClaimsProcessorsType} instance that contains the parsed data. + * @throws ParsingException if an error occurs while parsing the XML file. + */ + private ClaimsProcessorsType parseClaimsProcessors(XMLEventReader xmlEventReader) throws ParsingException + { + StartElement startElement = StaxParserUtil.getNextStartElement(xmlEventReader); + StaxParserUtil.validate(startElement, CLAIMS_PROCESSORS_ELEMENT); + + ClaimsProcessorsType claimsProcessors = new ClaimsProcessorsType(); + + // parse all claims processors one by one. + while (xmlEventReader.hasNext()) + { + XMLEvent xmlEvent = StaxParserUtil.peek(xmlEventReader); + if (xmlEvent == null) + break; + if (xmlEvent instanceof EndElement) + { + EndElement endElement = (EndElement) StaxParserUtil.getNextEvent(xmlEventReader); + String endElementName = StaxParserUtil.getEndElementName(endElement); + if (endElementName.equals(CLAIMS_PROCESSORS_ELEMENT)) + break; + else + throw new RuntimeException("Unknown End Element:" + endElementName); + } + + StartElement subEvent = StaxParserUtil.peekNextStartElement(xmlEventReader); + if (subEvent == null) + break; + String elementName = StaxParserUtil.getStartElementName(subEvent); + + if (CLAIMS_PROCESSOR_ELEMENT.equalsIgnoreCase(elementName)) + { + subEvent = StaxParserUtil.getNextStartElement(xmlEventReader); + StaxParserUtil.validate(subEvent, CLAIMS_PROCESSOR_ELEMENT); + ClaimsProcessorType claimsProcessor = new ClaimsProcessorType(); + + // parse the processor attributes (class and dialect). + QName attributeQName = new QName("", PROCESSOR_CLASS_ATTRIB); + Attribute attribute = subEvent.getAttributeByName(attributeQName); + if (attribute != null) + claimsProcessor.setProcessorClass(StaxParserUtil.getAttributeValue(attribute)); + attributeQName = new QName("", DIALECT_ATTRIB); + attribute = subEvent.getAttributeByName(attributeQName); + if (attribute != null) + claimsProcessor.setDialect(StaxParserUtil.getAttributeValue(attribute)); + + // parse the processor properties. + while (xmlEventReader.hasNext()) + { + xmlEvent = StaxParserUtil.peek(xmlEventReader); + if (xmlEvent == null) + break; + if (xmlEvent instanceof EndElement) + { + EndElement endElement = (EndElement) StaxParserUtil.getNextEvent(xmlEventReader); + String endElementName = StaxParserUtil.getEndElementName(endElement); + if (endElementName.equals(CLAIMS_PROCESSOR_ELEMENT)) + break; + else + throw new RuntimeException("Unknown End Element:" + endElementName); + } + + subEvent = StaxParserUtil.peekNextStartElement(xmlEventReader); + if (subEvent == null) + break; + elementName = StaxParserUtil.getStartElementName(subEvent); + if (PROPERTY_ELEMENT.equalsIgnoreCase(elementName)) + { + // parse the property key and value. + subEvent = StaxParserUtil.getNextStartElement(xmlEventReader); + KeyValueType keyValue = new KeyValueType(); + // parse the key and value attributes. + attributeQName = new QName("", KEY_ATTRIB); + attribute = subEvent.getAttributeByName(attributeQName); + if (attribute != null) + keyValue.setKey(StaxParserUtil.getAttributeValue(attribute)); + attributeQName = new QName("", VALUE_ATTRIB); + attribute = subEvent.getAttributeByName(attributeQName); + if (attribute != null) + keyValue.setValue(StaxParserUtil.getAttributeValue(attribute)); + + EndElement endElement = StaxParserUtil.getNextEndElement(xmlEventReader); + StaxParserUtil.validate(endElement, PROPERTY_ELEMENT); + claimsProcessor.getProperty().add(keyValue); + } + else + throw new ParsingException("Unknown Element: " + elementName); + } + claimsProcessors.getClaimsProcessor().add(claimsProcessor); + } + else + throw new ParsingException("Unknown Element: " + elementName); + } + return claimsProcessors; + } + + /** + * + * Parses the {@code TokenProviders} section of the STS configuration file. + * + * + * @param xmlEventReader the reader used to parse the XML configuration file. + * @return a {@code TokenProvidersType} instance that contains the parsed data. + * @throws ParsingException if an error occurs while parsing the XML file. + */ + private TokenProvidersType parseTokenProviders(XMLEventReader xmlEventReader) throws ParsingException + { + StartElement startElement = StaxParserUtil.getNextStartElement(xmlEventReader); + StaxParserUtil.validate(startElement, TOKEN_PROVIDERS_ELEMENT); + + TokenProvidersType tokenProviders = new TokenProvidersType(); + + // parse all token providers one by one. + while (xmlEventReader.hasNext()) + { + XMLEvent xmlEvent = StaxParserUtil.peek(xmlEventReader); + if (xmlEvent == null) + break; + if (xmlEvent instanceof EndElement) + { + EndElement endElement = (EndElement) StaxParserUtil.getNextEvent(xmlEventReader); + String endElementName = StaxParserUtil.getEndElementName(endElement); + if (endElementName.equals(TOKEN_PROVIDERS_ELEMENT)) + break; + else + throw new RuntimeException("Unknown End Element:" + endElementName); + } + + StartElement subEvent = StaxParserUtil.peekNextStartElement(xmlEventReader); + if (subEvent == null) + break; + String elementName = StaxParserUtil.getStartElementName(subEvent); + + if (TOKEN_PROVIDER_ELEMENT.equalsIgnoreCase(elementName)) + { + subEvent = StaxParserUtil.getNextStartElement(xmlEventReader); + StaxParserUtil.validate(subEvent, TOKEN_PROVIDER_ELEMENT); + TokenProviderType tokenProvider = new TokenProviderType(); + + // parse the provider attributes (provider class, token type, token element, token namespace). + QName attributeQName = new QName("", PROVIDER_CLASS_ATTRIB); + Attribute attribute = subEvent.getAttributeByName(attributeQName); + if (attribute != null) + tokenProvider.setProviderClass(StaxParserUtil.getAttributeValue(attribute)); + attributeQName = new QName("", TOKEN_TYPE_ATTRIB); + attribute = subEvent.getAttributeByName(attributeQName); + if (attribute != null) + tokenProvider.setTokenType(StaxParserUtil.getAttributeValue(attribute)); + attributeQName = new QName("", TOKEN_ELEMENT_ATTRIB); + attribute = subEvent.getAttributeByName(attributeQName); + if (attribute != null) + tokenProvider.setTokenElement(StaxParserUtil.getAttributeValue(attribute)); + attributeQName = new QName("", TOKEN_ELEMENT_NS_ATTRIB); + attribute = subEvent.getAttributeByName(attributeQName); + if (attribute != null) + tokenProvider.setTokenElementNS(StaxParserUtil.getAttributeValue(attribute)); + + // parse the provider properties. + while (xmlEventReader.hasNext()) + { + xmlEvent = StaxParserUtil.peek(xmlEventReader); + if (xmlEvent == null) + break; + if (xmlEvent instanceof EndElement) + { + EndElement endElement = (EndElement) StaxParserUtil.getNextEvent(xmlEventReader); + String endElementName = StaxParserUtil.getEndElementName(endElement); + if (endElementName.equals(TOKEN_PROVIDER_ELEMENT)) + break; + else + throw new RuntimeException("Unknown End Element:" + endElementName); + } + + subEvent = StaxParserUtil.peekNextStartElement(xmlEventReader); + if (subEvent == null) + break; + elementName = StaxParserUtil.getStartElementName(subEvent); + if (PROPERTY_ELEMENT.equalsIgnoreCase(elementName)) + { + // parse the property key and value. + subEvent = StaxParserUtil.getNextStartElement(xmlEventReader); + KeyValueType keyValue = new KeyValueType(); + // parse the key and value attributes. + attributeQName = new QName("", KEY_ATTRIB); + attribute = subEvent.getAttributeByName(attributeQName); + if (attribute != null) + keyValue.setKey(StaxParserUtil.getAttributeValue(attribute)); + attributeQName = new QName("", VALUE_ATTRIB); + attribute = subEvent.getAttributeByName(attributeQName); + if (attribute != null) + keyValue.setValue(StaxParserUtil.getAttributeValue(attribute)); + + EndElement endElement = StaxParserUtil.getNextEndElement(xmlEventReader); + StaxParserUtil.validate(endElement, PROPERTY_ELEMENT); + tokenProvider.getProperty().add(keyValue); + } + else + throw new ParsingException("Unknown Element: " + elementName); + } + tokenProviders.getTokenProvider().add(tokenProvider); + } + else + throw new ParsingException("Unknown Element: " + elementName); + } + return tokenProviders; + } + + /** + * + * Parses the {@code ServiceProviders} section of the STS configuration file. + * + * + * @param xmlEventReader the reader used to parse the XML configuration file. + * @return a {@code ServiceProvidersType} instance that contains the parsed data. + * @throws ParsingException if an error occurs while parsing the XML file. + */ + private ServiceProvidersType parseServiceProviders(XMLEventReader xmlEventReader) throws ParsingException + { + StartElement startElement = StaxParserUtil.getNextStartElement(xmlEventReader); + StaxParserUtil.validate(startElement, SERVICE_PROVIDERS_ELEMENT); + + ServiceProvidersType serviceProviders = new ServiceProvidersType(); + + // parse all token providers one by one. + while (xmlEventReader.hasNext()) + { + XMLEvent xmlEvent = StaxParserUtil.peek(xmlEventReader); + if (xmlEvent == null) + break; + if (xmlEvent instanceof EndElement) + { + EndElement endElement = (EndElement) StaxParserUtil.getNextEvent(xmlEventReader); + String endElementName = StaxParserUtil.getEndElementName(endElement); + if (endElementName.equals(SERVICE_PROVIDERS_ELEMENT)) + break; + else + throw new RuntimeException("Unknown End Element:" + endElementName); + } + + StartElement subEvent = StaxParserUtil.peekNextStartElement(xmlEventReader); + if (subEvent == null) + break; + String elementName = StaxParserUtil.getStartElementName(subEvent); + + if (SERVICE_PROVIDER_ELEMENT.equalsIgnoreCase(elementName)) + { + subEvent = StaxParserUtil.getNextStartElement(xmlEventReader); + StaxParserUtil.validate(subEvent, SERVICE_PROVIDER_ELEMENT); + ServiceProviderType serviceProvider = new ServiceProviderType(); + + // parse the provider attributes (endpoint, token type and truststore alias). + QName attributeQName = new QName("", TOKEN_TYPE_ATTRIB); + Attribute attribute = subEvent.getAttributeByName(attributeQName); + if (attribute != null) + serviceProvider.setTokenType(StaxParserUtil.getAttributeValue(attribute)); + attributeQName = new QName("", ENDPOINT_ATTRIB); + attribute = subEvent.getAttributeByName(attributeQName); + if (attribute != null) + serviceProvider.setEndpoint(StaxParserUtil.getAttributeValue(attribute)); + attributeQName = new QName("", TRUSTSTORE_ALIAS_ATTRIB); + attribute = subEvent.getAttributeByName(attributeQName); + if (attribute != null) + serviceProvider.setTruststoreAlias(StaxParserUtil.getAttributeValue(attribute)); + + EndElement endElement = StaxParserUtil.getNextEndElement(xmlEventReader); + StaxParserUtil.validate(endElement, SERVICE_PROVIDER_ELEMENT); + serviceProviders.getServiceProvider().add(serviceProvider); + } + else + throw new ParsingException("Unknown Element: " + elementName); + } + return serviceProviders; + } +} Modified: federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/sts/PicketLinkCoreSTS.java =================================================================== --- federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/sts/PicketLinkCoreSTS.java 2011-02-01 15:48:43 UTC (rev 695) +++ federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/sts/PicketLinkCoreSTS.java 2011-02-01 18:22:40 UTC (rev 696) @@ -35,9 +35,9 @@ import org.picketlink.identity.federation.core.exceptions.ProcessingException; import org.picketlink.identity.federation.core.interfaces.ProtocolContext; import org.picketlink.identity.federation.core.interfaces.SecurityTokenProvider; +import org.picketlink.identity.federation.core.parsers.sts.STSConfigParser; import org.picketlink.identity.federation.core.wstrust.PicketLinkSTSConfiguration; import org.picketlink.identity.federation.core.wstrust.STSConfiguration; -import org.picketlink.identity.federation.core.wstrust.WSTrustUtil; /** * @@ -315,7 +315,7 @@ } InputStream stream = configurationFileURL.openStream(); - STSType stsConfig = WSTrustUtil.getSTSConfiguration(stream); + STSType stsConfig = (STSType) new STSConfigParser().parse(stream); STSConfiguration configuration = new PicketLinkSTSConfiguration(stsConfig); if (logger.isInfoEnabled()) logger.info( fileName + " configuration file loaded"); Modified: federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/wstrust/PicketLinkSTS.java =================================================================== --- federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/wstrust/PicketLinkSTS.java 2011-02-01 15:48:43 UTC (rev 695) +++ federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/wstrust/PicketLinkSTS.java 2011-02-01 18:22:40 UTC (rev 696) @@ -37,6 +37,7 @@ import org.apache.log4j.Logger; import org.picketlink.identity.federation.core.config.STSType; import org.picketlink.identity.federation.core.exceptions.ConfigurationException; +import org.picketlink.identity.federation.core.parsers.sts.STSConfigParser; import org.picketlink.identity.federation.core.parsers.wst.WSTrustParser; import org.picketlink.identity.federation.core.saml.v2.util.DocumentUtil; import org.picketlink.identity.federation.core.wstrust.wrappers.BaseRequestSecurityToken; @@ -238,7 +239,7 @@ } InputStream stream = configurationFileURL.openStream(); - STSType stsConfig = WSTrustUtil.getSTSConfiguration(stream); + STSType stsConfig = (STSType) new STSConfigParser().parse(stream); STSConfiguration configuration = new PicketLinkSTSConfiguration(stsConfig); if (logger.isInfoEnabled()) logger.info(STS_CONFIG_FILE + " configuration file loaded"); Modified: federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/wstrust/StandardRequestHandler.java =================================================================== --- federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/wstrust/StandardRequestHandler.java 2011-02-01 15:48:43 UTC (rev 695) +++ federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/wstrust/StandardRequestHandler.java 2011-02-01 18:22:40 UTC (rev 696) @@ -273,7 +273,7 @@ } catch (ProcessingException e) { - throw new WSTrustException( "Exception during token issue::", e ); + throw new WSTrustException(e.getMessage(), e); } if (requestContext.getSecurityToken() == null) @@ -398,7 +398,7 @@ } catch (ProcessingException e) { - throw new WSTrustException( "Exception during token renewal:", e ); + throw new WSTrustException(e.getMessage(), e); } // create the WS-Trust response with the renewed token. @@ -513,7 +513,7 @@ } catch (ProcessingException e) { - throw new WSTrustException( "Exception during token validation:", e ); + throw new WSTrustException(e.getMessage(), e); } status = context.getStatus(); } @@ -570,7 +570,7 @@ } catch (ProcessingException e) { - throw new WSTrustException( "Exception during token cancellation:", e ); + throw new WSTrustException(e.getMessage(), e); } // if no exception has been raised, the token has been successfully canceled. Modified: federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/wstrust/WSTrustUtil.java =================================================================== --- federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/wstrust/WSTrustUtil.java 2011-02-01 15:48:43 UTC (rev 695) +++ federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/wstrust/WSTrustUtil.java 2011-02-01 18:22:40 UTC (rev 696) @@ -21,7 +21,6 @@ */ package org.picketlink.identity.federation.core.wstrust; -import java.io.InputStream; import java.io.OutputStream; import java.net.URI; import java.security.InvalidKeyException; @@ -282,21 +281,6 @@ /** * - * Given a stream of xml configuration (such as picketlink-sts.xml), return the {@code STSType} - * - * @param stream - * @return {@code STSType} - * @throws JAXBException - */ - public static STSType getSTSConfiguration(InputStream stream) throws JAXBException - { - String pkgName = "org.picketlink.identity.federation.core.config"; - JAXBElement<STSType> element = (JAXBElement<STSType>) JAXBUtil.getUnmarshaller(pkgName).unmarshal(stream); - return element.getValue(); - } - - /** - * * Marshall the {@code STSType} to an outputstream * * @param stsConfiguration Added: federation/trunk/picketlink-fed-core/src/test/java/org/picketlink/test/identity/federation/core/config/STSConfigParserUnitTestCase.java =================================================================== --- federation/trunk/picketlink-fed-core/src/test/java/org/picketlink/test/identity/federation/core/config/STSConfigParserUnitTestCase.java (rev 0) +++ federation/trunk/picketlink-fed-core/src/test/java/org/picketlink/test/identity/federation/core/config/STSConfigParserUnitTestCase.java 2011-02-01 18:22:40 UTC (rev 696) @@ -0,0 +1,152 @@ +/* + * JBoss, Home of Professional Open Source. Copyright 2009, Red Hat Middleware LLC, and individual contributors as + * indicated by the @author tags. See the copyright.txt file 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.picketlink.test.identity.federation.core.config; + +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertNull; + +import java.io.InputStream; +import java.util.List; + +import org.junit.Test; +import org.picketlink.identity.federation.core.config.AuthPropertyType; +import org.picketlink.identity.federation.core.config.ClaimsProcessorType; +import org.picketlink.identity.federation.core.config.KeyProviderType; +import org.picketlink.identity.federation.core.config.KeyValueType; +import org.picketlink.identity.federation.core.config.STSType; +import org.picketlink.identity.federation.core.config.ServiceProviderType; +import org.picketlink.identity.federation.core.config.TokenProviderType; +import org.picketlink.identity.federation.core.parsers.sts.STSConfigParser; + +/** + * + * This class tests the STS configuration file parser. + * + * + * @author <a href="mailto:sguilhen@redhat.com">Stefan Guilhen</a> + */ +public class STSConfigParserUnitTestCase +{ + + /** + * + * Parses a sample configuration file and verifies if the all data has been extracted as expected. + * + * + * @throws Exception if an error occurs while running the test. + */ + @Test + public void testSTSConfiguration() throws Exception + { + ClassLoader tcl = Thread.currentThread().getContextClassLoader(); + InputStream configStream = tcl.getResourceAsStream("parser/config/picketlink-sts.xml"); + + // parse the test configuration file. + STSConfigParser parser = new STSConfigParser(); + STSType stsType = (STSType) parser.parse(configStream); + + // check if the STS attributes have been correctly set, including the ones with default values. + assertEquals("PicketLinkSTS", stsType.getSTSName()); + assertEquals(7200, stsType.getTokenTimeout()); + assertEquals(true, stsType.isSignToken()); + assertEquals(false, stsType.isEncryptToken()); + assertEquals("http://www.w3.org/2001/10/xml-exc-c14n#WithComments", stsType.getCanonicalizationMethod()); + + // check if the key provider has been set according to the configuration file. + KeyProviderType keyProvider = stsType.getKeyProvider(); + assertNotNull(keyProvider); + assertEquals("org.picketlink.identity.federation.core.impl.KeyStoreKeyManager", keyProvider.getClassName()); + assertNull(keyProvider.getSigningAlias()); + List<AuthPropertyType> authProperties = keyProvider.getAuth(); + assertEquals(4, authProperties.size()); + assertEquals("KeyStoreURL", authProperties.get(0).getKey()); + assertEquals("sts_keystore.jks", authProperties.get(0).getValue()); + assertEquals("KeyStorePass", authProperties.get(1).getKey()); + assertEquals("testpass", authProperties.get(1).getValue()); + assertEquals("SigningKeyAlias", authProperties.get(2).getKey()); + assertEquals("sts", authProperties.get(2).getValue()); + assertEquals("SigningKeyPass", authProperties.get(3).getKey()); + assertEquals("keypass", authProperties.get(3).getValue()); + List<KeyValueType> validatingAliases = keyProvider.getValidatingAlias(); + assertEquals(2, validatingAliases.size()); + assertEquals("http://services.testcorp.org/provider1", validatingAliases.get(0).getKey()); + assertEquals("service1", validatingAliases.get(0).getValue()); + assertEquals("http://services.testcorp.org/provider2", validatingAliases.get(1).getKey()); + assertEquals("service2", validatingAliases.get(1).getValue()); + + // check if the request handler has been set according to the configuration file. + assertNotNull(stsType.getRequestHandler()); + assertEquals("org.picketlink.identity.federation.core.wstrust.StandardRequestHandler", stsType + .getRequestHandler()); + + // check if the claims processors have been set according to the configuration file. + assertNotNull(stsType.getClaimsProcessors()); + List<ClaimsProcessorType> claimsProcessors = stsType.getClaimsProcessors().getClaimsProcessor(); + assertEquals(2, claimsProcessors.size()); + ClaimsProcessorType claimsProcessor = claimsProcessors.get(0); + assertEquals("org.picketlink.test.Processor1", claimsProcessor.getProcessorClass()); + assertEquals("urn:test-org:test-dialect:1.0", claimsProcessor.getDialect()); + assertEquals(0, claimsProcessor.getProperty().size()); + claimsProcessor = claimsProcessors.get(1); + assertEquals("org.picketlink.test.Processor2", claimsProcessor.getProcessorClass()); + assertEquals("urn:test-org:test-dialect:2.0", claimsProcessor.getDialect()); + assertEquals(1, claimsProcessor.getProperty().size()); + assertEquals("SomeKey", claimsProcessor.getProperty().get(0).getKey()); + assertEquals("SomeValue", claimsProcessor.getProperty().get(0).getValue()); + + // check if the token providers have been set according to the configuration file. + assertNotNull(stsType.getTokenProviders()); + List<TokenProviderType> tokenProviders = stsType.getTokenProviders().getTokenProvider(); + assertEquals(2, tokenProviders.size()); + TokenProviderType tokenProvider = tokenProviders.get(0); + assertEquals("org.picketlink.test.identity.federation.core.wstrust.SpecialTokenProvider", tokenProvider + .getProviderClass()); + assertEquals("http://www.tokens.org/SpecialToken", tokenProvider.getTokenType()); + assertEquals("SpecialToken", tokenProvider.getTokenElement()); + assertEquals("http://www.tokens.org", tokenProvider.getTokenElementNS()); + assertEquals(2, tokenProvider.getProperty().size()); + assertEquals("Property1", tokenProvider.getProperty().get(0).getKey()); + assertEquals("Value1", tokenProvider.getProperty().get(0).getValue()); + assertEquals("Property2", tokenProvider.getProperty().get(1).getKey()); + assertEquals("Value2", tokenProvider.getProperty().get(1).getValue()); + tokenProvider = tokenProviders.get(1); + assertEquals("org.picketlink.identity.federation.core.wstrust.plugins.saml.SAML20TokenProvider", tokenProvider + .getProviderClass()); + assertEquals("http://docs.oasis-open.org/wss/oasis-wss-saml-token-profile-1.1#SAMLV2.0", tokenProvider + .getTokenType()); + assertEquals("Assertion", tokenProvider.getTokenElement()); + assertEquals("urn:oasis:names:tc:SAML:2.0:assertion", tokenProvider.getTokenElementNS()); + assertEquals(0, tokenProvider.getProperty().size()); + + // finally check if the service providers have been set according to the configuration file. + assertNotNull(stsType.getServiceProviders()); + List<ServiceProviderType> serviceProviders = stsType.getServiceProviders().getServiceProvider(); + assertEquals(2, serviceProviders.size()); + ServiceProviderType serviceProvider = serviceProviders.get(0); + assertEquals("http://services.testcorp.org/provider1", serviceProvider.getEndpoint()); + assertEquals("http://docs.oasis-open.org/wss/oasis-wss-saml-token-profile-1.1#SAMLV2.0", serviceProvider + .getTokenType()); + assertEquals("service1", serviceProvider.getTruststoreAlias()); + serviceProvider = serviceProviders.get(1); + assertEquals("http://services.testcorp.org/provider2", serviceProvider.getEndpoint()); + assertEquals("http://www.tokens.org/SpecialToken", serviceProvider + .getTokenType()); + assertEquals("service2", serviceProvider.getTruststoreAlias()); + } +} Modified: federation/trunk/picketlink-fed-core/src/test/java/org/picketlink/test/identity/federation/core/wstrust/PicketLinkSTSUnitTestCase.java =================================================================== --- federation/trunk/picketlink-fed-core/src/test/java/org/picketlink/test/identity/federation/core/wstrust/PicketLinkSTSUnitTestCase.java 2011-02-01 15:48:43 UTC (rev 695) +++ federation/trunk/picketlink-fed-core/src/test/java/org/picketlink/test/identity/federation/core/wstrust/PicketLinkSTSUnitTestCase.java 2011-02-01 18:22:40 UTC (rev 696) @@ -48,6 +48,7 @@ import org.picketlink.identity.federation.core.exceptions.ConfigurationException; import org.picketlink.identity.federation.core.exceptions.ParsingException; import org.picketlink.identity.federation.core.interfaces.SecurityTokenProvider; +import org.picketlink.identity.federation.core.parsers.sts.STSConfigParser; import org.picketlink.identity.federation.core.parsers.wst.WSTrustParser; import org.picketlink.identity.federation.core.saml.v2.common.IDGenerator; import org.picketlink.identity.federation.core.saml.v2.constants.JBossSAMLConstants; @@ -1384,7 +1385,7 @@ URL configURL = Thread.currentThread().getContextClassLoader().getResource(configFileName); stream = configURL.openStream(); - STSType stsConfig = WSTrustUtil.getSTSConfiguration(stream); + STSType stsConfig = (STSType) new STSConfigParser().parse(stream); return new PicketLinkSTSConfiguration(stsConfig); } catch (Exception e) Modified: federation/trunk/picketlink-fed-core/src/test/resources/parser/config/picketlink-sts.xml =================================================================== --- federation/trunk/picketlink-fed-core/src/test/resources/parser/config/picketlink-sts.xml 2011-02-01 15:48:43 UTC (rev 695) +++ federation/trunk/picketlink-fed-core/src/test/resources/parser/config/picketlink-sts.xml 2011-02-01 18:22:40 UTC (rev 696) @@ -6,8 +6,23 @@ <Auth Key="SigningKeyAlias" Value="sts"/> <Auth Key="SigningKeyPass" Value="keypass"/> <ValidatingAlias Key="http://services.testcorp.org/provider1" Value="service1"/> + <ValidatingAlias Key="http://services.testcorp.org/provider2" Value="service2"/> </KeyProvider> + <RequestHandler>org.picketlink.identity.federation.core.wstrust.StandardRequestHandler</RequestHandler> + <ClaimsProcessors> + <ClaimsProcessor ProcessorClass="org.picketlink.test.Processor1" Dialect="urn:test-org:test-dialect:1.0"/> + <ClaimsProcessor ProcessorClass="org.picketlink.test.Processor2" Dialect="urn:test-org:test-dialect:2.0"> + <Property Key="SomeKey" Value="SomeValue"/> + </ClaimsProcessor> + </ClaimsProcessors> <TokenProviders> + <TokenProvider ProviderClass="org.picketlink.test.identity.federation.core.wstrust.SpecialTokenProvider" + TokenType="http://www.tokens.org/SpecialToken" + TokenElement="SpecialToken" + TokenElementNS="http://www.tokens.org"> + <Property Key="Property1" Value="Value1"/> + <Property Key="Property2" Value="Value2"/> + </TokenProvider> <TokenProvider ProviderClass="org.picketlink.identity.federation.core.wstrust.plugins.saml.SAML20TokenProvider" TokenType="http://docs.oasis-open.org/wss/oasis-wss-saml-token-profile-1.1#SAMLV2.0" TokenElement="Assertion" @@ -16,5 +31,7 @@ <ServiceProviders> <ServiceProvider Endpoint="http://services.testcorp.org/provider1" TokenType="http://docs.oasis-open.org/wss/oasis-wss-saml-token-profile-1.1#SAMLV2.0" TruststoreAlias="service1"/> + <ServiceProvider Endpoint="http://services.testcorp.org/provider2" TokenType="http://www.tokens.org/SpecialToken" + TruststoreAlias="service2"/> </ServiceProviders> </PicketLinkSTS>

13 years, 2 months

1
0
0 / 0

Picketlink SVN: r695 - in federation/trunk/picketlink-fed-api/src: test/java/org/picketlink/test/identity/federation/api/saml/v2 and 1 other directory.

by picketlink-commits＠lists.jboss.org

Author: anil.saldhana(a)jboss.com Date: 2011-02-01 10:48:43 -0500 (Tue, 01 Feb 2011) New Revision: 695 Modified: federation/trunk/picketlink-fed-api/src/main/java/org/picketlink/identity/federation/api/saml/v2/request/SAML2Request.java federation/trunk/picketlink-fed-api/src/test/java/org/picketlink/test/identity/federation/api/saml/v2/SAML2AuthnRequestUnitTestCase.java Log: PLFED-133: authnrequest should have a nameidpolicy Modified: federation/trunk/picketlink-fed-api/src/main/java/org/picketlink/identity/federation/api/saml/v2/request/SAML2Request.java =================================================================== --- federation/trunk/picketlink-fed-api/src/main/java/org/picketlink/identity/federation/api/saml/v2/request/SAML2Request.java 2011-02-01 01:16:19 UTC (rev 694) +++ federation/trunk/picketlink-fed-api/src/main/java/org/picketlink/identity/federation/api/saml/v2/request/SAML2Request.java 2011-02-01 15:48:43 UTC (rev 695) @@ -43,6 +43,7 @@ import org.picketlink.identity.federation.core.saml.v2.common.IDGenerator; import org.picketlink.identity.federation.core.saml.v2.common.SAMLDocumentHolder; import org.picketlink.identity.federation.core.saml.v2.constants.JBossSAMLConstants; +import org.picketlink.identity.federation.core.saml.v2.constants.JBossSAMLURIConstants; import org.picketlink.identity.federation.core.saml.v2.util.DocumentUtil; import org.picketlink.identity.federation.core.saml.v2.util.XMLTimeUtil; import org.picketlink.identity.federation.core.saml.v2.writers.SAMLRequestWriter; @@ -53,6 +54,7 @@ import org.picketlink.identity.federation.newmodel.saml.v2.profiles.xacml.protocol.XACMLAuthzDecisionQueryType; import org.picketlink.identity.federation.newmodel.saml.v2.protocol.AuthnRequestType; import org.picketlink.identity.federation.newmodel.saml.v2.protocol.LogoutRequestType; +import org.picketlink.identity.federation.newmodel.saml.v2.protocol.NameIDPolicyType; import org.picketlink.identity.federation.newmodel.saml.v2.protocol.RequestAbstractType; import org.picketlink.identity.federation.newmodel.saml.v2.protocol.ResponseType; import org.picketlink.identity.federation.saml.v2.SAML2Object; @@ -99,6 +101,13 @@ authnRequest.setIssuer(issuer); + //Create a default NameIDPolicy + NameIDPolicyType nameIDPolicy = new NameIDPolicyType(); + nameIDPolicy.setAllowCreate( Boolean.TRUE ); + nameIDPolicy.setFormat( URI.create( JBossSAMLURIConstants.NAMEID_FORMAT_TRANSIENT.get() )); + + authnRequest.setNameIDPolicy( nameIDPolicy ); + return authnRequest; } Modified: federation/trunk/picketlink-fed-api/src/test/java/org/picketlink/test/identity/federation/api/saml/v2/SAML2AuthnRequestUnitTestCase.java =================================================================== --- federation/trunk/picketlink-fed-api/src/test/java/org/picketlink/test/identity/federation/api/saml/v2/SAML2AuthnRequestUnitTestCase.java 2011-02-01 01:16:19 UTC (rev 694) +++ federation/trunk/picketlink-fed-api/src/test/java/org/picketlink/test/identity/federation/api/saml/v2/SAML2AuthnRequestUnitTestCase.java 2011-02-01 15:48:43 UTC (rev 695) @@ -21,12 +21,15 @@ */ package org.picketlink.test.identity.federation.api.saml.v2; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; +import static org.junit.Assert.assertTrue; + import java.io.ByteArrayOutputStream; import java.net.URI; import java.util.List; -import junit.framework.TestCase; - +import org.junit.Test; import org.picketlink.identity.federation.api.saml.v2.request.SAML2Request; import org.picketlink.identity.federation.core.saml.v2.common.IDGenerator; import org.picketlink.identity.federation.newmodel.saml.v2.assertion.AudienceRestrictionType; @@ -36,6 +39,7 @@ import org.picketlink.identity.federation.newmodel.saml.v2.assertion.SubjectType; import org.picketlink.identity.federation.newmodel.saml.v2.assertion.SubjectType.STSubType; import org.picketlink.identity.federation.newmodel.saml.v2.protocol.AuthnRequestType; +import org.picketlink.identity.federation.newmodel.saml.v2.protocol.NameIDPolicyType; import org.picketlink.identity.federation.newmodel.saml.v2.protocol.RequestedAuthnContextType; import org.w3c.dom.Element; @@ -46,12 +50,13 @@ * @author Anil.Saldhana(a)redhat.com * @since Dec 8, 2008 */ -public class SAML2AuthnRequestUnitTestCase extends TestCase +public class SAML2AuthnRequestUnitTestCase { /** * Test reading a saml2 authn request * @throws Exception */ + @Test public void testAuthnRequestExample() throws Exception { String resourceName = "saml/v2/authnrequest/samlAuthnRequestExample.xml"; @@ -99,6 +104,7 @@ * contains a digital signature * @throws Exception */ + @Test public void testAuthnRequestWithSignature() throws Exception { String resourceName = "saml/v2/authnrequest/samlAuthnRequestWithSignature.xml"; @@ -120,13 +126,19 @@ * Test the creation of AuthnRequestType * @throws Exception */ + @Test public void testAuthnRequestCreation() throws Exception { String id = IDGenerator.create("ID_"); SAML2Request request = new SAML2Request(); AuthnRequestType authnRequest = request.createAuthnRequestType( - id, "http://sp", "http://idp", "http://sp"); + id, "http://sp", "http://idp", "http://sp"); + + //Verify whether NameIDPolicy exists + NameIDPolicyType nameIDPolicy = authnRequest.getNameIDPolicy(); + assertNotNull( "NameIDPolicy is not null", nameIDPolicy ); + assertTrue( nameIDPolicy.isAllowCreate() ); ByteArrayOutputStream baos = new ByteArrayOutputStream(); request.marshall(authnRequest, baos);

13 years, 2 months

1
0
0 / 0

Picketlink SVN: r694 - picketlink-seam/trunk/picketlink-seam.

by picketlink-commits＠lists.jboss.org

Author: anil.saldhana(a)jboss.com Date: 2011-01-31 20:16:19 -0500 (Mon, 31 Jan 2011) New Revision: 694 Modified: picketlink-seam/trunk/picketlink-seam/pom.xml Log: upgrade to Seam 2.2.1.Final Modified: picketlink-seam/trunk/picketlink-seam/pom.xml =================================================================== --- picketlink-seam/trunk/picketlink-seam/pom.xml 2011-02-01 01:01:19 UTC (rev 693) +++ picketlink-seam/trunk/picketlink-seam/pom.xml 2011-02-01 01:16:19 UTC (rev 694) @@ -110,7 +110,7 @@ <dependency> <groupId>org.jboss.seam</groupId> <artifactId>jboss-seam</artifactId> - <version>2.1.2.GA</version> + <version>2.2.1.Final</version> <type>ejb</type> <scope>provided</scope> </dependency>

13 years, 2 months

1
0
0 / 0

Picketlink SVN: r693 - federation/trunk/picketlink-fed-core/src/test/java/org/picketlink/test/identity/federation/core/saml/v2/metadata.

by picketlink-commits＠lists.jboss.org

Author: anil.saldhana(a)jboss.com Date: 2011-01-31 20:01:19 -0500 (Mon, 31 Jan 2011) New Revision: 693 Modified: federation/trunk/picketlink-fed-core/src/test/java/org/picketlink/test/identity/federation/core/saml/v2/metadata/SAMLMetadataParsingUnitTestCase.java Log: add check on cert issuer dn Modified: federation/trunk/picketlink-fed-core/src/test/java/org/picketlink/test/identity/federation/core/saml/v2/metadata/SAMLMetadataParsingUnitTestCase.java =================================================================== --- federation/trunk/picketlink-fed-core/src/test/java/org/picketlink/test/identity/federation/core/saml/v2/metadata/SAMLMetadataParsingUnitTestCase.java 2011-01-31 23:11:17 UTC (rev 692) +++ federation/trunk/picketlink-fed-core/src/test/java/org/picketlink/test/identity/federation/core/saml/v2/metadata/SAMLMetadataParsingUnitTestCase.java 2011-02-01 01:01:19 UTC (rev 693) @@ -60,5 +60,6 @@ KeyDescriptorType keyDescriptor = idp.getKeyDescriptor().get(0); X509Certificate cert = SAMLMetadataUtil.getCertificate(keyDescriptor); Assert.assertNotNull(cert); + Assert.assertEquals( "CN=test, OU=OpenSSO, O=Sun, L=Santa Clara, ST=California, C=US", cert.getIssuerDN().getName() ); } } \ No newline at end of file

13 years, 2 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

picketlink-commits February 2011