Author: anil.saldhana(a)jboss.com Date: 2011-06-21 17:04:32 -0400 (Tue, 21 Jun 2011) New Revision: 1020 Modified: picketlink-seam/trunk/picketlink-seam/src/main/java/org/picketlink/identity/seam/federation/SamlMessageFactory.java picketlink-seam/trunk/picketlink-seam/src/main/java/org/picketlink/identity/seam/federation/SamlMessageReceiver.java picketlink-seam/trunk/picketlink-seam/src/main/java/org/picketlink/identity/seam/federation/SamlMessageSender.java picketlink-seam/trunk/picketlink-seam/src/main/java/org/picketlink/identity/seam/federation/SamlMetaDataProvider.java picketlink-seam/trunk/picketlink-seam/src/main/java/org/picketlink/identity/seam/federation/SamlSingleLogoutReceiver.java picketlink-seam/trunk/picketlink-seam/src/main/java/org/picketlink/identity/seam/federation/SamlSingleLogoutSender.java picketlink-seam/trunk/picketlink-seam/src/main/java/org/picketlink/identity/seam/federation/SamlSingleSignOnReceiver.java picketlink-seam/trunk/picketlink-seam/src/main/java/org/picketlink/identity/seam/federation/SamlSingleSignOnSender.java picketlink-seam/trunk/picketlink-seam/src/main/java/org/picketlink/identity/seam/federation/SeamSamlPrincipal.java picketlink-seam/trunk/picketlink-seam/src/main/java/org/picketlink/identity/seam/federation/configuration/SamlConfiguration.java picketlink-seam/trunk/picketlink-seam/src/main/java/org/picketlink/identity/seam/federation/configuration/SamlIdentityProvider.java picketlink-seam/trunk/picketlink-seam/src/main/java/org/picketlink/identity/seam/federation/configuration/SamlService.java picketlink-seam/trunk/picketlink-seam/src/test/java/org/picketlink/test/identity/seam/federation/SamlConfigurationUnitTestCase.java picketlink-seam/trunk/seam-sp/src/main/java/org/picketlink/identity/seam/federation/Authenticator.java Log: use the saml object model moved from newmodel pkg Modified: picketlink-seam/trunk/picketlink-seam/src/main/java/org/picketlink/identity/seam/federation/SamlMessageFactory.java =================================================================== --- picketlink-seam/trunk/picketlink-seam/src/main/java/org/picketlink/identity/seam/federation/SamlMessageFactory.java 2011-06-21 20:53:02 UTC (rev 1019) +++ picketlink-seam/trunk/picketlink-seam/src/main/java/org/picketlink/identity/seam/federation/SamlMessageFactory.java 2011-06-21 21:04:32 UTC (rev 1020) @@ -33,13 +33,13 @@ import org.picketlink.identity.federation.core.saml.v2.common.IDGenerator; 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.AuthnRequestType; -import org.picketlink.identity.federation.newmodel.saml.v2.protocol.LogoutRequestType; -import org.picketlink.identity.federation.newmodel.saml.v2.protocol.RequestAbstractType; -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.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.RequestAbstractType; +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; import org.picketlink.identity.seam.federation.configuration.ServiceProvider; /** Modified: picketlink-seam/trunk/picketlink-seam/src/main/java/org/picketlink/identity/seam/federation/SamlMessageReceiver.java =================================================================== --- picketlink-seam/trunk/picketlink-seam/src/main/java/org/picketlink/identity/seam/federation/SamlMessageReceiver.java 2011-06-21 20:53:02 UTC (rev 1019) +++ picketlink-seam/trunk/picketlink-seam/src/main/java/org/picketlink/identity/seam/federation/SamlMessageReceiver.java 2011-06-21 21:04:32 UTC (rev 1020) @@ -40,8 +40,8 @@ import org.picketlink.identity.federation.core.parsers.saml.SAMLParser; import org.picketlink.identity.federation.core.parsers.util.StaxParserUtil; import org.picketlink.identity.federation.core.saml.v2.util.DocumentUtil; -import org.picketlink.identity.federation.newmodel.saml.v2.protocol.RequestAbstractType; -import org.picketlink.identity.federation.newmodel.saml.v2.protocol.StatusResponseType; +import org.picketlink.identity.federation.saml.v2.protocol.RequestAbstractType; +import org.picketlink.identity.federation.saml.v2.protocol.StatusResponseType; import org.picketlink.identity.federation.web.util.RedirectBindingUtil; import org.picketlink.identity.seam.federation.configuration.SamlIdentityProvider; import org.picketlink.identity.seam.federation.configuration.ServiceProvider; Modified: picketlink-seam/trunk/picketlink-seam/src/main/java/org/picketlink/identity/seam/federation/SamlMessageSender.java =================================================================== --- picketlink-seam/trunk/picketlink-seam/src/main/java/org/picketlink/identity/seam/federation/SamlMessageSender.java 2011-06-21 20:53:02 UTC (rev 1019) +++ picketlink-seam/trunk/picketlink-seam/src/main/java/org/picketlink/identity/seam/federation/SamlMessageSender.java 2011-06-21 21:04:32 UTC (rev 1020) @@ -49,8 +49,8 @@ import org.picketlink.identity.federation.core.saml.v2.util.DocumentUtil; 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.RequestAbstractType; -import org.picketlink.identity.federation.newmodel.saml.v2.protocol.StatusResponseType; +import org.picketlink.identity.federation.saml.v2.protocol.RequestAbstractType; +import org.picketlink.identity.federation.saml.v2.protocol.StatusResponseType; import org.picketlink.identity.federation.web.util.HTTPRedirectUtil; import org.picketlink.identity.federation.web.util.PostBindingUtil; import org.picketlink.identity.federation.web.util.RedirectBindingSignatureUtil; Modified: picketlink-seam/trunk/picketlink-seam/src/main/java/org/picketlink/identity/seam/federation/SamlMetaDataProvider.java =================================================================== --- picketlink-seam/trunk/picketlink-seam/src/main/java/org/picketlink/identity/seam/federation/SamlMetaDataProvider.java 2011-06-21 20:53:02 UTC (rev 1019) +++ picketlink-seam/trunk/picketlink-seam/src/main/java/org/picketlink/identity/seam/federation/SamlMetaDataProvider.java 2011-06-21 21:04:32 UTC (rev 1020) @@ -35,12 +35,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.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.IndexedEndpointType; -import org.picketlink.identity.federation.newmodel.saml.v2.metadata.KeyDescriptorType; -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.EntityDescriptorType.EDTChoiceType; +import org.picketlink.identity.federation.saml.v2.metadata.EntityDescriptorType.EDTDescriptorChoiceType; +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.SPSSODescriptorType; import org.picketlink.identity.seam.federation.configuration.ServiceProvider; import org.w3c.dom.Element; Modified: picketlink-seam/trunk/picketlink-seam/src/main/java/org/picketlink/identity/seam/federation/SamlSingleLogoutReceiver.java =================================================================== --- picketlink-seam/trunk/picketlink-seam/src/main/java/org/picketlink/identity/seam/federation/SamlSingleLogoutReceiver.java 2011-06-21 20:53:02 UTC (rev 1019) +++ picketlink-seam/trunk/picketlink-seam/src/main/java/org/picketlink/identity/seam/federation/SamlSingleLogoutReceiver.java 2011-06-21 21:04:32 UTC (rev 1020) @@ -32,9 +32,9 @@ import org.jboss.seam.annotations.Name; import org.jboss.seam.security.Identity; import org.picketlink.identity.federation.core.saml.v2.constants.JBossSAMLURIConstants; -import org.picketlink.identity.federation.newmodel.saml.v2.protocol.LogoutRequestType; -import org.picketlink.identity.federation.newmodel.saml.v2.protocol.RequestAbstractType; -import org.picketlink.identity.federation.newmodel.saml.v2.protocol.StatusResponseType; +import org.picketlink.identity.federation.saml.v2.protocol.LogoutRequestType; +import org.picketlink.identity.federation.saml.v2.protocol.RequestAbstractType; +import org.picketlink.identity.federation.saml.v2.protocol.StatusResponseType; import org.picketlink.identity.seam.federation.configuration.Binding; import org.picketlink.identity.seam.federation.configuration.SamlEndpoint; import org.picketlink.identity.seam.federation.configuration.SamlIdentityProvider; Modified: picketlink-seam/trunk/picketlink-seam/src/main/java/org/picketlink/identity/seam/federation/SamlSingleLogoutSender.java =================================================================== --- picketlink-seam/trunk/picketlink-seam/src/main/java/org/picketlink/identity/seam/federation/SamlSingleLogoutSender.java 2011-06-21 20:53:02 UTC (rev 1019) +++ picketlink-seam/trunk/picketlink-seam/src/main/java/org/picketlink/identity/seam/federation/SamlSingleLogoutSender.java 2011-06-21 21:04:32 UTC (rev 1020) @@ -29,7 +29,7 @@ import org.jboss.seam.annotations.In; import org.jboss.seam.annotations.Name; import org.jboss.seam.security.Identity; -import org.picketlink.identity.federation.newmodel.saml.v2.protocol.LogoutRequestType; +import org.picketlink.identity.federation.saml.v2.protocol.LogoutRequestType; import org.picketlink.identity.seam.federation.configuration.SamlIdentityProvider; /** Modified: picketlink-seam/trunk/picketlink-seam/src/main/java/org/picketlink/identity/seam/federation/SamlSingleSignOnReceiver.java =================================================================== --- picketlink-seam/trunk/picketlink-seam/src/main/java/org/picketlink/identity/seam/federation/SamlSingleSignOnReceiver.java 2011-06-21 20:53:02 UTC (rev 1019) +++ picketlink-seam/trunk/picketlink-seam/src/main/java/org/picketlink/identity/seam/federation/SamlSingleSignOnReceiver.java 2011-06-21 21:04:32 UTC (rev 1020) @@ -43,23 +43,23 @@ import org.picketlink.identity.federation.core.saml.v2.constants.JBossSAMLURIConstants; 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.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.AuthnStatementType; -import org.picketlink.identity.federation.newmodel.saml.v2.assertion.EncryptedAssertionType; -import org.picketlink.identity.federation.newmodel.saml.v2.assertion.EncryptedElementType; -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.protocol.ResponseType; -import org.picketlink.identity.federation.newmodel.saml.v2.protocol.ResponseType.RTChoiceType; -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.AttributeStatementType; +import org.picketlink.identity.federation.saml.v2.assertion.AttributeStatementType.ASTChoiceType; +import org.picketlink.identity.federation.saml.v2.assertion.AttributeType; +import org.picketlink.identity.federation.saml.v2.assertion.AuthnStatementType; +import org.picketlink.identity.federation.saml.v2.assertion.EncryptedAssertionType; +import org.picketlink.identity.federation.saml.v2.assertion.EncryptedElementType; +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.SubjectType.STSubType; +import org.picketlink.identity.federation.saml.v2.protocol.ResponseType; +import org.picketlink.identity.federation.saml.v2.protocol.ResponseType.RTChoiceType; +import org.picketlink.identity.federation.saml.v2.protocol.StatusResponseType; +import org.picketlink.identity.federation.saml.v2.protocol.StatusType; import org.picketlink.identity.seam.federation.configuration.SamlIdentityProvider; import org.picketlink.identity.seam.federation.configuration.ServiceProvider; Modified: picketlink-seam/trunk/picketlink-seam/src/main/java/org/picketlink/identity/seam/federation/SamlSingleSignOnSender.java =================================================================== --- picketlink-seam/trunk/picketlink-seam/src/main/java/org/picketlink/identity/seam/federation/SamlSingleSignOnSender.java 2011-06-21 20:53:02 UTC (rev 1019) +++ picketlink-seam/trunk/picketlink-seam/src/main/java/org/picketlink/identity/seam/federation/SamlSingleSignOnSender.java 2011-06-21 21:04:32 UTC (rev 1020) @@ -30,7 +30,7 @@ import org.jboss.seam.annotations.Name; import org.jboss.seam.core.Events; import org.jboss.seam.security.Identity; -import org.picketlink.identity.federation.newmodel.saml.v2.protocol.AuthnRequestType; +import org.picketlink.identity.federation.saml.v2.protocol.AuthnRequestType; import org.picketlink.identity.seam.federation.configuration.SamlIdentityProvider; /** Modified: picketlink-seam/trunk/picketlink-seam/src/main/java/org/picketlink/identity/seam/federation/SeamSamlPrincipal.java =================================================================== --- picketlink-seam/trunk/picketlink-seam/src/main/java/org/picketlink/identity/seam/federation/SeamSamlPrincipal.java 2011-06-21 20:53:02 UTC (rev 1019) +++ picketlink-seam/trunk/picketlink-seam/src/main/java/org/picketlink/identity/seam/federation/SeamSamlPrincipal.java 2011-06-21 21:04:32 UTC (rev 1020) @@ -26,9 +26,9 @@ import java.util.LinkedList; import java.util.List; -import org.picketlink.identity.federation.newmodel.saml.v2.assertion.AssertionType; -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.saml.v2.assertion.AssertionType; +import org.picketlink.identity.federation.saml.v2.assertion.AttributeType; +import org.picketlink.identity.federation.saml.v2.assertion.NameIDType; import org.picketlink.identity.seam.federation.configuration.SamlIdentityProvider; /** Modified: picketlink-seam/trunk/picketlink-seam/src/main/java/org/picketlink/identity/seam/federation/configuration/SamlConfiguration.java =================================================================== --- picketlink-seam/trunk/picketlink-seam/src/main/java/org/picketlink/identity/seam/federation/configuration/SamlConfiguration.java 2011-06-21 20:53:02 UTC (rev 1019) +++ picketlink-seam/trunk/picketlink-seam/src/main/java/org/picketlink/identity/seam/federation/configuration/SamlConfiguration.java 2011-06-21 21:04:32 UTC (rev 1020) @@ -40,11 +40,11 @@ import org.picketlink.identity.federation.core.exceptions.ConfigurationException; import org.picketlink.identity.federation.core.parsers.saml.SAMLParser; import org.picketlink.identity.federation.core.util.StringUtil; -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.saml.v2.metadata.EntitiesDescriptorType; +import org.picketlink.identity.federation.saml.v2.metadata.EntityDescriptorType; +import org.picketlink.identity.federation.saml.v2.metadata.EntityDescriptorType.EDTChoiceType; +import org.picketlink.identity.federation.saml.v2.metadata.EntityDescriptorType.EDTDescriptorChoiceType; +import org.picketlink.identity.federation.saml.v2.metadata.IDPSSODescriptorType; import org.picketlink.identity.seam.federation.jaxb.config.SamlConfigType; import org.picketlink.identity.seam.federation.jaxb.config.SamlIdentityProviderType; import org.picketlink.identity.seam.federation.util.PicketLinkSeamUtil; Modified: picketlink-seam/trunk/picketlink-seam/src/main/java/org/picketlink/identity/seam/federation/configuration/SamlIdentityProvider.java =================================================================== --- picketlink-seam/trunk/picketlink-seam/src/main/java/org/picketlink/identity/seam/federation/configuration/SamlIdentityProvider.java 2011-06-21 20:53:02 UTC (rev 1019) +++ picketlink-seam/trunk/picketlink-seam/src/main/java/org/picketlink/identity/seam/federation/configuration/SamlIdentityProvider.java 2011-06-21 21:04:32 UTC (rev 1020) @@ -29,9 +29,9 @@ import org.picketlink.identity.federation.api.saml.v2.metadata.MetaDataExtractor; import org.picketlink.identity.federation.core.util.StringUtil; -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.KeyTypes; +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.KeyTypes; import org.picketlink.identity.seam.federation.SamlProfile; /** Modified: picketlink-seam/trunk/picketlink-seam/src/main/java/org/picketlink/identity/seam/federation/configuration/SamlService.java =================================================================== --- picketlink-seam/trunk/picketlink-seam/src/main/java/org/picketlink/identity/seam/federation/configuration/SamlService.java 2011-06-21 20:53:02 UTC (rev 1019) +++ picketlink-seam/trunk/picketlink-seam/src/main/java/org/picketlink/identity/seam/federation/configuration/SamlService.java 2011-06-21 21:04:32 UTC (rev 1020) @@ -26,7 +26,7 @@ import java.util.LinkedList; import java.util.List; -import org.picketlink.identity.federation.newmodel.saml.v2.metadata.EndpointType; +import org.picketlink.identity.federation.saml.v2.metadata.EndpointType; import org.picketlink.identity.seam.federation.SamlProfile; /** Modified: picketlink-seam/trunk/picketlink-seam/src/test/java/org/picketlink/test/identity/seam/federation/SamlConfigurationUnitTestCase.java =================================================================== --- picketlink-seam/trunk/picketlink-seam/src/test/java/org/picketlink/test/identity/seam/federation/SamlConfigurationUnitTestCase.java 2011-06-21 20:53:02 UTC (rev 1019) +++ picketlink-seam/trunk/picketlink-seam/src/test/java/org/picketlink/test/identity/seam/federation/SamlConfigurationUnitTestCase.java 2011-06-21 21:04:32 UTC (rev 1020) @@ -29,11 +29,11 @@ import org.junit.Test; import org.picketlink.identity.federation.core.parsers.saml.SAMLParser; -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.saml.v2.metadata.EntitiesDescriptorType; +import org.picketlink.identity.federation.saml.v2.metadata.EntityDescriptorType; +import org.picketlink.identity.federation.saml.v2.metadata.EntityDescriptorType.EDTChoiceType; +import org.picketlink.identity.federation.saml.v2.metadata.EntityDescriptorType.EDTDescriptorChoiceType; +import org.picketlink.identity.federation.saml.v2.metadata.IDPSSODescriptorType; import org.picketlink.identity.seam.federation.configuration.SamlConfiguration; /** Modified: picketlink-seam/trunk/seam-sp/src/main/java/org/picketlink/identity/seam/federation/Authenticator.java =================================================================== --- picketlink-seam/trunk/seam-sp/src/main/java/org/picketlink/identity/seam/federation/Authenticator.java 2011-06-21 20:53:02 UTC (rev 1019) +++ picketlink-seam/trunk/seam-sp/src/main/java/org/picketlink/identity/seam/federation/Authenticator.java 2011-06-21 21:04:32 UTC (rev 1020) @@ -26,7 +26,7 @@ import org.jboss.seam.annotations.Name; import org.jboss.seam.security.Identity; -import org.picketlink.identity.federation.newmodel.saml.v2.assertion.AttributeType; +import org.picketlink.identity.federation.saml.v2.assertion.AttributeType; /** * @author Marcel Kolsteren