[jboss-cvs] Picketlink SVN: r1018 - federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/metadata.

jboss-cvs-commits at lists.jboss.org jboss-cvs-commits at lists.jboss.org
Tue Jun 21 16:50:57 EDT 2011


Author: anil.saldhana at jboss.com
Date: 2011-06-21 16:50:57 -0400 (Tue, 21 Jun 2011)
New Revision: 1018

Modified:
   federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/metadata/AdditionalMetadataLocationType.java
   federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/metadata/AffiliationDescriptorType.java
   federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/metadata/AttributeAuthorityDescriptorType.java
   federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/metadata/AttributeConsumingServiceType.java
   federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/metadata/AuthnAuthorityDescriptorType.java
   federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/metadata/ContactType.java
   federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/metadata/ContactTypeType.java
   federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/metadata/EndpointType.java
   federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/metadata/EntitiesDescriptorType.java
   federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/metadata/EntityDescriptorType.java
   federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/metadata/ExtensionsType.java
   federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/metadata/IDPSSODescriptorType.java
   federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/metadata/IndexedEndpointType.java
   federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/metadata/KeyDescriptorType.java
   federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/metadata/KeyTypes.java
   federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/metadata/LocalizedNameType.java
   federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/metadata/LocalizedURIType.java
   federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/metadata/OrganizationType.java
   federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/metadata/PDPDescriptorType.java
   federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/metadata/RequestedAttributeType.java
   federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/metadata/RoleDescriptorType.java
   federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/metadata/SPSSODescriptorType.java
   federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/metadata/SSODescriptorType.java
   federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/metadata/package-info.java
Log:
add license header

