[picketlink-commits] Picketlink SVN: r1022 - in federation/trunk/picketlink-fed-model/src/main: java/org/picketlink/identity/federation/saml/common and 7 other directories.

picketlink-commits at lists.jboss.org picketlink-commits at lists.jboss.org
Wed Jun 22 21:04:13 EDT 2011


Author: anil.saldhana at jboss.com
Date: 2011-06-22 21:04:12 -0400 (Wed, 22 Jun 2011)
New Revision: 1022

Added:
   federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/common/
   federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/common/CommonActionType.java
   federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/common/CommonAdviceType.java
   federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/common/CommonAssertionType.java
   federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/common/CommonConditionsType.java
   federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/common/CommonRequestAbstractType.java
   federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/common/CommonResponseType.java
   federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/common/CommonStatusDetailType.java
   federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v1/
   federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v1/assertion/
   federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v1/assertion/SAML11ActionType.java
   federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v1/assertion/SAML11AdviceType.java
   federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v1/assertion/SAML11AssertionType.java
   federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v1/assertion/SAML11AttributeDesignatorType.java
   federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v1/assertion/SAML11AttributeStatementType.java
   federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v1/assertion/SAML11AttributeType.java
   federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v1/assertion/SAML11AudienceRestrictionCondition.java
   federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v1/assertion/SAML11AuthenticationStatementType.java
   federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v1/assertion/SAML11AuthorityBindingType.java
   federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v1/assertion/SAML11AuthorizationDecisionStatementType.java
   federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v1/assertion/SAML11ConditionAbstractType.java
   federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v1/assertion/SAML11ConditionType.java
   federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v1/assertion/SAML11ConditionsAbstractType.java
   federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v1/assertion/SAML11ConditionsType.java
   federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v1/assertion/SAML11DecisionType.java
   federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v1/assertion/SAML11DoNotCacheConditionType.java
   federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v1/assertion/SAML11EvidenceType.java
   federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v1/assertion/SAML11NameIdentifierType.java
   federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v1/assertion/SAML11StatementAbstractType.java
   federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v1/assertion/SAML11StatementType.java
   federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v1/assertion/SAML11SubjectConfirmationType.java
   federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v1/assertion/SAML11SubjectLocalityType.java
   federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v1/assertion/SAML11SubjectStatementType.java
   federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v1/assertion/SAML11SubjectType.java
   federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v1/protocol/
   federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v1/protocol/SAML11AttributeQueryType.java
   federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v1/protocol/SAML11AuthenticationQueryType.java
   federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v1/protocol/SAML11AuthorizationDecisionQueryType.java
   federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v1/protocol/SAML11QueryAbstractType.java
   federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v1/protocol/SAML11RequestAbstractType.java
   federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v1/protocol/SAML11RequestType.java
   federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v1/protocol/SAML11ResponseAbstractType.java
   federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v1/protocol/SAML11ResponseType.java
   federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v1/protocol/SAML11StatusCodeType.java
   federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v1/protocol/SAML11StatusType.java
   federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v1/protocol/SAML11SubjectQueryAbstractType.java
   federation/trunk/picketlink-fed-model/src/main/resources/schema/saml/v1/
   federation/trunk/picketlink-fed-model/src/main/resources/schema/saml/v1/saml-schema-assertion-1.0.xsd
   federation/trunk/picketlink-fed-model/src/main/resources/schema/saml/v1/saml-schema-protocol-1.1.xsd
Modified:
   federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/assertion/ActionType.java
   federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/assertion/AdviceType.java
   federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/assertion/AssertionType.java
   federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/assertion/ConditionsType.java
   federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/assertion/OneTimeUseType.java
   federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/assertion/ProxyRestrictionType.java
   federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/protocol/ArtifactResolveType.java
   federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/protocol/ArtifactResponseType.java
   federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/protocol/AssertionIDRequestType.java
   federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/protocol/AttributeQueryType.java
   federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/protocol/AuthnQueryType.java
   federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/protocol/AuthnRequestType.java
   federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/protocol/AuthzDecisionQueryType.java
   federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/protocol/LogoutRequestType.java
   federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/protocol/ManageNameIDRequestType.java
   federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/protocol/NameIDMappingRequestType.java
   federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/protocol/NameIDMappingResponseType.java
   federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/protocol/RequestAbstractType.java
   federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/protocol/ResponseType.java
   federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/protocol/StatusDetailType.java
   federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/protocol/StatusResponseType.java
   federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/protocol/SubjectQueryAbstractType.java
   federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/protocol/XACMLAuthzDecisionQueryType.java
   federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/protocol/XACMLPolicyQueryType.java
Log:
PLFED-189: saml 1.1 object model

Added: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/common/CommonActionType.java
===================================================================
--- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/common/CommonActionType.java	                        (rev 0)
+++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/common/CommonActionType.java	2011-06-23 01:04:12 UTC (rev 1022)
@@ -0,0 +1,62 @@
+/*
+ * 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.saml.common;
+
+import java.io.Serializable;
+
+/**
+ * SAML Action Type
+ * @author Anil.Saldhana at redhat.com
+ * @since Jun 22, 2011
+ */
+public class CommonActionType implements Serializable
+{
+   private static final long serialVersionUID = 1L;
+
+   protected String namespace;
+
+   /**
+    * Gets the value of the namespace property.
+    * 
+    * @return
+    *     possible object is
+    *     {@link String }
+    *     
+    */
+   public String getNamespace()
+   {
+      return namespace;
+   }
+
+   /**
+    * Sets the value of the namespace property.
+    * 
+    * @param value
+    *     allowed object is
+    *     {@link String }
+    *     
+    */
+   public void setNamespace(String value)
+   {
+      this.namespace = value;
+   }
+}
\ No newline at end of file

Added: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/common/CommonAdviceType.java
===================================================================
--- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/common/CommonAdviceType.java	                        (rev 0)
+++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/common/CommonAdviceType.java	2011-06-23 01:04:12 UTC (rev 1022)
@@ -0,0 +1,67 @@
+/*
+ * 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.saml.common;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+/**
+ * SAML Advice Type
+ * @author Anil.Saldhana at redhat.com
+ * @since Jun 22, 2011
+ */
+public class CommonAdviceType implements Serializable
+{
+   private static final long serialVersionUID = 1L;
+
+   protected List<Object> advices = new ArrayList<Object>();
+
+   /**
+    * Add an advice
+    * @param obj
+    */
+   public void addAdvice(Object obj)
+   {
+      advices.add(obj);
+   }
+
+   /**
+    * Remove an advice
+    * @param advice
+    * @return
+    */
+   public boolean remove(Object advice)
+   {
+      return this.advices.remove(advice);
+   }
+
+   /**
+    * Gets the advices. (Read only list)
+    * @return {@link List} read only 
+    */
+   public List<Object> getAdvices()
+   {
+      return Collections.unmodifiableList(advices);
+   }
+}

Added: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/common/CommonAssertionType.java
===================================================================
--- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/common/CommonAssertionType.java	                        (rev 0)
+++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/common/CommonAssertionType.java	2011-06-23 01:04:12 UTC (rev 1022)
@@ -0,0 +1,61 @@
+/*
+ * 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.saml.common;
+
+import java.io.Serializable;
+
+import javax.xml.datatype.XMLGregorianCalendar;
+
+/**
+ * SAML AssertionType
+ * @author Anil.Saldhana at redhat.com
+ * @since Jun 21, 2011
+ */
+public class CommonAssertionType implements Serializable
+{
+   private static final long serialVersionUID = 1L;
+
+   protected XMLGregorianCalendar issueInstant;
+
+   protected String ID;
+
+   public CommonAssertionType(String iD, XMLGregorianCalendar issueInstant)
+   {
+      if (iD == null)
+         throw new IllegalArgumentException("iD is null");
+      if (issueInstant == null)
+         throw new IllegalArgumentException("issueInstant is null");
+
+      this.issueInstant = issueInstant;
+      ID = iD;
+   }
+
+   public XMLGregorianCalendar getIssueInstant()
+   {
+      return issueInstant;
+   }
+
+   public String getID()
+   {
+      return ID;
+   }
+}
\ No newline at end of file

Added: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/common/CommonConditionsType.java
===================================================================
--- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/common/CommonConditionsType.java	                        (rev 0)
+++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/common/CommonConditionsType.java	2011-06-23 01:04:12 UTC (rev 1022)
@@ -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.saml.common;
+
+import java.io.Serializable;
+
+import javax.xml.datatype.XMLGregorianCalendar;
+
+/**
+ * @author Anil.Saldhana at redhat.com
+ * @since Jun 22, 2011
+ */
+public class CommonConditionsType implements Serializable
+{
+   private static final long serialVersionUID = 1L;
+
+   protected XMLGregorianCalendar notBefore;
+
+   protected XMLGregorianCalendar notOnOrAfter;
+
+   /**
+    * Gets the value of the notBefore property.
+    * 
+    * @return
+    *     possible object is
+    *     {@link XMLGregorianCalendar }
+    *     
+    */
+   public XMLGregorianCalendar getNotBefore()
+   {
+      return notBefore;
+   }
+
+   /**
+    * Sets the value of the notBefore property.
+    * 
+    * @param value
+    *     allowed object is
+    *     {@link XMLGregorianCalendar }
+    *     
+    */
+   public void setNotBefore(XMLGregorianCalendar value)
+   {
+      this.notBefore = value;
+   }
+
+   /**
+    * Gets the value of the notOnOrAfter property.
+    * 
+    * @return
+    *     possible object is
+    *     {@link XMLGregorianCalendar }
+    *     
+    */
+   public XMLGregorianCalendar getNotOnOrAfter()
+   {
+      return notOnOrAfter;
+   }
+
+   /**
+    * Sets the value of the notOnOrAfter property.
+    * 
+    * @param value
+    *     allowed object is
+    *     {@link XMLGregorianCalendar }
+    *     
+    */
+   public void setNotOnOrAfter(XMLGregorianCalendar value)
+   {
+      this.notOnOrAfter = value;
+   }
+}
\ No newline at end of file

Added: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/common/CommonRequestAbstractType.java
===================================================================
--- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/common/CommonRequestAbstractType.java	                        (rev 0)
+++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/common/CommonRequestAbstractType.java	2011-06-23 01:04:12 UTC (rev 1022)
@@ -0,0 +1,103 @@
+/*
+ * 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.saml.common;
+
+import java.io.Serializable;
+
+import javax.xml.datatype.XMLGregorianCalendar;
+
+import org.picketlink.identity.xmlsec.w3.xmldsig.SignatureType;
+import org.w3c.dom.Element;
+
+/**
+ * SAML Request Abstract Type
+ * @author Anil.Saldhana at redhat.com
+ * @since Jun 22, 2011
+ */
+public abstract class CommonRequestAbstractType implements Serializable
+{
+   private static final long serialVersionUID = 1L;
+
+   protected String id;
+
+   protected XMLGregorianCalendar issueInstant;
+
+   protected Element signature;
+
+   public CommonRequestAbstractType(String id, XMLGregorianCalendar issueInstant)
+   {
+      this.id = id;
+      this.issueInstant = issueInstant;
+   }
+
+   /**
+    * Gets the value of the id property.
+    * 
+    * @return
+    *     possible object is
+    *     {@link String }
+    *     
+    */
+   public String getID()
+   {
+      return id;
+   }
+
+   /**
+    * Gets the value of the issueInstant property.
+    * 
+    * @return
+    *     possible object is
+    *     {@link XMLGregorianCalendar }
+    *     
+    */
+   public XMLGregorianCalendar getIssueInstant()
+   {
+      return issueInstant;
+   }
+
+   /**
+    * Gets the value of the signature property.
+    * 
+    * @return
+    *     possible object is
+    *     {@link SignatureType }
+    *     
+    */
+   public Element getSignature()
+   {
+      return signature;
+   }
+
+   /**
+    * Sets the value of the signature property.
+    * 
+    * @param value
+    *     allowed object is
+    *     {@link SignatureType }
+    *     
+    */
+   public void setSignature(Element value)
+   {
+      this.signature = value;
+   }
+}
\ No newline at end of file

Added: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/common/CommonResponseType.java
===================================================================
--- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/common/CommonResponseType.java	                        (rev 0)
+++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/common/CommonResponseType.java	2011-06-23 01:04:12 UTC (rev 1022)
@@ -0,0 +1,130 @@
+/*
+ * 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.saml.common;
+
+import java.io.Serializable;
+
+import javax.xml.datatype.XMLGregorianCalendar;
+
+import org.picketlink.identity.xmlsec.w3.xmldsig.SignatureType;
+import org.w3c.dom.Element;
+
+/**
+ * @author Anil.Saldhana at redhat.com
+ * @since Jun 22, 2011
+ */
+public class CommonResponseType implements Serializable
+{
+   private static final long serialVersionUID = 1L;
+
+   protected String id;
+
+   protected XMLGregorianCalendar issueInstant;
+
+   protected String inResponseTo;
+
+   protected Element signature;
+
+   public CommonResponseType(String id, XMLGregorianCalendar issueInstant)
+   {
+      this.id = id;
+      this.issueInstant = issueInstant;
+   }
+
+   /**
+    * Gets the value of the id property.
+    * 
+    * @return
+    *     possible object is
+    *     {@link String }
+    *     
+    */
+   public String getID()
+   {
+      return id;
+   }
+
+   /**
+    * Gets the value of the issueInstant property.
+    * 
+    * @return
+    *     possible object is
+    *     {@link XMLGregorianCalendar }
+    *     
+    */
+   public XMLGregorianCalendar getIssueInstant()
+   {
+      return issueInstant;
+   }
+
+   /**
+    * Gets the value of the inResponseTo property.
+    * 
+    * @return
+    *     possible object is
+    *     {@link String }
+    *     
+    */
+   public String getInResponseTo()
+   {
+      return inResponseTo;
+   }
+
+   /**
+    * Sets the value of the inResponseTo property.
+    * 
+    * @param value
+    *     allowed object is
+    *     {@link String }
+    *     
+    */
+   public void setInResponseTo(String value)
+   {
+      this.inResponseTo = value;
+   }
+
+   /**
+    * Gets the value of the signature property.
+    * 
+    * @return
+    *     possible object is
+    *     {@link SignatureType }
+    *     
+    */
+   public Element getSignature()
+   {
+      return signature;
+   }
+
+   /**
+    * Sets the value of the signature property.
+    * 
+    * @param value
+    *     allowed object is
+    *     {@link SignatureType }
+    *     
+    */
+   public void setSignature(Element value)
+   {
+      this.signature = value;
+   }
+}
\ No newline at end of file

Added: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/common/CommonStatusDetailType.java
===================================================================
--- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/common/CommonStatusDetailType.java	                        (rev 0)
+++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/common/CommonStatusDetailType.java	2011-06-23 01:04:12 UTC (rev 1022)
@@ -0,0 +1,79 @@
+/*
+ * 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.saml.common;
+
+import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+/**
+ * <p>Java class for StatusDetailType complex type.
+ * 
+ * <p>The following schema fragment specifies the expected content contained within this class.
+ * 
+ * <pre>
+ * &lt;complexType name="StatusDetailType">
+ *   &lt;complexContent>
+ *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
+ *       &lt;sequence>
+ *         &lt;any/>
+ *       &lt;/sequence>
+ *     &lt;/restriction>
+ *   &lt;/complexContent>
+ * &lt;/complexType>
+ * </pre>
+ * 
+ * 
+ */
+public class CommonStatusDetailType implements Serializable
+{
+   private static final long serialVersionUID = 1L;
+
+   protected List<Object> any = new ArrayList<Object>();
+
+   /**
+    * Add status detail
+    * @param obj
+    */
+   public void addStatusDetail(Object obj)
+   {
+      this.any.add(obj);
+   }
+
+   /**
+    * Remove status detail
+    * @param obj
+    */
+   public void removeStatusDetail(Object obj)
+   {
+      this.any.remove(obj);
+   }
+
+   /**
+    * Gets the value of the any property.  Read-Only list
+    */
+   public List<Object> getAny()
+   {
+      return Collections.unmodifiableList(this.any);
+   }
+}
\ No newline at end of file


Property changes on: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/common/CommonStatusDetailType.java
___________________________________________________________________
Added: svn:executable
   + *

Added: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v1/assertion/SAML11ActionType.java
===================================================================
--- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v1/assertion/SAML11ActionType.java	                        (rev 0)
+++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v1/assertion/SAML11ActionType.java	2011-06-23 01:04:12 UTC (rev 1022)
@@ -0,0 +1,43 @@
+/*
+ * 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.saml.v1.assertion;
+
+import org.picketlink.identity.federation.saml.common.CommonActionType;
+
+/**
+ * SAML11 Action Type
+ * 
+ * <complexType name="ActionType">
+        <simpleContent>
+            <extension base="string">
+                <attribute name="Namespace" type="anyURI"/>
+            </extension>
+        </simpleContent>
+    </complexType>
+
+ * @author Anil.Saldhana at redhat.com
+ * @since Jun 22, 2011
+ */
+public class SAML11ActionType extends CommonActionType
+{
+   private static final long serialVersionUID = 1L;
+}
\ No newline at end of file

Added: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v1/assertion/SAML11AdviceType.java
===================================================================
--- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v1/assertion/SAML11AdviceType.java	                        (rev 0)
+++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v1/assertion/SAML11AdviceType.java	2011-06-23 01:04:12 UTC (rev 1022)
@@ -0,0 +1,41 @@
+/*
+ * 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.saml.v1.assertion;
+
+import org.picketlink.identity.federation.saml.common.CommonAdviceType;
+
+/**
+ * <complexType name="AdviceType">
+        <choice minOccurs="0" maxOccurs="unbounded">
+            <element ref="saml:AssertionIDReference"/>
+            <element ref="saml:Assertion"/>
+            <any namespace="##other" processContents="lax"/>
+        </choice>
+    </complexType>
+
+ * @author Anil.Saldhana at redhat.com
+ * @since Jun 22, 2011
+ */
+public class SAML11AdviceType extends CommonAdviceType
+{
+   private static final long serialVersionUID = 1L;
+}
\ No newline at end of file

