[picketlink-commits] Picketlink SVN: r736 - in federation/trunk: picketlink-bindings/src/test/resources/saml2/logout/idp/WEB-INF and 15 other directories.

picketlink-commits at lists.jboss.org picketlink-commits at lists.jboss.org
Fri Feb 4 17:45:36 EST 2011


Author: anil.saldhana at jboss.com
Date: 2011-02-04 17:45:33 -0500 (Fri, 04 Feb 2011)
New Revision: 736

Removed:
   federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/generated/ActivationLimitDurationType.java
   federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/generated/ActivationLimitSessionType.java
   federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/generated/ActivationLimitType.java
   federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/generated/ActivationLimitUsagesType.java
   federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/generated/ActivationPinType.java
   federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/generated/AlphabetType.java
   federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/generated/AuthenticatorBaseType.java
   federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/generated/AuthenticatorTransportProtocolType.java
   federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/generated/AuthnContextDeclarationBaseType.java
   federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/generated/AuthnMethodBaseType.java
   federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/generated/BooleanType.java
   federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/generated/ComplexAuthenticatorType.java
   federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/generated/DeviceTypeType.java
   federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/generated/ExtensionOnlyType.java
   federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/generated/ExtensionType.java
   federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/generated/Generation.java
   federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/generated/GoverningAgreementRefType.java
   federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/generated/GoverningAgreementsType.java
   federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/generated/IdentificationType.java
   federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/generated/KeyActivationType.java
   federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/generated/KeySharingType.java
   federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/generated/KeyStorageType.java
   federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/generated/LengthType.java
   federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/generated/MediumType.java
   federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/generated/NymType.java
   federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/generated/ObjectFactory.java
   federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/generated/OperationalProtectionType.java
   federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/generated/PasswordType.java
   federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/generated/PhysicalVerification.java
   federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/generated/PrincipalAuthenticationMechanismType.java
   federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/generated/PrivateKeyProtectionType.java
   federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/generated/PublicKeyType.java
   federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/generated/RestrictedLengthType.java
   federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/generated/RestrictedPasswordType.java
   federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/generated/SecretKeyProtectionType.java
   federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/generated/SecurityAuditType.java
   federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/generated/SharedSecretChallengeResponseType.java
   federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/generated/TechnicalProtectionBaseType.java
   federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/generated/TimeSyncTokenType.java
   federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/generated/TokenType.java
   federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/generated/runtime/ZeroOneBooleanAdapter.java
Modified:
   federation/trunk/picketlink-bindings/src/test/java/org/picketlink/test/identity/federation/bindings/config/MetadataConfigUnitTestCase.java
   federation/trunk/picketlink-bindings/src/test/resources/saml2/logout/idp/WEB-INF/picketlink-idfed.xml
   federation/trunk/picketlink-bindings/src/test/resources/saml2/logout/sp/employee/WEB-INF/picketlink-idfed.xml
   federation/trunk/picketlink-bindings/src/test/resources/saml2/logout/sp/sales/WEB-INF/picketlink-idfed.xml
   federation/trunk/picketlink-bindings/src/test/resources/saml2/post/idp/WEB-INF/picketlink-idfed.xml
   federation/trunk/picketlink-bindings/src/test/resources/saml2/post/sp/employee/WEB-INF/picketlink-idfed.xml
   federation/trunk/picketlink-bindings/src/test/resources/saml2/redirect/idp/WEB-INF/picketlink-idfed.xml
   federation/trunk/picketlink-bindings/src/test/resources/saml2/redirect/sp/employee/WEB-INF/picketlink-idfed.xml
   federation/trunk/picketlink-bindings/src/test/resources/saml2/redirect/sp/sales/WEB-INF/picketlink-idfed.xml
   federation/trunk/picketlink-fed-api/src/main/java/org/picketlink/identity/federation/api/util/KeyUtil.java
   federation/trunk/picketlink-web/src/main/java/org/picketlink/identity/federation/web/util/ConfigurationUtil.java
   federation/trunk/picketlink-web/src/test/resources/saml2/logout/idp/WEB-INF/picketlink-idfed.xml
   federation/trunk/picketlink-web/src/test/resources/saml2/logout/sp/employee/WEB-INF/picketlink-idfed.xml
   federation/trunk/picketlink-web/src/test/resources/saml2/post/idp/WEB-INF/picketlink-idfed.xml
   federation/trunk/picketlink-web/src/test/resources/saml2/post/sp/employee/WEB-INF/picketlink-idfed.xml
Log:
PLFED-126: stax parsing of PL config

Modified: federation/trunk/picketlink-bindings/src/test/java/org/picketlink/test/identity/federation/bindings/config/MetadataConfigUnitTestCase.java
===================================================================
--- federation/trunk/picketlink-bindings/src/test/java/org/picketlink/test/identity/federation/bindings/config/MetadataConfigUnitTestCase.java	2011-02-04 22:44:25 UTC (rev 735)
+++ federation/trunk/picketlink-bindings/src/test/java/org/picketlink/test/identity/federation/bindings/config/MetadataConfigUnitTestCase.java	2011-02-04 22:45:33 UTC (rev 736)
@@ -24,17 +24,13 @@
 import java.io.InputStream;
 import java.util.List;
 
-import javax.xml.bind.JAXBElement;
-import javax.xml.bind.Unmarshaller;
-
 import junit.framework.TestCase;
 
 import org.picketlink.identity.federation.core.config.IDPType;
 import org.picketlink.identity.federation.core.config.KeyValueType;
 import org.picketlink.identity.federation.core.config.MetadataProviderType;
 import org.picketlink.identity.federation.core.config.TrustType;
-import org.picketlink.identity.federation.core.constants.PicketLinkFederationConstants;
-import org.picketlink.identity.federation.core.util.JAXBUtil;
+import org.picketlink.identity.federation.core.parsers.config.SAMLConfigParser;
 
 
 /**
@@ -45,14 +41,12 @@
 public class MetadataConfigUnitTestCase extends TestCase
 {
    String config = "config/test-metadata-config-";
-   
-   @SuppressWarnings("unchecked")
+    
    public void testMetadata() throws Exception
    {
       Object object = this.unmarshall(config + "1.xml");
-      assertNotNull("IDP is not null", object);
-      assertTrue(object instanceof JAXBElement);
-      IDPType idp = ((JAXBElement<IDPType>) object).getValue();
+      assertNotNull("IDP is not null", object); 
+      IDPType idp =  (IDPType) object;
       assertEquals("20000", 20000L, idp.getAssertionValidity());
       assertEquals("somefqn", idp.getRoleGenerator());
 
@@ -75,15 +69,12 @@
    
    private Object unmarshall(String configFile) throws Exception
    {
-      String schema = PicketLinkFederationConstants.SCHEMA_IDFED;
+      //String schema = PicketLinkFederationConstants.SCHEMA_IDFED;
 
       ClassLoader tcl = Thread.currentThread().getContextClassLoader();
       InputStream is = tcl.getResourceAsStream(configFile);
       assertNotNull("Inputstream not null", is);
 
-      Unmarshaller un = 
-         JAXBUtil.getValidatingUnmarshaller("org.picketlink.identity.federation.core.config",
-            schema);
-      return un.unmarshal(is);
+      return (new SAMLConfigParser()).parse( is );
    }
 }
\ No newline at end of file

Modified: federation/trunk/picketlink-bindings/src/test/resources/saml2/logout/idp/WEB-INF/picketlink-idfed.xml
===================================================================
--- federation/trunk/picketlink-bindings/src/test/resources/saml2/logout/idp/WEB-INF/picketlink-idfed.xml	2011-02-04 22:44:25 UTC (rev 735)
+++ federation/trunk/picketlink-bindings/src/test/resources/saml2/logout/idp/WEB-INF/picketlink-idfed.xml	2011-02-04 22:45:33 UTC (rev 736)
@@ -1,5 +1,5 @@
 <PicketLinkIDP xmlns="urn:picketlink:identity-federation:config:1.0" 
-  AttributeManager=""
+  AttributeManager="org.picketlink.identity.federation.core.impl.EmptyAttributeManager"
   RoleGenerator="org.picketlink.identity.federation.core.impl.EmptyRoleGenerator">
 <IdentityURL>http://localhost:8080/idp/</IdentityURL> 
 <Trust>

Modified: federation/trunk/picketlink-bindings/src/test/resources/saml2/logout/sp/employee/WEB-INF/picketlink-idfed.xml
===================================================================
--- federation/trunk/picketlink-bindings/src/test/resources/saml2/logout/sp/employee/WEB-INF/picketlink-idfed.xml	2011-02-04 22:44:25 UTC (rev 735)
+++ federation/trunk/picketlink-bindings/src/test/resources/saml2/logout/sp/employee/WEB-INF/picketlink-idfed.xml	2011-02-04 22:45:33 UTC (rev 736)
@@ -1,5 +1,5 @@
 <PicketLinkSP xmlns="urn:picketlink:identity-federation:config:1.0" 
-  AttributeManager="">
+  AttributeManager="org.picketlink.identity.federation.core.impl.EmptyAttributeManager">
 <IdentityURL>http://localhost:8080/idp/</IdentityURL>
 <ServiceURL>http://localhost:8080/employee/</ServiceURL>  
 

Modified: federation/trunk/picketlink-bindings/src/test/resources/saml2/logout/sp/sales/WEB-INF/picketlink-idfed.xml
===================================================================
--- federation/trunk/picketlink-bindings/src/test/resources/saml2/logout/sp/sales/WEB-INF/picketlink-idfed.xml	2011-02-04 22:44:25 UTC (rev 735)
+++ federation/trunk/picketlink-bindings/src/test/resources/saml2/logout/sp/sales/WEB-INF/picketlink-idfed.xml	2011-02-04 22:45:33 UTC (rev 736)
@@ -1,5 +1,5 @@
 <PicketLinkSP xmlns="urn:picketlink:identity-federation:config:1.0" 
-  AttributeManager="">
+  AttributeManager="org.picketlink.identity.federation.core.impl.EmptyAttributeManager">
 <IdentityURL>http://localhost:8080/idp/</IdentityURL>
 <ServiceURL>http://localhost:8080/sales/</ServiceURL>  
 

Modified: federation/trunk/picketlink-bindings/src/test/resources/saml2/post/idp/WEB-INF/picketlink-idfed.xml
===================================================================
--- federation/trunk/picketlink-bindings/src/test/resources/saml2/post/idp/WEB-INF/picketlink-idfed.xml	2011-02-04 22:44:25 UTC (rev 735)
+++ federation/trunk/picketlink-bindings/src/test/resources/saml2/post/idp/WEB-INF/picketlink-idfed.xml	2011-02-04 22:45:33 UTC (rev 736)
@@ -1,5 +1,5 @@
 <PicketLinkIDP xmlns="urn:picketlink:identity-federation:config:1.0" 
-  AttributeManager="">
+  AttributeManager="org.picketlink.identity.federation.core.impl.EmptyAttributeManager">
 <IdentityURL>http://localhost:8080/idp/</IdentityURL> 
 <Trust>
    <Domains>localhost,jboss.com,jboss.org</Domains>

Modified: federation/trunk/picketlink-bindings/src/test/resources/saml2/post/sp/employee/WEB-INF/picketlink-idfed.xml
===================================================================
--- federation/trunk/picketlink-bindings/src/test/resources/saml2/post/sp/employee/WEB-INF/picketlink-idfed.xml	2011-02-04 22:44:25 UTC (rev 735)
+++ federation/trunk/picketlink-bindings/src/test/resources/saml2/post/sp/employee/WEB-INF/picketlink-idfed.xml	2011-02-04 22:45:33 UTC (rev 736)
@@ -1,5 +1,5 @@
 <PicketLinkSP xmlns="urn:picketlink:identity-federation:config:1.0" 
-  AttributeManager="">
+  AttributeManager="org.picketlink.identity.federation.core.impl.EmptyAttributeManager">
 <IdentityURL>http://localhost:8080/idp/</IdentityURL>
 <ServiceURL>http://localhost:8080/employee/</ServiceURL>  
 

Modified: federation/trunk/picketlink-bindings/src/test/resources/saml2/redirect/idp/WEB-INF/picketlink-idfed.xml
===================================================================
--- federation/trunk/picketlink-bindings/src/test/resources/saml2/redirect/idp/WEB-INF/picketlink-idfed.xml	2011-02-04 22:44:25 UTC (rev 735)
+++ federation/trunk/picketlink-bindings/src/test/resources/saml2/redirect/idp/WEB-INF/picketlink-idfed.xml	2011-02-04 22:45:33 UTC (rev 736)
@@ -1,5 +1,5 @@
 <PicketLinkIDP xmlns="urn:picketlink:identity-federation:config:1.0" 
-  AttributeManager=""
+  AttributeManager="org.picketlink.identity.federation.core.impl.EmptyAttributeManager"
   RoleGenerator="org.picketlink.identity.federation.core.impl.EmptyRoleGenerator">
 <IdentityURL>http://localhost:8080/idp/</IdentityURL> 
 <Trust>

Modified: federation/trunk/picketlink-bindings/src/test/resources/saml2/redirect/sp/employee/WEB-INF/picketlink-idfed.xml
===================================================================
--- federation/trunk/picketlink-bindings/src/test/resources/saml2/redirect/sp/employee/WEB-INF/picketlink-idfed.xml	2011-02-04 22:44:25 UTC (rev 735)
+++ federation/trunk/picketlink-bindings/src/test/resources/saml2/redirect/sp/employee/WEB-INF/picketlink-idfed.xml	2011-02-04 22:45:33 UTC (rev 736)
@@ -1,5 +1,5 @@
 <PicketLinkSP xmlns="urn:picketlink:identity-federation:config:1.0" 
-  AttributeManager="">
+  AttributeManager="org.picketlink.identity.federation.core.impl.EmptyAttributeManager">
 <IdentityURL>http://localhost:8080/idp/</IdentityURL>
 <ServiceURL>http://localhost:8080/employee/</ServiceURL>  
 

Modified: federation/trunk/picketlink-bindings/src/test/resources/saml2/redirect/sp/sales/WEB-INF/picketlink-idfed.xml
===================================================================
--- federation/trunk/picketlink-bindings/src/test/resources/saml2/redirect/sp/sales/WEB-INF/picketlink-idfed.xml	2011-02-04 22:44:25 UTC (rev 735)
+++ federation/trunk/picketlink-bindings/src/test/resources/saml2/redirect/sp/sales/WEB-INF/picketlink-idfed.xml	2011-02-04 22:45:33 UTC (rev 736)
@@ -1,5 +1,5 @@
 <PicketLinkSP xmlns="urn:picketlink:identity-federation:config:1.0" 
-  AttributeManager="">
+  AttributeManager="org.picketlink.identity.federation.core.impl.EmptyAttributeManager">
 <IdentityURL>http://localhost:8080/idp/</IdentityURL>
 <ServiceURL>http://localhost:8080/sales/</ServiceURL>  
 

Modified: federation/trunk/picketlink-fed-api/src/main/java/org/picketlink/identity/federation/api/util/KeyUtil.java
===================================================================
--- federation/trunk/picketlink-fed-api/src/main/java/org/picketlink/identity/federation/api/util/KeyUtil.java	2011-02-04 22:44:25 UTC (rev 735)
+++ federation/trunk/picketlink-fed-api/src/main/java/org/picketlink/identity/federation/api/util/KeyUtil.java	2011-02-04 22:45:33 UTC (rev 736)
@@ -29,15 +29,12 @@
 import java.security.cert.X509Certificate;
 
 import javax.xml.bind.JAXBException;
-import javax.xml.bind.Marshaller;
-import javax.xml.bind.Unmarshaller;
 
 import org.picketlink.identity.federation.core.exceptions.ConfigurationException;
 import org.picketlink.identity.federation.core.exceptions.ParsingException;
 import org.picketlink.identity.federation.core.exceptions.ProcessingException;
 import org.picketlink.identity.federation.core.saml.v2.util.DocumentUtil;
 import org.picketlink.identity.federation.core.util.Base64;
-import org.picketlink.identity.federation.core.util.JAXBUtil; 
 import org.w3c.dom.Element;
 
 /**
@@ -98,28 +95,8 @@
       
       return DocumentUtil.getDocument(builder.toString()).getDocumentElement(); 
    }
-    
-   /**
-    * Get the Unmarshaller for the W3 XMLDSIG
-    * @return 
-    * @throws JAXBException 
-    */
-   public static Unmarshaller getUnmarshaller() throws JAXBException  
-   {
-      return JAXBUtil.getUnmarshaller("org.picketlink.identity.xmlsec.w3.xmldsig");
-   }
    
    /**
-    * Get the marshaller for the W3 XMLDSig
-    * @return 
-    * @throws JAXBException 
-    */
-   public static Marshaller getMarshaller() throws JAXBException 
-   {
-      return JAXBUtil.getMarshaller("org.picketlink.identity.xmlsec.w3.xmldsig");
-   }
-   
-   /**
     * Get the system property
     * @param key
     * @param defaultValue

Deleted: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/generated/ActivationLimitDurationType.java
===================================================================
--- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/generated/ActivationLimitDurationType.java	2011-02-04 22:44:25 UTC (rev 735)
+++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/generated/ActivationLimitDurationType.java	2011-02-04 22:45:33 UTC (rev 736)
@@ -1,66 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.1-661 
-// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2008.12.08 at 05:45:20 PM CST 
-//
-
-
-package org.picketlink.identity.federation.saml.v2.generated;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.datatype.Duration;
-
-
-/**
- * <p>Java class for ActivationLimitDurationType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained within this class.
- * 
- * <pre>
- * &lt;complexType name="ActivationLimitDurationType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       &lt;attribute name="duration" use="required" type="{http://www.w3.org/2001/XMLSchema}duration" />
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
- at XmlAccessorType(XmlAccessType.FIELD)
- at XmlType(name = "ActivationLimitDurationType")
-public class ActivationLimitDurationType {
-
-    @XmlAttribute(required = true)
-    protected Duration duration;
-
-    /**
-     * Gets the value of the duration property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link Duration }
-     *     
-     */
-    public Duration getDuration() {
-        return duration;
-    }
-
-    /**
-     * Sets the value of the duration property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link Duration }
-     *     
-     */
-    public void setDuration(Duration value) {
-        this.duration = value;
-    }
-
-}

Deleted: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/generated/ActivationLimitSessionType.java
===================================================================
--- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/generated/ActivationLimitSessionType.java	2011-02-04 22:44:25 UTC (rev 735)
+++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/generated/ActivationLimitSessionType.java	2011-02-04 22:45:33 UTC (rev 736)
@@ -1,37 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.1-661 
-// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2008.12.08 at 05:45:20 PM CST 
-//
-
-
-package org.picketlink.identity.federation.saml.v2.generated;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>Java class for ActivationLimitSessionType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained within this class.
- * 
- * <pre>
- * &lt;complexType name="ActivationLimitSessionType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
- at XmlAccessorType(XmlAccessType.FIELD)
- at XmlType(name = "ActivationLimitSessionType")
-public class ActivationLimitSessionType {
-
-
-}