Modified: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/metadata/AdditionalMetadataLocationType.java
===================================================================
--- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/metadata/AdditionalMetadataLocationType.java	2011-06-21 20:46:32 UTC (rev 1017)
+++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/metadata/AdditionalMetadataLocationType.java	2011-06-21 20:50:57 UTC (rev 1018)
@@ -1,3 +1,24 @@
+/*
+ * 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.v2.metadata;
 
 import java.net.URI;
@@ -2,3 +23,2 @@
 
-
 /**
@@ -19,10 +39,11 @@
  * </pre>
  * 
  * 
- */ 
-public class AdditionalMetadataLocationType 
+ */
+public class AdditionalMetadataLocationType
 {
    protected URI value;
+
    protected URI namespace;
 
    /**
@@ -33,7 +54,7 @@
     *     {@link URI }
     *     
     */
-   public URI getValue() 
+   public URI getValue()
    {
       return value;
    }
@@ -46,7 +67,7 @@
     *     {@link URI }
     *     
     */
-   public void setValue(URI value) 
+   public void setValue(URI value)
    {
       this.value = value;
    }
@@ -59,7 +80,7 @@
     *     {@link URI }
     *     
     */
-   public URI getNamespace() 
+   public URI getNamespace()
    {
       return namespace;
    }
@@ -72,7 +93,7 @@
     *     {@link URI }
     *     
     */
-   public void setNamespace(URI value) 
+   public void setNamespace(URI value)
    {
       this.namespace = value;
    }

Modified: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/metadata/AffiliationDescriptorType.java
===================================================================
--- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/metadata/AffiliationDescriptorType.java	2011-06-21 20:46:32 UTC (rev 1017)
+++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/metadata/AffiliationDescriptorType.java	2011-06-21 20:50:57 UTC (rev 1018)
@@ -1,3 +1,24 @@
+/*
+ * 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.v2.metadata;
 
 import java.util.ArrayList;
@@ -8,7 +29,6 @@
 
 import org.picketlink.identity.xmlsec.w3.xmldsig.SignatureType;
 
-
 /**
  * <p>Java class for AffiliationDescriptorType complex type.
  * 
@@ -34,16 +54,23 @@
  * </pre>
  * 
  * 
- */ 
+ */
 public class AffiliationDescriptorType extends TypeWithOtherAttributes
 {
    protected SignatureType signature;
+
    protected ExtensionsType extensions;
+
    protected List<String> affiliateMember;
+
    protected List<KeyDescriptorType> keyDescriptor;
+
    protected String affiliationOwnerID;
+
    protected XMLGregorianCalendar validUntil;
+
    protected Duration cacheDuration;
+
    protected String id;
 
    /**
@@ -54,7 +81,8 @@
     *     {@link SignatureType }
     *     
     */
-   public SignatureType getSignature() {
+   public SignatureType getSignature()
+   {
       return signature;
    }
 
@@ -66,7 +94,8 @@
     *     {@link SignatureType }
     *     
     */
-   public void setSignature(SignatureType value) {
+   public void setSignature(SignatureType value)
+   {
       this.signature = value;
    }
 
@@ -78,7 +107,8 @@
     *     {@link ExtensionsType }
     *     
     */
-   public ExtensionsType getExtensions() {
+   public ExtensionsType getExtensions()
+   {
       return extensions;
    }
 
@@ -90,7 +120,8 @@
     *     {@link ExtensionsType }
     *     
     */
-   public void setExtensions(ExtensionsType value) {
+   public void setExtensions(ExtensionsType value)
+   {
       this.extensions = value;
    }
 
@@ -116,8 +147,10 @@
     * 
     * 
     */
-   public List<String> getAffiliateMember() {
-      if (affiliateMember == null) {
+   public List<String> getAffiliateMember()
+   {
+      if (affiliateMember == null)
+      {
          affiliateMember = new ArrayList<String>();
       }
       return this.affiliateMember;
@@ -145,8 +178,10 @@
     * 
     * 
     */
-   public List<KeyDescriptorType> getKeyDescriptor() {
-      if (keyDescriptor == null) {
+   public List<KeyDescriptorType> getKeyDescriptor()
+   {
+      if (keyDescriptor == null)
+      {
          keyDescriptor = new ArrayList<KeyDescriptorType>();
       }
       return this.keyDescriptor;
@@ -160,7 +195,8 @@
     *     {@link String }
     *     
     */
-   public String getAffiliationOwnerID() {
+   public String getAffiliationOwnerID()
+   {
       return affiliationOwnerID;
    }
 
@@ -172,7 +208,8 @@
     *     {@link String }
     *     
     */
-   public void setAffiliationOwnerID(String value) {
+   public void setAffiliationOwnerID(String value)
+   {
       this.affiliationOwnerID = value;
    }
 
@@ -184,7 +221,8 @@
     *     {@link XMLGregorianCalendar }
     *     
     */
-   public XMLGregorianCalendar getValidUntil() {
+   public XMLGregorianCalendar getValidUntil()
+   {
       return validUntil;
    }
 
@@ -196,7 +234,8 @@
     *     {@link XMLGregorianCalendar }
     *     
     */
-   public void setValidUntil(XMLGregorianCalendar value) {
+   public void setValidUntil(XMLGregorianCalendar value)
+   {
       this.validUntil = value;
    }
 
@@ -208,7 +247,8 @@
     *     {@link Duration }
     *     
     */
-   public Duration getCacheDuration() {
+   public Duration getCacheDuration()
+   {
       return cacheDuration;
    }
 
@@ -220,7 +260,8 @@
     *     {@link Duration }
     *     
     */
-   public void setCacheDuration(Duration value) {
+   public void setCacheDuration(Duration value)
+   {
       this.cacheDuration = value;
    }
 
@@ -232,7 +273,8 @@
     *     {@link String }
     *     
     */
-   public String getID() {
+   public String getID()
+   {
       return id;
    }
 
@@ -244,7 +286,8 @@
     *     {@link String }
     *     
     */
-   public void setID(String value) {
+   public void setID(String value)
+   {
       this.id = value;
    }
 }
\ No newline at end of file

Modified: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/metadata/AttributeAuthorityDescriptorType.java
===================================================================
--- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/metadata/AttributeAuthorityDescriptorType.java	2011-06-21 20:46:32 UTC (rev 1017)
+++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/metadata/AttributeAuthorityDescriptorType.java	2011-06-21 20:50:57 UTC (rev 1018)
@@ -1,3 +1,24 @@
+/*
+ * 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.v2.metadata;
 
 import java.util.ArrayList;
@@ -6,7 +27,6 @@
 
 import org.picketlink.identity.federation.saml.v2.assertion.AttributeType;
 
-
 /**
  * <p>Java class for AttributeAuthorityDescriptorType complex type.
  * 
@@ -31,15 +51,18 @@
  * 
  */
 
-public class AttributeAuthorityDescriptorType
-extends RoleDescriptorType
-{ 
+public class AttributeAuthorityDescriptorType extends RoleDescriptorType
+{
    protected List<EndpointType> attributeService = new ArrayList<EndpointType>();
+
    protected List<EndpointType> assertionIDRequestService = new ArrayList<EndpointType>();
+
    protected List<String> nameIDFormat = new ArrayList<String>();
+
    protected List<String> attributeProfile = new ArrayList<String>();
+
    protected List<AttributeType> attribute = new ArrayList<AttributeType>();
-   
+
    public AttributeAuthorityDescriptorType(List<String> protocolSupport)
    {
       super(protocolSupport);
@@ -49,7 +72,7 @@
     * Add an attribute service
     * @param endpoint
     */
-   public void addAttributeService( EndpointType endpoint )
+   public void addAttributeService(EndpointType endpoint)
    {
       this.attributeService.add(endpoint);
    }
@@ -58,7 +81,7 @@
     * Add an assertion id request service
     * @param endpoint
     */
-   public void addAssertionIDRequestService( EndpointType endpoint )
+   public void addAssertionIDRequestService(EndpointType endpoint)
    {
       this.assertionIDRequestService.add(endpoint);
    }
@@ -67,7 +90,7 @@
     * Add a name id
     * @param str
     */
-   public void addNameIDFormat( String str )
+   public void addNameIDFormat(String str)
    {
       this.nameIDFormat.add(str);
    }
@@ -76,7 +99,7 @@
     * Add an attribute profile
     * @param str
     */
-   public void addAttributeProfile( String str )
+   public void addAttributeProfile(String str)
    {
       this.attributeProfile.add(str);
    }
@@ -85,25 +108,25 @@
     * Add an attribute
     * @param attribute
     */
-   public void addAttribute( AttributeType attribute )
+   public void addAttribute(AttributeType attribute)
    {
       this.attribute.add(attribute);
    }
-   
+
    /**
     * Remove an attribute service
     * @param endpoint
     */
-   public void removeAttributeService( EndpointType endpoint )
+   public void removeAttributeService(EndpointType endpoint)
    {
-      this.attributeService.remove( endpoint);
+      this.attributeService.remove(endpoint);
    }
 
    /**
     * Remove assertion id request service
     * @param endpoint
     */
-   public void removeAssertionIDRequestService( EndpointType endpoint )
+   public void removeAssertionIDRequestService(EndpointType endpoint)
    {
       this.assertionIDRequestService.remove(endpoint);
    }
@@ -112,7 +135,7 @@
     * Remove Name ID
     * @param str
     */
-   public void removeNameIDFormat( String str )
+   public void removeNameIDFormat(String str)
    {
       this.nameIDFormat.remove(str);
    }
@@ -121,7 +144,7 @@
     * Remove attribute profile
     * @param str
     */
-   public void removeAttributeProfile( String str )
+   public void removeAttributeProfile(String str)
    {
       this.attributeProfile.remove(str);
    }
@@ -130,7 +153,7 @@
     * Remove attribute
     * @param attribute
     */
-   public void removeAttribute( AttributeType attribute )
+   public void removeAttribute(AttributeType attribute)
    {
       this.attribute.remove(attribute);
    }
@@ -143,9 +166,9 @@
     * 
     * 
     */
-   public List<EndpointType> getAttributeService() 
-   { 
-      return Collections.unmodifiableList( this.attributeService );
+   public List<EndpointType> getAttributeService()
+   {
+      return Collections.unmodifiableList(this.attributeService);
    }
 
    /**
@@ -157,9 +180,9 @@
     * 
     * 
     */
-   public List<EndpointType> getAssertionIDRequestService() 
+   public List<EndpointType> getAssertionIDRequestService()
    {
-      return Collections.unmodifiableList( this.assertionIDRequestService );
+      return Collections.unmodifiableList(this.assertionIDRequestService);
    }
 
    /**
@@ -168,9 +191,9 @@
     * Objects of the following type(s) are allowed in the list
     * {@link String } 
     */
-   public List<String> getNameIDFormat() 
-   { 
-      return Collections.unmodifiableList( this.nameIDFormat );
+   public List<String> getNameIDFormat()
+   {
+      return Collections.unmodifiableList(this.nameIDFormat);
    }
 
    /**
@@ -181,9 +204,9 @@
     * 
     * 
     */
-   public List<String> getAttributeProfile() 
+   public List<String> getAttributeProfile()
    {
-      return Collections.unmodifiableList( this.attributeProfile );
+      return Collections.unmodifiableList(this.attributeProfile);
    }
 
    /**
@@ -194,8 +217,8 @@
     * 
     * 
     */
-   public List<AttributeType> getAttribute() 
-   { 
-      return Collections.unmodifiableList( this.attribute );
+   public List<AttributeType> getAttribute()
+   {
+      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/metadata/AttributeConsumingServiceType.java
===================================================================
--- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/metadata/AttributeConsumingServiceType.java	2011-06-21 20:46:32 UTC (rev 1017)
+++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/metadata/AttributeConsumingServiceType.java	2011-06-21 20:50:57 UTC (rev 1018)
@@ -1,3 +1,24 @@
+/*
+ * 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.v2.metadata;
 
 import java.util.ArrayList;
@@ -4,7 +25,6 @@
 import java.util.Collections;
 import java.util.List;
 
-
 /**
  * <p>Java class for AttributeConsumingServiceType complex type.
  * 
@@ -27,8 +47,8 @@
  * </pre>
  * 
  * 
- */ 
-public class AttributeConsumingServiceType 
+ */
+public class AttributeConsumingServiceType
 {
    protected List<LocalizedNameType> serviceName = new ArrayList<LocalizedNameType>();
 
@@ -40,10 +60,8 @@
 
    protected Boolean isDefault;
 
-
-
    public AttributeConsumingServiceType(int index)
-   { 
+   {
       this.index = index;
    }
 
@@ -55,9 +73,9 @@
     * 
     * 
     */
-   public void addServiceName( LocalizedNameType service ) 
+   public void addServiceName(LocalizedNameType service)
    {
-      this.serviceName.add(service) ;
+      this.serviceName.add(service);
    }
 
    /**
@@ -68,7 +86,7 @@
     * 
     * 
     */
-   public void addServiceDescription( LocalizedNameType desc ) 
+   public void addServiceDescription(LocalizedNameType desc)
    {
       this.serviceDescription.add(desc);
    }
@@ -80,11 +98,11 @@
     * {@link RequestedAttributeType }
     * 
     */
-   public void addRequestedAttribute( RequestedAttributeType req ) 
+   public void addRequestedAttribute(RequestedAttributeType req)
    {
       this.requestedAttribute.add(req);
    }
-   
+
    /**
     * remove serviceName  
     * <p>
@@ -93,9 +111,9 @@
     * 
     * 
     */
-   public void removeServiceName( LocalizedNameType service ) 
+   public void removeServiceName(LocalizedNameType service)
    {
-      this.serviceName.remove(service) ;
+      this.serviceName.remove(service);
    }
 
    /**
@@ -106,7 +124,7 @@
     * 
     * 
     */
-   public void removeServiceDescription( LocalizedNameType desc ) 
+   public void removeServiceDescription(LocalizedNameType desc)
    {
       this.serviceDescription.remove(desc);
    }
@@ -118,12 +136,11 @@
     * {@link RequestedAttributeType }
     * 
     */
-   public void removeRequestedAttribute( RequestedAttributeType req ) 
+   public void removeRequestedAttribute(RequestedAttributeType req)
    {
       this.requestedAttribute.remove(req);
    }
-   
-    
+
    /**
     * Gets the value of the serviceName property.
     * <p>
@@ -132,9 +149,9 @@
     * 
     * 
     */
-   public List<LocalizedNameType> getServiceName() 
+   public List<LocalizedNameType> getServiceName()
    {
-      return Collections.unmodifiableList( this.serviceName );
+      return Collections.unmodifiableList(this.serviceName);
    }
 
    /**
@@ -145,9 +162,9 @@
     * 
     * 
     */
-   public List<LocalizedNameType> getServiceDescription() 
+   public List<LocalizedNameType> getServiceDescription()
    {
-      return Collections.unmodifiableList( this.serviceDescription );
+      return Collections.unmodifiableList(this.serviceDescription);
    }
 
    /**
@@ -158,16 +175,16 @@
     * 
     * 
     */
-   public List<RequestedAttributeType> getRequestedAttribute() 
+   public List<RequestedAttributeType> getRequestedAttribute()
    {
-      return Collections.unmodifiableList( this.requestedAttribute );
+      return Collections.unmodifiableList(this.requestedAttribute);
    }
 
    /**
     * Gets the value of the index property.
     * 
     */
-   public int getIndex() 
+   public int getIndex()
    {
       return index;
    }
@@ -180,7 +197,7 @@
     *     {@link Boolean }
     *     
     */
-   public Boolean isIsDefault() 
+   public Boolean isIsDefault()
    {
       return isDefault;
    }
@@ -193,7 +210,7 @@
     *     {@link Boolean }
     *     
     */
-   public void setIsDefault(Boolean value) 
+   public void setIsDefault(Boolean value)
    {
       this.isDefault = value;
    }

Modified: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/metadata/AuthnAuthorityDescriptorType.java
===================================================================
--- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/metadata/AuthnAuthorityDescriptorType.java	2011-06-21 20:46:32 UTC (rev 1017)
+++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/metadata/AuthnAuthorityDescriptorType.java	2011-06-21 20:50:57 UTC (rev 1018)
@@ -1,3 +1,24 @@
+/*
+ * 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.v2.metadata;
 
 import java.util.ArrayList;
@@ -4,7 +25,6 @@
 import java.util.Collections;
 import java.util.List;
 
-
 /**
  * <p>Java class for AuthnAuthorityDescriptorType complex type.
  * 
@@ -24,23 +44,24 @@
  * &lt;/complexType>
  * </pre> 
  */
-public class AuthnAuthorityDescriptorType
-extends RoleDescriptorType
+public class AuthnAuthorityDescriptorType extends RoleDescriptorType
 {
-   protected List<EndpointType> authnQueryService = new ArrayList<EndpointType>(); 
+   protected List<EndpointType> authnQueryService = new ArrayList<EndpointType>();
+
    protected List<EndpointType> assertionIDRequestService = new ArrayList<EndpointType>();
+
    protected List<String> nameIDFormat = new ArrayList<String>();
-   
+
    public AuthnAuthorityDescriptorType(List<String> protocolSupport)
    {
-      super(protocolSupport); 
+      super(protocolSupport);
    }
 
    /**
     * Add authn query service
     * @param endpoint
     */
-   public void addAuthnQueryService( EndpointType endpoint )
+   public void addAuthnQueryService(EndpointType endpoint)
    {
       this.authnQueryService.add(endpoint);
    }
@@ -49,7 +70,7 @@
     * Add assertion id request service
     * @param endpoint
     */
-   public void addAssertionIDRequestService( EndpointType endpoint )
+   public void addAssertionIDRequestService(EndpointType endpoint)
    {
       this.assertionIDRequestService.add(endpoint);
    }
@@ -58,16 +79,16 @@
     * Add name id format
     * @param str
     */
-   public void addNameIDFormat( String str )
+   public void addNameIDFormat(String str)
    {
       this.nameIDFormat.add(str);
    }
-   
+
    /**
     * Remove authn query service
     * @param endpoint
     */
-   public void removeAuthnQueryService( EndpointType endpoint )
+   public void removeAuthnQueryService(EndpointType endpoint)
    {
       this.authnQueryService.remove(endpoint);
    }
@@ -76,7 +97,7 @@
     * remove assertion id request service
     * @param endpoint
     */
-   public void removeAssertionIDRequestService( EndpointType endpoint )
+   public void removeAssertionIDRequestService(EndpointType endpoint)
    {
       this.assertionIDRequestService.remove(endpoint);
    }
@@ -85,7 +106,7 @@
     * remove name id format
     * @param str
     */
-   public void removeNameIDFormat( String str )
+   public void removeNameIDFormat(String str)
    {
       this.nameIDFormat.remove(str);
    }
@@ -98,9 +119,9 @@
     * 
     * 
     */
-   public List<EndpointType> getAuthnQueryService() 
+   public List<EndpointType> getAuthnQueryService()
    {
-      return Collections.unmodifiableList( this.authnQueryService );
+      return Collections.unmodifiableList(this.authnQueryService);
    }
 
    /**
@@ -111,9 +132,9 @@
     * 
     * 
     */
-   public List<EndpointType> getAssertionIDRequestService() 
+   public List<EndpointType> getAssertionIDRequestService()
    {
-      return Collections.unmodifiableList( this.assertionIDRequestService );
+      return Collections.unmodifiableList(this.assertionIDRequestService);
    }
 
    /**
@@ -124,8 +145,8 @@
     * 
     * 
     */
-   public List<String> getNameIDFormat() 
+   public List<String> getNameIDFormat()
    {
-      return Collections.unmodifiableList( this.nameIDFormat );
+      return Collections.unmodifiableList(this.nameIDFormat);
    }
 }
\ No newline at end of file

Modified: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/metadata/ContactType.java
===================================================================
--- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/metadata/ContactType.java	2011-06-21 20:46:32 UTC (rev 1017)
+++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/metadata/ContactType.java	2011-06-21 20:50:57 UTC (rev 1018)
@@ -1,3 +1,24 @@
+/*
+ * 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.v2.metadata;
 
 import java.util.ArrayList;
@@ -4,7 +25,6 @@
 import java.util.Collections;
 import java.util.List;
 
-
 /**
  * <p>Java class for ContactType complex type.
  * 
@@ -29,21 +49,25 @@
  * </pre>
  * 
  * 
- */ 
+ */
 public class ContactType extends TypeWithOtherAttributes
 {
    protected ExtensionsType extensions;
+
    protected String company;
+
    protected String givenName;
+
    protected String surName;
+
    protected List<String> emailAddress = new ArrayList<String>();
+
    protected List<String> telephoneNumber = new ArrayList<String>();
-   protected ContactTypeType contactType; 
 
+   protected ContactTypeType contactType;
 
-
    public ContactType(ContactTypeType contactType)
-   { 
+   {
       this.contactType = contactType;
    }
 
@@ -55,7 +79,8 @@
     *     {@link ExtensionsType }
     *     
     */
-   public ExtensionsType getExtensions() {
+   public ExtensionsType getExtensions()
+   {
       return extensions;
    }
 
@@ -67,7 +92,8 @@
     *     {@link ExtensionsType }
     *     
     */
-   public void setExtensions(ExtensionsType value) {
+   public void setExtensions(ExtensionsType value)
+   {
       this.extensions = value;
    }
 
@@ -79,7 +105,8 @@
     *     {@link String }
     *     
     */
-   public String getCompany() {
+   public String getCompany()
+   {
       return company;
    }
 
@@ -91,7 +118,8 @@
     *     {@link String }
     *     
     */
-   public void setCompany(String value) {
+   public void setCompany(String value)
+   {
       this.company = value;
    }
 
@@ -103,7 +131,8 @@
     *     {@link String }
     *     
     */
-   public String getGivenName() {
+   public String getGivenName()
+   {
       return givenName;
    }
 
@@ -115,7 +144,8 @@
     *     {@link String }
     *     
     */
-   public void setGivenName(String value) {
+   public void setGivenName(String value)
+   {
       this.givenName = value;
    }
 
@@ -127,7 +157,8 @@
     *     {@link String }
     *     
     */
-   public String getSurName() {
+   public String getSurName()
+   {
       return surName;
    }
 
@@ -139,7 +170,8 @@
     *     {@link String }
     *     
     */
-   public void setSurName(String value) {
+   public void setSurName(String value)
+   {
       this.surName = value;
    }
 
@@ -147,7 +179,7 @@
     * Add an email address
     * @param email
     */
-   public void addEmailAddress( String email )
+   public void addEmailAddress(String email)
    {
       this.emailAddress.add(email);
    }
@@ -156,16 +188,16 @@
     * remove a telephone
     * @param tel
     */
-   public void removeTelephone( String tel )
+   public void removeTelephone(String tel)
    {
       this.telephoneNumber.remove(tel);
    }
-   
+
    /**
     * remove an email address
     * @param email
     */
-   public void removeEmailAddress( String email )
+   public void removeEmailAddress(String email)
    {
       this.emailAddress.remove(email);
    }
@@ -174,7 +206,7 @@
     * Add a telephone
     * @param tel
     */
-   public void addTelephone( String tel )
+   public void addTelephone(String tel)
    {
       this.telephoneNumber.add(tel);
    }
@@ -187,9 +219,9 @@
     * 
     * 
     */
-   public List<String> getEmailAddress() 
+   public List<String> getEmailAddress()
    {
-      return Collections.unmodifiableList( this.emailAddress );
+      return Collections.unmodifiableList(this.emailAddress);
    }
 
    /**
@@ -200,9 +232,9 @@
     * 
     * 
     */
-   public List<String> getTelephoneNumber() 
+   public List<String> getTelephoneNumber()
    {
-      return Collections.unmodifiableList( this.telephoneNumber );
+      return Collections.unmodifiableList(this.telephoneNumber);
    }
 
    /**
@@ -213,7 +245,8 @@
     *     {@link ContactTypeType }
     *     
     */
-   public ContactTypeType getContactType() {
+   public ContactTypeType getContactType()
+   {
       return contactType;
    }
 
@@ -225,7 +258,8 @@
     *     {@link ContactTypeType }
     *     
     */
-   public void setContactType(ContactTypeType value) {
+   public void setContactType(ContactTypeType value)
+   {
       this.contactType = value;
-   } 
+   }
 }
\ No newline at end of file

Modified: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/metadata/ContactTypeType.java
===================================================================
--- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/metadata/ContactTypeType.java	2011-06-21 20:46:32 UTC (rev 1017)
+++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/metadata/ContactTypeType.java	2011-06-21 20:50:57 UTC (rev 1018)
@@ -1,7 +1,26 @@
+/*
+ * 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.v2.metadata;
 
-
-
 /**
  * <p>Java class for ContactTypeType.
  * 
@@ -19,27 +38,27 @@
  * &lt;/simpleType>
  * </pre>
  * 
- */ 
-public enum ContactTypeType 
-{
-   TECHNICAL("technical"),
-   SUPPORT("support"),
-   ADMINISTRATIVE("administrative"),
-   BILLING("billing"),
-   OTHER("other");
+ */
+public enum ContactTypeType {
+   TECHNICAL("technical"), SUPPORT("support"), ADMINISTRATIVE("administrative"), BILLING("billing"), OTHER("other");
    private final String value;
 
-   ContactTypeType(String v) {
+   ContactTypeType(String v)
+   {
       value = v;
    }
 
-   public String value() {
+   public String value()
+   {
       return value;
    }
 
-   public static ContactTypeType fromValue(String v) {
-      for (ContactTypeType c: ContactTypeType.values()) {
-         if (c.value.equals(v)) {
+   public static ContactTypeType fromValue(String v)
+   {
+      for (ContactTypeType c : ContactTypeType.values())
+      {
+         if (c.value.equals(v))
+         {
             return c;
          }
       }

Modified: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/metadata/EndpointType.java
===================================================================
--- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/metadata/EndpointType.java	2011-06-21 20:46:32 UTC (rev 1017)
+++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/metadata/EndpointType.java	2011-06-21 20:50:57 UTC (rev 1018)
@@ -1,3 +1,24 @@
+/*
+ * 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.v2.metadata;
 
 import java.net.URI;
@@ -7,7 +28,6 @@
 
 import org.w3c.dom.Element;
 
-
 /**
  * <p>Java class for EndpointType complex type.
  * 
@@ -30,36 +50,37 @@
  * 
  * 
  */
-public class EndpointType extends TypeWithOtherAttributes 
+public class EndpointType extends TypeWithOtherAttributes
 {
 
-   protected List<Object> any = new ArrayList<Object> ();
+   protected List<Object> any = new ArrayList<Object>();
 
    protected URI binding;
+
    protected URI location;
-   protected URI responseLocation; 
 
+   protected URI responseLocation;
 
    public EndpointType(URI binding, URI location)
-   { 
+   {
       this.binding = binding;
       this.location = location;
    }
-   
+
    /**
     * Add an object
     * @param obj
     */
-   public void addObject( Object obj )
+   public void addObject(Object obj)
    {
       this.any.add(obj);
    }
-   
+
    /**
     * remove an object
     * @param obj
     */
-   public void removeObject( Object obj )
+   public void removeObject(Object obj)
    {
       this.any.remove(obj);
    }
@@ -73,9 +94,9 @@
     * 
     * 
     */
-   public List<Object> getAny() 
+   public List<Object> getAny()
    {
-      return Collections.unmodifiableList( this.any );
+      return Collections.unmodifiableList(this.any);
    }
 
    /**
@@ -86,7 +107,7 @@
     *     {@link URI }
     *     
     */
-   public URI getBinding() 
+   public URI getBinding()
    {
       return binding;
    }
@@ -99,7 +120,7 @@
     *     {@link URI }
     *     
     */
-   public URI getLocation() 
+   public URI getLocation()
    {
       return location;
    }
@@ -112,7 +133,8 @@
     *     {@link URI }
     *     
     */
-   public URI getResponseLocation() {
+   public URI getResponseLocation()
+   {
       return responseLocation;
    }
 
@@ -124,8 +146,8 @@
     *     {@link URI }
     *     
     */
-   public void setResponseLocation(URI value) 
+   public void setResponseLocation(URI value)
    {
       this.responseLocation = value;
-   } 
+   }
 }
\ No newline at end of file

Modified: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/metadata/EntitiesDescriptorType.java
===================================================================
--- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/metadata/EntitiesDescriptorType.java	2011-06-21 20:46:32 UTC (rev 1017)
+++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/metadata/EntitiesDescriptorType.java	2011-06-21 20:50:57 UTC (rev 1018)
@@ -1,3 +1,24 @@
+/*
+ * 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.v2.metadata;
 
 import java.util.ArrayList;
@@ -9,7 +30,6 @@
 
 import org.w3c.dom.Element;
 
-
 /**
  * <p>Java class for EntitiesDescriptorType complex type.
  * 
@@ -37,16 +57,21 @@
  * </pre>
  * 
  * 
- */ 
-public class EntitiesDescriptorType 
+ */
+public class EntitiesDescriptorType
 {
    protected Element signature;
+
    protected ExtensionsType extensions;
+
    protected List<Object> entityDescriptor = new ArrayList<Object>();
 
    protected XMLGregorianCalendar validUntil;
+
    protected Duration cacheDuration;
+
    protected String id;
+
    protected String name;
 
    /**
@@ -57,7 +82,7 @@
     *     {@link Element }
     *     
     */
-   public Element getSignature() 
+   public Element getSignature()
    {
       return signature;
    }
@@ -70,7 +95,7 @@
     *     {@link Element }
     *     
     */
-   public void setSignature(Element value) 
+   public void setSignature(Element value)
    {
       this.signature = value;
    }
@@ -83,7 +108,7 @@
     *     {@link ExtensionsType }
     *     
     */
-   public ExtensionsType getExtensions() 
+   public ExtensionsType getExtensions()
    {
       return extensions;
    }
@@ -96,7 +121,7 @@
     *     {@link ExtensionsType }
     *     
     */
-   public void setExtensions(ExtensionsType value) 
+   public void setExtensions(ExtensionsType value)
    {
       this.extensions = value;
    }
@@ -105,20 +130,20 @@
     * Add an entity descriptor
     * @param obj
     */
-   public void addEntityDescriptor( Object obj )
+   public void addEntityDescriptor(Object obj)
    {
-      this.entityDescriptor.add( obj );
+      this.entityDescriptor.add(obj);
    }
-   
+
    /**
     * Remove an entity descriptor
     * @param obj
     */
-   public void removeEntityDescriptor( Object obj )
+   public void removeEntityDescriptor(Object obj)
    {
-      this.entityDescriptor.remove( obj );
+      this.entityDescriptor.remove(obj);
    }
-   
+
    /**
     * Gets the value of the entityDescriptorOrEntitiesDescriptor property.
     * <p>
@@ -128,9 +153,9 @@
     * 
     * 
     */
-   public List<Object> getEntityDescriptor() 
+   public List<Object> getEntityDescriptor()
    {
-      return Collections.unmodifiableList( this.entityDescriptor );
+      return Collections.unmodifiableList(this.entityDescriptor);
    }
 
    /**
@@ -141,7 +166,7 @@
     *     {@link XMLGregorianCalendar }
     *     
     */
-   public XMLGregorianCalendar getValidUntil() 
+   public XMLGregorianCalendar getValidUntil()
    {
       return validUntil;
    }
@@ -154,7 +179,7 @@
     *     {@link XMLGregorianCalendar }
     *     
     */
-   public void setValidUntil(XMLGregorianCalendar value) 
+   public void setValidUntil(XMLGregorianCalendar value)
    {
       this.validUntil = value;
    }
@@ -167,7 +192,8 @@
     *     {@link Duration }
     *     
     */
-   public Duration getCacheDuration() {
+   public Duration getCacheDuration()
+   {
       return cacheDuration;
    }
 
@@ -179,7 +205,8 @@
     *     {@link Duration }
     *     
     */
-   public void setCacheDuration(Duration value) {
+   public void setCacheDuration(Duration value)
+   {
       this.cacheDuration = value;
    }
 
@@ -191,7 +218,8 @@
     *     {@link String }
     *     
     */
-   public String getID() {
+   public String getID()
+   {
       return id;
    }
 
@@ -203,7 +231,8 @@
     *     {@link String }
     *     
     */
-   public void setID(String value) {
+   public void setID(String value)
+   {
       this.id = value;
    }
 
@@ -215,7 +244,7 @@
     *     {@link String }
     *     
     */
-   public String getName() 
+   public String getName()
    {
       return name;
    }
@@ -228,7 +257,7 @@
     *     {@link String }
     *     
     */
-   public void setName(String value) 
+   public void setName(String value)
    {
       this.name = value;
    }

Modified: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/metadata/EntityDescriptorType.java
===================================================================
--- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/metadata/EntityDescriptorType.java	2011-06-21 20:46:32 UTC (rev 1017)
+++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/metadata/EntityDescriptorType.java	2011-06-21 20:50:57 UTC (rev 1018)
@@ -1,3 +1,24 @@
+/*
+ * 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.v2.metadata;
 
 import java.util.ArrayList;
@@ -9,7 +30,6 @@
 
 import org.w3c.dom.Element;
 
-
 /**
  * <p>Java class for EntityDescriptorType complex type.
  * 
@@ -53,100 +73,114 @@
    public static class EDTChoiceType
    {
       private List<EDTDescriptorChoiceType> descriptors = new ArrayList<EntityDescriptorType.EDTDescriptorChoiceType>();
+
       private AffiliationDescriptorType affiliationDescriptor;
 
       public EDTChoiceType(List<EDTDescriptorChoiceType> descriptors)
       {
          this.descriptors = descriptors;
       }
+
       public EDTChoiceType(AffiliationDescriptorType affiliationDescriptor)
-      { 
+      {
          this.affiliationDescriptor = affiliationDescriptor;
       }
+
       public List<EDTDescriptorChoiceType> getDescriptors()
       {
-         return Collections.unmodifiableList( descriptors );
+         return Collections.unmodifiableList(descriptors);
       }
+
       public AffiliationDescriptorType getAffiliationDescriptor()
       {
          return affiliationDescriptor;
-      } 
-      
-      public static EDTChoiceType oneValue( EDTDescriptorChoiceType edt )
+      }
+
+      public static EDTChoiceType oneValue(EDTDescriptorChoiceType edt)
       {
          List<EDTDescriptorChoiceType> aList = new ArrayList<EntityDescriptorType.EDTDescriptorChoiceType>();
          aList.add(edt);
-         return new EDTChoiceType( aList );
+         return new EDTChoiceType(aList);
       }
    }
 
    public static class EDTDescriptorChoiceType
    {
       private RoleDescriptorType roleDescriptor;
+
       private IDPSSODescriptorType idpDescriptor;
+
       private SPSSODescriptorType spDescriptor;
+
       private AuthnAuthorityDescriptorType authnDescriptor;
+
       private AttributeAuthorityDescriptorType attribDescriptor;
+
       private PDPDescriptorType pdpDescriptor;
-      
+
       public EDTDescriptorChoiceType(AuthnAuthorityDescriptorType authnDescriptor)
       {
          this.authnDescriptor = authnDescriptor;
       }
-      
+
       public EDTDescriptorChoiceType(AttributeAuthorityDescriptorType attribDescriptor)
       {
          this.attribDescriptor = attribDescriptor;
       }
-      
+
       public EDTDescriptorChoiceType(PDPDescriptorType pdpDescriptor)
       {
          this.pdpDescriptor = pdpDescriptor;
       }
-      
-      public EDTDescriptorChoiceType( SSODescriptorType sso )
+
+      public EDTDescriptorChoiceType(SSODescriptorType sso)
       {
-         if(sso instanceof IDPSSODescriptorType )
+         if (sso instanceof IDPSSODescriptorType)
          {
             this.idpDescriptor = (IDPSSODescriptorType) sso;
          }
          else
             this.spDescriptor = (SPSSODescriptorType) sso;
       }
-      
+
       public EDTDescriptorChoiceType(RoleDescriptorType roleDescriptor)
-      {  
-          this.roleDescriptor = roleDescriptor;
+      {
+         this.roleDescriptor = roleDescriptor;
       }
-      
-      
+
       public RoleDescriptorType getRoleDescriptor()
       {
          return roleDescriptor;
       }
+
       public IDPSSODescriptorType getIdpDescriptor()
       {
          return idpDescriptor;
       }
+
       public SPSSODescriptorType getSpDescriptor()
       {
          return spDescriptor;
       }
+
       public AuthnAuthorityDescriptorType getAuthnDescriptor()
       {
          return authnDescriptor;
       }
+
       public AttributeAuthorityDescriptorType getAttribDescriptor()
       {
          return attribDescriptor;
       }
+
       public PDPDescriptorType getPdpDescriptor()
       {
          return pdpDescriptor;
-      }  
+      }
    }
 
    protected Element signature;
+
    protected ExtensionsType extensions;
 
    protected List<EDTChoiceType> choiceType = new ArrayList<EntityDescriptorType.EDTChoiceType>();
@@ -165,7 +199,7 @@
 
    protected String id;
 
-   public EntityDescriptorType( String entityID )
+   public EntityDescriptorType(String entityID)
    {
       this.entityID = entityID;
    }
@@ -178,7 +212,8 @@
     *     {@link Element }
     *     
     */
-   public Element getSignature() {
+   public Element getSignature()
+   {
       return signature;
    }
 
@@ -190,7 +225,8 @@
     *     {@link Element }
     *     
     */
-   public void setSignature( Element value) {
+   public void setSignature(Element value)
+   {
       this.signature = value;
    }
 
@@ -202,7 +238,8 @@
     *     {@link ExtensionsType }
     *     
     */
-   public ExtensionsType getExtensions() {
+   public ExtensionsType getExtensions()
+   {
       return extensions;
    }
 
@@ -214,7 +251,8 @@
     *     {@link ExtensionsType }
     *     
     */
-   public void setExtensions(ExtensionsType value) {
+   public void setExtensions(ExtensionsType value)
+   {
       this.extensions = value;
    }
 
@@ -224,7 +262,7 @@
     */
    public List<EDTChoiceType> getChoiceType()
    {
-      return Collections.unmodifiableList( choiceType );
+      return Collections.unmodifiableList(choiceType);
    }
 
    /**
@@ -233,16 +271,16 @@
     */
    public void addChoiceType(EDTChoiceType choiceType)
    {
-      this.choiceType.add( choiceType );
+      this.choiceType.add(choiceType);
    }
-   
+
    /**
     * Remove a choice type
     * @param choiceType
     */
    public void removeChoiceType(EDTChoiceType choiceType)
    {
-      this.choiceType.remove( choiceType );
+      this.choiceType.remove(choiceType);
    }
 
    /**
@@ -253,7 +291,8 @@
     *     {@link OrganizationType }
     *     
     */
-   public OrganizationType getOrganization() {
+   public OrganizationType getOrganization()
+   {
       return organization;
    }
 
@@ -265,7 +304,8 @@
     *     {@link OrganizationType }
     *     
     */
-   public void setOrganization(OrganizationType value) {
+   public void setOrganization(OrganizationType value)
+   {
       this.organization = value;
    }
 
@@ -273,16 +313,16 @@
     * Add a {@link ContactType} contact person
     * @param ct
     */
-   public void addContactPerson( ContactType ct )
+   public void addContactPerson(ContactType ct)
    {
       contactPerson.add(ct);
    }
-   
-   public void removeContactPerson( ContactType ct )
+
+   public void removeContactPerson(ContactType ct)
    {
       contactPerson.remove(ct);
    }
-   
+
    /**
     * Gets the value of the contactPerson property.
     * <p>
@@ -291,9 +331,9 @@
     * 
     * 
     */
-   public List<ContactType> getContactPerson() 
+   public List<ContactType> getContactPerson()
    {
-      return Collections.unmodifiableList( this.contactPerson );
+      return Collections.unmodifiableList(this.contactPerson);
    }
 
    /**
@@ -318,9 +358,9 @@
     * 
     * 
     */
-   public List<AdditionalMetadataLocationType> getAdditionalMetadataLocation() 
+   public List<AdditionalMetadataLocationType> getAdditionalMetadataLocation()
    {
-      return Collections.unmodifiableList( this.additionalMetadataLocation );
+      return Collections.unmodifiableList(this.additionalMetadataLocation);
    }
 
    /**
@@ -331,7 +371,8 @@
     *     {@link String }
     *     
     */
-   public String getEntityID() {
+   public String getEntityID()
+   {
       return entityID;
    }
 
@@ -343,7 +384,8 @@
     *     {@link XMLGregorianCalendar }
     *     
     */
-   public XMLGregorianCalendar getValidUntil() {
+   public XMLGregorianCalendar getValidUntil()
+   {
       return validUntil;
    }
 
@@ -355,7 +397,8 @@
     *     {@link XMLGregorianCalendar }
     *     
     */
-   public void setValidUntil(XMLGregorianCalendar value) {
+   public void setValidUntil(XMLGregorianCalendar value)
+   {
       this.validUntil = value;
    }
 
@@ -367,7 +410,8 @@
     *     {@link Duration }
     *     
     */
-   public Duration getCacheDuration() {
+   public Duration getCacheDuration()
+   {
       return cacheDuration;
    }
 
@@ -379,7 +423,8 @@
     *     {@link Duration }
     *     
     */
-   public void setCacheDuration(Duration value) {
+   public void setCacheDuration(Duration value)
+   {
       this.cacheDuration = value;
    }
 
@@ -391,7 +436,8 @@
     *     {@link String }
     *     
     */
-   public String getID() {
+   public String getID()
+   {
       return id;
    }
 
@@ -403,7 +449,8 @@
     *     {@link String }
     *     
     */
-   public void setID(String value) {
+   public void setID(String value)
+   {
       this.id = value;
-   } 
+   }
 }
\ No newline at end of file

Modified: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/metadata/ExtensionsType.java
===================================================================
--- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/metadata/ExtensionsType.java	2011-06-21 20:46:32 UTC (rev 1017)
+++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/metadata/ExtensionsType.java	2011-06-21 20:50:57 UTC (rev 1018)
@@ -1,3 +1,24 @@
+/*
+ * 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.v2.metadata;
 
 import java.util.ArrayList;
@@ -6,7 +27,6 @@
 
 import org.w3c.dom.Element;
 
-
 /**
  * <p>Java class for ExtensionsType complex type.
  * 
@@ -26,7 +46,7 @@
  * 
  * 
  */
-public class ExtensionsType 
+public class ExtensionsType
 {
    protected List<Object> any = new ArrayList<Object>();
 
@@ -34,16 +54,16 @@
     * Add an object
     * @param obj
     */
-   public void addObject( Object obj )
+   public void addObject(Object obj)
    {
       this.any.add(obj);
    }
-   
+
    /**
     * Remove an object
     * @param obj
     */
-   public void removeObject( Object obj )
+   public void removeObject(Object obj)
    {
       this.any.remove(obj);
    }
@@ -57,8 +77,8 @@
     * 
     * 
     */
-   public List<Object> getAny() 
+   public List<Object> getAny()
    {
-      return Collections.unmodifiableList( this.any );
-   } 
+      return Collections.unmodifiableList(this.any);
+   }
 }
\ No newline at end of file

Modified: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/metadata/IDPSSODescriptorType.java
===================================================================
--- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/metadata/IDPSSODescriptorType.java	2011-06-21 20:46:32 UTC (rev 1017)
+++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/metadata/IDPSSODescriptorType.java	2011-06-21 20:50:57 UTC (rev 1018)
@@ -1,3 +1,24 @@
+/*
+ * 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.v2.metadata;
 
 import java.util.ArrayList;
@@ -6,7 +27,6 @@
 
 import org.picketlink.identity.federation.saml.v2.assertion.AttributeType;
 
-
 /**
  * <p>Java class for IDPSSODescriptorType complex type.
  * 
@@ -31,31 +51,30 @@
  * 
  * 
  */
-public class IDPSSODescriptorType
-extends SSODescriptorType
-{ 
+public class IDPSSODescriptorType extends SSODescriptorType
+{
    protected List<EndpointType> singleSignOnService = new ArrayList<EndpointType>();
 
-   protected List<EndpointType> nameIDMappingService= new ArrayList<EndpointType>();
+   protected List<EndpointType> nameIDMappingService = new ArrayList<EndpointType>();
 
-   protected List<EndpointType> assertionIDRequestService= new ArrayList<EndpointType>();
+   protected List<EndpointType> assertionIDRequestService = new ArrayList<EndpointType>();
 
    protected List<String> attributeProfile = new ArrayList<String>();
 
    protected List<AttributeType> attribute = new ArrayList<AttributeType>();
 
-   protected Boolean wantAuthnRequestsSigned; 
+   protected Boolean wantAuthnRequestsSigned;
 
    public IDPSSODescriptorType(List<String> protocolSupport)
    {
-      super(protocolSupport); 
+      super(protocolSupport);
    }
 
    /**
     * Add a SSO service
     * @param endpt
     */
-   public void addSingleSignOnService( EndpointType endpt)
+   public void addSingleSignOnService(EndpointType endpt)
    {
       this.singleSignOnService.add(endpt);
    }
@@ -64,7 +83,7 @@
     * Add name id mapping service
     * @param endpt
     */
-   public void addNameIDMappingService( EndpointType endpt )
+   public void addNameIDMappingService(EndpointType endpt)
    {
       this.nameIDMappingService.add(endpt);
    }
@@ -73,7 +92,7 @@
     * Add assertion id request service
     * @param endpt
     */
-   public void addAssertionIDRequestService( EndpointType endpt )
+   public void addAssertionIDRequestService(EndpointType endpt)
    {
       this.assertionIDRequestService.add(endpt);
    }
@@ -82,26 +101,25 @@
     * Add attribute profile
     * @param str
     */
-   public void addAttributeProfile( String str )
+   public void addAttributeProfile(String str)
    {
-      this.attributeProfile.add( str );
-   }  
+      this.attributeProfile.add(str);
+   }
 
    /**
     * Add attribute
     * @param att
     */
-   public void addAttribute( AttributeType att )
+   public void addAttribute(AttributeType att)
    {
       this.attribute.add(att);
-   } 
-   
-   
+   }
+
    /**
     * Remove a SSO service
     * @param endpt
     */
-   public void removeSingleSignOnService( EndpointType endpt)
+   public void removeSingleSignOnService(EndpointType endpt)
    {
       this.singleSignOnService.remove(endpt);
    }
@@ -110,7 +128,7 @@
     * remove name id mapping service
     * @param endpt
     */
-   public void removeNameIDMappingService( EndpointType endpt )
+   public void removeNameIDMappingService(EndpointType endpt)
    {
       this.nameIDMappingService.remove(endpt);
    }
@@ -119,7 +137,7 @@
     * remove assertion id request service
     * @param endpt
     */
-   public void removeAssertionIDRequestService( EndpointType endpt )
+   public void removeAssertionIDRequestService(EndpointType endpt)
    {
       this.assertionIDRequestService.remove(endpt);
    }
@@ -128,19 +146,19 @@
     * Add attribute profile
     * @param str
     */
-   public void removeAttributeProfile( String str )
+   public void removeAttributeProfile(String str)
    {
-      this.attributeProfile.remove( str );
-   }  
+      this.attributeProfile.remove(str);
+   }
 
    /**
     * Add attribute
     * @param att
     */
-   public void removeAttribute( AttributeType att )
+   public void removeAttribute(AttributeType att)
    {
       this.attribute.remove(att);
-   } 
+   }
 
    /**
     * Gets the value of the singleSignOnService property.
@@ -148,9 +166,9 @@
     * Objects of the following type(s) are allowed in the list
     * {@link EndpointType }
     */
-   public List<EndpointType> getSingleSignOnService() 
+   public List<EndpointType> getSingleSignOnService()
    {
-      return Collections.unmodifiableList( this.singleSignOnService );
+      return Collections.unmodifiableList(this.singleSignOnService);
    }
 
    /**
@@ -160,9 +178,9 @@
     * Objects of the following type(s) are allowed in the list
     * {@link EndpointType }
     */
-   public List<EndpointType> getNameIDMappingService() 
+   public List<EndpointType> getNameIDMappingService()
    {
-      return Collections.unmodifiableList( this.nameIDMappingService );
+      return Collections.unmodifiableList(this.nameIDMappingService);
    }
 
    /**
@@ -171,9 +189,9 @@
     * Objects of the following type(s) are allowed in the list
     * {@link EndpointType }
     */
-   public List<EndpointType> getAssertionIDRequestService() 
+   public List<EndpointType> getAssertionIDRequestService()
    {
-      return Collections.unmodifiableList( this.assertionIDRequestService );
+      return Collections.unmodifiableList(this.assertionIDRequestService);
    }
 
    /**
@@ -190,9 +208,9 @@
     * Objects of the following type(s) are allowed in the list
     * {@link String }
     */
-   public List<String> getAttributeProfile() 
+   public List<String> getAttributeProfile()
    {
-      return Collections.unmodifiableList( this.attributeProfile );
+      return Collections.unmodifiableList(this.attributeProfile);
    }
 
    /**
@@ -204,9 +222,9 @@
     * 
     * 
     */
-   public List<AttributeType> getAttribute() 
-   { 
-      return Collections.unmodifiableList( this.attribute );
+   public List<AttributeType> getAttribute()
+   {
+      return Collections.unmodifiableList(this.attribute);
    }
 
    /**
@@ -217,7 +235,7 @@
     *     {@link Boolean }
     *     
     */
-   public Boolean isWantAuthnRequestsSigned() 
+   public Boolean isWantAuthnRequestsSigned()
    {
       return wantAuthnRequestsSigned;
    }
@@ -230,7 +248,7 @@
     *     {@link Boolean }
     *     
     */
-   public void setWantAuthnRequestsSigned(Boolean value) 
+   public void setWantAuthnRequestsSigned(Boolean value)
    {
       this.wantAuthnRequestsSigned = value;
    }

Modified: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/metadata/IndexedEndpointType.java
===================================================================
--- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/metadata/IndexedEndpointType.java	2011-06-21 20:46:32 UTC (rev 1017)
+++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/metadata/IndexedEndpointType.java	2011-06-21 20:50:57 UTC (rev 1018)
@@ -1,3 +1,24 @@
+/*
+ * 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.v2.metadata;
 
 import java.net.URI;
@@ -2,4 +23,2 @@
 
-
-
 /**
@@ -21,12 +40,12 @@
  * </pre>
  * 
  * 
- */ 
-public class IndexedEndpointType
-extends EndpointType
+ */
+public class IndexedEndpointType extends EndpointType
 {
 
-   protected int index; 
+   protected int index;
+
    protected Boolean isDefault;
 
    public IndexedEndpointType(URI binding, URI location)
@@ -38,7 +57,8 @@
     * Gets the value of the index property.
     * 
     */
-   public int getIndex() {
+   public int getIndex()
+   {
       return index;
    }
 
@@ -46,7 +66,8 @@
     * Sets the value of the index property.
     * 
     */
-   public void setIndex(int value) {
+   public void setIndex(int value)
+   {
       this.index = value;
    }
 
@@ -58,7 +79,8 @@
     *     {@link Boolean }
     *     
     */
-   public Boolean isIsDefault() {
+   public Boolean isIsDefault()
+   {
       return isDefault;
    }
 
@@ -70,7 +92,8 @@
     *     {@link Boolean }
     *     
     */
-   public void setIsDefault(Boolean value) {
+   public void setIsDefault(Boolean value)
+   {
       this.isDefault = value;
    }
 }
\ No newline at end of file

Modified: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/metadata/KeyDescriptorType.java
===================================================================
--- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/metadata/KeyDescriptorType.java	2011-06-21 20:46:32 UTC (rev 1017)
+++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/metadata/KeyDescriptorType.java	2011-06-21 20:50:57 UTC (rev 1018)
@@ -1,4 +1,24 @@
-
+/*
+ * 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.v2.metadata;
 
 import java.util.ArrayList;
@@ -9,7 +29,6 @@
 import org.picketlink.identity.xmlsec.w3.xmlenc.EncryptionMethodType;
 import org.w3c.dom.Element;
 
-
 /**
  * <p>Java class for KeyDescriptorType complex type.
  * 
@@ -30,10 +49,11 @@
  * </pre>
  * 
  * 
- */  
-public class KeyDescriptorType 
+ */
+public class KeyDescriptorType
 {
    protected Element keyInfo;
+
    protected List<EncryptionMethodType> encryptionMethod = new ArrayList<EncryptionMethodType>();
 
    protected KeyTypes use;
@@ -46,7 +66,8 @@
     *     {@link KeyInfoType }
     *     
     */
-   public Element getKeyInfo() {
+   public Element getKeyInfo()
+   {
       return keyInfo;
    }
 
@@ -58,7 +79,8 @@
     *     {@link KeyInfoType }
     *     
     */
-   public void setKeyInfo( Element value) {
+   public void setKeyInfo(Element value)
+   {
       this.keyInfo = value;
    }
 
@@ -66,18 +88,18 @@
     * Add encryption method type
     * @param e
     */
-   public void addEncryptionMethod( EncryptionMethodType e )
+   public void addEncryptionMethod(EncryptionMethodType e)
    {
-      this.encryptionMethod.add( e );
+      this.encryptionMethod.add(e);
    }
-   
+
    /**
     * Remove encryption method type
     * @param e
     */
-   public void removeEncryptionMethod( EncryptionMethodType e )
+   public void removeEncryptionMethod(EncryptionMethodType e)
    {
-      this.encryptionMethod.remove( e );
+      this.encryptionMethod.remove(e);
    }
 
    /**
@@ -88,9 +110,9 @@
     * 
     * 
     */
-   public List<EncryptionMethodType> getEncryptionMethod() 
+   public List<EncryptionMethodType> getEncryptionMethod()
    {
-      return Collections.unmodifiableList( this.encryptionMethod );
+      return Collections.unmodifiableList(this.encryptionMethod);
    }
 
    /**
@@ -101,7 +123,8 @@
     *     {@link KeyTypes }
     *     
     */
-   public KeyTypes getUse() {
+   public KeyTypes getUse()
+   {
       return use;
    }
 
@@ -113,7 +136,8 @@
     *     {@link KeyTypes }
     *     
     */
-   public void setUse(KeyTypes value) {
+   public void setUse(KeyTypes value)
+   {
       this.use = value;
    }
 }
\ No newline at end of file

Modified: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/metadata/KeyTypes.java
===================================================================
--- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/metadata/KeyTypes.java	2011-06-21 20:46:32 UTC (rev 1017)
+++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/metadata/KeyTypes.java	2011-06-21 20:50:57 UTC (rev 1018)
@@ -1,7 +1,26 @@
+/*
+ * 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.v2.metadata;
 
-
-
 /**
  * <p>Java class for KeyTypes.
  * 
@@ -17,23 +36,26 @@
  * </pre>
  * 
  */
-public enum KeyTypes 
-{
-   ENCRYPTION("encryption"),
-   SIGNING("signing");
+public enum KeyTypes {
+   ENCRYPTION("encryption"), SIGNING("signing");
    private final String value;
 
-   KeyTypes(String v) {
+   KeyTypes(String v)
+   {
       value = v;
    }
 
-   public String value() {
+   public String value()
+   {
       return value;
    }
 
-   public static KeyTypes fromValue(String v) {
-      for (KeyTypes c: KeyTypes.values()) {
-         if (c.value.equals(v)) {
+   public static KeyTypes fromValue(String v)
+   {
+      for (KeyTypes c : KeyTypes.values())
+      {
+         if (c.value.equals(v))
+         {
             return c;
          }
       }

Modified: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/metadata/LocalizedNameType.java
===================================================================
--- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/metadata/LocalizedNameType.java	2011-06-21 20:46:32 UTC (rev 1017)
+++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/metadata/LocalizedNameType.java	2011-06-21 20:50:57 UTC (rev 1018)
@@ -1,7 +1,26 @@
+/*
+ * 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.v2.metadata;
 
-
-
 /**
  * <p>Java class for localizedNameType complex type.
  * 
@@ -19,14 +38,14 @@
  * 
  * 
  */
-public class LocalizedNameType 
+public class LocalizedNameType
 {
    protected String value;
+
    protected String lang;
 
-
    public LocalizedNameType(String lang)
-   { 
+   {
       this.lang = lang;
    }
 
@@ -38,7 +57,8 @@
     *     {@link String }
     *     
     */
-   public String getValue() {
+   public String getValue()
+   {
       return value;
    }
 
@@ -50,7 +70,8 @@
     *     {@link String }
     *     
     */
-   public void setValue(String value) {
+   public void setValue(String value)
+   {
       this.value = value;
    }
 
@@ -62,7 +83,8 @@
     *     {@link String }
     *     
     */
-   public String getLang() {
+   public String getLang()
+   {
       return lang;
-   } 
+   }
 }

Modified: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/metadata/LocalizedURIType.java
===================================================================
--- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/metadata/LocalizedURIType.java	2011-06-21 20:46:32 UTC (rev 1017)
+++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/metadata/LocalizedURIType.java	2011-06-21 20:50:57 UTC (rev 1018)
@@ -1,3 +1,24 @@
+/*
+ * 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.v2.metadata;
 
 import java.net.URI;
@@ -2,3 +23,2 @@
 
-
 /**
@@ -19,15 +39,16 @@
  * </pre>
  * 
  * 
- */ 
-public class LocalizedURIType 
+ */
+public class LocalizedURIType
 {
 
-   protected URI value; 
+   protected URI value;
+
    protected String lang;
 
    public LocalizedURIType(String lang)
-   { 
+   {
       this.lang = lang;
    }
 
@@ -39,7 +60,8 @@
     *     {@link String }
     *     
     */
-   public URI getValue() {
+   public URI getValue()
+   {
       return value;
    }
 
@@ -51,7 +73,8 @@
     *     {@link String }
     *     
     */
-   public void setValue( URI value) {
+   public void setValue(URI value)
+   {
       this.value = value;
    }
 
@@ -63,7 +86,8 @@
     *     {@link String }
     *     
     */
-   public String getLang() {
+   public String getLang()
+   {
       return lang;
    }
 }
\ No newline at end of file

Modified: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/metadata/OrganizationType.java
===================================================================
--- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/metadata/OrganizationType.java	2011-06-21 20:46:32 UTC (rev 1017)
+++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/metadata/OrganizationType.java	2011-06-21 20:50:57 UTC (rev 1018)
@@ -1,3 +1,24 @@
+/*
+ * 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.v2.metadata;
 
 import java.util.ArrayList;
@@ -4,7 +25,6 @@
 import java.util.Collections;
 import java.util.List;
 
-
 /**
  * <p>Java class for OrganizationType complex type.
  * 
@@ -32,6 +52,7 @@
 {
 
    protected ExtensionsType extensions;
+
    protected List<LocalizedNameType> organizationName = new ArrayList<LocalizedNameType>();
 
    protected List<LocalizedNameType> organizationDisplayName = new ArrayList<LocalizedNameType>();
@@ -42,7 +63,7 @@
     * Add an organization name
     * @param name
     */
-   public void addOrganizationName( LocalizedNameType name )
+   public void addOrganizationName(LocalizedNameType name)
    {
       this.organizationName.add(name);
    }
@@ -51,7 +72,7 @@
     * Add organization display name
     * @param name
     */
-   public void addOrganizationDisplayName( LocalizedNameType name )
+   public void addOrganizationDisplayName(LocalizedNameType name)
    {
       this.organizationDisplayName.add(name);
    }
@@ -60,16 +81,16 @@
     * Add organization url
     * @param uri
     */
-   public void addOrganizationURL( LocalizedURIType uri )
+   public void addOrganizationURL(LocalizedURIType uri)
    {
       this.organizationURL.add(uri);
    }
-   
+
    /**
     * remove an organization name
     * @param name
     */
-   public void removeOrganizationName( LocalizedNameType name )
+   public void removeOrganizationName(LocalizedNameType name)
    {
       this.organizationName.remove(name);
    }
@@ -78,7 +99,7 @@
     * remove organization display name
     * @param name
     */
-   public void removeOrganizationDisplayName( LocalizedNameType name )
+   public void removeOrganizationDisplayName(LocalizedNameType name)
    {
       this.organizationDisplayName.remove(name);
    }
@@ -87,7 +108,7 @@
     * remove organization url
     * @param uri
     */
-   public void removeOrganizationURL( LocalizedURIType uri )
+   public void removeOrganizationURL(LocalizedURIType uri)
    {
       this.organizationURL.remove(uri);
    }
@@ -100,7 +121,8 @@
     *     {@link ExtensionsType }
     *     
     */
-   public ExtensionsType getExtensions() {
+   public ExtensionsType getExtensions()
+   {
       return extensions;
    }
 
@@ -112,7 +134,8 @@
     *     {@link ExtensionsType }
     *     
     */
-   public void setExtensions(ExtensionsType value) {
+   public void setExtensions(ExtensionsType value)
+   {
       this.extensions = value;
    }
 
@@ -124,9 +147,9 @@
     * {@link LocalizedNameType }
     *  
     */
-   public List<LocalizedNameType> getOrganizationName() 
+   public List<LocalizedNameType> getOrganizationName()
    {
-      return Collections.unmodifiableList( this.organizationName );
+      return Collections.unmodifiableList(this.organizationName);
    }
 
    /**
@@ -138,9 +161,9 @@
     * 
     * 
     */
-   public List<LocalizedNameType> getOrganizationDisplayName() 
+   public List<LocalizedNameType> getOrganizationDisplayName()
    {
-      return Collections.unmodifiableList( this.organizationDisplayName );
+      return Collections.unmodifiableList(this.organizationDisplayName);
    }
 
    /**
@@ -148,8 +171,8 @@
     * 
 
     */
-   public List<LocalizedURIType> getOrganizationURL() 
+   public List<LocalizedURIType> getOrganizationURL()
    {
-      return Collections.unmodifiableList( this.organizationURL );
+      return Collections.unmodifiableList(this.organizationURL);
    }
 }
\ No newline at end of file

Modified: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/metadata/PDPDescriptorType.java
===================================================================
--- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/metadata/PDPDescriptorType.java	2011-06-21 20:46:32 UTC (rev 1017)
+++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/metadata/PDPDescriptorType.java	2011-06-21 20:50:57 UTC (rev 1018)
@@ -1,3 +1,24 @@
+/*
+ * 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.v2.metadata;
 
 import java.util.ArrayList;
@@ -4,7 +25,6 @@
 import java.util.Collections;
 import java.util.List;
 
-
 /**
  * <p>Java class for PDPDescriptorType complex type.
  * 
@@ -34,17 +54,16 @@
 
    protected List<String> nameIDFormat = new ArrayList<String>();
 
-   
    public PDPDescriptorType(List<String> protocolSupport)
    {
-      super(protocolSupport); 
+      super(protocolSupport);
    }
 
    /**
     * Add authorization service
     * @param endpt
     */
-   public void addAuthZService( EndpointType endpt )
+   public void addAuthZService(EndpointType endpt)
    {
       this.authzService.add(endpt);
    }
@@ -53,7 +72,7 @@
     * Add assertion id request service
     * @param endpt
     */
-   public void addAssertionIDRequestService( EndpointType endpt )
+   public void addAssertionIDRequestService(EndpointType endpt)
    {
       this.assertionIDRequestService.add(endpt);
    }
@@ -62,16 +81,16 @@
     * Add Name ID Format
     * @param str
     */
-   public void addNameIDFormat( String str )
+   public void addNameIDFormat(String str)
    {
       this.nameIDFormat.add(str);
    }
-   
+
    /**
     * remove authorization service
     * @param endpt
     */
-   public void removeAuthZService( EndpointType endpt )
+   public void removeAuthZService(EndpointType endpt)
    {
       this.authzService.remove(endpt);
    }
@@ -80,7 +99,7 @@
     * remove assertion id request service
     * @param endpt
     */
-   public void removeAssertionIDRequestService( EndpointType endpt )
+   public void removeAssertionIDRequestService(EndpointType endpt)
    {
       this.assertionIDRequestService.remove(endpt);
    }
@@ -89,7 +108,7 @@
     * remove Name ID Format
     * @param str
     */
-   public void removeNameIDFormat( String str )
+   public void removeNameIDFormat(String str)
    {
       this.nameIDFormat.remove(str);
    }
@@ -100,9 +119,9 @@
     * Objects of the following type(s) are allowed in the list
     * {@link EndpointType }
     */
-   public List<EndpointType> getAuthzService() 
+   public List<EndpointType> getAuthzService()
    {
-      return Collections.unmodifiableList( this.authzService );
+      return Collections.unmodifiableList(this.authzService);
    }
 
    /**
@@ -112,9 +131,9 @@
     * Objects of the following type(s) are allowed in the list
     * {@link EndpointType }
     */
-   public List<EndpointType> getAssertionIDRequestService() 
+   public List<EndpointType> getAssertionIDRequestService()
    {
-      return Collections.unmodifiableList( this.assertionIDRequestService );
+      return Collections.unmodifiableList(this.assertionIDRequestService);
    }
 
    /**
@@ -123,8 +142,8 @@
     * Objects of the following type(s) are allowed in the list
     * {@link String }
     */
-   public List<String> getNameIDFormat() 
+   public List<String> getNameIDFormat()
    {
-      return Collections.unmodifiableList( this.nameIDFormat );
+      return Collections.unmodifiableList(this.nameIDFormat);
    }
 }
\ No newline at end of file

Modified: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/metadata/RequestedAttributeType.java
===================================================================
--- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/metadata/RequestedAttributeType.java	2011-06-21 20:46:32 UTC (rev 1017)
+++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/metadata/RequestedAttributeType.java	2011-06-21 20:50:57 UTC (rev 1018)
@@ -1,11 +1,28 @@
-
-
-
+/*
+ * 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.v2.metadata;
 
 import org.picketlink.identity.federation.saml.v2.assertion.AttributeType;
 
-
 /**
  * <p>Java class for RequestedAttributeType complex type.
  * 
@@ -23,13 +40,13 @@
  * 
  * 
  */
-public class RequestedAttributeType
-extends AttributeType
+public class RequestedAttributeType extends AttributeType
 {
+   private static final long serialVersionUID = 1L;
 
    public RequestedAttributeType(String name)
    {
-      super(name); 
+      super(name);
    }
 
    protected Boolean isRequired;
@@ -42,7 +59,7 @@
     *     {@link Boolean }
     *     
     */
-   public Boolean isIsRequired() 
+   public Boolean isIsRequired()
    {
       return isRequired;
    }
@@ -55,7 +72,7 @@
     *     {@link Boolean }
     *     
     */
-   public void setIsRequired(Boolean value) 
+   public void setIsRequired(Boolean value)
    {
       this.isRequired = value;
    }

Modified: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/metadata/RoleDescriptorType.java
===================================================================
--- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/metadata/RoleDescriptorType.java	2011-06-21 20:46:32 UTC (rev 1017)
+++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/metadata/RoleDescriptorType.java	2011-06-21 20:50:57 UTC (rev 1018)
@@ -1,3 +1,24 @@
+/*
+ * 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.v2.metadata;
 
 import java.util.ArrayList;
@@ -9,7 +30,6 @@
 
 import org.picketlink.identity.xmlsec.w3.xmldsig.SignatureType;
 
-
 /**
  * <p>Java class for RoleDescriptorType complex type.
  * 
@@ -37,61 +57,70 @@
  * </pre>
  * 
  * 
- */ 
+ */
 public abstract class RoleDescriptorType extends TypeWithOtherAttributes
 {
    protected SignatureType signature;
+
    protected ExtensionsType extensions;
+
    protected List<KeyDescriptorType> keyDescriptor = new ArrayList<KeyDescriptorType>();
+
    protected OrganizationType organization;
+
    protected List<ContactType> contactPerson = new ArrayList<ContactType>();
+
    protected String id;
+
    protected XMLGregorianCalendar validUntil;
+
    protected Duration cacheDuration;
+
    protected List<String> protocolSupportEnumeration = new ArrayList<String>();
-   protected String errorURL; 
-   
-   public RoleDescriptorType( List<String> protocolSupport )
+
+   protected String errorURL;
+
+   public RoleDescriptorType(List<String> protocolSupport)
    {
-      protocolSupportEnumeration.addAll( protocolSupport );
+      protocolSupportEnumeration.addAll(protocolSupport);
    }
-   
+
    /**
     * Add key descriptor
     * @param keyD
     */
-   public void addKeyDescriptor( KeyDescriptorType keyD )
+   public void addKeyDescriptor(KeyDescriptorType keyD)
    {
       this.keyDescriptor.add(keyD);
    }
-   
+
    /**
     * Add contact 
     * @param contact
     */
-   public void addContactPerson( ContactType contact )
+   public void addContactPerson(ContactType contact)
    {
       this.contactPerson.add(contact);
    }
-   
+
    /**
     * remove key descriptor
     * @param keyD
     */
-   public void removeKeyDescriptor( KeyDescriptorType keyD )
+   public void removeKeyDescriptor(KeyDescriptorType keyD)
    {
       this.keyDescriptor.remove(keyD);
    }
-   
+
    /**
     * remove contact 
     * @param contact
     */
-   public void removeContactPerson( ContactType contact )
+   public void removeContactPerson(ContactType contact)
    {
       this.contactPerson.remove(contact);
    }
-     
+
    /**
     * Gets the value of the signature property.
     * 
@@ -100,7 +129,8 @@
     *     {@link SignatureType }
     *     
     */
-   public SignatureType getSignature() {
+   public SignatureType getSignature()
+   {
       return signature;
    }
 
@@ -112,7 +142,8 @@
     *     {@link SignatureType }
     *     
     */
-   public void setSignature(SignatureType value) {
+   public void setSignature(SignatureType value)
+   {
       this.signature = value;
    }
 
@@ -124,7 +155,8 @@
     *     {@link ExtensionsType }
     *     
     */
-   public ExtensionsType getExtensions() {
+   public ExtensionsType getExtensions()
+   {
       return extensions;
    }
 
@@ -136,7 +168,8 @@
     *     {@link ExtensionsType }
     *     
     */
-   public void setExtensions(ExtensionsType value) {
+   public void setExtensions(ExtensionsType value)
+   {
       this.extensions = value;
    }
 
@@ -148,8 +181,9 @@
     * 
     * 
     */
-   public List<KeyDescriptorType> getKeyDescriptor() { 
-      return Collections.unmodifiableList( this.keyDescriptor );
+   public List<KeyDescriptorType> getKeyDescriptor()
+   {
+      return Collections.unmodifiableList(this.keyDescriptor);
    }
 
    /**
@@ -160,7 +194,8 @@
     *     {@link OrganizationType }
     *     
     */
-   public OrganizationType getOrganization() {
+   public OrganizationType getOrganization()
+   {
       return organization;
    }
 
@@ -172,7 +207,8 @@
     *     {@link OrganizationType }
     *     
     */
-   public void setOrganization(OrganizationType value) {
+   public void setOrganization(OrganizationType value)
+   {
       this.organization = value;
    }
 
@@ -184,8 +220,9 @@
     * 
     * 
     */
-   public List<ContactType> getContactPerson() { 
-      return Collections.unmodifiableList( this.contactPerson );
+   public List<ContactType> getContactPerson()
+   {
+      return Collections.unmodifiableList(this.contactPerson);
    }
 
    /**
@@ -196,7 +233,8 @@
     *     {@link String }
     *     
     */
-   public String getID() {
+   public String getID()
+   {
       return id;
    }
 
@@ -208,7 +246,8 @@
     *     {@link String }
     *     
     */
-   public void setID(String value) {
+   public void setID(String value)
+   {
       this.id = value;
    }
 
@@ -220,7 +259,8 @@
     *     {@link XMLGregorianCalendar }
     *     
     */
-   public XMLGregorianCalendar getValidUntil() {
+   public XMLGregorianCalendar getValidUntil()
+   {
       return validUntil;
    }
 
@@ -232,7 +272,8 @@
     *     {@link XMLGregorianCalendar }
     *     
     */
-   public void setValidUntil(XMLGregorianCalendar value) {
+   public void setValidUntil(XMLGregorianCalendar value)
+   {
       this.validUntil = value;
    }
 
@@ -244,7 +285,8 @@
     *     {@link Duration }
     *     
     */
-   public Duration getCacheDuration() {
+   public Duration getCacheDuration()
+   {
       return cacheDuration;
    }
 
@@ -256,7 +298,8 @@
     *     {@link Duration }
     *     
     */
-   public void setCacheDuration(Duration value) {
+   public void setCacheDuration(Duration value)
+   {
       this.cacheDuration = value;
    }
 
@@ -268,8 +311,9 @@
     * 
     * 
     */
-   public List<String> getProtocolSupportEnumeration() { 
-      return Collections.unmodifiableList( this.protocolSupportEnumeration );
+   public List<String> getProtocolSupportEnumeration()
+   {
+      return Collections.unmodifiableList(this.protocolSupportEnumeration);
    }
 
    /**
@@ -280,7 +324,8 @@
     *     {@link String }
     *     
     */
-   public String getErrorURL() {
+   public String getErrorURL()
+   {
       return errorURL;
    }
 
@@ -292,7 +337,8 @@
     *     {@link String }
     *     
     */
-   public void setErrorURL(String value) {
+   public void setErrorURL(String value)
+   {
       this.errorURL = value;
-   } 
+   }
 }
\ No newline at end of file

Modified: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/metadata/SPSSODescriptorType.java
===================================================================
--- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/metadata/SPSSODescriptorType.java	2011-06-21 20:46:32 UTC (rev 1017)
+++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/metadata/SPSSODescriptorType.java	2011-06-21 20:50:57 UTC (rev 1018)
@@ -1,3 +1,24 @@
+/*
+ * 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.v2.metadata;
 
 import java.util.ArrayList;
@@ -4,7 +25,6 @@
 import java.util.Collections;
 import java.util.List;
 
-
 /**
  * <p>Java class for SPSSODescriptorType complex type.
  * 
@@ -27,53 +47,55 @@
  * 
  * 
  */
-public class SPSSODescriptorType  extends SSODescriptorType
+public class SPSSODescriptorType extends SSODescriptorType
 {
    protected List<IndexedEndpointType> assertionConsumerService = new ArrayList<IndexedEndpointType>();
+
    protected List<AttributeConsumingServiceType> attributeConsumingService = new ArrayList<AttributeConsumingServiceType>();
+
    protected Boolean authnRequestsSigned;
+
    protected Boolean wantAssertionsSigned;
 
-
    public SPSSODescriptorType(List<String> protocolSupport)
    {
-      super(protocolSupport); 
+      super(protocolSupport);
    }
-   
+
    /**
     * Add an Assertion Consumer Service
     * @param assertionConsumer an endpoint of type {@link IndexedEndpointType}
     */
-   public void addAssertionConsumerService( IndexedEndpointType assertionConsumer )
+   public void addAssertionConsumerService(IndexedEndpointType assertionConsumer)
    {
-      this.assertionConsumerService.add( assertionConsumer );
+      this.assertionConsumerService.add(assertionConsumer);
    }
-   
+
    /**
     * Add an attribute consumer
     * @param attributeConsumer an instance of type {@link AttributeConsumingServiceType}
     */
-   public void addAttributeConsumerService( AttributeConsumingServiceType attributeConsumer )
+   public void addAttributeConsumerService(AttributeConsumingServiceType attributeConsumer)
    {
-      this.attributeConsumingService.add( attributeConsumer );
+      this.attributeConsumingService.add(attributeConsumer);
    }
-   
+
    /**
     * Remove an Assertion Consumer Service
     * @param assertionConsumer an endpoint of type {@link IndexedEndpointType}
     */
-   public void removeAssertionConsumerService( IndexedEndpointType assertionConsumer )
+   public void removeAssertionConsumerService(IndexedEndpointType assertionConsumer)
    {
-      this.assertionConsumerService.remove( assertionConsumer );
+      this.assertionConsumerService.remove(assertionConsumer);
    }
-   
+
    /**
     * Remove an attribute consumer
     * @param attributeConsumer an instance of type {@link AttributeConsumingServiceType}
     */
-   public void removeAttributeConsumerService( AttributeConsumingServiceType attributeConsumer )
+   public void removeAttributeConsumerService(AttributeConsumingServiceType attributeConsumer)
    {
-      this.attributeConsumingService.remove( attributeConsumer );
+      this.attributeConsumingService.remove(attributeConsumer);
    }
 
    /**
@@ -82,12 +104,10 @@
     * Objects of the following type(s) are allowed in the list
     * {@link IndexedEndpointType }
     */
-   public List<IndexedEndpointType> getAssertionConsumerService() 
+   public List<IndexedEndpointType> getAssertionConsumerService()
    {
-      return Collections.unmodifiableList( this.assertionConsumerService );
+      return Collections.unmodifiableList(this.assertionConsumerService);
    }
-   
-   
 
    /**
     * Gets the value of the attributeConsumingService property.
@@ -95,9 +115,9 @@
     * Objects of the following type(s) are allowed in the list
     * {@link AttributeConsumingServiceType }
     */
-   public List<AttributeConsumingServiceType> getAttributeConsumingService() 
+   public List<AttributeConsumingServiceType> getAttributeConsumingService()
    {
-      return Collections.unmodifiableList( this.attributeConsumingService );
+      return Collections.unmodifiableList(this.attributeConsumingService);
    }
 
    /**
@@ -108,7 +128,8 @@
     *     {@link Boolean }
     *     
     */
-   public Boolean isAuthnRequestsSigned() {
+   public Boolean isAuthnRequestsSigned()
+   {
       return authnRequestsSigned;
    }
 
@@ -120,7 +141,8 @@
     *     {@link Boolean }
     *     
     */
-   public void setAuthnRequestsSigned(Boolean value) {
+   public void setAuthnRequestsSigned(Boolean value)
+   {
       this.authnRequestsSigned = value;
    }
 
@@ -132,7 +154,8 @@
     *     {@link Boolean }
     *     
     */
-   public Boolean isWantAssertionsSigned() {
+   public Boolean isWantAssertionsSigned()
+   {
       return wantAssertionsSigned;
    }
 
@@ -144,7 +167,8 @@
     *     {@link Boolean }
     *     
     */
-   public void setWantAssertionsSigned(Boolean value) {
+   public void setWantAssertionsSigned(Boolean value)
+   {
       this.wantAssertionsSigned = value;
    }
 }
\ No newline at end of file

Modified: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/metadata/SSODescriptorType.java
===================================================================
--- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/metadata/SSODescriptorType.java	2011-06-21 20:46:32 UTC (rev 1017)
+++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/metadata/SSODescriptorType.java	2011-06-21 20:50:57 UTC (rev 1018)
@@ -1,3 +1,24 @@
+/*
+ * 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.v2.metadata;
 
 import java.util.ArrayList;
@@ -4,7 +25,6 @@
 import java.util.Collections;
 import java.util.List;
 
-
 /**
  * <p>Java class for SSODescriptorType complex type.
  * 
@@ -29,22 +49,24 @@
  */
 public abstract class SSODescriptorType extends RoleDescriptorType
 {
-   protected List<IndexedEndpointType> artifactResolutionService = new ArrayList<IndexedEndpointType>(); 
-   protected List<EndpointType> singleLogoutService = new ArrayList<EndpointType>(); 
-   protected List<EndpointType> manageNameIDService = new ArrayList<EndpointType>(); 
+   protected List<IndexedEndpointType> artifactResolutionService = new ArrayList<IndexedEndpointType>();
+
+   protected List<EndpointType> singleLogoutService = new ArrayList<EndpointType>();
+
+   protected List<EndpointType> manageNameIDService = new ArrayList<EndpointType>();
+
    protected List<String> nameIDFormat = new ArrayList<String>();
 
-
    public SSODescriptorType(List<String> protocolSupport)
    {
-      super(protocolSupport); 
+      super(protocolSupport);
    }
 
    /**
     * Add SLO Service
     * @param endpt
     */
-   public void addSingleLogoutService( EndpointType endpt )
+   public void addSingleLogoutService(EndpointType endpt)
    {
       this.singleLogoutService.add(endpt);
    }
@@ -53,7 +75,7 @@
     * Add atrifact resolution service
     * @param i
     */
-   public void addArtifactResolutionService( IndexedEndpointType i )
+   public void addArtifactResolutionService(IndexedEndpointType i)
    {
       this.artifactResolutionService.add(i);
    }
@@ -62,7 +84,7 @@
     * Add manage name id service
     * @param end
     */
-   public void addManageNameIDService( EndpointType end )
+   public void addManageNameIDService(EndpointType end)
    {
       this.manageNameIDService.add(end);
    }
@@ -71,16 +93,16 @@
     * Add Name ID Format
     * @param s
     */
-   public void addNameIDFormat( String s )
+   public void addNameIDFormat(String s)
    {
       this.nameIDFormat.add(s);
    }
-   
+
    /**
     * remove SLO Service
     * @param endpt
     */
-   public void removeSingleLogoutService( EndpointType endpt )
+   public void removeSingleLogoutService(EndpointType endpt)
    {
       this.singleLogoutService.remove(endpt);
    }
@@ -89,7 +111,7 @@
     * remove atrifact resolution service
     * @param i
     */
-   public void removeArtifactResolutionService( IndexedEndpointType i )
+   public void removeArtifactResolutionService(IndexedEndpointType i)
    {
       this.artifactResolutionService.remove(i);
    }
@@ -98,7 +120,7 @@
     * remove manage name id service
     * @param end
     */
-   public void removeManageNameIDService( EndpointType end )
+   public void removeManageNameIDService(EndpointType end)
    {
       this.manageNameIDService.remove(end);
    }
@@ -107,7 +129,7 @@
     * remove Name ID Format
     * @param s
     */
-   public void removeNameIDFormat( String s )
+   public void removeNameIDFormat(String s)
    {
       this.nameIDFormat.remove(s);
    }
@@ -118,9 +140,9 @@
     * Objects of the following type(s) are allowed in the list
     * {@link IndexedEndpointType }
     */
-   public List<IndexedEndpointType> getArtifactResolutionService() 
-   { 
-      return Collections.unmodifiableList( this.artifactResolutionService );
+   public List<IndexedEndpointType> getArtifactResolutionService()
+   {
+      return Collections.unmodifiableList(this.artifactResolutionService);
    }
 
    /**
@@ -129,9 +151,9 @@
     * Objects of the following type(s) are allowed in the list
     * {@link EndpointType }
     */
-   public List<EndpointType> getSingleLogoutService() 
+   public List<EndpointType> getSingleLogoutService()
    {
-      return Collections.unmodifiableList( this.singleLogoutService );
+      return Collections.unmodifiableList(this.singleLogoutService);
    }
 
    /**
@@ -140,9 +162,9 @@
     * Objects of the following type(s) are allowed in the list
     * {@link EndpointType }
     */
-   public List<EndpointType> getManageNameIDService() 
+   public List<EndpointType> getManageNameIDService()
    {
-      return Collections.unmodifiableList( this.manageNameIDService );
+      return Collections.unmodifiableList(this.manageNameIDService);
    }
 
    /**
@@ -153,8 +175,8 @@
     * 
     * 
     */
-   public List<String> getNameIDFormat() 
+   public List<String> getNameIDFormat()
    {
-      return Collections.unmodifiableList( this.nameIDFormat );
-   } 
+      return Collections.unmodifiableList(this.nameIDFormat);
+   }
 }
\ No newline at end of file

Modified: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/metadata/package-info.java
===================================================================
--- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/metadata/package-info.java	2011-06-21 20:46:32 UTC (rev 1017)
+++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/metadata/package-info.java	2011-06-21 20:50:57 UTC (rev 1018)
@@ -1,9 +1,23 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.1-661 
-// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2008.12.08 at 05:45:20 PM CST 
-//
+/*
+ * 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.v2.metadata;
 
- at javax.xml.bind.annotation.XmlSchema(namespace = "urn:oasis:names:tc:SAML:2.0:metadata", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED)
-package org.picketlink.identity.federation.saml.v2.metadata;



More information about the jboss-cvs-commits mailing list