Added: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v1/assertion/SAML11AssertionType.java
===================================================================
--- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v1/assertion/SAML11AssertionType.java	                        (rev 0)
+++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v1/assertion/SAML11AssertionType.java	2011-06-23 01:04:12 UTC (rev 1022)
@@ -0,0 +1,150 @@
+/*
+ * 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.saml.v1.assertion;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+import javax.xml.datatype.XMLGregorianCalendar;
+
+import org.picketlink.identity.federation.saml.common.CommonAssertionType;
+import org.w3c.dom.Element;
+
+/**
+ * <complexType name="AssertionType">
+        <sequence>
+            <element ref="saml:Conditions" minOccurs="0"/>
+            <element ref="saml:Advice" minOccurs="0"/>
+            <choice maxOccurs="unbounded">
+                <element ref="saml:Statement"/>
+                <element ref="saml:SubjectStatement"/>
+                <element ref="saml:AuthenticationStatement"/>
+                <element ref="saml:AuthorizationDecisionStatement"/>
+                <element ref="saml:AttributeStatement"/>
+            </choice>
+
+            <element ref="ds:Signature" minOccurs="0"/>
+        </sequence>
+        <attribute name="MajorVersion" type="integer" use="required"/>
+        <attribute name="MinorVersion" type="integer" use="required"/>
+        <attribute name="AssertionID" type="ID" use="required"/>
+        <attribute name="Issuer" type="string" use="required"/>
+        <attribute name="IssueInstant" type="dateTime" use="required"/>
+    </complexType>
+
+ * @author Anil.Saldhana at redhat.com
+ * @since Jun 21, 2011
+ */
+public class SAML11AssertionType extends CommonAssertionType
+{
+   private static final long serialVersionUID = 1L;
+
+   protected int majorVersion = 1;
+
+   protected int minorVersion = 1;
+
+   protected SAML11ConditionsType conditions;
+
+   protected SAML11AdviceType advice;
+
+   protected List<SAML11StatementAbstractType> statements = new ArrayList<SAML11StatementAbstractType>();
+
+   protected Element signature;
+
+   protected String issuer;
+
+   public SAML11AssertionType(String iD, XMLGregorianCalendar issueInstant)
+   {
+      super(iD, issueInstant);
+   }
+
+   public int getMajorVersion()
+   {
+      return majorVersion;
+   }
+
+   public int getMinorVersion()
+   {
+      return minorVersion;
+   }
+
+   public void add(SAML11StatementAbstractType statement)
+   {
+      this.statements.add(statement);
+   }
+
+   public void addAllStatements(List<SAML11StatementAbstractType> statement)
+   {
+      this.statements.addAll(statement);
+   }
+
+   public boolean remove(SAML11StatementAbstractType statement)
+   {
+      return this.statements.remove(statement);
+   }
+
+   public List<SAML11StatementAbstractType> getStatements()
+   {
+      return Collections.unmodifiableList(statements);
+   }
+
+   public SAML11ConditionsType getConditions()
+   {
+      return conditions;
+   }
+
+   public void setConditions(SAML11ConditionsType conditions)
+   {
+      this.conditions = conditions;
+   }
+
+   public SAML11AdviceType getAdvice()
+   {
+      return advice;
+   }
+
+   public void setAdvice(SAML11AdviceType advice)
+   {
+      this.advice = advice;
+   }
+
+   public Element getSignature()
+   {
+      return signature;
+   }
+
+   public void setSignature(Element signature)
+   {
+      this.signature = signature;
+   }
+
+   public String getIssuer()
+   {
+      return issuer;
+   }
+
+   public void setIssuer(String issuer)
+   {
+      this.issuer = issuer;
+   }
+}
\ No newline at end of file

Added: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v1/assertion/SAML11AttributeDesignatorType.java
===================================================================
--- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v1/assertion/SAML11AttributeDesignatorType.java	                        (rev 0)
+++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v1/assertion/SAML11AttributeDesignatorType.java	2011-06-23 01:04:12 UTC (rev 1022)
@@ -0,0 +1,56 @@
+/*
+ * 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.saml.v1.assertion;
+
+import java.net.URI;
+
+/**
+ <complexType name="AttributeDesignatorType">
+        <attribute name="AttributeName" type="string" use="required"/>
+        <attribute name="AttributeNamespace" type="anyURI" use="required"/>
+    </complexType>
+
+ * @author Anil.Saldhana at redhat.com
+ * @since Jun 22, 2011
+ */
+public class SAML11AttributeDesignatorType
+{
+   protected String attributeName;
+
+   protected URI attributeNamespace;
+
+   public SAML11AttributeDesignatorType(String attributeName, URI attributeNamespace)
+   {
+      this.attributeName = attributeName;
+      this.attributeNamespace = attributeNamespace;
+   }
+
+   public String getAttributeName()
+   {
+      return attributeName;
+   }
+
+   public URI getAttributeNamespace()
+   {
+      return attributeNamespace;
+   }
+}
\ No newline at end of file

Added: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v1/assertion/SAML11AttributeStatementType.java
===================================================================
--- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v1/assertion/SAML11AttributeStatementType.java	                        (rev 0)
+++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v1/assertion/SAML11AttributeStatementType.java	2011-06-23 01:04:12 UTC (rev 1022)
@@ -0,0 +1,68 @@
+/*
+ * 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.saml.v1.assertion;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+/**
+ * <complexType name="AttributeStatementType">
+        <complexContent>
+            <extension base="saml:SubjectStatementAbstractType">
+                <sequence>
+                    <element ref="saml:Attribute" maxOccurs="unbounded"/>
+
+                </sequence>
+            </extension>
+        </complexContent>
+    </complexType>
+
+ * @author Anil.Saldhana at redhat.com
+ * @since Jun 22, 2011
+ */
+public class SAML11AttributeStatementType extends SAML11SubjectStatementType
+{
+   private static final long serialVersionUID = 1L;
+
+   protected List<SAML11AttributeType> attribute = new ArrayList<SAML11AttributeType>();
+
+   public void add(SAML11AttributeType statement)
+   {
+      this.attribute.add(statement);
+   }
+
+   public void addAllStatements(List<SAML11AttributeType> statement)
+   {
+      this.attribute.addAll(statement);
+   }
+
+   public boolean remove(SAML11AttributeType statement)
+   {
+      return this.attribute.remove(statement);
+   }
+
+   public List<SAML11AttributeType> get()
+   {
+      return Collections.unmodifiableList(attribute);
+   }
+}
\ No newline at end of file

Added: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v1/assertion/SAML11AttributeType.java
===================================================================
--- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v1/assertion/SAML11AttributeType.java	                        (rev 0)
+++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v1/assertion/SAML11AttributeType.java	2011-06-23 01:04:12 UTC (rev 1022)
@@ -0,0 +1,71 @@
+/*
+ * 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.saml.v1.assertion;
+
+import java.net.URI;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+/**
+ * <complexType name="AttributeType">
+        <complexContent>
+            <extension base="saml:AttributeDesignatorType">
+                <sequence>
+                    <element ref="saml:AttributeValue" maxOccurs="unbounded"/>
+                </sequence>
+            </extension>
+        </complexContent>
+
+    </complexType>
+ * @author Anil.Saldhana at redhat.com
+ * @since Jun 22, 2011
+ */
+public class SAML11AttributeType extends SAML11AttributeDesignatorType
+{
+   protected List<Object> attributeValues = new ArrayList<Object>();
+
+   public SAML11AttributeType(String attributeName, URI attributeNamespace)
+   {
+      super(attributeName, attributeNamespace);
+   }
+
+   public void add(Object advice)
+   {
+      this.attributeValues.add(advice);
+   }
+
+   public void addAll(List<Object> advice)
+   {
+      this.attributeValues.addAll(advice);
+   }
+
+   public boolean remove(Object advice)
+   {
+      return this.attributeValues.remove(advice);
+   }
+
+   public List<Object> get()
+   {
+      return Collections.unmodifiableList(attributeValues);
+   }
+}
\ No newline at end of file

Added: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v1/assertion/SAML11AudienceRestrictionCondition.java
===================================================================
--- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v1/assertion/SAML11AudienceRestrictionCondition.java	                        (rev 0)
+++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v1/assertion/SAML11AudienceRestrictionCondition.java	2011-06-23 01:04:12 UTC (rev 1022)
@@ -0,0 +1,69 @@
+/*
+ * 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.saml.v1.assertion;
+
+import java.net.URI;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+/**
+ * <complexType name="AudienceRestrictionConditionType">
+        <complexContent>
+            <extension base="saml:ConditionAbstractType">
+                <sequence>
+                    <element ref="saml:Audience" maxOccurs="unbounded"/>
+                </sequence>
+
+            </extension>
+        </complexContent>
+    </complexType>
+
+ * @author Anil.Saldhana at redhat.com
+ * @since Jun 22, 2011
+ */
+public class SAML11AudienceRestrictionCondition extends SAML11ConditionAbstractType
+{
+   private static final long serialVersionUID = 1L;
+
+   protected List<URI> audience = new ArrayList<URI>();
+
+   public void add(URI advice)
+   {
+      this.audience.add(advice);
+   }
+
+   public void addAll(List<URI> advice)
+   {
+      this.audience.addAll(advice);
+   }
+
+   public boolean remove(URI advice)
+   {
+      return this.audience.remove(advice);
+   }
+
+   public List<URI> get()
+   {
+      return Collections.unmodifiableList(audience);
+   }
+}
\ No newline at end of file

Added: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v1/assertion/SAML11AuthenticationStatementType.java
===================================================================
--- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v1/assertion/SAML11AuthenticationStatementType.java	                        (rev 0)
+++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v1/assertion/SAML11AuthenticationStatementType.java	2011-06-23 01:04:12 UTC (rev 1022)
@@ -0,0 +1,106 @@
+/*
+ * 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.saml.v1.assertion;
+
+import java.net.URI;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+import javax.xml.datatype.XMLGregorianCalendar;
+
+/**
+ * <complexType name="AuthenticationStatementType">
+        <complexContent>
+            <extension base="saml:SubjectStatementAbstractType">
+
+                <sequence>
+                    <element ref="saml:SubjectLocality" minOccurs="0"/>
+                    <element ref="saml:AuthorityBinding" minOccurs="0" maxOccurs="unbounded"/>
+                </sequence>
+                <attribute name="AuthenticationMethod" type="anyURI" use="required"/>
+                <attribute name="AuthenticationInstant" type="dateTime" use="required"/>
+            </extension>
+        </complexContent>
+    </complexType>
+
+ * @author Anil.Saldhana at redhat.com
+ * @since Jun 22, 2011
+ */
+public class SAML11AuthenticationStatementType extends SAML11SubjectStatementType
+{
+   private static final long serialVersionUID = 1L;
+
+   protected URI authenticationMethod;
+
+   protected XMLGregorianCalendar authenticationInstant;
+
+   protected SAML11SubjectLocalityType subjectLocality;
+
+   protected List<SAML11AuthorityBindingType> authorityBinding = new ArrayList<SAML11AuthorityBindingType>();
+
+   public SAML11AuthenticationStatementType(URI authenticationMethod, XMLGregorianCalendar authenticationInstant)
+   {
+      this.authenticationMethod = authenticationMethod;
+      this.authenticationInstant = authenticationInstant;
+   }
+
+   public URI getAuthenticationMethod()
+   {
+      return authenticationMethod;
+   }
+
+   public XMLGregorianCalendar getAuthenticationInstant()
+   {
+      return authenticationInstant;
+   }
+
+   public SAML11SubjectLocalityType getSubjectLocality()
+   {
+      return subjectLocality;
+   }
+
+   public void setSubjectLocality(SAML11SubjectLocalityType subjectLocality)
+   {
+      this.subjectLocality = subjectLocality;
+   }
+
+   public void add(SAML11AuthorityBindingType advice)
+   {
+      this.authorityBinding.add(advice);
+   }
+
+   public void addAllAuthorityBindingType(List<SAML11AuthorityBindingType> advice)
+   {
+      this.authorityBinding.addAll(advice);
+   }
+
+   public boolean remove(SAML11AuthorityBindingType advice)
+   {
+      return this.authorityBinding.remove(advice);
+   }
+
+   public List<SAML11AuthorityBindingType> getAuthorityBindingType()
+   {
+      return Collections.unmodifiableList(authorityBinding);
+   }
+}
\ No newline at end of file

Added: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v1/assertion/SAML11AuthorityBindingType.java
===================================================================
--- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v1/assertion/SAML11AuthorityBindingType.java	                        (rev 0)
+++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v1/assertion/SAML11AuthorityBindingType.java	2011-06-23 01:04:12 UTC (rev 1022)
@@ -0,0 +1,69 @@
+/*
+ * 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.saml.v1.assertion;
+
+import java.net.URI;
+
+import javax.xml.namespace.QName;
+
+/**
+ * <complexType name="AuthorityBindingType">
+        <attribute name="AuthorityKind" type="QName" use="required"/>
+        <attribute name="Location" type="anyURI" use="required"/>
+
+        <attribute name="Binding" type="anyURI" use="required"/>
+    </complexType>
+
+ * @author Anil.Saldhana at redhat.com
+ * @since Jun 22, 2011
+ */
+public class SAML11AuthorityBindingType
+{
+   protected QName authorityKind;
+
+   protected URI location;
+
+   protected URI binding;
+
+   public SAML11AuthorityBindingType(QName authorityKind, URI location, URI binding)
+   {
+      super();
+      this.authorityKind = authorityKind;
+      this.location = location;
+      this.binding = binding;
+   }
+
+   public QName getAuthorityKind()
+   {
+      return authorityKind;
+   }
+
+   public URI getLocation()
+   {
+      return location;
+   }
+
+   public URI getBinding()
+   {
+      return binding;
+   }
+}
\ No newline at end of file

Added: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v1/assertion/SAML11AuthorizationDecisionStatementType.java
===================================================================
--- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v1/assertion/SAML11AuthorizationDecisionStatementType.java	                        (rev 0)
+++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v1/assertion/SAML11AuthorizationDecisionStatementType.java	2011-06-23 01:04:12 UTC (rev 1022)
@@ -0,0 +1,99 @@
+/*
+ * 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.saml.v1.assertion;
+
+import java.net.URI;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+/**
+ * <complexType name="AuthorizationDecisionStatementType">
+        <complexContent>
+            <extension base="saml:SubjectStatementAbstractType">
+                <sequence>
+                    <element ref="saml:Action" maxOccurs="unbounded"/>
+                    <element ref="saml:Evidence" minOccurs="0"/>
+
+                </sequence>
+                <attribute name="Resource" type="anyURI" use="required"/>
+                <attribute name="Decision" type="saml:DecisionType" use="required"/>
+            </extension>
+        </complexContent>
+    </complexType>
+
+ * @author Anil.Saldhana at redhat.com
+ * @since Jun 22, 2011
+ */
+public class SAML11AuthorizationDecisionStatementType extends SAML11StatementAbstractType
+{
+   private static final long serialVersionUID = 1L;
+
+   protected List<SAML11ActionType> actions = new ArrayList<SAML11ActionType>();
+
+   protected SAML11EvidenceType evidence;
+
+   protected URI resource;
+
+   protected SAML11DecisionType decision;
+
+   public SAML11AuthorizationDecisionStatementType(URI resource, SAML11DecisionType decision)
+   {
+      this.resource = resource;
+      this.decision = decision;
+   }
+
+   public URI getResource()
+   {
+      return resource;
+   }
+
+   public SAML11DecisionType getDecision()
+   {
+      return decision;
+   }
+
+   public void addAction(SAML11ActionType action)
+   {
+      this.actions.add(action);
+   }
+
+   public boolean removeAction(SAML11ActionType action)
+   {
+      return this.actions.remove(action);
+   }
+
+   public List<SAML11ActionType> getActions()
+   {
+      return Collections.unmodifiableList(actions);
+   }
+
+   public SAML11EvidenceType getEvidence()
+   {
+      return evidence;
+   }
+
+   public void setEvidence(SAML11EvidenceType evidence)
+   {
+      this.evidence = evidence;
+   }
+}
\ No newline at end of file

Added: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v1/assertion/SAML11ConditionAbstractType.java
===================================================================
--- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v1/assertion/SAML11ConditionAbstractType.java	                        (rev 0)
+++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v1/assertion/SAML11ConditionAbstractType.java	2011-06-23 01:04:12 UTC (rev 1022)
@@ -0,0 +1,33 @@
+/*
+ * 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.saml.v1.assertion;
+
+import java.io.Serializable;
+
+/**
+ * @author Anil.Saldhana at redhat.com
+ * @since Jun 22, 2011
+ */
+public abstract class SAML11ConditionAbstractType implements Serializable
+{
+   private static final long serialVersionUID = 1L;
+}
\ No newline at end of file

Added: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v1/assertion/SAML11ConditionType.java
===================================================================
--- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v1/assertion/SAML11ConditionType.java	                        (rev 0)
+++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v1/assertion/SAML11ConditionType.java	2011-06-23 01:04:12 UTC (rev 1022)
@@ -0,0 +1,31 @@
+/*
+ * 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.saml.v1.assertion;
+
+/**
+ * @author Anil.Saldhana at redhat.com
+ * @since Jun 22, 2011
+ */
+public class SAML11ConditionType extends SAML11ConditionAbstractType
+{
+   private static final long serialVersionUID = 1L;
+}
\ No newline at end of file

Added: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v1/assertion/SAML11ConditionsAbstractType.java
===================================================================
--- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v1/assertion/SAML11ConditionsAbstractType.java	                        (rev 0)
+++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v1/assertion/SAML11ConditionsAbstractType.java	2011-06-23 01:04:12 UTC (rev 1022)
@@ -0,0 +1,33 @@
+/*
+ * 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.saml.v1.assertion;
+
+import java.io.Serializable;
+
+/**
+ * @author Anil.Saldhana at redhat.com
+ * @since Jun 22, 2011
+ */
+public abstract class SAML11ConditionsAbstractType implements Serializable
+{
+   private static final long serialVersionUID = 1L;
+}

Added: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v1/assertion/SAML11ConditionsType.java
===================================================================
--- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v1/assertion/SAML11ConditionsType.java	                        (rev 0)
+++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v1/assertion/SAML11ConditionsType.java	2011-06-23 01:04:12 UTC (rev 1022)
@@ -0,0 +1,62 @@
+/*
+ * 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.saml.v1.assertion;
+
+import java.util.ArrayList;
+import java.util.List;
+
+import org.picketlink.identity.federation.saml.common.CommonConditionsType;
+
+/**
+ * <complexType name="ConditionsType">
+        <choice minOccurs="0" maxOccurs="unbounded">
+            <element ref="saml:AudienceRestrictionCondition"/>
+            <element ref="saml:DoNotCacheCondition"/>
+            <element ref="saml:Condition"/>
+        </choice>
+        <attribute name="NotBefore" type="dateTime" use="optional"/>
+        <attribute name="NotOnOrAfter" type="dateTime" use="optional"/>
+    </complexType>
+ * @author Anil.Saldhana at redhat.com
+ * @since Jun 22, 2011
+ */
+public class SAML11ConditionsType extends CommonConditionsType
+{
+   private static final long serialVersionUID = 1L;
+
+   public List<SAML11ConditionAbstractType> conditions = new ArrayList<SAML11ConditionAbstractType>();
+
+   public void add(SAML11ConditionAbstractType condition)
+   {
+      this.conditions.add(condition);
+   }
+
+   public void addAll(List<SAML11ConditionAbstractType> theConditions)
+   {
+      this.conditions.addAll(theConditions);
+   }
+
+   public boolean remove(SAML11ConditionsAbstractType condition)
+   {
+      return this.conditions.remove(condition);
+   }
+}
\ No newline at end of file

Added: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v1/assertion/SAML11DecisionType.java
===================================================================
--- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v1/assertion/SAML11DecisionType.java	                        (rev 0)
+++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v1/assertion/SAML11DecisionType.java	2011-06-23 01:04:12 UTC (rev 1022)
@@ -0,0 +1,39 @@
+/*
+ * 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.saml.v1.assertion;
+
+/**
+ * <simpleType name="DecisionType">
+        <restriction base="string">
+
+            <enumeration value="Permit"/>
+            <enumeration value="Deny"/>
+            <enumeration value="Indeterminate"/>
+        </restriction>
+    </simpleType>
+
+ * @author Anil.Saldhana at redhat.com
+ * @since Jun 22, 2011
+ */
+public enum SAML11DecisionType {
+   Permit, Deny, Indeterminate;
+}
\ No newline at end of file

Added: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v1/assertion/SAML11DoNotCacheConditionType.java
===================================================================
--- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v1/assertion/SAML11DoNotCacheConditionType.java	                        (rev 0)
+++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v1/assertion/SAML11DoNotCacheConditionType.java	2011-06-23 01:04:12 UTC (rev 1022)
@@ -0,0 +1,31 @@
+/*
+ * 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.saml.v1.assertion;
+
+/**
+ * @author Anil.Saldhana at redhat.com
+ * @since Jun 22, 2011
+ */
+public class SAML11DoNotCacheConditionType extends SAML11ConditionAbstractType
+{
+   private static final long serialVersionUID = 1L;
+}
\ No newline at end of file