Deleted: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/generated/ActivationLimitType.java
===================================================================
--- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/generated/ActivationLimitType.java	2011-02-04 22:44:25 UTC (rev 735)
+++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/generated/ActivationLimitType.java	2011-02-04 22:45:33 UTC (rev 736)
@@ -1,125 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.1-661 
-// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2008.12.08 at 05:45:20 PM CST 
-//
-
-
-package org.picketlink.identity.federation.saml.v2.generated;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>Java class for ActivationLimitType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained within this class.
- * 
- * <pre>
- * &lt;complexType name="ActivationLimitType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       &lt;choice>
- *         &lt;element ref="{}ActivationLimitDuration"/>
- *         &lt;element ref="{}ActivationLimitUsages"/>
- *         &lt;element ref="{}ActivationLimitSession"/>
- *       &lt;/choice>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
- at XmlAccessorType(XmlAccessType.FIELD)
- at XmlType(name = "ActivationLimitType", propOrder = {
-    "activationLimitDuration",
-    "activationLimitUsages",
-    "activationLimitSession"
-})
-public class ActivationLimitType {
-
-    @XmlElement(name = "ActivationLimitDuration")
-    protected ActivationLimitDurationType activationLimitDuration;
-    @XmlElement(name = "ActivationLimitUsages")
-    protected ActivationLimitUsagesType activationLimitUsages;
-    @XmlElement(name = "ActivationLimitSession")
-    protected ActivationLimitSessionType activationLimitSession;
-
-    /**
-     * Gets the value of the activationLimitDuration property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link ActivationLimitDurationType }
-     *     
-     */
-    public ActivationLimitDurationType getActivationLimitDuration() {
-        return activationLimitDuration;
-    }
-
-    /**
-     * Sets the value of the activationLimitDuration property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link ActivationLimitDurationType }
-     *     
-     */
-    public void setActivationLimitDuration(ActivationLimitDurationType value) {
-        this.activationLimitDuration = value;
-    }
-
-    /**
-     * Gets the value of the activationLimitUsages property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link ActivationLimitUsagesType }
-     *     
-     */
-    public ActivationLimitUsagesType getActivationLimitUsages() {
-        return activationLimitUsages;
-    }
-
-    /**
-     * Sets the value of the activationLimitUsages property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link ActivationLimitUsagesType }
-     *     
-     */
-    public void setActivationLimitUsages(ActivationLimitUsagesType value) {
-        this.activationLimitUsages = value;
-    }
-
-    /**
-     * Gets the value of the activationLimitSession property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link ActivationLimitSessionType }
-     *     
-     */
-    public ActivationLimitSessionType getActivationLimitSession() {
-        return activationLimitSession;
-    }
-
-    /**
-     * Sets the value of the activationLimitSession property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link ActivationLimitSessionType }
-     *     
-     */
-    public void setActivationLimitSession(ActivationLimitSessionType value) {
-        this.activationLimitSession = value;
-    }
-
-}

Deleted: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/generated/ActivationLimitUsagesType.java
===================================================================
--- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/generated/ActivationLimitUsagesType.java	2011-02-04 22:44:25 UTC (rev 735)
+++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/generated/ActivationLimitUsagesType.java	2011-02-04 22:45:33 UTC (rev 736)
@@ -1,67 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.1-661 
-// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2008.12.08 at 05:45:20 PM CST 
-//
-
-
-package org.picketlink.identity.federation.saml.v2.generated;
-
-import java.math.BigInteger;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>Java class for ActivationLimitUsagesType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained within this class.
- * 
- * <pre>
- * &lt;complexType name="ActivationLimitUsagesType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       &lt;attribute name="number" use="required" type="{http://www.w3.org/2001/XMLSchema}integer" />
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
- at XmlAccessorType(XmlAccessType.FIELD)
- at XmlType(name = "ActivationLimitUsagesType")
-public class ActivationLimitUsagesType {
-
-    @XmlAttribute(required = true)
-    protected BigInteger number;
-
-    /**
-     * Gets the value of the number property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link BigInteger }
-     *     
-     */
-    public BigInteger getNumber() {
-        return number;
-    }
-
-    /**
-     * Sets the value of the number property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link BigInteger }
-     *     
-     */
-    public void setNumber(BigInteger value) {
-        this.number = value;
-    }
-
-}

Deleted: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/generated/ActivationPinType.java
===================================================================
--- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/generated/ActivationPinType.java	2011-02-04 22:44:25 UTC (rev 735)
+++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/generated/ActivationPinType.java	2011-02-04 22:45:33 UTC (rev 736)
@@ -1,189 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.1-661 
-// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2008.12.08 at 05:45:20 PM CST 
-//
-
-
-package org.picketlink.identity.federation.saml.v2.generated;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>Java class for ActivationPinType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained within this class.
- * 
- * <pre>
- * &lt;complexType name="ActivationPinType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       &lt;sequence>
- *         &lt;element ref="{}Length" minOccurs="0"/>
- *         &lt;element ref="{}Alphabet" minOccurs="0"/>
- *         &lt;element ref="{}Generation" minOccurs="0"/>
- *         &lt;element ref="{}ActivationLimit" minOccurs="0"/>
- *         &lt;element ref="{}Extension" maxOccurs="unbounded" minOccurs="0"/>
- *       &lt;/sequence>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
- at XmlAccessorType(XmlAccessType.FIELD)
- at XmlType(name = "ActivationPinType", propOrder = {
-    "length",
-    "alphabet",
-    "generation",
-    "activationLimit",
-    "extension"
-})
-public class ActivationPinType {
-
-    @XmlElement(name = "Length")
-    protected LengthType length;
-    @XmlElement(name = "Alphabet")
-    protected AlphabetType alphabet;
-    @XmlElement(name = "Generation")
-    protected Generation generation;
-    @XmlElement(name = "ActivationLimit")
-    protected ActivationLimitType activationLimit;
-    @XmlElement(name = "Extension")
-    protected List<ExtensionType> extension;
-
-    /**
-     * Gets the value of the length property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link LengthType }
-     *     
-     */
-    public LengthType getLength() {
-        return length;
-    }
-
-    /**
-     * Sets the value of the length property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link LengthType }
-     *     
-     */
-    public void setLength(LengthType value) {
-        this.length = value;
-    }
-
-    /**
-     * Gets the value of the alphabet property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link AlphabetType }
-     *     
-     */
-    public AlphabetType getAlphabet() {
-        return alphabet;
-    }
-
-    /**
-     * Sets the value of the alphabet property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link AlphabetType }
-     *     
-     */
-    public void setAlphabet(AlphabetType value) {
-        this.alphabet = value;
-    }
-
-    /**
-     * Gets the value of the generation property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link Generation }
-     *     
-     */
-    public Generation getGeneration() {
-        return generation;
-    }
-
-    /**
-     * Sets the value of the generation property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link Generation }
-     *     
-     */
-    public void setGeneration(Generation value) {
-        this.generation = value;
-    }
-
-    /**
-     * Gets the value of the activationLimit property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link ActivationLimitType }
-     *     
-     */
-    public ActivationLimitType getActivationLimit() {
-        return activationLimit;
-    }
-
-    /**
-     * Sets the value of the activationLimit property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link ActivationLimitType }
-     *     
-     */
-    public void setActivationLimit(ActivationLimitType value) {
-        this.activationLimit = value;
-    }
-
-    /**
-     * Gets the value of the extension property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the extension property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getExtension().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link ExtensionType }
-     * 
-     * 
-     */
-    public List<ExtensionType> getExtension() {
-        if (extension == null) {
-            extension = new ArrayList<ExtensionType>();
-        }
-        return this.extension;
-    }
-
-}

Deleted: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/generated/AlphabetType.java
===================================================================
--- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/generated/AlphabetType.java	2011-02-04 22:44:25 UTC (rev 735)
+++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/generated/AlphabetType.java	2011-02-04 22:45:33 UTC (rev 736)
@@ -1,119 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.1-661 
-// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2008.12.08 at 05:45:20 PM CST 
-//
-
-
-package org.picketlink.identity.federation.saml.v2.generated;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>Java class for AlphabetType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained within this class.
- * 
- * <pre>
- * &lt;complexType name="AlphabetType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       &lt;attribute name="requiredChars" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
- *       &lt;attribute name="excludedChars" type="{http://www.w3.org/2001/XMLSchema}string" />
- *       &lt;attribute name="case" type="{http://www.w3.org/2001/XMLSchema}string" />
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
- at XmlAccessorType(XmlAccessType.FIELD)
- at XmlType(name = "AlphabetType")
-public class AlphabetType {
-
-    @XmlAttribute(required = true)
-    protected String requiredChars;
-    @XmlAttribute
-    protected String excludedChars;
-    @XmlAttribute(name = "case")
-    protected String _case;
-
-    /**
-     * Gets the value of the requiredChars property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getRequiredChars() {
-        return requiredChars;
-    }
-
-    /**
-     * Sets the value of the requiredChars property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setRequiredChars(String value) {
-        this.requiredChars = value;
-    }
-
-    /**
-     * Gets the value of the excludedChars property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getExcludedChars() {
-        return excludedChars;
-    }
-
-    /**
-     * Sets the value of the excludedChars property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setExcludedChars(String value) {
-        this.excludedChars = value;
-    }
-
-    /**
-     * Gets the value of the case property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getCase() {
-        return _case;
-    }
-
-    /**
-     * Sets the value of the case property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setCase(String value) {
-        this._case = value;
-    }
-
-}

Deleted: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/generated/AuthenticatorBaseType.java
===================================================================
--- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/generated/AuthenticatorBaseType.java	2011-02-04 22:44:25 UTC (rev 735)
+++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/generated/AuthenticatorBaseType.java	2011-02-04 22:45:33 UTC (rev 736)
@@ -1,120 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.1-661 
-// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2008.12.08 at 05:45:20 PM CST 
-//
-
-
-package org.picketlink.identity.federation.saml.v2.generated;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.xml.bind.JAXBElement;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElementRef;
-import javax.xml.bind.annotation.XmlElementRefs;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>Java class for AuthenticatorBaseType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained within this class.
- * 
- * <pre>
- * &lt;complexType name="AuthenticatorBaseType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       &lt;sequence>
- *         &lt;group ref="{}AuthenticatorChoiceGroup"/>
- *         &lt;group ref="{}AuthenticatorSequenceGroup"/>
- *       &lt;/sequence>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
- at XmlAccessorType(XmlAccessType.FIELD)
- at XmlType(name = "AuthenticatorBaseType", propOrder = {
-    "content"
-})
-public class AuthenticatorBaseType {
-
-    @XmlElementRefs({
-        @XmlElementRef(name = "PreviousSession", type = JAXBElement.class),
-        @XmlElementRef(name = "SharedSecretDynamicPlaintext", type = JAXBElement.class),
-        @XmlElementRef(name = "AsymmetricDecryption", type = JAXBElement.class),
-        @XmlElementRef(name = "ResumeSession", type = JAXBElement.class),
-        @XmlElementRef(name = "RestrictedPassword", type = JAXBElement.class),
-        @XmlElementRef(name = "SubscriberLineNumber", type = JAXBElement.class),
-        @XmlElementRef(name = "UserSuffix", type = JAXBElement.class),
-        @XmlElementRef(name = "DigSig", type = JAXBElement.class),
-        @XmlElementRef(name = "ComplexAuthenticator", type = JAXBElement.class),
-        @XmlElementRef(name = "Password", type = JAXBElement.class),
-        @XmlElementRef(name = "Extension", type = JAXBElement.class),
-        @XmlElementRef(name = "SharedSecretChallengeResponse", type = JAXBElement.class),
-        @XmlElementRef(name = "AsymmetricKeyAgreement", type = JAXBElement.class),
-        @XmlElementRef(name = "ZeroKnowledge", type = JAXBElement.class),
-        @XmlElementRef(name = "IPAddress", type = JAXBElement.class)
-    })
-    protected List<JAXBElement<?>> content;
-
-    /**
-     * Gets the rest of the content model. 
-     * 
-     * <p>
-     * You are getting this "catch-all" property because of the following reason: 
-     * The field name "PreviousSession" is used by two different parts of a schema. See: 
-     * line 575 of file:/home/anil/saml2/saml-schema-authn-context-types-2.0.xsd
-     * line 556 of file:/home/anil/saml2/saml-schema-authn-context-types-2.0.xsd
-     * <p>
-     * To get rid of this property, apply a property customization to one 
-     * of both of the following declarations to change their names: 
-     * Gets the value of the content property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the content property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getContent().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link JAXBElement }{@code <}{@link ExtensionOnlyType }{@code >}
-     * {@link JAXBElement }{@code <}{@link ExtensionOnlyType }{@code >}
-     * {@link JAXBElement }{@code <}{@link PublicKeyType }{@code >}
-     * {@link JAXBElement }{@code <}{@link ExtensionOnlyType }{@code >}
-     * {@link JAXBElement }{@code <}{@link RestrictedPasswordType }{@code >}
-     * {@link JAXBElement }{@code <}{@link ExtensionOnlyType }{@code >}
-     * {@link JAXBElement }{@code <}{@link ExtensionOnlyType }{@code >}
-     * {@link JAXBElement }{@code <}{@link PublicKeyType }{@code >}
-     * {@link JAXBElement }{@code <}{@link ComplexAuthenticatorType }{@code >}
-     * {@link JAXBElement }{@code <}{@link PasswordType }{@code >}
-     * {@link JAXBElement }{@code <}{@link ExtensionType }{@code >}
-     * {@link JAXBElement }{@code <}{@link SharedSecretChallengeResponseType }{@code >}
-     * {@link JAXBElement }{@code <}{@link PublicKeyType }{@code >}
-     * {@link JAXBElement }{@code <}{@link ExtensionOnlyType }{@code >}
-     * {@link JAXBElement }{@code <}{@link ExtensionOnlyType }{@code >}
-     * 
-     * 
-     */
-    public List<JAXBElement<?>> getContent() {
-        if (content == null) {
-            content = new ArrayList<JAXBElement<?>>();
-        }
-        return this.content;
-    }
-
-}

Deleted: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/generated/AuthenticatorTransportProtocolType.java
===================================================================
--- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/generated/AuthenticatorTransportProtocolType.java	2011-02-04 22:44:25 UTC (rev 735)
+++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/generated/AuthenticatorTransportProtocolType.java	2011-02-04 22:45:33 UTC (rev 736)
@@ -1,359 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.1-661 
-// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2008.12.08 at 05:45:20 PM CST 
-//
-
-
-package org.picketlink.identity.federation.saml.v2.generated;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>Java class for AuthenticatorTransportProtocolType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained within this class.
- * 
- * <pre>
- * &lt;complexType name="AuthenticatorTransportProtocolType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       &lt;sequence>
- *         &lt;choice minOccurs="0">
- *           &lt;element ref="{}HTTP"/>
- *           &lt;element ref="{}SSL"/>
- *           &lt;element ref="{}MobileNetworkNoEncryption"/>
- *           &lt;element ref="{}MobileNetworkRadioEncryption"/>
- *           &lt;element ref="{}MobileNetworkEndToEndEncryption"/>
- *           &lt;element ref="{}WTLS"/>
- *           &lt;element ref="{}IPSec"/>
- *           &lt;element ref="{}PSTN"/>
- *           &lt;element ref="{}ISDN"/>
- *           &lt;element ref="{}ADSL"/>
- *         &lt;/choice>
- *         &lt;element ref="{}Extension" maxOccurs="unbounded" minOccurs="0"/>
- *       &lt;/sequence>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
- at XmlAccessorType(XmlAccessType.FIELD)
- at XmlType(name = "AuthenticatorTransportProtocolType", propOrder = {
-    "http",
-    "ssl",
-    "mobileNetworkNoEncryption",
-    "mobileNetworkRadioEncryption",
-    "mobileNetworkEndToEndEncryption",
-    "wtls",
-    "ipSec",
-    "pstn",
-    "isdn",
-    "adsl",
-    "extension"
-})
-public class AuthenticatorTransportProtocolType {
-
-    @XmlElement(name = "HTTP")
-    protected ExtensionOnlyType http;
-    @XmlElement(name = "SSL")
-    protected ExtensionOnlyType ssl;
-    @XmlElement(name = "MobileNetworkNoEncryption")
-    protected ExtensionOnlyType mobileNetworkNoEncryption;
-    @XmlElement(name = "MobileNetworkRadioEncryption")
-    protected ExtensionOnlyType mobileNetworkRadioEncryption;
-    @XmlElement(name = "MobileNetworkEndToEndEncryption")
-    protected ExtensionOnlyType mobileNetworkEndToEndEncryption;
-    @XmlElement(name = "WTLS")
-    protected ExtensionOnlyType wtls;
-    @XmlElement(name = "IPSec")
-    protected ExtensionOnlyType ipSec;
-    @XmlElement(name = "PSTN")
-    protected ExtensionOnlyType pstn;
-    @XmlElement(name = "ISDN")
-    protected ExtensionOnlyType isdn;
-    @XmlElement(name = "ADSL")
-    protected ExtensionOnlyType adsl;
-    @XmlElement(name = "Extension")
-    protected List<ExtensionType> extension;
-
-    /**
-     * Gets the value of the http property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link ExtensionOnlyType }
-     *     
-     */
-    public ExtensionOnlyType getHTTP() {
-        return http;
-    }
-
-    /**
-     * Sets the value of the http property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link ExtensionOnlyType }
-     *     
-     */
-    public void setHTTP(ExtensionOnlyType value) {
-        this.http = value;
-    }
-
-    /**
-     * Gets the value of the ssl property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link ExtensionOnlyType }
-     *     
-     */
-    public ExtensionOnlyType getSSL() {
-        return ssl;
-    }
-
-    /**
-     * Sets the value of the ssl property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link ExtensionOnlyType }
-     *     
-     */
-    public void setSSL(ExtensionOnlyType value) {
-        this.ssl = value;
-    }
-
-    /**
-     * Gets the value of the mobileNetworkNoEncryption property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link ExtensionOnlyType }
-     *     
-     */
-    public ExtensionOnlyType getMobileNetworkNoEncryption() {
-        return mobileNetworkNoEncryption;
-    }
-
-    /**
-     * Sets the value of the mobileNetworkNoEncryption property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link ExtensionOnlyType }
-     *     
-     */
-    public void setMobileNetworkNoEncryption(ExtensionOnlyType value) {
-        this.mobileNetworkNoEncryption = value;
-    }
-
-    /**
-     * Gets the value of the mobileNetworkRadioEncryption property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link ExtensionOnlyType }
-     *     
-     */
-    public ExtensionOnlyType getMobileNetworkRadioEncryption() {
-        return mobileNetworkRadioEncryption;
-    }
-
-    /**
-     * Sets the value of the mobileNetworkRadioEncryption property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link ExtensionOnlyType }
-     *     
-     */
-    public void setMobileNetworkRadioEncryption(ExtensionOnlyType value) {
-        this.mobileNetworkRadioEncryption = value;
-    }
-
-    /**
-     * Gets the value of the mobileNetworkEndToEndEncryption property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link ExtensionOnlyType }
-     *     
-     */
-    public ExtensionOnlyType getMobileNetworkEndToEndEncryption() {
-        return mobileNetworkEndToEndEncryption;
-    }
-
-    /**
-     * Sets the value of the mobileNetworkEndToEndEncryption property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link ExtensionOnlyType }
-     *     
-     */
-    public void setMobileNetworkEndToEndEncryption(ExtensionOnlyType value) {
-        this.mobileNetworkEndToEndEncryption = value;
-    }
-
-    /**
-     * Gets the value of the wtls property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link ExtensionOnlyType }
-     *     
-     */
-    public ExtensionOnlyType getWTLS() {
-        return wtls;
-    }
-
-    /**
-     * Sets the value of the wtls property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link ExtensionOnlyType }
-     *     
-     */
-    public void setWTLS(ExtensionOnlyType value) {
-        this.wtls = value;
-    }
-
-    /**
-     * Gets the value of the ipSec property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link ExtensionOnlyType }
-     *     
-     */
-    public ExtensionOnlyType getIPSec() {
-        return ipSec;
-    }
-
-    /**
-     * Sets the value of the ipSec property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link ExtensionOnlyType }
-     *     
-     */
-    public void setIPSec(ExtensionOnlyType value) {
-        this.ipSec = value;
-    }
-
-    /**
-     * Gets the value of the pstn property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link ExtensionOnlyType }
-     *     
-     */
-    public ExtensionOnlyType getPSTN() {
-        return pstn;
-    }
-
-    /**
-     * Sets the value of the pstn property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link ExtensionOnlyType }
-     *     
-     */
-    public void setPSTN(ExtensionOnlyType value) {
-        this.pstn = value;
-    }
-
-    /**
-     * Gets the value of the isdn property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link ExtensionOnlyType }
-     *     
-     */
-    public ExtensionOnlyType getISDN() {
-        return isdn;
-    }
-
-    /**
-     * Sets the value of the isdn property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link ExtensionOnlyType }
-     *     
-     */
-    public void setISDN(ExtensionOnlyType value) {
-        this.isdn = value;
-    }
-
-    /**
-     * Gets the value of the adsl property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link ExtensionOnlyType }
-     *     
-     */
-    public ExtensionOnlyType getADSL() {
-        return adsl;
-    }
-
-    /**
-     * Sets the value of the adsl property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link ExtensionOnlyType }
-     *     
-     */
-    public void setADSL(ExtensionOnlyType value) {
-        this.adsl = value;
-    }
-
-    /**
-     * Gets the value of the extension property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the extension property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getExtension().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link ExtensionType }
-     * 
-     * 
-     */
-    public List<ExtensionType> getExtension() {
-        if (extension == null) {
-            extension = new ArrayList<ExtensionType>();
-        }
-        return this.extension;
-    }
-
-}

Deleted: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/generated/AuthnContextDeclarationBaseType.java
===================================================================
--- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/generated/AuthnContextDeclarationBaseType.java	2011-02-04 22:44:25 UTC (rev 735)
+++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/generated/AuthnContextDeclarationBaseType.java	2011-02-04 22:45:33 UTC (rev 736)
@@ -1,252 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.1-661 
-// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2008.12.08 at 05:45:20 PM CST 
-//
-
-
-package org.picketlink.identity.federation.saml.v2.generated;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlID;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-
-
-/**
- * <p>Java class for AuthnContextDeclarationBaseType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained within this class.
- * 
- * <pre>
- * &lt;complexType name="AuthnContextDeclarationBaseType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       &lt;sequence>
- *         &lt;element ref="{}Identification" minOccurs="0"/>
- *         &lt;element ref="{}TechnicalProtection" minOccurs="0"/>
- *         &lt;element ref="{}OperationalProtection" minOccurs="0"/>
- *         &lt;element ref="{}AuthnMethod" minOccurs="0"/>
- *         &lt;element ref="{}GoverningAgreements" minOccurs="0"/>
- *         &lt;element ref="{}Extension" maxOccurs="unbounded" minOccurs="0"/>
- *       &lt;/sequence>
- *       &lt;attribute name="ID" type="{http://www.w3.org/2001/XMLSchema}ID" />
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
- at XmlAccessorType(XmlAccessType.FIELD)
- at XmlType(name = "AuthnContextDeclarationBaseType", propOrder = {
-    "identification",
-    "technicalProtection",
-    "operationalProtection",
-    "authnMethod",
-    "governingAgreements",
-    "extension"
-})
-public class AuthnContextDeclarationBaseType {
-
-    @XmlElement(name = "Identification")
-    protected IdentificationType identification;
-    @XmlElement(name = "TechnicalProtection")
-    protected TechnicalProtectionBaseType technicalProtection;
-    @XmlElement(name = "OperationalProtection")
-    protected OperationalProtectionType operationalProtection;
-    @XmlElement(name = "AuthnMethod")
-    protected AuthnMethodBaseType authnMethod;
-    @XmlElement(name = "GoverningAgreements")
-    protected GoverningAgreementsType governingAgreements;
-    @XmlElement(name = "Extension")
-    protected List<ExtensionType> extension;
-    @XmlAttribute(name = "ID")
-    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-    @XmlID
-    @XmlSchemaType(name = "ID")
-    protected String id;
-
-    /**
-     * Gets the value of the identification property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link IdentificationType }
-     *     
-     */
-    public IdentificationType getIdentification() {
-        return identification;
-    }
-
-    /**
-     * Sets the value of the identification property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link IdentificationType }
-     *     
-     */
-    public void setIdentification(IdentificationType value) {
-        this.identification = value;
-    }
-
-    /**
-     * Gets the value of the technicalProtection property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link TechnicalProtectionBaseType }
-     *     
-     */
-    public TechnicalProtectionBaseType getTechnicalProtection() {
-        return technicalProtection;
-    }
-
-    /**
-     * Sets the value of the technicalProtection property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link TechnicalProtectionBaseType }
-     *     
-     */
-    public void setTechnicalProtection(TechnicalProtectionBaseType value) {
-        this.technicalProtection = value;
-    }
-
-    /**
-     * Gets the value of the operationalProtection property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link OperationalProtectionType }
-     *     
-     */
-    public OperationalProtectionType getOperationalProtection() {
-        return operationalProtection;
-    }
-
-    /**
-     * Sets the value of the operationalProtection property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link OperationalProtectionType }
-     *     
-     */
-    public void setOperationalProtection(OperationalProtectionType value) {
-        this.operationalProtection = value;
-    }
-
-    /**
-     * Gets the value of the authnMethod property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link AuthnMethodBaseType }
-     *     
-     */
-    public AuthnMethodBaseType getAuthnMethod() {
-        return authnMethod;
-    }
-
-    /**
-     * Sets the value of the authnMethod property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link AuthnMethodBaseType }
-     *     
-     */
-    public void setAuthnMethod(AuthnMethodBaseType value) {
-        this.authnMethod = value;
-    }
-
-    /**
-     * Gets the value of the governingAgreements property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link GoverningAgreementsType }
-     *     
-     */
-    public GoverningAgreementsType getGoverningAgreements() {
-        return governingAgreements;
-    }
-
-    /**
-     * Sets the value of the governingAgreements property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link GoverningAgreementsType }
-     *     
-     */
-    public void setGoverningAgreements(GoverningAgreementsType value) {
-        this.governingAgreements = value;
-    }
-
-    /**
-     * Gets the value of the extension property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the extension property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getExtension().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link ExtensionType }
-     * 
-     * 
-     */
-    public List<ExtensionType> getExtension() {
-        if (extension == null) {
-            extension = new ArrayList<ExtensionType>();
-        }
-        return this.extension;
-    }
-
-    /**
-     * Gets the value of the id property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getID() {
-        return id;
-    }
-
-    /**
-     * Sets the value of the id property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setID(String value) {
-        this.id = value;
-    }
-
-}

Deleted: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/generated/AuthnMethodBaseType.java
===================================================================
--- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/generated/AuthnMethodBaseType.java	2011-02-04 22:44:25 UTC (rev 735)
+++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/generated/AuthnMethodBaseType.java	2011-02-04 22:45:33 UTC (rev 736)
@@ -1,161 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.1-661 
-// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2008.12.08 at 05:45:20 PM CST 
-//
-
-
-package org.picketlink.identity.federation.saml.v2.generated;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>Java class for AuthnMethodBaseType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained within this class.
- * 
- * <pre>
- * &lt;complexType name="AuthnMethodBaseType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       &lt;sequence>
- *         &lt;element ref="{}PrincipalAuthenticationMechanism" minOccurs="0"/>
- *         &lt;element ref="{}Authenticator" minOccurs="0"/>
- *         &lt;element ref="{}AuthenticatorTransportProtocol" minOccurs="0"/>
- *         &lt;element ref="{}Extension" maxOccurs="unbounded" minOccurs="0"/>
- *       &lt;/sequence>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
- at XmlAccessorType(XmlAccessType.FIELD)
- at XmlType(name = "AuthnMethodBaseType", propOrder = {
-    "principalAuthenticationMechanism",
-    "authenticator",
-    "authenticatorTransportProtocol",
-    "extension"
-})
-public class AuthnMethodBaseType {
-
-    @XmlElement(name = "PrincipalAuthenticationMechanism")
-    protected PrincipalAuthenticationMechanismType principalAuthenticationMechanism;
-    @XmlElement(name = "Authenticator")
-    protected AuthenticatorBaseType authenticator;
-    @XmlElement(name = "AuthenticatorTransportProtocol")
-    protected AuthenticatorTransportProtocolType authenticatorTransportProtocol;
-    @XmlElement(name = "Extension")
-    protected List<ExtensionType> extension;
-
-    /**
-     * Gets the value of the principalAuthenticationMechanism property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link PrincipalAuthenticationMechanismType }
-     *     
-     */
-    public PrincipalAuthenticationMechanismType getPrincipalAuthenticationMechanism() {
-        return principalAuthenticationMechanism;
-    }
-
-    /**
-     * Sets the value of the principalAuthenticationMechanism property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link PrincipalAuthenticationMechanismType }
-     *     
-     */
-    public void setPrincipalAuthenticationMechanism(PrincipalAuthenticationMechanismType value) {
-        this.principalAuthenticationMechanism = value;
-    }
-
-    /**
-     * Gets the value of the authenticator property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link AuthenticatorBaseType }
-     *     
-     */
-    public AuthenticatorBaseType getAuthenticator() {
-        return authenticator;
-    }
-
-    /**
-     * Sets the value of the authenticator property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link AuthenticatorBaseType }
-     *     
-     */
-    public void setAuthenticator(AuthenticatorBaseType value) {
-        this.authenticator = value;
-    }
-
-    /**
-     * Gets the value of the authenticatorTransportProtocol property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link AuthenticatorTransportProtocolType }
-     *     
-     */
-    public AuthenticatorTransportProtocolType getAuthenticatorTransportProtocol() {
-        return authenticatorTransportProtocol;
-    }
-
-    /**
-     * Sets the value of the authenticatorTransportProtocol property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link AuthenticatorTransportProtocolType }
-     *     
-     */
-    public void setAuthenticatorTransportProtocol(AuthenticatorTransportProtocolType value) {
-        this.authenticatorTransportProtocol = value;
-    }
-
-    /**
-     * Gets the value of the extension property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the extension property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getExtension().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link ExtensionType }
-     * 
-     * 
-     */
-    public List<ExtensionType> getExtension() {
-        if (extension == null) {
-            extension = new ArrayList<ExtensionType>();
-        }
-        return this.extension;
-    }
-
-}

