[jboss-cvs] Picketlink SVN: r1016 - in federation/trunk: picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/parsers/saml and 35 other directories.

Tue Jun 21 16:44:35 EDT 2011

Author: anil.saldhana at jboss.com
Date: 2011-06-21 16:44:33 -0400 (Tue, 21 Jun 2011)
New Revision: 1016

Removed:
   federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/assertion/ActionType.java
   federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/assertion/AdviceType.java
   federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/assertion/AssertionType.java
   federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/assertion/AttributeStatementType.java
   federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/assertion/AttributeType.java
   federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/assertion/AudienceRestrictionType.java
   federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/assertion/AuthnContextClassRefType.java
   federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/assertion/AuthnContextDeclRefType.java
   federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/assertion/AuthnContextDeclType.java
   federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/assertion/AuthnContextType.java
   federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/assertion/AuthnStatementType.java
   federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/assertion/AuthzDecisionStatementType.java
   federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/assertion/BaseIDAbstractType.java
   federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/assertion/ConditionAbstractType.java
   federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/assertion/ConditionsType.java
   federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/assertion/DecisionType.java
   federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/assertion/EncryptedAssertionType.java
   federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/assertion/EncryptedElementType.java
   federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/assertion/EvidenceType.java
   federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/assertion/KeyInfoConfirmationDataType.java
   federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/assertion/NameIDType.java
   federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/assertion/OneTimeUseType.java
   federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/assertion/ProxyRestrictionType.java
   federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/assertion/StatementAbstractType.java
   federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/assertion/SubjectConfirmationDataType.java
   federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/assertion/SubjectConfirmationType.java
   federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/assertion/SubjectLocalityType.java
   federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/assertion/SubjectType.java
   federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/assertion/URIType.java
   federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/assertion/package-info.java
   federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/metadata/AdditionalMetadataLocationType.java
   federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/metadata/AffiliationDescriptorType.java
   federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/metadata/AttributeAuthorityDescriptorType.java
   federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/metadata/AttributeConsumingServiceType.java
   federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/metadata/AuthnAuthorityDescriptorType.java
   federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/metadata/ContactType.java
   federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/metadata/ContactTypeType.java
   federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/metadata/EndpointType.java
   federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/metadata/EntitiesDescriptorType.java
   federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/metadata/EntityDescriptorType.java
   federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/metadata/ExtensionsType.java
   federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/metadata/IDPSSODescriptorType.java
   federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/metadata/IndexedEndpointType.java
   federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/metadata/KeyDescriptorType.java
   federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/metadata/KeyTypes.java
   federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/metadata/LocalizedNameType.java
   federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/metadata/LocalizedURIType.java
   federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/metadata/OrganizationType.java
   federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/metadata/PDPDescriptorType.java
   federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/metadata/RequestedAttributeType.java
   federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/metadata/RoleDescriptorType.java
   federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/metadata/SPSSODescriptorType.java
   federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/metadata/SSODescriptorType.java
   federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/metadata/TypeWithOtherAttributes.java
   federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/metadata/package-info.java
   federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/profiles/xacml/assertion/XACMLAuthzDecisionStatementType.java
   federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/profiles/xacml/assertion/XACMLPolicyStatementType.java
   federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/profiles/xacml/protocol/XACMLAuthzDecisionQueryType.java
   federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/profiles/xacml/protocol/XACMLPolicyQueryType.java
   federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/protocol/ArtifactResolveType.java
   federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/protocol/ArtifactResponseType.java
   federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/protocol/AssertionIDRequestType.java
   federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/protocol/AttributeQueryType.java
   federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/protocol/AuthnContextComparisonType.java
   federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/protocol/AuthnQueryType.java
   federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/protocol/AuthnRequestType.java
   federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/protocol/AuthzDecisionQueryType.java
   federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/protocol/ExtensionsType.java
   federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/protocol/IDPEntryType.java
   federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/protocol/IDPListType.java
   federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/protocol/LogoutRequestType.java
   federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/protocol/ManageNameIDRequestType.java
   federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/protocol/NameIDMappingRequestType.java
   federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/protocol/NameIDMappingResponseType.java
   federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/protocol/NameIDPolicyType.java
   federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/protocol/RequestAbstractType.java
   federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/protocol/RequestedAuthnContextType.java
   federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/protocol/ResponseType.java
   federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/protocol/ScopingType.java
   federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/protocol/StatusCodeType.java
   federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/protocol/StatusDetailType.java
   federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/protocol/StatusResponseType.java
   federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/protocol/StatusType.java
   federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/protocol/SubjectQueryAbstractType.java
   federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/protocol/TerminateType.java
   federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/protocol/package-info.java
Modified:
   federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/factories/XACMLContextFactory.java
   federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/parsers/saml/SAMLAssertionParser.java
   federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/parsers/saml/SAMLAuthNRequestParser.java
   federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/parsers/saml/SAMLConditionsParser.java
   federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/parsers/saml/SAMLRequestAbstractParser.java
   federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/parsers/saml/SAMLResponseParser.java
   federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/parsers/saml/SAMLSloRequestParser.java
   federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/parsers/saml/SAMLSloResponseParser.java
   federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/parsers/saml/SAMLStatusResponseTypeParser.java
   federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/parsers/saml/SAMLSubjectParser.java
   federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/parsers/saml/metadata/SAMLEntitiesDescriptorParser.java
   federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/parsers/saml/metadata/SAMLEntityDescriptorParser.java
   federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/parsers/saml/xacml/SAMLXACMLRequestParser.java
   federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/parsers/util/SAMLParserUtil.java
   federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/parsers/wst/WSTCancelTargetParser.java
   federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/parsers/wst/WSTRenewTargetParser.java
   federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/parsers/wst/WSTValidateTargetParser.java
   federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/pdp/SOAPSAMLXACMLPDP.java
   federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/saml/md/providers/FileBasedEntitiesMetadataProvider.java
   federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/saml/md/providers/FileBasedEntityMetadataProvider.java
   federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/saml/md/providers/MetaDataBuilderDelegate.java
   federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/saml/v2/common/SAMLProtocolContext.java
   federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/saml/v2/common/StatementLocal.java
   federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/saml/v2/factories/JBossSAMLAuthnResponseFactory.java
   federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/saml/v2/factories/JBossSAMLBaseFactory.java
   federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/saml/v2/factories/SAMLAssertionFactory.java
   federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/saml/v2/holders/IDPInfoHolder.java
   federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/saml/v2/holders/IssuerInfoHolder.java
   federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/saml/v2/impl/DefaultSAML2HandlerRequest.java
   federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/saml/v2/interfaces/SAML2HandlerRequest.java
   federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/saml/v2/metadata/store/FileBasedMetadataConfigurationStore.java
   federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/saml/v2/metadata/store/IMetadataConfigurationStore.java
   federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/saml/v2/providers/SAML20AssertionTokenProvider.java
   federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/saml/v2/util/AssertionUtil.java
   federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/saml/v2/util/SAMLMetadataUtil.java
   federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/saml/v2/util/SOAPSAMLXACMLUtil.java
   federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/saml/v2/util/StatementUtil.java
   federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/saml/v2/writers/BaseWriter.java
   federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/saml/v2/writers/SAMLAssertionWriter.java
   federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/saml/v2/writers/SAMLMetadataWriter.java
   federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/saml/v2/writers/SAMLRequestWriter.java
   federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/saml/v2/writers/SAMLResponseWriter.java
   federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/util/CoreConfigUtil.java
   federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/wstrust/PicketLinkSTS.java
   federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/wstrust/auth/AbstractSTSLoginModule.java
   federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/wstrust/plugins/saml/SAML20TokenAttributeProvider.java
   federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/wstrust/plugins/saml/SAML20TokenProvider.java
   federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/wstrust/plugins/saml/SAMLUtil.java
   federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/wstrust/wrappers/RequestSecurityToken.java
   federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/wstrust/writers/WSTrustRSTWriter.java
   federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/wstrust/writers/WSTrustRequestWriter.java
   federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/wstrust/writers/WSTrustResponseWriter.java
   federation/trunk/picketlink-fed-core/src/test/java/org/picketlink/identity/federation/core/wstrust/auth/Util.java
   federation/trunk/picketlink-fed-core/src/test/java/org/picketlink/test/identity/federation/core/config/MetadataToSPTypeUnitTestCase.java
   federation/trunk/picketlink-fed-core/src/test/java/org/picketlink/test/identity/federation/core/parser/saml/SAMLAssertionParserTestCase.java
   federation/trunk/picketlink-fed-core/src/test/java/org/picketlink/test/identity/federation/core/parser/saml/SAMLAuthnRequestParserTestCase.java
   federation/trunk/picketlink-fed-core/src/test/java/org/picketlink/test/identity/federation/core/parser/saml/SAMLResponseParserTestCase.java
   federation/trunk/picketlink-fed-core/src/test/java/org/picketlink/test/identity/federation/core/parser/saml/SAMLSloRequestParserTestCase.java
   federation/trunk/picketlink-fed-core/src/test/java/org/picketlink/test/identity/federation/core/parser/saml/SAMLSloResponseParserTestCase.java
   federation/trunk/picketlink-fed-core/src/test/java/org/picketlink/test/identity/federation/core/parser/wst/WSTrustCancelTargetSamlTestCase.java
   federation/trunk/picketlink-fed-core/src/test/java/org/picketlink/test/identity/federation/core/parser/wst/WSTrustRenewTargetParsingTestCase.java
   federation/trunk/picketlink-fed-core/src/test/java/org/picketlink/test/identity/federation/core/parser/wst/WSTrustValidateSamlTestCase.java
   federation/trunk/picketlink-fed-core/src/test/java/org/picketlink/test/identity/federation/core/saml/v2/X500AttributeUnitTestCase.java
   federation/trunk/picketlink-fed-core/src/test/java/org/picketlink/test/identity/federation/core/saml/v2/metadata/FileBasedMetadataConfigurationStoreUnitTestCase.java
   federation/trunk/picketlink-fed-core/src/test/java/org/picketlink/test/identity/federation/core/saml/v2/metadata/SAMLMetadataParsingUnitTestCase.java
   federation/trunk/picketlink-fed-core/src/test/java/org/picketlink/test/identity/federation/core/saml/v2/metadata/SAMLMetadataWriterUnitTestCase.java
   federation/trunk/picketlink-fed-core/src/test/java/org/picketlink/test/identity/federation/core/saml/v2/util/AssertionUtilUnitTestCase.java
   federation/trunk/picketlink-fed-core/src/test/java/org/picketlink/test/identity/federation/core/util/SAMLXACMLUnitTestCase.java
   federation/trunk/picketlink-fed-core/src/test/java/org/picketlink/test/identity/federation/core/wstrust/PicketLinkSTSUnitTestCase.java
   federation/trunk/picketlink-fed-core/src/test/java/org/picketlink/test/identity/federation/core/wstrust/SAML20TokenProviderUnitTestCase.java
Log:
move the classes from newmodel to saml pkg

Modified: federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/factories/XACMLContextFactory.java
===================================================================

--- federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/factories/XACMLContextFactory.java	2011-06-21 20:35:05 UTC (rev 1015)
+++ federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/factories/XACMLContextFactory.java	2011-06-21 20:44:33 UTC (rev 1016)
@@ -23,7 +23,7 @@
 
 import org.jboss.security.xacml.core.model.context.RequestType;
 import org.jboss.security.xacml.core.model.context.ResponseType;
-import org.picketlink.identity.federation.newmodel.saml.v2.profiles.xacml.assertion.XACMLAuthzDecisionStatementType;
+import org.picketlink.identity.federation.saml.v2.profiles.xacml.assertion.XACMLAuthzDecisionStatementType;
  
 
 /**

Modified: federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/parsers/saml/SAMLAssertionParser.java
===================================================================
--- federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/parsers/saml/SAMLAssertionParser.java	2011-06-21 20:35:05 UTC (rev 1015)
+++ federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/parsers/saml/SAMLAssertionParser.java	2011-06-21 20:44:33 UTC (rev 1016)
@@ -44,14 +44,14 @@
 import org.picketlink.identity.federation.core.saml.v2.constants.JBossSAMLURIConstants;
 import org.picketlink.identity.federation.core.saml.v2.util.DocumentUtil;
 import org.picketlink.identity.federation.core.saml.v2.util.XMLTimeUtil;
-import org.picketlink.identity.federation.newmodel.saml.v2.assertion.AssertionType;
-import org.picketlink.identity.federation.newmodel.saml.v2.assertion.AttributeStatementType;
-import org.picketlink.identity.federation.newmodel.saml.v2.assertion.AuthnStatementType;
-import org.picketlink.identity.federation.newmodel.saml.v2.assertion.ConditionsType;
-import org.picketlink.identity.federation.newmodel.saml.v2.assertion.EncryptedAssertionType;
-import org.picketlink.identity.federation.newmodel.saml.v2.assertion.NameIDType;
-import org.picketlink.identity.federation.newmodel.saml.v2.assertion.SubjectType;
-import org.picketlink.identity.federation.newmodel.saml.v2.profiles.xacml.assertion.XACMLAuthzDecisionStatementType;
+import org.picketlink.identity.federation.saml.v2.assertion.AssertionType;
+import org.picketlink.identity.federation.saml.v2.assertion.AttributeStatementType;
+import org.picketlink.identity.federation.saml.v2.assertion.AuthnStatementType;
+import org.picketlink.identity.federation.saml.v2.assertion.ConditionsType;
+import org.picketlink.identity.federation.saml.v2.assertion.EncryptedAssertionType;
+import org.picketlink.identity.federation.saml.v2.assertion.NameIDType;
+import org.picketlink.identity.federation.saml.v2.assertion.SubjectType;
+import org.picketlink.identity.federation.saml.v2.profiles.xacml.assertion.XACMLAuthzDecisionStatementType;
 import org.w3c.dom.Element;
 
 /**

Modified: federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/parsers/saml/SAMLAuthNRequestParser.java
===================================================================
--- federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/parsers/saml/SAMLAuthNRequestParser.java	2011-06-21 20:35:05 UTC (rev 1015)
+++ federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/parsers/saml/SAMLAuthNRequestParser.java	2011-06-21 20:44:33 UTC (rev 1016)
@@ -33,11 +33,11 @@
 import org.picketlink.identity.federation.core.parsers.util.StaxParserUtil;
 import org.picketlink.identity.federation.core.saml.v2.constants.JBossSAMLConstants;
 import org.picketlink.identity.federation.core.saml.v2.constants.JBossSAMLURIConstants; 
-import org.picketlink.identity.federation.newmodel.saml.v2.assertion.ConditionsType;
-import org.picketlink.identity.federation.newmodel.saml.v2.assertion.SubjectType;
-import org.picketlink.identity.federation.newmodel.saml.v2.protocol.AuthnRequestType;
-import org.picketlink.identity.federation.newmodel.saml.v2.protocol.NameIDPolicyType;
-import org.picketlink.identity.federation.newmodel.saml.v2.protocol.RequestedAuthnContextType;
+import org.picketlink.identity.federation.saml.v2.assertion.ConditionsType;
+import org.picketlink.identity.federation.saml.v2.assertion.SubjectType;
+import org.picketlink.identity.federation.saml.v2.protocol.AuthnRequestType;
+import org.picketlink.identity.federation.saml.v2.protocol.NameIDPolicyType;
+import org.picketlink.identity.federation.saml.v2.protocol.RequestedAuthnContextType;
 
 /**
  * Parse the SAML2 AuthnRequest

Modified: federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/parsers/saml/SAMLConditionsParser.java
===================================================================
--- federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/parsers/saml/SAMLConditionsParser.java	2011-06-21 20:35:05 UTC (rev 1015)
+++ federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/parsers/saml/SAMLConditionsParser.java	2011-06-21 20:44:33 UTC (rev 1016)
@@ -36,8 +36,8 @@
 import org.picketlink.identity.federation.core.saml.v2.constants.JBossSAMLConstants;
 import org.picketlink.identity.federation.core.saml.v2.constants.JBossSAMLURIConstants;
 import org.picketlink.identity.federation.core.saml.v2.util.XMLTimeUtil; 
-import org.picketlink.identity.federation.newmodel.saml.v2.assertion.AudienceRestrictionType;
-import org.picketlink.identity.federation.newmodel.saml.v2.assertion.ConditionsType;
+import org.picketlink.identity.federation.saml.v2.assertion.AudienceRestrictionType;
+import org.picketlink.identity.federation.saml.v2.assertion.ConditionsType;
 
 /**
  * Parse the <conditions> in the saml assertion

Modified: federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/parsers/saml/SAMLRequestAbstractParser.java
===================================================================
--- federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/parsers/saml/SAMLRequestAbstractParser.java	2011-06-21 20:35:05 UTC (rev 1015)
+++ federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/parsers/saml/SAMLRequestAbstractParser.java	2011-06-21 20:44:33 UTC (rev 1016)
@@ -33,8 +33,8 @@
 import org.picketlink.identity.federation.core.parsers.util.StaxParserUtil;
 import org.picketlink.identity.federation.core.saml.v2.constants.JBossSAMLConstants;
 import org.picketlink.identity.federation.core.saml.v2.util.XMLTimeUtil; 
-import org.picketlink.identity.federation.newmodel.saml.v2.assertion.NameIDType;
-import org.picketlink.identity.federation.newmodel.saml.v2.protocol.RequestAbstractType;
+import org.picketlink.identity.federation.saml.v2.assertion.NameIDType;
+import org.picketlink.identity.federation.saml.v2.protocol.RequestAbstractType;
 
 /**
  * Base Class for SAML Request Parsing

Modified: federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/parsers/saml/SAMLResponseParser.java
===================================================================
--- federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/parsers/saml/SAMLResponseParser.java	2011-06-21 20:35:05 UTC (rev 1015)
+++ federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/parsers/saml/SAMLResponseParser.java	2011-06-21 20:44:33 UTC (rev 1016)
@@ -31,11 +31,11 @@
 import org.picketlink.identity.federation.core.parsers.util.StaxParserUtil;
 import org.picketlink.identity.federation.core.saml.v2.constants.JBossSAMLConstants;
 import org.picketlink.identity.federation.core.saml.v2.constants.JBossSAMLURIConstants;
-import org.picketlink.identity.federation.newmodel.saml.v2.assertion.AssertionType;
-import org.picketlink.identity.federation.newmodel.saml.v2.assertion.EncryptedAssertionType;
-import org.picketlink.identity.federation.newmodel.saml.v2.assertion.NameIDType;
-import org.picketlink.identity.federation.newmodel.saml.v2.protocol.ResponseType;
-import org.picketlink.identity.federation.newmodel.saml.v2.protocol.ResponseType.RTChoiceType;
+import org.picketlink.identity.federation.saml.v2.assertion.AssertionType;
+import org.picketlink.identity.federation.saml.v2.assertion.EncryptedAssertionType;
+import org.picketlink.identity.federation.saml.v2.assertion.NameIDType;
+import org.picketlink.identity.federation.saml.v2.protocol.ResponseType;
+import org.picketlink.identity.federation.saml.v2.protocol.ResponseType.RTChoiceType;
 import org.w3c.dom.Element;
 
 /**

Modified: federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/parsers/saml/SAMLSloRequestParser.java
===================================================================
--- federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/parsers/saml/SAMLSloRequestParser.java	2011-06-21 20:35:05 UTC (rev 1015)
+++ federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/parsers/saml/SAMLSloRequestParser.java	2011-06-21 20:44:33 UTC (rev 1016)
@@ -34,7 +34,7 @@
 import org.picketlink.identity.federation.core.parsers.util.StaxParserUtil;
 import org.picketlink.identity.federation.core.saml.v2.constants.JBossSAMLConstants;
 import org.picketlink.identity.federation.core.saml.v2.util.XMLTimeUtil; 
-import org.picketlink.identity.federation.newmodel.saml.v2.protocol.LogoutRequestType;
+import org.picketlink.identity.federation.saml.v2.protocol.LogoutRequestType;
 
 /**
  * Parse the Single Log Out requests

Modified: federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/parsers/saml/SAMLSloResponseParser.java
===================================================================
--- federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/parsers/saml/SAMLSloResponseParser.java	2011-06-21 20:35:05 UTC (rev 1015)
+++ federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/parsers/saml/SAMLSloResponseParser.java	2011-06-21 20:44:33 UTC (rev 1016)
@@ -34,8 +34,8 @@
 import org.picketlink.identity.federation.core.parsers.util.StaxParserUtil;
 import org.picketlink.identity.federation.core.saml.v2.constants.JBossSAMLConstants;
 import org.picketlink.identity.federation.core.saml.v2.constants.JBossSAMLURIConstants;
-import org.picketlink.identity.federation.newmodel.saml.v2.assertion.NameIDType; 
-import org.picketlink.identity.federation.newmodel.saml.v2.protocol.StatusResponseType;
+import org.picketlink.identity.federation.saml.v2.assertion.NameIDType;
+import org.picketlink.identity.federation.saml.v2.protocol.StatusResponseType;
 
 /**
  * Parse the SLO Response

Modified: federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/parsers/saml/SAMLStatusResponseTypeParser.java
===================================================================
--- federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/parsers/saml/SAMLStatusResponseTypeParser.java	2011-06-21 20:35:05 UTC (rev 1015)
+++ federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/parsers/saml/SAMLStatusResponseTypeParser.java	2011-06-21 20:44:33 UTC (rev 1016)
@@ -34,9 +34,9 @@
 import org.picketlink.identity.federation.core.parsers.util.StaxParserUtil;
 import org.picketlink.identity.federation.core.saml.v2.constants.JBossSAMLConstants;
 import org.picketlink.identity.federation.core.saml.v2.util.XMLTimeUtil;
-import org.picketlink.identity.federation.newmodel.saml.v2.protocol.StatusCodeType;
-import org.picketlink.identity.federation.newmodel.saml.v2.protocol.StatusResponseType;
-import org.picketlink.identity.federation.newmodel.saml.v2.protocol.StatusType;
+import org.picketlink.identity.federation.saml.v2.protocol.StatusCodeType;
+import org.picketlink.identity.federation.saml.v2.protocol.StatusResponseType;
+import org.picketlink.identity.federation.saml.v2.protocol.StatusType;
 
 /**
  * Base Class for all Response Type parsing for SAML2

Modified: federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/parsers/saml/SAMLSubjectParser.java
===================================================================
--- federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/parsers/saml/SAMLSubjectParser.java	2011-06-21 20:35:05 UTC (rev 1015)
+++ federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/parsers/saml/SAMLSubjectParser.java	2011-06-21 20:44:33 UTC (rev 1016)
@@ -32,11 +32,11 @@
 import org.picketlink.identity.federation.core.saml.v2.constants.JBossSAMLURIConstants;
 import org.picketlink.identity.federation.core.saml.v2.util.XMLTimeUtil;
 import org.picketlink.identity.federation.core.wstrust.WSTrustConstants;
-import org.picketlink.identity.federation.newmodel.saml.v2.assertion.NameIDType;
-import org.picketlink.identity.federation.newmodel.saml.v2.assertion.SubjectConfirmationDataType;
-import org.picketlink.identity.federation.newmodel.saml.v2.assertion.SubjectConfirmationType;
-import org.picketlink.identity.federation.newmodel.saml.v2.assertion.SubjectType;
-import org.picketlink.identity.federation.newmodel.saml.v2.assertion.SubjectType.STSubType;
+import org.picketlink.identity.federation.saml.v2.assertion.NameIDType;
+import org.picketlink.identity.federation.saml.v2.assertion.SubjectConfirmationDataType;
+import org.picketlink.identity.federation.saml.v2.assertion.SubjectConfirmationType;
+import org.picketlink.identity.federation.saml.v2.assertion.SubjectType;
+import org.picketlink.identity.federation.saml.v2.assertion.SubjectType.STSubType;
 import org.picketlink.identity.xmlsec.w3.xmldsig.KeyInfoType;
 import org.picketlink.identity.xmlsec.w3.xmldsig.KeyValueType;
 import org.picketlink.identity.xmlsec.w3.xmldsig.RSAKeyValueType;

Modified: federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/parsers/saml/metadata/SAMLEntitiesDescriptorParser.java
===================================================================
--- federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/parsers/saml/metadata/SAMLEntitiesDescriptorParser.java	2011-06-21 20:35:05 UTC (rev 1015)
+++ federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/parsers/saml/metadata/SAMLEntitiesDescriptorParser.java	2011-06-21 20:44:33 UTC (rev 1016)
@@ -34,7 +34,7 @@
 import org.picketlink.identity.federation.core.saml.v2.constants.JBossSAMLConstants;
 import org.picketlink.identity.federation.core.saml.v2.constants.JBossSAMLURIConstants;
 import org.picketlink.identity.federation.core.saml.v2.util.XMLTimeUtil;
-import org.picketlink.identity.federation.newmodel.saml.v2.metadata.EntitiesDescriptorType;
+import org.picketlink.identity.federation.saml.v2.metadata.EntitiesDescriptorType;
 
 /**
  * Parse the SAML Entities Descriptor

Modified: federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/parsers/saml/metadata/SAMLEntityDescriptorParser.java
===================================================================
--- federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/parsers/saml/metadata/SAMLEntityDescriptorParser.java	2011-06-21 20:35:05 UTC (rev 1015)
+++ federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/parsers/saml/metadata/SAMLEntityDescriptorParser.java	2011-06-21 20:44:33 UTC (rev 1016)
@@ -38,24 +38,24 @@
 import org.picketlink.identity.federation.core.saml.v2.constants.JBossSAMLConstants;
 import org.picketlink.identity.federation.core.saml.v2.constants.JBossSAMLURIConstants;
 import org.picketlink.identity.federation.core.saml.v2.util.XMLTimeUtil;
-import org.picketlink.identity.federation.newmodel.saml.v2.assertion.AttributeType;
-import org.picketlink.identity.federation.newmodel.saml.v2.metadata.AttributeAuthorityDescriptorType;
-import org.picketlink.identity.federation.newmodel.saml.v2.metadata.AttributeConsumingServiceType;
-import org.picketlink.identity.federation.newmodel.saml.v2.metadata.ContactType;
-import org.picketlink.identity.federation.newmodel.saml.v2.metadata.ContactTypeType;
-import org.picketlink.identity.federation.newmodel.saml.v2.metadata.EndpointType;
-import org.picketlink.identity.federation.newmodel.saml.v2.metadata.EntityDescriptorType;
-import org.picketlink.identity.federation.newmodel.saml.v2.metadata.EntityDescriptorType.EDTChoiceType;
-import org.picketlink.identity.federation.newmodel.saml.v2.metadata.EntityDescriptorType.EDTDescriptorChoiceType;
-import org.picketlink.identity.federation.newmodel.saml.v2.metadata.IDPSSODescriptorType;
-import org.picketlink.identity.federation.newmodel.saml.v2.metadata.IndexedEndpointType;
-import org.picketlink.identity.federation.newmodel.saml.v2.metadata.KeyDescriptorType;
-import org.picketlink.identity.federation.newmodel.saml.v2.metadata.KeyTypes;
-import org.picketlink.identity.federation.newmodel.saml.v2.metadata.LocalizedNameType;
-import org.picketlink.identity.federation.newmodel.saml.v2.metadata.LocalizedURIType;
-import org.picketlink.identity.federation.newmodel.saml.v2.metadata.OrganizationType;
-import org.picketlink.identity.federation.newmodel.saml.v2.metadata.RequestedAttributeType;
-import org.picketlink.identity.federation.newmodel.saml.v2.metadata.SPSSODescriptorType;
+import org.picketlink.identity.federation.saml.v2.assertion.AttributeType;
+import org.picketlink.identity.federation.saml.v2.metadata.AttributeAuthorityDescriptorType;
+import org.picketlink.identity.federation.saml.v2.metadata.AttributeConsumingServiceType;
+import org.picketlink.identity.federation.saml.v2.metadata.ContactType;
+import org.picketlink.identity.federation.saml.v2.metadata.ContactTypeType;
+import org.picketlink.identity.federation.saml.v2.metadata.EndpointType;
+import org.picketlink.identity.federation.saml.v2.metadata.EntityDescriptorType;
+import org.picketlink.identity.federation.saml.v2.metadata.IDPSSODescriptorType;
+import org.picketlink.identity.federation.saml.v2.metadata.IndexedEndpointType;
+import org.picketlink.identity.federation.saml.v2.metadata.KeyDescriptorType;
+import org.picketlink.identity.federation.saml.v2.metadata.KeyTypes;
+import org.picketlink.identity.federation.saml.v2.metadata.LocalizedNameType;
+import org.picketlink.identity.federation.saml.v2.metadata.LocalizedURIType;
+import org.picketlink.identity.federation.saml.v2.metadata.OrganizationType;
+import org.picketlink.identity.federation.saml.v2.metadata.RequestedAttributeType;
+import org.picketlink.identity.federation.saml.v2.metadata.SPSSODescriptorType;
+import org.picketlink.identity.federation.saml.v2.metadata.EntityDescriptorType.EDTChoiceType;
+import org.picketlink.identity.federation.saml.v2.metadata.EntityDescriptorType.EDTDescriptorChoiceType;
 import org.w3c.dom.Element;
 
 /**

Modified: federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/parsers/saml/xacml/SAMLXACMLRequestParser.java
===================================================================
--- federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/parsers/saml/xacml/SAMLXACMLRequestParser.java	2011-06-21 20:35:05 UTC (rev 1015)
+++ federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/parsers/saml/xacml/SAMLXACMLRequestParser.java	2011-06-21 20:44:33 UTC (rev 1016)
@@ -37,7 +37,7 @@
 import org.picketlink.identity.federation.core.parsers.util.StaxParserUtil;
 import org.picketlink.identity.federation.core.saml.v2.constants.JBossSAMLConstants;
 import org.picketlink.identity.federation.core.saml.v2.util.DocumentUtil;
-import org.picketlink.identity.federation.newmodel.saml.v2.profiles.xacml.protocol.XACMLAuthzDecisionQueryType;
+import org.picketlink.identity.federation.saml.v2.protocol.XACMLAuthzDecisionQueryType;
 import org.w3c.dom.Element;
 
 /**

Modified: federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/parsers/util/SAMLParserUtil.java
===================================================================
--- federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/parsers/util/SAMLParserUtil.java	2011-06-21 20:35:05 UTC (rev 1015)
+++ federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/parsers/util/SAMLParserUtil.java	2011-06-21 20:44:33 UTC (rev 1016)
@@ -39,15 +39,15 @@
 import org.picketlink.identity.federation.core.saml.v2.constants.JBossSAMLURIConstants;
 import org.picketlink.identity.federation.core.saml.v2.util.XMLTimeUtil;
 import org.picketlink.identity.federation.core.util.StringUtil;
-import org.picketlink.identity.federation.newmodel.saml.v2.assertion.AttributeStatementType;
-import org.picketlink.identity.federation.newmodel.saml.v2.assertion.AttributeStatementType.ASTChoiceType;
-import org.picketlink.identity.federation.newmodel.saml.v2.assertion.AttributeType;
-import org.picketlink.identity.federation.newmodel.saml.v2.assertion.AuthnContextClassRefType;
-import org.picketlink.identity.federation.newmodel.saml.v2.assertion.AuthnContextDeclRefType;
-import org.picketlink.identity.federation.newmodel.saml.v2.assertion.AuthnContextType;
-import org.picketlink.identity.federation.newmodel.saml.v2.assertion.AuthnStatementType;
-import org.picketlink.identity.federation.newmodel.saml.v2.assertion.NameIDType;
-import org.picketlink.identity.federation.newmodel.saml.v2.assertion.SubjectLocalityType;
+import org.picketlink.identity.federation.saml.v2.assertion.AttributeStatementType;
+import org.picketlink.identity.federation.saml.v2.assertion.AttributeType;
+import org.picketlink.identity.federation.saml.v2.assertion.AuthnContextClassRefType;
+import org.picketlink.identity.federation.saml.v2.assertion.AuthnContextDeclRefType;
+import org.picketlink.identity.federation.saml.v2.assertion.AuthnContextType;
+import org.picketlink.identity.federation.saml.v2.assertion.AuthnStatementType;
+import org.picketlink.identity.federation.saml.v2.assertion.NameIDType;
+import org.picketlink.identity.federation.saml.v2.assertion.SubjectLocalityType;
+import org.picketlink.identity.federation.saml.v2.assertion.AttributeStatementType.ASTChoiceType;
 
 /**
  * Utility methods for SAML Parser

Modified: federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/parsers/wst/WSTCancelTargetParser.java
===================================================================
--- federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/parsers/wst/WSTCancelTargetParser.java	2011-06-21 20:35:05 UTC (rev 1015)
+++ federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/parsers/wst/WSTCancelTargetParser.java	2011-06-21 20:44:33 UTC (rev 1016)
@@ -31,7 +31,7 @@
 import org.picketlink.identity.federation.core.parsers.util.StaxParserUtil;
 import org.picketlink.identity.federation.core.saml.v2.constants.JBossSAMLConstants;
 import org.picketlink.identity.federation.core.wstrust.WSTrustConstants;
-import org.picketlink.identity.federation.newmodel.saml.v2.assertion.AssertionType;
+import org.picketlink.identity.federation.saml.v2.assertion.AssertionType;
 import org.picketlink.identity.federation.ws.trust.CancelTargetType;
 
 /**

Modified: federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/parsers/wst/WSTRenewTargetParser.java
===================================================================
--- federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/parsers/wst/WSTRenewTargetParser.java	2011-06-21 20:35:05 UTC (rev 1015)
+++ federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/parsers/wst/WSTRenewTargetParser.java	2011-06-21 20:44:33 UTC (rev 1016)
@@ -27,7 +27,7 @@
 import org.picketlink.identity.federation.core.parsers.util.StaxParserUtil;
 import org.picketlink.identity.federation.core.saml.v2.constants.JBossSAMLConstants;
 import org.picketlink.identity.federation.core.wstrust.WSTrustConstants;
-import org.picketlink.identity.federation.newmodel.saml.v2.assertion.AssertionType;
+import org.picketlink.identity.federation.saml.v2.assertion.AssertionType;
 import org.picketlink.identity.federation.ws.trust.RenewTargetType;
 
 /**

Modified: federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/parsers/wst/WSTValidateTargetParser.java
===================================================================
--- federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/parsers/wst/WSTValidateTargetParser.java	2011-06-21 20:35:05 UTC (rev 1015)
+++ federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/parsers/wst/WSTValidateTargetParser.java	2011-06-21 20:44:33 UTC (rev 1016)
@@ -31,7 +31,7 @@
 import org.picketlink.identity.federation.core.parsers.util.StaxParserUtil;
 import org.picketlink.identity.federation.core.saml.v2.constants.JBossSAMLConstants;
 import org.picketlink.identity.federation.core.wstrust.WSTrustConstants;
-import org.picketlink.identity.federation.newmodel.saml.v2.assertion.AssertionType;
+import org.picketlink.identity.federation.saml.v2.assertion.AssertionType;
 import org.picketlink.identity.federation.ws.trust.ValidateTargetType;
 
 /**

Modified: federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/pdp/SOAPSAMLXACMLPDP.java
===================================================================
--- federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/pdp/SOAPSAMLXACMLPDP.java	2011-06-21 20:35:05 UTC (rev 1015)
+++ federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/pdp/SOAPSAMLXACMLPDP.java	2011-06-21 20:44:33 UTC (rev 1016)
@@ -43,8 +43,8 @@
 import org.picketlink.identity.federation.core.saml.v2.util.SOAPSAMLXACMLUtil;
 import org.picketlink.identity.federation.core.saml.v2.writers.SAMLResponseWriter;
 import org.picketlink.identity.federation.core.util.StaxUtil;
-import org.picketlink.identity.federation.newmodel.saml.v2.profiles.xacml.protocol.XACMLAuthzDecisionQueryType;
-import org.picketlink.identity.federation.newmodel.saml.v2.protocol.ResponseType;
+import org.picketlink.identity.federation.saml.v2.protocol.ResponseType;
+import org.picketlink.identity.federation.saml.v2.protocol.XACMLAuthzDecisionQueryType;
 import org.w3c.dom.Document;
 
 /**

Modified: federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/saml/md/providers/FileBasedEntitiesMetadataProvider.java
===================================================================
--- federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/saml/md/providers/FileBasedEntitiesMetadataProvider.java	2011-06-21 20:35:05 UTC (rev 1015)
+++ federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/saml/md/providers/FileBasedEntitiesMetadataProvider.java	2011-06-21 20:44:33 UTC (rev 1016)
@@ -25,7 +25,7 @@
 import java.security.PublicKey;
 
 import org.picketlink.identity.federation.core.interfaces.IMetadataProvider; 
-import org.picketlink.identity.federation.newmodel.saml.v2.metadata.EntitiesDescriptorType;
+import org.picketlink.identity.federation.saml.v2.metadata.EntitiesDescriptorType;
 
 /**
  * File based provider that handles multiple entities

Modified: federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/saml/md/providers/FileBasedEntityMetadataProvider.java
===================================================================
--- federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/saml/md/providers/FileBasedEntityMetadataProvider.java	2011-06-21 20:35:05 UTC (rev 1015)
+++ federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/saml/md/providers/FileBasedEntityMetadataProvider.java	2011-06-21 20:44:33 UTC (rev 1016)
@@ -28,7 +28,7 @@
 import org.picketlink.identity.federation.core.interfaces.IMetadataProvider;
 import org.picketlink.identity.federation.core.parsers.saml.metadata.SAMLEntityDescriptorParser;
 import org.picketlink.identity.federation.core.parsers.util.StaxParserUtil;
-import org.picketlink.identity.federation.newmodel.saml.v2.metadata.EntityDescriptorType;
+import org.picketlink.identity.federation.saml.v2.metadata.EntityDescriptorType;
 
 /**
  * A file based metadata provider that

Modified: federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/saml/md/providers/MetaDataBuilderDelegate.java
===================================================================
--- federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/saml/md/providers/MetaDataBuilderDelegate.java	2011-06-21 20:35:05 UTC (rev 1015)
+++ federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/saml/md/providers/MetaDataBuilderDelegate.java	2011-06-21 20:44:33 UTC (rev 1016)
@@ -27,18 +27,18 @@
 
 import org.picketlink.identity.federation.core.saml.v2.constants.JBossSAMLConstants; 
 import org.picketlink.identity.federation.core.saml.v2.constants.JBossSAMLURIConstants;
-import org.picketlink.identity.federation.newmodel.saml.v2.assertion.AttributeType;
-import org.picketlink.identity.federation.newmodel.saml.v2.metadata.EndpointType;
-import org.picketlink.identity.federation.newmodel.saml.v2.metadata.EntityDescriptorType;
-import org.picketlink.identity.federation.newmodel.saml.v2.metadata.EntityDescriptorType.EDTChoiceType;
-import org.picketlink.identity.federation.newmodel.saml.v2.metadata.EntityDescriptorType.EDTDescriptorChoiceType;
-import org.picketlink.identity.federation.newmodel.saml.v2.metadata.IDPSSODescriptorType;
-import org.picketlink.identity.federation.newmodel.saml.v2.metadata.KeyDescriptorType;
-import org.picketlink.identity.federation.newmodel.saml.v2.metadata.LocalizedNameType;
-import org.picketlink.identity.federation.newmodel.saml.v2.metadata.LocalizedURIType;
-import org.picketlink.identity.federation.newmodel.saml.v2.metadata.OrganizationType;
-import org.picketlink.identity.federation.newmodel.saml.v2.metadata.SPSSODescriptorType;
-import org.picketlink.identity.federation.newmodel.saml.v2.metadata.SSODescriptorType;
+import org.picketlink.identity.federation.saml.v2.assertion.AttributeType;
+import org.picketlink.identity.federation.saml.v2.metadata.EndpointType;
+import org.picketlink.identity.federation.saml.v2.metadata.EntityDescriptorType;
+import org.picketlink.identity.federation.saml.v2.metadata.IDPSSODescriptorType;
+import org.picketlink.identity.federation.saml.v2.metadata.KeyDescriptorType;
+import org.picketlink.identity.federation.saml.v2.metadata.LocalizedNameType;
+import org.picketlink.identity.federation.saml.v2.metadata.LocalizedURIType;
+import org.picketlink.identity.federation.saml.v2.metadata.OrganizationType;
+import org.picketlink.identity.federation.saml.v2.metadata.SPSSODescriptorType;
+import org.picketlink.identity.federation.saml.v2.metadata.SSODescriptorType;
+import org.picketlink.identity.federation.saml.v2.metadata.EntityDescriptorType.EDTChoiceType;
+import org.picketlink.identity.federation.saml.v2.metadata.EntityDescriptorType.EDTDescriptorChoiceType;
 
 /**
  * SAML2 Metadata Builder API

Modified: federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/saml/v2/common/SAMLProtocolContext.java
===================================================================
--- federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/saml/v2/common/SAMLProtocolContext.java	2011-06-21 20:35:05 UTC (rev 1015)
+++ federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/saml/v2/common/SAMLProtocolContext.java	2011-06-21 20:44:33 UTC (rev 1016)
@@ -32,11 +32,11 @@
 import org.picketlink.identity.federation.core.saml.v2.constants.JBossSAMLConstants;
 import org.picketlink.identity.federation.core.saml.v2.constants.JBossSAMLURIConstants;
 import org.picketlink.identity.federation.core.sts.PicketLinkCoreSTS;
-import org.picketlink.identity.federation.newmodel.saml.v2.assertion.AssertionType;
-import org.picketlink.identity.federation.newmodel.saml.v2.assertion.ConditionsType;
-import org.picketlink.identity.federation.newmodel.saml.v2.assertion.NameIDType;
-import org.picketlink.identity.federation.newmodel.saml.v2.assertion.StatementAbstractType;
-import org.picketlink.identity.federation.newmodel.saml.v2.assertion.SubjectType;
+import org.picketlink.identity.federation.saml.v2.assertion.AssertionType;
+import org.picketlink.identity.federation.saml.v2.assertion.ConditionsType;
+import org.picketlink.identity.federation.saml.v2.assertion.NameIDType;
+import org.picketlink.identity.federation.saml.v2.assertion.StatementAbstractType;
+import org.picketlink.identity.federation.saml.v2.assertion.SubjectType;
 
 /**
  * <p>

Modified: federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/saml/v2/common/StatementLocal.java
===================================================================
--- federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/saml/v2/common/StatementLocal.java	2011-06-21 20:35:05 UTC (rev 1015)
+++ federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/saml/v2/common/StatementLocal.java	2011-06-21 20:44:33 UTC (rev 1016)
@@ -23,7 +23,7 @@
 
 import java.util.Set;
 
-import org.picketlink.identity.federation.newmodel.saml.v2.assertion.StatementAbstractType;
+import org.picketlink.identity.federation.saml.v2.assertion.StatementAbstractType;
 
 /**
  * Thread Local holding the statements 

Modified: federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/saml/v2/factories/JBossSAMLAuthnResponseFactory.java
===================================================================
--- federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/saml/v2/factories/JBossSAMLAuthnResponseFactory.java	2011-06-21 20:35:05 UTC (rev 1015)
+++ federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/saml/v2/factories/JBossSAMLAuthnResponseFactory.java	2011-06-21 20:44:33 UTC (rev 1016)
@@ -32,18 +32,18 @@
 import org.picketlink.identity.federation.core.saml.v2.holders.IssuerInfoHolder;
 import org.picketlink.identity.federation.core.saml.v2.holders.SPInfoHolder;
 import org.picketlink.identity.federation.core.saml.v2.util.XMLTimeUtil;
-import org.picketlink.identity.federation.newmodel.saml.v2.assertion.AssertionType;
-import org.picketlink.identity.federation.newmodel.saml.v2.assertion.ConditionsType;
-import org.picketlink.identity.federation.newmodel.saml.v2.assertion.EncryptedAssertionType;
-import org.picketlink.identity.federation.newmodel.saml.v2.assertion.NameIDType;
-import org.picketlink.identity.federation.newmodel.saml.v2.assertion.StatementAbstractType;
-import org.picketlink.identity.federation.newmodel.saml.v2.assertion.SubjectConfirmationDataType;
-import org.picketlink.identity.federation.newmodel.saml.v2.assertion.SubjectConfirmationType;
-import org.picketlink.identity.federation.newmodel.saml.v2.assertion.SubjectType;
-import org.picketlink.identity.federation.newmodel.saml.v2.protocol.ResponseType;
-import org.picketlink.identity.federation.newmodel.saml.v2.protocol.ResponseType.RTChoiceType;
-import org.picketlink.identity.federation.newmodel.saml.v2.protocol.StatusCodeType;
-import org.picketlink.identity.federation.newmodel.saml.v2.protocol.StatusType;
+import org.picketlink.identity.federation.saml.v2.assertion.AssertionType;
+import org.picketlink.identity.federation.saml.v2.assertion.ConditionsType;
+import org.picketlink.identity.federation.saml.v2.assertion.EncryptedAssertionType;
+import org.picketlink.identity.federation.saml.v2.assertion.NameIDType;
+import org.picketlink.identity.federation.saml.v2.assertion.StatementAbstractType;
+import org.picketlink.identity.federation.saml.v2.assertion.SubjectConfirmationDataType;
+import org.picketlink.identity.federation.saml.v2.assertion.SubjectConfirmationType;
+import org.picketlink.identity.federation.saml.v2.assertion.SubjectType;
+import org.picketlink.identity.federation.saml.v2.protocol.ResponseType;
+import org.picketlink.identity.federation.saml.v2.protocol.StatusCodeType;
+import org.picketlink.identity.federation.saml.v2.protocol.StatusType;
+import org.picketlink.identity.federation.saml.v2.protocol.ResponseType.RTChoiceType;
 import org.w3c.dom.Element;
 
 /**

Modified: federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/saml/v2/factories/JBossSAMLBaseFactory.java
===================================================================
--- federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/saml/v2/factories/JBossSAMLBaseFactory.java	2011-06-21 20:35:05 UTC (rev 1015)
+++ federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/saml/v2/factories/JBossSAMLBaseFactory.java	2011-06-21 20:44:33 UTC (rev 1016)
@@ -25,12 +25,12 @@
 import javax.xml.datatype.XMLGregorianCalendar;
 
 import org.picketlink.identity.federation.core.saml.v2.constants.JBossSAMLURIConstants;
-import org.picketlink.identity.federation.newmodel.saml.v2.assertion.AttributeStatementType;
-import org.picketlink.identity.federation.newmodel.saml.v2.assertion.AttributeStatementType.ASTChoiceType;
-import org.picketlink.identity.federation.newmodel.saml.v2.assertion.AttributeType;
-import org.picketlink.identity.federation.newmodel.saml.v2.assertion.NameIDType;
-import org.picketlink.identity.federation.newmodel.saml.v2.assertion.SubjectConfirmationDataType;
-import org.picketlink.identity.federation.newmodel.saml.v2.assertion.SubjectConfirmationType;
+import org.picketlink.identity.federation.saml.v2.assertion.AttributeStatementType;
+import org.picketlink.identity.federation.saml.v2.assertion.AttributeType;
+import org.picketlink.identity.federation.saml.v2.assertion.NameIDType;
+import org.picketlink.identity.federation.saml.v2.assertion.SubjectConfirmationDataType;
+import org.picketlink.identity.federation.saml.v2.assertion.SubjectConfirmationType;
+import org.picketlink.identity.federation.saml.v2.assertion.AttributeStatementType.ASTChoiceType;
 
 /**
  * Base methods for the factories

Modified: federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/saml/v2/factories/SAMLAssertionFactory.java
===================================================================
--- federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/saml/v2/factories/SAMLAssertionFactory.java	2011-06-21 20:35:05 UTC (rev 1015)
+++ federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/saml/v2/factories/SAMLAssertionFactory.java	2011-06-21 20:44:33 UTC (rev 1016)
@@ -27,15 +27,15 @@
 import javax.xml.datatype.XMLGregorianCalendar;
 
 import org.picketlink.identity.federation.core.saml.v2.constants.JBossSAMLConstants;
-import org.picketlink.identity.federation.newmodel.saml.v2.assertion.AssertionType;
-import org.picketlink.identity.federation.newmodel.saml.v2.assertion.AudienceRestrictionType;
-import org.picketlink.identity.federation.newmodel.saml.v2.assertion.ConditionAbstractType;
-import org.picketlink.identity.federation.newmodel.saml.v2.assertion.ConditionsType;
-import org.picketlink.identity.federation.newmodel.saml.v2.assertion.KeyInfoConfirmationDataType;
-import org.picketlink.identity.federation.newmodel.saml.v2.assertion.NameIDType;
-import org.picketlink.identity.federation.newmodel.saml.v2.assertion.StatementAbstractType;
-import org.picketlink.identity.federation.newmodel.saml.v2.assertion.SubjectConfirmationType;
-import org.picketlink.identity.federation.newmodel.saml.v2.assertion.SubjectType;
+import org.picketlink.identity.federation.saml.v2.assertion.AssertionType;
+import org.picketlink.identity.federation.saml.v2.assertion.AudienceRestrictionType;
+import org.picketlink.identity.federation.saml.v2.assertion.ConditionAbstractType;
+import org.picketlink.identity.federation.saml.v2.assertion.ConditionsType;
+import org.picketlink.identity.federation.saml.v2.assertion.KeyInfoConfirmationDataType;
+import org.picketlink.identity.federation.saml.v2.assertion.NameIDType;
+import org.picketlink.identity.federation.saml.v2.assertion.StatementAbstractType;
+import org.picketlink.identity.federation.saml.v2.assertion.SubjectConfirmationType;
+import org.picketlink.identity.federation.saml.v2.assertion.SubjectType;
 import org.picketlink.identity.xmlsec.w3.xmldsig.KeyInfoType;
 
 /**

Modified: federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/saml/v2/holders/IDPInfoHolder.java
===================================================================
--- federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/saml/v2/holders/IDPInfoHolder.java	2011-06-21 20:35:05 UTC (rev 1015)
+++ federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/saml/v2/holders/IDPInfoHolder.java	2011-06-21 20:44:33 UTC (rev 1016)
@@ -23,7 +23,7 @@
 
 import org.picketlink.identity.federation.core.saml.v2.constants.JBossSAMLURIConstants;
 import org.picketlink.identity.federation.core.sts.PicketLinkCoreSTS;
-import org.picketlink.identity.federation.newmodel.saml.v2.assertion.AssertionType;
+import org.picketlink.identity.federation.saml.v2.assertion.AssertionType;
  
 
 /**

Modified: federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/saml/v2/holders/IssuerInfoHolder.java
===================================================================
--- federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/saml/v2/holders/IssuerInfoHolder.java	2011-06-21 20:35:05 UTC (rev 1015)
+++ federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/saml/v2/holders/IssuerInfoHolder.java	2011-06-21 20:44:33 UTC (rev 1016)
@@ -23,7 +23,7 @@
 
 import org.picketlink.identity.federation.core.saml.v2.constants.JBossSAMLConstants;
 import org.picketlink.identity.federation.core.saml.v2.constants.JBossSAMLURIConstants;
-import org.picketlink.identity.federation.newmodel.saml.v2.assertion.NameIDType;
+import org.picketlink.identity.federation.saml.v2.assertion.NameIDType;
 
 /**
  * Holds info about the issuer for saml messages creation

Modified: federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/saml/v2/impl/DefaultSAML2HandlerRequest.java
===================================================================
--- federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/saml/v2/impl/DefaultSAML2HandlerRequest.java	2011-06-21 20:35:05 UTC (rev 1015)
+++ federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/saml/v2/impl/DefaultSAML2HandlerRequest.java	2011-06-21 20:44:33 UTC (rev 1016)
@@ -30,7 +30,7 @@
 import org.picketlink.identity.federation.core.saml.v2.interfaces.SAML2HandlerRequest;
 import org.picketlink.identity.federation.core.saml.v2.interfaces.SAML2Handler.HANDLER_TYPE;
 import org.picketlink.identity.federation.saml.v2.SAML2Object;
-import org.picketlink.identity.federation.newmodel.saml.v2.assertion.NameIDType;
+import org.picketlink.identity.federation.saml.v2.assertion.NameIDType;
 import org.w3c.dom.Document;
 
 /**

Modified: federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/saml/v2/interfaces/SAML2HandlerRequest.java
===================================================================
--- federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/saml/v2/interfaces/SAML2HandlerRequest.java	2011-06-21 20:35:05 UTC (rev 1015)
+++ federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/saml/v2/interfaces/SAML2HandlerRequest.java	2011-06-21 20:44:33 UTC (rev 1016)
@@ -24,8 +24,8 @@
 import java.util.Map;
 
 import org.picketlink.identity.federation.core.interfaces.ProtocolContext;
-import org.picketlink.identity.federation.newmodel.saml.v2.assertion.NameIDType;
 import org.picketlink.identity.federation.saml.v2.SAML2Object; 
+import org.picketlink.identity.federation.saml.v2.assertion.NameIDType;
 import org.w3c.dom.Document;
 
 /**

Modified: federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/saml/v2/metadata/store/FileBasedMetadataConfigurationStore.java
===================================================================
--- federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/saml/v2/metadata/store/FileBasedMetadataConfigurationStore.java	2011-06-21 20:35:05 UTC (rev 1015)
+++ federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/saml/v2/metadata/store/FileBasedMetadataConfigurationStore.java	2011-06-21 20:44:33 UTC (rev 1016)
@@ -46,11 +46,11 @@
 import org.picketlink.identity.federation.core.saml.v2.writers.SAMLMetadataWriter;
 import org.picketlink.identity.federation.core.util.StaxUtil;
 import org.picketlink.identity.federation.core.util.StringUtil;
-import org.picketlink.identity.federation.newmodel.saml.v2.metadata.EntityDescriptorType;
-import org.picketlink.identity.federation.newmodel.saml.v2.metadata.EntityDescriptorType.EDTChoiceType;
-import org.picketlink.identity.federation.newmodel.saml.v2.metadata.EntityDescriptorType.EDTDescriptorChoiceType;
-import org.picketlink.identity.federation.newmodel.saml.v2.metadata.IDPSSODescriptorType;
-import org.picketlink.identity.federation.newmodel.saml.v2.metadata.SPSSODescriptorType;
+import org.picketlink.identity.federation.saml.v2.metadata.EntityDescriptorType;
+import org.picketlink.identity.federation.saml.v2.metadata.IDPSSODescriptorType;
+import org.picketlink.identity.federation.saml.v2.metadata.SPSSODescriptorType;
+import org.picketlink.identity.federation.saml.v2.metadata.EntityDescriptorType.EDTChoiceType;
+import org.picketlink.identity.federation.saml.v2.metadata.EntityDescriptorType.EDTDescriptorChoiceType;
 
 /**
  * File based metadata store that uses

Modified: federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/saml/v2/metadata/store/IMetadataConfigurationStore.java
===================================================================
--- federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/saml/v2/metadata/store/IMetadataConfigurationStore.java	2011-06-21 20:35:05 UTC (rev 1015)
+++ federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/saml/v2/metadata/store/IMetadataConfigurationStore.java	2011-06-21 20:44:33 UTC (rev 1016)
@@ -25,7 +25,7 @@
 import java.util.Map;
 import java.util.Set;
 
-import org.picketlink.identity.federation.newmodel.saml.v2.metadata.EntityDescriptorType;
+import org.picketlink.identity.federation.saml.v2.metadata.EntityDescriptorType;
 
 /**
  * Configuration Store for the metadata

Modified: federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/saml/v2/providers/SAML20AssertionTokenProvider.java
===================================================================
--- federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/saml/v2/providers/SAML20AssertionTokenProvider.java	2011-06-21 20:35:05 UTC (rev 1015)
+++ federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/saml/v2/providers/SAML20AssertionTokenProvider.java	2011-06-21 20:44:33 UTC (rev 1016)
@@ -42,11 +42,11 @@
 import org.picketlink.identity.federation.core.saml.v2.util.XMLTimeUtil;
 import org.picketlink.identity.federation.core.sts.AbstractSecurityTokenProvider;
 import org.picketlink.identity.federation.core.sts.PicketLinkCoreSTS;
-import org.picketlink.identity.federation.newmodel.saml.v2.assertion.AssertionType;
-import org.picketlink.identity.federation.newmodel.saml.v2.assertion.ConditionsType;
-import org.picketlink.identity.federation.newmodel.saml.v2.assertion.NameIDType;
-import org.picketlink.identity.federation.newmodel.saml.v2.assertion.StatementAbstractType;
-import org.picketlink.identity.federation.newmodel.saml.v2.assertion.SubjectType;
+import org.picketlink.identity.federation.saml.v2.assertion.AssertionType;
+import org.picketlink.identity.federation.saml.v2.assertion.ConditionsType;
+import org.picketlink.identity.federation.saml.v2.assertion.NameIDType;
+import org.picketlink.identity.federation.saml.v2.assertion.StatementAbstractType;
+import org.picketlink.identity.federation.saml.v2.assertion.SubjectType;
 
 /**
  * <p>

Modified: federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/saml/v2/util/AssertionUtil.java
===================================================================
--- federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/saml/v2/util/AssertionUtil.java	2011-06-21 20:35:05 UTC (rev 1015)
+++ federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/saml/v2/util/AssertionUtil.java	2011-06-21 20:44:33 UTC (rev 1016)
@@ -37,15 +37,15 @@
 import org.picketlink.identity.federation.core.saml.v2.writers.SAMLAssertionWriter;
 import org.picketlink.identity.federation.core.util.StaxUtil;
 import org.picketlink.identity.federation.core.util.XMLSignatureUtil;
-import org.picketlink.identity.federation.newmodel.saml.v2.assertion.AssertionType;
-import org.picketlink.identity.federation.newmodel.saml.v2.assertion.AttributeStatementType;
-import org.picketlink.identity.federation.newmodel.saml.v2.assertion.AttributeStatementType.ASTChoiceType;
-import org.picketlink.identity.federation.newmodel.saml.v2.assertion.AttributeType;
-import org.picketlink.identity.federation.newmodel.saml.v2.assertion.ConditionsType;
-import org.picketlink.identity.federation.newmodel.saml.v2.assertion.NameIDType;
-import org.picketlink.identity.federation.newmodel.saml.v2.assertion.StatementAbstractType;
-import org.picketlink.identity.federation.newmodel.saml.v2.assertion.SubjectType;
-import org.picketlink.identity.federation.newmodel.saml.v2.assertion.SubjectType.STSubType;
+import org.picketlink.identity.federation.saml.v2.assertion.AssertionType;
+import org.picketlink.identity.federation.saml.v2.assertion.AttributeStatementType;
+import org.picketlink.identity.federation.saml.v2.assertion.AttributeType;
+import org.picketlink.identity.federation.saml.v2.assertion.ConditionsType;
+import org.picketlink.identity.federation.saml.v2.assertion.NameIDType;
+import org.picketlink.identity.federation.saml.v2.assertion.StatementAbstractType;
+import org.picketlink.identity.federation.saml.v2.assertion.SubjectType;
+import org.picketlink.identity.federation.saml.v2.assertion.AttributeStatementType.ASTChoiceType;
+import org.picketlink.identity.federation.saml.v2.assertion.SubjectType.STSubType;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 import org.w3c.dom.Node;

Modified: federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/saml/v2/util/SAMLMetadataUtil.java
===================================================================
--- federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/saml/v2/util/SAMLMetadataUtil.java	2011-06-21 20:35:05 UTC (rev 1015)
+++ federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/saml/v2/util/SAMLMetadataUtil.java	2011-06-21 20:44:33 UTC (rev 1016)
@@ -27,7 +27,7 @@
 import org.picketlink.identity.federation.core.exceptions.ProcessingException;
 import org.picketlink.identity.federation.core.saml.v2.constants.JBossSAMLURIConstants;
 import org.picketlink.identity.federation.core.util.XMLSignatureUtil;
-import org.picketlink.identity.federation.newmodel.saml.v2.metadata.KeyDescriptorType;
+import org.picketlink.identity.federation.saml.v2.metadata.KeyDescriptorType;
 import org.w3c.dom.Element;
 import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;

Modified: federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/saml/v2/util/SOAPSAMLXACMLUtil.java
===================================================================
--- federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/saml/v2/util/SOAPSAMLXACMLUtil.java	2011-06-21 20:35:05 UTC (rev 1015)
+++ federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/saml/v2/util/SOAPSAMLXACMLUtil.java	2011-06-21 20:44:33 UTC (rev 1016)
@@ -46,11 +46,11 @@
 import org.picketlink.identity.federation.core.saml.v2.factories.JBossSAMLAuthnResponseFactory;
 import org.picketlink.identity.federation.core.saml.v2.factories.SAMLAssertionFactory;
 import org.picketlink.identity.federation.core.saml.v2.holders.IssuerInfoHolder;
-import org.picketlink.identity.federation.newmodel.saml.v2.assertion.AssertionType;
-import org.picketlink.identity.federation.newmodel.saml.v2.assertion.StatementAbstractType;
-import org.picketlink.identity.federation.newmodel.saml.v2.profiles.xacml.assertion.XACMLAuthzDecisionStatementType;
-import org.picketlink.identity.federation.newmodel.saml.v2.profiles.xacml.protocol.XACMLAuthzDecisionQueryType;
-import org.picketlink.identity.federation.newmodel.saml.v2.protocol.ResponseType.RTChoiceType;
+import org.picketlink.identity.federation.saml.v2.assertion.AssertionType;
+import org.picketlink.identity.federation.saml.v2.assertion.StatementAbstractType;
+import org.picketlink.identity.federation.saml.v2.profiles.xacml.assertion.XACMLAuthzDecisionStatementType;
+import org.picketlink.identity.federation.saml.v2.protocol.XACMLAuthzDecisionQueryType;
+import org.picketlink.identity.federation.saml.v2.protocol.ResponseType.RTChoiceType;
 import org.w3c.dom.Node;
 
 /**
@@ -94,7 +94,7 @@
    {
       XMLEventReader xmlEventReader = StaxParserUtil.getXMLEventReader(DocumentUtil.getNodeAsStream(samlResponse));
       SAMLParser samlParser = new SAMLParser();
-      org.picketlink.identity.federation.newmodel.saml.v2.protocol.ResponseType response = (org.picketlink.identity.federation.newmodel.saml.v2.protocol.ResponseType) samlParser
+      org.picketlink.identity.federation.saml.v2.protocol.ResponseType response = (org.picketlink.identity.federation.saml.v2.protocol.ResponseType) samlParser
             .parse(xmlEventReader);
       List<RTChoiceType> choices = response.getAssertions();
       for (RTChoiceType rst : choices)
@@ -115,7 +115,7 @@
       throw new RuntimeException("Not found XACMLAuthzDecisionStatementType");
    }
 
-   public synchronized static org.picketlink.identity.federation.newmodel.saml.v2.protocol.ResponseType handleXACMLQuery(
+   public synchronized static org.picketlink.identity.federation.saml.v2.protocol.ResponseType handleXACMLQuery(
          PolicyDecisionPoint pdp, String issuer, XACMLAuthzDecisionQueryType xacmlRequest) throws ProcessingException,
          ConfigurationException
    {
@@ -153,7 +153,7 @@
       AssertionType assertion = SAMLAssertionFactory.createAssertion(ID, issuerInfo.getIssuer(),
             XMLTimeUtil.getIssueInstant(), null, null, statements);
 
-      org.picketlink.identity.federation.newmodel.saml.v2.protocol.ResponseType samlResponseType = JBossSAMLAuthnResponseFactory
+      org.picketlink.identity.federation.saml.v2.protocol.ResponseType samlResponseType = JBossSAMLAuthnResponseFactory
             .createResponseType(ID, issuerInfo, assertion);
 
       return samlResponseType;

Modified: federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/saml/v2/util/StatementUtil.java
===================================================================
--- federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/saml/v2/util/StatementUtil.java	2011-06-21 20:35:05 UTC (rev 1015)
+++ federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/saml/v2/util/StatementUtil.java	2011-06-21 20:44:33 UTC (rev 1016)
@@ -34,13 +34,13 @@
 import org.picketlink.identity.federation.core.saml.v2.constants.JBossSAMLURIConstants;
 import org.picketlink.identity.federation.core.saml.v2.constants.X500SAMLProfileConstants;
 import org.picketlink.identity.federation.core.util.StringUtil;
-import org.picketlink.identity.federation.newmodel.saml.v2.assertion.AttributeStatementType;
-import org.picketlink.identity.federation.newmodel.saml.v2.assertion.AttributeStatementType.ASTChoiceType;
-import org.picketlink.identity.federation.newmodel.saml.v2.assertion.AttributeType;
-import org.picketlink.identity.federation.newmodel.saml.v2.assertion.AuthnContextClassRefType;
-import org.picketlink.identity.federation.newmodel.saml.v2.assertion.AuthnContextType;
-import org.picketlink.identity.federation.newmodel.saml.v2.assertion.AuthnContextType.AuthnContextTypeSequence;
-import org.picketlink.identity.federation.newmodel.saml.v2.assertion.AuthnStatementType;
+import org.picketlink.identity.federation.saml.v2.assertion.AttributeStatementType;
+import org.picketlink.identity.federation.saml.v2.assertion.AttributeType;
+import org.picketlink.identity.federation.saml.v2.assertion.AuthnContextClassRefType;
+import org.picketlink.identity.federation.saml.v2.assertion.AuthnContextType;
+import org.picketlink.identity.federation.saml.v2.assertion.AuthnStatementType;
+import org.picketlink.identity.federation.saml.v2.assertion.AttributeStatementType.ASTChoiceType;
+import org.picketlink.identity.federation.saml.v2.assertion.AuthnContextType.AuthnContextTypeSequence;
 
 /**
  * Deals with SAML2 Statements

Modified: federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/saml/v2/writers/BaseWriter.java
===================================================================
--- federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/saml/v2/writers/BaseWriter.java	2011-06-21 20:35:05 UTC (rev 1015)
+++ federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/saml/v2/writers/BaseWriter.java	2011-06-21 20:44:33 UTC (rev 1016)
@@ -37,9 +37,9 @@
 import org.picketlink.identity.federation.core.saml.v2.constants.JBossSAMLURIConstants;
 import org.picketlink.identity.federation.core.util.StaxUtil;
 import org.picketlink.identity.federation.core.util.StringUtil; 
-import org.picketlink.identity.federation.newmodel.saml.v2.assertion.AttributeType;
-import org.picketlink.identity.federation.newmodel.saml.v2.assertion.NameIDType;
-import org.picketlink.identity.federation.newmodel.saml.v2.metadata.LocalizedNameType;
+import org.picketlink.identity.federation.saml.v2.assertion.AttributeType;
+import org.picketlink.identity.federation.saml.v2.assertion.NameIDType;
+import org.picketlink.identity.federation.saml.v2.metadata.LocalizedNameType;
 
 /**
  * Base Class for the Stax writers for SAML

Modified: federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/saml/v2/writers/SAMLAssertionWriter.java
===================================================================
--- federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/saml/v2/writers/SAMLAssertionWriter.java	2011-06-21 20:35:05 UTC (rev 1015)
+++ federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/saml/v2/writers/SAMLAssertionWriter.java	2011-06-21 20:44:33 UTC (rev 1016)
@@ -36,31 +36,31 @@
 import org.picketlink.identity.federation.core.util.StaxUtil;
 import org.picketlink.identity.federation.core.util.StringUtil;
 import org.picketlink.identity.federation.core.wstrust.WSTrustConstants;
-import org.picketlink.identity.federation.newmodel.saml.v2.assertion.AdviceType;
-import org.picketlink.identity.federation.newmodel.saml.v2.assertion.AssertionType;
-import org.picketlink.identity.federation.newmodel.saml.v2.assertion.AttributeStatementType;
-import org.picketlink.identity.federation.newmodel.saml.v2.assertion.AttributeStatementType.ASTChoiceType;
-import org.picketlink.identity.federation.newmodel.saml.v2.assertion.AttributeType;
-import org.picketlink.identity.federation.newmodel.saml.v2.assertion.AudienceRestrictionType;
-import org.picketlink.identity.federation.newmodel.saml.v2.assertion.AuthnContextClassRefType;
-import org.picketlink.identity.federation.newmodel.saml.v2.assertion.AuthnContextDeclRefType;
-import org.picketlink.identity.federation.newmodel.saml.v2.assertion.AuthnContextDeclType;
-import org.picketlink.identity.federation.newmodel.saml.v2.assertion.AuthnContextType;
-import org.picketlink.identity.federation.newmodel.saml.v2.assertion.AuthnContextType.AuthnContextTypeSequence;
-import org.picketlink.identity.federation.newmodel.saml.v2.assertion.AuthnStatementType;
-import org.picketlink.identity.federation.newmodel.saml.v2.assertion.BaseIDAbstractType;
-import org.picketlink.identity.federation.newmodel.saml.v2.assertion.ConditionAbstractType;
-import org.picketlink.identity.federation.newmodel.saml.v2.assertion.ConditionsType;
-import org.picketlink.identity.federation.newmodel.saml.v2.assertion.EncryptedElementType;
-import org.picketlink.identity.federation.newmodel.saml.v2.assertion.KeyInfoConfirmationDataType;
-import org.picketlink.identity.federation.newmodel.saml.v2.assertion.NameIDType;
-import org.picketlink.identity.federation.newmodel.saml.v2.assertion.StatementAbstractType;
-import org.picketlink.identity.federation.newmodel.saml.v2.assertion.SubjectConfirmationDataType;
-import org.picketlink.identity.federation.newmodel.saml.v2.assertion.SubjectConfirmationType;
-import org.picketlink.identity.federation.newmodel.saml.v2.assertion.SubjectType;
-import org.picketlink.identity.federation.newmodel.saml.v2.assertion.SubjectType.STSubType;
-import org.picketlink.identity.federation.newmodel.saml.v2.assertion.URIType;
-import org.picketlink.identity.federation.newmodel.saml.v2.profiles.xacml.assertion.XACMLAuthzDecisionStatementType;
+import org.picketlink.identity.federation.saml.v2.assertion.AdviceType;
+import org.picketlink.identity.federation.saml.v2.assertion.AssertionType;
+import org.picketlink.identity.federation.saml.v2.assertion.AttributeStatementType;
+import org.picketlink.identity.federation.saml.v2.assertion.AttributeType;
+import org.picketlink.identity.federation.saml.v2.assertion.AudienceRestrictionType;
+import org.picketlink.identity.federation.saml.v2.assertion.AuthnContextClassRefType;
+import org.picketlink.identity.federation.saml.v2.assertion.AuthnContextDeclRefType;
+import org.picketlink.identity.federation.saml.v2.assertion.AuthnContextDeclType;
+import org.picketlink.identity.federation.saml.v2.assertion.AuthnContextType;
+import org.picketlink.identity.federation.saml.v2.assertion.AuthnStatementType;
+import org.picketlink.identity.federation.saml.v2.assertion.BaseIDAbstractType;
+import org.picketlink.identity.federation.saml.v2.assertion.ConditionAbstractType;
+import org.picketlink.identity.federation.saml.v2.assertion.ConditionsType;
+import org.picketlink.identity.federation.saml.v2.assertion.EncryptedElementType;
+import org.picketlink.identity.federation.saml.v2.assertion.KeyInfoConfirmationDataType;
+import org.picketlink.identity.federation.saml.v2.assertion.NameIDType;
+import org.picketlink.identity.federation.saml.v2.assertion.StatementAbstractType;
+import org.picketlink.identity.federation.saml.v2.assertion.SubjectConfirmationDataType;
+import org.picketlink.identity.federation.saml.v2.assertion.SubjectConfirmationType;
+import org.picketlink.identity.federation.saml.v2.assertion.SubjectType;
+import org.picketlink.identity.federation.saml.v2.assertion.URIType;
+import org.picketlink.identity.federation.saml.v2.assertion.AttributeStatementType.ASTChoiceType;
+import org.picketlink.identity.federation.saml.v2.assertion.AuthnContextType.AuthnContextTypeSequence;
+import org.picketlink.identity.federation.saml.v2.assertion.SubjectType.STSubType;
+import org.picketlink.identity.federation.saml.v2.profiles.xacml.assertion.XACMLAuthzDecisionStatementType;
 import org.picketlink.identity.xmlsec.w3.xmldsig.KeyInfoType;
 import org.picketlink.identity.xmlsec.w3.xmldsig.X509CertificateType;
 import org.picketlink.identity.xmlsec.w3.xmldsig.X509DataType;

Modified: federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/saml/v2/writers/SAMLMetadataWriter.java
===================================================================
--- federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/saml/v2/writers/SAMLMetadataWriter.java	2011-06-21 20:35:05 UTC (rev 1015)
+++ federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/saml/v2/writers/SAMLMetadataWriter.java	2011-06-21 20:44:33 UTC (rev 1016)
@@ -33,29 +33,29 @@
 import org.picketlink.identity.federation.core.saml.v2.constants.JBossSAMLConstants;
 import org.picketlink.identity.federation.core.saml.v2.constants.JBossSAMLURIConstants;
 import org.picketlink.identity.federation.core.util.StaxUtil;
-import org.picketlink.identity.federation.newmodel.saml.v2.assertion.AttributeType;
-import org.picketlink.identity.federation.newmodel.saml.v2.metadata.AffiliationDescriptorType;
-import org.picketlink.identity.federation.newmodel.saml.v2.metadata.AttributeAuthorityDescriptorType;
-import org.picketlink.identity.federation.newmodel.saml.v2.metadata.AttributeConsumingServiceType;
-import org.picketlink.identity.federation.newmodel.saml.v2.metadata.AuthnAuthorityDescriptorType;
-import org.picketlink.identity.federation.newmodel.saml.v2.metadata.ContactType;
-import org.picketlink.identity.federation.newmodel.saml.v2.metadata.ContactTypeType;
-import org.picketlink.identity.federation.newmodel.saml.v2.metadata.EndpointType;
-import org.picketlink.identity.federation.newmodel.saml.v2.metadata.EntitiesDescriptorType;
-import org.picketlink.identity.federation.newmodel.saml.v2.metadata.EntityDescriptorType;
-import org.picketlink.identity.federation.newmodel.saml.v2.metadata.EntityDescriptorType.EDTChoiceType;
-import org.picketlink.identity.federation.newmodel.saml.v2.metadata.EntityDescriptorType.EDTDescriptorChoiceType;
-import org.picketlink.identity.federation.newmodel.saml.v2.metadata.IDPSSODescriptorType;
-import org.picketlink.identity.federation.newmodel.saml.v2.metadata.IndexedEndpointType;
-import org.picketlink.identity.federation.newmodel.saml.v2.metadata.KeyDescriptorType;
-import org.picketlink.identity.federation.newmodel.saml.v2.metadata.KeyTypes;
-import org.picketlink.identity.federation.newmodel.saml.v2.metadata.LocalizedNameType;
-import org.picketlink.identity.federation.newmodel.saml.v2.metadata.LocalizedURIType;
-import org.picketlink.identity.federation.newmodel.saml.v2.metadata.OrganizationType;
-import org.picketlink.identity.federation.newmodel.saml.v2.metadata.RequestedAttributeType;
-import org.picketlink.identity.federation.newmodel.saml.v2.metadata.RoleDescriptorType;
-import org.picketlink.identity.federation.newmodel.saml.v2.metadata.SPSSODescriptorType;
-import org.picketlink.identity.federation.newmodel.saml.v2.metadata.SSODescriptorType;
+import org.picketlink.identity.federation.saml.v2.assertion.AttributeType;
+import org.picketlink.identity.federation.saml.v2.metadata.AffiliationDescriptorType;
+import org.picketlink.identity.federation.saml.v2.metadata.AttributeAuthorityDescriptorType;
+import org.picketlink.identity.federation.saml.v2.metadata.AttributeConsumingServiceType;
+import org.picketlink.identity.federation.saml.v2.metadata.AuthnAuthorityDescriptorType;
+import org.picketlink.identity.federation.saml.v2.metadata.ContactType;
+import org.picketlink.identity.federation.saml.v2.metadata.ContactTypeType;
+import org.picketlink.identity.federation.saml.v2.metadata.EndpointType;
+import org.picketlink.identity.federation.saml.v2.metadata.EntitiesDescriptorType;
+import org.picketlink.identity.federation.saml.v2.metadata.EntityDescriptorType;
+import org.picketlink.identity.federation.saml.v2.metadata.IDPSSODescriptorType;
+import org.picketlink.identity.federation.saml.v2.metadata.IndexedEndpointType;
+import org.picketlink.identity.federation.saml.v2.metadata.KeyDescriptorType;
+import org.picketlink.identity.federation.saml.v2.metadata.KeyTypes;
+import org.picketlink.identity.federation.saml.v2.metadata.LocalizedNameType;
+import org.picketlink.identity.federation.saml.v2.metadata.LocalizedURIType;
+import org.picketlink.identity.federation.saml.v2.metadata.OrganizationType;
+import org.picketlink.identity.federation.saml.v2.metadata.RequestedAttributeType;
+import org.picketlink.identity.federation.saml.v2.metadata.RoleDescriptorType;
+import org.picketlink.identity.federation.saml.v2.metadata.SPSSODescriptorType;
+import org.picketlink.identity.federation.saml.v2.metadata.SSODescriptorType;
+import org.picketlink.identity.federation.saml.v2.metadata.EntityDescriptorType.EDTChoiceType;
+import org.picketlink.identity.federation.saml.v2.metadata.EntityDescriptorType.EDTDescriptorChoiceType;
 import org.w3c.dom.Element;
 
 /**

Modified: federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/saml/v2/writers/SAMLRequestWriter.java
===================================================================
--- federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/saml/v2/writers/SAMLRequestWriter.java	2011-06-21 20:35:05 UTC (rev 1015)
+++ federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/saml/v2/writers/SAMLRequestWriter.java	2011-06-21 20:44:33 UTC (rev 1016)
@@ -43,11 +43,11 @@
 import org.picketlink.identity.federation.core.util.JAXBUtil;
 import org.picketlink.identity.federation.core.util.StaxUtil;
 import org.picketlink.identity.federation.core.util.StringUtil; 
-import org.picketlink.identity.federation.newmodel.saml.v2.assertion.NameIDType;
-import org.picketlink.identity.federation.newmodel.saml.v2.profiles.xacml.protocol.XACMLAuthzDecisionQueryType;
-import org.picketlink.identity.federation.newmodel.saml.v2.protocol.AuthnRequestType;
-import org.picketlink.identity.federation.newmodel.saml.v2.protocol.LogoutRequestType;
-import org.picketlink.identity.federation.newmodel.saml.v2.protocol.NameIDPolicyType;
+import org.picketlink.identity.federation.saml.v2.assertion.NameIDType;
+import org.picketlink.identity.federation.saml.v2.protocol.AuthnRequestType;
+import org.picketlink.identity.federation.saml.v2.protocol.LogoutRequestType;
+import org.picketlink.identity.federation.saml.v2.protocol.NameIDPolicyType;
+import org.picketlink.identity.federation.saml.v2.protocol.XACMLAuthzDecisionQueryType;
 import org.w3c.dom.Document;
 
 /**

Modified: federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/saml/v2/writers/SAMLResponseWriter.java
===================================================================
--- federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/saml/v2/writers/SAMLResponseWriter.java	2011-06-21 20:35:05 UTC (rev 1015)
+++ federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/saml/v2/writers/SAMLResponseWriter.java	2011-06-21 20:44:33 UTC (rev 1016)
@@ -34,15 +34,15 @@
 import org.picketlink.identity.federation.core.saml.v2.constants.JBossSAMLConstants;
 import org.picketlink.identity.federation.core.util.StaxUtil;
 import org.picketlink.identity.federation.core.util.StringUtil;
-import org.picketlink.identity.federation.newmodel.saml.v2.assertion.AssertionType;
-import org.picketlink.identity.federation.newmodel.saml.v2.assertion.EncryptedAssertionType;
-import org.picketlink.identity.federation.newmodel.saml.v2.assertion.NameIDType;
-import org.picketlink.identity.federation.newmodel.saml.v2.protocol.ResponseType;
-import org.picketlink.identity.federation.newmodel.saml.v2.protocol.ResponseType.RTChoiceType;
-import org.picketlink.identity.federation.newmodel.saml.v2.protocol.StatusCodeType;
-import org.picketlink.identity.federation.newmodel.saml.v2.protocol.StatusDetailType;
-import org.picketlink.identity.federation.newmodel.saml.v2.protocol.StatusResponseType;
-import org.picketlink.identity.federation.newmodel.saml.v2.protocol.StatusType;
+import org.picketlink.identity.federation.saml.v2.assertion.AssertionType;
+import org.picketlink.identity.federation.saml.v2.assertion.EncryptedAssertionType;
+import org.picketlink.identity.federation.saml.v2.assertion.NameIDType;
+import org.picketlink.identity.federation.saml.v2.protocol.ResponseType;
+import org.picketlink.identity.federation.saml.v2.protocol.StatusCodeType;
+import org.picketlink.identity.federation.saml.v2.protocol.StatusDetailType;
+import org.picketlink.identity.federation.saml.v2.protocol.StatusResponseType;
+import org.picketlink.identity.federation.saml.v2.protocol.StatusType;
+import org.picketlink.identity.federation.saml.v2.protocol.ResponseType.RTChoiceType;
 import org.w3c.dom.Element;
 
 /**

Modified: federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/util/CoreConfigUtil.java
===================================================================
--- federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/util/CoreConfigUtil.java	2011-06-21 20:35:05 UTC (rev 1015)
+++ federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/util/CoreConfigUtil.java	2011-06-21 20:44:33 UTC (rev 1016)
@@ -44,11 +44,11 @@
 import org.picketlink.identity.federation.core.exceptions.ConfigurationException;
 import org.picketlink.identity.federation.core.exceptions.ProcessingException;
 import org.picketlink.identity.federation.core.interfaces.TrustKeyManager;
-import org.picketlink.identity.federation.newmodel.saml.v2.metadata.EndpointType;
-import org.picketlink.identity.federation.newmodel.saml.v2.metadata.EntityDescriptorType;
-import org.picketlink.identity.federation.newmodel.saml.v2.metadata.EntityDescriptorType.EDTChoiceType;
-import org.picketlink.identity.federation.newmodel.saml.v2.metadata.EntityDescriptorType.EDTDescriptorChoiceType;
-import org.picketlink.identity.federation.newmodel.saml.v2.metadata.IDPSSODescriptorType;
+import org.picketlink.identity.federation.saml.v2.metadata.EndpointType;
+import org.picketlink.identity.federation.saml.v2.metadata.EntityDescriptorType;
+import org.picketlink.identity.federation.saml.v2.metadata.IDPSSODescriptorType;
+import org.picketlink.identity.federation.saml.v2.metadata.EntityDescriptorType.EDTChoiceType;
+import org.picketlink.identity.federation.saml.v2.metadata.EntityDescriptorType.EDTDescriptorChoiceType;
 
 /**
  * Utility for configuration

Modified: federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/wstrust/PicketLinkSTS.java
===================================================================
--- federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/wstrust/PicketLinkSTS.java	2011-06-21 20:35:05 UTC (rev 1015)
+++ federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/wstrust/PicketLinkSTS.java	2011-06-21 20:44:33 UTC (rev 1016)
@@ -130,7 +130,6 @@
 
          WSTrustParser parser = new WSTrustParser();
 
-         System.out.println(DocumentUtil.getNodeAsString(payLoad));
          baseRequest = (BaseRequestSecurityToken) parser.parse(DocumentUtil.getNodeAsStream(payLoad));
       }
       catch (Exception e)

Modified: federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/wstrust/auth/AbstractSTSLoginModule.java
===================================================================
--- federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/wstrust/auth/AbstractSTSLoginModule.java	2011-06-21 20:35:05 UTC (rev 1015)
+++ federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/wstrust/auth/AbstractSTSLoginModule.java	2011-06-21 20:44:33 UTC (rev 1016)
@@ -63,7 +63,7 @@
 import org.picketlink.identity.federation.core.wstrust.SamlCredential;
 import org.picketlink.identity.federation.core.wstrust.WSTrustException;
 import org.picketlink.identity.federation.core.wstrust.plugins.saml.SAMLUtil;
-import org.picketlink.identity.federation.newmodel.saml.v2.assertion.AssertionType;
+import org.picketlink.identity.federation.saml.v2.assertion.AssertionType;
 import org.w3c.dom.Element;
 
 /**

Modified: federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/wstrust/plugins/saml/SAML20TokenAttributeProvider.java
===================================================================
--- federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/wstrust/plugins/saml/SAML20TokenAttributeProvider.java	2011-06-21 20:35:05 UTC (rev 1015)
+++ federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/wstrust/plugins/saml/SAML20TokenAttributeProvider.java	2011-06-21 20:44:33 UTC (rev 1016)
@@ -2,7 +2,7 @@
 
 import java.util.Map;
 
-import org.picketlink.identity.federation.newmodel.saml.v2.assertion.AttributeStatementType;
+import org.picketlink.identity.federation.saml.v2.assertion.AttributeStatementType;
 
 /**
  * <p>

Modified: federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/wstrust/plugins/saml/SAML20TokenProvider.java
===================================================================
--- federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/wstrust/plugins/saml/SAML20TokenProvider.java	2011-06-21 20:35:05 UTC (rev 1015)
+++ federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/wstrust/plugins/saml/SAML20TokenProvider.java	2011-06-21 20:44:33 UTC (rev 1016)
@@ -42,15 +42,15 @@
 import org.picketlink.identity.federation.core.wstrust.WSTrustRequestContext;
 import org.picketlink.identity.federation.core.wstrust.WSTrustUtil;
 import org.picketlink.identity.federation.core.wstrust.wrappers.Lifetime;
-import org.picketlink.identity.federation.newmodel.saml.v2.assertion.AssertionType;
-import org.picketlink.identity.federation.newmodel.saml.v2.assertion.AttributeStatementType;
-import org.picketlink.identity.federation.newmodel.saml.v2.assertion.AudienceRestrictionType;
-import org.picketlink.identity.federation.newmodel.saml.v2.assertion.ConditionsType;
-import org.picketlink.identity.federation.newmodel.saml.v2.assertion.KeyInfoConfirmationDataType;
-import org.picketlink.identity.federation.newmodel.saml.v2.assertion.NameIDType;
-import org.picketlink.identity.federation.newmodel.saml.v2.assertion.StatementAbstractType;
-import org.picketlink.identity.federation.newmodel.saml.v2.assertion.SubjectConfirmationType;
-import org.picketlink.identity.federation.newmodel.saml.v2.assertion.SubjectType;
+import org.picketlink.identity.federation.saml.v2.assertion.AssertionType;
+import org.picketlink.identity.federation.saml.v2.assertion.AttributeStatementType;
+import org.picketlink.identity.federation.saml.v2.assertion.AudienceRestrictionType;
+import org.picketlink.identity.federation.saml.v2.assertion.ConditionsType;
+import org.picketlink.identity.federation.saml.v2.assertion.KeyInfoConfirmationDataType;
+import org.picketlink.identity.federation.saml.v2.assertion.NameIDType;
+import org.picketlink.identity.federation.saml.v2.assertion.StatementAbstractType;
+import org.picketlink.identity.federation.saml.v2.assertion.SubjectConfirmationType;
+import org.picketlink.identity.federation.saml.v2.assertion.SubjectType;
 import org.picketlink.identity.federation.ws.policy.AppliesTo;
 import org.picketlink.identity.federation.ws.trust.RequestedReferenceType;
 import org.picketlink.identity.federation.ws.trust.StatusType;

Modified: federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/wstrust/plugins/saml/SAMLUtil.java
===================================================================
--- federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/wstrust/plugins/saml/SAMLUtil.java	2011-06-21 20:35:05 UTC (rev 1015)
+++ federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/wstrust/plugins/saml/SAMLUtil.java	2011-06-21 20:44:33 UTC (rev 1016)
@@ -31,7 +31,7 @@
 import org.picketlink.identity.federation.core.saml.v2.util.DocumentUtil;
 import org.picketlink.identity.federation.core.saml.v2.writers.SAMLAssertionWriter;
 import org.picketlink.identity.federation.core.util.StaxUtil;
-import org.picketlink.identity.federation.newmodel.saml.v2.assertion.AssertionType;
+import org.picketlink.identity.federation.saml.v2.assertion.AssertionType;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 

Modified: federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/wstrust/wrappers/RequestSecurityToken.java
===================================================================
--- federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/wstrust/wrappers/RequestSecurityToken.java	2011-06-21 20:35:05 UTC (rev 1015)
+++ federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/wstrust/wrappers/RequestSecurityToken.java	2011-06-21 20:44:33 UTC (rev 1016)
@@ -50,6 +50,7 @@
 import org.picketlink.identity.federation.ws.trust.ValidateTargetType;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
+import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
 
 /**
@@ -166,16 +167,8 @@
 
    private URI binaryValueType;
 
-   public URI getBinaryValueType()
-   {
-      return binaryValueType;
-   }
+   private Node binaryToken;
 
-   public void setBinaryValueType(URI binaryValueType)
-   {
-      this.binaryValueType = binaryValueType;
-   }
-
    /**
     * <p>
     * Creates an instance of {@code RequestSecurityToken}.
@@ -291,6 +284,34 @@
    }
 
    /**
+    * Get the Binary Value Type
+    * @return
+    */
+   public URI getBinaryValueType()
+   {
+      return binaryValueType;
+   }
+
+   public void setBinaryValueType(URI binaryValueType)
+   {
+      this.binaryValueType = binaryValueType;
+   }
+
+   /**
+    * Get the Binary Token from the SOAP Header
+    * @return
+    */
+   public Node getBinaryToken()
+   {
+      return binaryToken;
+   }
+
+   public void setBinaryToken(Node binaryToken)
+   {
+      this.binaryToken = binaryToken;
+   }
+
+   /**
     * <p>
     * Obtains the {@code URI} that identifies the token type.
     * </p>

Modified: federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/wstrust/writers/WSTrustRSTWriter.java
===================================================================
--- federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/wstrust/writers/WSTrustRSTWriter.java	2011-06-21 20:35:05 UTC (rev 1015)
+++ federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/wstrust/writers/WSTrustRSTWriter.java	2011-06-21 20:44:33 UTC (rev 1016)
@@ -40,7 +40,7 @@
 import org.picketlink.identity.federation.core.wstrust.WSTrustConstants;
 import org.picketlink.identity.federation.core.wstrust.wrappers.RequestSecurityToken;
 import org.picketlink.identity.federation.core.wstrust.wrappers.RequestSecurityTokenCollection;
-import org.picketlink.identity.federation.newmodel.saml.v2.assertion.AssertionType;
+import org.picketlink.identity.federation.saml.v2.assertion.AssertionType;
 import org.picketlink.identity.federation.ws.policy.AppliesTo;
 import org.picketlink.identity.federation.ws.trust.BinarySecretType;
 import org.picketlink.identity.federation.ws.trust.CancelTargetType;

Modified: federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/wstrust/writers/WSTrustRequestWriter.java
===================================================================
--- federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/wstrust/writers/WSTrustRequestWriter.java	2011-06-21 20:35:05 UTC (rev 1015)
+++ federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/wstrust/writers/WSTrustRequestWriter.java	2011-06-21 20:44:33 UTC (rev 1016)
@@ -42,7 +42,7 @@
 import org.picketlink.identity.federation.core.wstrust.wrappers.Lifetime;
 import org.picketlink.identity.federation.core.wstrust.wrappers.RequestSecurityToken;
 import org.picketlink.identity.federation.core.wstrust.wrappers.RequestSecurityTokenCollection;
-import org.picketlink.identity.federation.newmodel.saml.v2.assertion.AssertionType;
+import org.picketlink.identity.federation.saml.v2.assertion.AssertionType;
 import org.picketlink.identity.federation.ws.addressing.EndpointReferenceType;
 import org.picketlink.identity.federation.ws.policy.AppliesTo;
 import org.picketlink.identity.federation.ws.trust.BinarySecretType;

Modified: federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/wstrust/writers/WSTrustResponseWriter.java
===================================================================
--- federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/wstrust/writers/WSTrustResponseWriter.java	2011-06-21 20:35:05 UTC (rev 1015)
+++ federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/wstrust/writers/WSTrustResponseWriter.java	2011-06-21 20:44:33 UTC (rev 1016)
@@ -30,7 +30,7 @@
 import org.picketlink.identity.federation.core.wstrust.wrappers.Lifetime;
 import org.picketlink.identity.federation.core.wstrust.wrappers.RequestSecurityTokenResponse;
 import org.picketlink.identity.federation.core.wstrust.wrappers.RequestSecurityTokenResponseCollection;
-import org.picketlink.identity.federation.newmodel.saml.v2.assertion.AssertionType;
+import org.picketlink.identity.federation.saml.v2.assertion.AssertionType;
 import org.picketlink.identity.federation.ws.trust.BinarySecretType;
 import org.picketlink.identity.federation.ws.trust.ComputedKeyType;
 import org.picketlink.identity.federation.ws.trust.EntropyType;

Modified: federation/trunk/picketlink-fed-core/src/test/java/org/picketlink/identity/federation/core/wstrust/auth/Util.java
===================================================================
--- federation/trunk/picketlink-fed-core/src/test/java/org/picketlink/identity/federation/core/wstrust/auth/Util.java	2011-06-21 20:35:05 UTC (rev 1015)
+++ federation/trunk/picketlink-fed-core/src/test/java/org/picketlink/identity/federation/core/wstrust/auth/Util.java	2011-06-21 20:44:33 UTC (rev 1016)
@@ -28,7 +28,7 @@
 import org.picketlink.identity.federation.core.saml.v2.util.XMLTimeUtil;
 import org.picketlink.identity.federation.core.wstrust.auth.AbstractSTSLoginModule;
 import org.picketlink.identity.federation.core.wstrust.plugins.saml.SAMLUtil; 
-import org.picketlink.identity.federation.newmodel.saml.v2.assertion.AssertionType;
+import org.picketlink.identity.federation.saml.v2.assertion.AssertionType;
 import org.w3c.dom.Element;
 
 /**

Modified: federation/trunk/picketlink-fed-core/src/test/java/org/picketlink/test/identity/federation/core/config/MetadataToSPTypeUnitTestCase.java
===================================================================
--- federation/trunk/picketlink-fed-core/src/test/java/org/picketlink/test/identity/federation/core/config/MetadataToSPTypeUnitTestCase.java	2011-06-21 20:35:05 UTC (rev 1015)
+++ federation/trunk/picketlink-fed-core/src/test/java/org/picketlink/test/identity/federation/core/config/MetadataToSPTypeUnitTestCase.java	2011-06-21 20:44:33 UTC (rev 1016)
@@ -31,8 +31,8 @@
 import org.picketlink.identity.federation.core.parsers.saml.SAMLParser;
 import org.picketlink.identity.federation.core.saml.v2.constants.JBossSAMLURIConstants;
 import org.picketlink.identity.federation.core.util.CoreConfigUtil;
-import org.picketlink.identity.federation.newmodel.saml.v2.metadata.EntitiesDescriptorType;
-import org.picketlink.identity.federation.newmodel.saml.v2.metadata.EntityDescriptorType;
+import org.picketlink.identity.federation.saml.v2.metadata.EntitiesDescriptorType;
+import org.picketlink.identity.federation.saml.v2.metadata.EntityDescriptorType;
 
 /**
  * Given an IDP metadata, construct {@link SPType}

Modified: federation/trunk/picketlink-fed-core/src/test/java/org/picketlink/test/identity/federation/core/parser/saml/SAMLAssertionParserTestCase.java
===================================================================
--- federation/trunk/picketlink-fed-core/src/test/java/org/picketlink/test/identity/federation/core/parser/saml/SAMLAssertionParserTestCase.java	2011-06-21 20:35:05 UTC (rev 1015)
+++ federation/trunk/picketlink-fed-core/src/test/java/org/picketlink/test/identity/federation/core/parser/saml/SAMLAssertionParserTestCase.java	2011-06-21 20:44:33 UTC (rev 1016)
@@ -41,19 +41,19 @@
 import org.picketlink.identity.federation.core.saml.v2.util.XMLTimeUtil;
 import org.picketlink.identity.federation.core.saml.v2.writers.SAMLAssertionWriter;
 import org.picketlink.identity.federation.core.util.StaxUtil;
-import org.picketlink.identity.federation.newmodel.saml.v2.assertion.AssertionType;
-import org.picketlink.identity.federation.newmodel.saml.v2.assertion.AttributeStatementType;
-import org.picketlink.identity.federation.newmodel.saml.v2.assertion.AttributeStatementType.ASTChoiceType;
-import org.picketlink.identity.federation.newmodel.saml.v2.assertion.AttributeType;
-import org.picketlink.identity.federation.newmodel.saml.v2.assertion.AudienceRestrictionType;
-import org.picketlink.identity.federation.newmodel.saml.v2.assertion.AuthnStatementType;
-import org.picketlink.identity.federation.newmodel.saml.v2.assertion.ConditionsType;
-import org.picketlink.identity.federation.newmodel.saml.v2.assertion.NameIDType;
-import org.picketlink.identity.federation.newmodel.saml.v2.assertion.StatementAbstractType;
-import org.picketlink.identity.federation.newmodel.saml.v2.assertion.SubjectConfirmationDataType;
-import org.picketlink.identity.federation.newmodel.saml.v2.assertion.SubjectConfirmationType;
-import org.picketlink.identity.federation.newmodel.saml.v2.assertion.SubjectType;
-import org.picketlink.identity.federation.newmodel.saml.v2.assertion.SubjectType.STSubType;
+import org.picketlink.identity.federation.saml.v2.assertion.AssertionType;
+import org.picketlink.identity.federation.saml.v2.assertion.AttributeStatementType;
+import org.picketlink.identity.federation.saml.v2.assertion.AttributeType;
+import org.picketlink.identity.federation.saml.v2.assertion.AudienceRestrictionType;
+import org.picketlink.identity.federation.saml.v2.assertion.AuthnStatementType;
+import org.picketlink.identity.federation.saml.v2.assertion.ConditionsType;
+import org.picketlink.identity.federation.saml.v2.assertion.NameIDType;
+import org.picketlink.identity.federation.saml.v2.assertion.StatementAbstractType;
+import org.picketlink.identity.federation.saml.v2.assertion.SubjectConfirmationDataType;
+import org.picketlink.identity.federation.saml.v2.assertion.SubjectConfirmationType;
+import org.picketlink.identity.federation.saml.v2.assertion.SubjectType;
+import org.picketlink.identity.federation.saml.v2.assertion.AttributeStatementType.ASTChoiceType;
+import org.picketlink.identity.federation.saml.v2.assertion.SubjectType.STSubType;
 
 /**
  * Test the parsing of saml assertions

Modified: federation/trunk/picketlink-fed-core/src/test/java/org/picketlink/test/identity/federation/core/parser/saml/SAMLAuthnRequestParserTestCase.java
===================================================================
--- federation/trunk/picketlink-fed-core/src/test/java/org/picketlink/test/identity/federation/core/parser/saml/SAMLAuthnRequestParserTestCase.java	2011-06-21 20:35:05 UTC (rev 1015)
+++ federation/trunk/picketlink-fed-core/src/test/java/org/picketlink/test/identity/federation/core/parser/saml/SAMLAuthnRequestParserTestCase.java	2011-06-21 20:44:33 UTC (rev 1016)
@@ -34,8 +34,8 @@
 import org.picketlink.identity.federation.core.saml.v2.util.XMLTimeUtil;
 import org.picketlink.identity.federation.core.saml.v2.writers.SAMLRequestWriter;
 import org.picketlink.identity.federation.core.util.StaxUtil; 
-import org.picketlink.identity.federation.newmodel.saml.v2.protocol.AuthnRequestType;
-import org.picketlink.identity.federation.newmodel.saml.v2.protocol.NameIDPolicyType;
+import org.picketlink.identity.federation.saml.v2.protocol.AuthnRequestType;
+import org.picketlink.identity.federation.saml.v2.protocol.NameIDPolicyType;
 
 /**
  * Validate the SAML2 AuthnRequest parse

Modified: federation/trunk/picketlink-fed-core/src/test/java/org/picketlink/test/identity/federation/core/parser/saml/SAMLResponseParserTestCase.java
===================================================================
--- federation/trunk/picketlink-fed-core/src/test/java/org/picketlink/test/identity/federation/core/parser/saml/SAMLResponseParserTestCase.java	2011-06-21 20:35:05 UTC (rev 1015)
+++ federation/trunk/picketlink-fed-core/src/test/java/org/picketlink/test/identity/federation/core/parser/saml/SAMLResponseParserTestCase.java	2011-06-21 20:44:33 UTC (rev 1016)
@@ -36,22 +36,22 @@
 import org.picketlink.identity.federation.core.saml.v2.util.XMLTimeUtil;
 import org.picketlink.identity.federation.core.saml.v2.writers.SAMLResponseWriter;
 import org.picketlink.identity.federation.core.util.StaxUtil;
-import org.picketlink.identity.federation.newmodel.saml.v2.assertion.AssertionType;
-import org.picketlink.identity.federation.newmodel.saml.v2.assertion.AttributeStatementType;
-import org.picketlink.identity.federation.newmodel.saml.v2.assertion.AttributeType;
-import org.picketlink.identity.federation.newmodel.saml.v2.assertion.AuthnContextDeclRefType;
-import org.picketlink.identity.federation.newmodel.saml.v2.assertion.AuthnContextType;
-import org.picketlink.identity.federation.newmodel.saml.v2.assertion.AuthnStatementType;
-import org.picketlink.identity.federation.newmodel.saml.v2.assertion.NameIDType;
-import org.picketlink.identity.federation.newmodel.saml.v2.assertion.StatementAbstractType;
-import org.picketlink.identity.federation.newmodel.saml.v2.assertion.SubjectConfirmationDataType;
-import org.picketlink.identity.federation.newmodel.saml.v2.assertion.SubjectConfirmationType;
-import org.picketlink.identity.federation.newmodel.saml.v2.assertion.SubjectLocalityType;
-import org.picketlink.identity.federation.newmodel.saml.v2.assertion.SubjectType;
-import org.picketlink.identity.federation.newmodel.saml.v2.profiles.xacml.assertion.XACMLAuthzDecisionStatementType;
-import org.picketlink.identity.federation.newmodel.saml.v2.protocol.ResponseType;
-import org.picketlink.identity.federation.newmodel.saml.v2.protocol.ResponseType.RTChoiceType;
-import org.picketlink.identity.federation.newmodel.saml.v2.protocol.StatusType;
+import org.picketlink.identity.federation.saml.v2.assertion.AssertionType;
+import org.picketlink.identity.federation.saml.v2.assertion.AttributeStatementType;
+import org.picketlink.identity.federation.saml.v2.assertion.AttributeType;
+import org.picketlink.identity.federation.saml.v2.assertion.AuthnContextDeclRefType;
+import org.picketlink.identity.federation.saml.v2.assertion.AuthnContextType;
+import org.picketlink.identity.federation.saml.v2.assertion.AuthnStatementType;
+import org.picketlink.identity.federation.saml.v2.assertion.NameIDType;
+import org.picketlink.identity.federation.saml.v2.assertion.StatementAbstractType;
+import org.picketlink.identity.federation.saml.v2.assertion.SubjectConfirmationDataType;
+import org.picketlink.identity.federation.saml.v2.assertion.SubjectConfirmationType;
+import org.picketlink.identity.federation.saml.v2.assertion.SubjectLocalityType;
+import org.picketlink.identity.federation.saml.v2.assertion.SubjectType;
+import org.picketlink.identity.federation.saml.v2.profiles.xacml.assertion.XACMLAuthzDecisionStatementType;
+import org.picketlink.identity.federation.saml.v2.protocol.ResponseType;
+import org.picketlink.identity.federation.saml.v2.protocol.StatusType;
+import org.picketlink.identity.federation.saml.v2.protocol.ResponseType.RTChoiceType;
 
 /**
  * Validate the parsing of SAML2 Response

Modified: federation/trunk/picketlink-fed-core/src/test/java/org/picketlink/test/identity/federation/core/parser/saml/SAMLSloRequestParserTestCase.java
===================================================================
--- federation/trunk/picketlink-fed-core/src/test/java/org/picketlink/test/identity/federation/core/parser/saml/SAMLSloRequestParserTestCase.java	2011-06-21 20:35:05 UTC (rev 1015)
+++ federation/trunk/picketlink-fed-core/src/test/java/org/picketlink/test/identity/federation/core/parser/saml/SAMLSloRequestParserTestCase.java	2011-06-21 20:44:33 UTC (rev 1016)
@@ -34,7 +34,7 @@
 import org.picketlink.identity.federation.core.saml.v2.util.XMLTimeUtil;
 import org.picketlink.identity.federation.core.saml.v2.writers.SAMLRequestWriter;
 import org.picketlink.identity.federation.core.util.StaxUtil; 
-import org.picketlink.identity.federation.newmodel.saml.v2.protocol.LogoutRequestType;
+import org.picketlink.identity.federation.saml.v2.protocol.LogoutRequestType;
 
 /**
  * Validate the parsing of SLO (log out) Request

Modified: federation/trunk/picketlink-fed-core/src/test/java/org/picketlink/test/identity/federation/core/parser/saml/SAMLSloResponseParserTestCase.java
===================================================================
--- federation/trunk/picketlink-fed-core/src/test/java/org/picketlink/test/identity/federation/core/parser/saml/SAMLSloResponseParserTestCase.java	2011-06-21 20:35:05 UTC (rev 1015)
+++ federation/trunk/picketlink-fed-core/src/test/java/org/picketlink/test/identity/federation/core/parser/saml/SAMLSloResponseParserTestCase.java	2011-06-21 20:44:33 UTC (rev 1016)
@@ -38,8 +38,8 @@
 import org.picketlink.identity.federation.core.saml.v2.util.XMLTimeUtil;
 import org.picketlink.identity.federation.core.saml.v2.writers.SAMLResponseWriter;
 import org.picketlink.identity.federation.core.util.StaxUtil;
-import org.picketlink.identity.federation.newmodel.saml.v2.protocol.StatusResponseType;
-import org.picketlink.identity.federation.newmodel.saml.v2.protocol.StatusType;
+import org.picketlink.identity.federation.saml.v2.protocol.StatusResponseType;
+import org.picketlink.identity.federation.saml.v2.protocol.StatusType;
 
 /**
  * Validate the parsing of SLO Response

Modified: federation/trunk/picketlink-fed-core/src/test/java/org/picketlink/test/identity/federation/core/parser/wst/WSTrustCancelTargetSamlTestCase.java
===================================================================
--- federation/trunk/picketlink-fed-core/src/test/java/org/picketlink/test/identity/federation/core/parser/wst/WSTrustCancelTargetSamlTestCase.java	2011-06-21 20:35:05 UTC (rev 1015)
+++ federation/trunk/picketlink-fed-core/src/test/java/org/picketlink/test/identity/federation/core/parser/wst/WSTrustCancelTargetSamlTestCase.java	2011-06-21 20:44:33 UTC (rev 1016)
@@ -37,11 +37,11 @@
 import org.picketlink.identity.federation.core.wstrust.WSTrustConstants;
 import org.picketlink.identity.federation.core.wstrust.wrappers.RequestSecurityToken;
 import org.picketlink.identity.federation.core.wstrust.writers.WSTrustRequestWriter;
-import org.picketlink.identity.federation.newmodel.saml.v2.assertion.AssertionType;
-import org.picketlink.identity.federation.newmodel.saml.v2.assertion.ConditionsType;
-import org.picketlink.identity.federation.newmodel.saml.v2.assertion.NameIDType;
-import org.picketlink.identity.federation.newmodel.saml.v2.assertion.SubjectConfirmationType;
-import org.picketlink.identity.federation.newmodel.saml.v2.assertion.SubjectType;
+import org.picketlink.identity.federation.saml.v2.assertion.AssertionType;
+import org.picketlink.identity.federation.saml.v2.assertion.ConditionsType;
+import org.picketlink.identity.federation.saml.v2.assertion.NameIDType;
+import org.picketlink.identity.federation.saml.v2.assertion.SubjectConfirmationType;
+import org.picketlink.identity.federation.saml.v2.assertion.SubjectType;
 import org.picketlink.identity.federation.ws.trust.CancelTargetType;
 
 /**

Modified: federation/trunk/picketlink-fed-core/src/test/java/org/picketlink/test/identity/federation/core/parser/wst/WSTrustRenewTargetParsingTestCase.java
===================================================================
--- federation/trunk/picketlink-fed-core/src/test/java/org/picketlink/test/identity/federation/core/parser/wst/WSTrustRenewTargetParsingTestCase.java	2011-06-21 20:35:05 UTC (rev 1015)
+++ federation/trunk/picketlink-fed-core/src/test/java/org/picketlink/test/identity/federation/core/parser/wst/WSTrustRenewTargetParsingTestCase.java	2011-06-21 20:44:33 UTC (rev 1016)
@@ -29,9 +29,9 @@
 import org.picketlink.identity.federation.core.parsers.wst.WSTrustParser;
 import org.picketlink.identity.federation.core.wstrust.WSTrustConstants;
 import org.picketlink.identity.federation.core.wstrust.wrappers.RequestSecurityToken;
-import org.picketlink.identity.federation.newmodel.saml.v2.assertion.AssertionType;
-import org.picketlink.identity.federation.newmodel.saml.v2.assertion.NameIDType;
-import org.picketlink.identity.federation.newmodel.saml.v2.assertion.SubjectType;
+import org.picketlink.identity.federation.saml.v2.assertion.AssertionType;
+import org.picketlink.identity.federation.saml.v2.assertion.NameIDType;
+import org.picketlink.identity.federation.saml.v2.assertion.SubjectType;
 import org.picketlink.identity.federation.ws.trust.RenewTargetType;
 
 /**

Modified: federation/trunk/picketlink-fed-core/src/test/java/org/picketlink/test/identity/federation/core/parser/wst/WSTrustValidateSamlTestCase.java
===================================================================
--- federation/trunk/picketlink-fed-core/src/test/java/org/picketlink/test/identity/federation/core/parser/wst/WSTrustValidateSamlTestCase.java	2011-06-21 20:35:05 UTC (rev 1015)
+++ federation/trunk/picketlink-fed-core/src/test/java/org/picketlink/test/identity/federation/core/parser/wst/WSTrustValidateSamlTestCase.java	2011-06-21 20:44:33 UTC (rev 1016)
@@ -29,7 +29,7 @@
 import org.picketlink.identity.federation.core.parsers.wst.WSTrustParser;
 import org.picketlink.identity.federation.core.wstrust.WSTrustConstants;
 import org.picketlink.identity.federation.core.wstrust.wrappers.RequestSecurityToken;
-import org.picketlink.identity.federation.newmodel.saml.v2.assertion.AssertionType;
+import org.picketlink.identity.federation.saml.v2.assertion.AssertionType;
 import org.picketlink.identity.federation.ws.trust.ValidateTargetType;
 
 /**

Modified: federation/trunk/picketlink-fed-core/src/test/java/org/picketlink/test/identity/federation/core/saml/v2/X500AttributeUnitTestCase.java
===================================================================
--- federation/trunk/picketlink-fed-core/src/test/java/org/picketlink/test/identity/federation/core/saml/v2/X500AttributeUnitTestCase.java	2011-06-21 20:35:05 UTC (rev 1015)
+++ federation/trunk/picketlink-fed-core/src/test/java/org/picketlink/test/identity/federation/core/saml/v2/X500AttributeUnitTestCase.java	2011-06-21 20:44:33 UTC (rev 1016)
@@ -38,9 +38,9 @@
 import org.picketlink.identity.federation.core.saml.v2.util.StatementUtil;
 import org.picketlink.identity.federation.core.saml.v2.writers.SAMLResponseWriter;
 import org.picketlink.identity.federation.core.util.StaxUtil;
-import org.picketlink.identity.federation.newmodel.saml.v2.assertion.AssertionType;
-import org.picketlink.identity.federation.newmodel.saml.v2.assertion.AttributeStatementType;
-import org.picketlink.identity.federation.newmodel.saml.v2.protocol.ResponseType;
+import org.picketlink.identity.federation.saml.v2.assertion.AssertionType;
+import org.picketlink.identity.federation.saml.v2.assertion.AttributeStatementType;
+import org.picketlink.identity.federation.saml.v2.protocol.ResponseType;
 import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 import org.w3c.dom.Node;

Modified: federation/trunk/picketlink-fed-core/src/test/java/org/picketlink/test/identity/federation/core/saml/v2/metadata/FileBasedMetadataConfigurationStoreUnitTestCase.java
===================================================================
--- federation/trunk/picketlink-fed-core/src/test/java/org/picketlink/test/identity/federation/core/saml/v2/metadata/FileBasedMetadataConfigurationStoreUnitTestCase.java	2011-06-21 20:35:05 UTC (rev 1015)
+++ federation/trunk/picketlink-fed-core/src/test/java/org/picketlink/test/identity/federation/core/saml/v2/metadata/FileBasedMetadataConfigurationStoreUnitTestCase.java	2011-06-21 20:44:33 UTC (rev 1016)
@@ -32,7 +32,7 @@
 import org.junit.Test;
 import org.picketlink.identity.federation.core.parsers.saml.SAMLParser;
 import org.picketlink.identity.federation.core.saml.v2.metadata.store.FileBasedMetadataConfigurationStore;
-import org.picketlink.identity.federation.newmodel.saml.v2.metadata.EntityDescriptorType;
+import org.picketlink.identity.federation.saml.v2.metadata.EntityDescriptorType;
 
 
 /**

Modified: federation/trunk/picketlink-fed-core/src/test/java/org/picketlink/test/identity/federation/core/saml/v2/metadata/SAMLMetadataParsingUnitTestCase.java
===================================================================
--- federation/trunk/picketlink-fed-core/src/test/java/org/picketlink/test/identity/federation/core/saml/v2/metadata/SAMLMetadataParsingUnitTestCase.java	2011-06-21 20:35:05 UTC (rev 1015)
+++ federation/trunk/picketlink-fed-core/src/test/java/org/picketlink/test/identity/federation/core/saml/v2/metadata/SAMLMetadataParsingUnitTestCase.java	2011-06-21 20:44:33 UTC (rev 1016)
@@ -39,12 +39,12 @@
 import org.picketlink.identity.federation.core.saml.v2.util.SAMLMetadataUtil;
 import org.picketlink.identity.federation.core.saml.v2.writers.SAMLMetadataWriter;
 import org.picketlink.identity.federation.core.util.StaxUtil;
-import org.picketlink.identity.federation.newmodel.saml.v2.metadata.ContactType;
-import org.picketlink.identity.federation.newmodel.saml.v2.metadata.EntitiesDescriptorType;
-import org.picketlink.identity.federation.newmodel.saml.v2.metadata.EntityDescriptorType;
-import org.picketlink.identity.federation.newmodel.saml.v2.metadata.IDPSSODescriptorType;
-import org.picketlink.identity.federation.newmodel.saml.v2.metadata.KeyDescriptorType;
-import org.picketlink.identity.federation.newmodel.saml.v2.metadata.OrganizationType;
+import org.picketlink.identity.federation.saml.v2.metadata.ContactType;
+import org.picketlink.identity.federation.saml.v2.metadata.EntitiesDescriptorType;
+import org.picketlink.identity.federation.saml.v2.metadata.EntityDescriptorType;
+import org.picketlink.identity.federation.saml.v2.metadata.IDPSSODescriptorType;
+import org.picketlink.identity.federation.saml.v2.metadata.KeyDescriptorType;
+import org.picketlink.identity.federation.saml.v2.metadata.OrganizationType;
 
 /**
  * Unit test the SAML metadata parsing

Modified: federation/trunk/picketlink-fed-core/src/test/java/org/picketlink/test/identity/federation/core/saml/v2/metadata/SAMLMetadataWriterUnitTestCase.java
===================================================================
--- federation/trunk/picketlink-fed-core/src/test/java/org/picketlink/test/identity/federation/core/saml/v2/metadata/SAMLMetadataWriterUnitTestCase.java	2011-06-21 20:35:05 UTC (rev 1015)
+++ federation/trunk/picketlink-fed-core/src/test/java/org/picketlink/test/identity/federation/core/saml/v2/metadata/SAMLMetadataWriterUnitTestCase.java	2011-06-21 20:44:33 UTC (rev 1016)
@@ -37,12 +37,12 @@
 import org.picketlink.identity.federation.core.saml.v2.util.DocumentUtil;
 import org.picketlink.identity.federation.core.saml.v2.writers.SAMLMetadataWriter;
 import org.picketlink.identity.federation.core.util.StaxUtil;
-import org.picketlink.identity.federation.newmodel.saml.v2.assertion.AttributeType;
-import org.picketlink.identity.federation.newmodel.saml.v2.metadata.EndpointType;
-import org.picketlink.identity.federation.newmodel.saml.v2.metadata.EntityDescriptorType;
-import org.picketlink.identity.federation.newmodel.saml.v2.metadata.KeyDescriptorType;
-import org.picketlink.identity.federation.newmodel.saml.v2.metadata.OrganizationType;
-import org.picketlink.identity.federation.newmodel.saml.v2.metadata.SPSSODescriptorType;
+import org.picketlink.identity.federation.saml.v2.assertion.AttributeType;
+import org.picketlink.identity.federation.saml.v2.metadata.EndpointType;
+import org.picketlink.identity.federation.saml.v2.metadata.EntityDescriptorType;
+import org.picketlink.identity.federation.saml.v2.metadata.KeyDescriptorType;
+import org.picketlink.identity.federation.saml.v2.metadata.OrganizationType;
+import org.picketlink.identity.federation.saml.v2.metadata.SPSSODescriptorType;
 
 
 /**

Modified: federation/trunk/picketlink-fed-core/src/test/java/org/picketlink/test/identity/federation/core/saml/v2/util/AssertionUtilUnitTestCase.java
===================================================================
--- federation/trunk/picketlink-fed-core/src/test/java/org/picketlink/test/identity/federation/core/saml/v2/util/AssertionUtilUnitTestCase.java	2011-06-21 20:35:05 UTC (rev 1015)
+++ federation/trunk/picketlink-fed-core/src/test/java/org/picketlink/test/identity/federation/core/saml/v2/util/AssertionUtilUnitTestCase.java	2011-06-21 20:44:33 UTC (rev 1016)
@@ -35,11 +35,11 @@
 import org.picketlink.identity.federation.core.saml.v2.constants.JBossSAMLConstants;
 import org.picketlink.identity.federation.core.saml.v2.util.AssertionUtil;
 import org.picketlink.identity.federation.core.saml.v2.util.XMLTimeUtil;
-import org.picketlink.identity.federation.newmodel.saml.v2.assertion.AssertionType;
-import org.picketlink.identity.federation.newmodel.saml.v2.assertion.ConditionsType;
-import org.picketlink.identity.federation.newmodel.saml.v2.assertion.NameIDType;
-import org.picketlink.identity.federation.newmodel.saml.v2.protocol.ResponseType;
-import org.picketlink.identity.federation.newmodel.saml.v2.protocol.ResponseType.RTChoiceType;
+import org.picketlink.identity.federation.saml.v2.assertion.AssertionType;
+import org.picketlink.identity.federation.saml.v2.assertion.ConditionsType;
+import org.picketlink.identity.federation.saml.v2.assertion.NameIDType;
+import org.picketlink.identity.federation.saml.v2.protocol.ResponseType;
+import org.picketlink.identity.federation.saml.v2.protocol.ResponseType.RTChoiceType;
 
 /**
  * Unit test the AssertionUtil

Modified: federation/trunk/picketlink-fed-core/src/test/java/org/picketlink/test/identity/federation/core/util/SAMLXACMLUnitTestCase.java
===================================================================
--- federation/trunk/picketlink-fed-core/src/test/java/org/picketlink/test/identity/federation/core/util/SAMLXACMLUnitTestCase.java	2011-06-21 20:35:05 UTC (rev 1015)
+++ federation/trunk/picketlink-fed-core/src/test/java/org/picketlink/test/identity/federation/core/util/SAMLXACMLUnitTestCase.java	2011-06-21 20:44:33 UTC (rev 1016)
@@ -29,8 +29,8 @@
 import org.jboss.security.xacml.core.model.context.RequestType;
 import org.junit.Test;
 import org.picketlink.identity.federation.core.parsers.saml.SAMLParser;
-import org.picketlink.identity.federation.newmodel.saml.v2.profiles.xacml.protocol.XACMLAuthzDecisionQueryType;
-import org.picketlink.identity.federation.newmodel.saml.v2.protocol.RequestAbstractType;
+import org.picketlink.identity.federation.saml.v2.protocol.RequestAbstractType;
+import org.picketlink.identity.federation.saml.v2.protocol.XACMLAuthzDecisionQueryType;
 
 /**
  * Read a SAML-XACML request

Modified: federation/trunk/picketlink-fed-core/src/test/java/org/picketlink/test/identity/federation/core/wstrust/PicketLinkSTSUnitTestCase.java
===================================================================
--- federation/trunk/picketlink-fed-core/src/test/java/org/picketlink/test/identity/federation/core/wstrust/PicketLinkSTSUnitTestCase.java	2011-06-21 20:35:05 UTC (rev 1015)
+++ federation/trunk/picketlink-fed-core/src/test/java/org/picketlink/test/identity/federation/core/wstrust/PicketLinkSTSUnitTestCase.java	2011-06-21 20:44:33 UTC (rev 1016)
@@ -81,14 +81,14 @@
 import org.picketlink.identity.federation.core.wstrust.wrappers.RequestSecurityTokenResponse;
 import org.picketlink.identity.federation.core.wstrust.wrappers.RequestSecurityTokenResponseCollection;
 import org.picketlink.identity.federation.core.wstrust.writers.WSTrustRequestWriter;
-import org.picketlink.identity.federation.newmodel.saml.v2.assertion.AssertionType;
-import org.picketlink.identity.federation.newmodel.saml.v2.assertion.AudienceRestrictionType;
-import org.picketlink.identity.federation.newmodel.saml.v2.assertion.ConditionAbstractType;
-import org.picketlink.identity.federation.newmodel.saml.v2.assertion.ConditionsType;
-import org.picketlink.identity.federation.newmodel.saml.v2.assertion.NameIDType;
-import org.picketlink.identity.federation.newmodel.saml.v2.assertion.SubjectConfirmationDataType;
-import org.picketlink.identity.federation.newmodel.saml.v2.assertion.SubjectConfirmationType;
-import org.picketlink.identity.federation.newmodel.saml.v2.assertion.SubjectType;
+import org.picketlink.identity.federation.saml.v2.assertion.AssertionType;
+import org.picketlink.identity.federation.saml.v2.assertion.AudienceRestrictionType;
+import org.picketlink.identity.federation.saml.v2.assertion.ConditionAbstractType;
+import org.picketlink.identity.federation.saml.v2.assertion.ConditionsType;
+import org.picketlink.identity.federation.saml.v2.assertion.NameIDType;
+import org.picketlink.identity.federation.saml.v2.assertion.SubjectConfirmationDataType;
+import org.picketlink.identity.federation.saml.v2.assertion.SubjectConfirmationType;
+import org.picketlink.identity.federation.saml.v2.assertion.SubjectType;
 import org.picketlink.identity.federation.ws.trust.BinarySecretType;
 import org.picketlink.identity.federation.ws.trust.CancelTargetType;
 import org.picketlink.identity.federation.ws.trust.ComputedKeyType;

Modified: federation/trunk/picketlink-fed-core/src/test/java/org/picketlink/test/identity/federation/core/wstrust/SAML20TokenProviderUnitTestCase.java
===================================================================
--- federation/trunk/picketlink-fed-core/src/test/java/org/picketlink/test/identity/federation/core/wstrust/SAML20TokenProviderUnitTestCase.java	2011-06-21 20:35:05 UTC (rev 1015)
+++ federation/trunk/picketlink-fed-core/src/test/java/org/picketlink/test/identity/federation/core/wstrust/SAML20TokenProviderUnitTestCase.java	2011-06-21 20:44:33 UTC (rev 1016)
@@ -48,13 +48,13 @@
 import org.picketlink.identity.federation.core.wstrust.wrappers.Lifetime;
 import org.picketlink.identity.federation.core.wstrust.wrappers.RequestSecurityToken;
 import org.picketlink.identity.federation.core.wstrust.writers.WSTrustRequestWriter;
-import org.picketlink.identity.federation.newmodel.saml.v2.assertion.AssertionType;
-import org.picketlink.identity.federation.newmodel.saml.v2.assertion.AudienceRestrictionType;
-import org.picketlink.identity.federation.newmodel.saml.v2.assertion.ConditionsType;
-import org.picketlink.identity.federation.newmodel.saml.v2.assertion.NameIDType;
-import org.picketlink.identity.federation.newmodel.saml.v2.assertion.SubjectConfirmationDataType;
-import org.picketlink.identity.federation.newmodel.saml.v2.assertion.SubjectConfirmationType;
-import org.picketlink.identity.federation.newmodel.saml.v2.assertion.SubjectType;
+import org.picketlink.identity.federation.saml.v2.assertion.AssertionType;
+import org.picketlink.identity.federation.saml.v2.assertion.AudienceRestrictionType;
+import org.picketlink.identity.federation.saml.v2.assertion.ConditionsType;
+import org.picketlink.identity.federation.saml.v2.assertion.NameIDType;
+import org.picketlink.identity.federation.saml.v2.assertion.SubjectConfirmationDataType;
+import org.picketlink.identity.federation.saml.v2.assertion.SubjectConfirmationType;
+import org.picketlink.identity.federation.saml.v2.assertion.SubjectType;
 import org.picketlink.identity.federation.ws.trust.RequestedReferenceType;
 import org.picketlink.identity.federation.ws.trust.StatusType;
 import org.picketlink.identity.federation.ws.trust.ValidateTargetType;

Deleted: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/assertion/ActionType.java
===================================================================
--- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/assertion/ActionType.java	2011-06-21 20:35:05 UTC (rev 1015)
+++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/assertion/ActionType.java	2011-06-21 20:44:33 UTC (rev 1016)
@@ -1,98 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2008, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors. 
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.picketlink.identity.federation.newmodel.saml.v2.assertion;
-
-import java.io.Serializable;
-
-
-/**
- * <p>Java class for ActionType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained within this class.
- * 
- * <pre>
- * &lt;complexType name="ActionType">
- *   &lt;simpleContent>
- *     &lt;extension base="&lt;http://www.w3.org/2001/XMLSchema>string">
- *       &lt;attribute name="Namespace" use="required" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
- *     &lt;/extension>
- *   &lt;/simpleContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */ 
-public class ActionType implements Serializable {
-
-   private static final long serialVersionUID = 1L;
-
-   protected String value; 
-   protected String namespace;
-
-   /**
-    * Gets the value of the value property.
-    * 
-    * @return
-    *     possible object is
-    *     {@link String }
-    *     
-    */
-   public String getValue() {
-      return value;
-   }
-
-   /**
-    * Sets the value of the value property.
-    * 
-    * @param value
-    *     allowed object is
-    *     {@link String }
-    *     
-    */
-   public void setValue(String value) {
-      this.value = value;
-   }
-
-   /**
-    * Gets the value of the namespace property.
-    * 
-    * @return
-    *     possible object is
-    *     {@link String }
-    *     
-    */
-   public String getNamespace() {
-      return namespace;
-   }
-
-   /**
-    * Sets the value of the namespace property.
-    * 
-    * @param value
-    *     allowed object is
-    *     {@link String }
-    *     
-    */
-   public void setNamespace(String value) {
-      this.namespace = value;
-   }
-}
\ No newline at end of file

Deleted: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/assertion/AdviceType.java
===================================================================
--- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/assertion/AdviceType.java	2011-06-21 20:35:05 UTC (rev 1015)
+++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/assertion/AdviceType.java	2011-06-21 20:44:33 UTC (rev 1016)
@@ -1,76 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2008, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors. 
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
-package org.picketlink.identity.federation.newmodel.saml.v2.assertion;
-
-import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-
-/**
- * <p>Java class for AdviceType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained within this class.
- * 
- * <pre>
- * &lt;complexType name="AdviceType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       &lt;choice maxOccurs="unbounded" minOccurs="0">
- *         &lt;element ref="{urn:oasis:names:tc:SAML:2.0:assertion}AssertionIDRef"/>
- *         &lt;element ref="{urn:oasis:names:tc:SAML:2.0:assertion}AssertionURIRef"/>
- *         &lt;element ref="{urn:oasis:names:tc:SAML:2.0:assertion}Assertion"/>
- *         &lt;element ref="{urn:oasis:names:tc:SAML:2.0:assertion}EncryptedAssertion"/>
- *         &lt;any/>
- *       &lt;/choice>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */ 
-public class AdviceType implements Serializable
-{  
-   private static final long serialVersionUID = 1L;
-   protected List<Object> advices = new ArrayList<Object>();
-
-   /**
-    * Add an advice
-    * @param obj
-    */
-   public void addAdvice( Object obj )
-   {
-      advices.add( obj );
-   }
-
-   /**
-    * Gets the advices. (Read only list)
-    * @return {@link List} read only 
-    */
-   public List<Object> getAdvices() 
-   { 
-      return Collections.unmodifiableList( advices );
-   } 
-}
\ No newline at end of file

Deleted: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/assertion/AssertionType.java
===================================================================
--- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/assertion/AssertionType.java	2011-06-21 20:35:05 UTC (rev 1015)
+++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/assertion/AssertionType.java	2011-06-21 20:44:33 UTC (rev 1016)
@@ -1,286 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2008, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors. 
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.picketlink.identity.federation.newmodel.saml.v2.assertion;
-
-import java.io.Serializable;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.LinkedHashSet;
-import java.util.Set;
-
-import javax.xml.datatype.XMLGregorianCalendar;
- 
-import org.w3c.dom.Element;
-
-/**
- <complexType name="AssertionType">
-        <sequence>
-            <element ref="saml:Issuer"/>
-            <element ref="ds:Signature" minOccurs="0"/>
-            <element ref="saml:Subject" minOccurs="0"/>
-            <element ref="saml:Conditions" minOccurs="0"/>
-            <element ref="saml:Advice" minOccurs="0"/>
-            <choice minOccurs="0" maxOccurs="unbounded">
-                <element ref="saml:Statement"/>
-                <element ref="saml:AuthnStatement"/>
-                <element ref="saml:AuthzDecisionStatement"/>
-                <element ref="saml:AttributeStatement"/>
-            </choice>
-        </sequence>
-        <attribute name="Version" type="string" use="required"/>
-        <attribute name="ID" type="ID" use="required"/>
-        <attribute name="IssueInstant" type="dateTime" use="required"/>
-    </complexType>
- * @author Anil.Saldhana at redhat.com
- * @since Nov 24, 2010
- */
-public class AssertionType implements Serializable
-{ 
-   private static final long serialVersionUID = 1L;
-
-   private String ID;
-
-   private Element signature;
-
-   private XMLGregorianCalendar issueInstant;
-
-   private String version;
-
-   private AdviceType advice;
-
-   private NameIDType issuer;
-   
-   private SubjectType subject;
-
-   private ConditionsType conditions;
-
-   private Set<StatementAbstractType> statements = new LinkedHashSet<StatementAbstractType>();
-
-   /**
-    * Create an assertion
-    * @param iD ID of the assertion (Required)
-    * @param issueInstant {@link XMLGregorianCalendar} issue instant (required)
-    * @param version
-    */
-   public AssertionType(String iD, XMLGregorianCalendar issueInstant, String version)
-   { 
-      if( iD == null )
-         throw new IllegalArgumentException( "iD is null" );
-      if( issueInstant == null )
-         throw new IllegalArgumentException( "issueInstant is null" );
-      if( version == null )
-         throw new IllegalArgumentException( "version is null" );
-      
-      this.ID = iD;
-      this.issueInstant = issueInstant;
-      this.version = version;
-   }
-
-   /**
-    * Get the assertion id
-    * @return {@link String}
-    */
-   public String getID()
-   {
-      return ID;
-   }
-
-   /**
-    * Get the subject
-    * @return {@link SubjectType}
-    */
-   public SubjectType getSubject()
-   {
-      checkSTSPermission();
-      return subject;
-   }
-
-   /**
-    * Set the subject
-    * @param subject
-    */
-   public void setSubject(SubjectType subject)
-   {
-      checkSTSPermission();
-      this.subject = subject;
-   }
-
-   /**
-    * Get the Issue Instant
-    * @return {@link XMLGregorianCalendar}
-    */
-   public XMLGregorianCalendar getIssueInstant()
-   {
-      return issueInstant;
-   }
-
-   /**
-    * Get the version of SAML
-    * @return {@link String}
-    */
-   public String getVersion()
-   {
-      return version;
-   }   
-
-   /**
-    * Get the advice
-    * @return {@link AdviceType}
-    */
-   public AdviceType getAdvice()
-   {
-      return advice;
-   }
-
-   /**
-    * Set the advice
-    * @param advice {@link advice}
-    */
-   public void setAdvice(AdviceType advice)
-   {
-      checkSTSPermission();
-      
-      this.advice = advice;
-   }
-
-   /**
-    * Get the conditions
-    * @return {@link ConditionsType}
-    */
-   public ConditionsType getConditions()
-   {
-      checkSTSPermission();
-      
-      return conditions;
-   }
-
-   /**
-    * Set the conditions 
-    * @param conditions {@link ConditionsType}
-    */
-   public void setConditions(ConditionsType conditions)
-   {
-      checkSTSPermission();
-      
-      this.conditions = conditions;
-   }
-
-   /**
-    * Get the issuer
-    * @return {@link NameIDType}
-    */
-   public NameIDType getIssuer()
-   {
-      return issuer;
-   }
-
-   /**
-    * Set the issuer
-    * @param issuer {@link NameIDType}
-    */
-   public void setIssuer(NameIDType issuer)
-   {
-      checkSTSPermission();
-      
-      this.issuer = issuer;
-   } 
-
-   /**
-    * Add a statement
-    * @param statement {@link StatementAbstractType}
-    */
-   public void addStatement( StatementAbstractType statement )
-   {
-      checkSTSPermission();
-      
-      this.statements.add( statement );
-   }
-   /**
-    * Add a collection of statements
-    * @param statement {@link Collection}
-    */
-   public void addStatements( Collection<StatementAbstractType> statement )
-   {
-      checkSTSPermission();
-      
-      this.statements.addAll( statement );
-   }
-
-   /**
-    * Add a set of statements
-    * @param statement {@link Collection}
-    */
-   public void addStatements( Set<StatementAbstractType> statement )
-   {
-      checkSTSPermission();
-      
-      this.statements.addAll( statement );
-   }
-   
-   /**
-    * Get a read only set of statements
-    * @return {@link Set}
-    */
-   public Set<StatementAbstractType> getStatements()
-   {
-      checkSTSPermission();
-      
-      return Collections.unmodifiableSet( statements );
-   }
-
-   /**
-    * Get the signature as a DOM element
-    * @return {@link Element}
-    */
-   public Element getSignature()
-   {
-      return signature;
-   }
-
-   /**
-    * Set the signature DOM element
-    * @param signature
-    */
-   public void setSignature(Element signature)
-   {
-      this.signature = signature;
-   } 
-   
-   /**
-    * Update the issue instant
-    * @param xg
-    */
-   public void updateIssueInstant( XMLGregorianCalendar xg )
-   {
-      checkSTSPermission();
-      
-      this.issueInstant = xg; 
-   }
-   
-
-   protected void checkSTSPermission()
-   {
-      SecurityManager sm = System.getSecurityManager();
-      if( sm != null )
-         sm.checkPermission( new RuntimePermission( "org.picketlink.sts") );
-   }
-}
\ No newline at end of file

Deleted: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/assertion/AttributeStatementType.java
===================================================================
--- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/assertion/AttributeStatementType.java	2011-06-21 20:35:05 UTC (rev 1015)
+++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/assertion/AttributeStatementType.java	2011-06-21 20:44:33 UTC (rev 1016)
@@ -1,110 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2008, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors. 
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
-package org.picketlink.identity.federation.newmodel.saml.v2.assertion;
-
-import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-
-
-/**
- * <p>Java class for AttributeStatementType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained within this class.
- * 
- * <pre>
- * &lt;complexType name="AttributeStatementType">
- *   &lt;complexContent>
- *     &lt;extension base="{urn:oasis:names:tc:SAML:2.0:assertion}StatementAbstractType">
- *       &lt;choice maxOccurs="unbounded">
- *         &lt;element ref="{urn:oasis:names:tc:SAML:2.0:assertion}Attribute"/>
- *         &lt;element ref="{urn:oasis:names:tc:SAML:2.0:assertion}EncryptedAttribute"/>
- *       &lt;/choice>
- *     &lt;/extension>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */ 
-public class AttributeStatementType
-extends StatementAbstractType
-{ 
-   private static final long serialVersionUID = 1L;
-   protected List<ASTChoiceType> attributes = new ArrayList<ASTChoiceType>();
-
-   /**
-    * Add an attribute
-    * @param attribute
-    */
-   public void addAttribute( ASTChoiceType attribute )
-   {
-      attributes.add( attribute );
-   }
-   
-   /**
-    * Remove an attribute
-    * @param attribute
-    */
-   public void removeAttribute( ASTChoiceType attribute )
-   {
-      attributes.remove( attribute );
-   }
-
-   /**
-    * Gets the attributes.
-    * @return a read only {@link List} 
-    */
-   public List<ASTChoiceType> getAttributes() 
-   {
-      return Collections.unmodifiableList( this.attributes );
-   }
-
-   public static class ASTChoiceType implements Serializable
-   {
-      private static final long serialVersionUID = 1L;
-      private AttributeType attribute;
-      private EncryptedElementType encryptedAssertion;
-
-      public ASTChoiceType(AttributeType attribute)
-      {
-         super();
-         this.attribute = attribute;
-      }
-      public ASTChoiceType(EncryptedElementType encryptedAssertion)
-      {
-         super();
-         this.encryptedAssertion = encryptedAssertion;
-      }
-      public AttributeType getAttribute()
-      {
-         return attribute;
-      }
-      public EncryptedElementType getEncryptedAssertion()
-      {
-         return encryptedAssertion;
-      } 
-   }
-}
\ No newline at end of file

Deleted: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/assertion/AttributeType.java
===================================================================
--- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/assertion/AttributeType.java	2011-06-21 20:35:05 UTC (rev 1015)
+++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/assertion/AttributeType.java	2011-06-21 20:44:33 UTC (rev 1016)
@@ -1,204 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2008, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors. 
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.picketlink.identity.federation.newmodel.saml.v2.assertion;
-
-import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import javax.xml.namespace.QName; 
-
-/**
- * <p>Java class for AttributeType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained within this class.
- * 
- * <pre>
- * &lt;complexType name="AttributeType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       &lt;sequence>
- *         &lt;element ref="{urn:oasis:names:tc:SAML:2.0:assertion}AttributeValue" maxOccurs="unbounded" minOccurs="0"/>
- *       &lt;/sequence>
- *       &lt;attribute name="Name" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
- *       &lt;attribute name="NameFormat" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
- *       &lt;attribute name="FriendlyName" type="{http://www.w3.org/2001/XMLSchema}string" />
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- */ 
-public class AttributeType implements Serializable
-{
-   private static final long serialVersionUID = 1L;
-   
-   protected List<Object> attributeValue = new ArrayList<Object>(); 
-   protected String name;  
-   protected String nameFormat; 
-   protected String friendlyName; 
-   private Map<QName, String> otherAttributes = new HashMap<QName, String>();
-   
-   public AttributeType( String name )
-   {
-      this.name = name;
-   }
-
-   /**
-    * Add an attribute value to the attribute
-    * @param value {@link Object}
-    */
-   public void addAttributeValue( Object value )
-   {
-      attributeValue.add(value);
-   }
-   
-   /**
-    * Remove an attribute value to the attribute
-    * @param value {@link Object}
-    */
-   public void removeAttributeValue( Object value )
-   {
-      attributeValue.remove(value);
-   }
-
-   /**
-    * Gets the value of the attributeValue property.
-    *  
-    * <p>
-    * For example, to add a new item, do as follows:
-    * <pre>
-    *    getAttributeValue().add(newItem);
-    * </pre>
-    * 
-    * 
-    * <p>
-    * Objects of the following type(s) are allowed in the list
-    * {@link Object }
-    * 
-    * 
-    */
-   public List<Object> getAttributeValue() 
-   { 
-      return Collections.unmodifiableList( this.attributeValue );
-   }
-
-   /**
-    * Gets the value of the name property.
-    * 
-    * @return
-    *     possible object is
-    *     {@link String }
-    *     
-    */
-   public String getName() 
-   {
-      return name;
-   }
-
-   /**
-    * Sets the value of the name property.
-    * 
-    * @param value
-    *     allowed object is
-    *     {@link String }
-    *     
-    */
-   public void setName(String value) 
-   {
-      this.name = value;
-   }
-
-   /**
-    * Gets the value of the nameFormat property.
-    * 
-    * @return
-    *     possible object is
-    *     {@link String }
-    *     
-    */
-   public String getNameFormat() 
-   {
-      return nameFormat;
-   }
-
-   /**
-    * Sets the value of the nameFormat property.
-    * 
-    * @param value
-    *     allowed object is
-    *     {@link String }
-    *     
-    */
-   public void setNameFormat(String value) 
-   {
-      this.nameFormat = value;
-   }
-
-   /**
-    * Gets the value of the friendlyName property.
-    * 
-    * @return
-    *     possible object is
-    *     {@link String }
-    *     
-    */
-   public String getFriendlyName() 
-   {
-      return friendlyName;
-   }
-
-   /**
-    * Sets the value of the friendlyName property.
-    * 
-    * @param value
-    *     allowed object is
-    *     {@link String }
-    *     
-    */
-   public void setFriendlyName(String value) 
-   {
-      this.friendlyName = value;
-   }
-
-   /**
-    * Gets a map that contains attributes that aren't bound to any typed property on this class.
-    * 
-    * <p>
-    * the map is keyed by the name of the attribute and 
-    * the value is the string value of the attribute.
-    * 
-    * the map returned by this method is live, and you can add new attribute
-    * by updating the map directly. Because of this design, there's no setter.
-    * 
-    * 
-    * @return
-    *     always non-null
-    */
-   public Map<QName, String> getOtherAttributes() 
-   {
-      return otherAttributes;
-   }
-}
\ No newline at end of file

Deleted: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/assertion/AudienceRestrictionType.java
===================================================================
--- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/assertion/AudienceRestrictionType.java	2011-06-21 20:35:05 UTC (rev 1015)
+++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/assertion/AudienceRestrictionType.java	2011-06-21 20:44:33 UTC (rev 1016)
@@ -1,80 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2008, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors. 
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.picketlink.identity.federation.newmodel.saml.v2.assertion;
-
-import java.io.Serializable;
-import java.net.URI;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-/**
- * <p>Java class for AudienceRestrictionType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained within this class.
- * 
- * <pre>
- * &lt;complexType name="AudienceRestrictionType">
- *   &lt;complexContent>
- *     &lt;extension base="{urn:oasis:names:tc:SAML:2.0:assertion}ConditionAbstractType">
- *       &lt;sequence>
- *         &lt;element ref="{urn:oasis:names:tc:SAML:2.0:assertion}Audience" maxOccurs="unbounded"/>
- *       &lt;/sequence>
- *     &lt;/extension>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-public class AudienceRestrictionType extends ConditionAbstractType implements Serializable
-{
-   private static final long serialVersionUID = 1L;
-
-   protected List<URI> audience = new ArrayList<URI>();
-
-   /**
-    * Add an audience
-    * @param audienceval
-    */
-   public void addAudience(URI audienceval)
-   {
-      audience.add(audienceval);
-   }
-
-   /**
-    * Remove an audience
-    * @param audienceval
-    */
-   public void removeAudience(URI audienceval)
-   {
-      audience.remove(audienceval);
-   }
-
-   /**
-    * Gets the value of the audience property.  
-    */
-   public List<URI> getAudience()
-   {
-      return Collections.unmodifiableList(this.audience);
-   }
-}
\ No newline at end of file

Deleted: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/assertion/AuthnContextClassRefType.java
===================================================================
--- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/assertion/AuthnContextClassRefType.java	2011-06-21 20:35:05 UTC (rev 1015)
+++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/assertion/AuthnContextClassRefType.java	2011-06-21 20:44:33 UTC (rev 1016)
@@ -1,82 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2008, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors. 
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.picketlink.identity.federation.newmodel.saml.v2.assertion;
-
-import java.io.Serializable;
-import java.net.URI;
-
-/**
- * Type that represents an AuthnContextClassRef
- * @author Anil.Saldhana at redhat.com
- * @since Nov 24, 2010
- */
-public class AuthnContextClassRefType implements URIType, Serializable
-{
-   private static final long serialVersionUID = 1L;
-
-   private final URI value;
-
-   public AuthnContextClassRefType(URI value)
-   {
-      this.value = value;
-   }
-
-   public URI getValue()
-   {
-      return value;
-   }
-
-   @Override
-   public String toString()
-   {
-      return "AuthnContextClassRefType [value=" + value + "]";
-   }
-
-   @Override
-   public int hashCode()
-   {
-      final int prime = 31;
-      int result = 1;
-      result = prime * result + ((value == null) ? 0 : value.hashCode());
-      return result;
-   }
-
-   @Override
-   public boolean equals(Object obj)
-   {
-      if (this == obj)
-         return true;
-      if (obj == null)
-         return false;
-      if (getClass() != obj.getClass())
-         return false;
-      AuthnContextClassRefType other = (AuthnContextClassRefType) obj;
-      if (value == null)
-      {
-         if (other.value != null)
-            return false;
-      }
-      else if (!value.equals(other.value))
-         return false;
-      return true;
-   }
-}
\ No newline at end of file

Deleted: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/assertion/AuthnContextDeclRefType.java
===================================================================
--- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/assertion/AuthnContextDeclRefType.java	2011-06-21 20:35:05 UTC (rev 1015)
+++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/assertion/AuthnContextDeclRefType.java	2011-06-21 20:44:33 UTC (rev 1016)
@@ -1,75 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2008, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors. 
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.picketlink.identity.federation.newmodel.saml.v2.assertion;
-
-import java.io.Serializable;
-import java.net.URI;
-
-/**
- * Type that represents an AuthnContextDeclRef
- * @author Anil.Saldhana at redhat.com
- * @since Nov 24, 2010
- */
-public class AuthnContextDeclRefType implements URIType, Serializable
-{
-   private static final long serialVersionUID = 1L;
-   private URI value;
-
-   public AuthnContextDeclRefType(URI value)
-   { 
-      this.value = value;
-   }
-
-   public URI getValue()
-   {
-      return value;
-   }
-
-   @Override
-   public int hashCode()
-   {
-      final int prime = 31;
-      int result = 1;
-      result = prime * result + ((value == null) ? 0 : value.hashCode());
-      return result;
-   }
-
-   @Override
-   public boolean equals(Object obj)
-   {
-      if (this == obj)
-         return true;
-      if (obj == null)
-         return false;
-      if (getClass() != obj.getClass())
-         return false;
-      AuthnContextDeclRefType other = (AuthnContextDeclRefType) obj;
-      if (value == null)
-      {
-         if (other.value != null)
-            return false;
-      }
-      else if (!value.equals(other.value))
-         return false;
-      return true;
-   }  
-}

Deleted: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/assertion/AuthnContextDeclType.java
===================================================================
--- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/assertion/AuthnContextDeclType.java	2011-06-21 20:35:05 UTC (rev 1015)
+++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/assertion/AuthnContextDeclType.java	2011-06-21 20:44:33 UTC (rev 1016)
@@ -1,82 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2008, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors. 
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.picketlink.identity.federation.newmodel.saml.v2.assertion;
-
-import java.io.Serializable;
-import java.net.URI;
-
-/**
- * Type that represents an AuthnContextDecl
- * @author Anil.Saldhana at redhat.com
- * @since Nov 24, 2010
- */
-public class AuthnContextDeclType implements URIType, Serializable
-{
-   private static final long serialVersionUID = 1L;
-
-   private URI value;
-
-   public AuthnContextDeclType( URI value )
-   { 
-      this.value = value;
-   }
-
-   public URI getValue()
-   {
-      return value;
-   }
-
-   @Override
-   public String toString()
-   {
-      return "AuthnContextDeclType [value=" + value + "]";
-   }
-
-   @Override
-   public int hashCode()
-   {
-      final int prime = 31;
-      int result = 1;
-      result = prime * result + ((value == null) ? 0 : value.hashCode());
-      return result;
-   }
-
-   @Override
-   public boolean equals(Object obj)
-   {
-      if (this == obj)
-         return true;
-      if (obj == null)
-         return false;
-      if (getClass() != obj.getClass())
-         return false;
-      AuthnContextDeclType other = (AuthnContextDeclType) obj;
-      if (value == null)
-      {
-         if (other.value != null)
-            return false;
-      }
-      else if (!value.equals(other.value))
-         return false;
-      return true;
-   }
-}
\ No newline at end of file

Deleted: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/assertion/AuthnContextType.java
===================================================================
--- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/assertion/AuthnContextType.java	2011-06-21 20:35:05 UTC (rev 1015)
+++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/assertion/AuthnContextType.java	2011-06-21 20:44:33 UTC (rev 1016)
@@ -1,209 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2008, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors. 
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.picketlink.identity.federation.newmodel.saml.v2.assertion;
-
-import java.io.Serializable;
-import java.net.URI;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.LinkedHashSet;
-import java.util.Set;
-
-/**
- * <p>Java class for AuthnContextType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained within this class.
- * 
- * <pre>
- * &lt;complexType name="AuthnContextType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       &lt;sequence>
- *         &lt;choice>
- *           &lt;sequence>
- *             &lt;element ref="{urn:oasis:names:tc:SAML:2.0:assertion}AuthnContextClassRef"/>
- *             &lt;choice minOccurs="0">
- *               &lt;element ref="{urn:oasis:names:tc:SAML:2.0:assertion}AuthnContextDecl"/>
- *               &lt;element ref="{urn:oasis:names:tc:SAML:2.0:assertion}AuthnContextDeclRef"/>
- *             &lt;/choice>
- *           &lt;/sequence>
- *           &lt;choice>
- *             &lt;element ref="{urn:oasis:names:tc:SAML:2.0:assertion}AuthnContextDecl"/>
- *             &lt;element ref="{urn:oasis:names:tc:SAML:2.0:assertion}AuthnContextDeclRef"/>
- *           &lt;/choice>
- *         &lt;/choice>
- *         &lt;element ref="{urn:oasis:names:tc:SAML:2.0:assertion}AuthenticatingAuthority" maxOccurs="unbounded" minOccurs="0"/>
- *       &lt;/sequence>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-public class AuthnContextType implements Serializable
-{
-   private static final long serialVersionUID = 1L;
-
-   private final Set<URI> authenticatingAuthority = new LinkedHashSet<URI>();
-
-   private AuthnContextTypeSequence sequence;
-
-   private final Set<URIType> URITypes = new HashSet<URIType>();
-
-   /**
-    * Add an authenticating authority
-    * @param aa {@link URI}
-    */
-   public void addAuthenticatingAuthority(URI aa)
-   {
-      authenticatingAuthority.add(aa);
-   }
-
-   /**
-    * Add Authenticating Authority
-    * @param aas an array of {@link URI}
-    */
-   public void addAuthenticatingAuthority(URI[] aas)
-   {
-      authenticatingAuthority.addAll(Arrays.asList(aas));
-   }
-
-   /**
-    * Remove an authenticating authority
-    * @param aa
-    */
-   public void removeAuthenticatingAuthority(URI aa)
-   {
-      authenticatingAuthority.remove(aa);
-   }
-
-   /**
-    * Get a read only set of authenticating authority
-    * @return
-    */
-   public Set<URI> getAuthenticatingAuthority()
-   {
-      return Collections.unmodifiableSet(authenticatingAuthority);
-   }
-
-   /**
-    * Get the sequence
-    * @return
-    */
-   public AuthnContextTypeSequence getSequence()
-   {
-      return sequence;
-   }
-
-   /**
-    * Set the authn context sequence
-    * @param sequence
-    */
-   public void setSequence(AuthnContextTypeSequence sequence)
-   {
-      this.sequence = sequence;
-   }
-
-   /**
-    * Add an URI type
-    * @param aa
-    */
-   public void addURIType(URIType aa)
-   {
-      URITypes.add(aa);
-   }
-
-   /**
-    * Add an array of URI Type
-    * @param aas
-    */
-   public void addURIType(URIType[] aas)
-   {
-      URITypes.addAll(Arrays.asList(aas));
-   }
-
-   /**
-    * Get a read only set of URI type
-    * @return
-    */
-   public Set<URIType> getURIType()
-   {
-      return Collections.unmodifiableSet(URITypes);
-   }
-
-   /**
-    * Add an URI type
-    * @param aa
-    */
-   public void removeURIType(URIType aa)
-   {
-      URITypes.remove(aa);
-   }
-
-   /**
-    <sequence>
-       <element ref="saml:AuthnContextClassRef"/>
-       <choice minOccurs="0">
-          <element ref="saml:AuthnContextDecl"/>
-          <element ref="saml:AuthnContextDeclRef"/>
-       </choice>
-    </sequence>
-    */
-   public class AuthnContextTypeSequence
-   {
-      private AuthnContextClassRefType classRef;
-
-      private final Set<URIType> URITypes = new HashSet<URIType>();
-
-      public AuthnContextClassRefType getClassRef()
-      {
-         return classRef;
-      }
-
-      public void setClassRef(AuthnContextClassRefType classRef)
-      {
-         this.classRef = classRef;
-      }
-
-      public void addURIType(URIType aa)
-      {
-         URITypes.add(aa);
-      }
-
-      public void removeURIType(URIType aa)
-      {
-         URITypes.remove(aa);
-      }
-
-      public void addURIType(URIType[] aas)
-      {
-         URITypes.addAll(Arrays.asList(aas));
-      }
-
-      public Set<URIType> getURIType()
-      {
-         return Collections.unmodifiableSet(URITypes);
-      }
-   }
-}
\ No newline at end of file

Deleted: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/assertion/AuthnStatementType.java
===================================================================
--- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/assertion/AuthnStatementType.java	2011-06-21 20:35:05 UTC (rev 1015)
+++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/assertion/AuthnStatementType.java	2011-06-21 20:44:33 UTC (rev 1016)
@@ -1,174 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2008, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors. 
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.picketlink.identity.federation.newmodel.saml.v2.assertion;
-
-import javax.xml.datatype.XMLGregorianCalendar;
-
-
-/**
- * <p>Java class for AuthnStatementType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained within this class.
- * 
- * <pre>
- * &lt;complexType name="AuthnStatementType">
- *   &lt;complexContent>
- *     &lt;extension base="{urn:oasis:names:tc:SAML:2.0:assertion}StatementAbstractType">
- *       &lt;sequence>
- *         &lt;element ref="{urn:oasis:names:tc:SAML:2.0:assertion}SubjectLocality" minOccurs="0"/>
- *         &lt;element ref="{urn:oasis:names:tc:SAML:2.0:assertion}AuthnContext"/>
- *       &lt;/sequence>
- *       &lt;attribute name="AuthnInstant" use="required" type="{http://www.w3.org/2001/XMLSchema}dateTime" />
- *       &lt;attribute name="SessionIndex" type="{http://www.w3.org/2001/XMLSchema}string" />
- *       &lt;attribute name="SessionNotOnOrAfter" type="{http://www.w3.org/2001/XMLSchema}dateTime" />
- *     &lt;/extension>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */ 
-public class AuthnStatementType
-extends StatementAbstractType
-{ 
-   private static final long serialVersionUID = 1L;
-   
-   protected SubjectLocalityType subjectLocality; 
-   protected AuthnContextType authnContext; 
-   protected XMLGregorianCalendar authnInstant;  
-   protected XMLGregorianCalendar sessionNotOnOrAfter;
-
-   protected String sessionIndex;
-
-   public AuthnStatementType( XMLGregorianCalendar instant )
-   {
-      this.authnInstant = instant;
-   }
-
-   /**
-    * Gets the value of the subjectLocality property.
-    * 
-    * @return
-    *     possible object is
-    *     {@link SubjectLocalityType }
-    *     
-    */
-   public SubjectLocalityType getSubjectLocality() {
-      return subjectLocality;
-   }
-
-   /**
-    * Sets the value of the subjectLocality property.
-    * 
-    * @param value
-    *     allowed object is
-    *     {@link SubjectLocalityType }
-    *     
-    */
-   public void setSubjectLocality(SubjectLocalityType value) {
-      this.subjectLocality = value;
-   }
-
-   /**
-    * Gets the value of the authnContext property.
-    * 
-    * @return
-    *     possible object is
-    *     {@link AuthnContextType }
-    *     
-    */
-   public AuthnContextType getAuthnContext() {
-      return authnContext;
-   }
-
-   /**
-    * Sets the value of the authnContext property.
-    * 
-    * @param value
-    *     allowed object is
-    *     {@link AuthnContextType }
-    *     
-    */
-   public void setAuthnContext(AuthnContextType value) {
-      this.authnContext = value;
-   }
-
-   /**
-    * Gets the value of the authnInstant property.
-    * 
-    * @return
-    *     possible object is
-    *     {@link XMLGregorianCalendar }
-    *     
-    */
-   public XMLGregorianCalendar getAuthnInstant() {
-      return authnInstant;
-   } 
-
-   /**
-    * Gets the value of the sessionIndex property.
-    * 
-    * @return
-    *     possible object is
-    *     {@link String }
-    *     
-    */
-   public String getSessionIndex() {
-      return sessionIndex;
-   }
-
-   /**
-    * Sets the value of the sessionIndex property.
-    * 
-    * @param value
-    *     allowed object is
-    *     {@link String }
-    *     
-    */
-   public void setSessionIndex(String value) {
-      this.sessionIndex = value;
-   }
-
-   /**
-    * Gets the value of the sessionNotOnOrAfter property.
-    * 
-    * @return
-    *     possible object is
-    *     {@link XMLGregorianCalendar }
-    *     
-    */
-   public XMLGregorianCalendar getSessionNotOnOrAfter() {
-      return sessionNotOnOrAfter;
-   }
-
-   /**
-    * Sets the value of the sessionNotOnOrAfter property.
-    * 
-    * @param value
-    *     allowed object is
-    *     {@link XMLGregorianCalendar }
-    *     
-    */
-   public void setSessionNotOnOrAfter(XMLGregorianCalendar value) {
-      this.sessionNotOnOrAfter = value;
-   } 
-}
\ No newline at end of file

Deleted: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/assertion/AuthzDecisionStatementType.java
===================================================================
--- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/assertion/AuthzDecisionStatementType.java	2011-06-21 20:35:05 UTC (rev 1015)
+++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/assertion/AuthzDecisionStatementType.java	2011-06-21 20:44:33 UTC (rev 1016)
@@ -1,158 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2008, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors. 
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.picketlink.identity.federation.newmodel.saml.v2.assertion;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-
-/**
- * <p>Java class for AuthzDecisionStatementType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained within this class.
- * 
- * <pre>
- * &lt;complexType name="AuthzDecisionStatementType">
- *   &lt;complexContent>
- *     &lt;extension base="{urn:oasis:names:tc:SAML:2.0:assertion}StatementAbstractType">
- *       &lt;sequence>
- *         &lt;element ref="{urn:oasis:names:tc:SAML:2.0:assertion}Action" maxOccurs="unbounded"/>
- *         &lt;element ref="{urn:oasis:names:tc:SAML:2.0:assertion}Evidence" minOccurs="0"/>
- *       &lt;/sequence>
- *       &lt;attribute name="Resource" use="required" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
- *       &lt;attribute name="Decision" use="required" type="{urn:oasis:names:tc:SAML:2.0:assertion}DecisionType" />
- *     &lt;/extension>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */ 
-public class AuthzDecisionStatementType
-extends StatementAbstractType
-{ 
-   private static final long serialVersionUID = 1L;
-   protected List<ActionType> action = new ArrayList<ActionType>(); 
-   protected EvidenceType evidence; 
-   protected String resource; 
-   protected DecisionType decision;
-
-   /**
-    * Get the list of actions (read-only list)
-    * @return {@link List} read only 
-    */
-   public List<ActionType> getAction() 
-   { 
-      return Collections.unmodifiableList( this.action );
-   }
-
-   /**
-    * Add an action
-    * @param actionType
-    */
-   public void addAction( ActionType actionType )
-   {
-      action.add(actionType); 
-   }
-   
-   /**
-    * Remove an action
-    * @param actionType
-    */
-   public void removeAction( ActionType actionType )
-   {
-      action.remove(actionType); 
-   }
-
-   /**
-    * Gets the value of the evidence property.
-    * 
-    * @return
-    *     possible object is
-    *     {@link EvidenceType }
-    *     
-    */
-   public EvidenceType getEvidence() {
-      return evidence;
-   }
-
-   /**
-    * Sets the value of the evidence property.
-    * 
-    * @param value
-    *     allowed object is
-    *     {@link EvidenceType }
-    *     
-    */
-   public void setEvidence(EvidenceType value) {
-      this.evidence = value;
-   }
-
-   /**
-    * Gets the value of the resource property.
-    * 
-    * @return
-    *     possible object is
-    *     {@link String }
-    *     
-    */
-   public String getResource() {
-      return resource;
-   }
-
-   /**
-    * Sets the value of the resource property.
-    * 
-    * @param value
-    *     allowed object is
-    *     {@link String }
-    *     
-    */
-   public void setResource(String value) {
-      this.resource = value;
-   }
-
-   /**
-    * Gets the value of the decision property.
-    * 
-    * @return
-    *     possible object is
-    *     {@link DecisionType }
-    *     
-    */
-   public DecisionType getDecision() {
-      return decision;
-   }
-
-   /**
-    * Sets the value of the decision property.
-    * 
-    * @param value
-    *     allowed object is
-    *     {@link DecisionType }
-    *     
-    */
-   public void setDecision(DecisionType value) {
-      this.decision = value;
-   }
-}
\ No newline at end of file

Deleted: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/assertion/BaseIDAbstractType.java
===================================================================
--- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/assertion/BaseIDAbstractType.java	2011-06-21 20:35:05 UTC (rev 1015)
+++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/assertion/BaseIDAbstractType.java	2011-06-21 20:44:33 UTC (rev 1016)
@@ -1,63 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2008, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors. 
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.picketlink.identity.federation.newmodel.saml.v2.assertion;
-
-import java.io.Serializable;
-
-/**
- * Abstract Type that represents an ID
- <pre>
- &lt;attributeGroup name="IDNameQualifiers">
-        &lt;attribute name="NameQualifier" type="string" use="optional"/>
-        &lt;attribute name="SPNameQualifier" type="string" use="optional"/>
-    &lt;/attributeGroup>
-
-    &lt;complexType name="BaseIDAbstractType" abstract="true">
-        &lt;attributeGroup ref="saml:IDNameQualifiers"/>
-    &lt;/complexType>
- </pre>
- * @author Anil.Saldhana at redhat.com
- * @since Nov 24, 2010
- */
-public abstract class BaseIDAbstractType implements Serializable
-{ 
-   private static final long serialVersionUID = 1L;
-   private String nameQualifier;
-   private String sPNameQualifier;
-
-   public String getNameQualifier()
-   {
-      return nameQualifier;
-   }
-   public void setNameQualifier(String nameQualifier)
-   {
-      this.nameQualifier = nameQualifier;
-   }
-   public String getSPNameQualifier()
-   {
-      return sPNameQualifier;
-   }
-   public void setSPNameQualifier(String sPNameQualifier)
-   {
-      this.sPNameQualifier = sPNameQualifier;
-   }
-}
\ No newline at end of file

Deleted: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/assertion/ConditionAbstractType.java
===================================================================
--- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/assertion/ConditionAbstractType.java	2011-06-21 20:35:05 UTC (rev 1015)
+++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/assertion/ConditionAbstractType.java	2011-06-21 20:44:33 UTC (rev 1016)
@@ -1,46 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2008, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors. 
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.picketlink.identity.federation.newmodel.saml.v2.assertion;
-
-import java.io.Serializable;
-
-
-/**
- * <p>Java class for ConditionAbstractType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained within this class.
- * 
- * <pre>
- * &lt;complexType name="ConditionAbstractType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */ 
-public abstract class ConditionAbstractType implements Serializable
-{
-   private static final long serialVersionUID = 1L;
-}
\ No newline at end of file

Deleted: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/assertion/ConditionsType.java
===================================================================
--- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/assertion/ConditionsType.java	2011-06-21 20:35:05 UTC (rev 1015)
+++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/assertion/ConditionsType.java	2011-06-21 20:44:33 UTC (rev 1016)
@@ -1,136 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2008, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors. 
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.picketlink.identity.federation.newmodel.saml.v2.assertion;
-
-import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
- 
-import javax.xml.datatype.XMLGregorianCalendar;
-
-
-/**
- * <p>Java class for ConditionsType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained within this class.
- * 
- * <pre>
- * &lt;complexType name="ConditionsType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       &lt;choice maxOccurs="unbounded" minOccurs="0">
- *         &lt;element ref="{urn:oasis:names:tc:SAML:2.0:assertion}Condition"/>
- *         &lt;element ref="{urn:oasis:names:tc:SAML:2.0:assertion}AudienceRestriction"/>
- *         &lt;element ref="{urn:oasis:names:tc:SAML:2.0:assertion}OneTimeUse"/>
- *         &lt;element ref="{urn:oasis:names:tc:SAML:2.0:assertion}ProxyRestriction"/>
- *       &lt;/choice>
- *       &lt;attribute name="NotBefore" type="{http://www.w3.org/2001/XMLSchema}dateTime" />
- *       &lt;attribute name="NotOnOrAfter" type="{http://www.w3.org/2001/XMLSchema}dateTime" />
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */ 
-public class ConditionsType implements Serializable
-{  
-   private static final long serialVersionUID = 1L;
-   protected List<ConditionAbstractType> conditions = new ArrayList<ConditionAbstractType>(); 
-   protected XMLGregorianCalendar notBefore; 
-   protected XMLGregorianCalendar notOnOrAfter;
-
-   /**
-    * Add a condition
-    * @param condition
-    */
-   public void addCondition( ConditionAbstractType condition )
-   {
-      this.conditions.add( condition );
-   }
-   
-   /**
-    * Remove a condition
-    * @param condition
-    */
-   public void removeCondition( ConditionAbstractType condition )
-   {
-      this.conditions.remove( condition );
-   }
-
-   /**
-    * Gets an read only conditions list. 
-    */
-   public List<ConditionAbstractType> getConditions() 
-   { 
-      return Collections.unmodifiableList( this.conditions );
-   }
-
-   /**
-    * Gets the value of the notBefore property.
-    * 
-    * @return
-    *     possible object is
-    *     {@link XMLGregorianCalendar }
-    *     
-    */
-   public XMLGregorianCalendar getNotBefore() {
-      return notBefore;
-   }
-
-   /**
-    * Sets the value of the notBefore property.
-    * 
-    * @param value
-    *     allowed object is
-    *     {@link XMLGregorianCalendar }
-    *     
-    */
-   public void setNotBefore(XMLGregorianCalendar value) {
-      this.notBefore = value;
-   }
-
-   /**
-    * Gets the value of the notOnOrAfter property.
-    * 
-    * @return
-    *     possible object is
-    *     {@link XMLGregorianCalendar }
-    *     
-    */
-   public XMLGregorianCalendar getNotOnOrAfter() {
-      return notOnOrAfter;
-   }
-
-   /**
-    * Sets the value of the notOnOrAfter property.
-    * 
-    * @param value
-    *     allowed object is
-    *     {@link XMLGregorianCalendar }
-    *     
-    */
-   public void setNotOnOrAfter(XMLGregorianCalendar value) {
-      this.notOnOrAfter = value;
-   }
-}
\ No newline at end of file

Deleted: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/assertion/DecisionType.java
===================================================================
--- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/assertion/DecisionType.java	2011-06-21 20:35:05 UTC (rev 1015)
+++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/assertion/DecisionType.java	2011-06-21 20:44:33 UTC (rev 1016)
@@ -1,66 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2008, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors. 
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.picketlink.identity.federation.newmodel.saml.v2.assertion;
-
-/**
- * <p>Java class for DecisionType.
- * 
- * <p>The following schema fragment specifies the expected content contained within this class.
- * <p>
- * <pre>
- * &lt;simpleType name="DecisionType">
- *   &lt;restriction base="{http://www.w3.org/2001/XMLSchema}string">
- *     &lt;enumeration value="Permit"/>
- *     &lt;enumeration value="Deny"/>
- *     &lt;enumeration value="Indeterminate"/>
- *   &lt;/restriction>
- * &lt;/simpleType>
- * </pre>
- * 
- */
-public enum DecisionType 
-{ 
-   PERMIT("Permit"),
-   DENY("Deny"),
-   INDETERMINATE("Indeterminate");
-   private final String value;
-
-   DecisionType(String v) {
-      value = v;
-   }
-
-   public String value() {
-      return value;
-   }
-
-   public static DecisionType fromValue(String v) 
-   {
-      for (DecisionType c: DecisionType.values()) 
-      {
-         if (c.value.equals(v)) 
-         {
-            return c;
-         }
-      }
-      throw new IllegalArgumentException(v);
-   }
-}
\ No newline at end of file

Deleted: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/assertion/EncryptedAssertionType.java
===================================================================
--- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/assertion/EncryptedAssertionType.java	2011-06-21 20:35:05 UTC (rev 1015)
+++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/assertion/EncryptedAssertionType.java	2011-06-21 20:44:33 UTC (rev 1016)
@@ -1,49 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2008, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors. 
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.picketlink.identity.federation.newmodel.saml.v2.assertion;
-
-import org.w3c.dom.Element;
-
-/**
- * Assertion that is encrypted
- * @author Anil.Saldhana at redhat.com
- * @since Nov 24, 2010
- */
-public class EncryptedAssertionType extends EncryptedElementType
-{
-   private static final long serialVersionUID = 1L;
-
-   public EncryptedAssertionType()
-   {
-      super();
-   }
-
-   public EncryptedAssertionType(Element el)
-   {
-      super(el);
-   }
-
-   public String getID()
-   {
-      return null;
-   }
-}
\ No newline at end of file

Deleted: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/assertion/EncryptedElementType.java
===================================================================
--- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/assertion/EncryptedElementType.java	2011-06-21 20:35:05 UTC (rev 1015)
+++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/assertion/EncryptedElementType.java	2011-06-21 20:44:33 UTC (rev 1016)
@@ -1,66 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2008, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors. 
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.picketlink.identity.federation.newmodel.saml.v2.assertion;
-
-import java.io.Serializable;
-
-import org.w3c.dom.Element;
-
-/**
- * Represents an element that is encrypted
- * @author Anil.Saldhana at redhat.com
- * @since Nov 24, 2010
- */
-public class EncryptedElementType implements Serializable
-{
-   private static final long serialVersionUID = 1L;
-
-   /**
-    <complexType name="EncryptedElementType">
-        <sequence>
-            <element ref="xenc:EncryptedData"/>
-            <element ref="xenc:EncryptedKey" minOccurs="0" maxOccurs="unbounded"/>
-        </sequence>
-    </complexType>
-    */
-
-   protected Element encryptedElement;
-
-   public EncryptedElementType()
-   {
-   }
-
-   public EncryptedElementType(Element el)
-   {
-      this.encryptedElement = el;
-   }
-
-   public Element getEncryptedElement()
-   {
-      return encryptedElement;
-   }
-
-   public void setEncryptedElement(Element encryptedElement)
-   {
-      this.encryptedElement = encryptedElement;
-   }
-}
\ No newline at end of file

Deleted: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/assertion/EvidenceType.java
===================================================================
--- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/assertion/EvidenceType.java	2011-06-21 20:35:05 UTC (rev 1015)
+++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/assertion/EvidenceType.java	2011-06-21 20:44:33 UTC (rev 1016)
@@ -1,134 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2008, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors. 
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
-package org.picketlink.identity.federation.newmodel.saml.v2.assertion;
-
-import java.io.Serializable;
-import java.net.URI;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-
-/**
- * <p>Java class for EvidenceType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained within this class.
- * 
- * <pre>
- * &lt;complexType name="EvidenceType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       &lt;choice maxOccurs="unbounded">
- *         &lt;element ref="{urn:oasis:names:tc:SAML:2.0:assertion}AssertionIDRef"/>
- *         &lt;element ref="{urn:oasis:names:tc:SAML:2.0:assertion}AssertionURIRef"/>
- *         &lt;element ref="{urn:oasis:names:tc:SAML:2.0:assertion}Assertion"/>
- *         &lt;element ref="{urn:oasis:names:tc:SAML:2.0:assertion}EncryptedAssertion"/>
- *       &lt;/choice>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */ 
-public class EvidenceType implements Serializable
-{
-   private static final long serialVersionUID = 1L;
-   protected List<ChoiceType> evidences = new ArrayList<ChoiceType>();
-
-   /**
-    * Add an evidence
-    * @param evidence
-    */
-   public void addEvidence( ChoiceType evidence )
-   {
-      evidences.add( evidence );
-   }
-   
-   /**
-    * Remove an evidence
-    * @param evidence
-    */
-   public void removeEvidence( ChoiceType evidence )
-   {
-      evidences.remove( evidence );
-   }
-
-   /**
-    * Get the list of evidences as a read only list
-    * @return
-    */
-   public List<ChoiceType> evidences()
-   {
-      return Collections.unmodifiableList( evidences );
-   }
-
-   public static class ChoiceType implements Serializable
-   {
-      private static final long serialVersionUID = 1L;
-      private String AssertionIDRef;
-      private URI AssertionURIRef;
-      private AssertionType assertion;
-      private EncryptedAssertionType encryptedAssertion;
-
-      public ChoiceType(String assertionIDRef)
-      { 
-         AssertionIDRef = assertionIDRef;
-      }
-
-      public ChoiceType(URI assertionURIRef)
-      { 
-         AssertionURIRef = assertionURIRef;
-      }
-
-      public ChoiceType(AssertionType assertion)
-      { 
-         this.assertion = assertion;
-      }
-
-      public ChoiceType(EncryptedAssertionType encryptedAssertion)
-      { 
-         this.encryptedAssertion = encryptedAssertion;
-      }
-
-      public String getAssertionIDRef()
-      {
-         return AssertionIDRef;
-      }
-
-      public URI getAssertionURIRef()
-      {
-         return AssertionURIRef;
-      }
-
-      public AssertionType getAssertion()
-      {
-         return assertion;
-      }
-
-      public EncryptedAssertionType getEncryptedAssertion()
-      {
-         return encryptedAssertion;
-      } 
-   }
-}
\ No newline at end of file

Deleted: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/assertion/KeyInfoConfirmationDataType.java
===================================================================
--- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/assertion/KeyInfoConfirmationDataType.java	2011-06-21 20:35:05 UTC (rev 1015)
+++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/assertion/KeyInfoConfirmationDataType.java	2011-06-21 20:44:33 UTC (rev 1016)
@@ -1,60 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2008, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors. 
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.picketlink.identity.federation.newmodel.saml.v2.assertion;
-
-import org.w3c.dom.Element;
-
-/**
- * <p>Java class for KeyInfoConfirmationDataType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained within this class.
- * 
- * <pre>
- * &lt;complexType name="KeyInfoConfirmationDataType">
- *   &lt;complexContent>
- *     &lt;restriction base="{urn:oasis:names:tc:SAML:2.0:assertion}SubjectConfirmationDataType">
- *       &lt;sequence>
- *         &lt;element ref="{http://www.w3.org/2000/09/xmldsig#}KeyInfo" maxOccurs="unbounded"/>
- *       &lt;/sequence>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-public class KeyInfoConfirmationDataType extends SubjectConfirmationDataType
-{
-   private static final long serialVersionUID = 2510471236717847074L;
-
-   protected Element keyInfo;
-
-   public Element getKeyInfo()
-   {
-      return keyInfo;
-   }
-
-   public void setKeyInfo(Element keyInfo)
-   {
-      this.keyInfo = keyInfo;
-   }
-}
\ No newline at end of file

Deleted: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/assertion/NameIDType.java
===================================================================
--- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/assertion/NameIDType.java	2011-06-21 20:35:05 UTC (rev 1015)
+++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/assertion/NameIDType.java	2011-06-21 20:44:33 UTC (rev 1016)
@@ -1,88 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2008, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors. 
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.picketlink.identity.federation.newmodel.saml.v2.assertion;
-
-import java.net.URI;
-
-/**
- * Represents a NameIDType
- * @author Anil.Saldhana at redhat.com
- * @since Nov 24, 2010
- */
-public class NameIDType extends BaseIDAbstractType
-{
-   /*
-    <complexType name="NameIDType">
-        <simpleContent>
-            <extension base="string">
-                <attributeGroup ref="saml:IDNameQualifiers"/>
-                <attribute name="Format" type="anyURI" use="optional"/>
-                <attribute name="SPProvidedID" type="string" use="optional"/>
-            </extension>
-        </simpleContent>
-    </complexType>
-
-    <attributeGroup name="IDNameQualifiers">
-        <attribute name="NameQualifier" type="string" use="optional"/>
-        <attribute name="SPNameQualifier" type="string" use="optional"/>
-    </attributeGroup>
-    */
-
-   private static final long serialVersionUID = 1L;
-   private String value;
-   private URI format;
-   private String sPProvidedID; 
-
-   public String getValue()
-   {
-      return value;
-   }
-   public void setValue(String value)
-   {
-      this.value = value;
-   }
-
-   public String getsPProvidedID()
-   {
-      return sPProvidedID;
-   }
-   public void setsPProvidedID(String sPProvidedID)
-   {
-      this.sPProvidedID = sPProvidedID;
-   }
-   public URI getFormat()
-   {
-      return format;
-   }
-   public void setFormat(URI format)
-   {
-      this.format = format;
-   }
-   public String getSPProvidedID()
-   {
-      return sPProvidedID;
-   }
-   public void setSPProvidedID(String sPProvidedID)
-   {
-      this.sPProvidedID = sPProvidedID;
-   } 
-}
\ No newline at end of file

Deleted: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/assertion/OneTimeUseType.java
===================================================================
--- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/assertion/OneTimeUseType.java	2011-06-21 20:35:05 UTC (rev 1015)
+++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/assertion/OneTimeUseType.java	2011-06-21 20:44:33 UTC (rev 1016)
@@ -1,44 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2008, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors. 
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.picketlink.identity.federation.newmodel.saml.v2.assertion;
- 
-
-/**
- * <p>Java class for OneTimeUseType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained within this class.
- * 
- * <pre>
- * &lt;complexType name="OneTimeUseType">
- *   &lt;complexContent>
- *     &lt;extension base="{urn:oasis:names:tc:SAML:2.0:assertion}ConditionAbstractType">
- *     &lt;/extension>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */ 
-public class OneTimeUseType
-    extends ConditionAbstractType
-{ 
-}
\ No newline at end of file

Deleted: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/assertion/ProxyRestrictionType.java
===================================================================
--- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/assertion/ProxyRestrictionType.java	2011-06-21 20:35:05 UTC (rev 1015)
+++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/assertion/ProxyRestrictionType.java	2011-06-21 20:44:33 UTC (rev 1016)
@@ -1,108 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2008, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors. 
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.picketlink.identity.federation.newmodel.saml.v2.assertion;
-
-import java.math.BigInteger;
-import java.net.URI;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-
-/**
- * <p>Java class for ProxyRestrictionType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained within this class.
- * 
- * <pre>
- * &lt;complexType name="ProxyRestrictionType">
- *   &lt;complexContent>
- *     &lt;extension base="{urn:oasis:names:tc:SAML:2.0:assertion}ConditionAbstractType">
- *       &lt;sequence>
- *         &lt;element ref="{urn:oasis:names:tc:SAML:2.0:assertion}Audience" maxOccurs="unbounded" minOccurs="0"/>
- *       &lt;/sequence>
- *       &lt;attribute name="Count" type="{http://www.w3.org/2001/XMLSchema}nonNegativeInteger" />
- *     &lt;/extension>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */ 
-public class ProxyRestrictionType
-extends ConditionAbstractType
-{ 
-   protected List<URI> audience = new ArrayList<URI>();
-
-   protected BigInteger count;
-
-   /**
-    * Add an audience
-    * @param a
-    */
-   public void addAudience( URI a )
-   {
-      this.audience.add( a );
-   }
-
-   /**
-    * Gets the value of the audience property.
-    *  
-    */
-   public List<URI> getAudience() 
-   { 
-      return Collections.unmodifiableList( audience );
-   }
-   
-   /**
-    * Remove an audience
-    * @param a
-    */
-   public void removeAudience( URI a )
-   {
-      this.audience.remove( a );
-   }
-
-   /**
-    * Gets the value of the count property.
-    * 
-    * @return
-    *     possible object is
-    *     {@link BigInteger }
-    *     
-    */
-   public BigInteger getCount() {
-      return count;
-   }
-
-   /**
-    * Sets the value of the count property.
-    * 
-    * @param value
-    *     allowed object is
-    *     {@link BigInteger }
-    *     
-    */
-   public void setCount(BigInteger value) {
-      this.count = value;
-   }
-}
\ No newline at end of file

Deleted: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/assertion/StatementAbstractType.java
===================================================================
--- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/assertion/StatementAbstractType.java	2011-06-21 20:35:05 UTC (rev 1015)
+++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/assertion/StatementAbstractType.java	2011-06-21 20:44:33 UTC (rev 1016)
@@ -1,48 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2008, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors. 
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
-package org.picketlink.identity.federation.newmodel.saml.v2.assertion;
-
-import java.io.Serializable;
- 
-
-
-/**
- * <p>Java class for StatementAbstractType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained within this class.
- * 
- * <pre>
- * &lt;complexType name="StatementAbstractType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */ 
-public abstract class StatementAbstractType implements Serializable
-{ 
-   private static final long serialVersionUID = 1L;
-}
\ No newline at end of file

Deleted: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/assertion/SubjectConfirmationDataType.java
===================================================================
--- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/assertion/SubjectConfirmationDataType.java	2011-06-21 20:35:05 UTC (rev 1015)
+++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/assertion/SubjectConfirmationDataType.java	2011-06-21 20:44:33 UTC (rev 1016)
@@ -1,247 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2008, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors. 
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.picketlink.identity.federation.newmodel.saml.v2.assertion;
-
-import java.io.Serializable;
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Map;
-
-import javax.xml.datatype.XMLGregorianCalendar;
-import javax.xml.namespace.QName;
-
-/**
- * <p>Java class for SubjectConfirmationDataType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained within this class.
- * 
- * <pre>
- * &lt;complexType name="SubjectConfirmationDataType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       &lt;sequence>
- *         &lt;any/>
- *       &lt;/sequence>
- *       &lt;attribute name="NotBefore" type="{http://www.w3.org/2001/XMLSchema}dateTime" />
- *       &lt;attribute name="NotOnOrAfter" type="{http://www.w3.org/2001/XMLSchema}dateTime" />
- *       &lt;attribute name="Recipient" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
- *       &lt;attribute name="InResponseTo" type="{http://www.w3.org/2001/XMLSchema}NCName" />
- *       &lt;attribute name="Address" type="{http://www.w3.org/2001/XMLSchema}string" />
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-public class SubjectConfirmationDataType implements Serializable
-{
-   private static final long serialVersionUID = 7695748370849965158L;
-
-   protected XMLGregorianCalendar notBefore;
-
-   protected XMLGregorianCalendar notOnOrAfter;
-
-   protected String recipient;
-
-   protected String inResponseTo;
-
-   protected String address;
-
-   private final Map<QName, String> otherAttributes = new HashMap<QName, String>();
-
-   private Object anyType;
-
-   public Object getAnyType()
-   {
-      return anyType;
-   }
-
-   public void setAnyType(Object anyType)
-   {
-      this.anyType = anyType;
-   }
-
-   /**
-    * Gets the value of the notBefore property.
-    * 
-    * @return
-    *     possible object is
-    *     {@link XMLGregorianCalendar }
-    *     
-    */
-   public XMLGregorianCalendar getNotBefore()
-   {
-      return notBefore;
-   }
-
-   /**
-    * Sets the value of the notBefore property.
-    * 
-    * @param value
-    *     allowed object is
-    *     {@link XMLGregorianCalendar }
-    *     
-    */
-   public void setNotBefore(XMLGregorianCalendar value)
-   {
-      this.notBefore = value;
-   }
-
-   /**
-    * Gets the value of the notOnOrAfter property.
-    * 
-    * @return
-    *     possible object is
-    *     {@link XMLGregorianCalendar }
-    *     
-    */
-   public XMLGregorianCalendar getNotOnOrAfter()
-   {
-      return notOnOrAfter;
-   }
-
-   /**
-    * Sets the value of the notOnOrAfter property.
-    * 
-    * @param value
-    *     allowed object is
-    *     {@link XMLGregorianCalendar }
-    *     
-    */
-   public void setNotOnOrAfter(XMLGregorianCalendar value)
-   {
-      this.notOnOrAfter = value;
-   }
-
-   /**
-    * Gets the value of the recipient property.
-    * 
-    * @return
-    *     possible object is
-    *     {@link String }
-    *     
-    */
-   public String getRecipient()
-   {
-      return recipient;
-   }
-
-   /**
-    * Sets the value of the recipient property.
-    * 
-    * @param value
-    *     allowed object is
-    *     {@link String }
-    *     
-    */
-   public void setRecipient(String value)
-   {
-      this.recipient = value;
-   }
-
-   /**
-    * Gets the value of the inResponseTo property.
-    * 
-    * @return
-    *     possible object is
-    *     {@link String }
-    *     
-    */
-   public String getInResponseTo()
-   {
-      return inResponseTo;
-   }
-
-   /**
-    * Sets the value of the inResponseTo property.
-    * 
-    * @param value
-    *     allowed object is
-    *     {@link String }
-    *     
-    */
-   public void setInResponseTo(String value)
-   {
-      this.inResponseTo = value;
-   }
-
-   /**
-    * Gets the value of the address property.
-    * 
-    * @return
-    *     possible object is
-    *     {@link String }
-    *     
-    */
-   public String getAddress()
-   {
-      return address;
-   }
-
-   /**
-    * Sets the value of the address property.
-    * 
-    * @param value
-    *     allowed object is
-    *     {@link String }
-    *     
-    */
-   public void setAddress(String value)
-   {
-      this.address = value;
-   }
-
-   /**
-    * Gets a map that contains attributes that aren't bound to any typed property on this class.
-    * 
-    * <p>
-    * the map is keyed by the name of the attribute and 
-    * the value is the string value of the attribute.
-    * 
-    * @return
-    *     always non-null
-    */
-   public Map<QName, String> getOtherAttributes()
-   {
-      return Collections.unmodifiableMap(otherAttributes);
-   }
-
-   /**
-    * Add an other attribute
-    * @param qname
-    * @param str
-    */
-   public void addOtherAttribute(QName qname, String str)
-   {
-      otherAttributes.put(qname, str);
-   }
-
-   /**
-    * Remove an other attribute
-    * @param qname {@link QName} of the attribute to be removed
-    */
-   public void removeOtherAttribute(QName qname)
-   {
-      otherAttributes.remove(qname);
-   }
-}
\ No newline at end of file

Deleted: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/assertion/SubjectConfirmationType.java
===================================================================
--- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/assertion/SubjectConfirmationType.java	2011-06-21 20:35:05 UTC (rev 1015)
+++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/assertion/SubjectConfirmationType.java	2011-06-21 20:44:33 UTC (rev 1016)
@@ -1,182 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2008, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors. 
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-
-package org.picketlink.identity.federation.newmodel.saml.v2.assertion;
-
-import java.io.Serializable;
-
-
-
-/**
- * <p>Java class for SubjectConfirmationType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained within this class.
- * 
- * <pre>
- * &lt;complexType name="SubjectConfirmationType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       &lt;sequence>
- *         &lt;choice minOccurs="0">
- *           &lt;element ref="{urn:oasis:names:tc:SAML:2.0:assertion}BaseID"/>
- *           &lt;element ref="{urn:oasis:names:tc:SAML:2.0:assertion}NameID"/>
- *           &lt;element ref="{urn:oasis:names:tc:SAML:2.0:assertion}EncryptedID"/>
- *         &lt;/choice>
- *         &lt;element ref="{urn:oasis:names:tc:SAML:2.0:assertion}SubjectConfirmationData" minOccurs="0"/>
- *       &lt;/sequence>
- *       &lt;attribute name="Method" use="required" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */ 
-public class SubjectConfirmationType implements Serializable
-{ 
-   private static final long serialVersionUID = 1L;
-   protected BaseIDAbstractType baseID; 
-   protected NameIDType nameID; 
-   protected EncryptedElementType encryptedID; 
-   protected SubjectConfirmationDataType subjectConfirmationData; 
-   protected String method;
-
-   /**
-    * Gets the value of the baseID property.
-    * 
-    * @return
-    *     possible object is
-    *     {@link BaseIDAbstractType }
-    *     
-    */
-   public BaseIDAbstractType getBaseID() {
-      return baseID;
-   }
-
-   /**
-    * Sets the value of the baseID property.
-    * 
-    * @param value
-    *     allowed object is
-    *     {@link BaseIDAbstractType }
-    *     
-    */
-   public void setBaseID(BaseIDAbstractType value) {
-      this.baseID = value;
-   }
-
-   /**
-    * Gets the value of the nameID property.
-    * 
-    * @return
-    *     possible object is
-    *     {@link NameIDType }
-    *     
-    */
-   public NameIDType getNameID() {
-      return nameID;
-   }
-
-   /**
-    * Sets the value of the nameID property.
-    * 
-    * @param value
-    *     allowed object is
-    *     {@link NameIDType }
-    *     
-    */
-   public void setNameID(NameIDType value) {
-      this.nameID = value;
-   }
-
-   /**
-    * Gets the value of the encryptedID property.
-    * 
-    * @return
-    *     possible object is
-    *     {@link EncryptedElementType }
-    *     
-    */
-   public EncryptedElementType getEncryptedID() {
-      return encryptedID;
-   }
-
-   /**
-    * Sets the value of the encryptedID property.
-    * 
-    * @param value
-    *     allowed object is
-    *     {@link EncryptedElementType }
-    *     
-    */
-   public void setEncryptedID(EncryptedElementType value) {
-      this.encryptedID = value;
-   }
-
-   /**
-    * Gets the value of the subjectConfirmationData property.
-    * 
-    * @return
-    *     possible object is
-    *     {@link SubjectConfirmationDataType }
-    *     
-    */
-   public SubjectConfirmationDataType getSubjectConfirmationData() {
-      return subjectConfirmationData;
-   }
-
-   /**
-    * Sets the value of the subjectConfirmationData property.
-    * 
-    * @param value
-    *     allowed object is
-    *     {@link SubjectConfirmationDataType }
-    *     
-    */
-   public void setSubjectConfirmationData(SubjectConfirmationDataType value) {
-      this.subjectConfirmationData = value;
-   }
-
-   /**
-    * 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;
-   }
-}
\ No newline at end of file

Deleted: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/assertion/SubjectLocalityType.java
===================================================================
--- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/assertion/SubjectLocalityType.java	2011-06-21 20:35:05 UTC (rev 1015)
+++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/assertion/SubjectLocalityType.java	2011-06-21 20:44:33 UTC (rev 1016)
@@ -1,103 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2008, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors. 
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.picketlink.identity.federation.newmodel.saml.v2.assertion;
-
-import java.io.Serializable;
-
-/**
- * <p>Java class for SubjectLocalityType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained within this class.
- * 
- * <pre>
- * &lt;complexType name="SubjectLocalityType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       &lt;attribute name="Address" type="{http://www.w3.org/2001/XMLSchema}string" />
- *       &lt;attribute name="DNSName" type="{http://www.w3.org/2001/XMLSchema}string" />
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-public class SubjectLocalityType implements Serializable
-{
-   private static final long serialVersionUID = 1L;
-
-   protected String address;
-
-   protected String dnsName;
-
-   /**
-    * Gets the value of the address property.
-    * 
-    * @return
-    *     possible object is
-    *     {@link String }
-    *     
-    */
-   public String getAddress()
-   {
-      return address;
-   }
-
-   /**
-    * Sets the value of the address property.
-    * 
-    * @param value
-    *     allowed object is
-    *     {@link String }
-    *     
-    */
-   public void setAddress(String value)
-   {
-      this.address = value;
-   }
-
-   /**
-    * Gets the value of the dnsName property.
-    * 
-    * @return
-    *     possible object is
-    *     {@link String }
-    *     
-    */
-   public String getDNSName()
-   {
-      return dnsName;
-   }
-
-   /**
-    * Sets the value of the dnsName property.
-    * 
-    * @param value
-    *     allowed object is
-    *     {@link String }
-    *     
-    */
-   public void setDNSName(String value)
-   {
-      this.dnsName = value;
-   }
-}
\ No newline at end of file

Deleted: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/assertion/SubjectType.java
===================================================================
--- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/assertion/SubjectType.java	2011-06-21 20:35:05 UTC (rev 1015)
+++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/assertion/SubjectType.java	2011-06-21 20:44:33 UTC (rev 1016)
@@ -1,163 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2008, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors. 
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.picketlink.identity.federation.newmodel.saml.v2.assertion;
-
-import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-/**
- * <p>Java class for SubjectType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained within this class.
- * 
- * <pre>
- * &lt;complexType name="SubjectType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       &lt;choice>
- *         &lt;sequence>
- *           &lt;choice>
- *             &lt;element ref="{urn:oasis:names:tc:SAML:2.0:assertion}BaseID"/>
- *             &lt;element ref="{urn:oasis:names:tc:SAML:2.0:assertion}NameID"/>
- *             &lt;element ref="{urn:oasis:names:tc:SAML:2.0:assertion}EncryptedID"/>
- *           &lt;/choice>
- *           &lt;element ref="{urn:oasis:names:tc:SAML:2.0:assertion}SubjectConfirmation" maxOccurs="unbounded" minOccurs="0"/>
- *         &lt;/sequence>
- *         &lt;element ref="{urn:oasis:names:tc:SAML:2.0:assertion}SubjectConfirmation" maxOccurs="unbounded"/>
- *       &lt;/choice>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-public class SubjectType implements Serializable
-{
-   private static final long serialVersionUID = 1L;
-
-   protected List<SubjectConfirmationType> subjectConfirmation = new ArrayList<SubjectConfirmationType>();
-
-   protected STSubType subType;
-
-   /**
-    * Get the {@link STSubType}
-    * @return
-    */
-   public STSubType getSubType()
-   {
-      return subType;
-   }
-
-   /**
-    * Set the {@link STSubType}
-    * @param subType
-    */
-   public void setSubType(STSubType subType)
-   {
-      this.subType = subType;
-   }
-
-   /**
-    * Get the size of subject confirmations
-    * @return
-    */
-   public int getCount()
-   {
-      return subjectConfirmation.size();
-   }
-
-   /**
-    * Get a list of subject confirmations
-    * @return {@link} read only list of subject confirmation
-    */
-   public List<SubjectConfirmationType> getConfirmation()
-   {
-      return Collections.unmodifiableList(subjectConfirmation);
-   }
-
-   /**
-    * Add a subject confirmation
-    * @param con
-    */
-   public void addConfirmation(SubjectConfirmationType con)
-   {
-      subjectConfirmation.add(con);
-   }
-
-   /**
-    * Remove a subject confirmation
-    * @param con
-    */
-   public void removeConfirmation(SubjectConfirmationType con)
-   {
-      subjectConfirmation.remove(con);
-   }
-
-   public static class STSubType implements Serializable
-   {
-      private static final long serialVersionUID = -4073731807610876524L;
-
-      private BaseIDAbstractType baseID;
-
-      private EncryptedElementType encryptedID;
-
-      protected List<SubjectConfirmationType> subjectConfirmation = new ArrayList<SubjectConfirmationType>();
-
-      public void addBaseID(BaseIDAbstractType base)
-      {
-         this.baseID = base;
-      }
-
-      public BaseIDAbstractType getBaseID()
-      {
-         return baseID;
-      }
-
-      public EncryptedElementType getEncryptedID()
-      {
-         return encryptedID;
-      }
-
-      public void setEncryptedID(EncryptedElementType encryptedID)
-      {
-         this.encryptedID = encryptedID;
-      }
-
-      public void addConfirmation(SubjectConfirmationType con)
-      {
-         subjectConfirmation.add(con);
-      }
-
-      public int getCount()
-      {
-         return subjectConfirmation.size();
-      }
-
-      public List<SubjectConfirmationType> getConfirmation()
-      {
-         return Collections.unmodifiableList(subjectConfirmation);
-      }
-   }
-}
\ No newline at end of file

Deleted: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/assertion/URIType.java
===================================================================
--- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/assertion/URIType.java	2011-06-21 20:35:05 UTC (rev 1015)
+++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/assertion/URIType.java	2011-06-21 20:44:33 UTC (rev 1016)
@@ -1,34 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2008, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors. 
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.picketlink.identity.federation.newmodel.saml.v2.assertion;
-
-import java.net.URI;
-
-/**
- * A type that holds {@code URI}
- * @author Anil.Saldhana at redhat.com
- * @since Nov 24, 2010
- */
-public interface URIType
-{ 
-   URI getValue();
-}
\ No newline at end of file

Deleted: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/assertion/package-info.java
===================================================================
--- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/assertion/package-info.java	2011-06-21 20:35:05 UTC (rev 1015)
+++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/assertion/package-info.java	2011-06-21 20:44:33 UTC (rev 1016)
@@ -1,4 +0,0 @@
-/**
- * Package for the model classes for the SAML2 Assertion
- */
-package org.picketlink.identity.federation.newmodel.saml.v2.assertion;
\ No newline at end of file

Deleted: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/metadata/AdditionalMetadataLocationType.java
===================================================================
--- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/metadata/AdditionalMetadataLocationType.java	2011-06-21 20:35:05 UTC (rev 1015)
+++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/metadata/AdditionalMetadataLocationType.java	2011-06-21 20:44:33 UTC (rev 1016)
@@ -1,79 +0,0 @@
-package org.picketlink.identity.federation.newmodel.saml.v2.metadata;
-
-import java.net.URI;
-
-
-/**
- * <p>Java class for AdditionalMetadataLocationType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained within this class.
- * 
- * <pre>
- * &lt;complexType name="AdditionalMetadataLocationType">
- *   &lt;simpleContent>
- *     &lt;extension base="&lt;http://www.w3.org/2001/XMLSchema>anyURI">
- *       &lt;attribute name="namespace" use="required" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
- *     &lt;/extension>
- *   &lt;/simpleContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */ 
-public class AdditionalMetadataLocationType 
-{
-   protected URI value;
-   protected URI namespace;
-
-   /**
-    * Gets the value of the value property.
-    * 
-    * @return
-    *     possible object is
-    *     {@link URI }
-    *     
-    */
-   public URI getValue() 
-   {
-      return value;
-   }
-
-   /**
-    * Sets the value of the value property.
-    * 
-    * @param value
-    *     allowed object is
-    *     {@link URI }
-    *     
-    */
-   public void setValue(URI value) 
-   {
-      this.value = value;
-   }
-
-   /**
-    * Gets the value of the namespace property.
-    * 
-    * @return
-    *     possible object is
-    *     {@link URI }
-    *     
-    */
-   public URI getNamespace() 
-   {
-      return namespace;
-   }
-
-   /**
-    * Sets the value of the namespace property.
-    * 
-    * @param value
-    *     allowed object is
-    *     {@link URI }
-    *     
-    */
-   public void setNamespace(URI value) 
-   {
-      this.namespace = value;
-   }
-}
\ No newline at end of file

Deleted: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/metadata/AffiliationDescriptorType.java
===================================================================
--- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/metadata/AffiliationDescriptorType.java	2011-06-21 20:35:05 UTC (rev 1015)
+++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/metadata/AffiliationDescriptorType.java	2011-06-21 20:44:33 UTC (rev 1016)
@@ -1,250 +0,0 @@
-package org.picketlink.identity.federation.newmodel.saml.v2.metadata;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import javax.xml.datatype.Duration;
-import javax.xml.datatype.XMLGregorianCalendar;
-
-import org.picketlink.identity.xmlsec.w3.xmldsig.SignatureType;
-
-
-/**
- * <p>Java class for AffiliationDescriptorType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained within this class.
- * 
- * <pre>
- * &lt;complexType name="AffiliationDescriptorType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       &lt;sequence>
- *         &lt;element ref="{http://www.w3.org/2000/09/xmldsig#}Signature" minOccurs="0"/>
- *         &lt;element ref="{urn:oasis:names:tc:SAML:2.0:metadata}Extensions" minOccurs="0"/>
- *         &lt;element ref="{urn:oasis:names:tc:SAML:2.0:metadata}AffiliateMember" maxOccurs="unbounded"/>
- *         &lt;element ref="{urn:oasis:names:tc:SAML:2.0:metadata}KeyDescriptor" maxOccurs="unbounded" minOccurs="0"/>
- *       &lt;/sequence>
- *       &lt;attribute name="affiliationOwnerID" use="required" type="{urn:oasis:names:tc:SAML:2.0:metadata}entityIDType" />
- *       &lt;attribute name="validUntil" type="{http://www.w3.org/2001/XMLSchema}dateTime" />
- *       &lt;attribute name="cacheDuration" type="{http://www.w3.org/2001/XMLSchema}duration" />
- *       &lt;attribute name="ID" type="{http://www.w3.org/2001/XMLSchema}ID" />
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */ 
-public class AffiliationDescriptorType extends TypeWithOtherAttributes
-{
-   protected SignatureType signature;
-   protected ExtensionsType extensions;
-   protected List<String> affiliateMember;
-   protected List<KeyDescriptorType> keyDescriptor;
-   protected String affiliationOwnerID;
-   protected XMLGregorianCalendar validUntil;
-   protected Duration cacheDuration;
-   protected String id;
-
-   /**
-    * Gets the value of the signature property.
-    * 
-    * @return
-    *     possible object is
-    *     {@link SignatureType }
-    *     
-    */
-   public SignatureType getSignature() {
-      return signature;
-   }
-
-   /**
-    * Sets the value of the signature property.
-    * 
-    * @param value
-    *     allowed object is
-    *     {@link SignatureType }
-    *     
-    */
-   public void setSignature(SignatureType value) {
-      this.signature = value;
-   }
-
-   /**
-    * Gets the value of the extensions property.
-    * 
-    * @return
-    *     possible object is
-    *     {@link ExtensionsType }
-    *     
-    */
-   public ExtensionsType getExtensions() {
-      return extensions;
-   }
-
-   /**
-    * Sets the value of the extensions property.
-    * 
-    * @param value
-    *     allowed object is
-    *     {@link ExtensionsType }
-    *     
-    */
-   public void setExtensions(ExtensionsType value) {
-      this.extensions = value;
-   }
-
-   /**
-    * Gets the value of the affiliateMember 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 affiliateMember property.
-    * 
-    * <p>
-    * For example, to add a new item, do as follows:
-    * <pre>
-    *    getAffiliateMember().add(newItem);
-    * </pre>
-    * 
-    * 
-    * <p>
-    * Objects of the following type(s) are allowed in the list
-    * {@link String }
-    * 
-    * 
-    */
-   public List<String> getAffiliateMember() {
-      if (affiliateMember == null) {
-         affiliateMember = new ArrayList<String>();
-      }
-      return this.affiliateMember;
-   }
-
-   /**
-    * Gets the value of the keyDescriptor 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 keyDescriptor property.
-    * 
-    * <p>
-    * For example, to add a new item, do as follows:
-    * <pre>
-    *    getKeyDescriptor().add(newItem);
-    * </pre>
-    * 
-    * 
-    * <p>
-    * Objects of the following type(s) are allowed in the list
-    * {@link KeyDescriptorType }
-    * 
-    * 
-    */
-   public List<KeyDescriptorType> getKeyDescriptor() {
-      if (keyDescriptor == null) {
-         keyDescriptor = new ArrayList<KeyDescriptorType>();
-      }
-      return this.keyDescriptor;
-   }
-
-   /**
-    * Gets the value of the affiliationOwnerID property.
-    * 
-    * @return
-    *     possible object is
-    *     {@link String }
-    *     
-    */
-   public String getAffiliationOwnerID() {
-      return affiliationOwnerID;
-   }
-
-   /**
-    * Sets the value of the affiliationOwnerID property.
-    * 
-    * @param value
-    *     allowed object is
-    *     {@link String }
-    *     
-    */
-   public void setAffiliationOwnerID(String value) {
-      this.affiliationOwnerID = value;
-   }
-
-   /**
-    * Gets the value of the validUntil property.
-    * 
-    * @return
-    *     possible object is
-    *     {@link XMLGregorianCalendar }
-    *     
-    */
-   public XMLGregorianCalendar getValidUntil() {
-      return validUntil;
-   }
-
-   /**
-    * Sets the value of the validUntil property.
-    * 
-    * @param value
-    *     allowed object is
-    *     {@link XMLGregorianCalendar }
-    *     
-    */
-   public void setValidUntil(XMLGregorianCalendar value) {
-      this.validUntil = value;
-   }
-
-   /**
-    * Gets the value of the cacheDuration property.
-    * 
-    * @return
-    *     possible object is
-    *     {@link Duration }
-    *     
-    */
-   public Duration getCacheDuration() {
-      return cacheDuration;
-   }
-
-   /**
-    * Sets the value of the cacheDuration property.
-    * 
-    * @param value
-    *     allowed object is
-    *     {@link Duration }
-    *     
-    */
-   public void setCacheDuration(Duration value) {
-      this.cacheDuration = value;
-   }
-
-   /**
-    * Gets the value of the id property.
-    * 
-    * @return
-    *     possible object is
-    *     {@link String }
-    *     
-    */
-   public String getID() {
-      return id;
-   }
-
-   /**
-    * Sets the value of the id property.
-    * 
-    * @param value
-    *     allowed object is
-    *     {@link String }
-    *     
-    */
-   public void setID(String value) {
-      this.id = value;
-   }
-}
\ No newline at end of file

Deleted: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/metadata/AttributeAuthorityDescriptorType.java
===================================================================
--- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/metadata/AttributeAuthorityDescriptorType.java	2011-06-21 20:35:05 UTC (rev 1015)
+++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/metadata/AttributeAuthorityDescriptorType.java	2011-06-21 20:44:33 UTC (rev 1016)
@@ -1,201 +0,0 @@
-package org.picketlink.identity.federation.newmodel.saml.v2.metadata;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-import org.picketlink.identity.federation.newmodel.saml.v2.assertion.AttributeType; 
-
-
-/**
- * <p>Java class for AttributeAuthorityDescriptorType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained within this class.
- * 
- * <pre>
- * &lt;complexType name="AttributeAuthorityDescriptorType">
- *   &lt;complexContent>
- *     &lt;extension base="{urn:oasis:names:tc:SAML:2.0:metadata}RoleDescriptorType">
- *       &lt;sequence>
- *         &lt;element ref="{urn:oasis:names:tc:SAML:2.0:metadata}AttributeService" maxOccurs="unbounded"/>
- *         &lt;element ref="{urn:oasis:names:tc:SAML:2.0:metadata}AssertionIDRequestService" maxOccurs="unbounded" minOccurs="0"/>
- *         &lt;element ref="{urn:oasis:names:tc:SAML:2.0:metadata}NameIDFormat" maxOccurs="unbounded" minOccurs="0"/>
- *         &lt;element ref="{urn:oasis:names:tc:SAML:2.0:metadata}AttributeProfile" maxOccurs="unbounded" minOccurs="0"/>
- *         &lt;element ref="{urn:oasis:names:tc:SAML:2.0:assertion}Attribute" maxOccurs="unbounded" minOccurs="0"/>
- *       &lt;/sequence>
- *     &lt;/extension>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-
-public class AttributeAuthorityDescriptorType
-extends RoleDescriptorType
-{ 
-   protected List<EndpointType> attributeService = new ArrayList<EndpointType>();
-   protected List<EndpointType> assertionIDRequestService = new ArrayList<EndpointType>();
-   protected List<String> nameIDFormat = new ArrayList<String>();
-   protected List<String> attributeProfile = new ArrayList<String>();
-   protected List<AttributeType> attribute = new ArrayList<AttributeType>();
-   
-   public AttributeAuthorityDescriptorType(List<String> protocolSupport)
-   {
-      super(protocolSupport);
-   }
-
-   /**
-    * Add an attribute service
-    * @param endpoint
-    */
-   public void addAttributeService( EndpointType endpoint )
-   {
-      this.attributeService.add(endpoint);
-   }
-
-   /**
-    * Add an assertion id request service
-    * @param endpoint
-    */
-   public void addAssertionIDRequestService( EndpointType endpoint )
-   {
-      this.assertionIDRequestService.add(endpoint);
-   }
-
-   /**
-    * Add a name id
-    * @param str
-    */
-   public void addNameIDFormat( String str )
-   {
-      this.nameIDFormat.add(str);
-   }
-
-   /**
-    * Add an attribute profile
-    * @param str
-    */
-   public void addAttributeProfile( String str )
-   {
-      this.attributeProfile.add(str);
-   }
-
-   /**
-    * Add an attribute
-    * @param attribute
-    */
-   public void addAttribute( AttributeType attribute )
-   {
-      this.attribute.add(attribute);
-   }
-   
-   /**
-    * Remove an attribute service
-    * @param endpoint
-    */
-   public void removeAttributeService( EndpointType endpoint )
-   {
-      this.attributeService.remove( endpoint);
-   }
-
-   /**
-    * Remove assertion id request service
-    * @param endpoint
-    */
-   public void removeAssertionIDRequestService( EndpointType endpoint )
-   {
-      this.assertionIDRequestService.remove(endpoint);
-   }
-
-   /**
-    * Remove Name ID
-    * @param str
-    */
-   public void removeNameIDFormat( String str )
-   {
-      this.nameIDFormat.remove(str);
-   }
-
-   /**
-    * Remove attribute profile
-    * @param str
-    */
-   public void removeAttributeProfile( String str )
-   {
-      this.attributeProfile.remove(str);
-   }
-
-   /**
-    * Remove attribute
-    * @param attribute
-    */
-   public void removeAttribute( AttributeType attribute )
-   {
-      this.attribute.remove(attribute);
-   }
-
-   /**
-    * Gets the value of the attributeService property. 
-    * <p>
-    * Objects of the following type(s) are allowed in the list
-    * {@link EndpointType }
-    * 
-    * 
-    */
-   public List<EndpointType> getAttributeService() 
-   { 
-      return Collections.unmodifiableList( this.attributeService );
-   }
-
-   /**
-    * Gets the value of the assertionIDRequestService property. 
-    * 
-    * <p>
-    * Objects of the following type(s) are allowed in the list
-    * {@link EndpointType }
-    * 
-    * 
-    */
-   public List<EndpointType> getAssertionIDRequestService() 
-   {
-      return Collections.unmodifiableList( this.assertionIDRequestService );
-   }
-
-   /**
-    * Gets the value of the nameIDFormat property. 
-    * <p>
-    * Objects of the following type(s) are allowed in the list
-    * {@link String } 
-    */
-   public List<String> getNameIDFormat() 
-   { 
-      return Collections.unmodifiableList( this.nameIDFormat );
-   }
-
-   /**
-    * Gets the value of the attributeProfile property. 
-    * <p>
-    * Objects of the following type(s) are allowed in the list
-    * {@link String }
-    * 
-    * 
-    */
-   public List<String> getAttributeProfile() 
-   {
-      return Collections.unmodifiableList( this.attributeProfile );
-   }
-
-   /**
-    * Gets the value of the attribute property. 
-    * <p>
-    * Objects of the following type(s) are allowed in the list
-    * {@link AttributeType }
-    * 
-    * 
-    */
-   public List<AttributeType> getAttribute() 
-   { 
-      return Collections.unmodifiableList( this.attribute );
-   }
-}
\ No newline at end of file

Deleted: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/metadata/AttributeConsumingServiceType.java
===================================================================
--- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/metadata/AttributeConsumingServiceType.java	2011-06-21 20:35:05 UTC (rev 1015)
+++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/metadata/AttributeConsumingServiceType.java	2011-06-21 20:44:33 UTC (rev 1016)
@@ -1,200 +0,0 @@
-package org.picketlink.identity.federation.newmodel.saml.v2.metadata;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-
-/**
- * <p>Java class for AttributeConsumingServiceType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained within this class.
- * 
- * <pre>
- * &lt;complexType name="AttributeConsumingServiceType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       &lt;sequence>
- *         &lt;element ref="{urn:oasis:names:tc:SAML:2.0:metadata}ServiceName" maxOccurs="unbounded"/>
- *         &lt;element ref="{urn:oasis:names:tc:SAML:2.0:metadata}ServiceDescription" maxOccurs="unbounded" minOccurs="0"/>
- *         &lt;element ref="{urn:oasis:names:tc:SAML:2.0:metadata}RequestedAttribute" maxOccurs="unbounded"/>
- *       &lt;/sequence>
- *       &lt;attribute name="index" use="required" type="{http://www.w3.org/2001/XMLSchema}unsignedShort" />
- *       &lt;attribute name="isDefault" type="{http://www.w3.org/2001/XMLSchema}boolean" />
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */ 
-public class AttributeConsumingServiceType 
-{
-   protected List<LocalizedNameType> serviceName = new ArrayList<LocalizedNameType>();
-
-   protected List<LocalizedNameType> serviceDescription = new ArrayList<LocalizedNameType>();
-
-   protected List<RequestedAttributeType> requestedAttribute = new ArrayList<RequestedAttributeType>();
-
-   protected int index;
-
-   protected Boolean isDefault;
-
-
-
-   public AttributeConsumingServiceType(int index)
-   { 
-      this.index = index;
-   }
-
-   /**
-    * Add serviceName  
-    * <p>
-    * Objects of the following type(s) are allowed in the list
-    * {@link LocalizedNameType }
-    * 
-    * 
-    */
-   public void addServiceName( LocalizedNameType service ) 
-   {
-      this.serviceName.add(service) ;
-   }
-
-   /**
-    * Add serviceDescription.
-    * <p>
-    * Objects of the following type(s) are allowed in the list
-    * {@link LocalizedNameType }
-    * 
-    * 
-    */
-   public void addServiceDescription( LocalizedNameType desc ) 
-   {
-      this.serviceDescription.add(desc);
-   }
-
-   /**
-    * Add requestedAttribute 
-    * <p>
-    * Objects of the following type(s) are allowed in the list
-    * {@link RequestedAttributeType }
-    * 
-    */
-   public void addRequestedAttribute( RequestedAttributeType req ) 
-   {
-      this.requestedAttribute.add(req);
-   }
-   
-   /**
-    * remove serviceName  
-    * <p>
-    * Objects of the following type(s) are allowed in the list
-    * {@link LocalizedNameType }
-    * 
-    * 
-    */
-   public void removeServiceName( LocalizedNameType service ) 
-   {
-      this.serviceName.remove(service) ;
-   }
-
-   /**
-    * remove serviceDescription.
-    * <p>
-    * Objects of the following type(s) are allowed in the list
-    * {@link LocalizedNameType }
-    * 
-    * 
-    */
-   public void removeServiceDescription( LocalizedNameType desc ) 
-   {
-      this.serviceDescription.remove(desc);
-   }
-
-   /**
-    * remove requestedAttribute 
-    * <p>
-    * Objects of the following type(s) are allowed in the list
-    * {@link RequestedAttributeType }
-    * 
-    */
-   public void removeRequestedAttribute( RequestedAttributeType req ) 
-   {
-      this.requestedAttribute.remove(req);
-   }
-   
-    
-   /**
-    * Gets the value of the serviceName property.
-    * <p>
-    * Objects of the following type(s) are allowed in the list
-    * {@link LocalizedNameType }
-    * 
-    * 
-    */
-   public List<LocalizedNameType> getServiceName() 
-   {
-      return Collections.unmodifiableList( this.serviceName );
-   }
-
-   /**
-    * Gets the value of the serviceDescription property.
-    * <p>
-    * Objects of the following type(s) are allowed in the list
-    * {@link LocalizedNameType }
-    * 
-    * 
-    */
-   public List<LocalizedNameType> getServiceDescription() 
-   {
-      return Collections.unmodifiableList( this.serviceDescription );
-   }
-
-   /**
-    * Gets the value of the requestedAttribute property.
-    * <p>
-    * Objects of the following type(s) are allowed in the list
-    * {@link RequestedAttributeType }
-    * 
-    * 
-    */
-   public List<RequestedAttributeType> getRequestedAttribute() 
-   {
-      return Collections.unmodifiableList( this.requestedAttribute );
-   }
-
-   /**
-    * Gets the value of the index property.
-    * 
-    */
-   public int getIndex() 
-   {
-      return index;
-   }
-
-   /**
-    * Gets the value of the isDefault property.
-    * 
-    * @return
-    *     possible object is
-    *     {@link Boolean }
-    *     
-    */
-   public Boolean isIsDefault() 
-   {
-      return isDefault;
-   }
-
-   /**
-    * Sets the value of the isDefault property.
-    * 
-    * @param value
-    *     allowed object is
-    *     {@link Boolean }
-    *     
-    */
-   public void setIsDefault(Boolean value) 
-   {
-      this.isDefault = value;
-   }
-}
\ No newline at end of file

Deleted: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/metadata/AuthnAuthorityDescriptorType.java
===================================================================
--- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/metadata/AuthnAuthorityDescriptorType.java	2011-06-21 20:35:05 UTC (rev 1015)
+++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/metadata/AuthnAuthorityDescriptorType.java	2011-06-21 20:44:33 UTC (rev 1016)
@@ -1,131 +0,0 @@
-package org.picketlink.identity.federation.newmodel.saml.v2.metadata;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-
-/**
- * <p>Java class for AuthnAuthorityDescriptorType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained within this class.
- * 
- * <pre>
- * &lt;complexType name="AuthnAuthorityDescriptorType">
- *   &lt;complexContent>
- *     &lt;extension base="{urn:oasis:names:tc:SAML:2.0:metadata}RoleDescriptorType">
- *       &lt;sequence>
- *         &lt;element ref="{urn:oasis:names:tc:SAML:2.0:metadata}AuthnQueryService" maxOccurs="unbounded"/>
- *         &lt;element ref="{urn:oasis:names:tc:SAML:2.0:metadata}AssertionIDRequestService" maxOccurs="unbounded" minOccurs="0"/>
- *         &lt;element ref="{urn:oasis:names:tc:SAML:2.0:metadata}NameIDFormat" maxOccurs="unbounded" minOccurs="0"/>
- *       &lt;/sequence>
- *     &lt;/extension>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre> 
- */
-public class AuthnAuthorityDescriptorType
-extends RoleDescriptorType
-{
-   protected List<EndpointType> authnQueryService = new ArrayList<EndpointType>(); 
-   protected List<EndpointType> assertionIDRequestService = new ArrayList<EndpointType>();
-   protected List<String> nameIDFormat = new ArrayList<String>();
-   
-   public AuthnAuthorityDescriptorType(List<String> protocolSupport)
-   {
-      super(protocolSupport); 
-   }
-
-   /**
-    * Add authn query service
-    * @param endpoint
-    */
-   public void addAuthnQueryService( EndpointType endpoint )
-   {
-      this.authnQueryService.add(endpoint);
-   }
-
-   /**
-    * Add assertion id request service
-    * @param endpoint
-    */
-   public void addAssertionIDRequestService( EndpointType endpoint )
-   {
-      this.assertionIDRequestService.add(endpoint);
-   }
-
-   /**
-    * Add name id format
-    * @param str
-    */
-   public void addNameIDFormat( String str )
-   {
-      this.nameIDFormat.add(str);
-   }
-   
-   /**
-    * Remove authn query service
-    * @param endpoint
-    */
-   public void removeAuthnQueryService( EndpointType endpoint )
-   {
-      this.authnQueryService.remove(endpoint);
-   }
-
-   /**
-    * remove assertion id request service
-    * @param endpoint
-    */
-   public void removeAssertionIDRequestService( EndpointType endpoint )
-   {
-      this.assertionIDRequestService.remove(endpoint);
-   }
-
-   /**
-    * remove name id format
-    * @param str
-    */
-   public void removeNameIDFormat( String str )
-   {
-      this.nameIDFormat.remove(str);
-   }
-
-   /**
-    * Gets the value of the authnQueryService property.
-    * <p>
-    * Objects of the following type(s) are allowed in the list
-    * {@link EndpointType }
-    * 
-    * 
-    */
-   public List<EndpointType> getAuthnQueryService() 
-   {
-      return Collections.unmodifiableList( this.authnQueryService );
-   }
-
-   /**
-    * Gets the value of the assertionIDRequestService property.
-    * <p>
-    * Objects of the following type(s) are allowed in the list
-    * {@link EndpointType }
-    * 
-    * 
-    */
-   public List<EndpointType> getAssertionIDRequestService() 
-   {
-      return Collections.unmodifiableList( this.assertionIDRequestService );
-   }
-
-   /**
-    * Gets the value of the nameIDFormat property.
-    * <p>
-    * Objects of the following type(s) are allowed in the list
-    * {@link String }
-    * 
-    * 
-    */
-   public List<String> getNameIDFormat() 
-   {
-      return Collections.unmodifiableList( this.nameIDFormat );
-   }
-}
\ No newline at end of file

Deleted: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/metadata/ContactType.java
===================================================================
--- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/metadata/ContactType.java	2011-06-21 20:35:05 UTC (rev 1015)
+++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/metadata/ContactType.java	2011-06-21 20:44:33 UTC (rev 1016)
@@ -1,231 +0,0 @@
-package org.picketlink.identity.federation.newmodel.saml.v2.metadata;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-
-/**
- * <p>Java class for ContactType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained within this class.
- * 
- * <pre>
- * &lt;complexType name="ContactType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       &lt;sequence>
- *         &lt;element ref="{urn:oasis:names:tc:SAML:2.0:metadata}Extensions" minOccurs="0"/>
- *         &lt;element ref="{urn:oasis:names:tc:SAML:2.0:metadata}Company" minOccurs="0"/>
- *         &lt;element ref="{urn:oasis:names:tc:SAML:2.0:metadata}GivenName" minOccurs="0"/>
- *         &lt;element ref="{urn:oasis:names:tc:SAML:2.0:metadata}SurName" minOccurs="0"/>
- *         &lt;element ref="{urn:oasis:names:tc:SAML:2.0:metadata}EmailAddress" maxOccurs="unbounded" minOccurs="0"/>
- *         &lt;element ref="{urn:oasis:names:tc:SAML:2.0:metadata}TelephoneNumber" maxOccurs="unbounded" minOccurs="0"/>
- *       &lt;/sequence>
- *       &lt;attribute name="contactType" use="required" type="{urn:oasis:names:tc:SAML:2.0:metadata}ContactTypeType" />
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */ 
-public class ContactType extends TypeWithOtherAttributes
-{
-   protected ExtensionsType extensions;
-   protected String company;
-   protected String givenName;
-   protected String surName;
-   protected List<String> emailAddress = new ArrayList<String>();
-   protected List<String> telephoneNumber = new ArrayList<String>();
-   protected ContactTypeType contactType; 
-
-
-
-   public ContactType(ContactTypeType contactType)
-   { 
-      this.contactType = contactType;
-   }
-
-   /**
-    * Gets the value of the extensions property.
-    * 
-    * @return
-    *     possible object is
-    *     {@link ExtensionsType }
-    *     
-    */
-   public ExtensionsType getExtensions() {
-      return extensions;
-   }
-
-   /**
-    * Sets the value of the extensions property.
-    * 
-    * @param value
-    *     allowed object is
-    *     {@link ExtensionsType }
-    *     
-    */
-   public void setExtensions(ExtensionsType value) {
-      this.extensions = value;
-   }
-
-   /**
-    * Gets the value of the company property.
-    * 
-    * @return
-    *     possible object is
-    *     {@link String }
-    *     
-    */
-   public String getCompany() {
-      return company;
-   }
-
-   /**
-    * Sets the value of the company property.
-    * 
-    * @param value
-    *     allowed object is
-    *     {@link String }
-    *     
-    */
-   public void setCompany(String value) {
-      this.company = value;
-   }
-
-   /**
-    * Gets the value of the givenName property.
-    * 
-    * @return
-    *     possible object is
-    *     {@link String }
-    *     
-    */
-   public String getGivenName() {
-      return givenName;
-   }
-
-   /**
-    * Sets the value of the givenName property.
-    * 
-    * @param value
-    *     allowed object is
-    *     {@link String }
-    *     
-    */
-   public void setGivenName(String value) {
-      this.givenName = value;
-   }
-
-   /**
-    * Gets the value of the surName property.
-    * 
-    * @return
-    *     possible object is
-    *     {@link String }
-    *     
-    */
-   public String getSurName() {
-      return surName;
-   }
-
-   /**
-    * Sets the value of the surName property.
-    * 
-    * @param value
-    *     allowed object is
-    *     {@link String }
-    *     
-    */
-   public void setSurName(String value) {
-      this.surName = value;
-   }
-
-   /**
-    * Add an email address
-    * @param email
-    */
-   public void addEmailAddress( String email )
-   {
-      this.emailAddress.add(email);
-   }
-
-   /**
-    * remove a telephone
-    * @param tel
-    */
-   public void removeTelephone( String tel )
-   {
-      this.telephoneNumber.remove(tel);
-   }
-   
-   /**
-    * remove an email address
-    * @param email
-    */
-   public void removeEmailAddress( String email )
-   {
-      this.emailAddress.remove(email);
-   }
-
-   /**
-    * Add a telephone
-    * @param tel
-    */
-   public void addTelephone( String tel )
-   {
-      this.telephoneNumber.add(tel);
-   }
-
-   /**
-    * Gets the value of the emailAddress property.
-    * <p>
-    * Objects of the following type(s) are allowed in the list
-    * {@link String }
-    * 
-    * 
-    */
-   public List<String> getEmailAddress() 
-   {
-      return Collections.unmodifiableList( this.emailAddress );
-   }
-
-   /**
-    * Gets the value of the telephoneNumber property.
-    * <p>
-    * Objects of the following type(s) are allowed in the list
-    * {@link String }
-    * 
-    * 
-    */
-   public List<String> getTelephoneNumber() 
-   {
-      return Collections.unmodifiableList( this.telephoneNumber );
-   }
-
-   /**
-    * Gets the value of the contactType property.
-    * 
-    * @return
-    *     possible object is
-    *     {@link ContactTypeType }
-    *     
-    */
-   public ContactTypeType getContactType() {
-      return contactType;
-   }
-
-   /**
-    * Sets the value of the contactType property.
-    * 
-    * @param value
-    *     allowed object is
-    *     {@link ContactTypeType }
-    *     
-    */
-   public void setContactType(ContactTypeType value) {
-      this.contactType = value;
-   } 
-}
\ No newline at end of file

Deleted: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/metadata/ContactTypeType.java
===================================================================
--- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/metadata/ContactTypeType.java	2011-06-21 20:35:05 UTC (rev 1015)
+++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/metadata/ContactTypeType.java	2011-06-21 20:44:33 UTC (rev 1016)
@@ -1,49 +0,0 @@
-package org.picketlink.identity.federation.newmodel.saml.v2.metadata;
-
-
-
-/**
- * <p>Java class for ContactTypeType.
- * 
- * <p>The following schema fragment specifies the expected content contained within this class.
- * <p>
- * <pre>
- * &lt;simpleType name="ContactTypeType">
- *   &lt;restriction base="{http://www.w3.org/2001/XMLSchema}string">
- *     &lt;enumeration value="technical"/>
- *     &lt;enumeration value="support"/>
- *     &lt;enumeration value="administrative"/>
- *     &lt;enumeration value="billing"/>
- *     &lt;enumeration value="other"/>
- *   &lt;/restriction>
- * &lt;/simpleType>
- * </pre>
- * 
- */ 
-public enum ContactTypeType 
-{
-   TECHNICAL("technical"),
-   SUPPORT("support"),
-   ADMINISTRATIVE("administrative"),
-   BILLING("billing"),
-   OTHER("other");
-   private final String value;
-
-   ContactTypeType(String v) {
-      value = v;
-   }
-
-   public String value() {
-      return value;
-   }
-
-   public static ContactTypeType fromValue(String v) {
-      for (ContactTypeType c: ContactTypeType.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/newmodel/saml/v2/metadata/EndpointType.java
===================================================================
--- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/metadata/EndpointType.java	2011-06-21 20:35:05 UTC (rev 1015)
+++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/metadata/EndpointType.java	2011-06-21 20:44:33 UTC (rev 1016)
@@ -1,131 +0,0 @@
-package org.picketlink.identity.federation.newmodel.saml.v2.metadata;
-
-import java.net.URI;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-import org.w3c.dom.Element;
-
-
-/**
- * <p>Java class for EndpointType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained within this class.
- * 
- * <pre>
- * &lt;complexType name="EndpointType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       &lt;sequence>
- *         &lt;any/>
- *       &lt;/sequence>
- *       &lt;attribute name="Binding" use="required" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
- *       &lt;attribute name="Location" use="required" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
- *       &lt;attribute name="ResponseLocation" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-public class EndpointType extends TypeWithOtherAttributes 
-{
-
-   protected List<Object> any = new ArrayList<Object> ();
-
-   protected URI binding;
-   protected URI location;
-   protected URI responseLocation; 
-
-
-   public EndpointType(URI binding, URI location)
-   { 
-      this.binding = binding;
-      this.location = location;
-   }
-   
-   /**
-    * Add an object
-    * @param obj
-    */
-   public void addObject( Object obj )
-   {
-      this.any.add(obj);
-   }
-   
-   /**
-    * remove an object
-    * @param obj
-    */
-   public void removeObject( Object obj )
-   {
-      this.any.remove(obj);
-   }
-
-   /**
-    * Gets the value of the any property.
-    * <p>
-    * Objects of the following type(s) are allowed in the list
-    * {@link Element }
-    * {@link Object }
-    * 
-    * 
-    */
-   public List<Object> getAny() 
-   {
-      return Collections.unmodifiableList( this.any );
-   }
-
-   /**
-    * Gets the value of the binding property.
-    * 
-    * @return
-    *     possible object is
-    *     {@link URI }
-    *     
-    */
-   public URI getBinding() 
-   {
-      return binding;
-   }
-
-   /**
-    * Gets the value of the location property.
-    * 
-    * @return
-    *     possible object is
-    *     {@link URI }
-    *     
-    */
-   public URI getLocation() 
-   {
-      return location;
-   }
-
-   /**
-    * Gets the value of the responseLocation property.
-    * 
-    * @return
-    *     possible object is
-    *     {@link URI }
-    *     
-    */
-   public URI getResponseLocation() {
-      return responseLocation;
-   }
-
-   /**
-    * Sets the value of the responseLocation property.
-    * 
-    * @param value
-    *     allowed object is
-    *     {@link URI }
-    *     
-    */
-   public void setResponseLocation(URI value) 
-   {
-      this.responseLocation = value;
-   } 
-}
\ No newline at end of file

Deleted: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/metadata/EntitiesDescriptorType.java
===================================================================
--- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/metadata/EntitiesDescriptorType.java	2011-06-21 20:35:05 UTC (rev 1015)
+++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/metadata/EntitiesDescriptorType.java	2011-06-21 20:44:33 UTC (rev 1016)
@@ -1,235 +0,0 @@
-package org.picketlink.identity.federation.newmodel.saml.v2.metadata;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-import javax.xml.datatype.Duration;
-import javax.xml.datatype.XMLGregorianCalendar;
-
-import org.w3c.dom.Element;
-
-
-/**
- * <p>Java class for EntitiesDescriptorType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained within this class.
- * 
- * <pre>
- * &lt;complexType name="EntitiesDescriptorType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       &lt;sequence>
- *         &lt;element ref="{http://www.w3.org/2000/09/xmldsig#}Signature" minOccurs="0"/>
- *         &lt;element ref="{urn:oasis:names:tc:SAML:2.0:metadata}Extensions" minOccurs="0"/>
- *         &lt;choice maxOccurs="unbounded">
- *           &lt;element ref="{urn:oasis:names:tc:SAML:2.0:metadata}EntityDescriptor"/>
- *           &lt;element ref="{urn:oasis:names:tc:SAML:2.0:metadata}EntitiesDescriptor"/>
- *         &lt;/choice>
- *       &lt;/sequence>
- *       &lt;attribute name="validUntil" type="{http://www.w3.org/2001/XMLSchema}dateTime" />
- *       &lt;attribute name="cacheDuration" type="{http://www.w3.org/2001/XMLSchema}duration" />
- *       &lt;attribute name="ID" type="{http://www.w3.org/2001/XMLSchema}ID" />
- *       &lt;attribute name="Name" type="{http://www.w3.org/2001/XMLSchema}string" />
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */ 
-public class EntitiesDescriptorType 
-{
-   protected Element signature;
-   protected ExtensionsType extensions;
-   protected List<Object> entityDescriptor = new ArrayList<Object>();
-
-   protected XMLGregorianCalendar validUntil;
-   protected Duration cacheDuration;
-   protected String id;
-   protected String name;
-
-   /**
-    * Gets the value of the signature property.
-    * 
-    * @return
-    *     possible object is
-    *     {@link Element }
-    *     
-    */
-   public Element getSignature() 
-   {
-      return signature;
-   }
-
-   /**
-    * Sets the value of the signature property.
-    * 
-    * @param value
-    *     allowed object is
-    *     {@link Element }
-    *     
-    */
-   public void setSignature(Element value) 
-   {
-      this.signature = value;
-   }
-
-   /**
-    * Gets the value of the extensions property.
-    * 
-    * @return
-    *     possible object is
-    *     {@link ExtensionsType }
-    *     
-    */
-   public ExtensionsType getExtensions() 
-   {
-      return extensions;
-   }
-
-   /**
-    * Sets the value of the extensions property.
-    * 
-    * @param value
-    *     allowed object is
-    *     {@link ExtensionsType }
-    *     
-    */
-   public void setExtensions(ExtensionsType value) 
-   {
-      this.extensions = value;
-   }
-
-   /**
-    * Add an entity descriptor
-    * @param obj
-    */
-   public void addEntityDescriptor( Object obj )
-   {
-      this.entityDescriptor.add( obj );
-   }
-   
-   /**
-    * Remove an entity descriptor
-    * @param obj
-    */
-   public void removeEntityDescriptor( Object obj )
-   {
-      this.entityDescriptor.remove( obj );
-   }
-   
-   /**
-    * Gets the value of the entityDescriptorOrEntitiesDescriptor property.
-    * <p>
-    * Objects of the following type(s) are allowed in the list
-    * {@link EntitiesDescriptorType }
-    * {@link EntityDescriptorType }
-    * 
-    * 
-    */
-   public List<Object> getEntityDescriptor() 
-   {
-      return Collections.unmodifiableList( this.entityDescriptor );
-   }
-
-   /**
-    * Gets the value of the validUntil property.
-    * 
-    * @return
-    *     possible object is
-    *     {@link XMLGregorianCalendar }
-    *     
-    */
-   public XMLGregorianCalendar getValidUntil() 
-   {
-      return validUntil;
-   }
-
-   /**
-    * Sets the value of the validUntil property.
-    * 
-    * @param value
-    *     allowed object is
-    *     {@link XMLGregorianCalendar }
-    *     
-    */
-   public void setValidUntil(XMLGregorianCalendar value) 
-   {
-      this.validUntil = value;
-   }
-
-   /**
-    * Gets the value of the cacheDuration property.
-    * 
-    * @return
-    *     possible object is
-    *     {@link Duration }
-    *     
-    */
-   public Duration getCacheDuration() {
-      return cacheDuration;
-   }
-
-   /**
-    * Sets the value of the cacheDuration property.
-    * 
-    * @param value
-    *     allowed object is
-    *     {@link Duration }
-    *     
-    */
-   public void setCacheDuration(Duration value) {
-      this.cacheDuration = value;
-   }
-
-   /**
-    * Gets the value of the id property.
-    * 
-    * @return
-    *     possible object is
-    *     {@link String }
-    *     
-    */
-   public String getID() {
-      return id;
-   }
-
-   /**
-    * Sets the value of the id property.
-    * 
-    * @param value
-    *     allowed object is
-    *     {@link String }
-    *     
-    */
-   public void setID(String value) {
-      this.id = value;
-   }
-
-   /**
-    * Gets the value of the name property.
-    * 
-    * @return
-    *     possible object is
-    *     {@link String }
-    *     
-    */
-   public String getName() 
-   {
-      return name;
-   }
-
-   /**
-    * Sets the value of the name property.
-    * 
-    * @param value
-    *     allowed object is
-    *     {@link String }
-    *     
-    */
-   public void setName(String value) 
-   {
-      this.name = value;
-   }
-}
\ No newline at end of file

Deleted: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/metadata/EntityDescriptorType.java
===================================================================
--- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/metadata/EntityDescriptorType.java	2011-06-21 20:35:05 UTC (rev 1015)
+++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/metadata/EntityDescriptorType.java	2011-06-21 20:44:33 UTC (rev 1016)
@@ -1,409 +0,0 @@
-package org.picketlink.identity.federation.newmodel.saml.v2.metadata;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-import javax.xml.datatype.Duration;
-import javax.xml.datatype.XMLGregorianCalendar;
-
-import org.w3c.dom.Element;
-
-
-/**
- * <p>Java class for EntityDescriptorType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained within this class.
- * 
- * <pre>
- * &lt;complexType name="EntityDescriptorType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       &lt;sequence>
- *         &lt;element ref="{http://www.w3.org/2000/09/xmldsig#}Signature" minOccurs="0"/>
- *         &lt;element ref="{urn:oasis:names:tc:SAML:2.0:metadata}Extensions" minOccurs="0"/>
- *         &lt;choice>
- *           &lt;choice maxOccurs="unbounded">
- *             &lt;element ref="{urn:oasis:names:tc:SAML:2.0:metadata}RoleDescriptor"/>
- *             &lt;element ref="{urn:oasis:names:tc:SAML:2.0:metadata}IDPSSODescriptor"/>
- *             &lt;element ref="{urn:oasis:names:tc:SAML:2.0:metadata}SPSSODescriptor"/>
- *             &lt;element ref="{urn:oasis:names:tc:SAML:2.0:metadata}AuthnAuthorityDescriptor"/>
- *             &lt;element ref="{urn:oasis:names:tc:SAML:2.0:metadata}AttributeAuthorityDescriptor"/>
- *             &lt;element ref="{urn:oasis:names:tc:SAML:2.0:metadata}PDPDescriptor"/>
- *           &lt;/choice>
- *           &lt;element ref="{urn:oasis:names:tc:SAML:2.0:metadata}AffiliationDescriptor"/>
- *         &lt;/choice>
- *         &lt;element ref="{urn:oasis:names:tc:SAML:2.0:metadata}Organization" minOccurs="0"/>
- *         &lt;element ref="{urn:oasis:names:tc:SAML:2.0:metadata}ContactPerson" maxOccurs="unbounded" minOccurs="0"/>
- *         &lt;element ref="{urn:oasis:names:tc:SAML:2.0:metadata}AdditionalMetadataLocation" maxOccurs="unbounded" minOccurs="0"/>
- *       &lt;/sequence>
- *       &lt;attribute name="entityID" use="required" type="{urn:oasis:names:tc:SAML:2.0:metadata}entityIDType" />
- *       &lt;attribute name="validUntil" type="{http://www.w3.org/2001/XMLSchema}dateTime" />
- *       &lt;attribute name="cacheDuration" type="{http://www.w3.org/2001/XMLSchema}duration" />
- *       &lt;attribute name="ID" type="{http://www.w3.org/2001/XMLSchema}ID" />
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-public class EntityDescriptorType extends TypeWithOtherAttributes
-{
-   public static class EDTChoiceType
-   {
-      private List<EDTDescriptorChoiceType> descriptors = new ArrayList<EntityDescriptorType.EDTDescriptorChoiceType>();
-      private AffiliationDescriptorType affiliationDescriptor;
-
-      public EDTChoiceType(List<EDTDescriptorChoiceType> descriptors)
-      {
-         this.descriptors = descriptors;
-      }
-      public EDTChoiceType(AffiliationDescriptorType affiliationDescriptor)
-      { 
-         this.affiliationDescriptor = affiliationDescriptor;
-      }
-      public List<EDTDescriptorChoiceType> getDescriptors()
-      {
-         return Collections.unmodifiableList( descriptors );
-      }
-      public AffiliationDescriptorType getAffiliationDescriptor()
-      {
-         return affiliationDescriptor;
-      } 
-      
-      public static EDTChoiceType oneValue( EDTDescriptorChoiceType edt )
-      {
-         List<EDTDescriptorChoiceType> aList = new ArrayList<EntityDescriptorType.EDTDescriptorChoiceType>();
-         aList.add(edt);
-         return new EDTChoiceType( aList );
-      }
-   }
-
-   public static class EDTDescriptorChoiceType
-   {
-      private RoleDescriptorType roleDescriptor;
-      private IDPSSODescriptorType idpDescriptor;
-      private SPSSODescriptorType spDescriptor;
-      private AuthnAuthorityDescriptorType authnDescriptor;
-      private AttributeAuthorityDescriptorType attribDescriptor;
-      private PDPDescriptorType pdpDescriptor;
-      
-      public EDTDescriptorChoiceType(AuthnAuthorityDescriptorType authnDescriptor)
-      {
-         this.authnDescriptor = authnDescriptor;
-      }
-      
-      public EDTDescriptorChoiceType(AttributeAuthorityDescriptorType attribDescriptor)
-      {
-         this.attribDescriptor = attribDescriptor;
-      }
-      
-      public EDTDescriptorChoiceType(PDPDescriptorType pdpDescriptor)
-      {
-         this.pdpDescriptor = pdpDescriptor;
-      }
-      
-      public EDTDescriptorChoiceType( SSODescriptorType sso )
-      {
-         if(sso instanceof IDPSSODescriptorType )
-         {
-            this.idpDescriptor = (IDPSSODescriptorType) sso;
-         }
-         else
-            this.spDescriptor = (SPSSODescriptorType) sso;
-      }
-      
-      public EDTDescriptorChoiceType(RoleDescriptorType roleDescriptor)
-      {  
-          this.roleDescriptor = roleDescriptor;
-      }
-      
-      
-      public RoleDescriptorType getRoleDescriptor()
-      {
-         return roleDescriptor;
-      }
-      public IDPSSODescriptorType getIdpDescriptor()
-      {
-         return idpDescriptor;
-      }
-      public SPSSODescriptorType getSpDescriptor()
-      {
-         return spDescriptor;
-      }
-      public AuthnAuthorityDescriptorType getAuthnDescriptor()
-      {
-         return authnDescriptor;
-      }
-      public AttributeAuthorityDescriptorType getAttribDescriptor()
-      {
-         return attribDescriptor;
-      }
-      public PDPDescriptorType getPdpDescriptor()
-      {
-         return pdpDescriptor;
-      }  
-   }
-
-   protected Element signature;
-   protected ExtensionsType extensions;
-
-   protected List<EDTChoiceType> choiceType = new ArrayList<EntityDescriptorType.EDTChoiceType>();
-
-   protected OrganizationType organization;
-
-   protected List<ContactType> contactPerson = new ArrayList<ContactType>();
-
-   protected List<AdditionalMetadataLocationType> additionalMetadataLocation = new ArrayList<AdditionalMetadataLocationType>();
-
-   protected String entityID;
-
-   protected XMLGregorianCalendar validUntil;
-
-   protected Duration cacheDuration;
-
-   protected String id;
-
-   public EntityDescriptorType( String entityID )
-   {
-      this.entityID = entityID;
-   }
-
-   /**
-    * Gets the value of the signature property.
-    * 
-    * @return
-    *     possible object is
-    *     {@link Element }
-    *     
-    */
-   public Element getSignature() {
-      return signature;
-   }
-
-   /**
-    * Sets the value of the signature property.
-    * 
-    * @param value
-    *     allowed object is
-    *     {@link Element }
-    *     
-    */
-   public void setSignature( Element value) {
-      this.signature = value;
-   }
-
-   /**
-    * Gets the value of the extensions property.
-    * 
-    * @return
-    *     possible object is
-    *     {@link ExtensionsType }
-    *     
-    */
-   public ExtensionsType getExtensions() {
-      return extensions;
-   }
-
-   /**
-    * Sets the value of the extensions property.
-    * 
-    * @param value
-    *     allowed object is
-    *     {@link ExtensionsType }
-    *     
-    */
-   public void setExtensions(ExtensionsType value) {
-      this.extensions = value;
-   }
-
-   /**
-    * Get a read only list of choice types
-    * @return
-    */
-   public List<EDTChoiceType> getChoiceType()
-   {
-      return Collections.unmodifiableList( choiceType );
-   }
-
-   /**
-    * Add a choice type
-    * @param choiceType
-    */
-   public void addChoiceType(EDTChoiceType choiceType)
-   {
-      this.choiceType.add( choiceType );
-   }
-   
-   /**
-    * Remove a choice type
-    * @param choiceType
-    */
-   public void removeChoiceType(EDTChoiceType choiceType)
-   {
-      this.choiceType.remove( choiceType );
-   }
-
-   /**
-    * Gets the value of the organization property.
-    * 
-    * @return
-    *     possible object is
-    *     {@link OrganizationType }
-    *     
-    */
-   public OrganizationType getOrganization() {
-      return organization;
-   }
-
-   /**
-    * Sets the value of the organization property.
-    * 
-    * @param value
-    *     allowed object is
-    *     {@link OrganizationType }
-    *     
-    */
-   public void setOrganization(OrganizationType value) {
-      this.organization = value;
-   }
-
-   /**
-    * Add a {@link ContactType} contact person
-    * @param ct
-    */
-   public void addContactPerson( ContactType ct )
-   {
-      contactPerson.add(ct);
-   }
-   
-   public void removeContactPerson( ContactType ct )
-   {
-      contactPerson.remove(ct);
-   }
-   
-   /**
-    * Gets the value of the contactPerson property.
-    * <p>
-    * Objects of the following type(s) are allowed in the list
-    * {@link ContactType }
-    * 
-    * 
-    */
-   public List<ContactType> getContactPerson() 
-   {
-      return Collections.unmodifiableList( this.contactPerson );
-   }
-
-   /**
-    * Gets the value of the additionalMetadataLocation 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 additionalMetadataLocation property.
-    * 
-    * <p>
-    * For example, to add a new item, do as follows:
-    * <pre>
-    *    getAdditionalMetadataLocation().add(newItem);
-    * </pre>
-    * 
-    * 
-    * <p>
-    * Objects of the following type(s) are allowed in the list
-    * {@link AdditionalMetadataLocationType }
-    * 
-    * 
-    */
-   public List<AdditionalMetadataLocationType> getAdditionalMetadataLocation() 
-   {
-      return Collections.unmodifiableList( this.additionalMetadataLocation );
-   }
-
-   /**
-    * Gets the value of the entityID property.
-    * 
-    * @return
-    *     possible object is
-    *     {@link String }
-    *     
-    */
-   public String getEntityID() {
-      return entityID;
-   }
-
-   /**
-    * Gets the value of the validUntil property.
-    * 
-    * @return
-    *     possible object is
-    *     {@link XMLGregorianCalendar }
-    *     
-    */
-   public XMLGregorianCalendar getValidUntil() {
-      return validUntil;
-   }
-
-   /**
-    * Sets the value of the validUntil property.
-    * 
-    * @param value
-    *     allowed object is
-    *     {@link XMLGregorianCalendar }
-    *     
-    */
-   public void setValidUntil(XMLGregorianCalendar value) {
-      this.validUntil = value;
-   }
-
-   /**
-    * Gets the value of the cacheDuration property.
-    * 
-    * @return
-    *     possible object is
-    *     {@link Duration }
-    *     
-    */
-   public Duration getCacheDuration() {
-      return cacheDuration;
-   }
-
-   /**
-    * Sets the value of the cacheDuration property.
-    * 
-    * @param value
-    *     allowed object is
-    *     {@link Duration }
-    *     
-    */
-   public void setCacheDuration(Duration value) {
-      this.cacheDuration = value;
-   }
-
-   /**
-    * Gets the value of the id property.
-    * 
-    * @return
-    *     possible object is
-    *     {@link String }
-    *     
-    */
-   public String getID() {
-      return id;
-   }
-
-   /**
-    * Sets the value of the id property.
-    * 
-    * @param value
-    *     allowed object is
-    *     {@link String }
-    *     
-    */
-   public void setID(String value) {
-      this.id = value;
-   } 
-}
\ No newline at end of file

Deleted: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/metadata/ExtensionsType.java
===================================================================
--- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/metadata/ExtensionsType.java	2011-06-21 20:35:05 UTC (rev 1015)
+++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/metadata/ExtensionsType.java	2011-06-21 20:44:33 UTC (rev 1016)
@@ -1,64 +0,0 @@
-package org.picketlink.identity.federation.newmodel.saml.v2.metadata;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-import org.w3c.dom.Element;
-
-
-/**
- * <p>Java class for ExtensionsType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained within this class.
- * 
- * <pre>
- * &lt;complexType name="ExtensionsType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       &lt;sequence>
- *         &lt;any/>
- *       &lt;/sequence>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-public class ExtensionsType 
-{
-   protected List<Object> any = new ArrayList<Object>();
-
-   /**
-    * Add an object
-    * @param obj
-    */
-   public void addObject( Object obj )
-   {
-      this.any.add(obj);
-   }
-   
-   /**
-    * Remove an object
-    * @param obj
-    */
-   public void removeObject( Object obj )
-   {
-      this.any.remove(obj);
-   }
-
-   /**
-    * Gets the value of the any property.
-    * <p>
-    * Objects of the following type(s) are allowed in the list
-    * {@link Element }
-    * {@link Object }
-    * 
-    * 
-    */
-   public List<Object> getAny() 
-   {
-      return Collections.unmodifiableList( this.any );
-   } 
-}
\ No newline at end of file

Deleted: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/metadata/IDPSSODescriptorType.java
===================================================================
--- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/metadata/IDPSSODescriptorType.java	2011-06-21 20:35:05 UTC (rev 1015)
+++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/metadata/IDPSSODescriptorType.java	2011-06-21 20:44:33 UTC (rev 1016)
@@ -1,237 +0,0 @@
-package org.picketlink.identity.federation.newmodel.saml.v2.metadata;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-import org.picketlink.identity.federation.newmodel.saml.v2.assertion.AttributeType;
-
-
-/**
- * <p>Java class for IDPSSODescriptorType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained within this class.
- * 
- * <pre>
- * &lt;complexType name="IDPSSODescriptorType">
- *   &lt;complexContent>
- *     &lt;extension base="{urn:oasis:names:tc:SAML:2.0:metadata}SSODescriptorType">
- *       &lt;sequence>
- *         &lt;element ref="{urn:oasis:names:tc:SAML:2.0:metadata}SingleSignOnService" maxOccurs="unbounded"/>
- *         &lt;element ref="{urn:oasis:names:tc:SAML:2.0:metadata}NameIDMappingService" maxOccurs="unbounded" minOccurs="0"/>
- *         &lt;element ref="{urn:oasis:names:tc:SAML:2.0:metadata}AssertionIDRequestService" maxOccurs="unbounded" minOccurs="0"/>
- *         &lt;element ref="{urn:oasis:names:tc:SAML:2.0:metadata}AttributeProfile" maxOccurs="unbounded" minOccurs="0"/>
- *         &lt;element ref="{urn:oasis:names:tc:SAML:2.0:assertion}Attribute" maxOccurs="unbounded" minOccurs="0"/>
- *       &lt;/sequence>
- *       &lt;attribute name="WantAuthnRequestsSigned" type="{http://www.w3.org/2001/XMLSchema}boolean" />
- *     &lt;/extension>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-public class IDPSSODescriptorType
-extends SSODescriptorType
-{ 
-   protected List<EndpointType> singleSignOnService = new ArrayList<EndpointType>();
-
-   protected List<EndpointType> nameIDMappingService= new ArrayList<EndpointType>();
-
-   protected List<EndpointType> assertionIDRequestService= new ArrayList<EndpointType>();
-
-   protected List<String> attributeProfile = new ArrayList<String>();
-
-   protected List<AttributeType> attribute = new ArrayList<AttributeType>();
-
-   protected Boolean wantAuthnRequestsSigned; 
-
-   public IDPSSODescriptorType(List<String> protocolSupport)
-   {
-      super(protocolSupport); 
-   }
-
-   /**
-    * Add a SSO service
-    * @param endpt
-    */
-   public void addSingleSignOnService( EndpointType endpt)
-   {
-      this.singleSignOnService.add(endpt);
-   }
-
-   /**
-    * Add name id mapping service
-    * @param endpt
-    */
-   public void addNameIDMappingService( EndpointType endpt )
-   {
-      this.nameIDMappingService.add(endpt);
-   }
-
-   /**
-    * Add assertion id request service
-    * @param endpt
-    */
-   public void addAssertionIDRequestService( EndpointType endpt )
-   {
-      this.assertionIDRequestService.add(endpt);
-   }
-
-   /**
-    * Add attribute profile
-    * @param str
-    */
-   public void addAttributeProfile( String str )
-   {
-      this.attributeProfile.add( str );
-   }  
-
-   /**
-    * Add attribute
-    * @param att
-    */
-   public void addAttribute( AttributeType att )
-   {
-      this.attribute.add(att);
-   } 
-   
-   
-   /**
-    * Remove a SSO service
-    * @param endpt
-    */
-   public void removeSingleSignOnService( EndpointType endpt)
-   {
-      this.singleSignOnService.remove(endpt);
-   }
-
-   /**
-    * remove name id mapping service
-    * @param endpt
-    */
-   public void removeNameIDMappingService( EndpointType endpt )
-   {
-      this.nameIDMappingService.remove(endpt);
-   }
-
-   /**
-    * remove assertion id request service
-    * @param endpt
-    */
-   public void removeAssertionIDRequestService( EndpointType endpt )
-   {
-      this.assertionIDRequestService.remove(endpt);
-   }
-
-   /**
-    * Add attribute profile
-    * @param str
-    */
-   public void removeAttributeProfile( String str )
-   {
-      this.attributeProfile.remove( str );
-   }  
-
-   /**
-    * Add attribute
-    * @param att
-    */
-   public void removeAttribute( AttributeType att )
-   {
-      this.attribute.remove(att);
-   } 
-
-   /**
-    * Gets the value of the singleSignOnService property.
-    * <p>
-    * Objects of the following type(s) are allowed in the list
-    * {@link EndpointType }
-    */
-   public List<EndpointType> getSingleSignOnService() 
-   {
-      return Collections.unmodifiableList( this.singleSignOnService );
-   }
-
-   /**
-    * Gets the value of the nameIDMappingService property.
-
-    * <p>
-    * Objects of the following type(s) are allowed in the list
-    * {@link EndpointType }
-    */
-   public List<EndpointType> getNameIDMappingService() 
-   {
-      return Collections.unmodifiableList( this.nameIDMappingService );
-   }
-
-   /**
-    * Gets the value of the assertionIDRequestService property.
-    * <p>
-    * Objects of the following type(s) are allowed in the list
-    * {@link EndpointType }
-    */
-   public List<EndpointType> getAssertionIDRequestService() 
-   {
-      return Collections.unmodifiableList( this.assertionIDRequestService );
-   }
-
-   /**
-    * Gets the value of the attributeProfile 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 attributeProfile property.
-    * 
-    * <p>
-    * <p>
-    * Objects of the following type(s) are allowed in the list
-    * {@link String }
-    */
-   public List<String> getAttributeProfile() 
-   {
-      return Collections.unmodifiableList( this.attributeProfile );
-   }
-
-   /**
-    * Gets the value of the attribute property.
-    * 
-    * <p>
-    * Objects of the following type(s) are allowed in the list
-    * {@link AttributeType }
-    * 
-    * 
-    */
-   public List<AttributeType> getAttribute() 
-   { 
-      return Collections.unmodifiableList( this.attribute );
-   }
-
-   /**
-    * Gets the value of the wantAuthnRequestsSigned property.
-    * 
-    * @return
-    *     possible object is
-    *     {@link Boolean }
-    *     
-    */
-   public Boolean isWantAuthnRequestsSigned() 
-   {
-      return wantAuthnRequestsSigned;
-   }
-
-   /**
-    * Sets the value of the wantAuthnRequestsSigned property.
-    * 
-    * @param value
-    *     allowed object is
-    *     {@link Boolean }
-    *     
-    */
-   public void setWantAuthnRequestsSigned(Boolean value) 
-   {
-      this.wantAuthnRequestsSigned = value;
-   }
-}
\ No newline at end of file

Deleted: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/metadata/IndexedEndpointType.java
===================================================================
--- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/metadata/IndexedEndpointType.java	2011-06-21 20:35:05 UTC (rev 1015)
+++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/metadata/IndexedEndpointType.java	2011-06-21 20:44:33 UTC (rev 1016)
@@ -1,76 +0,0 @@
-package org.picketlink.identity.federation.newmodel.saml.v2.metadata;
-
-import java.net.URI;
-
-
-
-/**
- * <p>Java class for IndexedEndpointType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained within this class.
- * 
- * <pre>
- * &lt;complexType name="IndexedEndpointType">
- *   &lt;complexContent>
- *     &lt;extension base="{urn:oasis:names:tc:SAML:2.0:metadata}EndpointType">
- *       &lt;attribute name="index" use="required" type="{http://www.w3.org/2001/XMLSchema}unsignedShort" />
- *       &lt;attribute name="isDefault" type="{http://www.w3.org/2001/XMLSchema}boolean" />
- *     &lt;/extension>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */ 
-public class IndexedEndpointType
-extends EndpointType
-{
-
-   protected int index; 
-   protected Boolean isDefault;
-
-   public IndexedEndpointType(URI binding, URI location)
-   {
-      super(binding, location);
-   }
-
-   /**
-    * Gets the value of the index property.
-    * 
-    */
-   public int getIndex() {
-      return index;
-   }
-
-   /**
-    * Sets the value of the index property.
-    * 
-    */
-   public void setIndex(int value) {
-      this.index = value;
-   }
-
-   /**
-    * Gets the value of the isDefault property.
-    * 
-    * @return
-    *     possible object is
-    *     {@link Boolean }
-    *     
-    */
-   public Boolean isIsDefault() {
-      return isDefault;
-   }
-
-   /**
-    * Sets the value of the isDefault property.
-    * 
-    * @param value
-    *     allowed object is
-    *     {@link Boolean }
-    *     
-    */
-   public void setIsDefault(Boolean value) {
-      this.isDefault = value;
-   }
-}
\ No newline at end of file

Deleted: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/metadata/KeyDescriptorType.java
===================================================================
--- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/metadata/KeyDescriptorType.java	2011-06-21 20:35:05 UTC (rev 1015)
+++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/metadata/KeyDescriptorType.java	2011-06-21 20:44:33 UTC (rev 1016)
@@ -1,119 +0,0 @@
-
-package org.picketlink.identity.federation.newmodel.saml.v2.metadata;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-import org.picketlink.identity.xmlsec.w3.xmldsig.KeyInfoType;
-import org.picketlink.identity.xmlsec.w3.xmlenc.EncryptionMethodType;
-import org.w3c.dom.Element;
-
-
-/**
- * <p>Java class for KeyDescriptorType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained within this class.
- * 
- * <pre>
- * &lt;complexType name="KeyDescriptorType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       &lt;sequence>
- *         &lt;element ref="{http://www.w3.org/2000/09/xmldsig#}KeyInfo"/>
- *         &lt;element ref="{urn:oasis:names:tc:SAML:2.0:metadata}EncryptionMethod" maxOccurs="unbounded" minOccurs="0"/>
- *       &lt;/sequence>
- *       &lt;attribute name="use" type="{urn:oasis:names:tc:SAML:2.0:metadata}KeyTypes" />
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */  
-public class KeyDescriptorType 
-{
-   protected Element keyInfo;
-   protected List<EncryptionMethodType> encryptionMethod = new ArrayList<EncryptionMethodType>();
-
-   protected KeyTypes use;
-
-   /**
-    * Gets the value of the keyInfo property.
-    * 
-    * @return
-    *     possible object is
-    *     {@link KeyInfoType }
-    *     
-    */
-   public Element getKeyInfo() {
-      return keyInfo;
-   }
-
-   /**
-    * Sets the value of the keyInfo property.
-    * 
-    * @param value
-    *     allowed object is
-    *     {@link KeyInfoType }
-    *     
-    */
-   public void setKeyInfo( Element value) {
-      this.keyInfo = value;
-   }
-
-   /**
-    * Add encryption method type
-    * @param e
-    */
-   public void addEncryptionMethod( EncryptionMethodType e )
-   {
-      this.encryptionMethod.add( e );
-   }
-   
-   /**
-    * Remove encryption method type
-    * @param e
-    */
-   public void removeEncryptionMethod( EncryptionMethodType e )
-   {
-      this.encryptionMethod.remove( e );
-   }
-
-   /**
-    * Gets the value of the encryptionMethod property.
-    * <p>
-    * Objects of the following type(s) are allowed in the list
-    * {@link EncryptionMethodType }
-    * 
-    * 
-    */
-   public List<EncryptionMethodType> getEncryptionMethod() 
-   {
-      return Collections.unmodifiableList( this.encryptionMethod );
-   }
-
-   /**
-    * Gets the value of the use property.
-    * 
-    * @return
-    *     possible object is
-    *     {@link KeyTypes }
-    *     
-    */
-   public KeyTypes getUse() {
-      return use;
-   }
-
-   /**
-    * Sets the value of the use property.
-    * 
-    * @param value
-    *     allowed object is
-    *     {@link KeyTypes }
-    *     
-    */
-   public void setUse(KeyTypes value) {
-      this.use = value;
-   }
-}
\ No newline at end of file

Deleted: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/metadata/KeyTypes.java
===================================================================
--- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/metadata/KeyTypes.java	2011-06-21 20:35:05 UTC (rev 1015)
+++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/metadata/KeyTypes.java	2011-06-21 20:44:33 UTC (rev 1016)
@@ -1,42 +0,0 @@
-package org.picketlink.identity.federation.newmodel.saml.v2.metadata;
-
-
-
-/**
- * <p>Java class for KeyTypes.
- * 
- * <p>The following schema fragment specifies the expected content contained within this class.
- * <p>
- * <pre>
- * &lt;simpleType name="KeyTypes">
- *   &lt;restriction base="{http://www.w3.org/2001/XMLSchema}string">
- *     &lt;enumeration value="encryption"/>
- *     &lt;enumeration value="signing"/>
- *   &lt;/restriction>
- * &lt;/simpleType>
- * </pre>
- * 
- */
-public enum KeyTypes 
-{
-   ENCRYPTION("encryption"),
-   SIGNING("signing");
-   private final String value;
-
-   KeyTypes(String v) {
-      value = v;
-   }
-
-   public String value() {
-      return value;
-   }
-
-   public static KeyTypes fromValue(String v) {
-      for (KeyTypes c: KeyTypes.values()) {
-         if (c.value.equals(v)) {
-            return c;
-         }
-      }
-      throw new IllegalArgumentException(v);
-   }
-}
\ No newline at end of file

Deleted: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/metadata/LocalizedNameType.java
===================================================================
--- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/metadata/LocalizedNameType.java	2011-06-21 20:35:05 UTC (rev 1015)
+++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/metadata/LocalizedNameType.java	2011-06-21 20:44:33 UTC (rev 1016)
@@ -1,68 +0,0 @@
-package org.picketlink.identity.federation.newmodel.saml.v2.metadata;
-
-
-
-/**
- * <p>Java class for localizedNameType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained within this class.
- * 
- * <pre>
- * &lt;complexType name="localizedNameType">
- *   &lt;simpleContent>
- *     &lt;extension base="&lt;http://www.w3.org/2001/XMLSchema>string">
- *       &lt;attribute ref="{http://www.w3.org/XML/1998/namespace}lang use="required""/>
- *     &lt;/extension>
- *   &lt;/simpleContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-public class LocalizedNameType 
-{
-   protected String value;
-   protected String lang;
-
-
-   public LocalizedNameType(String lang)
-   { 
-      this.lang = lang;
-   }
-
-   /**
-    * Gets the value of the value property.
-    * 
-    * @return
-    *     possible object is
-    *     {@link String }
-    *     
-    */
-   public String getValue() {
-      return value;
-   }
-
-   /**
-    * Sets the value of the value property.
-    * 
-    * @param value
-    *     allowed object is
-    *     {@link String }
-    *     
-    */
-   public void setValue(String value) {
-      this.value = value;
-   }
-
-   /**
-    * Gets the value of the lang property.
-    * 
-    * @return
-    *     possible object is
-    *     {@link String }
-    *     
-    */
-   public String getLang() {
-      return lang;
-   } 
-}

Deleted: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/metadata/LocalizedURIType.java
===================================================================
--- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/metadata/LocalizedURIType.java	2011-06-21 20:35:05 UTC (rev 1015)
+++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/metadata/LocalizedURIType.java	2011-06-21 20:44:33 UTC (rev 1016)
@@ -1,69 +0,0 @@
-package org.picketlink.identity.federation.newmodel.saml.v2.metadata;
-
-import java.net.URI;
-
-
-/**
- * <p>Java class for localizedURIType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained within this class.
- * 
- * <pre>
- * &lt;complexType name="localizedURIType">
- *   &lt;simpleContent>
- *     &lt;extension base="&lt;http://www.w3.org/2001/XMLSchema>anyURI">
- *       &lt;attribute ref="{http://www.w3.org/XML/1998/namespace}lang use="required""/>
- *     &lt;/extension>
- *   &lt;/simpleContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */ 
-public class LocalizedURIType 
-{
-
-   protected URI value; 
-   protected String lang;
-
-   public LocalizedURIType(String lang)
-   { 
-      this.lang = lang;
-   }
-
-   /**
-    * Gets the value of the value property.
-    * 
-    * @return
-    *     possible object is
-    *     {@link String }
-    *     
-    */
-   public URI getValue() {
-      return value;
-   }
-
-   /**
-    * Sets the value of the value property.
-    * 
-    * @param value
-    *     allowed object is
-    *     {@link String }
-    *     
-    */
-   public void setValue( URI value) {
-      this.value = value;
-   }
-
-   /**
-    * Gets the value of the lang property.
-    * 
-    * @return
-    *     possible object is
-    *     {@link String }
-    *     
-    */
-   public String getLang() {
-      return lang;
-   }
-}
\ No newline at end of file

Deleted: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/metadata/OrganizationType.java
===================================================================
--- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/metadata/OrganizationType.java	2011-06-21 20:35:05 UTC (rev 1015)
+++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/metadata/OrganizationType.java	2011-06-21 20:44:33 UTC (rev 1016)
@@ -1,155 +0,0 @@
-package org.picketlink.identity.federation.newmodel.saml.v2.metadata;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-
-/**
- * <p>Java class for OrganizationType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained within this class.
- * 
- * <pre>
- * &lt;complexType name="OrganizationType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       &lt;sequence>
- *         &lt;element ref="{urn:oasis:names:tc:SAML:2.0:metadata}Extensions" minOccurs="0"/>
- *         &lt;element ref="{urn:oasis:names:tc:SAML:2.0:metadata}OrganizationName" maxOccurs="unbounded"/>
- *         &lt;element ref="{urn:oasis:names:tc:SAML:2.0:metadata}OrganizationDisplayName" maxOccurs="unbounded"/>
- *         &lt;element ref="{urn:oasis:names:tc:SAML:2.0:metadata}OrganizationURL" maxOccurs="unbounded"/>
- *       &lt;/sequence>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-
-public class OrganizationType extends TypeWithOtherAttributes
-{
-
-   protected ExtensionsType extensions;
-   protected List<LocalizedNameType> organizationName = new ArrayList<LocalizedNameType>();
-
-   protected List<LocalizedNameType> organizationDisplayName = new ArrayList<LocalizedNameType>();
-
-   protected List<LocalizedURIType> organizationURL = new ArrayList<LocalizedURIType>();
-
-   /**
-    * Add an organization name
-    * @param name
-    */
-   public void addOrganizationName( LocalizedNameType name )
-   {
-      this.organizationName.add(name);
-   }
-
-   /**
-    * Add organization display name
-    * @param name
-    */
-   public void addOrganizationDisplayName( LocalizedNameType name )
-   {
-      this.organizationDisplayName.add(name);
-   }
-
-   /**
-    * Add organization url
-    * @param uri
-    */
-   public void addOrganizationURL( LocalizedURIType uri )
-   {
-      this.organizationURL.add(uri);
-   }
-   
-   /**
-    * remove an organization name
-    * @param name
-    */
-   public void removeOrganizationName( LocalizedNameType name )
-   {
-      this.organizationName.remove(name);
-   }
-
-   /**
-    * remove organization display name
-    * @param name
-    */
-   public void removeOrganizationDisplayName( LocalizedNameType name )
-   {
-      this.organizationDisplayName.remove(name);
-   }
-
-   /**
-    * remove organization url
-    * @param uri
-    */
-   public void removeOrganizationURL( LocalizedURIType uri )
-   {
-      this.organizationURL.remove(uri);
-   }
-
-   /**
-    * Gets the value of the extensions property.
-    * 
-    * @return
-    *     possible object is
-    *     {@link ExtensionsType }
-    *     
-    */
-   public ExtensionsType getExtensions() {
-      return extensions;
-   }
-
-   /**
-    * Sets the value of the extensions property.
-    * 
-    * @param value
-    *     allowed object is
-    *     {@link ExtensionsType }
-    *     
-    */
-   public void setExtensions(ExtensionsType value) {
-      this.extensions = value;
-   }
-
-   /**
-    * Gets the value of the organizationName property.
-    * 
-    * <p>
-    * Objects of the following type(s) are allowed in the list
-    * {@link LocalizedNameType }
-    *  
-    */
-   public List<LocalizedNameType> getOrganizationName() 
-   {
-      return Collections.unmodifiableList( this.organizationName );
-   }
-
-   /**
-    * Gets the value of the organizationDisplayName property.
-    * 
-    * <p>
-    * Objects of the following type(s) are allowed in the list
-    * {@link LocalizedNameType }
-    * 
-    * 
-    */
-   public List<LocalizedNameType> getOrganizationDisplayName() 
-   {
-      return Collections.unmodifiableList( this.organizationDisplayName );
-   }
-
-   /**
-    * Gets the value of the organizationURL property.
-    * 
-
-    */
-   public List<LocalizedURIType> getOrganizationURL() 
-   {
-      return Collections.unmodifiableList( this.organizationURL );
-   }
-}
\ No newline at end of file

Deleted: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/metadata/PDPDescriptorType.java
===================================================================
--- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/metadata/PDPDescriptorType.java	2011-06-21 20:35:05 UTC (rev 1015)
+++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/metadata/PDPDescriptorType.java	2011-06-21 20:44:33 UTC (rev 1016)
@@ -1,130 +0,0 @@
-package org.picketlink.identity.federation.newmodel.saml.v2.metadata;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-
-/**
- * <p>Java class for PDPDescriptorType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained within this class.
- * 
- * <pre>
- * &lt;complexType name="PDPDescriptorType">
- *   &lt;complexContent>
- *     &lt;extension base="{urn:oasis:names:tc:SAML:2.0:metadata}RoleDescriptorType">
- *       &lt;sequence>
- *         &lt;element ref="{urn:oasis:names:tc:SAML:2.0:metadata}AuthzService" maxOccurs="unbounded"/>
- *         &lt;element ref="{urn:oasis:names:tc:SAML:2.0:metadata}AssertionIDRequestService" maxOccurs="unbounded" minOccurs="0"/>
- *         &lt;element ref="{urn:oasis:names:tc:SAML:2.0:metadata}NameIDFormat" maxOccurs="unbounded" minOccurs="0"/>
- *       &lt;/sequence>
- *     &lt;/extension>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-public class PDPDescriptorType extends RoleDescriptorType
-{
-   protected List<EndpointType> authzService = new ArrayList<EndpointType>();
-
-   protected List<EndpointType> assertionIDRequestService = new ArrayList<EndpointType>();
-
-   protected List<String> nameIDFormat = new ArrayList<String>();
-
-   
-   public PDPDescriptorType(List<String> protocolSupport)
-   {
-      super(protocolSupport); 
-   }
-
-   /**
-    * Add authorization service
-    * @param endpt
-    */
-   public void addAuthZService( EndpointType endpt )
-   {
-      this.authzService.add(endpt);
-   }
-
-   /**
-    * Add assertion id request service
-    * @param endpt
-    */
-   public void addAssertionIDRequestService( EndpointType endpt )
-   {
-      this.assertionIDRequestService.add(endpt);
-   }
-
-   /**
-    * Add Name ID Format
-    * @param str
-    */
-   public void addNameIDFormat( String str )
-   {
-      this.nameIDFormat.add(str);
-   }
-   
-   /**
-    * remove authorization service
-    * @param endpt
-    */
-   public void removeAuthZService( EndpointType endpt )
-   {
-      this.authzService.remove(endpt);
-   }
-
-   /**
-    * remove assertion id request service
-    * @param endpt
-    */
-   public void removeAssertionIDRequestService( EndpointType endpt )
-   {
-      this.assertionIDRequestService.remove(endpt);
-   }
-
-   /**
-    * remove Name ID Format
-    * @param str
-    */
-   public void removeNameIDFormat( String str )
-   {
-      this.nameIDFormat.remove(str);
-   }
-
-   /**
-    * Gets the value of the authzService property.
-    * <p>
-    * Objects of the following type(s) are allowed in the list
-    * {@link EndpointType }
-    */
-   public List<EndpointType> getAuthzService() 
-   {
-      return Collections.unmodifiableList( this.authzService );
-   }
-
-   /**
-    * Gets the value of the assertionIDRequestService property.
-    * 
-    * <p>
-    * Objects of the following type(s) are allowed in the list
-    * {@link EndpointType }
-    */
-   public List<EndpointType> getAssertionIDRequestService() 
-   {
-      return Collections.unmodifiableList( this.assertionIDRequestService );
-   }
-
-   /**
-    * Gets the value of the nameIDFormat property.
-    * <p>
-    * Objects of the following type(s) are allowed in the list
-    * {@link String }
-    */
-   public List<String> getNameIDFormat() 
-   {
-      return Collections.unmodifiableList( this.nameIDFormat );
-   }
-}
\ No newline at end of file

Deleted: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/metadata/RequestedAttributeType.java
===================================================================
--- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/metadata/RequestedAttributeType.java	2011-06-21 20:35:05 UTC (rev 1015)
+++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/metadata/RequestedAttributeType.java	2011-06-21 20:44:33 UTC (rev 1016)
@@ -1,62 +0,0 @@
-
-
-
-package org.picketlink.identity.federation.newmodel.saml.v2.metadata;
-
-import org.picketlink.identity.federation.newmodel.saml.v2.assertion.AttributeType;
-
-
-/**
- * <p>Java class for RequestedAttributeType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained within this class.
- * 
- * <pre>
- * &lt;complexType name="RequestedAttributeType">
- *   &lt;complexContent>
- *     &lt;extension base="{urn:oasis:names:tc:SAML:2.0:assertion}AttributeType">
- *       &lt;attribute name="isRequired" type="{http://www.w3.org/2001/XMLSchema}boolean" />
- *     &lt;/extension>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-public class RequestedAttributeType
-extends AttributeType
-{
-
-   public RequestedAttributeType(String name)
-   {
-      super(name); 
-   }
-
-   protected Boolean isRequired;
-
-   /**
-    * Gets the value of the isRequired property.
-    * 
-    * @return
-    *     possible object is
-    *     {@link Boolean }
-    *     
-    */
-   public Boolean isIsRequired() 
-   {
-      return isRequired;
-   }
-
-   /**
-    * Sets the value of the isRequired property.
-    * 
-    * @param value
-    *     allowed object is
-    *     {@link Boolean }
-    *     
-    */
-   public void setIsRequired(Boolean value) 
-   {
-      this.isRequired = value;
-   }
-}
\ No newline at end of file

Deleted: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/metadata/RoleDescriptorType.java
===================================================================
--- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/metadata/RoleDescriptorType.java	2011-06-21 20:35:05 UTC (rev 1015)
+++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/metadata/RoleDescriptorType.java	2011-06-21 20:44:33 UTC (rev 1016)
@@ -1,298 +0,0 @@
-package org.picketlink.identity.federation.newmodel.saml.v2.metadata;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-import javax.xml.datatype.Duration;
-import javax.xml.datatype.XMLGregorianCalendar;
-
-import org.picketlink.identity.xmlsec.w3.xmldsig.SignatureType;
-
-
-/**
- * <p>Java class for RoleDescriptorType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained within this class.
- * 
- * <pre>
- * &lt;complexType name="RoleDescriptorType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       &lt;sequence>
- *         &lt;element ref="{http://www.w3.org/2000/09/xmldsig#}Signature" minOccurs="0"/>
- *         &lt;element ref="{urn:oasis:names:tc:SAML:2.0:metadata}Extensions" minOccurs="0"/>
- *         &lt;element ref="{urn:oasis:names:tc:SAML:2.0:metadata}KeyDescriptor" maxOccurs="unbounded" minOccurs="0"/>
- *         &lt;element ref="{urn:oasis:names:tc:SAML:2.0:metadata}Organization" minOccurs="0"/>
- *         &lt;element ref="{urn:oasis:names:tc:SAML:2.0:metadata}ContactPerson" maxOccurs="unbounded" minOccurs="0"/>
- *       &lt;/sequence>
- *       &lt;attribute name="ID" type="{http://www.w3.org/2001/XMLSchema}ID" />
- *       &lt;attribute name="validUntil" type="{http://www.w3.org/2001/XMLSchema}dateTime" />
- *       &lt;attribute name="cacheDuration" type="{http://www.w3.org/2001/XMLSchema}duration" />
- *       &lt;attribute name="protocolSupportEnumeration" use="required" type="{urn:oasis:names:tc:SAML:2.0:metadata}anyURIListType" />
- *       &lt;attribute name="errorURL" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */ 
-public abstract class RoleDescriptorType extends TypeWithOtherAttributes
-{
-   protected SignatureType signature;
-   protected ExtensionsType extensions;
-   protected List<KeyDescriptorType> keyDescriptor = new ArrayList<KeyDescriptorType>();
-   protected OrganizationType organization;
-   protected List<ContactType> contactPerson = new ArrayList<ContactType>();
-   protected String id;
-   protected XMLGregorianCalendar validUntil;
-   protected Duration cacheDuration;
-   protected List<String> protocolSupportEnumeration = new ArrayList<String>();
-   protected String errorURL; 
-   
-   public RoleDescriptorType( List<String> protocolSupport )
-   {
-      protocolSupportEnumeration.addAll( protocolSupport );
-   }
-   
-   /**
-    * Add key descriptor
-    * @param keyD
-    */
-   public void addKeyDescriptor( KeyDescriptorType keyD )
-   {
-      this.keyDescriptor.add(keyD);
-   }
-   
-   /**
-    * Add contact 
-    * @param contact
-    */
-   public void addContactPerson( ContactType contact )
-   {
-      this.contactPerson.add(contact);
-   }
-   
-   /**
-    * remove key descriptor
-    * @param keyD
-    */
-   public void removeKeyDescriptor( KeyDescriptorType keyD )
-   {
-      this.keyDescriptor.remove(keyD);
-   }
-   
-   /**
-    * remove contact 
-    * @param contact
-    */
-   public void removeContactPerson( ContactType contact )
-   {
-      this.contactPerson.remove(contact);
-   }
-     
-   /**
-    * Gets the value of the signature property.
-    * 
-    * @return
-    *     possible object is
-    *     {@link SignatureType }
-    *     
-    */
-   public SignatureType getSignature() {
-      return signature;
-   }
-
-   /**
-    * Sets the value of the signature property.
-    * 
-    * @param value
-    *     allowed object is
-    *     {@link SignatureType }
-    *     
-    */
-   public void setSignature(SignatureType value) {
-      this.signature = value;
-   }
-
-   /**
-    * Gets the value of the extensions property.
-    * 
-    * @return
-    *     possible object is
-    *     {@link ExtensionsType }
-    *     
-    */
-   public ExtensionsType getExtensions() {
-      return extensions;
-   }
-
-   /**
-    * Sets the value of the extensions property.
-    * 
-    * @param value
-    *     allowed object is
-    *     {@link ExtensionsType }
-    *     
-    */
-   public void setExtensions(ExtensionsType value) {
-      this.extensions = value;
-   }
-
-   /**
-    * Gets the value of the keyDescriptor property. 
-    * <p>
-    * Objects of the following type(s) are allowed in the list
-    * {@link KeyDescriptorType }
-    * 
-    * 
-    */
-   public List<KeyDescriptorType> getKeyDescriptor() { 
-      return Collections.unmodifiableList( this.keyDescriptor );
-   }
-
-   /**
-    * Gets the value of the organization property.
-    * 
-    * @return
-    *     possible object is
-    *     {@link OrganizationType }
-    *     
-    */
-   public OrganizationType getOrganization() {
-      return organization;
-   }
-
-   /**
-    * Sets the value of the organization property.
-    * 
-    * @param value
-    *     allowed object is
-    *     {@link OrganizationType }
-    *     
-    */
-   public void setOrganization(OrganizationType value) {
-      this.organization = value;
-   }
-
-   /**
-    * Gets the value of the contactPerson property. 
-    * <p>
-    * Objects of the following type(s) are allowed in the list
-    * {@link ContactType }
-    * 
-    * 
-    */
-   public List<ContactType> getContactPerson() { 
-      return Collections.unmodifiableList( this.contactPerson );
-   }
-
-   /**
-    * Gets the value of the id property.
-    * 
-    * @return
-    *     possible object is
-    *     {@link String }
-    *     
-    */
-   public String getID() {
-      return id;
-   }
-
-   /**
-    * Sets the value of the id property.
-    * 
-    * @param value
-    *     allowed object is
-    *     {@link String }
-    *     
-    */
-   public void setID(String value) {
-      this.id = value;
-   }
-
-   /**
-    * Gets the value of the validUntil property.
-    * 
-    * @return
-    *     possible object is
-    *     {@link XMLGregorianCalendar }
-    *     
-    */
-   public XMLGregorianCalendar getValidUntil() {
-      return validUntil;
-   }
-
-   /**
-    * Sets the value of the validUntil property.
-    * 
-    * @param value
-    *     allowed object is
-    *     {@link XMLGregorianCalendar }
-    *     
-    */
-   public void setValidUntil(XMLGregorianCalendar value) {
-      this.validUntil = value;
-   }
-
-   /**
-    * Gets the value of the cacheDuration property.
-    * 
-    * @return
-    *     possible object is
-    *     {@link Duration }
-    *     
-    */
-   public Duration getCacheDuration() {
-      return cacheDuration;
-   }
-
-   /**
-    * Sets the value of the cacheDuration property.
-    * 
-    * @param value
-    *     allowed object is
-    *     {@link Duration }
-    *     
-    */
-   public void setCacheDuration(Duration value) {
-      this.cacheDuration = value;
-   }
-
-   /**
-    * Gets the value of the protocolSupportEnumeration property. 
-    * <p>
-    * Objects of the following type(s) are allowed in the list
-    * {@link String }
-    * 
-    * 
-    */
-   public List<String> getProtocolSupportEnumeration() { 
-      return Collections.unmodifiableList( this.protocolSupportEnumeration );
-   }
-
-   /**
-    * Gets the value of the errorURL property.
-    * 
-    * @return
-    *     possible object is
-    *     {@link String }
-    *     
-    */
-   public String getErrorURL() {
-      return errorURL;
-   }
-
-   /**
-    * Sets the value of the errorURL property.
-    * 
-    * @param value
-    *     allowed object is
-    *     {@link String }
-    *     
-    */
-   public void setErrorURL(String value) {
-      this.errorURL = value;
-   } 
-}
\ No newline at end of file

Deleted: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/metadata/SPSSODescriptorType.java
===================================================================
--- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/metadata/SPSSODescriptorType.java	2011-06-21 20:35:05 UTC (rev 1015)
+++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/metadata/SPSSODescriptorType.java	2011-06-21 20:44:33 UTC (rev 1016)
@@ -1,150 +0,0 @@
-package org.picketlink.identity.federation.newmodel.saml.v2.metadata;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-
-/**
- * <p>Java class for SPSSODescriptorType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained within this class.
- * 
- * <pre>
- * &lt;complexType name="SPSSODescriptorType">
- *   &lt;complexContent>
- *     &lt;extension base="{urn:oasis:names:tc:SAML:2.0:metadata}SSODescriptorType">
- *       &lt;sequence>
- *         &lt;element ref="{urn:oasis:names:tc:SAML:2.0:metadata}AssertionConsumerService" maxOccurs="unbounded"/>
- *         &lt;element ref="{urn:oasis:names:tc:SAML:2.0:metadata}AttributeConsumingService" maxOccurs="unbounded" minOccurs="0"/>
- *       &lt;/sequence>
- *       &lt;attribute name="AuthnRequestsSigned" type="{http://www.w3.org/2001/XMLSchema}boolean" />
- *       &lt;attribute name="WantAssertionsSigned" type="{http://www.w3.org/2001/XMLSchema}boolean" />
- *     &lt;/extension>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-public class SPSSODescriptorType  extends SSODescriptorType
-{
-   protected List<IndexedEndpointType> assertionConsumerService = new ArrayList<IndexedEndpointType>();
-   protected List<AttributeConsumingServiceType> attributeConsumingService = new ArrayList<AttributeConsumingServiceType>();
-   protected Boolean authnRequestsSigned;
-   protected Boolean wantAssertionsSigned;
-
-
-   public SPSSODescriptorType(List<String> protocolSupport)
-   {
-      super(protocolSupport); 
-   }
-   
-   /**
-    * Add an Assertion Consumer Service
-    * @param assertionConsumer an endpoint of type {@link IndexedEndpointType}
-    */
-   public void addAssertionConsumerService( IndexedEndpointType assertionConsumer )
-   {
-      this.assertionConsumerService.add( assertionConsumer );
-   }
-   
-   /**
-    * Add an attribute consumer
-    * @param attributeConsumer an instance of type {@link AttributeConsumingServiceType}
-    */
-   public void addAttributeConsumerService( AttributeConsumingServiceType attributeConsumer )
-   {
-      this.attributeConsumingService.add( attributeConsumer );
-   }
-   
-   /**
-    * Remove an Assertion Consumer Service
-    * @param assertionConsumer an endpoint of type {@link IndexedEndpointType}
-    */
-   public void removeAssertionConsumerService( IndexedEndpointType assertionConsumer )
-   {
-      this.assertionConsumerService.remove( assertionConsumer );
-   }
-   
-   /**
-    * Remove an attribute consumer
-    * @param attributeConsumer an instance of type {@link AttributeConsumingServiceType}
-    */
-   public void removeAttributeConsumerService( AttributeConsumingServiceType attributeConsumer )
-   {
-      this.attributeConsumingService.remove( attributeConsumer );
-   }
-
-   /**
-    * Gets the value of the assertionConsumerService property.
-    * <p>
-    * Objects of the following type(s) are allowed in the list
-    * {@link IndexedEndpointType }
-    */
-   public List<IndexedEndpointType> getAssertionConsumerService() 
-   {
-      return Collections.unmodifiableList( this.assertionConsumerService );
-   }
-   
-   
-
-   /**
-    * Gets the value of the attributeConsumingService property.
-    * <p>
-    * Objects of the following type(s) are allowed in the list
-    * {@link AttributeConsumingServiceType }
-    */
-   public List<AttributeConsumingServiceType> getAttributeConsumingService() 
-   {
-      return Collections.unmodifiableList( this.attributeConsumingService );
-   }
-
-   /**
-    * Gets the value of the authnRequestsSigned property.
-    * 
-    * @return
-    *     possible object is
-    *     {@link Boolean }
-    *     
-    */
-   public Boolean isAuthnRequestsSigned() {
-      return authnRequestsSigned;
-   }
-
-   /**
-    * Sets the value of the authnRequestsSigned property.
-    * 
-    * @param value
-    *     allowed object is
-    *     {@link Boolean }
-    *     
-    */
-   public void setAuthnRequestsSigned(Boolean value) {
-      this.authnRequestsSigned = value;
-   }
-
-   /**
-    * Gets the value of the wantAssertionsSigned property.
-    * 
-    * @return
-    *     possible object is
-    *     {@link Boolean }
-    *     
-    */
-   public Boolean isWantAssertionsSigned() {
-      return wantAssertionsSigned;
-   }
-
-   /**
-    * Sets the value of the wantAssertionsSigned property.
-    * 
-    * @param value
-    *     allowed object is
-    *     {@link Boolean }
-    *     
-    */
-   public void setWantAssertionsSigned(Boolean value) {
-      this.wantAssertionsSigned = value;
-   }
-}
\ No newline at end of file

Deleted: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/metadata/SSODescriptorType.java
===================================================================
--- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/metadata/SSODescriptorType.java	2011-06-21 20:35:05 UTC (rev 1015)
+++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/metadata/SSODescriptorType.java	2011-06-21 20:44:33 UTC (rev 1016)
@@ -1,160 +0,0 @@
-package org.picketlink.identity.federation.newmodel.saml.v2.metadata;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-
-/**
- * <p>Java class for SSODescriptorType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained within this class.
- * 
- * <pre>
- * &lt;complexType name="SSODescriptorType">
- *   &lt;complexContent>
- *     &lt;extension base="{urn:oasis:names:tc:SAML:2.0:metadata}RoleDescriptorType">
- *       &lt;sequence>
- *         &lt;element ref="{urn:oasis:names:tc:SAML:2.0:metadata}ArtifactResolutionService" maxOccurs="unbounded" minOccurs="0"/>
- *         &lt;element ref="{urn:oasis:names:tc:SAML:2.0:metadata}SingleLogoutService" maxOccurs="unbounded" minOccurs="0"/>
- *         &lt;element ref="{urn:oasis:names:tc:SAML:2.0:metadata}ManageNameIDService" maxOccurs="unbounded" minOccurs="0"/>
- *         &lt;element ref="{urn:oasis:names:tc:SAML:2.0:metadata}NameIDFormat" maxOccurs="unbounded" minOccurs="0"/>
- *       &lt;/sequence>
- *     &lt;/extension>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-public abstract class SSODescriptorType extends RoleDescriptorType
-{
-   protected List<IndexedEndpointType> artifactResolutionService = new ArrayList<IndexedEndpointType>(); 
-   protected List<EndpointType> singleLogoutService = new ArrayList<EndpointType>(); 
-   protected List<EndpointType> manageNameIDService = new ArrayList<EndpointType>(); 
-   protected List<String> nameIDFormat = new ArrayList<String>();
-
-
-   public SSODescriptorType(List<String> protocolSupport)
-   {
-      super(protocolSupport); 
-   }
-
-   /**
-    * Add SLO Service
-    * @param endpt
-    */
-   public void addSingleLogoutService( EndpointType endpt )
-   {
-      this.singleLogoutService.add(endpt);
-   }
-
-   /**
-    * Add atrifact resolution service
-    * @param i
-    */
-   public void addArtifactResolutionService( IndexedEndpointType i )
-   {
-      this.artifactResolutionService.add(i);
-   }
-
-   /**
-    * Add manage name id service
-    * @param end
-    */
-   public void addManageNameIDService( EndpointType end )
-   {
-      this.manageNameIDService.add(end);
-   }
-
-   /**
-    * Add Name ID Format
-    * @param s
-    */
-   public void addNameIDFormat( String s )
-   {
-      this.nameIDFormat.add(s);
-   }
-   
-   /**
-    * remove SLO Service
-    * @param endpt
-    */
-   public void removeSingleLogoutService( EndpointType endpt )
-   {
-      this.singleLogoutService.remove(endpt);
-   }
-
-   /**
-    * remove atrifact resolution service
-    * @param i
-    */
-   public void removeArtifactResolutionService( IndexedEndpointType i )
-   {
-      this.artifactResolutionService.remove(i);
-   }
-
-   /**
-    * remove manage name id service
-    * @param end
-    */
-   public void removeManageNameIDService( EndpointType end )
-   {
-      this.manageNameIDService.remove(end);
-   }
-
-   /**
-    * remove Name ID Format
-    * @param s
-    */
-   public void removeNameIDFormat( String s )
-   {
-      this.nameIDFormat.remove(s);
-   }
-
-   /**
-    * Gets the value of the artifactResolutionService property. 
-    * <p>
-    * Objects of the following type(s) are allowed in the list
-    * {@link IndexedEndpointType }
-    */
-   public List<IndexedEndpointType> getArtifactResolutionService() 
-   { 
-      return Collections.unmodifiableList( this.artifactResolutionService );
-   }
-
-   /**
-    * Gets the value of the singleLogoutService property.
-    * <p>
-    * Objects of the following type(s) are allowed in the list
-    * {@link EndpointType }
-    */
-   public List<EndpointType> getSingleLogoutService() 
-   {
-      return Collections.unmodifiableList( this.singleLogoutService );
-   }
-
-   /**
-    * Gets the value of the manageNameIDService property.
-    * <p>
-    * Objects of the following type(s) are allowed in the list
-    * {@link EndpointType }
-    */
-   public List<EndpointType> getManageNameIDService() 
-   {
-      return Collections.unmodifiableList( this.manageNameIDService );
-   }
-
-   /**
-    * Gets the value of the nameIDFormat property. 
-    * <p>
-    * Objects of the following type(s) are allowed in the list
-    * {@link String }
-    * 
-    * 
-    */
-   public List<String> getNameIDFormat() 
-   {
-      return Collections.unmodifiableList( this.nameIDFormat );
-   } 
-}
\ No newline at end of file

Deleted: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/metadata/TypeWithOtherAttributes.java
===================================================================
--- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/metadata/TypeWithOtherAttributes.java	2011-06-21 20:35:05 UTC (rev 1015)
+++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/metadata/TypeWithOtherAttributes.java	2011-06-21 20:44:33 UTC (rev 1016)
@@ -1,70 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2008, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors. 
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.picketlink.identity.federation.newmodel.saml.v2.metadata;
-
-import java.util.Collections;
-import java.util.HashMap;
-import java.util.Map;
-
-import javax.xml.namespace.QName;
-
-/**
- * Abstract base class for types that can have extra attributes
- * @author Anil.Saldhana at redhat.com
- * @since Dec 10, 2010
- */
-public abstract class TypeWithOtherAttributes
-{
-   protected Map<QName, String> otherAttributes = new HashMap<QName, String>();
-   
-   /**
-    * Add other attribute
-    * @param qame
-    * @param value
-    */
-   public void addOtherAttribute( QName qame, String value )
-   {
-      otherAttributes.put(qame, value);
-   }
-   
-   /**
-    * Remove other attribute
-    * @param qame
-    * @param value
-    */
-   public void removeOtherAttribute( QName qame )
-   {
-      otherAttributes.remove( qame );
-   }
-   
-   /**
-    * Gets a map that contains attributes that aren't bound to any typed property on this class.
-    *  
-    * 
-    * @return
-    *     always non-null
-    */
-   public Map<QName, String> getOtherAttributes() 
-   {
-       return Collections.unmodifiableMap( otherAttributes );
-   }
-}
\ No newline at end of file

Deleted: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/metadata/package-info.java
===================================================================
--- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/metadata/package-info.java	2011-06-21 20:35:05 UTC (rev 1015)
+++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/metadata/package-info.java	2011-06-21 20:44:33 UTC (rev 1016)
@@ -1,9 +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 
-//
-
- at javax.xml.bind.annotation.XmlSchema(namespace = "urn:oasis:names:tc:SAML:2.0:metadata", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED)
-package org.picketlink.identity.federation.newmodel.saml.v2.metadata;

Deleted: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/profiles/xacml/assertion/XACMLAuthzDecisionStatementType.java
===================================================================
--- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/profiles/xacml/assertion/XACMLAuthzDecisionStatementType.java	2011-06-21 20:35:05 UTC (rev 1015)
+++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/profiles/xacml/assertion/XACMLAuthzDecisionStatementType.java	2011-06-21 20:44:33 UTC (rev 1016)
@@ -1,104 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2008, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors. 
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.picketlink.identity.federation.newmodel.saml.v2.profiles.xacml.assertion;
-
-import org.jboss.security.xacml.core.model.context.RequestType;
-import org.jboss.security.xacml.core.model.context.ResponseType;
-import org.picketlink.identity.federation.newmodel.saml.v2.assertion.StatementAbstractType;
-
-
-/**
- * <p>Java class for XACMLAuthzDecisionStatementType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained within this class.
- * 
- * <pre>
- * &lt;complexType name="XACMLAuthzDecisionStatementType">
- *   &lt;complexContent>
- *     &lt;extension base="{urn:oasis:names:tc:SAML:2.0:assertion}StatementAbstractType">
- *       &lt;sequence>
- *         &lt;element ref="{urn:oasis:names:tc:xacml:2.0:context:schema:os}Response"/>
- *         &lt;element ref="{urn:oasis:names:tc:xacml:2.0:context:schema:os}Request" minOccurs="0"/>
- *       &lt;/sequence>
- *     &lt;/extension>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */ 
-public class XACMLAuthzDecisionStatementType
-extends StatementAbstractType
-{ 
-   private static final long serialVersionUID = 1L;
-   public static final String XSI_TYPE = "xacml-samlp:XACMLAuthzDecisionStatementType";
-   protected ResponseType response;
-   protected RequestType request;
-
-   /**
-    * Gets the value of the response property.
-    * 
-    * @return
-    *     possible object is
-    *     {@link ResponseType }
-    *     
-    */
-   public ResponseType getResponse() {
-      return response;
-   }
-
-   /**
-    * Sets the value of the response property.
-    * 
-    * @param value
-    *     allowed object is
-    *     {@link ResponseType }
-    *     
-    */
-   public void setResponse(ResponseType value) {
-      this.response = value;
-   }
-
-   /**
-    * Gets the value of the request property.
-    * 
-    * @return
-    *     possible object is
-    *     {@link RequestType }
-    *     
-    */
-   public RequestType getRequest() {
-      return request;
-   }
-
-   /**
-    * Sets the value of the request property.
-    * 
-    * @param value
-    *     allowed object is
-    *     {@link RequestType }
-    *     
-    */
-   public void setRequest(RequestType value) {
-      this.request = value;
-   }
-}
\ No newline at end of file

Deleted: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/profiles/xacml/assertion/XACMLPolicyStatementType.java
===================================================================
--- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/profiles/xacml/assertion/XACMLPolicyStatementType.java	2011-06-21 20:35:05 UTC (rev 1015)
+++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/profiles/xacml/assertion/XACMLPolicyStatementType.java	2011-06-21 20:44:33 UTC (rev 1016)
@@ -1,93 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2008, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors. 
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.picketlink.identity.federation.newmodel.saml.v2.profiles.xacml.assertion;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.jboss.security.xacml.core.model.policy.PolicySetType;
-import org.jboss.security.xacml.core.model.policy.PolicyType;
-import org.picketlink.identity.federation.newmodel.saml.v2.assertion.StatementAbstractType;
-
-/**
- * <p>Java class for XACMLPolicyStatementType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained within this class.
- * 
- * <pre>
- * &lt;complexType name="XACMLPolicyStatementType">
- *   &lt;complexContent>
- *     &lt;extension base="{urn:oasis:names:tc:SAML:2.0:assertion}StatementAbstractType">
- *       &lt;choice maxOccurs="unbounded" minOccurs="0">
- *         &lt;element ref="{urn:oasis:names:tc:xacml:2.0:policy:schema:os}Policy"/>
- *         &lt;element ref="{urn:oasis:names:tc:xacml:2.0:policy:schema:os}PolicySet"/>
- *       &lt;/choice>
- *     &lt;/extension>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */ 
-public class XACMLPolicyStatementType
-extends StatementAbstractType
-{
-   private static final long serialVersionUID = 1L;
-
-   public static class ChoiceType
-   {
-      private PolicyType policy;
-      private PolicySetType policySet;
-      public PolicyType getPolicy()
-      {
-         return policy;
-      }
-      public void setPolicy(PolicyType policy)
-      {
-         this.policy = policy;
-      }
-      public PolicySetType getPolicySet()
-      {
-         return policySet;
-      }
-      public void setPolicySet(PolicySetType policySet)
-      {
-         this.policySet = policySet;
-      } 
-   }
-
-   protected List<ChoiceType> choiceTypeList = new ArrayList<ChoiceType>();
-
-   public void add(ChoiceType choice )
-   {
-      choiceTypeList.add(choice);
-   }
-
-   /**
-    * Gets the value of the choiceTypeList property. 
-    */
-   public List<ChoiceType> getChoiceType() 
-   {
-      return choiceTypeList;
-   }
-
-}
\ No newline at end of file

Deleted: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/profiles/xacml/protocol/XACMLAuthzDecisionQueryType.java
===================================================================
--- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/profiles/xacml/protocol/XACMLAuthzDecisionQueryType.java	2011-06-21 20:35:05 UTC (rev 1015)
+++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/profiles/xacml/protocol/XACMLAuthzDecisionQueryType.java	2011-06-21 20:44:33 UTC (rev 1016)
@@ -1,144 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2008, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors. 
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.picketlink.identity.federation.newmodel.saml.v2.profiles.xacml.protocol;
-
-import javax.xml.datatype.XMLGregorianCalendar;
-
-import org.jboss.security.xacml.core.model.context.RequestType;
-import org.picketlink.identity.federation.newmodel.saml.v2.protocol.RequestAbstractType;
-
-
-/**
- * <p>Java class for XACMLAuthzDecisionQueryType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained within this class.
- * 
- * <pre>
- * &lt;complexType name="XACMLAuthzDecisionQueryType">
- *   &lt;complexContent>
- *     &lt;extension base="{urn:oasis:names:tc:SAML:2.0:protocol}RequestAbstractType">
- *       &lt;sequence>
- *         &lt;element ref="{urn:oasis:names:tc:xacml:2.0:context:schema:os}Request"/>
- *       &lt;/sequence>
- *       &lt;attribute name="InputContextOnly" type="{http://www.w3.org/2001/XMLSchema}boolean" default="false" />
- *       &lt;attribute name="ReturnContext" type="{http://www.w3.org/2001/XMLSchema}boolean" default="false" />
- *     &lt;/extension>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */ 
-public class XACMLAuthzDecisionQueryType
-extends RequestAbstractType
-{
-   protected RequestType request;
-   protected Boolean inputContextOnly;
-   protected Boolean returnContext;
-
-
-   public XACMLAuthzDecisionQueryType(String id, String version, XMLGregorianCalendar instant)
-   {
-      super(id, version, instant); 
-   }
-
-   /**
-    * Gets the value of the request property.
-    * 
-    * @return
-    *     possible object is
-    *     {@link RequestType }
-    *     
-    */
-   public RequestType getRequest() {
-      return request;
-   }
-
-   /**
-    * Sets the value of the request property.
-    * 
-    * @param value
-    *     allowed object is
-    *     {@link RequestType }
-    *     
-    */
-   public void setRequest(RequestType value) {
-      this.request = value;
-   }
-
-   /**
-    * Gets the value of the inputContextOnly property.
-    * 
-    * @return
-    *     possible object is
-    *     {@link Boolean }
-    *     
-    */
-   public boolean isInputContextOnly() {
-      if (inputContextOnly == null) {
-         return false;
-      } else {
-         return inputContextOnly;
-      }
-   }
-
-   /**
-    * Sets the value of the inputContextOnly property.
-    * 
-    * @param value
-    *     allowed object is
-    *     {@link Boolean }
-    *     
-    */
-   public void setInputContextOnly(Boolean value) {
-      this.inputContextOnly = value;
-   }
-
-   /**
-    * Gets the value of the returnContext property.
-    * 
-    * @return
-    *     possible object is
-    *     {@link Boolean }
-    *     
-    */
-   public boolean isReturnContext() {
-      if (returnContext == null) {
-         return false;
-      } else {
-         return returnContext;
-      }
-   }
-
-   /**
-    * Sets the value of the returnContext property.
-    * 
-    * @param value
-    *     allowed object is
-    *     {@link Boolean }
-    *     
-    */
-   public void setReturnContext(Boolean value) {
-      this.returnContext = value;
-   }
-
-}
\ No newline at end of file

Deleted: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/profiles/xacml/protocol/XACMLPolicyQueryType.java
===================================================================
--- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/profiles/xacml/protocol/XACMLPolicyQueryType.java	2011-06-21 20:35:05 UTC (rev 1015)
+++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/profiles/xacml/protocol/XACMLPolicyQueryType.java	2011-06-21 20:44:33 UTC (rev 1016)
@@ -1,115 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2008, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors. 
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.picketlink.identity.federation.newmodel.saml.v2.profiles.xacml.protocol;
-
-import javax.xml.datatype.XMLGregorianCalendar;
-
-import org.jboss.security.xacml.core.model.context.RequestType;
-import org.jboss.security.xacml.core.model.policy.IdReferenceType;
-import org.jboss.security.xacml.core.model.policy.TargetType;
-import org.picketlink.identity.federation.newmodel.saml.v2.protocol.RequestAbstractType;
-
-
-/**
- * <p>Java class for XACMLPolicyQueryType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained within this class.
- * 
- * <pre>
- * &lt;complexType name="XACMLPolicyQueryType">
- *   &lt;complexContent>
- *     &lt;extension base="{urn:oasis:names:tc:SAML:2.0:protocol}RequestAbstractType">
- *       &lt;choice maxOccurs="unbounded" minOccurs="0">
- *         &lt;element ref="{urn:oasis:names:tc:xacml:2.0:context:schema:os}Request"/>
- *         &lt;element ref="{urn:oasis:names:tc:xacml:2.0:policy:schema:os}Target"/>
- *         &lt;element ref="{urn:oasis:names:tc:xacml:2.0:policy:schema:os}PolicySetIdReference"/>
- *         &lt;element ref="{urn:oasis:names:tc:xacml:2.0:policy:schema:os}PolicyIdReference"/>
- *       &lt;/choice>
- *     &lt;/extension>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */ 
-public class XACMLPolicyQueryType
-extends RequestAbstractType
-{
-   public static class ChoiceType
-   {
-      private RequestType request;
-      private TargetType target;
-      private IdReferenceType policySetIDReference;
-      private IdReferenceType policyIdReference;
-      public RequestType getRequest()
-      {
-         return request;
-      }
-      public void setRequest(RequestType request)
-      {
-         this.request = request;
-      }
-      public TargetType getTarget()
-      {
-         return target;
-      }
-      public void setTarget(TargetType target)
-      {
-         this.target = target;
-      }
-      public IdReferenceType getPolicySetIDReference()
-      {
-         return policySetIDReference;
-      }
-      public void setPolicySetIDReference(IdReferenceType policySetIDReference)
-      {
-         this.policySetIDReference = policySetIDReference;
-      }
-      public IdReferenceType getPolicyIdReference()
-      {
-         return policyIdReference;
-      }
-      public void setPolicyIdReference(IdReferenceType policyIdReference)
-      {
-         this.policyIdReference = policyIdReference;
-      } 
-   }
-
-   protected ChoiceType choiceType;
-
-
-
-   public XACMLPolicyQueryType(String id, String version, XMLGregorianCalendar instant)
-   {
-      super(id, version, instant); 
-   }
-
-   public ChoiceType getChoiceType()
-   {
-      return choiceType;
-   }
-
-   public void setChoiceType(ChoiceType choiceType)
-   {
-      this.choiceType = choiceType;
-   }
-}
\ No newline at end of file

Deleted: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/protocol/ArtifactResolveType.java
===================================================================
--- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/protocol/ArtifactResolveType.java	2011-06-21 20:35:05 UTC (rev 1015)
+++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/protocol/ArtifactResolveType.java	2011-06-21 20:44:33 UTC (rev 1016)
@@ -1,81 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2008, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors. 
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.picketlink.identity.federation.newmodel.saml.v2.protocol;
-
-import javax.xml.datatype.XMLGregorianCalendar;
-
-
-
-/**
- * <p>Java class for ArtifactResolveType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained within this class.
- * 
- * <pre>
- * &lt;complexType name="ArtifactResolveType">
- *   &lt;complexContent>
- *     &lt;extension base="{urn:oasis:names:tc:SAML:2.0:protocol}RequestAbstractType">
- *       &lt;sequence>
- *         &lt;element ref="{urn:oasis:names:tc:SAML:2.0:protocol}Artifact"/>
- *       &lt;/sequence>
- *     &lt;/extension>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */ 
-public class ArtifactResolveType
-extends RequestAbstractType
-{
-   protected String artifact; 
-
-   public ArtifactResolveType(String id, String version, XMLGregorianCalendar instant)
-   {
-      super(id, version, instant); 
-   }
-
-   /**
-    * Gets the value of the artifact property.
-    * 
-    * @return
-    *     possible object is
-    *     {@link String }
-    *     
-    */
-   public String getArtifact() {
-      return artifact;
-   }
-
-   /**
-    * Sets the value of the artifact property.
-    * 
-    * @param value
-    *     allowed object is
-    *     {@link String }
-    *     
-    */
-   public void setArtifact(String value) {
-      this.artifact = value;
-   }
-
-}
\ No newline at end of file

Deleted: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/protocol/ArtifactResponseType.java
===================================================================
--- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/protocol/ArtifactResponseType.java	2011-06-21 20:35:05 UTC (rev 1015)
+++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/protocol/ArtifactResponseType.java	2011-06-21 20:44:33 UTC (rev 1016)
@@ -1,79 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2008, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors. 
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.picketlink.identity.federation.newmodel.saml.v2.protocol;
- 
-
-import org.w3c.dom.Element;
-
-
-/**
- * <p>Java class for ArtifactResponseType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained within this class.
- * 
- * <pre>
- * &lt;complexType name="ArtifactResponseType">
- *   &lt;complexContent>
- *     &lt;extension base="{urn:oasis:names:tc:SAML:2.0:protocol}StatusResponseType">
- *       &lt;sequence>
- *         &lt;any/>
- *       &lt;/sequence>
- *     &lt;/extension>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */ 
-public class ArtifactResponseType
-    extends StatusResponseType
-{
-
-    protected Object any;
-
-    /**
-     * Gets the value of the any property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link Element }
-     *     {@link Object }
-     *     
-     */
-    public Object getAny() {
-        return any;
-    }
-
-    /**
-     * Sets the value of the any property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link Element }
-     *     {@link Object }
-     *     
-     */
-    public void setAny(Object value) {
-        this.any = value;
-    }
-
-}

Deleted: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/protocol/AssertionIDRequestType.java
===================================================================
--- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/protocol/AssertionIDRequestType.java	2011-06-21 20:35:05 UTC (rev 1015)
+++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/protocol/AssertionIDRequestType.java	2011-06-21 20:44:33 UTC (rev 1016)
@@ -1,86 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2008, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors. 
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.picketlink.identity.federation.newmodel.saml.v2.protocol;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-import javax.xml.datatype.XMLGregorianCalendar;
-
-
-/**
- * <p>Java class for AssertionIDRequestType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained within this class.
- * 
- * <pre>
- * &lt;complexType name="AssertionIDRequestType">
- *   &lt;complexContent>
- *     &lt;extension base="{urn:oasis:names:tc:SAML:2.0:protocol}RequestAbstractType">
- *       &lt;sequence>
- *         &lt;element ref="{urn:oasis:names:tc:SAML:2.0:assertion}AssertionIDRef" maxOccurs="unbounded"/>
- *       &lt;/sequence>
- *     &lt;/extension>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */ 
-public class AssertionIDRequestType
-extends RequestAbstractType
-{ 
-   protected List<String> assertionIDRef = new ArrayList<String>();
-    
-   public AssertionIDRequestType(String id, String version, XMLGregorianCalendar instant)
-   {
-      super(id, version, instant);
-   }
-
-   /**
-    * Add assertion id reference
-    * @param id
-    */
-   public void addAssertionIDRef( String id )
-   {
-      assertionIDRef.add( id );
-   }
-   
-   /**
-    * remove assertion id reference
-    * @param id
-    */
-   public void removeAssertionIDRef( String id )
-   {
-      assertionIDRef.remove( id );
-   }
-
-   /**
-    * Gets the value of the assertionIDRef property.
-    *  
-    */
-   public List<String> getAssertionIDRef() 
-   {
-      return Collections.unmodifiableList( this.assertionIDRef );
-   }
-}
\ No newline at end of file

Deleted: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/protocol/AttributeQueryType.java
===================================================================
--- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/protocol/AttributeQueryType.java	2011-06-21 20:35:05 UTC (rev 1015)
+++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/protocol/AttributeQueryType.java	2011-06-21 20:44:33 UTC (rev 1016)
@@ -1,88 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2008, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors. 
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.picketlink.identity.federation.newmodel.saml.v2.protocol;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-import javax.xml.datatype.XMLGregorianCalendar;
-
-import org.picketlink.identity.federation.newmodel.saml.v2.assertion.AttributeType;
- 
-
-
-/**
- * <p>Java class for AttributeQueryType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained within this class.
- * 
- * <pre>
- * &lt;complexType name="AttributeQueryType">
- *   &lt;complexContent>
- *     &lt;extension base="{urn:oasis:names:tc:SAML:2.0:protocol}SubjectQueryAbstractType">
- *       &lt;sequence>
- *         &lt;element ref="{urn:oasis:names:tc:SAML:2.0:assertion}Attribute" maxOccurs="unbounded" minOccurs="0"/>
- *       &lt;/sequence>
- *     &lt;/extension>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */ 
-public class AttributeQueryType
-extends SubjectQueryAbstractType
-{
-   protected List<AttributeType> attribute = new ArrayList<AttributeType>();
-  
-   public AttributeQueryType(String id, String version, XMLGregorianCalendar instant)
-   {
-      super(id, version, instant); 
-   }
-
-   /**
-    * Add an attribute
-    * @param att
-    */
-   public void add( AttributeType att )
-   {
-      this.attribute.add(att);
-   }
-   
-   /**
-    * Remove an attribute
-    * @param att
-    */
-   public void remove( AttributeType att )
-   {
-      this.attribute.remove(att);
-   }
-   
-   /**
-    * Gets the value of the attribute property. 
-    */
-   public List<AttributeType> getAttribute() 
-   {
-      return Collections.unmodifiableList( this.attribute );
-   }
-}
\ No newline at end of file

Deleted: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/protocol/AuthnContextComparisonType.java
===================================================================
--- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/protocol/AuthnContextComparisonType.java	2011-06-21 20:35:05 UTC (rev 1015)
+++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/protocol/AuthnContextComparisonType.java	2011-06-21 20:44:33 UTC (rev 1016)
@@ -1,72 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2008, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors. 
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.picketlink.identity.federation.newmodel.saml.v2.protocol;
-
-
-/**
- * <p>Java class for AuthnContextComparisonType.
- * 
- * <p>The following schema fragment specifies the expected content contained within this class.
- * <p>
- * <pre>
- * &lt;simpleType name="AuthnContextComparisonType">
- *   &lt;restriction base="{http://www.w3.org/2001/XMLSchema}string">
- *     &lt;enumeration value="exact"/>
- *     &lt;enumeration value="minimum"/>
- *     &lt;enumeration value="maximum"/>
- *     &lt;enumeration value="better"/>
- *   &lt;/restriction>
- * &lt;/simpleType>
- * </pre>
- * 
- */ 
-public enum AuthnContextComparisonType 
-{
-   EXACT("exact"),
-   MINIMUM("minimum"),
-   MAXIMUM("maximum"),
-   BETTER("better");
-
-   private final String value;
-
-   AuthnContextComparisonType(String v) 
-   {
-      value = v;
-   }
-
-   public String value() 
-   {
-      return value;
-   }
-
-   public static AuthnContextComparisonType fromValue(String v) 
-   {
-      for (AuthnContextComparisonType c: AuthnContextComparisonType.values()) 
-      {
-         if (c.value.equals(v)) 
-         {
-            return c;
-         }
-      }
-      throw new IllegalArgumentException(v);
-   }
-}
\ No newline at end of file

Deleted: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/protocol/AuthnQueryType.java
===================================================================
--- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/protocol/AuthnQueryType.java	2011-06-21 20:35:05 UTC (rev 1015)
+++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/protocol/AuthnQueryType.java	2011-06-21 20:44:33 UTC (rev 1016)
@@ -1,106 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2008, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors. 
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.picketlink.identity.federation.newmodel.saml.v2.protocol;
-
-import javax.xml.datatype.XMLGregorianCalendar;
-
-
-/**
- * <p>Java class for AuthnQueryType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained within this class.
- * 
- * <pre>
- * &lt;complexType name="AuthnQueryType">
- *   &lt;complexContent>
- *     &lt;extension base="{urn:oasis:names:tc:SAML:2.0:protocol}SubjectQueryAbstractType">
- *       &lt;sequence>
- *         &lt;element ref="{urn:oasis:names:tc:SAML:2.0:protocol}RequestedAuthnContext" minOccurs="0"/>
- *       &lt;/sequence>
- *       &lt;attribute name="SessionIndex" type="{http://www.w3.org/2001/XMLSchema}string" />
- *     &lt;/extension>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */ 
-public class AuthnQueryType
-extends SubjectQueryAbstractType
-{ 
-   protected RequestedAuthnContextType requestedAuthnContext; 
-   protected String sessionIndex;
-
-   
-   public AuthnQueryType(String id, String version, XMLGregorianCalendar instant)
-   {
-      super(id, version, instant); 
-   }
-
-   /**
-    * Gets the value of the requestedAuthnContext property.
-    * 
-    * @return
-    *     possible object is
-    *     {@link RequestedAuthnContextType }
-    *     
-    */
-   public RequestedAuthnContextType getRequestedAuthnContext() {
-      return requestedAuthnContext;
-   }
-
-   /**
-    * Sets the value of the requestedAuthnContext property.
-    * 
-    * @param value
-    *     allowed object is
-    *     {@link RequestedAuthnContextType }
-    *     
-    */
-   public void setRequestedAuthnContext(RequestedAuthnContextType value) {
-      this.requestedAuthnContext = value;
-   }
-
-   /**
-    * Gets the value of the sessionIndex property.
-    * 
-    * @return
-    *     possible object is
-    *     {@link String }
-    *     
-    */
-   public String getSessionIndex() {
-      return sessionIndex;
-   }
-
-   /**
-    * Sets the value of the sessionIndex property.
-    * 
-    * @param value
-    *     allowed object is
-    *     {@link String }
-    *     
-    */
-   public void setSessionIndex(String value) {
-      this.sessionIndex = value;
-   }
-}
\ No newline at end of file

Deleted: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/protocol/AuthnRequestType.java
===================================================================
--- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/protocol/AuthnRequestType.java	2011-06-21 20:35:05 UTC (rev 1015)
+++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/protocol/AuthnRequestType.java	2011-06-21 20:44:33 UTC (rev 1016)
@@ -1,371 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2008, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors. 
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.picketlink.identity.federation.newmodel.saml.v2.protocol;
-
-import java.net.URI;
-
-import javax.xml.datatype.XMLGregorianCalendar;
-
-import org.picketlink.identity.federation.newmodel.saml.v2.assertion.ConditionsType;
-import org.picketlink.identity.federation.newmodel.saml.v2.assertion.SubjectType;
-
-
-
-/**
- * <p>Java class for AuthnRequestType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained within this class.
- * 
- * <pre>
- * &lt;complexType name="AuthnRequestType">
- *   &lt;complexContent>
- *     &lt;extension base="{urn:oasis:names:tc:SAML:2.0:protocol}RequestAbstractType">
- *       &lt;sequence>
- *         &lt;element ref="{urn:oasis:names:tc:SAML:2.0:assertion}Subject" minOccurs="0"/>
- *         &lt;element ref="{urn:oasis:names:tc:SAML:2.0:protocol}NameIDPolicy" minOccurs="0"/>
- *         &lt;element ref="{urn:oasis:names:tc:SAML:2.0:assertion}Conditions" minOccurs="0"/>
- *         &lt;element ref="{urn:oasis:names:tc:SAML:2.0:protocol}RequestedAuthnContext" minOccurs="0"/>
- *         &lt;element ref="{urn:oasis:names:tc:SAML:2.0:protocol}Scoping" minOccurs="0"/>
- *       &lt;/sequence>
- *       &lt;attribute name="ForceAuthn" type="{http://www.w3.org/2001/XMLSchema}boolean" />
- *       &lt;attribute name="IsPassive" type="{http://www.w3.org/2001/XMLSchema}boolean" />
- *       &lt;attribute name="ProtocolBinding" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
- *       &lt;attribute name="AssertionConsumerServiceIndex" type="{http://www.w3.org/2001/XMLSchema}unsignedShort" />
- *       &lt;attribute name="AssertionConsumerServiceURL" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
- *       &lt;attribute name="AttributeConsumingServiceIndex" type="{http://www.w3.org/2001/XMLSchema}unsignedShort" />
- *       &lt;attribute name="ProviderName" type="{http://www.w3.org/2001/XMLSchema}string" />
- *     &lt;/extension>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */ 
-public class AuthnRequestType
-extends RequestAbstractType
-{
-   protected SubjectType subject; 
-   protected NameIDPolicyType nameIDPolicy; 
-   protected ConditionsType conditions; 
-   protected RequestedAuthnContextType requestedAuthnContext; 
-   protected ScopingType scoping; 
-   protected Boolean forceAuthn; 
-   protected Boolean isPassive; 
-   protected URI protocolBinding; 
-   protected Integer assertionConsumerServiceIndex; 
-   protected URI assertionConsumerServiceURL; 
-   protected Integer attributeConsumingServiceIndex; 
-   protected String providerName;
-
-   public AuthnRequestType(String id, String version, XMLGregorianCalendar instant)
-   {
-      super(id, version, instant);
-   }
-
-   /**
-    * Gets the value of the subject property.
-    * 
-    * @return
-    *     possible object is
-    *     {@link SubjectType }
-    *     
-    */
-   public SubjectType getSubject() {
-      return subject;
-   }
-
-   /**
-    * Sets the value of the subject property.
-    * 
-    * @param value
-    *     allowed object is
-    *     {@link SubjectType }
-    *     
-    */
-   public void setSubject(SubjectType value) {
-      this.subject = value;
-   }
-
-   /**
-    * Gets the value of the nameIDPolicy property.
-    * 
-    * @return
-    *     possible object is
-    *     {@link NameIDPolicyType }
-    *     
-    */
-   public NameIDPolicyType getNameIDPolicy() {
-      return nameIDPolicy;
-   }
-
-   /**
-    * Sets the value of the nameIDPolicy property.
-    * 
-    * @param value
-    *     allowed object is
-    *     {@link NameIDPolicyType }
-    *     
-    */
-   public void setNameIDPolicy(NameIDPolicyType value) {
-      this.nameIDPolicy = value;
-   }
-
-   /**
-    * Gets the value of the conditions property.
-    * 
-    * @return
-    *     possible object is
-    *     {@link ConditionsType }
-    *     
-    */
-   public ConditionsType getConditions() {
-      return conditions;
-   }
-
-   /**
-    * Sets the value of the conditions property.
-    * 
-    * @param value
-    *     allowed object is
-    *     {@link ConditionsType }
-    *     
-    */
-   public void setConditions(ConditionsType value) {
-      this.conditions = value;
-   }
-
-   /**
-    * Gets the value of the requestedAuthnContext property.
-    * 
-    * @return
-    *     possible object is
-    *     {@link RequestedAuthnContextType }
-    *     
-    */
-   public RequestedAuthnContextType getRequestedAuthnContext() {
-      return requestedAuthnContext;
-   }
-
-   /**
-    * Sets the value of the requestedAuthnContext property.
-    * 
-    * @param value
-    *     allowed object is
-    *     {@link RequestedAuthnContextType }
-    *     
-    */
-   public void setRequestedAuthnContext(RequestedAuthnContextType value) {
-      this.requestedAuthnContext = value;
-   }
-
-   /**
-    * Gets the value of the scoping property.
-    * 
-    * @return
-    *     possible object is
-    *     {@link ScopingType }
-    *     
-    */
-   public ScopingType getScoping() {
-      return scoping;
-   }
-
-   /**
-    * Sets the value of the scoping property.
-    * 
-    * @param value
-    *     allowed object is
-    *     {@link ScopingType }
-    *     
-    */
-   public void setScoping(ScopingType value) {
-      this.scoping = value;
-   }
-
-   /**
-    * Gets the value of the forceAuthn property.
-    * 
-    * @return
-    *     possible object is
-    *     {@link Boolean }
-    *     
-    */
-   public Boolean isForceAuthn() {
-      return forceAuthn;
-   }
-
-   /**
-    * Sets the value of the forceAuthn property.
-    * 
-    * @param value
-    *     allowed object is
-    *     {@link Boolean }
-    *     
-    */
-   public void setForceAuthn(Boolean value) {
-      this.forceAuthn = value;
-   }
-
-   /**
-    * Gets the value of the isPassive property.
-    * 
-    * @return
-    *     possible object is
-    *     {@link Boolean }
-    *     
-    */
-   public Boolean isIsPassive() {
-      return isPassive;
-   }
-
-   /**
-    * Sets the value of the isPassive property.
-    * 
-    * @param value
-    *     allowed object is
-    *     {@link Boolean }
-    *     
-    */
-   public void setIsPassive(Boolean value) {
-      this.isPassive = value;
-   }
-
-   /**
-    * Gets the value of the protocolBinding property.
-    * 
-    * @return
-    *     possible object is
-    *     {@link String }
-    *     
-    */
-   public URI getProtocolBinding() {
-      return protocolBinding;
-   }
-
-   /**
-    * Sets the value of the protocolBinding property.
-    * 
-    * @param value
-    *     allowed object is
-    *     {@link String }
-    *     
-    */
-   public void setProtocolBinding( URI value) {
-      this.protocolBinding = value;
-   }
-
-   /**
-    * Gets the value of the assertionConsumerServiceIndex property.
-    * 
-    * @return
-    *     possible object is
-    *     {@link Integer }
-    *     
-    */
-   public Integer getAssertionConsumerServiceIndex() {
-      return assertionConsumerServiceIndex;
-   }
-
-   /**
-    * Sets the value of the assertionConsumerServiceIndex property.
-    * 
-    * @param value
-    *     allowed object is
-    *     {@link Integer }
-    *     
-    */
-   public void setAssertionConsumerServiceIndex(Integer value) {
-      this.assertionConsumerServiceIndex = value;
-   }
-
-   /**
-    * Gets the value of the assertionConsumerServiceURL property.
-    * 
-    * @return
-    *     possible object is
-    *     {@link String }
-    *     
-    */
-   public URI getAssertionConsumerServiceURL() {
-      return assertionConsumerServiceURL;
-   }
-
-   /**
-    * Sets the value of the assertionConsumerServiceURL property.
-    * 
-    * @param value
-    *     allowed object is
-    *     {@link String }
-    *     
-    */
-   public void setAssertionConsumerServiceURL( URI value) {
-      this.assertionConsumerServiceURL = value;
-   }
-
-   /**
-    * Gets the value of the attributeConsumingServiceIndex property.
-    * 
-    * @return
-    *     possible object is
-    *     {@link Integer }
-    *     
-    */
-   public Integer getAttributeConsumingServiceIndex() {
-      return attributeConsumingServiceIndex;
-   }
-
-   /**
-    * Sets the value of the attributeConsumingServiceIndex property.
-    * 
-    * @param value
-    *     allowed object is
-    *     {@link Integer }
-    *     
-    */
-   public void setAttributeConsumingServiceIndex(Integer value) {
-      this.attributeConsumingServiceIndex = value;
-   }
-
-   /**
-    * Gets the value of the providerName property.
-    * 
-    * @return
-    *     possible object is
-    *     {@link String }
-    *     
-    */
-   public String getProviderName() {
-      return providerName;
-   }
-
-   /**
-    * Sets the value of the providerName property.
-    * 
-    * @param value
-    *     allowed object is
-    *     {@link String }
-    *     
-    */
-   public void setProviderName(String value) {
-      this.providerName = value;
-   }
-}
\ No newline at end of file

Deleted: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/protocol/AuthzDecisionQueryType.java
===================================================================
--- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/protocol/AuthzDecisionQueryType.java	2011-06-21 20:35:05 UTC (rev 1015)
+++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/protocol/AuthzDecisionQueryType.java	2011-06-21 20:44:33 UTC (rev 1016)
@@ -1,143 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2008, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors. 
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.picketlink.identity.federation.newmodel.saml.v2.protocol;
-
-import java.net.URI;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List; 
-
-import javax.xml.datatype.XMLGregorianCalendar;
-
-import org.picketlink.identity.federation.newmodel.saml.v2.assertion.ActionType;
-import org.picketlink.identity.federation.newmodel.saml.v2.assertion.EvidenceType;
-
-
-/**
- * <p>Java class for AuthzDecisionQueryType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained within this class.
- * 
- * <pre>
- * &lt;complexType name="AuthzDecisionQueryType">
- *   &lt;complexContent>
- *     &lt;extension base="{urn:oasis:names:tc:SAML:2.0:protocol}SubjectQueryAbstractType">
- *       &lt;sequence>
- *         &lt;element ref="{urn:oasis:names:tc:SAML:2.0:assertion}Action" maxOccurs="unbounded"/>
- *         &lt;element ref="{urn:oasis:names:tc:SAML:2.0:assertion}Evidence" minOccurs="0"/>
- *       &lt;/sequence>
- *       &lt;attribute name="Resource" use="required" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
- *     &lt;/extension>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre> 
- */ 
-public class AuthzDecisionQueryType
-extends SubjectQueryAbstractType
-{ 
-   protected List<ActionType> action = new ArrayList<ActionType> (); 
-   protected EvidenceType evidence; 
-   protected URI resource;
-    
-   public AuthzDecisionQueryType(String id, String version, XMLGregorianCalendar instant)
-   {
-      super(id, version, instant); 
-   }
-
-   /**
-    * Add an action
-    * @param act
-    */
-   public void addAction( ActionType act )
-   {
-      this.action.add(act);
-   }
-   
-   /**
-    * Remove an action
-    * @param act
-    */
-   public void removeAction( ActionType act )
-   {
-      this.action.remove(act);
-   }
-
-   /**
-    * Gets the value of the action property.  
-    */
-   public List<ActionType> getAction() 
-   { 
-      return Collections.unmodifiableList( this.action );
-   }
-
-   /**
-    * Gets the value of the evidence property.
-    * 
-    * @return
-    *     possible object is
-    *     {@link EvidenceType }
-    *     
-    */
-   public EvidenceType getEvidence() 
-   {
-      return evidence;
-   }
-
-   /**
-    * Sets the value of the evidence property.
-    * 
-    * @param value
-    *     allowed object is
-    *     {@link EvidenceType }
-    *     
-    */
-   public void setEvidence(EvidenceType value) 
-   {
-      this.evidence = value;
-   }
-
-   /**
-    * Gets the value of the resource property.
-    * 
-    * @return
-    *     possible object is
-    *     {@link String }
-    *     
-    */
-   public URI getResource() 
-   {
-      return resource;
-   }
-
-   /**
-    * Sets the value of the resource property.
-    * 
-    * @param value
-    *     allowed object is
-    *     {@link String }
-    *     
-    */
-   public void setResource( URI value) 
-   {
-      this.resource = value;
-   } 
-}
\ No newline at end of file

Deleted: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/protocol/ExtensionsType.java
===================================================================
--- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/protocol/ExtensionsType.java	2011-06-21 20:35:05 UTC (rev 1015)
+++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/protocol/ExtensionsType.java	2011-06-21 20:44:33 UTC (rev 1016)
@@ -1,77 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2008, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors. 
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.picketlink.identity.federation.newmodel.saml.v2.protocol;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-
-/**
- * <p>Java class for ExtensionsType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained within this class.
- * 
- * <pre>
- * &lt;complexType name="ExtensionsType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       &lt;sequence>
- *         &lt;any/>
- *       &lt;/sequence>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre> 
- * 
- */ 
-public class ExtensionsType 
-{ 
-   protected List<Object> any = new ArrayList<Object>();
-
-   /**
-    * Add an extension
-    * @param extension
-    */
-   public void addExtension( Object extension )
-   {
-      any.add( extension );
-   }
-   
-   /**
-    * Remove an extension
-    * @param extension
-    */
-   public void removeExtension( Object extension )
-   {
-      any.remove( extension );
-   }
-
-   /**
-    * Gets the value of the any property. 
-    * 
-    */
-   public List<Object> getAny() 
-   {
-      return Collections.unmodifiableList( this.any );
-   }
-}
\ No newline at end of file

Deleted: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/protocol/IDPEntryType.java
===================================================================
--- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/protocol/IDPEntryType.java	2011-06-21 20:35:05 UTC (rev 1015)
+++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/protocol/IDPEntryType.java	2011-06-21 20:44:33 UTC (rev 1016)
@@ -1,126 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2008, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors. 
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.picketlink.identity.federation.newmodel.saml.v2.protocol;
-
-import java.net.URI;
-
-
-/**
- * <p>Java class for IDPEntryType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained within this class.
- * 
- * <pre>
- * &lt;complexType name="IDPEntryType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       &lt;attribute name="ProviderID" use="required" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
- *       &lt;attribute name="Name" type="{http://www.w3.org/2001/XMLSchema}string" />
- *       &lt;attribute name="Loc" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */ 
-public class IDPEntryType 
-{
-   protected URI providerID; 
-   protected String name; 
-   protected String loc;
-
-   /**
-    * Gets the value of the providerID property.
-    * 
-    * @return
-    *     possible object is
-    *     {@link String }
-    *     
-    */
-   public URI getProviderID() 
-   {
-      return providerID;
-   }
-
-   /**
-    * Sets the value of the providerID property.
-    * 
-    * @param value
-    *     allowed object is
-    *     {@link String }
-    *     
-    */
-   public void setProviderID( URI value) 
-   {
-      this.providerID = value;
-   }
-
-   /**
-    * Gets the value of the name property.
-    * 
-    * @return
-    *     possible object is
-    *     {@link String }
-    *     
-    */
-   public String getName() {
-      return name;
-   }
-
-   /**
-    * Sets the value of the name property.
-    * 
-    * @param value
-    *     allowed object is
-    *     {@link String }
-    *     
-    */
-   public void setName(String value) {
-      this.name = value;
-   }
-
-   /**
-    * Gets the value of the loc property.
-    * 
-    * @return
-    *     possible object is
-    *     {@link String }
-    *     
-    */
-   public String getLoc() {
-      return loc;
-   }
-
-   /**
-    * Sets the value of the loc property.
-    * 
-    * @param value
-    *     allowed object is
-    *     {@link String }
-    *     
-    */
-   public void setLoc(String value) {
-      this.loc = value;
-   }
-
-}
\ No newline at end of file

Deleted: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/protocol/IDPListType.java
===================================================================
--- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/protocol/IDPListType.java	2011-06-21 20:35:05 UTC (rev 1015)
+++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/protocol/IDPListType.java	2011-06-21 20:44:33 UTC (rev 1016)
@@ -1,106 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2008, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors. 
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.picketlink.identity.federation.newmodel.saml.v2.protocol;
-
-import java.net.URI;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-
-/**
- * <p>Java class for IDPListType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained within this class.
- * 
- * <pre>
- * &lt;complexType name="IDPListType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       &lt;sequence>
- *         &lt;element ref="{urn:oasis:names:tc:SAML:2.0:protocol}IDPEntry" maxOccurs="unbounded"/>
- *         &lt;element ref="{urn:oasis:names:tc:SAML:2.0:protocol}GetComplete" minOccurs="0"/>
- *       &lt;/sequence>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */ 
-public class IDPListType 
-{
-   protected List<IDPEntryType> idpEntry = new ArrayList<IDPEntryType>(); 
-   protected URI getComplete;
-
-   /**
-    * Add an idp entry
-    * @param entry
-    */
-   public void addIDPEntry( IDPEntryType entry )
-   {
-      this.idpEntry.add(entry);
-   }
-   
-   /**
-    * Remove an idp entry
-    * @param entry
-    */
-   public void removeIDPEntry( IDPEntryType entry )
-   {
-      this.idpEntry.remove(entry);
-   }
-
-   /**
-    * Gets the value of the idpEntry property. 
-    * 
-    */
-   public List<IDPEntryType> getIDPEntry() 
-   { 
-      return Collections.unmodifiableList( this.idpEntry );
-   }
-
-   /**
-    * Gets the value of the getComplete property.
-    * 
-    * @return
-    *     possible object is
-    *     {@link String }
-    *     
-    */
-   public URI getGetComplete() {
-      return getComplete;
-   }
-
-   /**
-    * Sets the value of the getComplete property.
-    * 
-    * @param value
-    *     allowed object is
-    *     {@link String }
-    *     
-    */
-   public void setGetComplete( URI value) {
-      this.getComplete = value;
-   }
-
-}
\ No newline at end of file

Deleted: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/protocol/LogoutRequestType.java
===================================================================
--- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/protocol/LogoutRequestType.java	2011-06-21 20:35:05 UTC (rev 1015)
+++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/protocol/LogoutRequestType.java	2011-06-21 20:44:33 UTC (rev 1016)
@@ -1,224 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2008, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors. 
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.picketlink.identity.federation.newmodel.saml.v2.protocol;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List; 
-import javax.xml.datatype.XMLGregorianCalendar;
-
-import org.picketlink.identity.federation.newmodel.saml.v2.assertion.BaseIDAbstractType;
-import org.picketlink.identity.federation.newmodel.saml.v2.assertion.EncryptedElementType;
-import org.picketlink.identity.federation.newmodel.saml.v2.assertion.NameIDType;
- 
-
-
-/**
- * <p>Java class for LogoutRequestType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained within this class.
- * 
- * <pre>
- * &lt;complexType name="LogoutRequestType">
- *   &lt;complexContent>
- *     &lt;extension base="{urn:oasis:names:tc:SAML:2.0:protocol}RequestAbstractType">
- *       &lt;sequence>
- *         &lt;choice>
- *           &lt;element ref="{urn:oasis:names:tc:SAML:2.0:assertion}BaseID"/>
- *           &lt;element ref="{urn:oasis:names:tc:SAML:2.0:assertion}NameID"/>
- *           &lt;element ref="{urn:oasis:names:tc:SAML:2.0:assertion}EncryptedID"/>
- *         &lt;/choice>
- *         &lt;element ref="{urn:oasis:names:tc:SAML:2.0:protocol}SessionIndex" maxOccurs="unbounded" minOccurs="0"/>
- *       &lt;/sequence>
- *       &lt;attribute name="Reason" type="{http://www.w3.org/2001/XMLSchema}string" />
- *       &lt;attribute name="NotOnOrAfter" type="{http://www.w3.org/2001/XMLSchema}dateTime" />
- *     &lt;/extension>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */ 
-public class LogoutRequestType
-    extends RequestAbstractType
-{ 
-    protected BaseIDAbstractType baseID;
-    protected NameIDType nameID; 
-    protected EncryptedElementType encryptedID; 
-    protected List<String> sessionIndex = new ArrayList<String>(); 
-    protected String reason; 
-    protected XMLGregorianCalendar notOnOrAfter;
-
-    
-    public LogoutRequestType(String id, String version, XMLGregorianCalendar instant)
-   {
-      super(id, version, instant); 
-   }
-
-   /**
-     * Gets the value of the baseID property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link BaseIDAbstractType }
-     *     
-     */
-    public BaseIDAbstractType getBaseID() {
-        return baseID;
-    }
-
-    /**
-     * Sets the value of the baseID property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link BaseIDAbstractType }
-     *     
-     */
-    public void setBaseID(BaseIDAbstractType value) {
-        this.baseID = value;
-    }
-
-    /**
-     * Gets the value of the nameID property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link NameIDType }
-     *     
-     */
-    public NameIDType getNameID() {
-        return nameID;
-    }
-
-    /**
-     * Sets the value of the nameID property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link NameIDType }
-     *     
-     */
-    public void setNameID(NameIDType value) {
-        this.nameID = value;
-    }
-
-    /**
-     * Gets the value of the encryptedID property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link EncryptedElementType }
-     *     
-     */
-    public EncryptedElementType getEncryptedID() {
-        return encryptedID;
-    }
-
-    /**
-     * Sets the value of the encryptedID property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link EncryptedElementType }
-     *     
-     */
-    public void setEncryptedID(EncryptedElementType value) {
-        this.encryptedID = value;
-    }
-    
-    /**
-     * Add session index
-     * @param index
-     */
-    public void addSessionIndex( String index )
-    {
-       this.sessionIndex.add( index );
-    }
-    
-    /**
-     * Remove session index
-     * @param index
-     */
-    public void removeSessionIndex( String index )
-    {
-       this.sessionIndex.remove( index );
-    }
-
-    /**
-     * Gets the value of the sessionIndex property.
-     *  
-     */
-    public List<String> getSessionIndex() 
-    { 
-        return Collections.unmodifiableList( this.sessionIndex );
-    }
-
-    /**
-     * Gets the value of the reason property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public String getReason() {
-        return reason;
-    }
-
-    /**
-     * Sets the value of the reason property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setReason(String value) {
-        this.reason = value;
-    }
-
-    /**
-     * Gets the value of the notOnOrAfter property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link XMLGregorianCalendar }
-     *     
-     */
-    public XMLGregorianCalendar getNotOnOrAfter() {
-        return notOnOrAfter;
-    }
-
-    /**
-     * Sets the value of the notOnOrAfter property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link XMLGregorianCalendar }
-     *     
-     */
-    public void setNotOnOrAfter(XMLGregorianCalendar value) {
-        this.notOnOrAfter = value;
-    }
-
-}

Deleted: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/protocol/ManageNameIDRequestType.java
===================================================================
--- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/protocol/ManageNameIDRequestType.java	2011-06-21 20:35:05 UTC (rev 1015)
+++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/protocol/ManageNameIDRequestType.java	2011-06-21 20:44:33 UTC (rev 1016)
@@ -1,193 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2008, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors. 
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.picketlink.identity.federation.newmodel.saml.v2.protocol;
-
-import javax.xml.datatype.XMLGregorianCalendar;
-
-import org.picketlink.identity.federation.newmodel.saml.v2.assertion.EncryptedElementType;
-import org.picketlink.identity.federation.newmodel.saml.v2.assertion.NameIDType;
-
-
-
-/**
- * <p>Java class for ManageNameIDRequestType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained within this class.
- * 
- * <pre>
- * &lt;complexType name="ManageNameIDRequestType">
- *   &lt;complexContent>
- *     &lt;extension base="{urn:oasis:names:tc:SAML:2.0:protocol}RequestAbstractType">
- *       &lt;sequence>
- *         &lt;choice>
- *           &lt;element ref="{urn:oasis:names:tc:SAML:2.0:assertion}NameID"/>
- *           &lt;element ref="{urn:oasis:names:tc:SAML:2.0:assertion}EncryptedID"/>
- *         &lt;/choice>
- *         &lt;choice>
- *           &lt;element ref="{urn:oasis:names:tc:SAML:2.0:protocol}NewID"/>
- *           &lt;element ref="{urn:oasis:names:tc:SAML:2.0:protocol}NewEncryptedID"/>
- *           &lt;element ref="{urn:oasis:names:tc:SAML:2.0:protocol}Terminate"/>
- *         &lt;/choice>
- *       &lt;/sequence>
- *     &lt;/extension>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */ 
-public class ManageNameIDRequestType
-extends RequestAbstractType
-{ 
-   protected NameIDType nameID; 
-   protected EncryptedElementType encryptedID; 
-   protected String newID; 
-   protected EncryptedElementType newEncryptedID; 
-   protected TerminateType terminate;
-
-   
-   public ManageNameIDRequestType(String id, String version, XMLGregorianCalendar instant)
-   {
-      super(id, version, instant); 
-   }
-
-   /**
-    * Gets the value of the nameID property.
-    * 
-    * @return
-    *     possible object is
-    *     {@link NameIDType }
-    *     
-    */
-   public NameIDType getNameID() {
-      return nameID;
-   }
-
-   /**
-    * Sets the value of the nameID property.
-    * 
-    * @param value
-    *     allowed object is
-    *     {@link NameIDType }
-    *     
-    */
-   public void setNameID(NameIDType value) {
-      this.nameID = value;
-   }
-
-   /**
-    * Gets the value of the encryptedID property.
-    * 
-    * @return
-    *     possible object is
-    *     {@link EncryptedElementType }
-    *     
-    */
-   public EncryptedElementType getEncryptedID() {
-      return encryptedID;
-   }
-
-   /**
-    * Sets the value of the encryptedID property.
-    * 
-    * @param value
-    *     allowed object is
-    *     {@link EncryptedElementType }
-    *     
-    */
-   public void setEncryptedID(EncryptedElementType value) {
-      this.encryptedID = value;
-   }
-
-   /**
-    * Gets the value of the newID property.
-    * 
-    * @return
-    *     possible object is
-    *     {@link String }
-    *     
-    */
-   public String getNewID() {
-      return newID;
-   }
-
-   /**
-    * Sets the value of the newID property.
-    * 
-    * @param value
-    *     allowed object is
-    *     {@link String }
-    *     
-    */
-   public void setNewID(String value) {
-      this.newID = value;
-   }
-
-   /**
-    * Gets the value of the newEncryptedID property.
-    * 
-    * @return
-    *     possible object is
-    *     {@link EncryptedElementType }
-    *     
-    */
-   public EncryptedElementType getNewEncryptedID() {
-      return newEncryptedID;
-   }
-
-   /**
-    * Sets the value of the newEncryptedID property.
-    * 
-    * @param value
-    *     allowed object is
-    *     {@link EncryptedElementType }
-    *     
-    */
-   public void setNewEncryptedID(EncryptedElementType value) {
-      this.newEncryptedID = value;
-   }
-
-   /**
-    * Gets the value of the terminate property.
-    * 
-    * @return
-    *     possible object is
-    *     {@link TerminateType }
-    *     
-    */
-   public TerminateType getTerminate() {
-      return terminate;
-   }
-
-   /**
-    * Sets the value of the terminate property.
-    * 
-    * @param value
-    *     allowed object is
-    *     {@link TerminateType }
-    *     
-    */
-   public void setTerminate(TerminateType value) {
-      this.terminate = value;
-   }
-
-}
\ No newline at end of file

Deleted: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/protocol/NameIDMappingRequestType.java
===================================================================
--- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/protocol/NameIDMappingRequestType.java	2011-06-21 20:35:05 UTC (rev 1015)
+++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/protocol/NameIDMappingRequestType.java	2011-06-21 20:44:33 UTC (rev 1016)
@@ -1,165 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2008, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors. 
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.picketlink.identity.federation.newmodel.saml.v2.protocol;
-
-import javax.xml.datatype.XMLGregorianCalendar;
-
-import org.picketlink.identity.federation.newmodel.saml.v2.assertion.BaseIDAbstractType;
-import org.picketlink.identity.federation.newmodel.saml.v2.assertion.EncryptedElementType;
-import org.picketlink.identity.federation.newmodel.saml.v2.assertion.NameIDType;
- 
-
-
-/**
- * <p>Java class for NameIDMappingRequestType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained within this class.
- * 
- * <pre>
- * &lt;complexType name="NameIDMappingRequestType">
- *   &lt;complexContent>
- *     &lt;extension base="{urn:oasis:names:tc:SAML:2.0:protocol}RequestAbstractType">
- *       &lt;sequence>
- *         &lt;choice>
- *           &lt;element ref="{urn:oasis:names:tc:SAML:2.0:assertion}BaseID"/>
- *           &lt;element ref="{urn:oasis:names:tc:SAML:2.0:assertion}NameID"/>
- *           &lt;element ref="{urn:oasis:names:tc:SAML:2.0:assertion}EncryptedID"/>
- *         &lt;/choice>
- *         &lt;element ref="{urn:oasis:names:tc:SAML:2.0:protocol}NameIDPolicy"/>
- *       &lt;/sequence>
- *     &lt;/extension>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */ 
-public class NameIDMappingRequestType
-extends RequestAbstractType
-{ 
-   protected BaseIDAbstractType baseID; 
-   protected NameIDType nameID; 
-   protected EncryptedElementType encryptedID; 
-   protected NameIDPolicyType nameIDPolicy;
-
-   
-   public NameIDMappingRequestType(String id, String version, XMLGregorianCalendar instant)
-   {
-      super(id, version, instant); 
-   }
-
-   /**
-    * Gets the value of the baseID property.
-    * 
-    * @return
-    *     possible object is
-    *     {@link BaseIDAbstractType }
-    *     
-    */
-   public BaseIDAbstractType getBaseID() {
-      return baseID;
-   }
-
-   /**
-    * Sets the value of the baseID property.
-    * 
-    * @param value
-    *     allowed object is
-    *     {@link BaseIDAbstractType }
-    *     
-    */
-   public void setBaseID(BaseIDAbstractType value) {
-      this.baseID = value;
-   }
-
-   /**
-    * Gets the value of the nameID property.
-    * 
-    * @return
-    *     possible object is
-    *     {@link NameIDType }
-    *     
-    */
-   public NameIDType getNameID() {
-      return nameID;
-   }
-
-   /**
-    * Sets the value of the nameID property.
-    * 
-    * @param value
-    *     allowed object is
-    *     {@link NameIDType }
-    *     
-    */
-   public void setNameID(NameIDType value) {
-      this.nameID = value;
-   }
-
-   /**
-    * Gets the value of the encryptedID property.
-    * 
-    * @return
-    *     possible object is
-    *     {@link EncryptedElementType }
-    *     
-    */
-   public EncryptedElementType getEncryptedID() {
-      return encryptedID;
-   }
-
-   /**
-    * Sets the value of the encryptedID property.
-    * 
-    * @param value
-    *     allowed object is
-    *     {@link EncryptedElementType }
-    *     
-    */
-   public void setEncryptedID(EncryptedElementType value) {
-      this.encryptedID = value;
-   }
-
-   /**
-    * Gets the value of the nameIDPolicy property.
-    * 
-    * @return
-    *     possible object is
-    *     {@link NameIDPolicyType }
-    *     
-    */
-   public NameIDPolicyType getNameIDPolicy() {
-      return nameIDPolicy;
-   }
-
-   /**
-    * Sets the value of the nameIDPolicy property.
-    * 
-    * @param value
-    *     allowed object is
-    *     {@link NameIDPolicyType }
-    *     
-    */
-   public void setNameIDPolicy(NameIDPolicyType value) {
-      this.nameIDPolicy = value;
-   }
-}
\ No newline at end of file

Deleted: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/protocol/NameIDMappingResponseType.java
===================================================================
--- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/protocol/NameIDMappingResponseType.java	2011-06-21 20:35:05 UTC (rev 1015)
+++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/protocol/NameIDMappingResponseType.java	2011-06-21 20:44:33 UTC (rev 1016)
@@ -1,100 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2008, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors. 
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.picketlink.identity.federation.newmodel.saml.v2.protocol;
-
-import org.picketlink.identity.federation.newmodel.saml.v2.assertion.EncryptedElementType;
-import org.picketlink.identity.federation.newmodel.saml.v2.assertion.NameIDType;
-
-/**
- * <p>Java class for NameIDMappingResponseType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained within this class.
- * 
- * <pre>
- * &lt;complexType name="NameIDMappingResponseType">
- *   &lt;complexContent>
- *     &lt;extension base="{urn:oasis:names:tc:SAML:2.0:protocol}StatusResponseType">
- *       &lt;choice>
- *         &lt;element ref="{urn:oasis:names:tc:SAML:2.0:assertion}NameID"/>
- *         &lt;element ref="{urn:oasis:names:tc:SAML:2.0:assertion}EncryptedID"/>
- *       &lt;/choice>
- *     &lt;/extension>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */
-public class NameIDMappingResponseType
-extends StatusResponseType
-{
-   protected NameIDType nameID; 
-   protected EncryptedElementType encryptedID;
-
-   /**
-    * Gets the value of the nameID property.
-    * 
-    * @return
-    *     possible object is
-    *     {@link NameIDType }
-    *     
-    */
-   public NameIDType getNameID() {
-      return nameID;
-   }
-
-   /**
-    * Sets the value of the nameID property.
-    * 
-    * @param value
-    *     allowed object is
-    *     {@link NameIDType }
-    *     
-    */
-   public void setNameID(NameIDType value) {
-      this.nameID = value;
-   }
-
-   /**
-    * Gets the value of the encryptedID property.
-    * 
-    * @return
-    *     possible object is
-    *     {@link EncryptedElementType }
-    *     
-    */
-   public EncryptedElementType getEncryptedID() {
-      return encryptedID;
-   }
-
-   /**
-    * Sets the value of the encryptedID property.
-    * 
-    * @param value
-    *     allowed object is
-    *     {@link EncryptedElementType }
-    *     
-    */
-   public void setEncryptedID(EncryptedElementType value) {
-      this.encryptedID = value;
-   }
-}
\ No newline at end of file

Deleted: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/protocol/NameIDPolicyType.java
===================================================================
--- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/protocol/NameIDPolicyType.java	2011-06-21 20:35:05 UTC (rev 1015)
+++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/protocol/NameIDPolicyType.java	2011-06-21 20:44:33 UTC (rev 1016)
@@ -1,123 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2008, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors. 
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.picketlink.identity.federation.newmodel.saml.v2.protocol;
-
-import java.net.URI;
-
-
-/**
- * <p>Java class for NameIDPolicyType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained within this class.
- * 
- * <pre>
- * &lt;complexType name="NameIDPolicyType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       &lt;attribute name="Format" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
- *       &lt;attribute name="SPNameQualifier" type="{http://www.w3.org/2001/XMLSchema}string" />
- *       &lt;attribute name="AllowCreate" type="{http://www.w3.org/2001/XMLSchema}boolean" />
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */ 
-public class NameIDPolicyType 
-{
-   protected URI format; 
-   protected String spNameQualifier; 
-   protected Boolean allowCreate;
-
-   /**
-    * Gets the value of the format property.
-    * 
-    * @return
-    *     possible object is
-    *     {@link String }
-    *     
-    */
-   public URI getFormat() {
-      return format;
-   }
-
-   /**
-    * Sets the value of the format property.
-    * 
-    * @param value
-    *     allowed object is
-    *     {@link String }
-    *     
-    */
-   public void setFormat( URI value) {
-      this.format = value;
-   }
-
-   /**
-    * Gets the value of the spNameQualifier property.
-    * 
-    * @return
-    *     possible object is
-    *     {@link String }
-    *     
-    */
-   public String getSPNameQualifier() {
-      return spNameQualifier;
-   }
-
-   /**
-    * Sets the value of the spNameQualifier property.
-    * 
-    * @param value
-    *     allowed object is
-    *     {@link String }
-    *     
-    */
-   public void setSPNameQualifier(String value) {
-      this.spNameQualifier = value;
-   }
-
-   /**
-    * Gets the value of the allowCreate property.
-    * 
-    * @return
-    *     possible object is
-    *     {@link Boolean }
-    *     
-    */
-   public Boolean isAllowCreate() {
-      return allowCreate;
-   }
-
-   /**
-    * Sets the value of the allowCreate property.
-    * 
-    * @param value
-    *     allowed object is
-    *     {@link Boolean }
-    *     
-    */
-   public void setAllowCreate(Boolean value) {
-      this.allowCreate = value;
-   }
-}
\ No newline at end of file

Deleted: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/protocol/RequestAbstractType.java
===================================================================
--- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/protocol/RequestAbstractType.java	2011-06-21 20:35:05 UTC (rev 1015)
+++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/protocol/RequestAbstractType.java	2011-06-21 20:44:33 UTC (rev 1016)
@@ -1,236 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2008, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors. 
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.picketlink.identity.federation.newmodel.saml.v2.protocol;
-
-import java.net.URI;
-
-import javax.xml.datatype.XMLGregorianCalendar;
-
-import org.picketlink.identity.federation.newmodel.saml.v2.assertion.NameIDType;
-import org.picketlink.identity.federation.saml.v2.SAML2Object;
-import org.picketlink.identity.xmlsec.w3.xmldsig.SignatureType;
-import org.w3c.dom.Element;
-
-
-/**
- * <p>Java class for RequestAbstractType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained within this class.
- * 
- * <pre>
- * &lt;complexType name="RequestAbstractType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       &lt;sequence>
- *         &lt;element ref="{urn:oasis:names:tc:SAML:2.0:assertion}Issuer" minOccurs="0"/>
- *         &lt;element ref="{http://www.w3.org/2000/09/xmldsig#}Signature" minOccurs="0"/>
- *         &lt;element ref="{urn:oasis:names:tc:SAML:2.0:protocol}Extensions" minOccurs="0"/>
- *       &lt;/sequence>
- *       &lt;attribute name="ID" use="required" type="{http://www.w3.org/2001/XMLSchema}ID" />
- *       &lt;attribute name="Version" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
- *       &lt;attribute name="IssueInstant" use="required" type="{http://www.w3.org/2001/XMLSchema}dateTime" />
- *       &lt;attribute name="Destination" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
- *       &lt;attribute name="Consent" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */ 
-public abstract class RequestAbstractType implements SAML2Object 
-{
-   protected String id;
-
-   protected NameIDType issuer; 
-   protected Element signature; 
-   protected ExtensionsType extensions;
-   protected String version; 
-   protected XMLGregorianCalendar issueInstant; 
-   protected URI destination; 
-   protected String consent;
-
-   public RequestAbstractType( String id, String version, XMLGregorianCalendar instant )
-   {
-      this.id = id;
-      this.version = version;
-      this.issueInstant = instant;
-   }
-   
-   /**
-    * Gets the value of the issuer property.
-    * 
-    * @return
-    *     possible object is
-    *     {@link NameIDType }
-    *     
-    */
-   public NameIDType getIssuer() {
-      return issuer;
-   }
-
-   /**
-    * Sets the value of the issuer property.
-    * 
-    * @param value
-    *     allowed object is
-    *     {@link NameIDType }
-    *     
-    */
-   public void setIssuer(NameIDType value) {
-      this.issuer = value;
-   }
-
-   /**
-    * Gets the value of the signature property.
-    * 
-    * @return
-    *     possible object is
-    *     {@link SignatureType }
-    *     
-    */
-   public Element getSignature() {
-      return signature;
-   }
-
-   /**
-    * Sets the value of the signature property.
-    * 
-    * @param value
-    *     allowed object is
-    *     {@link SignatureType }
-    *     
-    */
-   public void setSignature(Element value) {
-      this.signature = value;
-   }
-
-   /**
-    * Gets the value of the extensions property.
-    * 
-    * @return
-    *     possible object is
-    *     {@link ExtensionsType }
-    *     
-    */
-   public ExtensionsType getExtensions() {
-      return extensions;
-   }
-
-   /**
-    * Sets the value of the extensions property.
-    * 
-    * @param value
-    *     allowed object is
-    *     {@link ExtensionsType }
-    *     
-    */
-   public void setExtensions(ExtensionsType value) {
-      this.extensions = value;
-   }
-
-   /**
-    * Gets the value of the id property.
-    * 
-    * @return
-    *     possible object is
-    *     {@link String }
-    *     
-    */
-   public String getID() {
-      return id;
-   }
-
-   /**
-    * Gets the value of the version property.
-    * 
-    * @return
-    *     possible object is
-    *     {@link String }
-    *     
-    */
-   public String getVersion() {
-      return version;
-   } 
-
-   /**
-    * Gets the value of the issueInstant property.
-    * 
-    * @return
-    *     possible object is
-    *     {@link XMLGregorianCalendar }
-    *     
-    */
-   public XMLGregorianCalendar getIssueInstant() {
-      return issueInstant;
-   } 
-
-   /**
-    * Gets the value of the destination property.
-    * 
-    * @return
-    *     possible object is
-    *     {@link String }
-    *     
-    */
-   public URI getDestination() 
-   {
-      return destination;
-   }
-
-   /**
-    * Sets the value of the destination property.
-    * 
-    * @param value
-    *     allowed object is
-    *     {@link String }
-    *     
-    */
-   public void setDestination( URI value) {
-      this.destination = value;
-   }
-
-   /**
-    * Gets the value of the consent property.
-    * 
-    * @return
-    *     possible object is
-    *     {@link String }
-    *     
-    */
-   public String getConsent() {
-      return consent;
-   }
-
-   /**
-    * Sets the value of the consent property.
-    * 
-    * @param value
-    *     allowed object is
-    *     {@link String }
-    *     
-    */
-   public void setConsent(String value) {
-      this.consent = value;
-   }
-
-}
\ No newline at end of file

Deleted: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/protocol/RequestedAuthnContextType.java
===================================================================
--- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/protocol/RequestedAuthnContextType.java	2011-06-21 20:35:05 UTC (rev 1015)
+++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/protocol/RequestedAuthnContextType.java	2011-06-21 20:44:33 UTC (rev 1016)
@@ -1,152 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2008, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors. 
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.picketlink.identity.federation.newmodel.saml.v2.protocol;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-/**
- * <p>Java class for RequestedAuthnContextType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained within this class.
- * 
- * <pre>
- * &lt;complexType name="RequestedAuthnContextType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       &lt;choice>
- *         &lt;element ref="{urn:oasis:names:tc:SAML:2.0:assertion}AuthnContextClassRef" maxOccurs="unbounded"/>
- *         &lt;element ref="{urn:oasis:names:tc:SAML:2.0:assertion}AuthnContextDeclRef" maxOccurs="unbounded"/>
- *       &lt;/choice>
- *       &lt;attribute name="Comparison" type="{urn:oasis:names:tc:SAML:2.0:protocol}AuthnContextComparisonType" />
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */ 
-public class RequestedAuthnContextType 
-{
-   protected List<String> authnContextClassRef = new ArrayList<String>();
-   protected List<String> authnContextDeclRef = new ArrayList<String>();
-   protected AuthnContextComparisonType comparison;
-
-   /**
-    * Add an authn Context class ref
-    * @param str
-    */
-   public void addAuthnContextClassRef( String str )
-   {
-      this.authnContextClassRef.add(str);
-   }
-
-   /**
-    * Add authn context decl ref
-    * @param str
-    */
-   public void addAuthnContextDeclRef( String str )
-   {
-      this.authnContextDeclRef.add(str);
-   }
-   
-   /**
-    * Remove an authn Context class ref
-    * @param str
-    */
-   public void removeAuthnContextClassRef( String str )
-   {
-      this.authnContextClassRef.remove(str);
-   }
-
-   /**
-    * remove authn context decl ref
-    * @param str
-    */
-   public void removeAuthnContextDeclRef( String str )
-   {
-      this.authnContextDeclRef.remove(str);
-   }
-
-   /**
-    * Gets the value of the authnContextClassRef property. 
-    * 
-    */
-   public List<String> getAuthnContextClassRef() 
-   {
-      return Collections.unmodifiableList( this.authnContextClassRef );
-   }
-
-   /**
-    * Gets the value of the authnContextDeclRef 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 authnContextDeclRef property.
-    * 
-    * <p>
-    * For example, to add a new item, do as follows:
-    * <pre>
-    *    getAuthnContextDeclRef().add(newItem);
-    * </pre>
-    * 
-    * 
-    * <p>
-    * Objects of the following type(s) are allowed in the list
-    * {@link String }
-    * 
-    * 
-    */
-   public List<String> getAuthnContextDeclRef() 
-   { 
-      return Collections.unmodifiableList( this.authnContextDeclRef );
-   }
-
-   /**
-    * Gets the value of the comparison property.
-    * 
-    * @return
-    *     possible object is
-    *     {@link AuthnContextComparisonType }
-    *     
-    */
-   public AuthnContextComparisonType getComparison() 
-   {
-      return comparison;
-   }
-
-   /**
-    * Sets the value of the comparison property.
-    * 
-    * @param value
-    *     allowed object is
-    *     {@link AuthnContextComparisonType }
-    *     
-    */
-   public void setComparison(AuthnContextComparisonType value) 
-   {
-      this.comparison = value;
-   }
-}
\ No newline at end of file

Deleted: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/protocol/ResponseType.java
===================================================================
--- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/protocol/ResponseType.java	2011-06-21 20:35:05 UTC (rev 1015)
+++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/protocol/ResponseType.java	2011-06-21 20:44:33 UTC (rev 1016)
@@ -1,133 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2008, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors. 
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.picketlink.identity.federation.newmodel.saml.v2.protocol;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-import org.picketlink.identity.federation.newmodel.saml.v2.assertion.AssertionType;
-import org.picketlink.identity.federation.newmodel.saml.v2.assertion.EncryptedAssertionType; 
-
-/**
- * <p>Java class for ResponseType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained within this class.
- * 
- * <pre>
- * &lt;complexType name="ResponseType">
- *   &lt;complexContent>
- *     &lt;extension base="{urn:oasis:names:tc:SAML:2.0:protocol}StatusResponseType">
- *       &lt;choice maxOccurs="unbounded" minOccurs="0">
- *         &lt;element ref="{urn:oasis:names:tc:SAML:2.0:assertion}Assertion"/>
- *         &lt;element ref="{urn:oasis:names:tc:SAML:2.0:assertion}EncryptedAssertion"/>
- *       &lt;/choice>
- *     &lt;/extension>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */ 
-public class ResponseType
-extends StatusResponseType
-{ 
-   protected List<RTChoiceType> assertions = new ArrayList<ResponseType.RTChoiceType>();
-
-   /**
-    * Add an assertion
-    * @param choice
-    */
-   public void addAssertion( RTChoiceType choice )
-   {
-      assertions.add(choice);
-   }
-   
-   /**
-    * Remove an assertion
-    * @param choice
-    */
-   public void removeAssertion( RTChoiceType choice )
-   {
-      assertions.remove(choice);
-   }
-   
-   /**
-    * Replace the first assertion with the passed assertion
-    * @param id id of the old assertion
-    * @param newAssertion
-    */
-   public void replaceAssertion( String id,  RTChoiceType newAssertion )
-   {
-      int index = 0;
-      if( id != null && !id.isEmpty())
-      {
-         for( RTChoiceType assertion : assertions )
-         {
-            if( assertion.getID().equals(id) )
-            {
-               break;
-            }
-            index++;
-         } 
-      }
-      assertions.remove(index); 
-      assertions.add(index, newAssertion);
-   }
-
-   /**
-    * Gets a read only list of assertions
-    */
-   public List<RTChoiceType> getAssertions() 
-   {
-      return Collections.unmodifiableList( assertions );
-   }
-
-   public static class RTChoiceType
-   {
-      private AssertionType assertion;
-      private EncryptedAssertionType encryptedAssertion;
-      private String id;
-      public RTChoiceType(AssertionType assertion)
-      { 
-         this.assertion = assertion;
-         this.id = assertion.getID();
-      }
-      public RTChoiceType(EncryptedAssertionType encryptedAssertion)
-      { 
-         this.encryptedAssertion = encryptedAssertion;
-         
-      }
-      public AssertionType getAssertion()
-      {
-         return assertion;
-      }
-      public EncryptedAssertionType getEncryptedAssertion()
-      {
-         return encryptedAssertion;
-      } 
-      public String getID()
-      {
-         return id; 
-      }
-   } 
-}
\ No newline at end of file

Deleted: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/protocol/ScopingType.java
===================================================================
--- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/protocol/ScopingType.java	2011-06-21 20:35:05 UTC (rev 1015)
+++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/protocol/ScopingType.java	2011-06-21 20:44:33 UTC (rev 1016)
@@ -1,145 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2008, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors. 
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.picketlink.identity.federation.newmodel.saml.v2.protocol;
-
-import java.math.BigInteger;
-import java.net.URI;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-
-/**
- * <p>Java class for ScopingType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained within this class.
- * 
- * <pre>
- * &lt;complexType name="ScopingType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       &lt;sequence>
- *         &lt;element ref="{urn:oasis:names:tc:SAML:2.0:protocol}IDPList" minOccurs="0"/>
- *         &lt;element ref="{urn:oasis:names:tc:SAML:2.0:protocol}RequesterID" maxOccurs="unbounded" minOccurs="0"/>
- *       &lt;/sequence>
- *       &lt;attribute name="ProxyCount" type="{http://www.w3.org/2001/XMLSchema}nonNegativeInteger" />
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */ 
-public class ScopingType 
-{
-    protected IDPListType idpList; 
-    protected List<URI> requesterID = new ArrayList<URI>();
-    
-    protected BigInteger proxyCount;
-
-    /**
-     * Gets the value of the idpList property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link IDPListType }
-     *     
-     */
-    public IDPListType getIDPList() {
-        return idpList;
-    }
-
-    /**
-     * Sets the value of the idpList property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link IDPListType }
-     *     
-     */
-    public void setIDPList(IDPListType value) {
-        this.idpList = value;
-    }
-
-    /**
-     * Gets the value of the requesterID property.
-     * <p>
-     * For example, to add a new item, do as follows:
-     * <pre>
-     *    getRequesterID().add(newItem);
-     * </pre>
-     * 
-     * 
-     * <p>
-     * Objects of the following type(s) are allowed in the list
-     * {@link String }
-     * 
-     * 
-     */
-    public List<URI> getRequesterID() 
-    {
-        return Collections.unmodifiableList( this.requesterID );
-    }
-    
-    /**
-     * Add requester id
-     * @param uri
-     */
-    public void addRequesterID( URI uri )
-    {
-       this.requesterID.add( uri );
-    }
-    
-    /**
-     * Remove requester id
-     * @param uri
-     */
-    public void removeRequesterID( URI uri )
-    {
-       this.requesterID.remove( uri );
-    }
-
-    /**
-     * Gets the value of the proxyCount property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link BigInteger }
-     *     
-     */
-    public BigInteger getProxyCount() {
-        return proxyCount;
-    }
-
-    /**
-     * Sets the value of the proxyCount property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link BigInteger }
-     *     
-     */
-    public void setProxyCount(BigInteger value) {
-        this.proxyCount = value;
-    }
-
-}

Deleted: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/protocol/StatusCodeType.java
===================================================================
--- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/protocol/StatusCodeType.java	2011-06-21 20:35:05 UTC (rev 1015)
+++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/protocol/StatusCodeType.java	2011-06-21 20:44:33 UTC (rev 1016)
@@ -1,101 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2008, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors. 
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.picketlink.identity.federation.newmodel.saml.v2.protocol;
-
-import java.net.URI;
- 
-
-
-/**
- * <p>Java class for StatusCodeType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained within this class.
- * 
- * <pre>
- * &lt;complexType name="StatusCodeType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       &lt;sequence>
- *         &lt;element ref="{urn:oasis:names:tc:SAML:2.0:protocol}StatusCode" minOccurs="0"/>
- *       &lt;/sequence>
- *       &lt;attribute name="Value" use="required" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */ 
-public class StatusCodeType 
-{ 
-    protected StatusCodeType statusCode;  
-    protected URI value;
-
-    /**
-     * Gets the value of the statusCode property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link StatusCodeType }
-     *     
-     */
-    public StatusCodeType getStatusCode() {
-        return statusCode;
-    }
-
-    /**
-     * Sets the value of the statusCode property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link StatusCodeType }
-     *     
-     */
-    public void setStatusCode(StatusCodeType value) {
-        this.statusCode = value;
-    }
-
-    /**
-     * Gets the value of the value property.
-     * 
-     * @return
-     *     possible object is
-     *     {@link String }
-     *     
-     */
-    public URI getValue() {
-        return value;
-    }
-
-    /**
-     * Sets the value of the value property.
-     * 
-     * @param value
-     *     allowed object is
-     *     {@link String }
-     *     
-     */
-    public void setValue( URI value ) 
-    {
-        this.value = value;
-    } 
-}
\ No newline at end of file

Deleted: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/protocol/StatusDetailType.java
===================================================================
--- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/protocol/StatusDetailType.java	2011-06-21 20:35:05 UTC (rev 1015)
+++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/protocol/StatusDetailType.java	2011-06-21 20:44:33 UTC (rev 1016)
@@ -1,77 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2008, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors. 
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.picketlink.identity.federation.newmodel.saml.v2.protocol;
-
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-
-
-/**
- * <p>Java class for StatusDetailType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained within this class.
- * 
- * <pre>
- * &lt;complexType name="StatusDetailType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       &lt;sequence>
- *         &lt;any/>
- *       &lt;/sequence>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */ 
-public class StatusDetailType 
-{
-   protected List<Object> any = new ArrayList<Object>();
-
-   /**
-    * Add status detail
-    * @param obj
-    */
-   public void addStatusDetail( Object obj )
-   {
-      this.any.add( obj );
-   }
-   
-   /**
-    * Remove status detail
-    * @param obj
-    */
-   public void removeStatusDetail( Object obj )
-   {
-      this.any.remove( obj );
-   }
-
-   /**
-    * Gets the value of the any property.  Read-Only list
-    */
-   public List<Object> getAny() 
-   {
-      return Collections.unmodifiableList( this.any );
-   } 
-}
\ No newline at end of file

Deleted: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/protocol/StatusResponseType.java
===================================================================
--- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/protocol/StatusResponseType.java	2011-06-21 20:35:05 UTC (rev 1015)
+++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/protocol/StatusResponseType.java	2011-06-21 20:44:33 UTC (rev 1016)
@@ -1,312 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2008, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors. 
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.picketlink.identity.federation.newmodel.saml.v2.protocol;
-
-import javax.xml.datatype.XMLGregorianCalendar;
-
-import org.picketlink.identity.federation.newmodel.saml.v2.assertion.NameIDType;
-import org.picketlink.identity.federation.saml.v2.SAML2Object;
-import org.w3c.dom.Element;
-
-
-/**
- * <p>Java class for StatusResponseType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained within this class.
- * 
- * <pre>
- * &lt;complexType name="StatusResponseType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       &lt;sequence>
- *         &lt;element ref="{urn:oasis:names:tc:SAML:2.0:assertion}Issuer" minOccurs="0"/>
- *         &lt;element ref="{http://www.w3.org/2000/09/xmldsig#}Signature" minOccurs="0"/>
- *         &lt;element ref="{urn:oasis:names:tc:SAML:2.0:protocol}Extensions" minOccurs="0"/>
- *         &lt;element ref="{urn:oasis:names:tc:SAML:2.0:protocol}Status"/>
- *       &lt;/sequence>
- *       &lt;attribute name="ID" use="required" type="{http://www.w3.org/2001/XMLSchema}ID" />
- *       &lt;attribute name="InResponseTo" type="{http://www.w3.org/2001/XMLSchema}NCName" />
- *       &lt;attribute name="Version" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
- *       &lt;attribute name="IssueInstant" use="required" type="{http://www.w3.org/2001/XMLSchema}dateTime" />
- *       &lt;attribute name="Destination" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
- *       &lt;attribute name="Consent" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */ 
-public class StatusResponseType implements SAML2Object 
-{
-   protected NameIDType issuer;
-   protected Element signature; 
-   protected ExtensionsType extensions; 
-   protected StatusType status; 
-   protected String id; 
-   protected String inResponseTo; 
-   protected String version; 
-   protected XMLGregorianCalendar issueInstant; 
-   protected String destination; 
-   protected String consent;
-
-   /**
-    * Gets the value of the issuer property.
-    * 
-    * @return
-    *     possible object is
-    *     {@link NameIDType }
-    *     
-    */
-   public NameIDType getIssuer() {
-      return issuer;
-   }
-
-   /**
-    * Sets the value of the issuer property.
-    * 
-    * @param value
-    *     allowed object is
-    *     {@link NameIDType }
-    *     
-    */
-   public void setIssuer(NameIDType value) {
-      this.issuer = value;
-   }
-
-   /**
-    * Gets the value of the signature property.
-    * 
-    * @return
-    *     possible object is
-    *     {@link SignatureType }
-    *     
-    */
-   public Element getSignature() {
-      return signature;
-   }
-
-   /**
-    * Sets the value of the signature property.
-    * 
-    * @param value
-    *     allowed object is
-    *     {@link SignatureType }
-    *     
-    */
-   public void setSignature( Element value) {
-      this.signature = value;
-   }
-
-   /**
-    * Gets the value of the extensions property.
-    * 
-    * @return
-    *     possible object is
-    *     {@link ExtensionsType }
-    *     
-    */
-   public ExtensionsType getExtensions() {
-      return extensions;
-   }
-
-   /**
-    * Sets the value of the extensions property.
-    * 
-    * @param value
-    *     allowed object is
-    *     {@link ExtensionsType }
-    *     
-    */
-   public void setExtensions(ExtensionsType value) {
-      this.extensions = value;
-   }
-
-   /**
-    * Gets the value of the status property.
-    * 
-    * @return
-    *     possible object is
-    *     {@link StatusType }
-    *     
-    */
-   public StatusType getStatus() {
-      return status;
-   }
-
-   /**
-    * Sets the value of the status property.
-    * 
-    * @param value
-    *     allowed object is
-    *     {@link StatusType }
-    *     
-    */
-   public void setStatus(StatusType value) {
-      this.status = value;
-   }
-
-   /**
-    * Gets the value of the id property.
-    * 
-    * @return
-    *     possible object is
-    *     {@link String }
-    *     
-    */
-   public String getID() {
-      return id;
-   }
-
-   /**
-    * Sets the value of the id property.
-    * 
-    * @param value
-    *     allowed object is
-    *     {@link String }
-    *     
-    */
-   public void setID(String value) {
-      this.id = value;
-   }
-
-   /**
-    * Gets the value of the inResponseTo property.
-    * 
-    * @return
-    *     possible object is
-    *     {@link String }
-    *     
-    */
-   public String getInResponseTo() {
-      return inResponseTo;
-   }
-
-   /**
-    * Sets the value of the inResponseTo property.
-    * 
-    * @param value
-    *     allowed object is
-    *     {@link String }
-    *     
-    */
-   public void setInResponseTo(String value) {
-      this.inResponseTo = value;
-   }
-
-   /**
-    * Gets the value of the version property.
-    * 
-    * @return
-    *     possible object is
-    *     {@link String }
-    *     
-    */
-   public String getVersion() {
-      return version;
-   }
-
-   /**
-    * Sets the value of the version property.
-    * 
-    * @param value
-    *     allowed object is
-    *     {@link String }
-    *     
-    */
-   public void setVersion(String value) {
-      this.version = value;
-   }
-
-   /**
-    * Gets the value of the issueInstant property.
-    * 
-    * @return
-    *     possible object is
-    *     {@link XMLGregorianCalendar }
-    *     
-    */
-   public XMLGregorianCalendar getIssueInstant() {
-      return issueInstant;
-   }
-
-   /**
-    * Sets the value of the issueInstant property.
-    * 
-    * @param value
-    *     allowed object is
-    *     {@link XMLGregorianCalendar }
-    *     
-    */
-   public void setIssueInstant(XMLGregorianCalendar value) {
-      this.issueInstant = value;
-   }
-
-   /**
-    * Gets the value of the destination property.
-    * 
-    * @return
-    *     possible object is
-    *     {@link String }
-    *     
-    */
-   public String getDestination() {
-      return destination;
-   }
-
-   /**
-    * Sets the value of the destination property.
-    * 
-    * @param value
-    *     allowed object is
-    *     {@link String }
-    *     
-    */
-   public void setDestination(String value) {
-      this.destination = value;
-   }
-
-   /**
-    * Gets the value of the consent property.
-    * 
-    * @return
-    *     possible object is
-    *     {@link String }
-    *     
-    */
-   public String getConsent() {
-      return consent;
-   }
-
-   /**
-    * Sets the value of the consent property.
-    * 
-    * @param value
-    *     allowed object is
-    *     {@link String }
-    *     
-    */
-   public void setConsent(String value) {
-      this.consent = value;
-   }
-
-}
\ No newline at end of file

Deleted: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/protocol/StatusType.java
===================================================================
--- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/protocol/StatusType.java	2011-06-21 20:35:05 UTC (rev 1015)
+++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/protocol/StatusType.java	2011-06-21 20:44:33 UTC (rev 1016)
@@ -1,125 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2008, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors. 
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.picketlink.identity.federation.newmodel.saml.v2.protocol;
-
-
-
-/**
- * <p>Java class for StatusType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained within this class.
- * 
- * <pre>
- * &lt;complexType name="StatusType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       &lt;sequence>
- *         &lt;element ref="{urn:oasis:names:tc:SAML:2.0:protocol}StatusCode"/>
- *         &lt;element ref="{urn:oasis:names:tc:SAML:2.0:protocol}StatusMessage" minOccurs="0"/>
- *         &lt;element ref="{urn:oasis:names:tc:SAML:2.0:protocol}StatusDetail" minOccurs="0"/>
- *       &lt;/sequence>
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */ 
-public class StatusType 
-{ 
-   protected String statusMessage;
-   protected StatusCodeType statusCode; 
-   protected StatusDetailType statusDetail;
-
-   /**
-    * Gets the value of the statusCode property.
-    * 
-    * @return
-    *     possible object is
-    *     {@link StatusCodeType }
-    *     
-    */
-   public StatusCodeType getStatusCode() {
-      return statusCode;
-   }
-
-   /**
-    * Sets the value of the statusCode property.
-    * 
-    * @param value
-    *     allowed object is
-    *     {@link StatusCodeType }
-    *     
-    */
-   public void setStatusCode(StatusCodeType value) {
-      this.statusCode = value;
-   }
-
-   /**
-    * Gets the value of the statusMessage property.
-    * 
-    * @return
-    *     possible object is
-    *     {@link String }
-    *     
-    */
-   public String getStatusMessage() {
-      return statusMessage;
-   }
-
-   /**
-    * Sets the value of the statusMessage property.
-    * 
-    * @param value
-    *     allowed object is
-    *     {@link String }
-    *     
-    */
-   public void setStatusMessage(String value) {
-      this.statusMessage = value;
-   }
-
-   /**
-    * Gets the value of the statusDetail property.
-    * 
-    * @return
-    *     possible object is
-    *     {@link StatusDetailType }
-    *     
-    */
-   public StatusDetailType getStatusDetail() {
-      return statusDetail;
-   }
-
-   /**
-    * Sets the value of the statusDetail property.
-    * 
-    * @param value
-    *     allowed object is
-    *     {@link StatusDetailType }
-    *     
-    */
-   public void setStatusDetail(StatusDetailType value) {
-      this.statusDetail = value;
-   }
-
-}

Deleted: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/protocol/SubjectQueryAbstractType.java
===================================================================
--- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/protocol/SubjectQueryAbstractType.java	2011-06-21 20:35:05 UTC (rev 1015)
+++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/protocol/SubjectQueryAbstractType.java	2011-06-21 20:44:33 UTC (rev 1016)
@@ -1,77 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2008, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors. 
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.picketlink.identity.federation.newmodel.saml.v2.protocol;
-
-import javax.xml.datatype.XMLGregorianCalendar;
-
-import org.picketlink.identity.federation.newmodel.saml.v2.assertion.SubjectType;
-
-
-/**
- * <p>Java class for SubjectQueryAbstractType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained within this class.
- * 
- * <pre>
- * &lt;complexType name="SubjectQueryAbstractType">
- *   &lt;complexContent>
- *     &lt;extension base="{urn:oasis:names:tc:SAML:2.0:protocol}RequestAbstractType">
- *       &lt;sequence>
- *         &lt;element ref="{urn:oasis:names:tc:SAML:2.0:assertion}Subject"/>
- *       &lt;/sequence>
- *     &lt;/extension>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */ 
-public abstract class SubjectQueryAbstractType
-extends RequestAbstractType
-{ 
-   protected SubjectType subject; 
-    
-   public SubjectQueryAbstractType(String id, String version, XMLGregorianCalendar instant)
-   {
-      super(id, version, instant); 
-   }
-
-   public void setSubject(SubjectType subject)
-   {
-      this.subject = subject;
-   }
-
-
-
-   /**
-    * Gets the value of the subject property.
-    * 
-    * @return
-    *     possible object is
-    *     {@link SubjectType }
-    *     
-    */
-   public SubjectType getSubject() 
-   {
-      return subject;
-   }
-}
\ No newline at end of file

Deleted: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/protocol/TerminateType.java
===================================================================
--- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/protocol/TerminateType.java	2011-06-21 20:35:05 UTC (rev 1015)
+++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/protocol/TerminateType.java	2011-06-21 20:44:33 UTC (rev 1016)
@@ -1,42 +0,0 @@
-/*
- * JBoss, Home of Professional Open Source.
- * Copyright 2008, Red Hat Middleware LLC, and individual contributors
- * as indicated by the @author tags. See the copyright.txt file in the
- * distribution for a full listing of individual contributors. 
- *
- * This is free software; you can redistribute it and/or modify it
- * under the terms of the GNU Lesser General Public License as
- * published by the Free Software Foundation; either version 2.1 of
- * the License, or (at your option) any later version.
- *
- * This software is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this software; if not, write to the Free
- * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
- * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
- */
-package org.picketlink.identity.federation.newmodel.saml.v2.protocol;
- 
-/**
- * <p>Java class for TerminateType complex type.
- * 
- * <p>The following schema fragment specifies the expected content contained within this class.
- * 
- * <pre>
- * &lt;complexType name="TerminateType">
- *   &lt;complexContent>
- *     &lt;restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *     &lt;/restriction>
- *   &lt;/complexContent>
- * &lt;/complexType>
- * </pre>
- * 
- * 
- */ 
-public class TerminateType 
-{
-}
\ No newline at end of file

Deleted: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/protocol/package-info.java
===================================================================
--- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/protocol/package-info.java	2011-06-21 20:35:05 UTC (rev 1015)
+++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/newmodel/saml/v2/protocol/package-info.java	2011-06-21 20:44:33 UTC (rev 1016)
@@ -1,4 +0,0 @@
-/**
- * Package containing the classes for the protocol of SAMLv2 
- */
-package org.picketlink.identity.federation.newmodel.saml.v2.protocol;