Added: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v1/assertion/SAML11EvidenceType.java
===================================================================
--- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v1/assertion/SAML11EvidenceType.java	                        (rev 0)
+++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v1/assertion/SAML11EvidenceType.java	2011-06-23 01:04:12 UTC (rev 1022)
@@ -0,0 +1,85 @@
+/*
+ * 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.saml.v1.assertion;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+/**
+ * <complexType name="EvidenceType">
+        <choice maxOccurs="unbounded">
+            <element ref="saml:AssertionIDReference"/>
+
+            <element ref="saml:Assertion"/>
+        </choice>
+    </complexType>
+
+ * @author Anil.Saldhana at redhat.com
+ * @since Jun 22, 2011
+ */
+public class SAML11EvidenceType
+{
+   protected List<String> assertionIDReference = new ArrayList<String>();
+
+   protected List<SAML11AssertionType> assertions = new ArrayList<SAML11AssertionType>();
+
+   public void add(String condition)
+   {
+      this.assertionIDReference.add(condition);
+   }
+
+   public void addAllAssertionIDReference(List<String> theassertionIDReference)
+   {
+      this.assertionIDReference.addAll(theassertionIDReference);
+   }
+
+   public boolean remove(String assertionIDReference)
+   {
+      return this.assertionIDReference.remove(assertionIDReference);
+   }
+
+   public List<String> getAssertionIDReference()
+   {
+      return Collections.unmodifiableList(assertionIDReference);
+   }
+
+   public void add(SAML11AssertionType condition)
+   {
+      this.assertions.add(condition);
+   }
+
+   public void addAllAssertionType(List<SAML11AssertionType> theassertions)
+   {
+      this.assertions.addAll(theassertions);
+   }
+
+   public boolean remove(SAML11AssertionType assertion)
+   {
+      return this.assertions.remove(assertionIDReference);
+   }
+
+   public List<SAML11AssertionType> getAssertions()
+   {
+      return Collections.unmodifiableList(assertions);
+   }
+}
\ No newline at end of file

Added: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v1/assertion/SAML11NameIdentifierType.java
===================================================================
--- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v1/assertion/SAML11NameIdentifierType.java	                        (rev 0)
+++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v1/assertion/SAML11NameIdentifierType.java	2011-06-23 01:04:12 UTC (rev 1022)
@@ -0,0 +1,66 @@
+/*
+ * 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.saml.v1.assertion;
+
+import java.io.Serializable;
+import java.net.URI;
+
+/**
+ * <complexType name="NameIdentifierType">
+        <simpleContent>
+            <extension base="string">
+                <attribute name="NameQualifier" type="string" use="optional"/> 
+                <attribute name="Format" type="anyURI" use="optional"/>
+            </extension>
+        </simpleContent>
+    </complexType>
+ * @author Anil.Saldhana at redhat.com
+ * @since Jun 22, 2011
+ */
+public class SAML11NameIdentifierType implements Serializable
+{
+   private static final long serialVersionUID = 1L;
+
+   protected String nameQualifier;
+
+   protected URI format;
+
+   public String getNameQualifier()
+   {
+      return nameQualifier;
+   }
+
+   public void setNameQualifier(String nameQualifier)
+   {
+      this.nameQualifier = nameQualifier;
+   }
+
+   public URI getFormat()
+   {
+      return format;
+   }
+
+   public void setFormat(URI format)
+   {
+      this.format = format;
+   }
+}
\ No newline at end of file

Added: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v1/assertion/SAML11StatementAbstractType.java
===================================================================
--- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v1/assertion/SAML11StatementAbstractType.java	                        (rev 0)
+++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v1/assertion/SAML11StatementAbstractType.java	2011-06-23 01:04:12 UTC (rev 1022)
@@ -0,0 +1,33 @@
+/*
+ * 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.saml.v1.assertion;
+
+import java.io.Serializable;
+
+/**
+ * @author Anil.Saldhana at redhat.com
+ * @since Jun 22, 2011
+ */
+public abstract class SAML11StatementAbstractType implements Serializable
+{
+   private static final long serialVersionUID = 1L;
+}
\ No newline at end of file

Added: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v1/assertion/SAML11StatementType.java
===================================================================
--- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v1/assertion/SAML11StatementType.java	                        (rev 0)
+++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v1/assertion/SAML11StatementType.java	2011-06-23 01:04:12 UTC (rev 1022)
@@ -0,0 +1,31 @@
+/*
+ * 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.saml.v1.assertion;
+
+/**
+ * @author Anil.Saldhana at redhat.com
+ * @since Jun 22, 2011
+ */
+public class SAML11StatementType extends SAML11StatementAbstractType
+{
+   private static final long serialVersionUID = 1L;
+}
\ No newline at end of file

Added: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v1/assertion/SAML11SubjectConfirmationType.java
===================================================================
--- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v1/assertion/SAML11SubjectConfirmationType.java	                        (rev 0)
+++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v1/assertion/SAML11SubjectConfirmationType.java	2011-06-23 01:04:12 UTC (rev 1022)
@@ -0,0 +1,86 @@
+/*
+ * 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.saml.v1.assertion;
+
+import java.net.URI;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+import org.w3c.dom.Element;
+
+/**
+ * <complexType name="SubjectConfirmationType">
+        <sequence>
+            <element ref="saml:ConfirmationMethod" maxOccurs="unbounded"/>
+            <element ref="saml:SubjectConfirmationData" minOccurs="0"/>
+
+            <element ref="ds:KeyInfo" minOccurs="0"/>
+        </sequence>
+    </complexType>
+
+ * @author Anil.Saldhana at redhat.com
+ * @since Jun 22, 2011
+ */
+public class SAML11SubjectConfirmationType
+{
+   protected List<URI> confirmationMethod = new ArrayList<URI>();
+
+   protected Object subjectConfirmationData;
+
+   protected Element keyInfo;
+
+   public void addConfirmation(URI confirmation)
+   {
+      this.confirmationMethod.add(confirmation);
+   }
+
+   public void addAllConfirmation(List<URI> confirmation)
+   {
+      this.confirmationMethod.addAll(confirmation);
+   }
+
+   public boolean removeConfirmation(URI confirmation)
+   {
+      return this.confirmationMethod.remove(confirmation);
+   }
+
+   public List<URI> getConfirmationMethod()
+   {
+      return Collections.unmodifiableList(confirmationMethod);
+   }
+
+   public void setSubjectConfirmationData(Object subjectConfirmation)
+   {
+      this.subjectConfirmationData = subjectConfirmation;
+   }
+
+   public Element getKeyInfo()
+   {
+      return keyInfo;
+   }
+
+   public void setKeyInfo(Element keyInfo)
+   {
+      this.keyInfo = keyInfo;
+   }
+}
\ No newline at end of file

Added: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v1/assertion/SAML11SubjectLocalityType.java
===================================================================
--- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v1/assertion/SAML11SubjectLocalityType.java	                        (rev 0)
+++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v1/assertion/SAML11SubjectLocalityType.java	2011-06-23 01:04:12 UTC (rev 1022)
@@ -0,0 +1,58 @@
+/*
+ * 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.saml.v1.assertion;
+
+/**
+ * <complexType name="SubjectLocalityType">
+        <attribute name="IPAddress" type="string" use="optional"/>
+        <attribute name="DNSAddress" type="string" use="optional"/>
+    </complexType>
+
+ * @author Anil.Saldhana at redhat.com
+ * @since Jun 22, 2011
+ */
+public class SAML11SubjectLocalityType
+{
+   protected String ipAddress;
+
+   protected String dnsAddress;
+
+   public String getIpAddress()
+   {
+      return ipAddress;
+   }
+
+   public void setIpAddress(String ipAddress)
+   {
+      this.ipAddress = ipAddress;
+   }
+
+   public String getDnsAddress()
+   {
+      return dnsAddress;
+   }
+
+   public void setDnsAddress(String dnsAddress)
+   {
+      this.dnsAddress = dnsAddress;
+   }
+}
\ No newline at end of file

Added: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v1/assertion/SAML11SubjectStatementType.java
===================================================================
--- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v1/assertion/SAML11SubjectStatementType.java	                        (rev 0)
+++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v1/assertion/SAML11SubjectStatementType.java	2011-06-23 01:04:12 UTC (rev 1022)
@@ -0,0 +1,54 @@
+/*
+ * 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.saml.v1.assertion;
+
+/**
+ * <complexType name="SubjectStatementAbstractType" abstract="true">
+        <complexContent>
+            <extension base="saml:StatementAbstractType">
+                <sequence>
+                    <element ref="saml:Subject"/>
+                </sequence>
+
+            </extension>
+        </complexContent>
+    </complexType>
+
+ * @author Anil.Saldhana at redhat.com
+ * @since Jun 22, 2011
+ */
+public class SAML11SubjectStatementType extends SAML11StatementAbstractType
+{
+   private static final long serialVersionUID = 1L;
+
+   protected SAML11SubjectType subject;
+
+   public SAML11SubjectType getSubject()
+   {
+      return subject;
+   }
+
+   public void setSubject(SAML11SubjectType subject)
+   {
+      this.subject = subject;
+   }
+}
\ No newline at end of file

Added: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v1/assertion/SAML11SubjectType.java
===================================================================
--- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v1/assertion/SAML11SubjectType.java	                        (rev 0)
+++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v1/assertion/SAML11SubjectType.java	2011-06-23 01:04:12 UTC (rev 1022)
@@ -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.saml.v1.assertion;
+
+/**
+ * <complexType name="SubjectType">
+        <choice>
+            <sequence>
+                <element ref="saml:NameIdentifier"/>
+                <element ref="saml:SubjectConfirmation" minOccurs="0"/>
+
+            </sequence>
+            <element ref="saml:SubjectConfirmation"/>
+        </choice>
+    </complexType>
+
+ * @author Anil.Saldhana at redhat.com
+ * @since Jun 22, 2011
+ */
+public class SAML11SubjectType
+{
+   public static class SAML11SubjectTypeChoice
+   {
+      protected SAML11NameIdentifierType nameID;
+
+      protected SAML11SubjectConfirmationType subjectConfirmation;
+
+      public SAML11SubjectTypeChoice(SAML11NameIdentifierType nameID)
+      {
+         this.nameID = nameID;
+      }
+
+      public SAML11SubjectTypeChoice(SAML11SubjectConfirmationType subConfirms)
+      {
+         this.subjectConfirmation = subConfirms;
+      }
+
+      public SAML11NameIdentifierType getNameID()
+      {
+         return nameID;
+      }
+
+      public SAML11SubjectConfirmationType getsubjectConfirmation()
+      {
+         return subjectConfirmation;
+      }
+   }
+
+   protected SAML11SubjectConfirmationType subjectConfirmation;
+
+   protected SAML11SubjectTypeChoice choice;
+
+   public SAML11SubjectConfirmationType getSubjectConfirmation()
+   {
+      return subjectConfirmation;
+   }
+
+   public void setSubjectConfirmation(SAML11SubjectConfirmationType subjectConfirmation)
+   {
+      this.subjectConfirmation = subjectConfirmation;
+   }
+
+   public SAML11SubjectTypeChoice getChoice()
+   {
+      return choice;
+   }
+
+   public void setChoice(SAML11SubjectTypeChoice choice)
+   {
+      this.choice = choice;
+   }
+}
\ No newline at end of file

Added: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v1/protocol/SAML11AttributeQueryType.java
===================================================================
--- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v1/protocol/SAML11AttributeQueryType.java	                        (rev 0)
+++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v1/protocol/SAML11AttributeQueryType.java	2011-06-23 01:04:12 UTC (rev 1022)
@@ -0,0 +1,79 @@
+/*
+ * 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.saml.v1.protocol;
+
+import java.net.URI;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+import org.picketlink.identity.federation.saml.v1.assertion.SAML11AttributeDesignatorType;
+
+/**
+ * <complexType name="AttributeQueryType">
+        <complexContent>
+            <extension base="samlp:SubjectQueryAbstractType">
+                <sequence>
+                    <element ref="saml:AttributeDesignator" minOccurs="0" maxOccurs="unbounded"/>
+                </sequence>
+
+                <attribute name="Resource" type="anyURI" use="optional"/>
+            </extension>
+        </complexContent>
+    </complexType>
+
+ * @author Anil.Saldhana at redhat.com
+ * @since Jun 22, 2011
+ */
+public class SAML11AttributeQueryType extends SAML11SubjectQueryAbstractType
+{
+   private static final long serialVersionUID = 1L;
+
+   protected List<SAML11AttributeDesignatorType> attributeDesignator = new ArrayList<SAML11AttributeDesignatorType>();
+
+   protected URI resource;
+
+   public URI getResource()
+   {
+      return resource;
+   }
+
+   public void setResource(URI resource)
+   {
+      this.resource = resource;
+   }
+
+   public void add(SAML11AttributeDesignatorType sadt)
+   {
+      this.attributeDesignator.add(sadt);
+   }
+
+   public boolean remove(SAML11AttributeDesignatorType sadt)
+   {
+      return this.attributeDesignator.remove(sadt);
+   }
+
+   public List<SAML11AttributeDesignatorType> get()
+   {
+      return Collections.unmodifiableList(attributeDesignator);
+   }
+}
\ No newline at end of file

Added: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v1/protocol/SAML11AuthenticationQueryType.java
===================================================================
--- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v1/protocol/SAML11AuthenticationQueryType.java	                        (rev 0)
+++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v1/protocol/SAML11AuthenticationQueryType.java	2011-06-23 01:04:12 UTC (rev 1022)
@@ -0,0 +1,54 @@
+/*
+ * 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.saml.v1.protocol;
+
+import java.net.URI;
+
+/**
+ * <complexType name="AuthenticationQueryType">
+        <complexContent>
+            <extension base="samlp:SubjectQueryAbstractType">
+                <attribute name="AuthenticationMethod" type="anyURI"/>
+            </extension>
+
+        </complexContent>
+    </complexType>
+
+ * @author Anil.Saldhana at redhat.com
+ * @since Jun 22, 2011
+ */
+public class SAML11AuthenticationQueryType extends SAML11SubjectQueryAbstractType
+{
+   private static final long serialVersionUID = 1L;
+
+   protected URI authenticationMethod;
+
+   public URI getAuthenticationMethod()
+   {
+      return authenticationMethod;
+   }
+
+   public void setAuthenticationMethod(URI authenticationMethod)
+   {
+      this.authenticationMethod = authenticationMethod;
+   }
+}
\ No newline at end of file

Added: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v1/protocol/SAML11AuthorizationDecisionQueryType.java
===================================================================
--- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v1/protocol/SAML11AuthorizationDecisionQueryType.java	                        (rev 0)
+++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v1/protocol/SAML11AuthorizationDecisionQueryType.java	2011-06-23 01:04:12 UTC (rev 1022)
@@ -0,0 +1,93 @@
+/*
+ * 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.saml.v1.protocol;
+
+import java.net.URI;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+import org.picketlink.identity.federation.saml.v1.assertion.SAML11ActionType;
+import org.picketlink.identity.federation.saml.v1.assertion.SAML11EvidenceType;
+
+/**
+ * <complexType name="AuthorizationDecisionQueryType">
+        <complexContent>
+            <extension base="samlp:SubjectQueryAbstractType">
+                <sequence>
+
+                    <element ref="saml:Action" maxOccurs="unbounded"/>
+                    <element ref="saml:Evidence" minOccurs="0"/>
+                </sequence>
+                <attribute name="Resource" type="anyURI" use="required"/>
+            </extension>
+        </complexContent>
+    </complexType>
+
+ * @author Anil.Saldhana at redhat.com
+ * @since Jun 22, 2011
+ */
+public class SAML11AuthorizationDecisionQueryType extends SAML11SubjectQueryAbstractType
+{
+   private static final long serialVersionUID = 1L;
+
+   protected List<SAML11ActionType> action = new ArrayList<SAML11ActionType>();
+
+   protected SAML11EvidenceType evidence;
+
+   protected URI resource;
+
+   public URI getResource()
+   {
+      return resource;
+   }
+
+   public void setResource(URI resource)
+   {
+      this.resource = resource;
+   }
+
+   public SAML11EvidenceType getEvidence()
+   {
+      return evidence;
+   }
+
+   public void setEvidence(SAML11EvidenceType evidence)
+   {
+      this.evidence = evidence;
+   }
+
+   public void add(SAML11ActionType sadt)
+   {
+      this.action.add(sadt);
+   }
+
+   public boolean remove(SAML11ActionType sadt)
+   {
+      return this.action.remove(sadt);
+   }
+
+   public List<SAML11ActionType> get()
+   {
+      return Collections.unmodifiableList(action);
+   }
+}
\ No newline at end of file

Added: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v1/protocol/SAML11QueryAbstractType.java
===================================================================
--- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v1/protocol/SAML11QueryAbstractType.java	                        (rev 0)
+++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v1/protocol/SAML11QueryAbstractType.java	2011-06-23 01:04:12 UTC (rev 1022)
@@ -0,0 +1,33 @@
+/*
+ * 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.saml.v1.protocol;
+
+import java.io.Serializable;
+
+/**
+ * @author Anil.Saldhana at redhat.com
+ * @since Jun 22, 2011
+ */
+public abstract class SAML11QueryAbstractType implements Serializable
+{
+   private static final long serialVersionUID = 1L;
+}
\ No newline at end of file

Added: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v1/protocol/SAML11RequestAbstractType.java
===================================================================
--- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v1/protocol/SAML11RequestAbstractType.java	                        (rev 0)
+++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v1/protocol/SAML11RequestAbstractType.java	2011-06-23 01:04:12 UTC (rev 1022)
@@ -0,0 +1,93 @@
+/*
+ * 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.saml.v1.protocol;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+import javax.xml.datatype.XMLGregorianCalendar;
+import javax.xml.namespace.QName;
+
+import org.picketlink.identity.federation.saml.common.CommonRequestAbstractType;
+
+/**
+ * <complexType name="RequestAbstractType" abstract="true">
+
+        <sequence>
+            <element ref="samlp:RespondWith" minOccurs="0" maxOccurs="unbounded"/>
+            <element ref="ds:Signature" minOccurs="0"/>
+        </sequence>
+        <attribute name="RequestID" type="ID" use="required"/>
+        <attribute name="MajorVersion" type="integer" use="required"/>
+        <attribute name="MinorVersion" type="integer" use="required"/>
+        <attribute name="IssueInstant" type="dateTime" use="required"/>
+    </complexType>
+
+ * @author Anil.Saldhana at redhat.com
+ * @since Jun 22, 2011
+ */
+public abstract class SAML11RequestAbstractType extends CommonRequestAbstractType
+{
+   private static final long serialVersionUID = 1L;
+
+   protected int majorVersion = 1;
+
+   protected int minorVersion = 1;
+
+   protected List<QName> respondWith = new ArrayList<QName>();
+
+   public SAML11RequestAbstractType(String id, XMLGregorianCalendar issueInstant)
+   {
+      super(id, issueInstant);
+   }
+
+   public int getMajorVersion()
+   {
+      return majorVersion;
+   }
+
+   public int getMinorVersion()
+   {
+      return minorVersion;
+   }
+
+   public void add(QName rw)
+   {
+      this.respondWith.add(rw);
+   }
+
+   public void addAllConditions(List<QName> rw)
+   {
+      this.respondWith.addAll(rw);
+   }
+
+   public boolean remove(QName rw)
+   {
+      return this.respondWith.remove(rw);
+   }
+
+   public List<QName> getRespondWith()
+   {
+      return Collections.unmodifiableList(respondWith);
+   }
+}
\ No newline at end of file