Deleted: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/generated/BooleanType.java
===================================================================
--- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/generated/BooleanType.java	2011-02-04 22:44:25 UTC (rev 735)
+++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/generated/BooleanType.java	2011-02-04 22:45:33 UTC (rev 736)
@@ -1,58 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.1-661 
-// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2008.12.08 at 05:45:20 PM CST 
-//
-
-
-package org.picketlink.identity.federation.saml.v2.generated;
-
-import javax.xml.bind.annotation.XmlEnum;
-import javax.xml.bind.annotation.XmlEnumValue;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>Java class for booleanType.
- * 
- * <p>The following schema fragment specifies the expected content contained within this class.
- * <p>
- * <pre>
- * &lt;simpleType name="booleanType">
- *   &lt;restriction base="{http://www.w3.org/2001/XMLSchema}NMTOKEN">
- *     &lt;enumeration value="true"/>
- *     &lt;enumeration value="false"/>
- *   &lt;/restriction>
- * &lt;/simpleType>
- * </pre>
- * 
- */
- at XmlType(name = "booleanType")
- at XmlEnum
-public enum BooleanType {
-
-    @XmlEnumValue("true")
-    TRUE("true"),
-    @XmlEnumValue("false")
-    FALSE("false");
-    private final String value;
-
-    BooleanType(String v) {
-        value = v;
-    }
-
-    public String value() {
-        return value;
-    }
-
-    public static BooleanType fromValue(String v) {
-        for (BooleanType c: BooleanType.values()) {
-            if (c.value.equals(v)) {
-                return c;
-            }
-        }
-        throw new IllegalArgumentException(v);
-    }
-
-}

Deleted: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/generated/ComplexAuthenticatorType.java
===================================================================
--- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/generated/ComplexAuthenticatorType.java	2011-02-04 22:44:25 UTC (rev 735)
+++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/generated/ComplexAuthenticatorType.java	2011-02-04 22:45:33 UTC (rev 736)
@@ -1,120 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.1-661 
-// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2008.12.08 at 05:45:20 PM CST 
-//
-
-
-package org.picketlink.identity.federation.saml.v2.generated;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.xml.bind.JAXBElement;
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElementRef;
-import javax.xml.bind.annotation.XmlElementRefs;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>Java class for ComplexAuthenticatorType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained within this class.
- * 
- * <pre>
- * &lt;complexType name="ComplexAuthenticatorType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       &lt;sequence>
- *         &lt;group ref="{}AuthenticatorChoiceGroup"/>
- *         &lt;group ref="{}AuthenticatorSequenceGroup"/>
- *       &lt;/sequence>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
- at XmlAccessorType(XmlAccessType.FIELD)
- at XmlType(name = "ComplexAuthenticatorType", propOrder = {
-    "content"
-})
-public class ComplexAuthenticatorType {
-
-    @XmlElementRefs({
-        @XmlElementRef(name = "PreviousSession", type = JAXBElement.class),
-        @XmlElementRef(name = "SharedSecretDynamicPlaintext", type = JAXBElement.class),
-        @XmlElementRef(name = "ResumeSession", type = JAXBElement.class),
-        @XmlElementRef(name = "AsymmetricDecryption", type = JAXBElement.class),
-        @XmlElementRef(name = "RestrictedPassword", type = JAXBElement.class),
-        @XmlElementRef(name = "SubscriberLineNumber", type = JAXBElement.class),
-        @XmlElementRef(name = "UserSuffix", type = JAXBElement.class),
-        @XmlElementRef(name = "DigSig", type = JAXBElement.class),
-        @XmlElementRef(name = "ComplexAuthenticator", type = JAXBElement.class),
-        @XmlElementRef(name = "Password", type = JAXBElement.class),
-        @XmlElementRef(name = "Extension", type = JAXBElement.class),
-        @XmlElementRef(name = "SharedSecretChallengeResponse", type = JAXBElement.class),
-        @XmlElementRef(name = "AsymmetricKeyAgreement", type = JAXBElement.class),
-        @XmlElementRef(name = "ZeroKnowledge", type = JAXBElement.class),
-        @XmlElementRef(name = "IPAddress", type = JAXBElement.class)
-    })
-    protected List<JAXBElement<?>> content;
-
-    /**
-     * Gets the rest of the content model. 
-     * 
-     * <p>
-     * You are getting this "catch-all" property because of the following reason: 
-     * The field name "PreviousSession" is used by two different parts of a schema. See: 
-     * line 575 of file:/home/anil/saml2/saml-schema-authn-context-types-2.0.xsd
-     * line 556 of file:/home/anil/saml2/saml-schema-authn-context-types-2.0.xsd
-     * <p>
-     * To get rid of this property, apply a property customization to one 
-     * of both of the following declarations to change their names: 
-     * Gets the value of the content property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the content property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getContent().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link JAXBElement }{@code <}{@link ExtensionOnlyType }{@code >}
-     * {@link JAXBElement }{@code <}{@link ExtensionOnlyType }{@code >}
-     * {@link JAXBElement }{@code <}{@link ExtensionOnlyType }{@code >}
-     * {@link JAXBElement }{@code <}{@link PublicKeyType }{@code >}
-     * {@link JAXBElement }{@code <}{@link RestrictedPasswordType }{@code >}
-     * {@link JAXBElement }{@code <}{@link ExtensionOnlyType }{@code >}
-     * {@link JAXBElement }{@code <}{@link ExtensionOnlyType }{@code >}
-     * {@link JAXBElement }{@code <}{@link PublicKeyType }{@code >}
-     * {@link JAXBElement }{@code <}{@link ComplexAuthenticatorType }{@code >}
-     * {@link JAXBElement }{@code <}{@link PasswordType }{@code >}
-     * {@link JAXBElement }{@code <}{@link ExtensionType }{@code >}
-     * {@link JAXBElement }{@code <}{@link SharedSecretChallengeResponseType }{@code >}
-     * {@link JAXBElement }{@code <}{@link PublicKeyType }{@code >}
-     * {@link JAXBElement }{@code <}{@link ExtensionOnlyType }{@code >}
-     * {@link JAXBElement }{@code <}{@link ExtensionOnlyType }{@code >}
-     * 
-     * 
-     */
-    public List<JAXBElement<?>> getContent() {
-        if (content == null) {
-            content = new ArrayList<JAXBElement<?>>();
-        }
-        return this.content;
-    }
-
-}

Deleted: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/generated/DeviceTypeType.java
===================================================================
--- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/generated/DeviceTypeType.java	2011-02-04 22:44:25 UTC (rev 735)
+++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/generated/DeviceTypeType.java	2011-02-04 22:45:33 UTC (rev 736)
@@ -1,58 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.1-661 
-// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2008.12.08 at 05:45:20 PM CST 
-//
-
-
-package org.picketlink.identity.federation.saml.v2.generated;
-
-import javax.xml.bind.annotation.XmlEnum;
-import javax.xml.bind.annotation.XmlEnumValue;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>Java class for DeviceTypeType.
- * 
- * <p>The following schema fragment specifies the expected content contained within this class.
- * <p>
- * <pre>
- * &lt;simpleType name="DeviceTypeType">
- *   &lt;restriction base="{http://www.w3.org/2001/XMLSchema}NMTOKEN">
- *     &lt;enumeration value="hardware"/>
- *     &lt;enumeration value="software"/>
- *   &lt;/restriction>
- * &lt;/simpleType>
- * </pre>
- * 
- */
- at XmlType(name = "DeviceTypeType")
- at XmlEnum
-public enum DeviceTypeType {
-
-    @XmlEnumValue("hardware")
-    HARDWARE("hardware"),
-    @XmlEnumValue("software")
-    SOFTWARE("software");
-    private final String value;
-
-    DeviceTypeType(String v) {
-        value = v;
-    }
-
-    public String value() {
-        return value;
-    }
-
-    public static DeviceTypeType fromValue(String v) {
-        for (DeviceTypeType c: DeviceTypeType.values()) {
-            if (c.value.equals(v)) {
-                return c;
-            }
-        }
-        throw new IllegalArgumentException(v);
-    }
-
-}

