[picketlink-commits] Picketlink SVN: r568 - in federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2: assertion and 5 other directories.

Author: anil.saldhana(a)jboss.com Date: 2010-11-30 11:03:56 -0500 (Tue, 30 Nov 2010) New Revision: 568 Added: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/profiles/ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/profiles/xacml/ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/profiles/xacml/assertion/ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/profiles/xacml/assertion/XACMLAuthzDecisionStatementType.java federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/profiles/xacml/assertion/XACMLPolicyStatementType.java federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/profiles/xacml/protocol/ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/profiles/xacml/protocol/XACMLAuthzDecisionQueryType.java federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/profiles/xacml/protocol/XACMLPolicyQueryType.java Modified: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/assertion/AssertionType.java federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/assertion/AttributeStatementType.java federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/assertion/AuthzDecisionStatementType.java federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/assertion/NameIDType.java federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/assertion/SubjectType.java federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/protocol/ResponseType.java Log: updated saml object model Modified: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/assertion/AssertionType.java =================================================================== --- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/assertion/AssertionType.java 2010-11-30 00:32:39 UTC (rev 567) +++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/assertion/AssertionType.java 2010-11-30 16:03:56 UTC (rev 568) @@ -65,6 +65,8 @@ private AdviceType advice; private NameIDType issuer; + + private SubjectType subject; private ConditionsType conditions; @@ -82,6 +84,16 @@ return ID; } + public SubjectType getSubject() + { + return subject; + } + + public void setSubject(SubjectType subject) + { + this.subject = subject; + } + public XMLGregorianCalendar getIssueInstant() { return issueInstant; Modified: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/assertion/AttributeStatementType.java =================================================================== --- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/assertion/AttributeStatementType.java 2010-11-30 00:32:39 UTC (rev 567) +++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/assertion/AttributeStatementType.java 2010-11-30 16:03:56 UTC (rev 568) @@ -51,9 +51,9 @@ public class AttributeStatementType extends StatementAbstractType { - protected List<ChoiceType> attributes = new ArrayList<ChoiceType>(); + protected List<ASTChoiceType> attributes = new ArrayList<ASTChoiceType>(); - public void addAttribute( ChoiceType attribute ) + public void addAttribute( ASTChoiceType attribute ) { attributes.add( attribute ); } @@ -61,22 +61,22 @@ /** * Gets the attributes. */ - public List<ChoiceType> getAttributes() + public List<ASTChoiceType> getAttributes() { return Collections.unmodifiableList( this.attributes ); } - public static class ChoiceType + public static class ASTChoiceType { private AttributeType attribute; private EncryptedElementType encryptedAssertion; - public ChoiceType(AttributeType attribute) + public ASTChoiceType(AttributeType attribute) { super(); this.attribute = attribute; } - public ChoiceType(EncryptedElementType encryptedAssertion) + public ASTChoiceType(EncryptedElementType encryptedAssertion) { super(); this.encryptedAssertion = encryptedAssertion; Modified: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/assertion/AuthzDecisionStatementType.java =================================================================== --- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/assertion/AuthzDecisionStatementType.java 2010-11-30 00:32:39 UTC (rev 567) +++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/assertion/AuthzDecisionStatementType.java 2010-11-30 16:03:56 UTC (rev 568) @@ -22,6 +22,7 @@ package org.picketlink.identity.federation.newmodel.saml.v2.assertion; import java.util.ArrayList; +import java.util.Collections; import java.util.List; @@ -51,39 +52,23 @@ extends StatementAbstractType { - protected List<ActionType> action; + protected List<ActionType> action = new ArrayList<ActionType>(); protected EvidenceType evidence; protected String resource; protected DecisionType decision; /** - * Gets the value of the action property. - * - * <p> - * This accessor method returns a reference to the live list, - * not a snapshot. Therefore any modification you make to the - * returned list will be present inside the JAXB object. - * This is why there is not a <CODE>set</CODE> method for the action property. - * - * <p> - * For example, to add a new item, do as follows: - * <pre> - * getAction().add(newItem); - * </pre> - * - * - * <p> - * Objects of the following type(s) are allowed in the list - * {@link ActionType } - * - * + * Gets the value of the action property. */ - public List<ActionType> getAction() { - if (action == null) { - action = new ArrayList<ActionType>(); - } - return this.action; + public List<ActionType> getAction() + { + return Collections.unmodifiableList( this.action ); } + + public void addAction( ActionType actionType ) + { + action.add(actionType); + } /** * Gets the value of the evidence property. Modified: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/assertion/NameIDType.java =================================================================== --- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/assertion/NameIDType.java 2010-11-30 00:32:39 UTC (rev 567) +++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/assertion/NameIDType.java 2010-11-30 16:03:56 UTC (rev 568) @@ -47,10 +47,19 @@ </attributeGroup> */ + private String value; + private URI format; + private String sPProvidedID; - private URI format; - private String sPProvidedID; - + public String getValue() + { + return value; + } + public void setValue(String value) + { + this.value = value; + } + public String getsPProvidedID() { return sPProvidedID; Modified: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/assertion/SubjectType.java =================================================================== --- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/assertion/SubjectType.java 2010-11-30 00:32:39 UTC (rev 567) +++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/assertion/SubjectType.java 2010-11-30 16:03:56 UTC (rev 568) @@ -58,14 +58,14 @@ { protected List<SubjectConfirmationType> subjectConfirmation = new ArrayList<SubjectConfirmationType>(); - protected SubType subType; + protected STSubType subType; - public SubType getSubType() + public STSubType getSubType() { return subType; } - public void setSubType(SubType subType) + public void setSubType(STSubType subType) { this.subType = subType; } @@ -85,9 +85,11 @@ subjectConfirmation.add( con ); } - public static class SubType + public static class STSubType { private BaseIDAbstractType baseID; + + private EncryptedElementType encryptedID; protected List<SubjectConfirmationType> subjectConfirmation = new ArrayList<SubjectConfirmationType>(); @@ -99,8 +101,18 @@ public BaseIDAbstractType getBaseID() { return baseID; + } + + public EncryptedElementType getEncryptedID() + { + return encryptedID; } + public void setEncryptedID(EncryptedElementType encryptedID) + { + this.encryptedID = encryptedID; + } + public void addConfirmation( SubjectConfirmationType con ) { subjectConfirmation.add( con ); Added: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/profiles/xacml/assertion/XACMLAuthzDecisionStatementType.java =================================================================== --- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/profiles/xacml/assertion/XACMLAuthzDecisionStatementType.java (rev 0) +++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/profiles/xacml/assertion/XACMLAuthzDecisionStatementType.java 2010-11-30 16:03:56 UTC (rev 568) @@ -0,0 +1,102 @@ +/* + * 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.newmodel.saml.v2.profiles.xacml.assertion; + +import org.jboss.security.xacml.core.model.context.RequestType; +import org.jboss.security.xacml.core.model.context.ResponseType; +import org.picketlink.identity.federation.newmodel.saml.v2.assertion.StatementAbstractType; + + +/** + * <p>Java class for XACMLAuthzDecisionStatementType complex type. + * + * <p>The following schema fragment specifies the expected content contained within this class. + * + * <pre> + * &lt;complexType name="XACMLAuthzDecisionStatementType"> + * &lt;complexContent> + * &lt;extension base="{urn:oasis:names:tc:SAML:2.0:assertion}StatementAbstractType"> + * &lt;sequence> + * &lt;element ref="{urn:oasis:names:tc:xacml:2.0:context:schema:os}Response"/> + * &lt;element ref="{urn:oasis:names:tc:xacml:2.0:context:schema:os}Request" minOccurs="0"/> + * &lt;/sequence> + * &lt;/extension> + * &lt;/complexContent> + * &lt;/complexType> + * </pre> + * + * + */ +public class XACMLAuthzDecisionStatementType + extends StatementAbstractType +{ + protected ResponseType response; + protected RequestType request; + + /** + * Gets the value of the response property. + * + * @return + * possible object is + * {@link ResponseType } + * + */ + public ResponseType getResponse() { + return response; + } + + /** + * Sets the value of the response property. + * + * @param value + * allowed object is + * {@link ResponseType } + * + */ + public void setResponse(ResponseType value) { + this.response = value; + } + + /** + * Gets the value of the request property. + * + * @return + * possible object is + * {@link RequestType } + * + */ + public RequestType getRequest() { + return request; + } + + /** + * Sets the value of the request property. + * + * @param value + * allowed object is + * {@link RequestType } + * + */ + public void setRequest(RequestType value) { + this.request = value; + } +} \ No newline at end of file Added: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/profiles/xacml/assertion/XACMLPolicyStatementType.java =================================================================== --- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/profiles/xacml/assertion/XACMLPolicyStatementType.java (rev 0) +++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/profiles/xacml/assertion/XACMLPolicyStatementType.java 2010-11-30 16:03:56 UTC (rev 568) @@ -0,0 +1,91 @@ +/* + * 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.newmodel.saml.v2.profiles.xacml.assertion; + +import java.util.ArrayList; +import java.util.List; + +import org.jboss.security.xacml.core.model.policy.PolicySetType; +import org.jboss.security.xacml.core.model.policy.PolicyType; +import org.picketlink.identity.federation.newmodel.saml.v2.assertion.StatementAbstractType; + +/** + * <p>Java class for XACMLPolicyStatementType complex type. + * + * <p>The following schema fragment specifies the expected content contained within this class. + * + * <pre> + * &lt;complexType name="XACMLPolicyStatementType"> + * &lt;complexContent> + * &lt;extension base="{urn:oasis:names:tc:SAML:2.0:assertion}StatementAbstractType"> + * &lt;choice maxOccurs="unbounded" minOccurs="0"> + * &lt;element ref="{urn:oasis:names:tc:xacml:2.0:policy:schema:os}Policy"/> + * &lt;element ref="{urn:oasis:names:tc:xacml:2.0:policy:schema:os}PolicySet"/> + * &lt;/choice> + * &lt;/extension> + * &lt;/complexContent> + * &lt;/complexType> + * </pre> + * + * + */ +public class XACMLPolicyStatementType + extends StatementAbstractType +{ + public static class ChoiceType + { + private PolicyType policy; + private PolicySetType policySet; + public PolicyType getPolicy() + { + return policy; + } + public void setPolicy(PolicyType policy) + { + this.policy = policy; + } + public PolicySetType getPolicySet() + { + return policySet; + } + public void setPolicySet(PolicySetType policySet) + { + this.policySet = policySet; + } + } + + protected List<ChoiceType> choiceTypeList = new ArrayList<ChoiceType>(); + + public void add(ChoiceType choice ) + { + choiceTypeList.add(choice); + } + + /** + * Gets the value of the choiceTypeList property. + */ + public List<ChoiceType> getChoiceType() + { + return choiceTypeList; + } + +} \ No newline at end of file Added: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/profiles/xacml/protocol/XACMLAuthzDecisionQueryType.java =================================================================== --- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/profiles/xacml/protocol/XACMLAuthzDecisionQueryType.java (rev 0) +++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/profiles/xacml/protocol/XACMLAuthzDecisionQueryType.java 2010-11-30 16:03:56 UTC (rev 568) @@ -0,0 +1,136 @@ +/* + * 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.newmodel.saml.v2.profiles.xacml.protocol; + +import org.jboss.security.xacml.core.model.context.RequestType; +import org.picketlink.identity.federation.newmodel.saml.v2.protocol.RequestAbstractType; + + +/** + * <p>Java class for XACMLAuthzDecisionQueryType complex type. + * + * <p>The following schema fragment specifies the expected content contained within this class. + * + * <pre> + * &lt;complexType name="XACMLAuthzDecisionQueryType"> + * &lt;complexContent> + * &lt;extension base="{urn:oasis:names:tc:SAML:2.0:protocol}RequestAbstractType"> + * &lt;sequence> + * &lt;element ref="{urn:oasis:names:tc:xacml:2.0:context:schema:os}Request"/> + * &lt;/sequence> + * &lt;attribute name="InputContextOnly" type="{http://www.w3.org/2001/XMLSchema}boolean" default="false" /> + * &lt;attribute name="ReturnContext" type="{http://www.w3.org/2001/XMLSchema}boolean" default="false" /> + * &lt;/extension> + * &lt;/complexContent> + * &lt;/complexType> + * </pre> + * + * + */ +public class XACMLAuthzDecisionQueryType + extends RequestAbstractType +{ + protected RequestType request; + protected Boolean inputContextOnly; + protected Boolean returnContext; + + /** + * Gets the value of the request property. + * + * @return + * possible object is + * {@link RequestType } + * + */ + public RequestType getRequest() { + return request; + } + + /** + * Sets the value of the request property. + * + * @param value + * allowed object is + * {@link RequestType } + * + */ + public void setRequest(RequestType value) { + this.request = value; + } + + /** + * Gets the value of the inputContextOnly property. + * + * @return + * possible object is + * {@link Boolean } + * + */ + public boolean isInputContextOnly() { + if (inputContextOnly == null) { + return false; + } else { + return inputContextOnly; + } + } + + /** + * Sets the value of the inputContextOnly property. + * + * @param value + * allowed object is + * {@link Boolean } + * + */ + public void setInputContextOnly(Boolean value) { + this.inputContextOnly = value; + } + + /** + * Gets the value of the returnContext property. + * + * @return + * possible object is + * {@link Boolean } + * + */ + public boolean isReturnContext() { + if (returnContext == null) { + return false; + } else { + return returnContext; + } + } + + /** + * Sets the value of the returnContext property. + * + * @param value + * allowed object is + * {@link Boolean } + * + */ + public void setReturnContext(Boolean value) { + this.returnContext = value; + } + +} \ No newline at end of file Added: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/profiles/xacml/protocol/XACMLPolicyQueryType.java =================================================================== --- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/profiles/xacml/protocol/XACMLPolicyQueryType.java (rev 0) +++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/profiles/xacml/protocol/XACMLPolicyQueryType.java 2010-11-30 16:03:56 UTC (rev 568) @@ -0,0 +1,108 @@ +/* + * 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.newmodel.saml.v2.profiles.xacml.protocol; + +import org.jboss.security.xacml.core.model.context.RequestType; +import org.jboss.security.xacml.core.model.policy.IdReferenceType; +import org.jboss.security.xacml.core.model.policy.TargetType; +import org.picketlink.identity.federation.newmodel.saml.v2.protocol.RequestAbstractType; + + +/** + * <p>Java class for XACMLPolicyQueryType complex type. + * + * <p>The following schema fragment specifies the expected content contained within this class. + * + * <pre> + * &lt;complexType name="XACMLPolicyQueryType"> + * &lt;complexContent> + * &lt;extension base="{urn:oasis:names:tc:SAML:2.0:protocol}RequestAbstractType"> + * &lt;choice maxOccurs="unbounded" minOccurs="0"> + * &lt;element ref="{urn:oasis:names:tc:xacml:2.0:context:schema:os}Request"/> + * &lt;element ref="{urn:oasis:names:tc:xacml:2.0:policy:schema:os}Target"/> + * &lt;element ref="{urn:oasis:names:tc:xacml:2.0:policy:schema:os}PolicySetIdReference"/> + * &lt;element ref="{urn:oasis:names:tc:xacml:2.0:policy:schema:os}PolicyIdReference"/> + * &lt;/choice> + * &lt;/extension> + * &lt;/complexContent> + * &lt;/complexType> + * </pre> + * + * + */ +public class XACMLPolicyQueryType + extends RequestAbstractType +{ + public static class ChoiceType + { + private RequestType request; + private TargetType target; + private IdReferenceType policySetIDReference; + private IdReferenceType policyIdReference; + public RequestType getRequest() + { + return request; + } + public void setRequest(RequestType request) + { + this.request = request; + } + public TargetType getTarget() + { + return target; + } + public void setTarget(TargetType target) + { + this.target = target; + } + public IdReferenceType getPolicySetIDReference() + { + return policySetIDReference; + } + public void setPolicySetIDReference(IdReferenceType policySetIDReference) + { + this.policySetIDReference = policySetIDReference; + } + public IdReferenceType getPolicyIdReference() + { + return policyIdReference; + } + public void setPolicyIdReference(IdReferenceType policyIdReference) + { + this.policyIdReference = policyIdReference; + } + } + + protected ChoiceType choiceType; + + + + public ChoiceType getChoiceType() + { + return choiceType; + } + + public void setChoiceType(ChoiceType choiceType) + { + this.choiceType = choiceType; + } +} \ No newline at end of file Modified: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/protocol/ResponseType.java =================================================================== --- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/protocol/ResponseType.java 2010-11-30 00:32:39 UTC (rev 567) +++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/protocol/ResponseType.java 2010-11-30 16:03:56 UTC (rev 568) @@ -25,8 +25,8 @@ import java.util.Collections; import java.util.List; -import org.picketlink.identity.federation.newmodel.saml.v2.assertion.EncryptedAssertionType; -import org.picketlink.identity.federation.saml.v2.assertion.AssertionType; +import org.picketlink.identity.federation.newmodel.saml.v2.assertion.AssertionType; +import org.picketlink.identity.federation.newmodel.saml.v2.assertion.EncryptedAssertionType; /** * <p>Java class for ResponseType complex type. @@ -51,9 +51,9 @@ public class ResponseType extends StatusResponseType { - protected List<ChoiceType> assertions = new ArrayList<ResponseType.ChoiceType>(); + protected List<RTChoiceType> assertions = new ArrayList<ResponseType.RTChoiceType>(); - public void addAssertion( ChoiceType choice ) + public void addAssertion( RTChoiceType choice ) { assertions.add(choice); } @@ -61,20 +61,20 @@ /** * Gets a read only list of assertions */ - public List<ChoiceType> getAssertions() + public List<RTChoiceType> getAssertions() { return Collections.unmodifiableList( assertions ); } - public static class ChoiceType + public static class RTChoiceType { private AssertionType assertion; private EncryptedAssertionType encryptedAssertion; - public ChoiceType(AssertionType assertion) + public RTChoiceType(AssertionType assertion) { this.assertion = assertion; } - public ChoiceType(EncryptedAssertionType encryptedAssertion) + public RTChoiceType(EncryptedAssertionType encryptedAssertion) { this.encryptedAssertion = encryptedAssertion; }