Added: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v1/protocol/SAML11RequestType.java
===================================================================
--- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v1/protocol/SAML11RequestType.java	                        (rev 0)
+++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v1/protocol/SAML11RequestType.java	2011-06-23 01:04:12 UTC (rev 1022)
@@ -0,0 +1,95 @@
+/*
+ * 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.saml.v1.protocol;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+import javax.xml.datatype.XMLGregorianCalendar;
+
+/**
+ * <complexType name="RequestType">
+        <complexContent>
+            <extension base="samlp:RequestAbstractType">
+                <choice>
+                    <element ref="samlp:Query"/>
+                    <element ref="samlp:SubjectQuery"/>
+                    <element ref="samlp:AuthenticationQuery"/>
+
+                    <element ref="samlp:AttributeQuery"/>
+                    <element ref="samlp:AuthorizationDecisionQuery"/>
+                    <element ref="saml:AssertionIDReference" maxOccurs="unbounded"/>
+                    <element ref="samlp:AssertionArtifact" maxOccurs="unbounded"/>
+                </choice>
+            </extension>
+        </complexContent>
+    </complexType>
+
+ * @author Anil.Saldhana at redhat.com
+ * @since Jun 22, 2011
+ */
+public class SAML11RequestType extends SAML11RequestAbstractType
+{
+   private static final long serialVersionUID = 1L;
+
+   protected SAML11QueryAbstractType query;
+
+   protected List<String> assertionIDRef = new ArrayList<String>();
+
+   protected List<String> assertionArtifact = new ArrayList<String>();
+
+   public SAML11RequestType(String id, XMLGregorianCalendar issueInstant)
+   {
+      super(id, issueInstant);
+   }
+
+   public void addAssertionIDRef(String sadt)
+   {
+      this.assertionIDRef.add(sadt);
+   }
+
+   public boolean removeAssertionIDRef(String sadt)
+   {
+      return this.assertionIDRef.remove(sadt);
+   }
+
+   public List<String> getAssertionIDRef()
+   {
+      return Collections.unmodifiableList(assertionIDRef);
+   }
+
+   public void addAssertionArtifact(String sadt)
+   {
+      this.assertionArtifact.add(sadt);
+   }
+
+   public boolean removeAssertionArtifact(String sadt)
+   {
+      return this.assertionArtifact.remove(sadt);
+   }
+
+   public List<String> getAssertionArtifact()
+   {
+      return Collections.unmodifiableList(assertionArtifact);
+   }
+}
\ No newline at end of file

Added: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v1/protocol/SAML11ResponseAbstractType.java
===================================================================
--- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v1/protocol/SAML11ResponseAbstractType.java	                        (rev 0)
+++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v1/protocol/SAML11ResponseAbstractType.java	2011-06-23 01:04:12 UTC (rev 1022)
@@ -0,0 +1,81 @@
+/*
+ * 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.saml.v1.protocol;
+
+import java.net.URI;
+
+import javax.xml.datatype.XMLGregorianCalendar;
+
+import org.picketlink.identity.federation.saml.common.CommonResponseType;
+
+/**
+ * <complexType name="ResponseAbstractType" abstract="true">
+        <sequence>
+
+            <element ref="ds:Signature" minOccurs="0"/>
+        </sequence>
+        <attribute name="ResponseID" type="ID" use="required"/>
+        <attribute name="InResponseTo" type="NCName" use="optional"/>
+        <attribute name="MajorVersion" type="integer" use="required"/>
+        <attribute name="MinorVersion" type="integer" use="required"/>
+        <attribute name="IssueInstant" type="dateTime" use="required"/>
+        <attribute name="Recipient" type="anyURI" use="optional"/>
+    </complexType>
+
+ * @author Anil.Saldhana at redhat.com
+ * @since Jun 22, 2011
+ */
+public abstract class SAML11ResponseAbstractType extends CommonResponseType
+{
+   private static final long serialVersionUID = 1L;
+
+   protected int majorVersion = 1;
+
+   protected int minorVersion = 1;
+
+   protected URI recipient;
+
+   public SAML11ResponseAbstractType(String id, XMLGregorianCalendar issueInstant)
+   {
+      super(id, issueInstant);
+   }
+
+   public int getMajorVersion()
+   {
+      return majorVersion;
+   }
+
+   public int getMinorVersion()
+   {
+      return minorVersion;
+   }
+
+   public URI getRecipient()
+   {
+      return recipient;
+   }
+
+   public void setRecipient(URI recipient)
+   {
+      this.recipient = recipient;
+   }
+}
\ No newline at end of file

Added: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v1/protocol/SAML11ResponseType.java
===================================================================
--- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v1/protocol/SAML11ResponseType.java	                        (rev 0)
+++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v1/protocol/SAML11ResponseType.java	2011-06-23 01:04:12 UTC (rev 1022)
@@ -0,0 +1,86 @@
+/*
+ * 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.saml.v1.protocol;
+
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
+
+import javax.xml.datatype.XMLGregorianCalendar;
+
+import org.picketlink.identity.federation.saml.common.CommonResponseType;
+import org.picketlink.identity.federation.saml.v1.assertion.SAML11AssertionType;
+
+/**
+ * <complexType name="ResponseType">
+        <complexContent>
+            <extension base="samlp:ResponseAbstractType">
+                <sequence>
+                    <element ref="samlp:Status"/>
+                    <element ref="saml:Assertion" minOccurs="0" maxOccurs="unbounded"/>
+                </sequence>
+            </extension>
+
+        </complexContent>
+    </complexType>
+
+ * @author Anil.Saldhana at redhat.com
+ * @since Jun 22, 2011
+ */
+public class SAML11ResponseType extends CommonResponseType
+{
+   private static final long serialVersionUID = 1L;
+
+   protected List<SAML11AssertionType> assertions = new ArrayList<SAML11AssertionType>();
+
+   protected SAML11StatusType status;
+
+   public SAML11ResponseType(String id, XMLGregorianCalendar issueInstant)
+   {
+      super(id, issueInstant);
+   }
+
+   public void add(SAML11AssertionType assertion)
+   {
+      this.assertions.add(assertion);
+   }
+
+   public boolean remove(SAML11AssertionType assertion)
+   {
+      return this.assertions.remove(assertion);
+   }
+
+   public List<SAML11AssertionType> get()
+   {
+      return Collections.unmodifiableList(assertions);
+   }
+
+   public SAML11StatusType getStatus()
+   {
+      return status;
+   }
+
+   public void setStatus(SAML11StatusType status)
+   {
+      this.status = status;
+   }
+}
\ No newline at end of file

Added: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v1/protocol/SAML11StatusCodeType.java
===================================================================
--- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v1/protocol/SAML11StatusCodeType.java	                        (rev 0)
+++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v1/protocol/SAML11StatusCodeType.java	2011-06-23 01:04:12 UTC (rev 1022)
@@ -0,0 +1,98 @@
+/*
+ * 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.saml.v1.protocol;
+
+import java.io.Serializable;
+
+import javax.xml.namespace.QName;
+
+/**
+ * <complexType name="StatusCodeType">
+        <sequence>
+            <element ref="samlp:StatusCode" minOccurs="0"/>
+        </sequence>
+        <attribute name="Value" type="QName" use="required"/>
+    </complexType>
+
+ * @author Anil.Saldhana at redhat.com
+ * @since Jun 22, 2011
+ */
+public class SAML11StatusCodeType implements Serializable
+{
+   private static final long serialVersionUID = 1L;
+
+   protected SAML11StatusCodeType statusCode;
+
+   protected QName value;
+
+   /**
+    * Gets the value of the statusCode property.
+    * 
+    * @return
+    *     possible object is
+    *     {@link StatusCodeType }
+    *     
+    */
+   public SAML11StatusCodeType getStatusCode()
+   {
+      return statusCode;
+   }
+
+   /**
+    * Sets the value of the statusCode property.
+    * 
+    * @param value
+    *     allowed object is
+    *     {@link StatusCodeType }
+    *     
+    */
+   public void setStatusCode(SAML11StatusCodeType value)
+   {
+      this.statusCode = value;
+   }
+
+   /**
+    * Gets the value of the value property.
+    * 
+    * @return
+    *     possible object is
+    *     {@link String }
+    *     
+    */
+   public QName getValue()
+   {
+      return value;
+   }
+
+   /**
+    * Sets the value of the value property.
+    * 
+    * @param value
+    *     allowed object is
+    *     {@link String }
+    *     
+    */
+   public void setValue(QName value)
+   {
+      this.value = value;
+   }
+}
\ No newline at end of file

Added: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v1/protocol/SAML11StatusType.java
===================================================================
--- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v1/protocol/SAML11StatusType.java	                        (rev 0)
+++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v1/protocol/SAML11StatusType.java	2011-06-23 01:04:12 UTC (rev 1022)
@@ -0,0 +1,80 @@
+/*
+ * 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.saml.v1.protocol;
+
+import java.io.Serializable;
+
+import org.picketlink.identity.federation.saml.common.CommonStatusDetailType;
+
+/**
+ * <complexType name="StatusType">
+        <sequence>
+            <element ref="samlp:StatusCode"/>
+            <element ref="samlp:StatusMessage" minOccurs="0"/>
+            <element ref="samlp:StatusDetail" minOccurs="0"/>
+        </sequence>
+
+    </complexType>
+    
+ * @author Anil.Saldhana at redhat.com
+ * @since Jun 22, 2011
+ */
+public class SAML11StatusType implements Serializable
+{
+   private static final long serialVersionUID = 1L;
+
+   protected SAML11StatusCodeType statusCode;
+
+   protected String statusMessage;
+
+   protected CommonStatusDetailType statusDetail;
+
+   public SAML11StatusCodeType getStatusCode()
+   {
+      return statusCode;
+   }
+
+   public void setStatusCode(SAML11StatusCodeType statusCode)
+   {
+      this.statusCode = statusCode;
+   }
+
+   public String getStatusMessage()
+   {
+      return statusMessage;
+   }
+
+   public void setStatusMessage(String statusMessage)
+   {
+      this.statusMessage = statusMessage;
+   }
+
+   public CommonStatusDetailType getStatusDetail()
+   {
+      return statusDetail;
+   }
+
+   public void setStatusDetail(CommonStatusDetailType statusDetail)
+   {
+      this.statusDetail = statusDetail;
+   }
+}
\ No newline at end of file

Added: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v1/protocol/SAML11SubjectQueryAbstractType.java
===================================================================
--- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v1/protocol/SAML11SubjectQueryAbstractType.java	                        (rev 0)
+++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v1/protocol/SAML11SubjectQueryAbstractType.java	2011-06-23 01:04:12 UTC (rev 1022)
@@ -0,0 +1,56 @@
+/*
+ * 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.saml.v1.protocol;
+
+import org.picketlink.identity.federation.saml.v1.assertion.SAML11SubjectType;
+
+/**
+ * <complexType name="SubjectQueryAbstractType" abstract="true">
+        <complexContent>
+            <extension base="samlp:QueryAbstractType">
+                <sequence>
+                    <element ref="saml:Subject"/>
+                </sequence>
+
+            </extension>
+        </complexContent>
+    </complexType>
+
+ * @author Anil.Saldhana at redhat.com
+ * @since Jun 22, 2011
+ */
+public class SAML11SubjectQueryAbstractType extends SAML11QueryAbstractType
+{
+   private static final long serialVersionUID = 1L;
+
+   protected SAML11SubjectType subject;
+
+   public SAML11SubjectType getSubject()
+   {
+      return subject;
+   }
+
+   public void setSubject(SAML11SubjectType subject)
+   {
+      this.subject = subject;
+   }
+}
\ No newline at end of file

Modified: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/assertion/ActionType.java
===================================================================
--- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/assertion/ActionType.java	2011-06-21 21:10:53 UTC (rev 1021)
+++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/assertion/ActionType.java	2011-06-23 01:04:12 UTC (rev 1022)
@@ -21,9 +21,8 @@
  */
 package org.picketlink.identity.federation.saml.v2.assertion;
 
-import java.io.Serializable;
+import org.picketlink.identity.federation.saml.common.CommonActionType;
 