Deleted: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/generated/ExtensionOnlyType.java
===================================================================
--- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/generated/ExtensionOnlyType.java	2011-02-04 22:44:25 UTC (rev 735)
+++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/generated/ExtensionOnlyType.java	2011-02-04 22:45:33 UTC (rev 736)
@@ -1,77 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.1-661 
-// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2008.12.08 at 05:45:20 PM CST 
-//
-
-
-package org.picketlink.identity.federation.saml.v2.generated;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>Java class for ExtensionOnlyType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained within this class.
- * 
- * <pre>
- * &lt;complexType name="ExtensionOnlyType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       &lt;sequence>
- *         &lt;element ref="{}Extension" maxOccurs="unbounded" minOccurs="0"/>
- *       &lt;/sequence>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
- at XmlAccessorType(XmlAccessType.FIELD)
- at XmlType(name = "ExtensionOnlyType", propOrder = {
-    "extension"
-})
-public class ExtensionOnlyType {
-
-    @XmlElement(name = "Extension")
-    protected List<ExtensionType> extension;
-
-    /**
-     * Gets the value of the extension property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the extension property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getExtension().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link ExtensionType }
-     * 
-     * 
-     */
-    public List<ExtensionType> getExtension() {
-        if (extension == null) {
-            extension = new ArrayList<ExtensionType>();
-        }
-        return this.extension;
-    }
-
-}

Deleted: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/generated/ExtensionType.java
===================================================================
--- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/generated/ExtensionType.java	2011-02-04 22:44:25 UTC (rev 735)
+++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/generated/ExtensionType.java	2011-02-04 22:45:33 UTC (rev 736)
@@ -1,80 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.1-661 
-// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2008.12.08 at 05:45:20 PM CST 
-//
-
-
-package org.picketlink.identity.federation.saml.v2.generated;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAnyElement;
-import javax.xml.bind.annotation.XmlType;
-
-import org.w3c.dom.Element;
-
-
-/**
- * <p>Java class for ExtensionType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained within this class.
- * 
- * <pre>
- * &lt;complexType name="ExtensionType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       &lt;sequence>
- *         &lt;any/>
- *       &lt;/sequence>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
- at XmlAccessorType(XmlAccessType.FIELD)
- at XmlType(name = "ExtensionType", propOrder = {
-    "any"
-})
-public class ExtensionType {
-
-    @XmlAnyElement(lax = true)
-    protected List<Object> any;
-
-    /**
-     * Gets the value of the any property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the any property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getAny().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link Element }
-     * {@link Object }
-     * 
-     * 
-     */
-    public List<Object> getAny() {
-        if (any == null) {
-            any = new ArrayList<Object>();
-        }
-        return this.any;
-    }
-
-}

Deleted: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/generated/Generation.java
===================================================================
--- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/generated/Generation.java	2011-02-04 22:44:25 UTC (rev 735)
+++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/generated/Generation.java	2011-02-04 22:45:33 UTC (rev 736)
@@ -1,77 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.1-661 
-// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2008.12.08 at 05:45:20 PM CST 
-//
-
-
-package org.picketlink.identity.federation.saml.v2.generated;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-
-
-/**
- * <p>Java class for anonymous complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained within this class.
- * 
- * <pre>
- * &lt;complexType>
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       &lt;attribute name="mechanism" use="required">
- *         &lt;simpleType>
- *           &lt;restriction base="{http://www.w3.org/2001/XMLSchema}NMTOKEN">
- *             &lt;enumeration value="principalchosen"/>
- *             &lt;enumeration value="automatic"/>
- *           &lt;/restriction>
- *         &lt;/simpleType>
- *       &lt;/attribute>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
- at XmlAccessorType(XmlAccessType.FIELD)
- at XmlType(name = "")
- at XmlRootElement(name = "Generation")
-public class Generation {
-
-    @XmlAttribute(required = true)
-    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-    protected String mechanism;
-
-    /**
-     * Gets the value of the mechanism property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getMechanism() {
-        return mechanism;
-    }
-
-    /**
-     * Sets the value of the mechanism property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setMechanism(String value) {
-        this.mechanism = value;
-    }
-
-}

Deleted: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/generated/GoverningAgreementRefType.java
===================================================================
--- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/generated/GoverningAgreementRefType.java	2011-02-04 22:44:25 UTC (rev 735)
+++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/generated/GoverningAgreementRefType.java	2011-02-04 22:45:33 UTC (rev 736)
@@ -1,67 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.1-661 
-// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2008.12.08 at 05:45:20 PM CST 
-//
-
-
-package org.picketlink.identity.federation.saml.v2.generated;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>Java class for GoverningAgreementRefType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained within this class.
- * 
- * <pre>
- * &lt;complexType name="GoverningAgreementRefType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       &lt;attribute name="governingAgreementRef" use="required" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
- at XmlAccessorType(XmlAccessType.FIELD)
- at XmlType(name = "GoverningAgreementRefType")
-public class GoverningAgreementRefType {
-
-    @XmlAttribute(required = true)
-    @XmlSchemaType(name = "anyURI")
-    protected String governingAgreementRef;
-
-    /**
-     * Gets the value of the governingAgreementRef property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getGoverningAgreementRef() {
-        return governingAgreementRef;
-    }
-
-    /**
-     * Sets the value of the governingAgreementRef property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setGoverningAgreementRef(String value) {
-        this.governingAgreementRef = value;
-    }
-
-}

Deleted: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/generated/GoverningAgreementsType.java
===================================================================
--- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/generated/GoverningAgreementsType.java	2011-02-04 22:44:25 UTC (rev 735)
+++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/generated/GoverningAgreementsType.java	2011-02-04 22:45:33 UTC (rev 736)
@@ -1,77 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.1-661 
-// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2008.12.08 at 05:45:20 PM CST 
-//
-
-
-package org.picketlink.identity.federation.saml.v2.generated;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>Java class for GoverningAgreementsType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained within this class.
- * 
- * <pre>
- * &lt;complexType name="GoverningAgreementsType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       &lt;sequence>
- *         &lt;element ref="{}GoverningAgreementRef" maxOccurs="unbounded"/>
- *       &lt;/sequence>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
- at XmlAccessorType(XmlAccessType.FIELD)
- at XmlType(name = "GoverningAgreementsType", propOrder = {
-    "governingAgreementRef"
-})
-public class GoverningAgreementsType {
-
-    @XmlElement(name = "GoverningAgreementRef", required = true)
-    protected List<GoverningAgreementRefType> governingAgreementRef;
-
-    /**
-     * Gets the value of the governingAgreementRef property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the governingAgreementRef property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getGoverningAgreementRef().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link GoverningAgreementRefType }
-     * 
-     * 
-     */
-    public List<GoverningAgreementRefType> getGoverningAgreementRef() {
-        if (governingAgreementRef == null) {
-            governingAgreementRef = new ArrayList<GoverningAgreementRefType>();
-        }
-        return this.governingAgreementRef;
-    }
-
-}

Deleted: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/generated/IdentificationType.java
===================================================================
--- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/generated/IdentificationType.java	2011-02-04 22:44:25 UTC (rev 735)
+++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/generated/IdentificationType.java	2011-02-04 22:45:33 UTC (rev 736)
@@ -1,189 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.1-661 
-// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2008.12.08 at 05:45:20 PM CST 
-//
-
-
-package org.picketlink.identity.federation.saml.v2.generated;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>Java class for IdentificationType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained within this class.
- * 
- * <pre>
- * &lt;complexType name="IdentificationType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       &lt;sequence>
- *         &lt;element ref="{}PhysicalVerification" minOccurs="0"/>
- *         &lt;element ref="{}WrittenConsent" minOccurs="0"/>
- *         &lt;element ref="{}GoverningAgreements" minOccurs="0"/>
- *         &lt;element ref="{}Extension" maxOccurs="unbounded" minOccurs="0"/>
- *       &lt;/sequence>
- *       &lt;attribute name="nym" type="{}nymType" />
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
- at XmlAccessorType(XmlAccessType.FIELD)
- at XmlType(name = "IdentificationType", propOrder = {
-    "physicalVerification",
-    "writtenConsent",
-    "governingAgreements",
-    "extension"
-})
-public class IdentificationType {
-
-    @XmlElement(name = "PhysicalVerification")
-    protected PhysicalVerification physicalVerification;
-    @XmlElement(name = "WrittenConsent")
-    protected ExtensionOnlyType writtenConsent;
-    @XmlElement(name = "GoverningAgreements")
-    protected GoverningAgreementsType governingAgreements;
-    @XmlElement(name = "Extension")
-    protected List<ExtensionType> extension;
-    @XmlAttribute
-    protected NymType nym;
-
-    /**
-     * Gets the value of the physicalVerification property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link PhysicalVerification }
-     *     
-     */
-    public PhysicalVerification getPhysicalVerification() {
-        return physicalVerification;
-    }
-
-    /**
-     * Sets the value of the physicalVerification property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link PhysicalVerification }
-     *     
-     */
-    public void setPhysicalVerification(PhysicalVerification value) {
-        this.physicalVerification = value;
-    }
-
-    /**
-     * Gets the value of the writtenConsent property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link ExtensionOnlyType }
-     *     
-     */
-    public ExtensionOnlyType getWrittenConsent() {
-        return writtenConsent;
-    }
-
-    /**
-     * Sets the value of the writtenConsent property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link ExtensionOnlyType }
-     *     
-     */
-    public void setWrittenConsent(ExtensionOnlyType value) {
-        this.writtenConsent = value;
-    }
-
-    /**
-     * Gets the value of the governingAgreements property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link GoverningAgreementsType }
-     *     
-     */
-    public GoverningAgreementsType getGoverningAgreements() {
-        return governingAgreements;
-    }
-
-    /**
-     * Sets the value of the governingAgreements property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link GoverningAgreementsType }
-     *     
-     */
-    public void setGoverningAgreements(GoverningAgreementsType value) {
-        this.governingAgreements = value;
-    }
-
-    /**
-     * Gets the value of the extension property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the extension property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getExtension().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link ExtensionType }
-     * 
-     * 
-     */
-    public List<ExtensionType> getExtension() {
-        if (extension == null) {
-            extension = new ArrayList<ExtensionType>();
-        }
-        return this.extension;
-    }
-
-    /**
-     * Gets the value of the nym property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link NymType }
-     *     
-     */
-    public NymType getNym() {
-        return nym;
-    }
-
-    /**
-     * Sets the value of the nym property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link NymType }
-     *     
-     */
-    public void setNym(NymType value) {
-        this.nym = value;
-    }
-
-}

Deleted: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/generated/KeyActivationType.java
===================================================================
--- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/generated/KeyActivationType.java	2011-02-04 22:44:25 UTC (rev 735)
+++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/generated/KeyActivationType.java	2011-02-04 22:45:33 UTC (rev 736)
@@ -1,105 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.1-661 
-// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2008.12.08 at 05:45:20 PM CST 
-//
-
-
-package org.picketlink.identity.federation.saml.v2.generated;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>Java class for KeyActivationType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained within this class.
- * 
- * <pre>
- * &lt;complexType name="KeyActivationType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       &lt;sequence>
- *         &lt;element ref="{}ActivationPin" minOccurs="0"/>
- *         &lt;element ref="{}Extension" maxOccurs="unbounded" minOccurs="0"/>
- *       &lt;/sequence>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
- at XmlAccessorType(XmlAccessType.FIELD)
- at XmlType(name = "KeyActivationType", propOrder = {
-    "activationPin",
-    "extension"
-})
-public class KeyActivationType {
-
-    @XmlElement(name = "ActivationPin")
-    protected ActivationPinType activationPin;
-    @XmlElement(name = "Extension")
-    protected List<ExtensionType> extension;
-
-    /**
-     * Gets the value of the activationPin property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link ActivationPinType }
-     *     
-     */
-    public ActivationPinType getActivationPin() {
-        return activationPin;
-    }
-
-    /**
-     * Sets the value of the activationPin property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link ActivationPinType }
-     *     
-     */
-    public void setActivationPin(ActivationPinType value) {
-        this.activationPin = value;
-    }
-
-    /**
-     * Gets the value of the extension property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the extension property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getExtension().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link ExtensionType }
-     * 
-     * 
-     */
-    public List<ExtensionType> getExtension() {
-        if (extension == null) {
-            extension = new ArrayList<ExtensionType>();
-        }
-        return this.extension;
-    }
-
-}

