Author: anil.saldhana(a)jboss.com Date: 2010-12-16 18:03:30 -0500 (Thu, 16 Dec 2010) New Revision: 607 Modified: 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 federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/protocol/ArtifactResolveType.java federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/protocol/AssertionIDRequestType.java federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/protocol/AttributeQueryType.java federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/protocol/AuthnQueryType.java federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/protocol/AuthnRequestType.java federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/protocol/AuthzDecisionQueryType.java federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/protocol/LogoutRequestType.java federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/protocol/ManageNameIDRequestType.java federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/protocol/NameIDMappingRequestType.java federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/protocol/RequestAbstractType.java federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/protocol/SubjectQueryAbstractType.java Log: adapt to RequestAbstractType ctr change Modified: 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 2010-12-16 23:00:13 UTC (rev 606) +++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/profiles/xacml/protocol/XACMLAuthzDecisionQueryType.java 2010-12-16 23:03:30 UTC (rev 607) @@ -20,7 +20,9 @@ * 02110-1301 USA, or see the FSF site: http://www.fsf.org. */ package org.picketlink.identity.federation.newmodel.saml.v2.profiles.xacml.protocol; - + +import javax.xml.datatype.XMLGregorianCalendar; + import org.jboss.security.xacml.core.model.context.RequestType; import org.picketlink.identity.federation.newmodel.saml.v2.protocol.RequestAbstractType; @@ -47,90 +49,96 @@ * */ public class XACMLAuthzDecisionQueryType - extends RequestAbstractType +extends RequestAbstractType { - protected RequestType request; - protected Boolean inputContextOnly; - protected Boolean returnContext; + 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; - } + public XACMLAuthzDecisionQueryType(String id, String version, XMLGregorianCalendar instant) + { + super(id, version, instant); + } - /** - * Gets the value of the inputContextOnly property. - * - * @return - * possible object is - * {@link Boolean } - * - */ - public boolean isInputContextOnly() { - if (inputContextOnly == null) { - return false; - } else { - return inputContextOnly; - } - } + /** + * Gets the value of the request property. + * + * @return + * possible object is + * {@link RequestType } + * + */ + public RequestType getRequest() { + return request; + } - /** - * Sets the value of the inputContextOnly property. - * - * @param value - * allowed object is - * {@link Boolean } - * - */ - public void setInputContextOnly(Boolean value) { - this.inputContextOnly = value; - } + /** + * 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 returnContext property. - * - * @return - * possible object is - * {@link Boolean } - * - */ - public boolean isReturnContext() { - if (returnContext == null) { - return false; - } else { - return returnContext; - } - } + /** + * 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 returnContext property. - * - * @param value - * allowed object is - * {@link Boolean } - * - */ - public void setReturnContext(Boolean value) { - this.returnContext = value; - } + /** + * 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 Modified: 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 2010-12-16 23:00:13 UTC (rev 606) +++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/profiles/xacml/protocol/XACMLPolicyQueryType.java 2010-12-16 23:03:30 UTC (rev 607) @@ -21,6 +21,8 @@ */ package org.picketlink.identity.federation.newmodel.saml.v2.profiles.xacml.protocol; +import javax.xml.datatype.XMLGregorianCalendar; + 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; @@ -50,7 +52,7 @@ * */ public class XACMLPolicyQueryType - extends RequestAbstractType +extends RequestAbstractType { public static class ChoiceType { @@ -91,13 +93,18 @@ this.policyIdReference = policyIdReference; } } - + protected ChoiceType choiceType; - - - public ChoiceType getChoiceType() + + + public XACMLPolicyQueryType(String id, String version, XMLGregorianCalendar instant) { + super(id, version, instant); + } + + public ChoiceType getChoiceType() + { return choiceType; } Modified: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/protocol/ArtifactResolveType.java =================================================================== --- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/protocol/ArtifactResolveType.java 2010-12-16 23:00:13 UTC (rev 606) +++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/protocol/ArtifactResolveType.java 2010-12-16 23:03:30 UTC (rev 607) @@ -21,8 +21,10 @@ */ package org.picketlink.identity.federation.newmodel.saml.v2.protocol; +import javax.xml.datatype.XMLGregorianCalendar; + /** * <p>Java class for ArtifactResolveType complex type. * @@ -45,8 +47,13 @@ public class ArtifactResolveType extends RequestAbstractType { - protected String artifact; + protected String artifact; + public ArtifactResolveType(String id, String version, XMLGregorianCalendar instant) + { + super(id, version, instant); + } + /** * Gets the value of the artifact property. * Modified: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/protocol/AssertionIDRequestType.java =================================================================== --- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/protocol/AssertionIDRequestType.java 2010-12-16 23:00:13 UTC (rev 606) +++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/protocol/AssertionIDRequestType.java 2010-12-16 23:03:30 UTC (rev 607) @@ -25,7 +25,9 @@ import java.util.Collections; import java.util.List; +import javax.xml.datatype.XMLGregorianCalendar; + /** * <p>Java class for AssertionIDRequestType complex type. * @@ -49,6 +51,11 @@ extends RequestAbstractType { protected List<String> assertionIDRef = new ArrayList<String>(); + + public AssertionIDRequestType(String id, String version, XMLGregorianCalendar instant) + { + super(id, version, instant); + } public void addAssertionIDRef( String id ) { Modified: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/protocol/AttributeQueryType.java =================================================================== --- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/protocol/AttributeQueryType.java 2010-12-16 23:00:13 UTC (rev 606) +++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/protocol/AttributeQueryType.java 2010-12-16 23:03:30 UTC (rev 607) @@ -25,6 +25,8 @@ import java.util.Collections; import java.util.List; +import javax.xml.datatype.XMLGregorianCalendar; + import org.picketlink.identity.federation.newmodel.saml.v2.assertion.AttributeType; @@ -52,6 +54,11 @@ extends SubjectQueryAbstractType { protected List<AttributeType> attribute = new ArrayList<AttributeType>(); + + public AttributeQueryType(String id, String version, XMLGregorianCalendar instant) + { + super(id, version, instant); + } public void add( AttributeType att ) { Modified: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/protocol/AuthnQueryType.java =================================================================== --- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/protocol/AuthnQueryType.java 2010-12-16 23:00:13 UTC (rev 606) +++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/protocol/AuthnQueryType.java 2010-12-16 23:03:30 UTC (rev 607) @@ -21,7 +21,9 @@ */ package org.picketlink.identity.federation.newmodel.saml.v2.protocol; +import javax.xml.datatype.XMLGregorianCalendar; + /** * <p>Java class for AuthnQueryType complex type. * @@ -44,11 +46,16 @@ */ public class AuthnQueryType extends SubjectQueryAbstractType -{ - +{ protected RequestedAuthnContextType requestedAuthnContext; protected String sessionIndex; + + public AuthnQueryType(String id, String version, XMLGregorianCalendar instant) + { + super(id, version, instant); + } + /** * Gets the value of the requestedAuthnContext property. * Modified: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/protocol/AuthnRequestType.java =================================================================== --- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/protocol/AuthnRequestType.java 2010-12-16 23:00:13 UTC (rev 606) +++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/protocol/AuthnRequestType.java 2010-12-16 23:03:30 UTC (rev 607) @@ -23,6 +23,8 @@ import java.net.URI; +import javax.xml.datatype.XMLGregorianCalendar; + import org.picketlink.identity.federation.newmodel.saml.v2.assertion.ConditionsType; import org.picketlink.identity.federation.newmodel.saml.v2.assertion.SubjectType; @@ -61,7 +63,6 @@ public class AuthnRequestType extends RequestAbstractType { - protected SubjectType subject; protected NameIDPolicyType nameIDPolicy; protected ConditionsType conditions; @@ -75,6 +76,11 @@ protected Integer attributeConsumingServiceIndex; protected String providerName; + public AuthnRequestType(String id, String version, XMLGregorianCalendar instant) + { + super(id, version, instant); + } + /** * Gets the value of the subject property. * Modified: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/protocol/AuthzDecisionQueryType.java =================================================================== --- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/protocol/AuthzDecisionQueryType.java 2010-12-16 23:00:13 UTC (rev 606) +++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/protocol/AuthzDecisionQueryType.java 2010-12-16 23:03:30 UTC (rev 607) @@ -26,6 +26,8 @@ import java.util.Collections; import java.util.List; +import javax.xml.datatype.XMLGregorianCalendar; + import org.picketlink.identity.federation.newmodel.saml.v2.assertion.ActionType; import org.picketlink.identity.federation.newmodel.saml.v2.assertion.EvidenceType; @@ -55,7 +57,12 @@ protected List<ActionType> action = new ArrayList<ActionType> (); protected EvidenceType evidence; protected URI resource; - + + public AuthzDecisionQueryType(String id, String version, XMLGregorianCalendar instant) + { + super(id, version, instant); + } + public void addAction( ActionType act ) { this.action.add(act); Modified: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/protocol/LogoutRequestType.java =================================================================== --- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/protocol/LogoutRequestType.java 2010-12-16 23:00:13 UTC (rev 606) +++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/protocol/LogoutRequestType.java 2010-12-16 23:03:30 UTC (rev 607) @@ -68,7 +68,13 @@ protected String reason; protected XMLGregorianCalendar notOnOrAfter; - /** + + public LogoutRequestType(String id, String version, XMLGregorianCalendar instant) + { + super(id, version, instant); + } + + /** * Gets the value of the baseID property. * * @return Modified: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/protocol/ManageNameIDRequestType.java =================================================================== --- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/protocol/ManageNameIDRequestType.java 2010-12-16 23:00:13 UTC (rev 606) +++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/protocol/ManageNameIDRequestType.java 2010-12-16 23:03:30 UTC (rev 607) @@ -21,6 +21,8 @@ */ package org.picketlink.identity.federation.newmodel.saml.v2.protocol; +import javax.xml.datatype.XMLGregorianCalendar; + import org.picketlink.identity.federation.newmodel.saml.v2.assertion.EncryptedElementType; import org.picketlink.identity.federation.newmodel.saml.v2.assertion.NameIDType; @@ -55,14 +57,19 @@ */ public class ManageNameIDRequestType extends RequestAbstractType -{ - +{ protected NameIDType nameID; protected EncryptedElementType encryptedID; protected String newID; protected EncryptedElementType newEncryptedID; protected TerminateType terminate; + + public ManageNameIDRequestType(String id, String version, XMLGregorianCalendar instant) + { + super(id, version, instant); + } + /** * Gets the value of the nameID property. * Modified: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/protocol/NameIDMappingRequestType.java =================================================================== --- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/protocol/NameIDMappingRequestType.java 2010-12-16 23:00:13 UTC (rev 606) +++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/protocol/NameIDMappingRequestType.java 2010-12-16 23:03:30 UTC (rev 607) @@ -21,6 +21,8 @@ */ package org.picketlink.identity.federation.newmodel.saml.v2.protocol; +import javax.xml.datatype.XMLGregorianCalendar; + import org.picketlink.identity.federation.newmodel.saml.v2.assertion.BaseIDAbstractType; import org.picketlink.identity.federation.newmodel.saml.v2.assertion.EncryptedElementType; import org.picketlink.identity.federation.newmodel.saml.v2.assertion.NameIDType; @@ -59,6 +61,12 @@ protected EncryptedElementType encryptedID; protected NameIDPolicyType nameIDPolicy; + + public NameIDMappingRequestType(String id, String version, XMLGregorianCalendar instant) + { + super(id, version, instant); + } + /** * Gets the value of the baseID property. * Modified: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/protocol/RequestAbstractType.java =================================================================== --- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/protocol/RequestAbstractType.java 2010-12-16 23:00:13 UTC (rev 606) +++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/protocol/RequestAbstractType.java 2010-12-16 23:03:30 UTC (rev 607) @@ -69,6 +69,13 @@ protected URI destination; protected String consent; + public RequestAbstractType( String id, String version, XMLGregorianCalendar instant ) + { + this.id = id; + this.version = version; + this.issueInstant = instant; + } + /** * Gets the value of the issuer property. * @@ -154,18 +161,6 @@ } /** - * Sets the value of the id property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setID(String value) { - this.id = value; - } - - /** * Gets the value of the version property. * * @return @@ -175,21 +170,9 @@ */ public String getVersion() { return version; - } + } /** - * Sets the value of the version property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setVersion(String value) { - this.version = value; - } - - /** * Gets the value of the issueInstant property. * * @return @@ -199,21 +182,9 @@ */ public XMLGregorianCalendar getIssueInstant() { return issueInstant; - } + } /** - * Sets the value of the issueInstant property. - * - * @param value - * allowed object is - * {@link XMLGregorianCalendar } - * - */ - public void setIssueInstant(XMLGregorianCalendar value) { - this.issueInstant = value; - } - - /** * Gets the value of the destination property. * * @return Modified: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/protocol/SubjectQueryAbstractType.java =================================================================== --- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/protocol/SubjectQueryAbstractType.java 2010-12-16 23:00:13 UTC (rev 606) +++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/protocol/SubjectQueryAbstractType.java 2010-12-16 23:03:30 UTC (rev 607) @@ -21,6 +21,8 @@ */ package org.picketlink.identity.federation.newmodel.saml.v2.protocol; +import javax.xml.datatype.XMLGregorianCalendar; + import org.picketlink.identity.federation.newmodel.saml.v2.assertion.SubjectType; @@ -47,6 +49,11 @@ extends RequestAbstractType { protected SubjectType subject; + + public SubjectQueryAbstractType(String id, String version, XMLGregorianCalendar instant) + { + super(id, version, instant); + } public void setSubject(SubjectType subject) {