-
 /**
  * <p>Java class for ActionType complex type.
  * 
@@ -40,59 +39,8 @@
  * </pre>
  * 
  * 
- */ 
-public class ActionType implements Serializable {
-
+ */
+public class ActionType extends CommonActionType
+{
    private static final long serialVersionUID = 1L;
-
-   protected String value; 
-   protected String namespace;
-
-   /**
-    * Gets the value of the value property.
-    * 
-    * @return
-    *     possible object is
-    *     {@link String }
-    *     
-    */
-   public String getValue() {
-      return value;
-   }
-
-   /**
-    * Sets the value of the value property.
-    * 
-    * @param value
-    *     allowed object is
-    *     {@link String }
-    *     
-    */
-   public void setValue(String value) {
-      this.value = value;
-   }
-
-   /**
-    * Gets the value of the namespace property.
-    * 
-    * @return
-    *     possible object is
-    *     {@link String }
-    *     
-    */
-   public String getNamespace() {
-      return namespace;
-   }
-
-   /**
-    * Sets the value of the namespace property.
-    * 
-    * @param value
-    *     allowed object is
-    *     {@link String }
-    *     
-    */
-   public void setNamespace(String value) {
-      this.namespace = value;
-   }
 }
\ No newline at end of file

Modified: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/assertion/AdviceType.java
===================================================================
--- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/assertion/AdviceType.java	2011-06-21 21:10:53 UTC (rev 1021)
+++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/assertion/AdviceType.java	2011-06-23 01:04:12 UTC (rev 1022)
@@ -22,12 +22,8 @@
 
 package org.picketlink.identity.federation.saml.v2.assertion;
 
-import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
+import org.picketlink.identity.federation.saml.common.CommonAdviceType;
 
-
 /**
  * <p>Java class for AdviceType complex type.
  * 
@@ -50,27 +46,8 @@
  * </pre>
  * 
  * 
- */ 
-public class AdviceType implements Serializable
-{  
+ */
+public class AdviceType extends CommonAdviceType
+{
    private static final long serialVersionUID = 1L;
-   protected List<Object> advices = new ArrayList<Object>();
-
-   /**
-    * Add an advice
-    * @param obj
-    */
-   public void addAdvice( Object obj )
-   {
-      advices.add( obj );
-   }
-
-   /**
-    * Gets the advices. (Read only list)
-    * @return {@link List} read only 
-    */
-   public List<Object> getAdvices() 
-   { 
-      return Collections.unmodifiableList( advices );
-   } 
 }
\ No newline at end of file

Modified: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/assertion/AssertionType.java
===================================================================
--- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/assertion/AssertionType.java	2011-06-21 21:10:53 UTC (rev 1021)
+++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/assertion/AssertionType.java	2011-06-23 01:04:12 UTC (rev 1022)
@@ -21,14 +21,14 @@
  */
 package org.picketlink.identity.federation.saml.v2.assertion;
 
-import java.io.Serializable;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.LinkedHashSet;
 import java.util.Set;
 
 import javax.xml.datatype.XMLGregorianCalendar;
- 
+
+import org.picketlink.identity.federation.saml.common.CommonAssertionType;
 import org.w3c.dom.Element;
 
 /**
@@ -53,27 +53,23 @@
  * @author Anil.Saldhana at redhat.com
  * @since Nov 24, 2010
  */
-public class AssertionType implements Serializable
-{ 
+public class AssertionType extends CommonAssertionType
+{
    private static final long serialVersionUID = 1L;
 
-   private String ID;
-
    private Element signature;
 
-   private XMLGregorianCalendar issueInstant;
+   private final String version = "2.0";
 
-   private String version;
-
    private AdviceType advice;
 
    private NameIDType issuer;
-   
+
    private SubjectType subject;
 
    private ConditionsType conditions;
 
-   private Set<StatementAbstractType> statements = new LinkedHashSet<StatementAbstractType>();
+   private final Set<StatementAbstractType> statements = new LinkedHashSet<StatementAbstractType>();
 
    /**
     * Create an assertion
@@ -81,27 +77,9 @@
     * @param issueInstant {@link XMLGregorianCalendar} issue instant (required)
     * @param version
     */
-   public AssertionType(String iD, XMLGregorianCalendar issueInstant, String version)
-   { 
-      if( iD == null )
-         throw new IllegalArgumentException( "iD is null" );
-      if( issueInstant == null )
-         throw new IllegalArgumentException( "issueInstant is null" );
-      if( version == null )
-         throw new IllegalArgumentException( "version is null" );
-      
-      this.ID = iD;
-      this.issueInstant = issueInstant;
-      this.version = version;
-   }
-
-   /**
-    * Get the assertion id
-    * @return {@link String}
-    */
-   public String getID()
+   public AssertionType(String iD, XMLGregorianCalendar issueInstant)
    {
-      return ID;
+      super(iD, issueInstant);
    }
 
    /**
@@ -125,22 +103,13 @@
    }
 
    /**
-    * Get the Issue Instant
-    * @return {@link XMLGregorianCalendar}
-    */
-   public XMLGregorianCalendar getIssueInstant()
-   {
-      return issueInstant;
-   }
-
-   /**
     * Get the version of SAML
     * @return {@link String}
     */
    public String getVersion()
    {
       return version;
-   }   
+   }
 
    /**
     * Get the advice
@@ -158,7 +127,7 @@
    public void setAdvice(AdviceType advice)
    {
       checkSTSPermission();
-      
+
       this.advice = advice;
    }
 
@@ -169,7 +138,7 @@
    public ConditionsType getConditions()
    {
       checkSTSPermission();
-      
+
       return conditions;
    }
 
@@ -180,7 +149,7 @@
    public void setConditions(ConditionsType conditions)
    {
       checkSTSPermission();
-      
+
       this.conditions = conditions;
    }
 
@@ -200,42 +169,43 @@
    public void setIssuer(NameIDType issuer)
    {
       checkSTSPermission();
-      
+
       this.issuer = issuer;
-   } 
+   }
 
    /**
     * Add a statement
     * @param statement {@link StatementAbstractType}
     */
-   public void addStatement( StatementAbstractType statement )
+   public void addStatement(StatementAbstractType statement)
    {
       checkSTSPermission();
-      
-      this.statements.add( statement );
+
+      this.statements.add(statement);
    }
+
    /**
     * Add a collection of statements
     * @param statement {@link Collection}
     */
-   public void addStatements( Collection<StatementAbstractType> statement )
+   public void addStatements(Collection<StatementAbstractType> statement)
    {
       checkSTSPermission();
-      
-      this.statements.addAll( statement );
+
+      this.statements.addAll(statement);
    }
 
    /**
     * Add a set of statements
     * @param statement {@link Collection}
     */
-   public void addStatements( Set<StatementAbstractType> statement )
+   public void addStatements(Set<StatementAbstractType> statement)
    {
       checkSTSPermission();
-      
-      this.statements.addAll( statement );
+
+      this.statements.addAll(statement);
    }
-   
+
    /**
     * Get a read only set of statements
     * @return {@link Set}
@@ -243,8 +213,8 @@
    public Set<StatementAbstractType> getStatements()
    {
       checkSTSPermission();
-      
-      return Collections.unmodifiableSet( statements );
+
+      return Collections.unmodifiableSet(statements);
    }
 
    /**
@@ -263,24 +233,23 @@
    public void setSignature(Element signature)
    {
       this.signature = signature;
-   } 
-   
+   }
+
    /**
     * Update the issue instant
     * @param xg
     */
-   public void updateIssueInstant( XMLGregorianCalendar xg )
+   public void updateIssueInstant(XMLGregorianCalendar xg)
    {
       checkSTSPermission();
-      
-      this.issueInstant = xg; 
+
+      this.issueInstant = xg;
    }
-   
 
    protected void checkSTSPermission()
    {
       SecurityManager sm = System.getSecurityManager();
-      if( sm != null )
-         sm.checkPermission( new RuntimePermission( "org.picketlink.sts") );
+      if (sm != null)
+         sm.checkPermission(new RuntimePermission("org.picketlink.sts"));
    }
 }
\ No newline at end of file

Modified: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/assertion/ConditionsType.java
===================================================================
--- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/assertion/ConditionsType.java	2011-06-21 21:10:53 UTC (rev 1021)
+++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/assertion/ConditionsType.java	2011-06-23 01:04:12 UTC (rev 1022)
@@ -25,9 +25,8 @@
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
- 
-import javax.xml.datatype.XMLGregorianCalendar;
 
+import org.picketlink.identity.federation.saml.common.CommonConditionsType;
 
 /**
  * <p>Java class for ConditionsType complex type.
@@ -52,85 +51,36 @@
  * </pre>
  * 
  * 
- */ 
-public class ConditionsType implements Serializable
-{  
+ */
+public class ConditionsType extends CommonConditionsType implements Serializable
+{
    private static final long serialVersionUID = 1L;
-   protected List<ConditionAbstractType> conditions = new ArrayList<ConditionAbstractType>(); 
-   protected XMLGregorianCalendar notBefore; 
-   protected XMLGregorianCalendar notOnOrAfter;
 
+   protected List<ConditionAbstractType> conditions = new ArrayList<ConditionAbstractType>();
+
    /**
     * Add a condition
     * @param condition
     */
-   public void addCondition( ConditionAbstractType condition )
+   public void addCondition(ConditionAbstractType condition)
    {
-      this.conditions.add( condition );
+      this.conditions.add(condition);
    }
-   
+
    /**
     * Remove a condition
     * @param condition
     */
-   public void removeCondition( ConditionAbstractType condition )
+   public void removeCondition(ConditionAbstractType condition)
    {
-      this.conditions.remove( condition );
+      this.conditions.remove(condition);
    }
 
    /**
     * Gets an read only conditions list. 
     */
-   public List<ConditionAbstractType> getConditions() 
-   { 
-      return Collections.unmodifiableList( this.conditions );
+   public List<ConditionAbstractType> getConditions()
+   {
+      return Collections.unmodifiableList(this.conditions);
    }
-
-   /**
-    * Gets the value of the notBefore property.
-    * 
-    * @return
-    *     possible object is
-    *     {@link XMLGregorianCalendar }
-    *     
-    */
-   public XMLGregorianCalendar getNotBefore() {
-      return notBefore;
-   }
-
-   /**
-    * Sets the value of the notBefore property.
-    * 
-    * @param value
-    *     allowed object is
-    *     {@link XMLGregorianCalendar }
-    *     
-    */
-   public void setNotBefore(XMLGregorianCalendar value) {
-      this.notBefore = value;
-   }
-
-   /**
-    * Gets the value of the notOnOrAfter property.
-    * 
-    * @return
-    *     possible object is
-    *     {@link XMLGregorianCalendar }
-    *     
-    */
-   public XMLGregorianCalendar getNotOnOrAfter() {
-      return notOnOrAfter;
-   }
-
-   /**
-    * Sets the value of the notOnOrAfter property.
-    * 
-    * @param value
-    *     allowed object is
-    *     {@link XMLGregorianCalendar }
-    *     
-    */
-   public void setNotOnOrAfter(XMLGregorianCalendar value) {
-      this.notOnOrAfter = value;
-   }
 }
\ No newline at end of file

Modified: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/assertion/OneTimeUseType.java
===================================================================
--- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/assertion/OneTimeUseType.java	2011-06-21 21:10:53 UTC (rev 1021)
+++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/assertion/OneTimeUseType.java	2011-06-23 01:04:12 UTC (rev 1022)
@@ -20,7 +20,6 @@
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
 package org.picketlink.identity.federation.saml.v2.assertion;
- 
 
 /**
  * <p>Java class for OneTimeUseType complex type.
@@ -37,8 +36,8 @@
  * </pre>
  * 
  * 
- */ 
-public class OneTimeUseType
-    extends ConditionAbstractType
-{ 
+ */
+public class OneTimeUseType extends ConditionAbstractType
+{
+   private static final long serialVersionUID = 1L;
 }
\ No newline at end of file

Modified: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/assertion/ProxyRestrictionType.java
===================================================================
--- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/assertion/ProxyRestrictionType.java	2011-06-21 21:10:53 UTC (rev 1021)
+++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/assertion/ProxyRestrictionType.java	2011-06-23 01:04:12 UTC (rev 1022)
@@ -27,7 +27,6 @@
 import java.util.Collections;
 import java.util.List;
 
-
 /**
  * <p>Java class for ProxyRestrictionType complex type.
  * 
@@ -47,10 +46,11 @@
  * </pre>
  * 
  * 
- */ 
-public class ProxyRestrictionType
-extends ConditionAbstractType
-{ 
+ */
+public class ProxyRestrictionType extends ConditionAbstractType
+{
+   private static final long serialVersionUID = 1L;
+
    protected List<URI> audience = new ArrayList<URI>();
 
    protected BigInteger count;
@@ -59,27 +59,27 @@
     * Add an audience
     * @param a
     */
-   public void addAudience( URI a )
+   public void addAudience(URI a)
    {
-      this.audience.add( a );
+      this.audience.add(a);
    }
 
    /**
     * Gets the value of the audience property.
     *  
     */
-   public List<URI> getAudience() 
-   { 
-      return Collections.unmodifiableList( audience );
+   public List<URI> getAudience()
+   {
+      return Collections.unmodifiableList(audience);
    }
-   
+
    /**
     * Remove an audience
     * @param a
     */
-   public void removeAudience( URI a )
+   public void removeAudience(URI a)
    {
-      this.audience.remove( a );
+      this.audience.remove(a);
    }
 
    /**
@@ -90,7 +90,8 @@
     *     {@link BigInteger }
     *     
     */
-   public BigInteger getCount() {
+   public BigInteger getCount()
+   {
       return count;
    }
 
@@ -102,7 +103,8 @@
     *     {@link BigInteger }
     *     
     */
-   public void setCount(BigInteger value) {
+   public void setCount(BigInteger value)
+   {
       this.count = value;
    }
 }
\ No newline at end of file

Modified: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/protocol/ArtifactResolveType.java
===================================================================
--- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/protocol/ArtifactResolveType.java	2011-06-21 21:10:53 UTC (rev 1021)
+++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/protocol/ArtifactResolveType.java	2011-06-23 01:04:12 UTC (rev 1022)
@@ -23,8 +23,6 @@
 
 import javax.xml.datatype.XMLGregorianCalendar;
 
-
-
 /**
  * <p>Java class for ArtifactResolveType complex type.
  * 
@@ -43,15 +41,16 @@
  * </pre>
  * 
  * 
- */ 
-public class ArtifactResolveType
-extends RequestAbstractType
+ */
+public class ArtifactResolveType extends RequestAbstractType
 {
-   protected String artifact; 
+   private static final long serialVersionUID = 1L;
 
-   public ArtifactResolveType(String id, String version, XMLGregorianCalendar instant)
+   protected String artifact;
+
+   public ArtifactResolveType(String id, XMLGregorianCalendar instant)
    {
-      super(id, version, instant); 
+      super(id, instant);
    }
 
    /**
@@ -62,7 +61,8 @@
     *     {@link String }
     *     
     */
-   public String getArtifact() {
+   public String getArtifact()
+   {
       return artifact;
    }
 
@@ -74,7 +74,8 @@
     *     {@link String }
     *     
     */
-   public void setArtifact(String value) {
+   public void setArtifact(String value)
+   {
       this.artifact = value;
    }
 

Modified: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/protocol/ArtifactResponseType.java
===================================================================
--- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/protocol/ArtifactResponseType.java	2011-06-21 21:10:53 UTC (rev 1021)
+++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/protocol/ArtifactResponseType.java	2011-06-23 01:04:12 UTC (rev 1022)
@@ -20,11 +20,11 @@
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
 package org.picketlink.identity.federation.saml.v2.protocol;
- 
 
+import javax.xml.datatype.XMLGregorianCalendar;
+
 import org.w3c.dom.Element;
 
-
 /**
  * <p>Java class for ArtifactResponseType complex type.
  * 
@@ -43,37 +43,44 @@
  * </pre>
  * 
  * 
- */ 
-public class ArtifactResponseType
-    extends StatusResponseType
+ */
+public class ArtifactResponseType extends StatusResponseType
 {
+   private static final long serialVersionUID = 1L;
 
-    protected Object any;
+   protected Object any;
 
-    /**
-     * Gets the value of the any property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link Element }
-     *     {@link Object }
-     *     
-     */
-    public Object getAny() {
-        return any;
-    }
+   public ArtifactResponseType(String id, XMLGregorianCalendar issueInstant)
+   {
+      super(id, issueInstant);
+   }
 
-    /**
-     * Sets the value of the any property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link Element }
-     *     {@link Object }
-     *     
-     */
-    public void setAny(Object value) {
-        this.any = value;
-    }
+   /**
+    * Gets the value of the any property.
+    * 
+    * @return
+    *     possible object is
+    *     {@link Element }
+    *     {@link Object }
+    *     
+    */
+   public Object getAny()
+   {
+      return any;
+   }
 
+   /**
+    * Sets the value of the any property.
+    * 
+    * @param value
+    *     allowed object is
+    *     {@link Element }
+    *     {@link Object }
+    *     
+    */
+   public void setAny(Object value)
+   {
+      this.any = value;
+   }
+
 }

Modified: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/protocol/AssertionIDRequestType.java
===================================================================
--- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/protocol/AssertionIDRequestType.java	2011-06-21 21:10:53 UTC (rev 1021)
+++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/protocol/AssertionIDRequestType.java	2011-06-23 01:04:12 UTC (rev 1022)
@@ -27,7 +27,6 @@
 
 import javax.xml.datatype.XMLGregorianCalendar;
 
-
 /**
  * <p>Java class for AssertionIDRequestType complex type.
  * 
@@ -46,41 +45,42 @@
  * </pre>
  * 
  * 
- */ 
-public class AssertionIDRequestType
-extends RequestAbstractType
-{ 
+ */
+public class AssertionIDRequestType extends RequestAbstractType
+{
+   private static final long serialVersionUID = 1L;
+
    protected List<String> assertionIDRef = new ArrayList<String>();
-    
-   public AssertionIDRequestType(String id, String version, XMLGregorianCalendar instant)
+
+   public AssertionIDRequestType(String id, XMLGregorianCalendar instant)
    {
-      super(id, version, instant);
+      super(id, instant);
    }
 
    /**
     * Add assertion id reference
     * @param id
     */
-   public void addAssertionIDRef( String id )
+   public void addAssertionIDRef(String id)
    {
-      assertionIDRef.add( id );
+      assertionIDRef.add(id);
    }
-   
+
    /**
     * remove assertion id reference
     * @param id
     */
-   public void removeAssertionIDRef( String id )
+   public void removeAssertionIDRef(String id)
    {
-      assertionIDRef.remove( id );
+      assertionIDRef.remove(id);
    }
 
    /**
     * Gets the value of the assertionIDRef property.
     *  
     */
-   public List<String> getAssertionIDRef() 
+   public List<String> getAssertionIDRef()
    {
-      return Collections.unmodifiableList( this.assertionIDRef );
+      return Collections.unmodifiableList(this.assertionIDRef);
    }
 }
\ No newline at end of file

Modified: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/protocol/AttributeQueryType.java
===================================================================
--- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/protocol/AttributeQueryType.java	2011-06-21 21:10:53 UTC (rev 1021)
+++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/protocol/AttributeQueryType.java	2011-06-23 01:04:12 UTC (rev 1022)
@@ -28,9 +28,7 @@
 import javax.xml.datatype.XMLGregorianCalendar;
 
 import org.picketlink.identity.federation.saml.v2.assertion.AttributeType;
- 
 
-
 /**
  * <p>Java class for AttributeQueryType complex type.
  * 
@@ -49,40 +47,41 @@
  * </pre>
  * 
  * 
- */ 
-public class AttributeQueryType
-extends SubjectQueryAbstractType
+ */
+public class AttributeQueryType extends SubjectQueryAbstractType
 {
+   private static final long serialVersionUID = 1L;
+
    protected List<AttributeType> attribute = new ArrayList<AttributeType>();
-  
-   public AttributeQueryType(String id, String version, XMLGregorianCalendar instant)
+
+   public AttributeQueryType(String id, XMLGregorianCalendar instant)
    {
-      super(id, version, instant); 
+      super(id, instant);
    }
 
    /**
     * Add an attribute
     * @param att
     */
-   public void add( AttributeType att )
+   public void add(AttributeType att)
    {
       this.attribute.add(att);
    }
-   
+
    /**
     * Remove an attribute
     * @param att
     */
-   public void remove( AttributeType att )
+   public void remove(AttributeType att)
    {
       this.attribute.remove(att);
    }
-   
+
    /**
     * Gets the value of the attribute property. 
     */
-   public List<AttributeType> getAttribute() 
+   public List<AttributeType> getAttribute()
    {
-      return Collections.unmodifiableList( this.attribute );
+      return Collections.unmodifiableList(this.attribute);
    }
 }
\ No newline at end of file

Modified: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/protocol/AuthnQueryType.java
===================================================================
--- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/protocol/AuthnQueryType.java	2011-06-21 21:10:53 UTC (rev 1021)
+++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/protocol/AuthnQueryType.java	2011-06-23 01:04:12 UTC (rev 1022)
@@ -23,7 +23,6 @@
 
 import javax.xml.datatype.XMLGregorianCalendar;
 
-
 /**
  * <p>Java class for AuthnQueryType complex type.
  * 
@@ -43,17 +42,18 @@
  * </pre>
  * 
  * 
- */ 
-public class AuthnQueryType
-extends SubjectQueryAbstractType
-{ 
-   protected RequestedAuthnContextType requestedAuthnContext; 
+ */
+public class AuthnQueryType extends SubjectQueryAbstractType
+{
+   private static final long serialVersionUID = 1L;
+
+   protected RequestedAuthnContextType requestedAuthnContext;
+
    protected String sessionIndex;
 
-   
-   public AuthnQueryType(String id, String version, XMLGregorianCalendar instant)
+   public AuthnQueryType(String id, XMLGregorianCalendar instant)
    {
-      super(id, version, instant); 
+      super(id, instant);
    }
 
    /**
@@ -64,7 +64,8 @@
     *     {@link RequestedAuthnContextType }
     *     
     */
-   public RequestedAuthnContextType getRequestedAuthnContext() {
+   public RequestedAuthnContextType getRequestedAuthnContext()
+   {
       return requestedAuthnContext;
    }
 
@@ -76,7 +77,8 @@
     *     {@link RequestedAuthnContextType }
     *     
     */
-   public void setRequestedAuthnContext(RequestedAuthnContextType value) {
+   public void setRequestedAuthnContext(RequestedAuthnContextType value)
+   {
       this.requestedAuthnContext = value;
    }
 
@@ -88,7 +90,8 @@
     *     {@link String }
     *     
     */
-   public String getSessionIndex() {
+   public String getSessionIndex()
+   {
       return sessionIndex;
    }
 
@@ -100,7 +103,8 @@
     *     {@link String }
     *     
     */
-   public void setSessionIndex(String value) {
+   public void setSessionIndex(String value)
+   {
       this.sessionIndex = value;
    }
 }
\ No newline at end of file

Modified: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/protocol/AuthnRequestType.java
===================================================================
--- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/protocol/AuthnRequestType.java	2011-06-21 21:10:53 UTC (rev 1021)
+++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/protocol/AuthnRequestType.java	2011-06-23 01:04:12 UTC (rev 1022)
@@ -28,8 +28,6 @@
 import org.picketlink.identity.federation.saml.v2.assertion.ConditionsType;
 import org.picketlink.identity.federation.saml.v2.assertion.SubjectType;
 
-
-
 /**
  * <p>Java class for AuthnRequestType complex type.
  * 
@@ -59,26 +57,38 @@
  * </pre>
  * 
  * 
- */ 
-public class AuthnRequestType
-extends RequestAbstractType
+ */
+public class AuthnRequestType extends RequestAbstractType
 {
-   protected SubjectType subject; 
-   protected NameIDPolicyType nameIDPolicy; 
-   protected ConditionsType conditions; 
-   protected RequestedAuthnContextType requestedAuthnContext; 
-   protected ScopingType scoping; 
-   protected Boolean forceAuthn; 
-   protected Boolean isPassive; 
-   protected URI protocolBinding; 
-   protected Integer assertionConsumerServiceIndex; 
-   protected URI assertionConsumerServiceURL; 
-   protected Integer attributeConsumingServiceIndex; 
+   private static final long serialVersionUID = 1L;
+
+   protected SubjectType subject;
+
+   protected NameIDPolicyType nameIDPolicy;
+
+   protected ConditionsType conditions;
+
+   protected RequestedAuthnContextType requestedAuthnContext;
+
+   protected ScopingType scoping;
+
+   protected Boolean forceAuthn;
+
+   protected Boolean isPassive;
+
+   protected URI protocolBinding;
+
+   protected Integer assertionConsumerServiceIndex;
+
+   protected URI assertionConsumerServiceURL;
+
+   protected Integer attributeConsumingServiceIndex;
+
    protected String providerName;
 
-   public AuthnRequestType(String id, String version, XMLGregorianCalendar instant)
+   public AuthnRequestType(String id, XMLGregorianCalendar instant)
    {
-      super(id, version, instant);
+      super(id, instant);
    }
 
    /**
@@ -89,7 +99,8 @@
     *     {@link SubjectType }
     *     
     */
-   public SubjectType getSubject() {
+   public SubjectType getSubject()
+   {
       return subject;
    }
 
@@ -101,7 +112,8 @@
     *     {@link SubjectType }
     *     
     */
-   public void setSubject(SubjectType value) {
+   public void setSubject(SubjectType value)
+   {
       this.subject = value;
    }
 
@@ -113,7 +125,8 @@
     *     {@link NameIDPolicyType }
     *     
     */
-   public NameIDPolicyType getNameIDPolicy() {
+   public NameIDPolicyType getNameIDPolicy()
+   {
       return nameIDPolicy;
    }
 
@@ -125,7 +138,8 @@
     *     {@link NameIDPolicyType }
     *     
     */
-   public void setNameIDPolicy(NameIDPolicyType value) {
+   public void setNameIDPolicy(NameIDPolicyType value)
+   {
       this.nameIDPolicy = value;
    }
 
@@ -137,7 +151,8 @@
     *     {@link ConditionsType }
     *     
     */
-   public ConditionsType getConditions() {
+   public ConditionsType getConditions()
+   {
       return conditions;
    }
 
@@ -149,7 +164,8 @@
     *     {@link ConditionsType }
     *     
     */
-   public void setConditions(ConditionsType value) {
+   public void setConditions(ConditionsType value)
+   {
       this.conditions = value;
    }
 
@@ -161,7 +177,8 @@
     *     {@link RequestedAuthnContextType }
     *     
     */
-   public RequestedAuthnContextType getRequestedAuthnContext() {
+   public RequestedAuthnContextType getRequestedAuthnContext()
+   {
       return requestedAuthnContext;
    }
 
@@ -173,7 +190,8 @@
     *     {@link RequestedAuthnContextType }
     *     
     */
-   public void setRequestedAuthnContext(RequestedAuthnContextType value) {
+   public void setRequestedAuthnContext(RequestedAuthnContextType value)
+   {
       this.requestedAuthnContext = value;
    }
 
@@ -185,7 +203,8 @@
     *     {@link ScopingType }
     *     
     */
-   public ScopingType getScoping() {
+   public ScopingType getScoping()
+   {
       return scoping;
    }
 
@@ -197,7 +216,8 @@
     *     {@link ScopingType }
     *     
     */
-   public void setScoping(ScopingType value) {
+   public void setScoping(ScopingType value)
+   {
       this.scoping = value;
    }
 
@@ -209,7 +229,8 @@
     *     {@link Boolean }
     *     
     */
-   public Boolean isForceAuthn() {
+   public Boolean isForceAuthn()
+   {
       return forceAuthn;
    }
 
@@ -221,7 +242,8 @@
     *     {@link Boolean }
     *     
     */
-   public void setForceAuthn(Boolean value) {
+   public void setForceAuthn(Boolean value)
+   {
       this.forceAuthn = value;
    }
 
@@ -233,7 +255,8 @@
     *     {@link Boolean }
     *     
     */
-   public Boolean isIsPassive() {
+   public Boolean isIsPassive()
+   {
       return isPassive;
    }
 
@@ -245,7 +268,8 @@
     *     {@link Boolean }
     *     
     */
-   public void setIsPassive(Boolean value) {
+   public void setIsPassive(Boolean value)
+   {
       this.isPassive = value;
    }
 
@@ -257,7 +281,8 @@
     *     {@link String }
     *     
     */
-   public URI getProtocolBinding() {
+   public URI getProtocolBinding()
+   {
       return protocolBinding;
    }
 
@@ -269,7 +294,8 @@
     *     {@link String }
     *     
     */
-   public void setProtocolBinding( URI value) {
+   public void setProtocolBinding(URI value)
+   {
       this.protocolBinding = value;
    }
 
@@ -281,7 +307,8 @@
     *     {@link Integer }
     *     
     */
-   public Integer getAssertionConsumerServiceIndex() {
+   public Integer getAssertionConsumerServiceIndex()
+   {
       return assertionConsumerServiceIndex;
    }
 
@@ -293,7 +320,8 @@
     *     {@link Integer }
     *     
     */
-   public void setAssertionConsumerServiceIndex(Integer value) {
+   public void setAssertionConsumerServiceIndex(Integer value)
+   {
       this.assertionConsumerServiceIndex = value;
    }
 
@@ -305,7 +333,8 @@
     *     {@link String }
     *     
     */
-   public URI getAssertionConsumerServiceURL() {
+   public URI getAssertionConsumerServiceURL()
+   {
       return assertionConsumerServiceURL;
    }
 
@@ -317,7 +346,8 @@
     *     {@link String }
     *     
     */
-   public void setAssertionConsumerServiceURL( URI value) {
+   public void setAssertionConsumerServiceURL(URI value)
+   {
       this.assertionConsumerServiceURL = value;
    }
 
@@ -329,7 +359,8 @@
     *     {@link Integer }
     *     
     */
-   public Integer getAttributeConsumingServiceIndex() {
+   public Integer getAttributeConsumingServiceIndex()
+   {
       return attributeConsumingServiceIndex;
    }
 
@@ -341,7 +372,8 @@
     *     {@link Integer }
     *     
     */
-   public void setAttributeConsumingServiceIndex(Integer value) {
+   public void setAttributeConsumingServiceIndex(Integer value)
+   {
       this.attributeConsumingServiceIndex = value;
    }
 
@@ -353,7 +385,8 @@
     *     {@link String }
     *     
     */
-   public String getProviderName() {
+   public String getProviderName()
+   {
       return providerName;
    }
 
@@ -365,7 +398,8 @@
     *     {@link String }
     *     
     */
-   public void setProviderName(String value) {
+   public void setProviderName(String value)
+   {
       this.providerName = value;
    }
 }
\ No newline at end of file

Modified: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/protocol/AuthzDecisionQueryType.java
===================================================================
--- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/protocol/AuthzDecisionQueryType.java	2011-06-21 21:10:53 UTC (rev 1021)
+++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/protocol/AuthzDecisionQueryType.java	2011-06-23 01:04:12 UTC (rev 1022)
@@ -24,14 +24,13 @@
 import java.net.URI;
 import java.util.ArrayList;
 import java.util.Collections;
-import java.util.List; 
+import java.util.List;
 
 import javax.xml.datatype.XMLGregorianCalendar;
 
 import org.picketlink.identity.federation.saml.v2.assertion.ActionType;
 import org.picketlink.identity.federation.saml.v2.assertion.EvidenceType;
 
-
 /**
  * <p>Java class for AuthzDecisionQueryType complex type.
  * 
@@ -50,33 +49,36 @@
  *   &lt;/complexContent>
  * &lt;/complexType>
  * </pre> 
- */ 
-public class AuthzDecisionQueryType
-extends SubjectQueryAbstractType
-{ 
-   protected List<ActionType> action = new ArrayList<ActionType> (); 
-   protected EvidenceType evidence; 
+ */
+public class AuthzDecisionQueryType extends SubjectQueryAbstractType
+{
+   private static final long serialVersionUID = 1L;
+
+   protected List<ActionType> action = new ArrayList<ActionType>();
+
+   protected EvidenceType evidence;
+
    protected URI resource;
-    
-   public AuthzDecisionQueryType(String id, String version, XMLGregorianCalendar instant)
+
+   public AuthzDecisionQueryType(String id, XMLGregorianCalendar instant)
    {
-      super(id, version, instant); 
+      super(id, instant);
    }
 
    /**
     * Add an action
     * @param act
     */
-   public void addAction( ActionType act )
+   public void addAction(ActionType act)
    {
       this.action.add(act);
    }
-   
+
    /**
     * Remove an action
     * @param act
     */
-   public void removeAction( ActionType act )
+   public void removeAction(ActionType act)
    {
       this.action.remove(act);
    }
@@ -84,9 +86,9 @@
    /**
     * Gets the value of the action property.  
     */
-   public List<ActionType> getAction() 
-   { 
-      return Collections.unmodifiableList( this.action );
+   public List<ActionType> getAction()
+   {
+      return Collections.unmodifiableList(this.action);
    }
 
    /**
@@ -97,7 +99,7 @@
     *     {@link EvidenceType }
     *     
     */
-   public EvidenceType getEvidence() 
+   public EvidenceType getEvidence()
    {
       return evidence;
    }
@@ -110,7 +112,7 @@
     *     {@link EvidenceType }
     *     
     */
-   public void setEvidence(EvidenceType value) 
+   public void setEvidence(EvidenceType value)
    {
       this.evidence = value;
    }
@@ -123,7 +125,7 @@
     *     {@link String }
     *     
     */
-   public URI getResource() 
+   public URI getResource()
    {
       return resource;
    }
@@ -136,8 +138,8 @@
     *     {@link String }
     *     
     */
-   public void setResource( URI value) 
+   public void setResource(URI value)
    {
       this.resource = value;
-   } 
+   }
 }
\ No newline at end of file

Modified: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/protocol/LogoutRequestType.java
===================================================================
--- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/protocol/LogoutRequestType.java	2011-06-21 21:10:53 UTC (rev 1021)
+++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/protocol/LogoutRequestType.java	2011-06-23 01:04:12 UTC (rev 1022)
@@ -23,15 +23,14 @@
 
 import java.util.ArrayList;
 import java.util.Collections;
-import java.util.List; 
+import java.util.List;
+
 import javax.xml.datatype.XMLGregorianCalendar;
 
 import org.picketlink.identity.federation.saml.v2.assertion.BaseIDAbstractType;
 import org.picketlink.identity.federation.saml.v2.assertion.EncryptedElementType;
 import org.picketlink.identity.federation.saml.v2.assertion.NameIDType;
- 
 
-
 /**
  * <p>Java class for LogoutRequestType complex type.
  * 
@@ -57,21 +56,26 @@
  * </pre>
  * 
  * 
- */ 
-public class LogoutRequestType
-    extends RequestAbstractType
-{ 
-    protected BaseIDAbstractType baseID;
-    protected NameIDType nameID; 
-    protected EncryptedElementType encryptedID; 
-    protected List<String> sessionIndex = new ArrayList<String>(); 
-    protected String reason; 
-    protected XMLGregorianCalendar notOnOrAfter;
+ */
+public class LogoutRequestType extends RequestAbstractType
+{
+   private static final long serialVersionUID = 1L;
 
-    
-    public LogoutRequestType(String id, String version, XMLGregorianCalendar instant)
+   protected BaseIDAbstractType baseID;
+
+   protected NameIDType nameID;
+
+   protected EncryptedElementType encryptedID;
+
+   protected List<String> sessionIndex = new ArrayList<String>();
+
+   protected String reason;
+
+   protected XMLGregorianCalendar notOnOrAfter;
+
+   public LogoutRequestType(String id, XMLGregorianCalendar instant)
    {
-      super(id, version, instant); 
+      super(id, instant);
    }
 
    /**
@@ -82,143 +86,153 @@
      *     {@link BaseIDAbstractType }
      *     
      */
-    public BaseIDAbstractType getBaseID() {
-        return baseID;
-    }
+   public BaseIDAbstractType getBaseID()
+   {
+      return baseID;
+   }
 
-    /**
-     * Sets the value of the baseID property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link BaseIDAbstractType }
-     *     
-     */
-    public void setBaseID(BaseIDAbstractType value) {
-        this.baseID = value;
-    }
+   /**
+    * Sets the value of the baseID property.
+    * 
+    * @param value
+    *     allowed object is
+    *     {@link BaseIDAbstractType }
+    *     
+    */
+   public void setBaseID(BaseIDAbstractType value)
+   {
+      this.baseID = value;
+   }
 
-    /**
-     * Gets the value of the nameID property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link NameIDType }
-     *     
-     */
-    public NameIDType getNameID() {
-        return nameID;
-    }
+   /**
+    * Gets the value of the nameID property.
+    * 
+    * @return
+    *     possible object is
+    *     {@link NameIDType }
+    *     
+    */
+   public NameIDType getNameID()
+   {
+      return nameID;
+   }
 
-    /**
-     * Sets the value of the nameID property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link NameIDType }
-     *     
-     */
-    public void setNameID(NameIDType value) {
-        this.nameID = value;
-    }
+   /**
+    * Sets the value of the nameID property.
+    * 
+    * @param value
+    *     allowed object is
+    *     {@link NameIDType }
+    *     
+    */
+   public void setNameID(NameIDType value)
+   {
+      this.nameID = value;
+   }
 
-    /**
-     * Gets the value of the encryptedID property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link EncryptedElementType }
-     *     
-     */
-    public EncryptedElementType getEncryptedID() {
-        return encryptedID;
-    }
+   /**
+    * Gets the value of the encryptedID property.
+    * 
+    * @return
+    *     possible object is
+    *     {@link EncryptedElementType }
+    *     
+    */
+   public EncryptedElementType getEncryptedID()
+   {
+      return encryptedID;
+   }
 
-    /**
-     * Sets the value of the encryptedID property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link EncryptedElementType }
-     *     
-     */
-    public void setEncryptedID(EncryptedElementType value) {
-        this.encryptedID = value;
-    }
-    
-    /**
-     * Add session index
-     * @param index
-     */
-    public void addSessionIndex( String index )
-    {
-       this.sessionIndex.add( index );
-    }
-    
-    /**
-     * Remove session index
-     * @param index
-     */
-    public void removeSessionIndex( String index )
-    {
-       this.sessionIndex.remove( index );
-    }
+   /**
+    * Sets the value of the encryptedID property.
+    * 
+    * @param value
+    *     allowed object is
+    *     {@link EncryptedElementType }
+    *     
+    */
+   public void setEncryptedID(EncryptedElementType value)
+   {
+      this.encryptedID = value;
+   }
 
-    /**
-     * Gets the value of the sessionIndex property.
-     *  
-     */
-    public List<String> getSessionIndex() 
-    { 
-        return Collections.unmodifiableList( this.sessionIndex );
-    }
+   /**
+    * Add session index
+    * @param index
+    */
+   public void addSessionIndex(String index)
+   {
+      this.sessionIndex.add(index);
+   }
 
-    /**
-     * Gets the value of the reason property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getReason() {
-        return reason;
-    }
+   /**
+    * Remove session index
+    * @param index
+    */
+   public void removeSessionIndex(String index)
+   {
+      this.sessionIndex.remove(index);
+   }
 
-    /**
-     * Sets the value of the reason property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setReason(String value) {
-        this.reason = value;
-    }
+   /**
+    * Gets the value of the sessionIndex property.
+    *  
+    */
+   public List<String> getSessionIndex()
+   {
+      return Collections.unmodifiableList(this.sessionIndex);
+   }
 
-    /**
-     * Gets the value of the notOnOrAfter property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link XMLGregorianCalendar }
-     *     
-     */
-    public XMLGregorianCalendar getNotOnOrAfter() {
-        return notOnOrAfter;
-    }
+   /**
+    * Gets the value of the reason property.
+    * 
+    * @return
+    *     possible object is
+    *     {@link String }
+    *     
+    */
+   public String getReason()
+   {
+      return reason;
+   }
 
-    /**
-     * Sets the value of the notOnOrAfter property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link XMLGregorianCalendar }
-     *     
-     */
-    public void setNotOnOrAfter(XMLGregorianCalendar value) {
-        this.notOnOrAfter = value;
-    }
+   /**
+    * Sets the value of the reason property.
+    * 
+    * @param value
+    *     allowed object is
+    *     {@link String }
+    *     
+    */
+   public void setReason(String value)
+   {
+      this.reason = value;
+   }
 
+   /**
+    * Gets the value of the notOnOrAfter property.
+    * 
+    * @return
+    *     possible object is
+    *     {@link XMLGregorianCalendar }
+    *     
+    */
+   public XMLGregorianCalendar getNotOnOrAfter()
+   {
+      return notOnOrAfter;
+   }
+
+   /**
+    * Sets the value of the notOnOrAfter property.
+    * 
+    * @param value
+    *     allowed object is
+    *     {@link XMLGregorianCalendar }
+    *     
+    */
+   public void setNotOnOrAfter(XMLGregorianCalendar value)
+   {
+      this.notOnOrAfter = value;
+   }
+
 }

Modified: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/protocol/ManageNameIDRequestType.java
===================================================================
--- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/protocol/ManageNameIDRequestType.java	2011-06-21 21:10:53 UTC (rev 1021)
+++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/protocol/ManageNameIDRequestType.java	2011-06-23 01:04:12 UTC (rev 1022)
@@ -26,8 +26,6 @@
 import org.picketlink.identity.federation.saml.v2.assertion.EncryptedElementType;
 import org.picketlink.identity.federation.saml.v2.assertion.NameIDType;
 
-
-
 /**
  * <p>Java class for ManageNameIDRequestType complex type.
  * 
@@ -54,20 +52,24 @@
  * </pre>
  * 
  * 
- */ 
-public class ManageNameIDRequestType
-extends RequestAbstractType
-{ 
-   protected NameIDType nameID; 
-   protected EncryptedElementType encryptedID; 
-   protected String newID; 
-   protected EncryptedElementType newEncryptedID; 
+ */
+public class ManageNameIDRequestType extends RequestAbstractType
+{
+   private static final long serialVersionUID = 1L;
+
+   protected NameIDType nameID;
+
+   protected EncryptedElementType encryptedID;
+
+   protected String newID;
+
+   protected EncryptedElementType newEncryptedID;
+
    protected TerminateType terminate;
 
-   
-   public ManageNameIDRequestType(String id, String version, XMLGregorianCalendar instant)
+   public ManageNameIDRequestType(String id, XMLGregorianCalendar instant)
    {
-      super(id, version, instant); 
+      super(id, instant);
    }
 
    /**
@@ -78,7 +80,8 @@
     *     {@link NameIDType }
     *     
     */
-   public NameIDType getNameID() {
+   public NameIDType getNameID()
+   {
       return nameID;
    }
 
@@ -90,7 +93,8 @@
     *     {@link NameIDType }
     *     
     */
-   public void setNameID(NameIDType value) {
+   public void setNameID(NameIDType value)
+   {
       this.nameID = value;
    }
 
@@ -102,7 +106,8 @@
     *     {@link EncryptedElementType }
     *     
     */
-   public EncryptedElementType getEncryptedID() {
+   public EncryptedElementType getEncryptedID()
+   {
       return encryptedID;
    }
 
@@ -114,7 +119,8 @@
     *     {@link EncryptedElementType }
     *     
     */
-   public void setEncryptedID(EncryptedElementType value) {
+   public void setEncryptedID(EncryptedElementType value)
+   {
       this.encryptedID = value;
    }
 
@@ -126,7 +132,8 @@
     *     {@link String }
     *     
     */
-   public String getNewID() {
+   public String getNewID()
+   {
       return newID;
    }
 
@@ -138,7 +145,8 @@
     *     {@link String }
     *     
     */
-   public void setNewID(String value) {
+   public void setNewID(String value)
+   {
       this.newID = value;
    }
 
@@ -150,7 +158,8 @@
     *     {@link EncryptedElementType }
     *     
     */
-   public EncryptedElementType getNewEncryptedID() {
+   public EncryptedElementType getNewEncryptedID()
+   {
       return newEncryptedID;
    }
 
@@ -162,7 +171,8 @@
     *     {@link EncryptedElementType }
     *     
     */
-   public void setNewEncryptedID(EncryptedElementType value) {
+   public void setNewEncryptedID(EncryptedElementType value)
+   {
       this.newEncryptedID = value;
    }
 
@@ -174,7 +184,8 @@
     *     {@link TerminateType }
     *     
     */
-   public TerminateType getTerminate() {
+   public TerminateType getTerminate()
+   {
       return terminate;
    }
 
@@ -186,7 +197,8 @@
     *     {@link TerminateType }
     *     
     */
-   public void setTerminate(TerminateType value) {
+   public void setTerminate(TerminateType value)
+   {
       this.terminate = value;
    }
 

Modified: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/protocol/NameIDMappingRequestType.java
===================================================================
--- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/protocol/NameIDMappingRequestType.java	2011-06-21 21:10:53 UTC (rev 1021)
+++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/protocol/NameIDMappingRequestType.java	2011-06-23 01:04:12 UTC (rev 1022)
@@ -26,9 +26,7 @@
 import org.picketlink.identity.federation.saml.v2.assertion.BaseIDAbstractType;
 import org.picketlink.identity.federation.saml.v2.assertion.EncryptedElementType;
 import org.picketlink.identity.federation.saml.v2.assertion.NameIDType;
- 
 
-
 /**
  * <p>Java class for NameIDMappingRequestType complex type.
  * 
@@ -52,19 +50,22 @@
  * </pre>
  * 
  * 
- */ 
-public class NameIDMappingRequestType
-extends RequestAbstractType
-{ 
-   protected BaseIDAbstractType baseID; 
-   protected NameIDType nameID; 
-   protected EncryptedElementType encryptedID; 
+ */
+public class NameIDMappingRequestType extends RequestAbstractType
+{
+   private static final long serialVersionUID = 1L;
+
+   protected BaseIDAbstractType baseID;
+
+   protected NameIDType nameID;
+
+   protected EncryptedElementType encryptedID;
+
    protected NameIDPolicyType nameIDPolicy;
 
-   
-   public NameIDMappingRequestType(String id, String version, XMLGregorianCalendar instant)
+   public NameIDMappingRequestType(String id, XMLGregorianCalendar instant)
    {
-      super(id, version, instant); 
+      super(id, instant);
    }
 
    /**
@@ -75,7 +76,8 @@
     *     {@link BaseIDAbstractType }
     *     
     */
-   public BaseIDAbstractType getBaseID() {
+   public BaseIDAbstractType getBaseID()
+   {
       return baseID;
    }
 
@@ -87,7 +89,8 @@
     *     {@link BaseIDAbstractType }
     *     
     */
-   public void setBaseID(BaseIDAbstractType value) {
+   public void setBaseID(BaseIDAbstractType value)
+   {
       this.baseID = value;
    }
 
@@ -99,7 +102,8 @@
     *     {@link NameIDType }
     *     
     */
-   public NameIDType getNameID() {
+   public NameIDType getNameID()
+   {
       return nameID;
    }
 
@@ -111,7 +115,8 @@
     *     {@link NameIDType }
     *     
     */
-   public void setNameID(NameIDType value) {
+   public void setNameID(NameIDType value)
+   {
       this.nameID = value;
    }
 
@@ -123,7 +128,8 @@
     *     {@link EncryptedElementType }
     *     
     */
-   public EncryptedElementType getEncryptedID() {
+   public EncryptedElementType getEncryptedID()
+   {
       return encryptedID;
    }
 
@@ -135,7 +141,8 @@
     *     {@link EncryptedElementType }
     *     
     */
-   public void setEncryptedID(EncryptedElementType value) {
+   public void setEncryptedID(EncryptedElementType value)
+   {
       this.encryptedID = value;
    }
 
@@ -147,7 +154,8 @@
     *     {@link NameIDPolicyType }
     *     
     */
-   public NameIDPolicyType getNameIDPolicy() {
+   public NameIDPolicyType getNameIDPolicy()
+   {
       return nameIDPolicy;
    }
 
@@ -159,7 +167,8 @@
     *     {@link NameIDPolicyType }
     *     
     */
-   public void setNameIDPolicy(NameIDPolicyType value) {
+   public void setNameIDPolicy(NameIDPolicyType value)
+   {
       this.nameIDPolicy = value;
    }
 }
\ No newline at end of file

Modified: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/protocol/NameIDMappingResponseType.java
===================================================================
--- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/protocol/NameIDMappingResponseType.java	2011-06-21 21:10:53 UTC (rev 1021)
+++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/protocol/NameIDMappingResponseType.java	2011-06-23 01:04:12 UTC (rev 1022)
@@ -21,6 +21,8 @@
  */
 package org.picketlink.identity.federation.saml.v2.protocol;
 
+import javax.xml.datatype.XMLGregorianCalendar;
+
 import org.picketlink.identity.federation.saml.v2.assertion.EncryptedElementType;
 import org.picketlink.identity.federation.saml.v2.assertion.NameIDType;
 
@@ -44,12 +46,19 @@
  * 
  * 
  */
-public class NameIDMappingResponseType
-extends StatusResponseType
+public class NameIDMappingResponseType extends StatusResponseType
 {
-   protected NameIDType nameID; 
+   private static final long serialVersionUID = 1L;
+
+   protected NameIDType nameID;
+
    protected EncryptedElementType encryptedID;
 
+   public NameIDMappingResponseType(String id, XMLGregorianCalendar issueInstant)
+   {
+      super(id, issueInstant);
+   }
+
    /**
     * Gets the value of the nameID property.
     * 
@@ -58,7 +67,8 @@
     *     {@link NameIDType }
     *     
     */
-   public NameIDType getNameID() {
+   public NameIDType getNameID()
+   {
       return nameID;
    }
 
@@ -70,7 +80,8 @@
     *     {@link NameIDType }
     *     
     */
-   public void setNameID(NameIDType value) {
+   public void setNameID(NameIDType value)
+   {
       this.nameID = value;
    }
 
@@ -82,7 +93,8 @@
     *     {@link EncryptedElementType }
     *     
     */
-   public EncryptedElementType getEncryptedID() {
+   public EncryptedElementType getEncryptedID()
+   {
       return encryptedID;
    }
 
@@ -94,7 +106,8 @@
     *     {@link EncryptedElementType }
     *     
     */
-   public void setEncryptedID(EncryptedElementType value) {
+   public void setEncryptedID(EncryptedElementType value)
+   {
       this.encryptedID = value;
    }
 }
\ No newline at end of file

Modified: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/protocol/RequestAbstractType.java
===================================================================
--- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/protocol/RequestAbstractType.java	2011-06-21 21:10:53 UTC (rev 1021)
+++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/protocol/RequestAbstractType.java	2011-06-23 01:04:12 UTC (rev 1022)
@@ -25,12 +25,10 @@
 
 import javax.xml.datatype.XMLGregorianCalendar;
 
+import org.picketlink.identity.federation.saml.common.CommonRequestAbstractType;
 import org.picketlink.identity.federation.saml.v2.SAML2Object;
 import org.picketlink.identity.federation.saml.v2.assertion.NameIDType;
-import org.picketlink.identity.xmlsec.w3.xmldsig.SignatureType;
-import org.w3c.dom.Element;
 
-
 /**
  * <p>Java class for RequestAbstractType complex type.
  * 
@@ -56,26 +54,26 @@
  * </pre>
  * 
  * 
- */ 
-public abstract class RequestAbstractType implements SAML2Object 
+ */
+public abstract class RequestAbstractType extends CommonRequestAbstractType implements SAML2Object
 {
-   protected String id;
+   private static final long serialVersionUID = 1L;
 
-   protected NameIDType issuer; 
-   protected Element signature; 
+   protected NameIDType issuer;
+
    protected ExtensionsType extensions;
-   protected String version; 
-   protected XMLGregorianCalendar issueInstant; 
-   protected URI destination; 
+
+   protected String version = "2.0";
+
+   protected URI destination;
+
    protected String consent;
 
-   public RequestAbstractType( String id, String version, XMLGregorianCalendar instant )
+   public RequestAbstractType(String id, XMLGregorianCalendar instant)
    {
-      this.id = id;
-      this.version = version;
-      this.issueInstant = instant;
+      super(id, instant);
    }
-   
+
    /**
     * Gets the value of the issuer property.
     * 
@@ -84,7 +82,8 @@
     *     {@link NameIDType }
     *     
     */
-   public NameIDType getIssuer() {
+   public NameIDType getIssuer()
+   {
       return issuer;
    }
 
@@ -96,35 +95,12 @@
     *     {@link NameIDType }
     *     
     */
-   public void setIssuer(NameIDType value) {
+   public void setIssuer(NameIDType value)
+   {
       this.issuer = value;
    }
 
    /**
-    * Gets the value of the signature property.
-    * 
-    * @return
-    *     possible object is
-    *     {@link SignatureType }
-    *     
-    */
-   public Element getSignature() {
-      return signature;
-   }
-
-   /**
-    * Sets the value of the signature property.
-    * 
-    * @param value
-    *     allowed object is
-    *     {@link SignatureType }
-    *     
-    */
-   public void setSignature(Element value) {
-      this.signature = value;
-   }
-
-   /**
     * Gets the value of the extensions property.
     * 
     * @return
@@ -132,7 +108,8 @@
     *     {@link ExtensionsType }
     *     
     */
-   public ExtensionsType getExtensions() {
+   public ExtensionsType getExtensions()
+   {
       return extensions;
    }
 
@@ -144,23 +121,12 @@
     *     {@link ExtensionsType }
     *     
     */
-   public void setExtensions(ExtensionsType value) {
+   public void setExtensions(ExtensionsType value)
+   {
       this.extensions = value;
    }
 
    /**
-    * Gets the value of the id property.
-    * 
-    * @return
-    *     possible object is
-    *     {@link String }
-    *     
-    */
-   public String getID() {
-      return id;
-   }
-
-   /**
     * Gets the value of the version property.
     * 
     * @return
@@ -168,23 +134,12 @@
     *     {@link String }
     *     
     */
-   public String getVersion() {
+   public String getVersion()
+   {
       return version;
-   } 
+   }
 
    /**
-    * Gets the value of the issueInstant property.
-    * 
-    * @return
-    *     possible object is
-    *     {@link XMLGregorianCalendar }
-    *     
-    */
-   public XMLGregorianCalendar getIssueInstant() {
-      return issueInstant;
-   } 
-
-   /**
     * Gets the value of the destination property.
     * 
     * @return
@@ -192,7 +147,7 @@
     *     {@link String }
     *     
     */
-   public URI getDestination() 
+   public URI getDestination()
    {
       return destination;
    }
@@ -205,7 +160,8 @@
     *     {@link String }
     *     
     */
-   public void setDestination( URI value) {
+   public void setDestination(URI value)
+   {
       this.destination = value;
    }
 
@@ -217,7 +173,8 @@
     *     {@link String }
     *     
     */
-   public String getConsent() {
+   public String getConsent()
+   {
       return consent;
    }
 
@@ -229,8 +186,8 @@
     *     {@link String }
     *     
     */
-   public void setConsent(String value) {
+   public void setConsent(String value)
+   {
       this.consent = value;
    }
-
 }
\ No newline at end of file

Modified: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/protocol/ResponseType.java
===================================================================
--- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/protocol/ResponseType.java	2011-06-21 21:10:53 UTC (rev 1021)
+++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/protocol/ResponseType.java	2011-06-23 01:04:12 UTC (rev 1022)
@@ -25,6 +25,8 @@
 import java.util.Collections;
 import java.util.List;
 
+import javax.xml.datatype.XMLGregorianCalendar;
+
 import org.picketlink.identity.federation.saml.v2.assertion.AssertionType;
 import org.picketlink.identity.federation.saml.v2.assertion.EncryptedAssertionType;
 
@@ -47,87 +49,105 @@
  * </pre>
  * 
  * 
- */ 
-public class ResponseType
-extends StatusResponseType
-{ 
+ */
+public class ResponseType extends StatusResponseType
+{
+   private static final long serialVersionUID = 1L;
+
    protected List<RTChoiceType> assertions = new ArrayList<ResponseType.RTChoiceType>();
 
+   public ResponseType(String id, XMLGregorianCalendar issueInstant)
+   {
+      super(id, issueInstant);
+   }
+
+   public ResponseType(StatusResponseType srt)
+   {
+      super(srt);
+   }
+
    /**
     * Add an assertion
     * @param choice
     */
-   public void addAssertion( RTChoiceType choice )
+   public void addAssertion(RTChoiceType choice)
    {
       assertions.add(choice);
    }
-   
+
    /**
     * Remove an assertion
     * @param choice
     */
-   public void removeAssertion( RTChoiceType choice )
+   public void removeAssertion(RTChoiceType choice)
    {
       assertions.remove(choice);
    }
-   
+
    /**
     * Replace the first assertion with the passed assertion
     * @param id id of the old assertion
     * @param newAssertion
     */
-   public void replaceAssertion( String id,  RTChoiceType newAssertion )
+   public void replaceAssertion(String id, RTChoiceType newAssertion)
    {
       int index = 0;
-      if( id != null && !id.isEmpty())
+      if (id != null && !id.isEmpty())
       {
-         for( RTChoiceType assertion : assertions )
+         for (RTChoiceType assertion : assertions)
          {
-            if( assertion.getID().equals(id) )
+            if (assertion.getID().equals(id))
             {
                break;
             }
             index++;
-         } 
+         }
       }
-      assertions.remove(index); 
+      assertions.remove(index);
       assertions.add(index, newAssertion);
    }
 
    /**
     * Gets a read only list of assertions
     */
-   public List<RTChoiceType> getAssertions() 
+   public List<RTChoiceType> getAssertions()
    {
-      return Collections.unmodifiableList( assertions );
+      return Collections.unmodifiableList(assertions);
    }
 
    public static class RTChoiceType
    {
       private AssertionType assertion;
+
       private EncryptedAssertionType encryptedAssertion;
+
       private String id;
+
       public RTChoiceType(AssertionType assertion)
-      { 
+      {
          this.assertion = assertion;
          this.id = assertion.getID();
       }
+
       public RTChoiceType(EncryptedAssertionType encryptedAssertion)
-      { 
+      {
          this.encryptedAssertion = encryptedAssertion;
-         
+
       }
+
       public AssertionType getAssertion()
       {
          return assertion;
       }
+
       public EncryptedAssertionType getEncryptedAssertion()
       {
          return encryptedAssertion;
-      } 
+      }
+
       public String getID()
       {
-         return id; 
+         return id;
       }
-   } 
+   }
 }
\ No newline at end of file

Modified: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/protocol/StatusDetailType.java
===================================================================
--- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/protocol/StatusDetailType.java	2011-06-21 21:10:53 UTC (rev 1021)
+++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/protocol/StatusDetailType.java	2011-06-23 01:04:12 UTC (rev 1022)
@@ -21,11 +21,8 @@
  */
 package org.picketlink.identity.federation.saml.v2.protocol;
 
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
+import org.picketlink.identity.federation.saml.common.CommonStatusDetailType;
 
-
 /**
  * <p>Java class for StatusDetailType complex type.
  * 
@@ -44,34 +41,8 @@
  * </pre>
  * 
  * 
- */ 
-public class StatusDetailType 
+ */
+public class StatusDetailType extends CommonStatusDetailType
 {
-   protected List<Object> any = new ArrayList<Object>();
-
-   /**
-    * Add status detail
-    * @param obj
-    */
-   public void addStatusDetail( Object obj )
-   {
-      this.any.add( obj );
-   }
-   
-   /**
-    * Remove status detail
-    * @param obj
-    */
-   public void removeStatusDetail( Object obj )
-   {
-      this.any.remove( obj );
-   }
-
-   /**
-    * Gets the value of the any property.  Read-Only list
-    */
-   public List<Object> getAny() 
-   {
-      return Collections.unmodifiableList( this.any );
-   } 
+   private static final long serialVersionUID = 1L;
 }
\ No newline at end of file

Modified: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/protocol/StatusResponseType.java
===================================================================
--- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/protocol/StatusResponseType.java	2011-06-21 21:10:53 UTC (rev 1021)
+++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/protocol/StatusResponseType.java	2011-06-23 01:04:12 UTC (rev 1022)
@@ -23,11 +23,10 @@
 
 import javax.xml.datatype.XMLGregorianCalendar;
 
+import org.picketlink.identity.federation.saml.common.CommonResponseType;
 import org.picketlink.identity.federation.saml.v2.SAML2Object;
 import org.picketlink.identity.federation.saml.v2.assertion.NameIDType;
-import org.w3c.dom.Element;
 
-
 /**
  * <p>Java class for StatusResponseType complex type.
  * 
@@ -55,20 +54,44 @@
  * </pre>
  * 
  * 
- */ 
-public class StatusResponseType implements SAML2Object 
+ */
+public class StatusResponseType extends CommonResponseType implements SAML2Object
 {
+   private static final long serialVersionUID = 1L;
+
    protected NameIDType issuer;
-   protected Element signature; 
-   protected ExtensionsType extensions; 
-   protected StatusType status; 
-   protected String id; 
-   protected String inResponseTo; 
-   protected String version; 
-   protected XMLGregorianCalendar issueInstant; 
-   protected String destination; 
+
+   protected ExtensionsType extensions;
+
+   protected StatusType status;
+
+   protected String id;
+
+   protected String version = "2.0";
+
+   protected XMLGregorianCalendar issueInstant;
+
+   protected String destination;
+
    protected String consent;
 
+   public StatusResponseType(String id, XMLGregorianCalendar issueInstant)
+   {
+      super(id, issueInstant);
+   }
+
+   public StatusResponseType(StatusResponseType srt)
+   {
+      this(srt.getID(), srt.getIssueInstant());
+      this.issuer = srt.getIssuer();
+      this.signature = srt.getSignature();
+      this.extensions = srt.getExtensions();
+      this.status = srt.getStatus();
+      this.inResponseTo = srt.getInResponseTo();
+      this.destination = srt.getDestination();
+      this.consent = srt.getConsent();
+   }
+
    /**
     * Gets the value of the issuer property.
     * 
@@ -77,7 +100,8 @@
     *     {@link NameIDType }
     *     
     */
-   public NameIDType getIssuer() {
+   public NameIDType getIssuer()
+   {
       return issuer;
    }
 
@@ -89,35 +113,12 @@
     *     {@link NameIDType }
     *     
     */
-   public void setIssuer(NameIDType value) {
+   public void setIssuer(NameIDType value)
+   {
       this.issuer = value;
    }
 
    /**
-    * Gets the value of the signature property.
-    * 
-    * @return
-    *     possible object is
-    *     {@link SignatureType }
-    *     
-    */
-   public Element getSignature() {
-      return signature;
-   }
-
-   /**
-    * Sets the value of the signature property.
-    * 
-    * @param value
-    *     allowed object is
-    *     {@link SignatureType }
-    *     
-    */
-   public void setSignature( Element value) {
-      this.signature = value;
-   }
-
-   /**
     * Gets the value of the extensions property.
     * 
     * @return
@@ -125,7 +126,8 @@
     *     {@link ExtensionsType }
     *     
     */
-   public ExtensionsType getExtensions() {
+   public ExtensionsType getExtensions()
+   {
       return extensions;
    }
 
@@ -137,7 +139,8 @@
     *     {@link ExtensionsType }
     *     
     */
-   public void setExtensions(ExtensionsType value) {
+   public void setExtensions(ExtensionsType value)
+   {
       this.extensions = value;
    }
 
@@ -149,7 +152,8 @@
     *     {@link StatusType }
     *     
     */
-   public StatusType getStatus() {
+   public StatusType getStatus()
+   {
       return status;
    }
 
@@ -161,59 +165,12 @@
     *     {@link StatusType }
     *     
     */
-   public void setStatus(StatusType value) {
+   public void setStatus(StatusType value)
+   {
       this.status = value;
    }
 
    /**
-    * Gets the value of the id property.
-    * 
-    * @return
-    *     possible object is
-    *     {@link String }
-    *     
-    */
-   public String getID() {
-      return id;
-   }
-
-   /**
-    * 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 inResponseTo property.
-    * 
-    * @return
-    *     possible object is
-    *     {@link String }
-    *     
-    */
-   public String getInResponseTo() {
-      return inResponseTo;
-   }
-
-   /**
-    * Sets the value of the inResponseTo property.
-    * 
-    * @param value
-    *     allowed object is
-    *     {@link String }
-    *     
-    */
-   public void setInResponseTo(String value) {
-      this.inResponseTo = value;
-   }
-
-   /**
     * Gets the value of the version property.
     * 
     * @return
@@ -221,47 +178,12 @@
     *     {@link String }
     *     
     */
-   public String getVersion() {
+   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
-    *     possible object is
-    *     {@link XMLGregorianCalendar }
-    *     
-    */
-   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
@@ -269,7 +191,8 @@
     *     {@link String }
     *     
     */
-   public String getDestination() {
+   public String getDestination()
+   {
       return destination;
    }
 
@@ -281,7 +204,8 @@
     *     {@link String }
     *     
     */
-   public void setDestination(String value) {
+   public void setDestination(String value)
+   {
       this.destination = value;
    }
 
@@ -293,7 +217,8 @@
     *     {@link String }
     *     
     */
-   public String getConsent() {
+   public String getConsent()
+   {
       return consent;
    }
 
@@ -305,8 +230,8 @@
     *     {@link String }
     *     
     */
-   public void setConsent(String value) {
+   public void setConsent(String value)
+   {
       this.consent = value;
    }
-
 }
\ No newline at end of file

Modified: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/protocol/SubjectQueryAbstractType.java
===================================================================
--- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/protocol/SubjectQueryAbstractType.java	2011-06-21 21:10:53 UTC (rev 1021)
+++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/protocol/SubjectQueryAbstractType.java	2011-06-23 01:04:12 UTC (rev 1022)
@@ -25,7 +25,6 @@
 
 import org.picketlink.identity.federation.saml.v2.assertion.SubjectType;
 
-
 /**
  * <p>Java class for SubjectQueryAbstractType complex type.
  * 
@@ -44,15 +43,16 @@
  * </pre>
  * 
  * 
- */ 
-public abstract class SubjectQueryAbstractType
-extends RequestAbstractType
-{ 
-   protected SubjectType subject; 
-    
-   public SubjectQueryAbstractType(String id, String version, XMLGregorianCalendar instant)
+ */
+public abstract class SubjectQueryAbstractType extends RequestAbstractType
+{
+   private static final long serialVersionUID = 1L;
+
+   protected SubjectType subject;
+
+   public SubjectQueryAbstractType(String id, XMLGregorianCalendar instant)
    {
-      super(id, version, instant); 
+      super(id, instant);
    }
 
    public void setSubject(SubjectType subject)
@@ -60,8 +60,6 @@
       this.subject = subject;
    }
 
-
-
    /**
     * Gets the value of the subject property.
     * 
@@ -70,7 +68,7 @@
     *     {@link SubjectType }
     *     
     */
-   public SubjectType getSubject() 
+   public SubjectType getSubject()
    {
       return subject;
    }

Modified: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/protocol/XACMLAuthzDecisionQueryType.java
===================================================================
--- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/protocol/XACMLAuthzDecisionQueryType.java	2011-06-21 21:10:53 UTC (rev 1021)
+++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/protocol/XACMLAuthzDecisionQueryType.java	2011-06-23 01:04:12 UTC (rev 1022)
@@ -25,7 +25,6 @@
 
 import org.jboss.security.xacml.core.model.context.RequestType;
 
-
 /**
  * <p>Java class for XACMLAuthzDecisionQueryType complex type.
  * 
@@ -46,18 +45,20 @@
  * </pre>
  * 
  * 
- */ 
-public class XACMLAuthzDecisionQueryType
-extends RequestAbstractType
+ */
+public class XACMLAuthzDecisionQueryType extends RequestAbstractType
 {
+   private static final long serialVersionUID = 1L;
+
    protected RequestType request;
+
    protected Boolean inputContextOnly;
+
    protected Boolean returnContext;
 
-
-   public XACMLAuthzDecisionQueryType(String id, String version, XMLGregorianCalendar instant)
+   public XACMLAuthzDecisionQueryType(String id, XMLGregorianCalendar instant)
    {
-      super(id, version, instant); 
+      super(id, instant);
    }
 
    /**
@@ -68,7 +69,8 @@
     *     {@link RequestType }
     *     
     */
-   public RequestType getRequest() {
+   public RequestType getRequest()
+   {
       return request;
    }
 
@@ -80,7 +82,8 @@
     *     {@link RequestType }
     *     
     */
-   public void setRequest(RequestType value) {
+   public void setRequest(RequestType value)
+   {
       this.request = value;
    }
 
@@ -92,10 +95,14 @@
     *     {@link Boolean }
     *     
     */
-   public boolean isInputContextOnly() {
-      if (inputContextOnly == null) {
+   public boolean isInputContextOnly()
+   {
+      if (inputContextOnly == null)
+      {
          return false;
-      } else {
+      }
+      else
+      {
          return inputContextOnly;
       }
    }
@@ -108,7 +115,8 @@
     *     {@link Boolean }
     *     
     */
-   public void setInputContextOnly(Boolean value) {
+   public void setInputContextOnly(Boolean value)
+   {
       this.inputContextOnly = value;
    }
 
@@ -120,10 +128,14 @@
     *     {@link Boolean }
     *     
     */
-   public boolean isReturnContext() {
-      if (returnContext == null) {
+   public boolean isReturnContext()
+   {
+      if (returnContext == null)
+      {
          return false;
-      } else {
+      }
+      else
+      {
          return returnContext;
       }
    }
@@ -136,7 +148,8 @@
     *     {@link Boolean }
     *     
     */
-   public void setReturnContext(Boolean value) {
+   public void setReturnContext(Boolean value)
+   {
       this.returnContext = value;
    }
 

Modified: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/protocol/XACMLPolicyQueryType.java
===================================================================
--- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/protocol/XACMLPolicyQueryType.java	2011-06-21 21:10:53 UTC (rev 1021)
+++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/protocol/XACMLPolicyQueryType.java	2011-06-23 01:04:12 UTC (rev 1022)
@@ -27,7 +27,6 @@
 import org.jboss.security.xacml.core.model.policy.IdReferenceType;
 import org.jboss.security.xacml.core.model.policy.TargetType;
 
-
 /**
  * <p>Java class for XACMLPolicyQueryType complex type.
  * 
@@ -49,57 +48,67 @@
  * </pre>
  * 
  * 
- */ 
-public class XACMLPolicyQueryType
-extends RequestAbstractType
+ */
+public class XACMLPolicyQueryType extends RequestAbstractType
 {
+   private static final long serialVersionUID = 1L;
+
    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 XACMLPolicyQueryType(String id, String version, XMLGregorianCalendar instant)
+   public XACMLPolicyQueryType(String id, XMLGregorianCalendar instant)
    {
-      super(id, version, instant); 
+      super(id, instant);
    }
 
    public ChoiceType getChoiceType()

Added: federation/trunk/picketlink-fed-model/src/main/resources/schema/saml/v1/saml-schema-assertion-1.0.xsd
===================================================================
--- federation/trunk/picketlink-fed-model/src/main/resources/schema/saml/v1/saml-schema-assertion-1.0.xsd	                        (rev 0)
+++ federation/trunk/picketlink-fed-model/src/main/resources/schema/saml/v1/saml-schema-assertion-1.0.xsd	2011-06-23 01:04:12 UTC (rev 1022)
@@ -0,0 +1,227 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<schema targetNamespace="urn:oasis:names:tc:SAML:1.0:assertion" 
+       xmlns:ds="http://www.w3.org/2000/09/xmldsig#" 
+       xmlns:saml="urn:oasis:names:tc:SAML:1.0:assertion" 
+       xmlns="http://www.w3.org/2001/XMLSchema" 
+       elementFormDefault="unqualified" 
+       attributeFormDefault="unqualified" version="1.1">
+	<import namespace="http://www.w3.org/2000/09/xmldsig#" 
+	        schemaLocation="http://www.w3.org/TR/xmldsig-core/xmldsig-core-schema.xsd"/>
+	<annotation>
+		<documentation>
+                Document identifier: oasis-sstc-saml-schema-assertion-1.1
+                Location: http://www.oasis-open.org/committees/documents.php?wg_abbrev=security
+                Revision history:
+                V1.0 (November, 2002):
+                  Initial standard schema.
+                V1.1 (September, 2003):
+                  * Note that V1.1 of this schema has the same XML namespace as V1.0.
+                  Rebased ID content directly on XML Schema types
+                  Added DoNotCacheCondition element and DoNotCacheConditionType
+		</documentation>
+	</annotation>
+	<simpleType name="DecisionType">
+		<restriction base="string">
+
+			<enumeration value="Permit"/>
+			<enumeration value="Deny"/>
+			<enumeration value="Indeterminate"/>
+		</restriction>
+	</simpleType>
+	<element name="AssertionIDReference" type="NCName"/>
+	<element name="Assertion" type="saml:AssertionType"/>
+	<complexType name="AssertionType">
+		<sequence>
+
+			<element ref="saml:Conditions" minOccurs="0"/>
+			<element ref="saml:Advice" minOccurs="0"/>
+			<choice maxOccurs="unbounded">
+				<element ref="saml:Statement"/>
+				<element ref="saml:SubjectStatement"/>
+				<element ref="saml:AuthenticationStatement"/>
+				<element ref="saml:AuthorizationDecisionStatement"/>
+				<element ref="saml:AttributeStatement"/>
+			</choice>
+
+			<element ref="ds:Signature" minOccurs="0"/>
+		</sequence>
+		<attribute name="MajorVersion" type="integer" use="required"/>
+		<attribute name="MinorVersion" type="integer" use="required"/>
+		<attribute name="AssertionID" type="ID" use="required"/>
+		<attribute name="Issuer" type="string" use="required"/>
+		<attribute name="IssueInstant" type="dateTime" use="required"/>
+	</complexType>
+	<element name="Conditions" type="saml:ConditionsType"/>
+
+	<complexType name="ConditionsType">
+		<choice minOccurs="0" maxOccurs="unbounded">
+			<element ref="saml:AudienceRestrictionCondition"/>
+			<element ref="saml:DoNotCacheCondition"/>
+			<element ref="saml:Condition"/>
+		</choice>
+		<attribute name="NotBefore" type="dateTime" use="optional"/>
+		<attribute name="NotOnOrAfter" type="dateTime" use="optional"/>
+	</complexType>
+
+	<element name="Condition" type="saml:ConditionAbstractType"/>
+	<complexType name="ConditionAbstractType" abstract="true"/>
+	<element name="AudienceRestrictionCondition" type="saml:AudienceRestrictionConditionType"/>
+	<complexType name="AudienceRestrictionConditionType">
+		<complexContent>
+			<extension base="saml:ConditionAbstractType">
+				<sequence>
+					<element ref="saml:Audience" maxOccurs="unbounded"/>
+				</sequence>
+
+			</extension>
+		</complexContent>
+	</complexType>
+	<element name="Audience" type="anyURI"/>
+	<element name="DoNotCacheCondition" type="saml:DoNotCacheConditionType"/>
+	<complexType name="DoNotCacheConditionType">
+		<complexContent>
+			<extension base="saml:ConditionAbstractType"/>
+		</complexContent>
+
+	</complexType>
+	<element name="Advice" type="saml:AdviceType"/>
+	<complexType name="AdviceType">
+		<choice minOccurs="0" maxOccurs="unbounded">
+			<element ref="saml:AssertionIDReference"/>
+			<element ref="saml:Assertion"/>
+			<any namespace="##other" processContents="lax"/>
+		</choice>
+	</complexType>
+
+	<element name="Statement" type="saml:StatementAbstractType"/>
+	<complexType name="StatementAbstractType" abstract="true"/>
+	<element name="SubjectStatement" type="saml:SubjectStatementAbstractType"/>
+	<complexType name="SubjectStatementAbstractType" abstract="true">
+		<complexContent>
+			<extension base="saml:StatementAbstractType">
+				<sequence>
+					<element ref="saml:Subject"/>
+				</sequence>
+
+			</extension>
+		</complexContent>
+	</complexType>
+	<element name="Subject" type="saml:SubjectType"/>
+	<complexType name="SubjectType">
+		<choice>
+			<sequence>
+				<element ref="saml:NameIdentifier"/>
+				<element ref="saml:SubjectConfirmation" minOccurs="0"/>
+
+			</sequence>
+			<element ref="saml:SubjectConfirmation"/>
+		</choice>
+	</complexType>
+	<element name="NameIdentifier" type="saml:NameIdentifierType"/>
+	<complexType name="NameIdentifierType">
+		<simpleContent>
+			<extension base="string">
+				<attribute name="NameQualifier" type="string" use="optional"/>
+
+				<attribute name="Format" type="anyURI" use="optional"/>
+			</extension>
+		</simpleContent>
+	</complexType>
+	<element name="SubjectConfirmation" type="saml:SubjectConfirmationType"/>
+	<complexType name="SubjectConfirmationType">
+		<sequence>
+			<element ref="saml:ConfirmationMethod" maxOccurs="unbounded"/>
+			<element ref="saml:SubjectConfirmationData" minOccurs="0"/>
+
+			<element ref="ds:KeyInfo" minOccurs="0"/>
+		</sequence>
+	</complexType>
+	<element name="SubjectConfirmationData" type="anyType"/>
+	<element name="ConfirmationMethod" type="anyURI"/>
+	<element name="AuthenticationStatement" type="saml:AuthenticationStatementType"/>
+	<complexType name="AuthenticationStatementType">
+		<complexContent>
+			<extension base="saml:SubjectStatementAbstractType">
+
+				<sequence>
+					<element ref="saml:SubjectLocality" minOccurs="0"/>
+					<element ref="saml:AuthorityBinding" minOccurs="0" maxOccurs="unbounded"/>
+				</sequence>
+				<attribute name="AuthenticationMethod" type="anyURI" use="required"/>
+				<attribute name="AuthenticationInstant" type="dateTime" use="required"/>
+			</extension>
+		</complexContent>
+	</complexType>
+
+	<element name="SubjectLocality" type="saml:SubjectLocalityType"/>
+	<complexType name="SubjectLocalityType">
+		<attribute name="IPAddress" type="string" use="optional"/>
+		<attribute name="DNSAddress" type="string" use="optional"/>
+	</complexType>
+	<element name="AuthorityBinding" type="saml:AuthorityBindingType"/>
+	<complexType name="AuthorityBindingType">
+		<attribute name="AuthorityKind" type="QName" use="required"/>
+		<attribute name="Location" type="anyURI" use="required"/>
+
+		<attribute name="Binding" type="anyURI" use="required"/>
+	</complexType>
+	<element name="AuthorizationDecisionStatement" type="saml:AuthorizationDecisionStatementType"/>
+	<complexType name="AuthorizationDecisionStatementType">
+		<complexContent>
+			<extension base="saml:SubjectStatementAbstractType">
+				<sequence>
+					<element ref="saml:Action" maxOccurs="unbounded"/>
+					<element ref="saml:Evidence" minOccurs="0"/>
+
+				</sequence>
+				<attribute name="Resource" type="anyURI" use="required"/>
+				<attribute name="Decision" type="saml:DecisionType" use="required"/>
+			</extension>
+		</complexContent> 
+	</complexType>
+	<element name="Action" type="saml:ActionType"/>
+	<complexType name="ActionType">
+		<simpleContent>
+
+			<extension base="string">
+				<attribute name="Namespace" type="anyURI"/>
+			</extension>
+		</simpleContent>
+	</complexType>
+	<element name="Evidence" type="saml:EvidenceType"/>
+	<complexType name="EvidenceType">
+		<choice maxOccurs="unbounded">
+			<element ref="saml:AssertionIDReference"/>
+			<element ref="saml:Assertion"/>
+		</choice>
+	</complexType>
+	<element name="AttributeStatement" type="saml:AttributeStatementType"/>
+	<complexType name="AttributeStatementType">
+		<complexContent>
+			<extension base="saml:SubjectStatementAbstractType">
+				<sequence>
+					<element ref="saml:Attribute" maxOccurs="unbounded"/>
+
+				</sequence>
+			</extension>
+		</complexContent>
+	</complexType>
+	<element name="AttributeDesignator" type="saml:AttributeDesignatorType"/>
+	<complexType name="AttributeDesignatorType">
+		<attribute name="AttributeName" type="string" use="required"/>
+		<attribute name="AttributeNamespace" type="anyURI" use="required"/>
+	</complexType>
+
+	<element name="Attribute" type="saml:AttributeType"/>
+	<complexType name="AttributeType">
+		<complexContent>
+			<extension base="saml:AttributeDesignatorType">
+				<sequence>
+					<element ref="saml:AttributeValue" maxOccurs="unbounded"/>
+				</sequence>
+			</extension>
+		</complexContent>
+
+	</complexType>
+	<element name="AttributeValue" type="anyType"/>
+</schema>
\ No newline at end of file

Added: federation/trunk/picketlink-fed-model/src/main/resources/schema/saml/v1/saml-schema-protocol-1.1.xsd
===================================================================
--- federation/trunk/picketlink-fed-model/src/main/resources/schema/saml/v1/saml-schema-protocol-1.1.xsd	                        (rev 0)
+++ federation/trunk/picketlink-fed-model/src/main/resources/schema/saml/v1/saml-schema-protocol-1.1.xsd	2011-06-23 01:04:12 UTC (rev 1022)
@@ -0,0 +1,153 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<schema targetNamespace="urn:oasis:names:tc:SAML:1.0:protocol" 
+        xmlns:ds="http://www.w3.org/2000/09/xmldsig#" 
+        xmlns:saml="urn:oasis:names:tc:SAML:1.0:assertion" 
+        xmlns:samlp="urn:oasis:names:tc:SAML:1.0:protocol" 
+        xmlns="http://www.w3.org/2001/XMLSchema" 
+        elementFormDefault="unqualified" 
+        attributeFormDefault="unqualified" version="1.1">
+	<import namespace="urn:oasis:names:tc:SAML:1.0:assertion" 
+	schemaLocation="oasis-sstc-saml-schema-assertion-1.1.xsd"/>
+	<import namespace="http://www.w3.org/2000/09/xmldsig#" 
+	schemaLocation="http://www.w3.org/TR/xmldsig-core/xmldsig-core-schema.xsd"/>
+	<annotation>
+		<documentation>
+                Document identifier: oasis-sstc-saml-schema-protocol-1.1
+                Location: http://www.oasis-open.org/committees/documents.php?wg_abbrev=security
+                Revision history:
+                V1.0 (November, 2002):
+                  Initial standard schema.
+                V1.1 (September, 2003):
+                  * Note that V1.1 of this schema has the same XML namespace as V1.0.
+                  Rebased ID content directly on XML Schema types
+		</documentation>
+	</annotation>
+	<complexType name="RequestAbstractType" abstract="true">
+
+		<sequence>
+			<element ref="samlp:RespondWith" minOccurs="0" maxOccurs="unbounded"/>
+			<element ref="ds:Signature" minOccurs="0"/>
+		</sequence>
+		<attribute name="RequestID" type="ID" use="required"/>
+		<attribute name="MajorVersion" type="integer" use="required"/>
+		<attribute name="MinorVersion" type="integer" use="required"/>
+		<attribute name="IssueInstant" type="dateTime" use="required"/>
+	</complexType>
+
+	<element name="RespondWith" type="QName"/>
+	<element name="Request" type="samlp:RequestType"/>
+	<complexType name="RequestType">
+		<complexContent>
+			<extension base="samlp:RequestAbstractType">
+				<choice>
+					<element ref="samlp:Query"/>
+					<element ref="samlp:SubjectQuery"/>
+					<element ref="samlp:AuthenticationQuery"/>
+
+					<element ref="samlp:AttributeQuery"/>
+					<element ref="samlp:AuthorizationDecisionQuery"/>
+					<element ref="saml:AssertionIDReference" maxOccurs="unbounded"/>
+					<element ref="samlp:AssertionArtifact" maxOccurs="unbounded"/>
+				</choice>
+			</extension>
+		</complexContent>
+	</complexType>
+	<element name="AssertionArtifact" type="string"/>
+
+	<element name="Query" type="samlp:QueryAbstractType"/>
+	<complexType name="QueryAbstractType" abstract="true"/>
+	<element name="SubjectQuery" type="samlp:SubjectQueryAbstractType"/>
+	<complexType name="SubjectQueryAbstractType" abstract="true">
+		<complexContent>
+			<extension base="samlp:QueryAbstractType">
+				<sequence>
+					<element ref="saml:Subject"/>
+				</sequence>
+
+			</extension>
+		</complexContent>
+	</complexType>
+	<element name="AuthenticationQuery" type="samlp:AuthenticationQueryType"/>
+	<complexType name="AuthenticationQueryType">
+		<complexContent>
+			<extension base="samlp:SubjectQueryAbstractType">
+				<attribute name="AuthenticationMethod" type="anyURI"/>
+			</extension>
+
+		</complexContent>
+	</complexType>
+	<element name="AttributeQuery" type="samlp:AttributeQueryType"/>
+	<complexType name="AttributeQueryType">
+		<complexContent>
+			<extension base="samlp:SubjectQueryAbstractType">
+				<sequence>
+					<element ref="saml:AttributeDesignator" minOccurs="0" maxOccurs="unbounded"/>
+				</sequence>
+
+				<attribute name="Resource" type="anyURI" use="optional"/>
+			</extension>
+		</complexContent>
+	</complexType>
+	<element name="AuthorizationDecisionQuery" type="samlp:AuthorizationDecisionQueryType"/>
+	<complexType name="AuthorizationDecisionQueryType">
+		<complexContent>
+			<extension base="samlp:SubjectQueryAbstractType">
+				<sequence>
+
+					<element ref="saml:Action" maxOccurs="unbounded"/>
+					<element ref="saml:Evidence" minOccurs="0"/>
+				</sequence>
+				<attribute name="Resource" type="anyURI" use="required"/>
+			</extension>
+		</complexContent>
+	</complexType>
+	<complexType name="ResponseAbstractType" abstract="true">
+		<sequence>
+
+			<element ref="ds:Signature" minOccurs="0"/>
+		</sequence>
+		<attribute name="ResponseID" type="ID" use="required"/>
+		<attribute name="InResponseTo" type="NCName" use="optional"/>
+		<attribute name="MajorVersion" type="integer" use="required"/>
+		<attribute name="MinorVersion" type="integer" use="required"/>
+		<attribute name="IssueInstant" type="dateTime" use="required"/>
+		<attribute name="Recipient" type="anyURI" use="optional"/>
+	</complexType>
+
+	<element name="Response" type="samlp:ResponseType"/>
+	<complexType name="ResponseType">
+		<complexContent>
+			<extension base="samlp:ResponseAbstractType">
+				<sequence>
+					<element ref="samlp:Status"/>
+					<element ref="saml:Assertion" minOccurs="0" maxOccurs="unbounded"/>
+				</sequence>
+			</extension>
+
+		</complexContent>
+	</complexType>
+	<element name="Status" type="samlp:StatusType"/>
+	<complexType name="StatusType">
+		<sequence>
+			<element ref="samlp:StatusCode"/>
+			<element ref="samlp:StatusMessage" minOccurs="0"/>
+			<element ref="samlp:StatusDetail" minOccurs="0"/>
+		</sequence>
+
+	</complexType>
+	<element name="StatusCode" type="samlp:StatusCodeType"/>
+	<complexType name="StatusCodeType">
+		<sequence>
+			<element ref="samlp:StatusCode" minOccurs="0"/>
+		</sequence>
+		<attribute name="Value" type="QName" use="required"/>
+	</complexType>
+	<element name="StatusMessage" type="string"/>
+
+	<element name="StatusDetail" type="samlp:StatusDetailType"/>
+	<complexType name="StatusDetailType">
+		<sequence>
+			<any namespace="##any" processContents="lax" minOccurs="0" maxOccurs="unbounded"/>
+		</sequence>
+	</complexType>
+</schema>
\ No newline at end of file



More information about the picketlink-commits mailing list