Deleted: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/generated/KeySharingType.java
===================================================================
--- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/generated/KeySharingType.java	2011-02-04 22:44:25 UTC (rev 735)
+++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/generated/KeySharingType.java	2011-02-04 22:45:33 UTC (rev 736)
@@ -1,57 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.1-661 
-// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2008.12.08 at 05:45:20 PM CST 
-//
-
-
-package org.picketlink.identity.federation.saml.v2.generated;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>Java class for KeySharingType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained within this class.
- * 
- * <pre>
- * &lt;complexType name="KeySharingType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       &lt;attribute name="sharing" use="required" type="{http://www.w3.org/2001/XMLSchema}boolean" />
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
- at XmlAccessorType(XmlAccessType.FIELD)
- at XmlType(name = "KeySharingType")
-public class KeySharingType {
-
-    @XmlAttribute(required = true)
-    protected boolean sharing;
-
-    /**
-     * Gets the value of the sharing property.
-     * 
-     */
-    public boolean isSharing() {
-        return sharing;
-    }
-
-    /**
-     * Sets the value of the sharing property.
-     * 
-     */
-    public void setSharing(boolean value) {
-        this.sharing = value;
-    }
-
-}

Deleted: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/generated/KeyStorageType.java
===================================================================
--- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/generated/KeyStorageType.java	2011-02-04 22:44:25 UTC (rev 735)
+++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/generated/KeyStorageType.java	2011-02-04 22:45:33 UTC (rev 736)
@@ -1,65 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.1-661 
-// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2008.12.08 at 05:45:20 PM CST 
-//
-
-
-package org.picketlink.identity.federation.saml.v2.generated;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>Java class for KeyStorageType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained within this class.
- * 
- * <pre>
- * &lt;complexType name="KeyStorageType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       &lt;attribute name="medium" use="required" type="{}mediumType" />
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
- at XmlAccessorType(XmlAccessType.FIELD)
- at XmlType(name = "KeyStorageType")
-public class KeyStorageType {
-
-    @XmlAttribute(required = true)
-    protected MediumType medium;
-
-    /**
-     * Gets the value of the medium property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link MediumType }
-     *     
-     */
-    public MediumType getMedium() {
-        return medium;
-    }
-
-    /**
-     * Sets the value of the medium property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link MediumType }
-     *     
-     */
-    public void setMedium(MediumType value) {
-        this.medium = value;
-    }
-
-}

Deleted: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/generated/LengthType.java
===================================================================
--- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/generated/LengthType.java	2011-02-04 22:44:25 UTC (rev 735)
+++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/generated/LengthType.java	2011-02-04 22:45:33 UTC (rev 736)
@@ -1,98 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.1-661 
-// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2008.12.08 at 05:45:20 PM CST 
-//
-
-
-package org.picketlink.identity.federation.saml.v2.generated;
-
-import java.math.BigInteger;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlSeeAlso;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>Java class for LengthType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained within this class.
- * 
- * <pre>
- * &lt;complexType name="LengthType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       &lt;attribute name="min" use="required" type="{http://www.w3.org/2001/XMLSchema}integer" />
- *       &lt;attribute name="max" type="{http://www.w3.org/2001/XMLSchema}integer" />
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
- at XmlAccessorType(XmlAccessType.FIELD)
- at XmlType(name = "LengthType")
- at XmlSeeAlso({
-    RestrictedLengthType.class
-})
-public class LengthType {
-
-    @XmlAttribute(required = true)
-    protected BigInteger min;
-    @XmlAttribute
-    protected BigInteger max;
-
-    /**
-     * Gets the value of the min property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link BigInteger }
-     *     
-     */
-    public BigInteger getMin() {
-        return min;
-    }
-
-    /**
-     * Sets the value of the min property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link BigInteger }
-     *     
-     */
-    public void setMin(BigInteger value) {
-        this.min = value;
-    }
-
-    /**
-     * Gets the value of the max property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link BigInteger }
-     *     
-     */
-    public BigInteger getMax() {
-        return max;
-    }
-
-    /**
-     * Sets the value of the max property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link BigInteger }
-     *     
-     */
-    public void setMax(BigInteger value) {
-        this.max = value;
-    }
-
-}

Deleted: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/generated/MediumType.java
===================================================================
--- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/generated/MediumType.java	2011-02-04 22:44:25 UTC (rev 735)
+++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/generated/MediumType.java	2011-02-04 22:45:33 UTC (rev 736)
@@ -1,67 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.1-661 
-// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2008.12.08 at 05:45:20 PM CST 
-//
-
-
-package org.picketlink.identity.federation.saml.v2.generated;
-
-import javax.xml.bind.annotation.XmlEnum;
-import javax.xml.bind.annotation.XmlEnumValue;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>Java class for mediumType.
- * 
- * <p>The following schema fragment specifies the expected content contained within this class.
- * <p>
- * <pre>
- * &lt;simpleType name="mediumType">
- *   &lt;restriction base="{http://www.w3.org/2001/XMLSchema}NMTOKEN">
- *     &lt;enumeration value="memory"/>
- *     &lt;enumeration value="smartcard"/>
- *     &lt;enumeration value="token"/>
- *     &lt;enumeration value="MobileDevice"/>
- *     &lt;enumeration value="MobileAuthCard"/>
- *   &lt;/restriction>
- * &lt;/simpleType>
- * </pre>
- * 
- */
- at XmlType(name = "mediumType")
- at XmlEnum
-public enum MediumType {
-
-    @XmlEnumValue("memory")
-    MEMORY("memory"),
-    @XmlEnumValue("smartcard")
-    SMARTCARD("smartcard"),
-    @XmlEnumValue("token")
-    TOKEN("token"),
-    @XmlEnumValue("MobileDevice")
-    MOBILE_DEVICE("MobileDevice"),
-    @XmlEnumValue("MobileAuthCard")
-    MOBILE_AUTH_CARD("MobileAuthCard");
-    private final String value;
-
-    MediumType(String v) {
-        value = v;
-    }
-
-    public String value() {
-        return value;
-    }
-
-    public static MediumType fromValue(String v) {
-        for (MediumType c: MediumType.values()) {
-            if (c.value.equals(v)) {
-                return c;
-            }
-        }
-        throw new IllegalArgumentException(v);
-    }
-
-}

Deleted: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/generated/NymType.java
===================================================================
--- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/generated/NymType.java	2011-02-04 22:44:25 UTC (rev 735)
+++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/generated/NymType.java	2011-02-04 22:45:33 UTC (rev 736)
@@ -1,61 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.1-661 
-// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2008.12.08 at 05:45:20 PM CST 
-//
-
-
-package org.picketlink.identity.federation.saml.v2.generated;
-
-import javax.xml.bind.annotation.XmlEnum;
-import javax.xml.bind.annotation.XmlEnumValue;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>Java class for nymType.
- * 
- * <p>The following schema fragment specifies the expected content contained within this class.
- * <p>
- * <pre>
- * &lt;simpleType name="nymType">
- *   &lt;restriction base="{http://www.w3.org/2001/XMLSchema}NMTOKEN">
- *     &lt;enumeration value="anonymity"/>
- *     &lt;enumeration value="verinymity"/>
- *     &lt;enumeration value="pseudonymity"/>
- *   &lt;/restriction>
- * &lt;/simpleType>
- * </pre>
- * 
- */
- at XmlType(name = "nymType")
- at XmlEnum
-public enum NymType {
-
-    @XmlEnumValue("anonymity")
-    ANONYMITY("anonymity"),
-    @XmlEnumValue("verinymity")
-    VERINYMITY("verinymity"),
-    @XmlEnumValue("pseudonymity")
-    PSEUDONYMITY("pseudonymity");
-    private final String value;
-
-    NymType(String v) {
-        value = v;
-    }
-
-    public String value() {
-        return value;
-    }
-
-    public static NymType fromValue(String v) {
-        for (NymType c: NymType.values()) {
-            if (c.value.equals(v)) {
-                return c;
-            }
-        }
-        throw new IllegalArgumentException(v);
-    }
-
-}

Deleted: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/generated/ObjectFactory.java
===================================================================
--- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/generated/ObjectFactory.java	2011-02-04 22:44:25 UTC (rev 735)
+++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/generated/ObjectFactory.java	2011-02-04 22:45:33 UTC (rev 736)
@@ -1,862 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.1-661 
-// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2008.12.08 at 05:45:20 PM CST 
-//
-
-
-package org.picketlink.identity.federation.saml.v2.generated;
-
-import javax.xml.bind.JAXBElement;
-import javax.xml.bind.annotation.XmlElementDecl;
-import javax.xml.bind.annotation.XmlRegistry;
-import javax.xml.namespace.QName;
-
-
-/**
- * This object contains factory methods for each 
- * Java content interface and Java element interface 
- * generated in the generated package. 
- * <p>An ObjectFactory allows you to programatically 
- * construct new instances of the Java representation 
- * for XML content. The Java representation of XML 
- * content can consist of schema derived interfaces 
- * and classes representing the binding of schema 
- * type definitions, element declarations and model 
- * groups.  Factory methods for each of these are 
- * provided in this class.
- * 
- */
- at XmlRegistry
-public class ObjectFactory {
-
-    private final static QName _ZeroKnowledge_QNAME = new QName("", "ZeroKnowledge");
-    private final static QName _GoverningAgreements_QNAME = new QName("", "GoverningAgreements");
-    private final static QName _SubscriberLineNumber_QNAME = new QName("", "SubscriberLineNumber");
-    private final static QName _DigSig_QNAME = new QName("", "DigSig");
-    private final static QName _AsymmetricKeyAgreement_QNAME = new QName("", "AsymmetricKeyAgreement");
-    private final static QName _AuthnMethod_QNAME = new QName("", "AuthnMethod");
-    private final static QName _ActivationPin_QNAME = new QName("", "ActivationPin");
-    private final static QName _GoverningAgreementRef_QNAME = new QName("", "GoverningAgreementRef");
-    private final static QName _PrincipalAuthenticationMechanism_QNAME = new QName("", "PrincipalAuthenticationMechanism");
-    private final static QName _AuthenticatorTransportProtocol_QNAME = new QName("", "AuthenticatorTransportProtocol");
-    private final static QName _SwitchAudit_QNAME = new QName("", "SwitchAudit");
-    private final static QName _RestrictedPassword_QNAME = new QName("", "RestrictedPassword");
-    private final static QName _TechnicalProtection_QNAME = new QName("", "TechnicalProtection");
-    private final static QName _KeyStorage_QNAME = new QName("", "KeyStorage");
-    private final static QName _TimeSyncToken_QNAME = new QName("", "TimeSyncToken");
-    private final static QName _MobileNetworkRadioEncryption_QNAME = new QName("", "MobileNetworkRadioEncryption");
-    private final static QName _SharedSecretChallengeResponse_QNAME = new QName("", "SharedSecretChallengeResponse");
-    private final static QName _WrittenConsent_QNAME = new QName("", "WrittenConsent");
-    private final static QName _AuthenticationContextDeclaration_QNAME = new QName("", "AuthenticationContextDeclaration");
-    private final static QName _Identification_QNAME = new QName("", "Identification");
-    private final static QName _OperationalProtection_QNAME = new QName("", "OperationalProtection");
-    private final static QName _Authenticator_QNAME = new QName("", "Authenticator");
-    private final static QName _SSL_QNAME = new QName("", "SSL");
-    private final static QName _IPSec_QNAME = new QName("", "IPSec");
-    private final static QName _SharedSecretDynamicPlaintext_QNAME = new QName("", "SharedSecretDynamicPlaintext");
-    private final static QName _ResumeSession_QNAME = new QName("", "ResumeSession");
-    private final static QName _IPAddress_QNAME = new QName("", "IPAddress");
-    private final static QName _WTLS_QNAME = new QName("", "WTLS");
-    private final static QName _PreviousSession_QNAME = new QName("", "PreviousSession");
-    private final static QName _ActivationLimit_QNAME = new QName("", "ActivationLimit");
-    private final static QName _DeactivationCallCenter_QNAME = new QName("", "DeactivationCallCenter");
-    private final static QName _Extension_QNAME = new QName("", "Extension");
-    private final static QName _Password_QNAME = new QName("", "Password");
-    private final static QName _Token_QNAME = new QName("", "Token");
-    private final static QName _ActivationLimitUsages_QNAME = new QName("", "ActivationLimitUsages");
-    private final static QName _PSTN_QNAME = new QName("", "PSTN");
-    private final static QName _SecurityAudit_QNAME = new QName("", "SecurityAudit");
-    private final static QName _AsymmetricDecryption_QNAME = new QName("", "AsymmetricDecryption");
-    private final static QName _SecretKeyProtection_QNAME = new QName("", "SecretKeyProtection");
-    private final static QName _ActivationLimitDuration_QNAME = new QName("", "ActivationLimitDuration");
-    private final static QName _PrivateKeyProtection_QNAME = new QName("", "PrivateKeyProtection");
-    private final static QName _Alphabet_QNAME = new QName("", "Alphabet");
-    private final static QName _ActivationLimitSession_QNAME = new QName("", "ActivationLimitSession");
-    private final static QName _Smartcard_QNAME = new QName("", "Smartcard");
-    private final static QName _KeySharing_QNAME = new QName("", "KeySharing");
-    private final static QName _ComplexAuthenticator_QNAME = new QName("", "ComplexAuthenticator");
-    private final static QName _ADSL_QNAME = new QName("", "ADSL");
-    private final static QName _ISDN_QNAME = new QName("", "ISDN");
-    private final static QName _MobileNetworkNoEncryption_QNAME = new QName("", "MobileNetworkNoEncryption");
-    private final static QName _MobileNetworkEndToEndEncryption_QNAME = new QName("", "MobileNetworkEndToEndEncryption");
-    private final static QName _UserSuffix_QNAME = new QName("", "UserSuffix");
-    private final static QName _Length_QNAME = new QName("", "Length");
-    private final static QName _HTTP_QNAME = new QName("", "HTTP");
-    private final static QName _KeyActivation_QNAME = new QName("", "KeyActivation");
-
-    /**
-     * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: generated
-     * 
-     */
-    public ObjectFactory() {
-    }
-
-    /**
-     * Create an instance of {@link AuthnContextDeclarationBaseType }
-     * 
-     */
-    public AuthnContextDeclarationBaseType createAuthnContextDeclarationBaseType() {
-        return new AuthnContextDeclarationBaseType();
-    }
-
-    /**
-     * Create an instance of {@link KeyActivationType }
-     * 
-     */
-    public KeyActivationType createKeyActivationType() {
-        return new KeyActivationType();
-    }
-
-    /**
-     * Create an instance of {@link SecretKeyProtectionType }
-     * 
-     */
-    public SecretKeyProtectionType createSecretKeyProtectionType() {
-        return new SecretKeyProtectionType();
-    }
-
-    /**
-     * Create an instance of {@link RestrictedLengthType }
-     * 
-     */
-    public RestrictedLengthType createRestrictedLengthType() {
-        return new RestrictedLengthType();
-    }
-
-    /**
-     * Create an instance of {@link TechnicalProtectionBaseType }
-     * 
-     */
-    public TechnicalProtectionBaseType createTechnicalProtectionBaseType() {
-        return new TechnicalProtectionBaseType();
-    }
-
-    /**
-     * Create an instance of {@link PrivateKeyProtectionType }
-     * 
-     */
-    public PrivateKeyProtectionType createPrivateKeyProtectionType() {
-        return new PrivateKeyProtectionType();
-    }
-
-    /**
-     * Create an instance of {@link ActivationLimitDurationType }
-     * 
-     */
-    public ActivationLimitDurationType createActivationLimitDurationType() {
-        return new ActivationLimitDurationType();
-    }
-
-    /**
-     * Create an instance of {@link SharedSecretChallengeResponseType }
-     * 
-     */
-    public SharedSecretChallengeResponseType createSharedSecretChallengeResponseType() {
-        return new SharedSecretChallengeResponseType();
-    }
-
-    /**
-     * Create an instance of {@link AuthenticatorTransportProtocolType }
-     * 
-     */
-    public AuthenticatorTransportProtocolType createAuthenticatorTransportProtocolType() {
-        return new AuthenticatorTransportProtocolType();
-    }
-
-    /**
-     * Create an instance of {@link LengthType }
-     * 
-     */
-    public LengthType createLengthType() {
-        return new LengthType();
-    }
-
-    /**
-     * Create an instance of {@link ActivationLimitUsagesType }
-     * 
-     */
-    public ActivationLimitUsagesType createActivationLimitUsagesType() {
-        return new ActivationLimitUsagesType();
-    }
-
-    /**
-     * Create an instance of {@link AuthnMethodBaseType }
-     * 
-     */
-    public AuthnMethodBaseType createAuthnMethodBaseType() {
-        return new AuthnMethodBaseType();
-    }
-
-    /**
-     * Create an instance of {@link TimeSyncTokenType }
-     * 
-     */
-    public TimeSyncTokenType createTimeSyncTokenType() {
-        return new TimeSyncTokenType();
-    }
-
-    /**
-     * Create an instance of {@link ActivationLimitSessionType }
-     * 
-     */
-    public ActivationLimitSessionType createActivationLimitSessionType() {
-        return new ActivationLimitSessionType();
-    }
-
-    /**
-     * Create an instance of {@link AuthenticatorBaseType }
-     * 
-     */
-    public AuthenticatorBaseType createAuthenticatorBaseType() {
-        return new AuthenticatorBaseType();
-    }
-
-    /**
-     * Create an instance of {@link ExtensionOnlyType }
-     * 
-     */
-    public ExtensionOnlyType createExtensionOnlyType() {
-        return new ExtensionOnlyType();
-    }
-
-    /**
-     * Create an instance of {@link Generation }
-     * 
-     */
-    public Generation createGeneration() {
-        return new Generation();
-    }
-
-    /**
-     * Create an instance of {@link PublicKeyType }
-     * 
-     */
-    public PublicKeyType createPublicKeyType() {
-        return new PublicKeyType();
-    }
-
-    /**
-     * Create an instance of {@link RestrictedPasswordType }
-     * 
-     */
-    public RestrictedPasswordType createRestrictedPasswordType() {
-        return new RestrictedPasswordType();
-    }
-
-    /**
-     * Create an instance of {@link IdentificationType }
-     * 
-     */
-    public IdentificationType createIdentificationType() {
-        return new IdentificationType();
-    }
-
-    /**
-     * Create an instance of {@link GoverningAgreementRefType }
-     * 
-     */
-    public GoverningAgreementRefType createGoverningAgreementRefType() {
-        return new GoverningAgreementRefType();
-    }
-
-    /**
-     * Create an instance of {@link AlphabetType }
-     * 
-     */
-    public AlphabetType createAlphabetType() {
-        return new AlphabetType();
-    }
-
-    /**
-     * Create an instance of {@link ExtensionType }
-     * 
-     */
-    public ExtensionType createExtensionType() {
-        return new ExtensionType();
-    }
-
-    /**
-     * Create an instance of {@link PasswordType }
-     * 
-     */
-    public PasswordType createPasswordType() {
-        return new PasswordType();
-    }
-
-    /**
-     * Create an instance of {@link SecurityAuditType }
-     * 
-     */
-    public SecurityAuditType createSecurityAuditType() {
-        return new SecurityAuditType();
-    }
-
-    /**
-     * Create an instance of {@link PrincipalAuthenticationMechanismType }
-     * 
-     */
-    public PrincipalAuthenticationMechanismType createPrincipalAuthenticationMechanismType() {
-        return new PrincipalAuthenticationMechanismType();
-    }
-
-    /**
-     * Create an instance of {@link ComplexAuthenticatorType }
-     * 
-     */
-    public ComplexAuthenticatorType createComplexAuthenticatorType() {
-        return new ComplexAuthenticatorType();
-    }
-
-    /**
-     * Create an instance of {@link ActivationLimitType }
-     * 
-     */
-    public ActivationLimitType createActivationLimitType() {
-        return new ActivationLimitType();
-    }
-
-    /**
-     * Create an instance of {@link KeyStorageType }
-     * 
-     */
-    public KeyStorageType createKeyStorageType() {
-        return new KeyStorageType();
-    }
-
-    /**
-     * Create an instance of {@link OperationalProtectionType }
-     * 
-     */
-    public OperationalProtectionType createOperationalProtectionType() {
-        return new OperationalProtectionType();
-    }
-
-    /**
-     * Create an instance of {@link GoverningAgreementsType }
-     * 
-     */
-    public GoverningAgreementsType createGoverningAgreementsType() {
-        return new GoverningAgreementsType();
-    }
-
-    /**
-     * Create an instance of {@link PhysicalVerification }
-     * 
-     */
-    public PhysicalVerification createPhysicalVerification() {
-        return new PhysicalVerification();
-    }
-
-    /**
-     * Create an instance of {@link ActivationPinType }
-     * 
-     */
-    public ActivationPinType createActivationPinType() {
-        return new ActivationPinType();
-    }
-
-    /**
-     * Create an instance of {@link KeySharingType }
-     * 
-     */
-    public KeySharingType createKeySharingType() {
-        return new KeySharingType();
-    }
-
-    /**
-     * Create an instance of {@link TokenType }
-     * 
-     */
-    public TokenType createTokenType() {
-        return new TokenType();
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link ExtensionOnlyType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "", name = "ZeroKnowledge")
-    public JAXBElement<ExtensionOnlyType> createZeroKnowledge(ExtensionOnlyType value) {
-        return new JAXBElement<ExtensionOnlyType>(_ZeroKnowledge_QNAME, ExtensionOnlyType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link GoverningAgreementsType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "", name = "GoverningAgreements")
-    public JAXBElement<GoverningAgreementsType> createGoverningAgreements(GoverningAgreementsType value) {
-        return new JAXBElement<GoverningAgreementsType>(_GoverningAgreements_QNAME, GoverningAgreementsType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link ExtensionOnlyType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "", name = "SubscriberLineNumber")
-    public JAXBElement<ExtensionOnlyType> createSubscriberLineNumber(ExtensionOnlyType value) {
-        return new JAXBElement<ExtensionOnlyType>(_SubscriberLineNumber_QNAME, ExtensionOnlyType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link PublicKeyType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "", name = "DigSig")
-    public JAXBElement<PublicKeyType> createDigSig(PublicKeyType value) {
-        return new JAXBElement<PublicKeyType>(_DigSig_QNAME, PublicKeyType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link PublicKeyType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "", name = "AsymmetricKeyAgreement")
-    public JAXBElement<PublicKeyType> createAsymmetricKeyAgreement(PublicKeyType value) {
-        return new JAXBElement<PublicKeyType>(_AsymmetricKeyAgreement_QNAME, PublicKeyType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link AuthnMethodBaseType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "", name = "AuthnMethod")
-    public JAXBElement<AuthnMethodBaseType> createAuthnMethod(AuthnMethodBaseType value) {
-        return new JAXBElement<AuthnMethodBaseType>(_AuthnMethod_QNAME, AuthnMethodBaseType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link ActivationPinType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "", name = "ActivationPin")
-    public JAXBElement<ActivationPinType> createActivationPin(ActivationPinType value) {
-        return new JAXBElement<ActivationPinType>(_ActivationPin_QNAME, ActivationPinType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link GoverningAgreementRefType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "", name = "GoverningAgreementRef")
-    public JAXBElement<GoverningAgreementRefType> createGoverningAgreementRef(GoverningAgreementRefType value) {
-        return new JAXBElement<GoverningAgreementRefType>(_GoverningAgreementRef_QNAME, GoverningAgreementRefType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link PrincipalAuthenticationMechanismType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "", name = "PrincipalAuthenticationMechanism")
-    public JAXBElement<PrincipalAuthenticationMechanismType> createPrincipalAuthenticationMechanism(PrincipalAuthenticationMechanismType value) {
-        return new JAXBElement<PrincipalAuthenticationMechanismType>(_PrincipalAuthenticationMechanism_QNAME, PrincipalAuthenticationMechanismType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link AuthenticatorTransportProtocolType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "", name = "AuthenticatorTransportProtocol")
-    public JAXBElement<AuthenticatorTransportProtocolType> createAuthenticatorTransportProtocol(AuthenticatorTransportProtocolType value) {
-        return new JAXBElement<AuthenticatorTransportProtocolType>(_AuthenticatorTransportProtocol_QNAME, AuthenticatorTransportProtocolType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link ExtensionOnlyType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "", name = "SwitchAudit")
-    public JAXBElement<ExtensionOnlyType> createSwitchAudit(ExtensionOnlyType value) {
-        return new JAXBElement<ExtensionOnlyType>(_SwitchAudit_QNAME, ExtensionOnlyType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link RestrictedPasswordType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "", name = "RestrictedPassword")
-    public JAXBElement<RestrictedPasswordType> createRestrictedPassword(RestrictedPasswordType value) {
-        return new JAXBElement<RestrictedPasswordType>(_RestrictedPassword_QNAME, RestrictedPasswordType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link TechnicalProtectionBaseType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "", name = "TechnicalProtection")
-    public JAXBElement<TechnicalProtectionBaseType> createTechnicalProtection(TechnicalProtectionBaseType value) {
-        return new JAXBElement<TechnicalProtectionBaseType>(_TechnicalProtection_QNAME, TechnicalProtectionBaseType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link KeyStorageType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "", name = "KeyStorage")
-    public JAXBElement<KeyStorageType> createKeyStorage(KeyStorageType value) {
-        return new JAXBElement<KeyStorageType>(_KeyStorage_QNAME, KeyStorageType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link TimeSyncTokenType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "", name = "TimeSyncToken")
-    public JAXBElement<TimeSyncTokenType> createTimeSyncToken(TimeSyncTokenType value) {
-        return new JAXBElement<TimeSyncTokenType>(_TimeSyncToken_QNAME, TimeSyncTokenType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link ExtensionOnlyType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "", name = "MobileNetworkRadioEncryption")
-    public JAXBElement<ExtensionOnlyType> createMobileNetworkRadioEncryption(ExtensionOnlyType value) {
-        return new JAXBElement<ExtensionOnlyType>(_MobileNetworkRadioEncryption_QNAME, ExtensionOnlyType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link SharedSecretChallengeResponseType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "", name = "SharedSecretChallengeResponse")
-    public JAXBElement<SharedSecretChallengeResponseType> createSharedSecretChallengeResponse(SharedSecretChallengeResponseType value) {
-        return new JAXBElement<SharedSecretChallengeResponseType>(_SharedSecretChallengeResponse_QNAME, SharedSecretChallengeResponseType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link ExtensionOnlyType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "", name = "WrittenConsent")
-    public JAXBElement<ExtensionOnlyType> createWrittenConsent(ExtensionOnlyType value) {
-        return new JAXBElement<ExtensionOnlyType>(_WrittenConsent_QNAME, ExtensionOnlyType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link AuthnContextDeclarationBaseType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "", name = "AuthenticationContextDeclaration")
-    public JAXBElement<AuthnContextDeclarationBaseType> createAuthenticationContextDeclaration(AuthnContextDeclarationBaseType value) {
-        return new JAXBElement<AuthnContextDeclarationBaseType>(_AuthenticationContextDeclaration_QNAME, AuthnContextDeclarationBaseType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link IdentificationType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "", name = "Identification")
-    public JAXBElement<IdentificationType> createIdentification(IdentificationType value) {
-        return new JAXBElement<IdentificationType>(_Identification_QNAME, IdentificationType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link OperationalProtectionType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "", name = "OperationalProtection")
-    public JAXBElement<OperationalProtectionType> createOperationalProtection(OperationalProtectionType value) {
-        return new JAXBElement<OperationalProtectionType>(_OperationalProtection_QNAME, OperationalProtectionType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link AuthenticatorBaseType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "", name = "Authenticator")
-    public JAXBElement<AuthenticatorBaseType> createAuthenticator(AuthenticatorBaseType value) {
-        return new JAXBElement<AuthenticatorBaseType>(_Authenticator_QNAME, AuthenticatorBaseType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link ExtensionOnlyType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "", name = "SSL")
-    public JAXBElement<ExtensionOnlyType> createSSL(ExtensionOnlyType value) {
-        return new JAXBElement<ExtensionOnlyType>(_SSL_QNAME, ExtensionOnlyType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link ExtensionOnlyType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "", name = "IPSec")
-    public JAXBElement<ExtensionOnlyType> createIPSec(ExtensionOnlyType value) {
-        return new JAXBElement<ExtensionOnlyType>(_IPSec_QNAME, ExtensionOnlyType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link ExtensionOnlyType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "", name = "SharedSecretDynamicPlaintext")
-    public JAXBElement<ExtensionOnlyType> createSharedSecretDynamicPlaintext(ExtensionOnlyType value) {
-        return new JAXBElement<ExtensionOnlyType>(_SharedSecretDynamicPlaintext_QNAME, ExtensionOnlyType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link ExtensionOnlyType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "", name = "ResumeSession")
-    public JAXBElement<ExtensionOnlyType> createResumeSession(ExtensionOnlyType value) {
-        return new JAXBElement<ExtensionOnlyType>(_ResumeSession_QNAME, ExtensionOnlyType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link ExtensionOnlyType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "", name = "IPAddress")
-    public JAXBElement<ExtensionOnlyType> createIPAddress(ExtensionOnlyType value) {
-        return new JAXBElement<ExtensionOnlyType>(_IPAddress_QNAME, ExtensionOnlyType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link ExtensionOnlyType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "", name = "WTLS")
-    public JAXBElement<ExtensionOnlyType> createWTLS(ExtensionOnlyType value) {
-        return new JAXBElement<ExtensionOnlyType>(_WTLS_QNAME, ExtensionOnlyType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link ExtensionOnlyType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "", name = "PreviousSession")
-    public JAXBElement<ExtensionOnlyType> createPreviousSession(ExtensionOnlyType value) {
-        return new JAXBElement<ExtensionOnlyType>(_PreviousSession_QNAME, ExtensionOnlyType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link ActivationLimitType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "", name = "ActivationLimit")
-    public JAXBElement<ActivationLimitType> createActivationLimit(ActivationLimitType value) {
-        return new JAXBElement<ActivationLimitType>(_ActivationLimit_QNAME, ActivationLimitType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link ExtensionOnlyType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "", name = "DeactivationCallCenter")
-    public JAXBElement<ExtensionOnlyType> createDeactivationCallCenter(ExtensionOnlyType value) {
-        return new JAXBElement<ExtensionOnlyType>(_DeactivationCallCenter_QNAME, ExtensionOnlyType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link ExtensionType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "", name = "Extension")
-    public JAXBElement<ExtensionType> createExtension(ExtensionType value) {
-        return new JAXBElement<ExtensionType>(_Extension_QNAME, ExtensionType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link PasswordType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "", name = "Password")
-    public JAXBElement<PasswordType> createPassword(PasswordType value) {
-        return new JAXBElement<PasswordType>(_Password_QNAME, PasswordType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link TokenType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "", name = "Token")
-    public JAXBElement<TokenType> createToken(TokenType value) {
-        return new JAXBElement<TokenType>(_Token_QNAME, TokenType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link ActivationLimitUsagesType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "", name = "ActivationLimitUsages")
-    public JAXBElement<ActivationLimitUsagesType> createActivationLimitUsages(ActivationLimitUsagesType value) {
-        return new JAXBElement<ActivationLimitUsagesType>(_ActivationLimitUsages_QNAME, ActivationLimitUsagesType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link ExtensionOnlyType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "", name = "PSTN")
-    public JAXBElement<ExtensionOnlyType> createPSTN(ExtensionOnlyType value) {
-        return new JAXBElement<ExtensionOnlyType>(_PSTN_QNAME, ExtensionOnlyType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link SecurityAuditType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "", name = "SecurityAudit")
-    public JAXBElement<SecurityAuditType> createSecurityAudit(SecurityAuditType value) {
-        return new JAXBElement<SecurityAuditType>(_SecurityAudit_QNAME, SecurityAuditType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link PublicKeyType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "", name = "AsymmetricDecryption")
-    public JAXBElement<PublicKeyType> createAsymmetricDecryption(PublicKeyType value) {
-        return new JAXBElement<PublicKeyType>(_AsymmetricDecryption_QNAME, PublicKeyType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link SecretKeyProtectionType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "", name = "SecretKeyProtection")
-    public JAXBElement<SecretKeyProtectionType> createSecretKeyProtection(SecretKeyProtectionType value) {
-        return new JAXBElement<SecretKeyProtectionType>(_SecretKeyProtection_QNAME, SecretKeyProtectionType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link ActivationLimitDurationType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "", name = "ActivationLimitDuration")
-    public JAXBElement<ActivationLimitDurationType> createActivationLimitDuration(ActivationLimitDurationType value) {
-        return new JAXBElement<ActivationLimitDurationType>(_ActivationLimitDuration_QNAME, ActivationLimitDurationType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link PrivateKeyProtectionType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "", name = "PrivateKeyProtection")
-    public JAXBElement<PrivateKeyProtectionType> createPrivateKeyProtection(PrivateKeyProtectionType value) {
-        return new JAXBElement<PrivateKeyProtectionType>(_PrivateKeyProtection_QNAME, PrivateKeyProtectionType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link AlphabetType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "", name = "Alphabet")
-    public JAXBElement<AlphabetType> createAlphabet(AlphabetType value) {
-        return new JAXBElement<AlphabetType>(_Alphabet_QNAME, AlphabetType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link ActivationLimitSessionType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "", name = "ActivationLimitSession")
-    public JAXBElement<ActivationLimitSessionType> createActivationLimitSession(ActivationLimitSessionType value) {
-        return new JAXBElement<ActivationLimitSessionType>(_ActivationLimitSession_QNAME, ActivationLimitSessionType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link ExtensionOnlyType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "", name = "Smartcard")
-    public JAXBElement<ExtensionOnlyType> createSmartcard(ExtensionOnlyType value) {
-        return new JAXBElement<ExtensionOnlyType>(_Smartcard_QNAME, ExtensionOnlyType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link KeySharingType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "", name = "KeySharing")
-    public JAXBElement<KeySharingType> createKeySharing(KeySharingType value) {
-        return new JAXBElement<KeySharingType>(_KeySharing_QNAME, KeySharingType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link ComplexAuthenticatorType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "", name = "ComplexAuthenticator")
-    public JAXBElement<ComplexAuthenticatorType> createComplexAuthenticator(ComplexAuthenticatorType value) {
-        return new JAXBElement<ComplexAuthenticatorType>(_ComplexAuthenticator_QNAME, ComplexAuthenticatorType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link ExtensionOnlyType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "", name = "ADSL")
-    public JAXBElement<ExtensionOnlyType> createADSL(ExtensionOnlyType value) {
-        return new JAXBElement<ExtensionOnlyType>(_ADSL_QNAME, ExtensionOnlyType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link ExtensionOnlyType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "", name = "ISDN")
-    public JAXBElement<ExtensionOnlyType> createISDN(ExtensionOnlyType value) {
-        return new JAXBElement<ExtensionOnlyType>(_ISDN_QNAME, ExtensionOnlyType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link ExtensionOnlyType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "", name = "MobileNetworkNoEncryption")
-    public JAXBElement<ExtensionOnlyType> createMobileNetworkNoEncryption(ExtensionOnlyType value) {
-        return new JAXBElement<ExtensionOnlyType>(_MobileNetworkNoEncryption_QNAME, ExtensionOnlyType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link ExtensionOnlyType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "", name = "MobileNetworkEndToEndEncryption")
-    public JAXBElement<ExtensionOnlyType> createMobileNetworkEndToEndEncryption(ExtensionOnlyType value) {
-        return new JAXBElement<ExtensionOnlyType>(_MobileNetworkEndToEndEncryption_QNAME, ExtensionOnlyType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link ExtensionOnlyType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "", name = "UserSuffix")
-    public JAXBElement<ExtensionOnlyType> createUserSuffix(ExtensionOnlyType value) {
-        return new JAXBElement<ExtensionOnlyType>(_UserSuffix_QNAME, ExtensionOnlyType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link LengthType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "", name = "Length")
-    public JAXBElement<LengthType> createLength(LengthType value) {
-        return new JAXBElement<LengthType>(_Length_QNAME, LengthType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link ExtensionOnlyType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "", name = "HTTP")
-    public JAXBElement<ExtensionOnlyType> createHTTP(ExtensionOnlyType value) {
-        return new JAXBElement<ExtensionOnlyType>(_HTTP_QNAME, ExtensionOnlyType.class, null, value);
-    }
-
-    /**
-     * Create an instance of {@link JAXBElement }{@code <}{@link KeyActivationType }{@code >}}
-     * 
-     */
-    @XmlElementDecl(namespace = "", name = "KeyActivation")
-    public JAXBElement<KeyActivationType> createKeyActivation(KeyActivationType value) {
-        return new JAXBElement<KeyActivationType>(_KeyActivation_QNAME, KeyActivationType.class, null, value);
-    }
-
-}

Deleted: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/generated/OperationalProtectionType.java
===================================================================
--- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/generated/OperationalProtectionType.java	2011-02-04 22:44:25 UTC (rev 735)
+++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/generated/OperationalProtectionType.java	2011-02-04 22:45:33 UTC (rev 736)
@@ -1,133 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.1-661 
-// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2008.12.08 at 05:45:20 PM CST 
-//
-
-
-package org.picketlink.identity.federation.saml.v2.generated;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>Java class for OperationalProtectionType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained within this class.
- * 
- * <pre>
- * &lt;complexType name="OperationalProtectionType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       &lt;sequence>
- *         &lt;element ref="{}SecurityAudit" minOccurs="0"/>
- *         &lt;element ref="{}DeactivationCallCenter" minOccurs="0"/>
- *         &lt;element ref="{}Extension" maxOccurs="unbounded" minOccurs="0"/>
- *       &lt;/sequence>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
- at XmlAccessorType(XmlAccessType.FIELD)
- at XmlType(name = "OperationalProtectionType", propOrder = {
-    "securityAudit",
-    "deactivationCallCenter",
-    "extension"
-})
-public class OperationalProtectionType {
-
-    @XmlElement(name = "SecurityAudit")
-    protected SecurityAuditType securityAudit;
-    @XmlElement(name = "DeactivationCallCenter")
-    protected ExtensionOnlyType deactivationCallCenter;
-    @XmlElement(name = "Extension")
-    protected List<ExtensionType> extension;
-
-    /**
-     * Gets the value of the securityAudit property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link SecurityAuditType }
-     *     
-     */
-    public SecurityAuditType getSecurityAudit() {
-        return securityAudit;
-    }
-
-    /**
-     * Sets the value of the securityAudit property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link SecurityAuditType }
-     *     
-     */
-    public void setSecurityAudit(SecurityAuditType value) {
-        this.securityAudit = value;
-    }
-
-    /**
-     * Gets the value of the deactivationCallCenter property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link ExtensionOnlyType }
-     *     
-     */
-    public ExtensionOnlyType getDeactivationCallCenter() {
-        return deactivationCallCenter;
-    }
-
-    /**
-     * Sets the value of the deactivationCallCenter property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link ExtensionOnlyType }
-     *     
-     */
-    public void setDeactivationCallCenter(ExtensionOnlyType value) {
-        this.deactivationCallCenter = value;
-    }
-
-    /**
-     * Gets the value of the extension property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the extension property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getExtension().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link ExtensionType }
-     * 
-     * 
-     */
-    public List<ExtensionType> getExtension() {
-        if (extension == null) {
-            extension = new ArrayList<ExtensionType>();
-        }
-        return this.extension;
-    }
-
-}

Deleted: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/generated/PasswordType.java
===================================================================
--- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/generated/PasswordType.java	2011-02-04 22:44:25 UTC (rev 735)
+++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/generated/PasswordType.java	2011-02-04 22:45:33 UTC (rev 736)
@@ -1,195 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.1-661 
-// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2008.12.08 at 05:45:20 PM CST 
-//
-
-
-package org.picketlink.identity.federation.saml.v2.generated;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlSeeAlso;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>Java class for PasswordType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained within this class.
- * 
- * <pre>
- * &lt;complexType name="PasswordType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       &lt;sequence>
- *         &lt;element ref="{}Length" minOccurs="0"/>
- *         &lt;element ref="{}Alphabet" minOccurs="0"/>
- *         &lt;element ref="{}Generation" minOccurs="0"/>
- *         &lt;element ref="{}Extension" maxOccurs="unbounded" minOccurs="0"/>
- *       &lt;/sequence>
- *       &lt;attribute name="ExternalVerification" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
- at XmlAccessorType(XmlAccessType.FIELD)
- at XmlType(name = "PasswordType", propOrder = {
-    "length",
-    "alphabet",
-    "generation",
-    "extension"
-})
- at XmlSeeAlso({
-    RestrictedPasswordType.class
-})
-public class PasswordType {
-
-    @XmlElement(name = "Length")
-    protected LengthType length;
-    @XmlElement(name = "Alphabet")
-    protected AlphabetType alphabet;
-    @XmlElement(name = "Generation")
-    protected Generation generation;
-    @XmlElement(name = "Extension")
-    protected List<ExtensionType> extension;
-    @XmlAttribute(name = "ExternalVerification")
-    @XmlSchemaType(name = "anyURI")
-    protected String externalVerification;
-
-    /**
-     * Gets the value of the length property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link LengthType }
-     *     
-     */
-    public LengthType getLength() {
-        return length;
-    }
-
-    /**
-     * Sets the value of the length property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link LengthType }
-     *     
-     */
-    public void setLength(LengthType value) {
-        this.length = value;
-    }
-
-    /**
-     * Gets the value of the alphabet property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link AlphabetType }
-     *     
-     */
-    public AlphabetType getAlphabet() {
-        return alphabet;
-    }
-
-    /**
-     * Sets the value of the alphabet property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link AlphabetType }
-     *     
-     */
-    public void setAlphabet(AlphabetType value) {
-        this.alphabet = value;
-    }
-
-    /**
-     * Gets the value of the generation property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link Generation }
-     *     
-     */
-    public Generation getGeneration() {
-        return generation;
-    }
-
-    /**
-     * Sets the value of the generation property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link Generation }
-     *     
-     */
-    public void setGeneration(Generation value) {
-        this.generation = value;
-    }
-
-    /**
-     * Gets the value of the extension property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the extension property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getExtension().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link ExtensionType }
-     * 
-     * 
-     */
-    public List<ExtensionType> getExtension() {
-        if (extension == null) {
-            extension = new ArrayList<ExtensionType>();
-        }
-        return this.extension;
-    }
-
-    /**
-     * Gets the value of the externalVerification property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getExternalVerification() {
-        return externalVerification;
-    }
-
-    /**
-     * Sets the value of the externalVerification property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setExternalVerification(String value) {
-        this.externalVerification = value;
-    }
-
-}

Deleted: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/generated/PhysicalVerification.java
===================================================================
--- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/generated/PhysicalVerification.java	2011-02-04 22:44:25 UTC (rev 735)
+++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/generated/PhysicalVerification.java	2011-02-04 22:45:33 UTC (rev 736)
@@ -1,77 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.1-661 
-// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2008.12.08 at 05:45:20 PM CST 
-//
-
-
-package org.picketlink.identity.federation.saml.v2.generated;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
-import javax.xml.bind.annotation.adapters.CollapsedStringAdapter;
-import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
-
-
-/**
- * <p>Java class for anonymous complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained within this class.
- * 
- * <pre>
- * &lt;complexType>
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       &lt;attribute name="credentialLevel">
- *         &lt;simpleType>
- *           &lt;restriction base="{http://www.w3.org/2001/XMLSchema}NMTOKEN">
- *             &lt;enumeration value="primary"/>
- *             &lt;enumeration value="secondary"/>
- *           &lt;/restriction>
- *         &lt;/simpleType>
- *       &lt;/attribute>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
- at XmlAccessorType(XmlAccessType.FIELD)
- at XmlType(name = "")
- at XmlRootElement(name = "PhysicalVerification")
-public class PhysicalVerification {
-
-    @XmlAttribute
-    @XmlJavaTypeAdapter(CollapsedStringAdapter.class)
-    protected String credentialLevel;
-
-    /**
-     * Gets the value of the credentialLevel property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getCredentialLevel() {
-        return credentialLevel;
-    }
-
-    /**
-     * Sets the value of the credentialLevel property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setCredentialLevel(String value) {
-        this.credentialLevel = value;
-    }
-
-}

Deleted: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/generated/PrincipalAuthenticationMechanismType.java
===================================================================
--- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/generated/PrincipalAuthenticationMechanismType.java	2011-02-04 22:44:25 UTC (rev 735)
+++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/generated/PrincipalAuthenticationMechanismType.java	2011-02-04 22:45:33 UTC (rev 736)
@@ -1,246 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.1-661 
-// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2008.12.08 at 05:45:20 PM CST 
-//
-
-
-package org.picketlink.identity.federation.saml.v2.generated;
-
-import java.math.BigInteger;
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>Java class for PrincipalAuthenticationMechanismType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained within this class.
- * 
- * <pre>
- * &lt;complexType name="PrincipalAuthenticationMechanismType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       &lt;sequence>
- *         &lt;element ref="{}Password" minOccurs="0"/>
- *         &lt;element ref="{}RestrictedPassword" minOccurs="0"/>
- *         &lt;element ref="{}Token" minOccurs="0"/>
- *         &lt;element ref="{}Smartcard" minOccurs="0"/>
- *         &lt;element ref="{}ActivationPin" minOccurs="0"/>
- *         &lt;element ref="{}Extension" maxOccurs="unbounded" minOccurs="0"/>
- *       &lt;/sequence>
- *       &lt;attribute name="preauth" type="{http://www.w3.org/2001/XMLSchema}integer" />
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
- at XmlAccessorType(XmlAccessType.FIELD)
- at XmlType(name = "PrincipalAuthenticationMechanismType", propOrder = {
-    "password",
-    "restrictedPassword",
-    "token",
-    "smartcard",
-    "activationPin",
-    "extension"
-})
-public class PrincipalAuthenticationMechanismType {
-
-    @XmlElement(name = "Password")
-    protected PasswordType password;
-    @XmlElement(name = "RestrictedPassword")
-    protected RestrictedPasswordType restrictedPassword;
-    @XmlElement(name = "Token")
-    protected TokenType token;
-    @XmlElement(name = "Smartcard")
-    protected ExtensionOnlyType smartcard;
-    @XmlElement(name = "ActivationPin")
-    protected ActivationPinType activationPin;
-    @XmlElement(name = "Extension")
-    protected List<ExtensionType> extension;
-    @XmlAttribute
-    protected BigInteger preauth;
-
-    /**
-     * Gets the value of the password property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link PasswordType }
-     *     
-     */
-    public PasswordType getPassword() {
-        return password;
-    }
-
-    /**
-     * Sets the value of the password property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link PasswordType }
-     *     
-     */
-    public void setPassword(PasswordType value) {
-        this.password = value;
-    }
-
-    /**
-     * Gets the value of the restrictedPassword property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link RestrictedPasswordType }
-     *     
-     */
-    public RestrictedPasswordType getRestrictedPassword() {
-        return restrictedPassword;
-    }
-
-    /**
-     * Sets the value of the restrictedPassword property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link RestrictedPasswordType }
-     *     
-     */
-    public void setRestrictedPassword(RestrictedPasswordType value) {
-        this.restrictedPassword = value;
-    }
-
-    /**
-     * Gets the value of the token property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link TokenType }
-     *     
-     */
-    public TokenType getToken() {
-        return token;
-    }
-
-    /**
-     * Sets the value of the token property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link TokenType }
-     *     
-     */
-    public void setToken(TokenType value) {
-        this.token = value;
-    }
-
-    /**
-     * Gets the value of the smartcard property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link ExtensionOnlyType }
-     *     
-     */
-    public ExtensionOnlyType getSmartcard() {
-        return smartcard;
-    }
-
-    /**
-     * Sets the value of the smartcard property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link ExtensionOnlyType }
-     *     
-     */
-    public void setSmartcard(ExtensionOnlyType value) {
-        this.smartcard = value;
-    }
-
-    /**
-     * Gets the value of the activationPin property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link ActivationPinType }
-     *     
-     */
-    public ActivationPinType getActivationPin() {
-        return activationPin;
-    }
-
-    /**
-     * Sets the value of the activationPin property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link ActivationPinType }
-     *     
-     */
-    public void setActivationPin(ActivationPinType value) {
-        this.activationPin = value;
-    }
-
-    /**
-     * Gets the value of the extension property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the extension property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getExtension().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link ExtensionType }
-     * 
-     * 
-     */
-    public List<ExtensionType> getExtension() {
-        if (extension == null) {
-            extension = new ArrayList<ExtensionType>();
-        }
-        return this.extension;
-    }
-
-    /**
-     * Gets the value of the preauth property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link BigInteger }
-     *     
-     */
-    public BigInteger getPreauth() {
-        return preauth;
-    }
-
-    /**
-     * Sets the value of the preauth property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link BigInteger }
-     *     
-     */
-    public void setPreauth(BigInteger value) {
-        this.preauth = value;
-    }
-
-}

Deleted: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/generated/PrivateKeyProtectionType.java
===================================================================
--- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/generated/PrivateKeyProtectionType.java	2011-02-04 22:44:25 UTC (rev 735)
+++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/generated/PrivateKeyProtectionType.java	2011-02-04 22:45:33 UTC (rev 736)
@@ -1,161 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.1-661 
-// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2008.12.08 at 05:45:20 PM CST 
-//
-
-
-package org.picketlink.identity.federation.saml.v2.generated;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>Java class for PrivateKeyProtectionType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained within this class.
- * 
- * <pre>
- * &lt;complexType name="PrivateKeyProtectionType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       &lt;sequence>
- *         &lt;element ref="{}KeyActivation" minOccurs="0"/>
- *         &lt;element ref="{}KeyStorage" minOccurs="0"/>
- *         &lt;element ref="{}KeySharing" minOccurs="0"/>
- *         &lt;element ref="{}Extension" maxOccurs="unbounded" minOccurs="0"/>
- *       &lt;/sequence>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
- at XmlAccessorType(XmlAccessType.FIELD)
- at XmlType(name = "PrivateKeyProtectionType", propOrder = {
-    "keyActivation",
-    "keyStorage",
-    "keySharing",
-    "extension"
-})
-public class PrivateKeyProtectionType {
-
-    @XmlElement(name = "KeyActivation")
-    protected KeyActivationType keyActivation;
-    @XmlElement(name = "KeyStorage")
-    protected KeyStorageType keyStorage;
-    @XmlElement(name = "KeySharing")
-    protected KeySharingType keySharing;
-    @XmlElement(name = "Extension")
-    protected List<ExtensionType> extension;
-
-    /**
-     * Gets the value of the keyActivation property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link KeyActivationType }
-     *     
-     */
-    public KeyActivationType getKeyActivation() {
-        return keyActivation;
-    }
-
-    /**
-     * Sets the value of the keyActivation property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link KeyActivationType }
-     *     
-     */
-    public void setKeyActivation(KeyActivationType value) {
-        this.keyActivation = value;
-    }
-
-    /**
-     * Gets the value of the keyStorage property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link KeyStorageType }
-     *     
-     */
-    public KeyStorageType getKeyStorage() {
-        return keyStorage;
-    }
-
-    /**
-     * Sets the value of the keyStorage property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link KeyStorageType }
-     *     
-     */
-    public void setKeyStorage(KeyStorageType value) {
-        this.keyStorage = value;
-    }
-
-    /**
-     * Gets the value of the keySharing property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link KeySharingType }
-     *     
-     */
-    public KeySharingType getKeySharing() {
-        return keySharing;
-    }
-
-    /**
-     * Sets the value of the keySharing property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link KeySharingType }
-     *     
-     */
-    public void setKeySharing(KeySharingType value) {
-        this.keySharing = value;
-    }
-
-    /**
-     * Gets the value of the extension property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the extension property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getExtension().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link ExtensionType }
-     * 
-     * 
-     */
-    public List<ExtensionType> getExtension() {
-        if (extension == null) {
-            extension = new ArrayList<ExtensionType>();
-        }
-        return this.extension;
-    }
-
-}

Deleted: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/generated/PublicKeyType.java
===================================================================
--- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/generated/PublicKeyType.java	2011-02-04 22:44:25 UTC (rev 735)
+++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/generated/PublicKeyType.java	2011-02-04 22:45:33 UTC (rev 736)
@@ -1,107 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.1-661 
-// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2008.12.08 at 05:45:20 PM CST 
-//
-
-
-package org.picketlink.identity.federation.saml.v2.generated;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>Java class for PublicKeyType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained within this class.
- * 
- * <pre>
- * &lt;complexType name="PublicKeyType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       &lt;sequence>
- *         &lt;element ref="{}Extension" maxOccurs="unbounded" minOccurs="0"/>
- *       &lt;/sequence>
- *       &lt;attribute name="keyValidation" type="{http://www.w3.org/2001/XMLSchema}anySimpleType" />
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
- at XmlAccessorType(XmlAccessType.FIELD)
- at XmlType(name = "PublicKeyType", propOrder = {
-    "extension"
-})
-public class PublicKeyType {
-
-    @XmlElement(name = "Extension")
-    protected List<ExtensionType> extension;
-    @XmlAttribute
-    @XmlSchemaType(name = "anySimpleType")
-    protected String keyValidation;
-
-    /**
-     * Gets the value of the extension property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the extension property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getExtension().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link ExtensionType }
-     * 
-     * 
-     */
-    public List<ExtensionType> getExtension() {
-        if (extension == null) {
-            extension = new ArrayList<ExtensionType>();
-        }
-        return this.extension;
-    }
-
-    /**
-     * Gets the value of the keyValidation property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getKeyValidation() {
-        return keyValidation;
-    }
-
-    /**
-     * Sets the value of the keyValidation property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setKeyValidation(String value) {
-        this.keyValidation = value;
-    }
-
-}

Deleted: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/generated/RestrictedLengthType.java
===================================================================
--- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/generated/RestrictedLengthType.java	2011-02-04 22:44:25 UTC (rev 735)
+++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/generated/RestrictedLengthType.java	2011-02-04 22:45:33 UTC (rev 736)
@@ -1,47 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.1-661 
-// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2008.12.08 at 05:45:20 PM CST 
-//
-
-
-package org.picketlink.identity.federation.saml.v2.generated;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>Java class for RestrictedLengthType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained within this class.
- * 
- * <pre>
- * &lt;complexType name="RestrictedLengthType">
- *   &lt;complexContent>
- *     &lt;restriction base="{}LengthType">
- *       &lt;attribute name="min" use="required">
- *         &lt;simpleType>
- *           &lt;restriction base="{http://www.w3.org/2001/XMLSchema}integer">
- *             &lt;minInclusive value="3"/>
- *           &lt;/restriction>
- *         &lt;/simpleType>
- *       &lt;/attribute>
- *       &lt;attribute name="max" type="{http://www.w3.org/2001/XMLSchema}integer" />
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
- at XmlAccessorType(XmlAccessType.FIELD)
- at XmlType(name = "RestrictedLengthType")
-public class RestrictedLengthType
-    extends LengthType
-{
-
-
-}

Deleted: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/generated/RestrictedPasswordType.java
===================================================================
--- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/generated/RestrictedPasswordType.java	2011-02-04 22:44:25 UTC (rev 735)
+++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/generated/RestrictedPasswordType.java	2011-02-04 22:45:33 UTC (rev 736)
@@ -1,45 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.1-661 
-// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2008.12.08 at 05:45:20 PM CST 
-//
-
-
-package org.picketlink.identity.federation.saml.v2.generated;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>Java class for RestrictedPasswordType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained within this class.
- * 
- * <pre>
- * &lt;complexType name="RestrictedPasswordType">
- *   &lt;complexContent>
- *     &lt;restriction base="{}PasswordType">
- *       &lt;sequence>
- *         &lt;element name="Length" type="{}RestrictedLengthType"/>
- *         &lt;element ref="{}Generation" minOccurs="0"/>
- *         &lt;element ref="{}Extension" maxOccurs="unbounded" minOccurs="0"/>
- *       &lt;/sequence>
- *       &lt;attribute name="ExternalVerification" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
- at XmlAccessorType(XmlAccessType.FIELD)
- at XmlType(name = "RestrictedPasswordType")
-public class RestrictedPasswordType
-    extends PasswordType
-{
-
-
-}

Deleted: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/generated/SecretKeyProtectionType.java
===================================================================
--- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/generated/SecretKeyProtectionType.java	2011-02-04 22:44:25 UTC (rev 735)
+++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/generated/SecretKeyProtectionType.java	2011-02-04 22:45:33 UTC (rev 736)
@@ -1,133 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.1-661 
-// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2008.12.08 at 05:45:20 PM CST 
-//
-
-
-package org.picketlink.identity.federation.saml.v2.generated;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>Java class for SecretKeyProtectionType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained within this class.
- * 
- * <pre>
- * &lt;complexType name="SecretKeyProtectionType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       &lt;sequence>
- *         &lt;element ref="{}KeyActivation" minOccurs="0"/>
- *         &lt;element ref="{}KeyStorage" minOccurs="0"/>
- *         &lt;element ref="{}Extension" maxOccurs="unbounded" minOccurs="0"/>
- *       &lt;/sequence>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
- at XmlAccessorType(XmlAccessType.FIELD)
- at XmlType(name = "SecretKeyProtectionType", propOrder = {
-    "keyActivation",
-    "keyStorage",
-    "extension"
-})
-public class SecretKeyProtectionType {
-
-    @XmlElement(name = "KeyActivation")
-    protected KeyActivationType keyActivation;
-    @XmlElement(name = "KeyStorage")
-    protected KeyStorageType keyStorage;
-    @XmlElement(name = "Extension")
-    protected List<ExtensionType> extension;
-
-    /**
-     * Gets the value of the keyActivation property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link KeyActivationType }
-     *     
-     */
-    public KeyActivationType getKeyActivation() {
-        return keyActivation;
-    }
-
-    /**
-     * Sets the value of the keyActivation property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link KeyActivationType }
-     *     
-     */
-    public void setKeyActivation(KeyActivationType value) {
-        this.keyActivation = value;
-    }
-
-    /**
-     * Gets the value of the keyStorage property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link KeyStorageType }
-     *     
-     */
-    public KeyStorageType getKeyStorage() {
-        return keyStorage;
-    }
-
-    /**
-     * Sets the value of the keyStorage property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link KeyStorageType }
-     *     
-     */
-    public void setKeyStorage(KeyStorageType value) {
-        this.keyStorage = value;
-    }
-
-    /**
-     * Gets the value of the extension property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the extension property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getExtension().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link ExtensionType }
-     * 
-     * 
-     */
-    public List<ExtensionType> getExtension() {
-        if (extension == null) {
-            extension = new ArrayList<ExtensionType>();
-        }
-        return this.extension;
-    }
-
-}

Deleted: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/generated/SecurityAuditType.java
===================================================================
--- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/generated/SecurityAuditType.java	2011-02-04 22:44:25 UTC (rev 735)
+++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/generated/SecurityAuditType.java	2011-02-04 22:45:33 UTC (rev 736)
@@ -1,105 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.1-661 
-// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2008.12.08 at 05:45:20 PM CST 
-//
-
-
-package org.picketlink.identity.federation.saml.v2.generated;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>Java class for SecurityAuditType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained within this class.
- * 
- * <pre>
- * &lt;complexType name="SecurityAuditType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       &lt;sequence>
- *         &lt;element ref="{}SwitchAudit" minOccurs="0"/>
- *         &lt;element ref="{}Extension" maxOccurs="unbounded" minOccurs="0"/>
- *       &lt;/sequence>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
- at XmlAccessorType(XmlAccessType.FIELD)
- at XmlType(name = "SecurityAuditType", propOrder = {
-    "switchAudit",
-    "extension"
-})
-public class SecurityAuditType {
-
-    @XmlElement(name = "SwitchAudit")
-    protected ExtensionOnlyType switchAudit;
-    @XmlElement(name = "Extension")
-    protected List<ExtensionType> extension;
-
-    /**
-     * Gets the value of the switchAudit property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link ExtensionOnlyType }
-     *     
-     */
-    public ExtensionOnlyType getSwitchAudit() {
-        return switchAudit;
-    }
-
-    /**
-     * Sets the value of the switchAudit property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link ExtensionOnlyType }
-     *     
-     */
-    public void setSwitchAudit(ExtensionOnlyType value) {
-        this.switchAudit = value;
-    }
-
-    /**
-     * Gets the value of the extension property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the extension property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getExtension().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link ExtensionType }
-     * 
-     * 
-     */
-    public List<ExtensionType> getExtension() {
-        if (extension == null) {
-            extension = new ArrayList<ExtensionType>();
-        }
-        return this.extension;
-    }
-
-}

Deleted: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/generated/SharedSecretChallengeResponseType.java
===================================================================
--- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/generated/SharedSecretChallengeResponseType.java	2011-02-04 22:44:25 UTC (rev 735)
+++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/generated/SharedSecretChallengeResponseType.java	2011-02-04 22:45:33 UTC (rev 736)
@@ -1,113 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.1-661 
-// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2008.12.08 at 05:45:20 PM CST 
-//
-
-
-package org.picketlink.identity.federation.saml.v2.generated;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlSchemaType;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * 
- *         This element indicates that the Principal has been
- *         authenticated by a challenge-response protocol utilizing shared secret
- *         keys and symmetric cryptography.
- *       
- * 
- * <p>Java class for SharedSecretChallengeResponseType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained within this class.
- * 
- * <pre>
- * &lt;complexType name="SharedSecretChallengeResponseType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       &lt;sequence>
- *         &lt;element ref="{}Extension" maxOccurs="unbounded" minOccurs="0"/>
- *       &lt;/sequence>
- *       &lt;attribute name="method" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
- at XmlAccessorType(XmlAccessType.FIELD)
- at XmlType(name = "SharedSecretChallengeResponseType", propOrder = {
-    "extension"
-})
-public class SharedSecretChallengeResponseType {
-
-    @XmlElement(name = "Extension")
-    protected List<ExtensionType> extension;
-    @XmlAttribute
-    @XmlSchemaType(name = "anyURI")
-    protected String method;
-
-    /**
-     * Gets the value of the extension property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the extension property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getExtension().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link ExtensionType }
-     * 
-     * 
-     */
-    public List<ExtensionType> getExtension() {
-        if (extension == null) {
-            extension = new ArrayList<ExtensionType>();
-        }
-        return this.extension;
-    }
-
-    /**
-     * Gets the value of the method property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getMethod() {
-        return method;
-    }
-
-    /**
-     * Sets the value of the method property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setMethod(String value) {
-        this.method = value;
-    }
-
-}

Deleted: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/generated/TechnicalProtectionBaseType.java
===================================================================
--- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/generated/TechnicalProtectionBaseType.java	2011-02-04 22:44:25 UTC (rev 735)
+++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/generated/TechnicalProtectionBaseType.java	2011-02-04 22:45:33 UTC (rev 736)
@@ -1,135 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.1-661 
-// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2008.12.08 at 05:45:20 PM CST 
-//
-
-
-package org.picketlink.identity.federation.saml.v2.generated;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>Java class for TechnicalProtectionBaseType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained within this class.
- * 
- * <pre>
- * &lt;complexType name="TechnicalProtectionBaseType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       &lt;sequence>
- *         &lt;choice minOccurs="0">
- *           &lt;element ref="{}PrivateKeyProtection"/>
- *           &lt;element ref="{}SecretKeyProtection"/>
- *         &lt;/choice>
- *         &lt;element ref="{}Extension" maxOccurs="unbounded" minOccurs="0"/>
- *       &lt;/sequence>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
- at XmlAccessorType(XmlAccessType.FIELD)
- at XmlType(name = "TechnicalProtectionBaseType", propOrder = {
-    "privateKeyProtection",
-    "secretKeyProtection",
-    "extension"
-})
-public class TechnicalProtectionBaseType {
-
-    @XmlElement(name = "PrivateKeyProtection")
-    protected PrivateKeyProtectionType privateKeyProtection;
-    @XmlElement(name = "SecretKeyProtection")
-    protected SecretKeyProtectionType secretKeyProtection;
-    @XmlElement(name = "Extension")
-    protected List<ExtensionType> extension;
-
-    /**
-     * Gets the value of the privateKeyProtection property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link PrivateKeyProtectionType }
-     *     
-     */
-    public PrivateKeyProtectionType getPrivateKeyProtection() {
-        return privateKeyProtection;
-    }
-
-    /**
-     * Sets the value of the privateKeyProtection property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link PrivateKeyProtectionType }
-     *     
-     */
-    public void setPrivateKeyProtection(PrivateKeyProtectionType value) {
-        this.privateKeyProtection = value;
-    }
-
-    /**
-     * Gets the value of the secretKeyProtection property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link SecretKeyProtectionType }
-     *     
-     */
-    public SecretKeyProtectionType getSecretKeyProtection() {
-        return secretKeyProtection;
-    }
-
-    /**
-     * Sets the value of the secretKeyProtection property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link SecretKeyProtectionType }
-     *     
-     */
-    public void setSecretKeyProtection(SecretKeyProtectionType value) {
-        this.secretKeyProtection = value;
-    }
-
-    /**
-     * Gets the value of the extension property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the extension property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getExtension().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link ExtensionType }
-     * 
-     * 
-     */
-    public List<ExtensionType> getExtension() {
-        if (extension == null) {
-            extension = new ArrayList<ExtensionType>();
-        }
-        return this.extension;
-    }
-
-}

Deleted: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/generated/TimeSyncTokenType.java
===================================================================
--- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/generated/TimeSyncTokenType.java	2011-02-04 22:44:25 UTC (rev 735)
+++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/generated/TimeSyncTokenType.java	2011-02-04 22:45:33 UTC (rev 736)
@@ -1,121 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.1-661 
-// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2008.12.08 at 05:45:20 PM CST 
-//
-
-
-package org.picketlink.identity.federation.saml.v2.generated;
-
-import java.math.BigInteger;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>Java class for TimeSyncTokenType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained within this class.
- * 
- * <pre>
- * &lt;complexType name="TimeSyncTokenType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       &lt;attribute name="DeviceType" use="required" type="{}DeviceTypeType" />
- *       &lt;attribute name="SeedLength" use="required" type="{http://www.w3.org/2001/XMLSchema}integer" />
- *       &lt;attribute name="DeviceInHand" use="required" type="{}booleanType" />
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
- at XmlAccessorType(XmlAccessType.FIELD)
- at XmlType(name = "TimeSyncTokenType")
-public class TimeSyncTokenType {
-
-    @XmlAttribute(name = "DeviceType", required = true)
-    protected DeviceTypeType deviceType;
-    @XmlAttribute(name = "SeedLength", required = true)
-    protected BigInteger seedLength;
-    @XmlAttribute(name = "DeviceInHand", required = true)
-    protected BooleanType deviceInHand;
-
-    /**
-     * Gets the value of the deviceType property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link DeviceTypeType }
-     *     
-     */
-    public DeviceTypeType getDeviceType() {
-        return deviceType;
-    }
-
-    /**
-     * Sets the value of the deviceType property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link DeviceTypeType }
-     *     
-     */
-    public void setDeviceType(DeviceTypeType value) {
-        this.deviceType = value;
-    }
-
-    /**
-     * Gets the value of the seedLength property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link BigInteger }
-     *     
-     */
-    public BigInteger getSeedLength() {
-        return seedLength;
-    }
-
-    /**
-     * Sets the value of the seedLength property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link BigInteger }
-     *     
-     */
-    public void setSeedLength(BigInteger value) {
-        this.seedLength = value;
-    }
-
-    /**
-     * Gets the value of the deviceInHand property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link BooleanType }
-     *     
-     */
-    public BooleanType getDeviceInHand() {
-        return deviceInHand;
-    }
-
-    /**
-     * Sets the value of the deviceInHand property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link BooleanType }
-     *     
-     */
-    public void setDeviceInHand(BooleanType value) {
-        this.deviceInHand = value;
-    }
-
-}

Deleted: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/generated/TokenType.java
===================================================================
--- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/generated/TokenType.java	2011-02-04 22:44:25 UTC (rev 735)
+++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/generated/TokenType.java	2011-02-04 22:45:33 UTC (rev 736)
@@ -1,105 +0,0 @@
-//
-// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vhudson-jaxb-ri-2.1-661 
-// See <a href="http://java.sun.com/xml/jaxb">http://java.sun.com/xml/jaxb</a> 
-// Any modifications to this file will be lost upon recompilation of the source schema. 
-// Generated on: 2008.12.08 at 05:45:20 PM CST 
-//
-
-
-package org.picketlink.identity.federation.saml.v2.generated;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.xml.bind.annotation.XmlAccessType;
-import javax.xml.bind.annotation.XmlAccessorType;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlType;
-
-
-/**
- * <p>Java class for TokenType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained within this class.
- * 
- * <pre>
- * &lt;complexType name="TokenType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       &lt;sequence>
- *         &lt;element ref="{}TimeSyncToken"/>
- *         &lt;element ref="{}Extension" maxOccurs="unbounded" minOccurs="0"/>
- *       &lt;/sequence>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
- at XmlAccessorType(XmlAccessType.FIELD)
- at XmlType(name = "TokenType", propOrder = {
-    "timeSyncToken",
-    "extension"
-})
-public class TokenType {
-
-    @XmlElement(name = "TimeSyncToken", required = true)
-    protected TimeSyncTokenType timeSyncToken;
-    @XmlElement(name = "Extension")
-    protected List<ExtensionType> extension;
-
-    /**
-     * Gets the value of the timeSyncToken property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link TimeSyncTokenType }
-     *     
-     */
-    public TimeSyncTokenType getTimeSyncToken() {
-        return timeSyncToken;
-    }
-
-    /**
-     * Sets the value of the timeSyncToken property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link TimeSyncTokenType }
-     *     
-     */
-    public void setTimeSyncToken(TimeSyncTokenType value) {
-        this.timeSyncToken = value;
-    }
-
-    /**
-     * Gets the value of the extension property.
-     * 
-     * <p>
-     * This accessor method returns a reference to the live list,
-     * not a snapshot. Therefore any modification you make to the
-     * returned list will be present inside the JAXB object.
-     * This is why there is not a <CODE>set</CODE> method for the extension property.
-     * 
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getExtension().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link ExtensionType }
-     * 
-     * 
-     */
-    public List<ExtensionType> getExtension() {
-        if (extension == null) {
-            extension = new ArrayList<ExtensionType>();
-        }
-        return this.extension;
-    }
-
-}

Deleted: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/generated/runtime/ZeroOneBooleanAdapter.java
===================================================================
--- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/generated/runtime/ZeroOneBooleanAdapter.java	2011-02-04 22:44:25 UTC (rev 735)
+++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/generated/runtime/ZeroOneBooleanAdapter.java	2011-02-04 22:45:33 UTC (rev 736)
@@ -1,62 +0,0 @@
-/*
- * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
- * 
- * Copyright 1997-2007 Sun Microsystems, Inc. All rights reserved.
- * 
- * The contents of this file are subject to the terms of either the GNU
- * General Public License Version 2 only ("GPL") or the Common Development
- * and Distribution License("CDDL") (collectively, the "License").  You
- * may not use this file except in compliance with the License. You can obtain
- * a copy of the License at https://glassfish.dev.java.net/public/CDDL+GPL.html
- * or glassfish/bootstrap/legal/LICENSE.txt.  See the License for the specific
- * language governing permissions and limitations under the License.
- * 
- * When distributing the software, include this License Header Notice in each
- * file and include the License file at glassfish/bootstrap/legal/LICENSE.txt.
- * Sun designates this particular file as subject to the "Classpath" exception
- * as provided by Sun in the GPL Version 2 section of the License file that
- * accompanied this code.  If applicable, add the following below the License
- * Header, with the fields enclosed by brackets [] replaced by your own
- * identifying information: "Portions Copyrighted [year]
- * [name of copyright owner]"
- * 
- * Contributor(s):
- * 
- * If you wish your version of this file to be governed by only the CDDL or
- * only the GPL Version 2, indicate your decision by adding "[Contributor]
- * elects to include this software in this distribution under the [CDDL or GPL
- * Version 2] license."  If you don't indicate a single choice of license, a
- * recipient has the option to distribute your version of this file under
- * either the CDDL, the GPL Version 2 or to extend the choice of license to
- * its licensees as provided above.  However, if you add GPL Version 2 code
- * and therefore, elected the GPL Version 2 license, then the option applies
- * only if the new code is made subject to such option by the copyright
- * holder.
- */
-
-package org.picketlink.identity.federation.saml.v2.generated.runtime;
-
-import javax.xml.bind.DatatypeConverter;
-import javax.xml.bind.annotation.adapters.XmlAdapter;
-
-/**
- * Serializes <tt>boolean</tt> as 0 or 1.
- *
- * @author Kohsuke Kawaguchi
- * @since 2.0
- */
-public class ZeroOneBooleanAdapter extends XmlAdapter<String,Boolean> {
-    public Boolean unmarshal(String v) {
-        if(v==null)     return null;
-        return DatatypeConverter.parseBoolean(v);
-    }
-
-    public String marshal(Boolean v) {
-        if(v==null)     return null;
-        if(v) {
-            return "1";
-        } else {
-            return "0";
-        }
-    }
-}

Modified: federation/trunk/picketlink-web/src/main/java/org/picketlink/identity/federation/web/util/ConfigurationUtil.java
===================================================================
--- federation/trunk/picketlink-web/src/main/java/org/picketlink/identity/federation/web/util/ConfigurationUtil.java	2011-02-04 22:44:25 UTC (rev 735)
+++ federation/trunk/picketlink-web/src/main/java/org/picketlink/identity/federation/web/util/ConfigurationUtil.java	2011-02-04 22:45:33 UTC (rev 736)
@@ -21,19 +21,13 @@
  */
 package org.picketlink.identity.federation.web.util;
 
-import java.io.IOException;
 import java.io.InputStream;
 
-import javax.xml.bind.JAXBElement;
-import javax.xml.bind.JAXBException;
-import javax.xml.bind.Unmarshaller;
-
 import org.picketlink.identity.federation.core.config.IDPType;
 import org.picketlink.identity.federation.core.config.SPType;
-import org.picketlink.identity.federation.core.constants.PicketLinkFederationConstants;
+import org.picketlink.identity.federation.core.exceptions.ParsingException;
 import org.picketlink.identity.federation.core.handler.config.Handlers;
-import org.picketlink.identity.federation.core.util.JAXBUtil;
-import org.xml.sax.SAXException;
+import org.picketlink.identity.federation.core.parsers.config.SAMLConfigParser;
 
 /**
  * Deals with Configuration
@@ -46,22 +40,22 @@
     * Get the IDP Configuration
     * from the passed configuration
     * @param is
-    * @return
-    * @throws JAXBException
-    * @throws SAXException
-    * @throws IOException
-    */
-   @SuppressWarnings("unchecked")
-   public static IDPType getIDPConfiguration(InputStream is) throws JAXBException, SAXException, IOException  
+    * @return 
+    * @throws ParsingException 
+    */ 
+   public static IDPType getIDPConfiguration(InputStream is) throws ParsingException  
    {
       if(is == null)
          throw new IllegalArgumentException("inputstream is null");
-      String schema = PicketLinkFederationConstants.SCHEMA_IDFED;
+      /*String schema = PicketLinkFederationConstants.SCHEMA_IDFED;
       
       Unmarshaller un = getUnmarshaller(schema);
       
       JAXBElement<IDPType> jaxbSp =  (JAXBElement<IDPType>) un.unmarshal(is);
-      return jaxbSp.getValue(); 
+      return jaxbSp.getValue(); */
+      
+      SAMLConfigParser parser = new SAMLConfigParser();
+      return (IDPType) parser.parse(is);
    }
 
    
@@ -69,60 +63,40 @@
     * Get the SP Configuration from the
     * passed inputstream
     * @param is
-    * @return
-    * @throws JAXBException
-    * @throws SAXException
-    * @throws IOException
-    */
-   @SuppressWarnings("unchecked")
-   public static SPType getSPConfiguration(InputStream is) throws JAXBException, SAXException, IOException  
+    * @return 
+    * @throws ParsingException 
+    */ 
+   public static SPType getSPConfiguration(InputStream is) throws ParsingException  
    {
       if(is == null)
          throw new IllegalArgumentException("inputstream is null");
+      /*
       String schema = PicketLinkFederationConstants.SCHEMA_IDFED;
       
       Unmarshaller un = getUnmarshaller(schema);
       
       JAXBElement<SPType> jaxbSp =  (JAXBElement<SPType>) un.unmarshal(is);
       return jaxbSp.getValue(); 
+      */
+      return (SPType) (new SAMLConfigParser()).parse(is);
    }
    
    /**
     * Get the Handlers from the configuration
     * @param is
-    * @return
-    * @throws JAXBException
-    * @throws SAXException
-    * @throws IOException
+    * @return 
+    * @throws ParsingException 
     */
-   @SuppressWarnings("unchecked")
-   public static Handlers getHandlers(InputStream is) throws JAXBException, SAXException, IOException
+   public static Handlers getHandlers(InputStream is) throws ParsingException
    {
       if(is == null)
-         throw new IllegalArgumentException("inputstream is null");
+         throw new IllegalArgumentException("inputstream is null");/*
       String[] schemas = new String[] { PicketLinkFederationConstants.SCHEMA_IDFED,
     		  PicketLinkFederationConstants.SCHEMA_IDFED_HANDLER};
 
       Unmarshaller un = getUnmarshaller(schemas);
       JAXBElement<Handlers> handlers = (JAXBElement<Handlers>) un.unmarshal(is);
-      return handlers.getValue(); 
+      return handlers.getValue(); */
+      return (Handlers) (new SAMLConfigParser()).parse(is);
    }
-   
-
-   private static Unmarshaller getUnmarshaller(String... schema) throws JAXBException, SAXException, IOException
-   {
-      String key = PicketLinkFederationConstants.JAXB_SCHEMA_VALIDATION;
-      boolean validate = Boolean.parseBoolean(SecurityActions.getSystemProperty(key, "false"));
-      
-      String[] pkgName =  new String[] { IDPType.class.getPackage().getName(),
-            Handlers.class.getPackage().getName()    
-      } ; 
-      
-      Unmarshaller un = null;
-      if(validate)
-         un = JAXBUtil.getValidatingUnmarshaller(pkgName, schema);
-      else
-         un = JAXBUtil.getUnmarshaller(pkgName);
-      return un;
-   }
 }
\ No newline at end of file

Modified: federation/trunk/picketlink-web/src/test/resources/saml2/logout/idp/WEB-INF/picketlink-idfed.xml
===================================================================
--- federation/trunk/picketlink-web/src/test/resources/saml2/logout/idp/WEB-INF/picketlink-idfed.xml	2011-02-04 22:44:25 UTC (rev 735)
+++ federation/trunk/picketlink-web/src/test/resources/saml2/logout/idp/WEB-INF/picketlink-idfed.xml	2011-02-04 22:45:33 UTC (rev 736)
@@ -1,5 +1,5 @@
 <PicketLinkIDP xmlns="urn:picketlink:identity-federation:config:1.0" 
-  AttributeManager=""
+  AttributeManager="org.picketlink.identity.federation.core.impl.EmptyAttributeManager"
   RoleGenerator="org.picketlink.identity.federation.core.impl.EmptyRoleGenerator">
 <IdentityURL>http://localhost:8080/idp/</IdentityURL> 
 <Trust>

Modified: federation/trunk/picketlink-web/src/test/resources/saml2/logout/sp/employee/WEB-INF/picketlink-idfed.xml
===================================================================
--- federation/trunk/picketlink-web/src/test/resources/saml2/logout/sp/employee/WEB-INF/picketlink-idfed.xml	2011-02-04 22:44:25 UTC (rev 735)
+++ federation/trunk/picketlink-web/src/test/resources/saml2/logout/sp/employee/WEB-INF/picketlink-idfed.xml	2011-02-04 22:45:33 UTC (rev 736)
@@ -1,5 +1,5 @@
 <PicketLinkSP xmlns="urn:picketlink:identity-federation:config:1.0" 
-  AttributeManager="">
+  AttributeManager="org.picketlink.identity.federation.core.impl.EmptyAttributeManager">
 <IdentityURL>http://localhost:8080/idp/</IdentityURL>
 <ServiceURL>http://localhost:8080/employee/</ServiceURL>  
 

Modified: federation/trunk/picketlink-web/src/test/resources/saml2/post/idp/WEB-INF/picketlink-idfed.xml
===================================================================
--- federation/trunk/picketlink-web/src/test/resources/saml2/post/idp/WEB-INF/picketlink-idfed.xml	2011-02-04 22:44:25 UTC (rev 735)
+++ federation/trunk/picketlink-web/src/test/resources/saml2/post/idp/WEB-INF/picketlink-idfed.xml	2011-02-04 22:45:33 UTC (rev 736)
@@ -1,5 +1,5 @@
 <PicketLinkIDP xmlns="urn:picketlink:identity-federation:config:1.0" 
-  AttributeManager="">
+  AttributeManager="org.picketlink.identity.federation.core.impl.EmptyAttributeManager">
 <IdentityURL>http://localhost:8080/idp/</IdentityURL> 
 <Trust>
    <Domains>localhost,jboss.com,jboss.org</Domains>

Modified: federation/trunk/picketlink-web/src/test/resources/saml2/post/sp/employee/WEB-INF/picketlink-idfed.xml
===================================================================
--- federation/trunk/picketlink-web/src/test/resources/saml2/post/sp/employee/WEB-INF/picketlink-idfed.xml	2011-02-04 22:44:25 UTC (rev 735)
+++ federation/trunk/picketlink-web/src/test/resources/saml2/post/sp/employee/WEB-INF/picketlink-idfed.xml	2011-02-04 22:45:33 UTC (rev 736)
@@ -1,5 +1,5 @@
 <PicketLinkSP xmlns="urn:picketlink:identity-federation:config:1.0" 
-  AttributeManager="">
+  AttributeManager="org.picketlink.identity.federation.core.impl.EmptyAttributeManager">
 <IdentityURL>http://localhost:8080/idp/</IdentityURL>
 <ServiceURL>http://localhost:8080/employee/</ServiceURL>  
 



More information about the picketlink-commits mailing list