June 2011 - picketlink-commits - Jboss List Archives

Picketlink SVN: r1017 - in federation/trunk: picketlink-bindings/src/main/java/org/picketlink/identity/federation/bindings/tomcat/sp and 22 other directories.

by picketlink-commits＠lists.jboss.org

Author: anil.saldhana(a)jboss.com Date: 2011-06-21 16:46:32 -0400 (Tue, 21 Jun 2011) New Revision: 1017 Modified: federation/trunk/picketlink-bindings-jboss/src/main/java/org/picketlink/identity/federation/bindings/jboss/auth/SAML20TokenRoleAttributeProvider.java federation/trunk/picketlink-bindings-jboss/src/main/java/org/picketlink/identity/federation/bindings/jboss/auth/SAML2STSLoginModule.java federation/trunk/picketlink-bindings-jboss/src/main/java/org/picketlink/identity/federation/bindings/jboss/auth/mapping/STSGroupMappingProvider.java federation/trunk/picketlink-bindings-jboss/src/main/java/org/picketlink/identity/federation/bindings/jboss/auth/mapping/STSPrincipalMappingProvider.java federation/trunk/picketlink-bindings-jboss/src/test/java/org/picketlink/test/identity/federation/bindings/jboss/auth/SAML20TokenProviderUnitTestCase.java federation/trunk/picketlink-bindings-jboss/src/test/java/org/picketlink/test/identity/federation/bindings/jboss/auth/SAML2STSLoginModuleUnitTestCase.java federation/trunk/picketlink-bindings-jboss/src/test/java/org/picketlink/test/identity/federation/bindings/jboss/auth/STSMappingProviderUnitTestCase.java federation/trunk/picketlink-bindings/src/main/java/org/picketlink/identity/federation/bindings/tomcat/idp/IDPWebBrowserSSOValve.java federation/trunk/picketlink-bindings/src/main/java/org/picketlink/identity/federation/bindings/tomcat/sp/BaseFormAuthenticator.java federation/trunk/picketlink-bindings/src/main/java/org/picketlink/identity/federation/bindings/tomcat/sp/SPPostFormAuthenticator.java federation/trunk/picketlink-bindings/src/main/java/org/picketlink/identity/federation/bindings/tomcat/sp/SPRedirectFormAuthenticator.java federation/trunk/picketlink-bindings/src/main/java/org/picketlink/identity/federation/bindings/tomcat/sp/SPRedirectSignatureFormAuthenticator.java federation/trunk/picketlink-bindings/src/main/java/org/picketlink/identity/federation/bindings/tomcat/sp/SPUtil.java federation/trunk/picketlink-bindings/src/test/java/org/picketlink/test/identity/federation/bindings/servlets/SOAPSAMLXACMLServletUnitTestCase.java federation/trunk/picketlink-bindings/src/test/java/org/picketlink/test/identity/federation/bindings/util/RedirectBindingSignatureUtilTestCase.java federation/trunk/picketlink-bindings/src/test/java/org/picketlink/test/identity/federation/bindings/util/RedirectBindingUtilTestCase.java federation/trunk/picketlink-bindings/src/test/java/org/picketlink/test/identity/federation/bindings/workflow/SAML2LogoutTomcatWorkflowUnitTestCase.java federation/trunk/picketlink-bindings/src/test/java/org/picketlink/test/identity/federation/bindings/workflow/SAML2PostTomcatWorkflowUnitTestCase.java federation/trunk/picketlink-fed-api/src/main/java/org/picketlink/identity/federation/api/saml/v2/metadata/KeyDescriptorMetaDataBuilder.java federation/trunk/picketlink-fed-api/src/main/java/org/picketlink/identity/federation/api/saml/v2/metadata/MetaDataBuilder.java federation/trunk/picketlink-fed-api/src/main/java/org/picketlink/identity/federation/api/saml/v2/metadata/MetaDataExtractor.java federation/trunk/picketlink-fed-api/src/main/java/org/picketlink/identity/federation/api/saml/v2/request/SAML2Request.java federation/trunk/picketlink-fed-api/src/main/java/org/picketlink/identity/federation/api/saml/v2/response/SAML2Response.java federation/trunk/picketlink-fed-api/src/main/java/org/picketlink/identity/federation/api/saml/v2/sig/SAML2Signature.java federation/trunk/picketlink-fed-api/src/main/java/org/picketlink/identity/federation/api/soap/SOAPSAMLXACML.java federation/trunk/picketlink-fed-api/src/test/java/org/picketlink/test/identity/federation/api/saml/v2/DeflateEncodingDecodingUnitTestCase.java federation/trunk/picketlink-fed-api/src/test/java/org/picketlink/test/identity/federation/api/saml/v2/SAML2AuthnRequestUnitTestCase.java federation/trunk/picketlink-fed-api/src/test/java/org/picketlink/test/identity/federation/api/saml/v2/SAML2AuthnResponseUnitTestCase.java federation/trunk/picketlink-fed-api/src/test/java/org/picketlink/test/identity/federation/api/saml/v2/SAML2RequestUnitTestCase.java federation/trunk/picketlink-fed-api/src/test/java/org/picketlink/test/identity/federation/api/saml/v2/SignatureValidationUnitTestCase.java federation/trunk/picketlink-fed-api/src/test/java/org/picketlink/test/identity/federation/api/saml/v2/metadata/KeyDescriptorMetaDataBuilderUnitTestCase.java federation/trunk/picketlink-fed-api/src/test/java/org/picketlink/test/identity/federation/api/saml/v2/metadata/MetaDataBuilderUnitTestCase.java federation/trunk/picketlink-fed-api/src/test/java/org/picketlink/test/identity/federation/api/util/XMLEncryptionUnitTestCase.java federation/trunk/picketlink-web/src/main/java/org/picketlink/identity/federation/web/filters/SPFilter.java federation/trunk/picketlink-web/src/main/java/org/picketlink/identity/federation/web/handlers/saml2/RolesGenerationHandler.java federation/trunk/picketlink-web/src/main/java/org/picketlink/identity/federation/web/handlers/saml2/SAML2AttributeHandler.java federation/trunk/picketlink-web/src/main/java/org/picketlink/identity/federation/web/handlers/saml2/SAML2AuthenticationHandler.java federation/trunk/picketlink-web/src/main/java/org/picketlink/identity/federation/web/handlers/saml2/SAML2LogOutHandler.java federation/trunk/picketlink-web/src/main/java/org/picketlink/identity/federation/web/process/SAMLHandlerChainProcessor.java federation/trunk/picketlink-web/src/main/java/org/picketlink/identity/federation/web/process/ServiceProviderSAMLResponseProcessor.java federation/trunk/picketlink-web/src/main/java/org/picketlink/identity/federation/web/servlets/IDPServlet.java federation/trunk/picketlink-web/src/main/java/org/picketlink/identity/federation/web/servlets/saml/CircleOfTrustServlet.java federation/trunk/picketlink-web/src/main/java/org/picketlink/identity/federation/web/servlets/saml/MetadataServlet.java federation/trunk/picketlink-web/src/main/java/org/picketlink/identity/federation/web/servlets/saml/SOAPSAMLXACMLServlet.java federation/trunk/picketlink-web/src/main/java/org/picketlink/identity/federation/web/util/IDPWebRequestUtil.java federation/trunk/picketlink-web/src/main/java/org/picketlink/identity/federation/web/util/RedirectBindingSignatureUtil.java federation/trunk/picketlink-web/src/test/java/org/picketlink/test/identity/federation/web/saml/handlers/SAML2AttributeHandlerUnitTestCase.java federation/trunk/picketlink-web/src/test/java/org/picketlink/test/identity/federation/web/saml/handlers/SAML2AuthenticationHandlerUnitTestCase.java federation/trunk/picketlink-web/src/test/java/org/picketlink/test/identity/federation/web/saml/handlers/SAML2SignatureHandlerUnitTestCase.java federation/trunk/picketlink-web/src/test/java/org/picketlink/test/identity/federation/web/workflow/saml2/SAML2LogoutWorkflowUnitTestCase.java federation/trunk/picketlink-web/src/test/java/org/picketlink/test/identity/federation/web/workflow/saml2/SAML2PostWorkflowUnitTestCase.java Log: move the classes from newmodel to saml pkg Modified: federation/trunk/picketlink-bindings/src/main/java/org/picketlink/identity/federation/bindings/tomcat/idp/IDPWebBrowserSSOValve.java =================================================================== --- federation/trunk/picketlink-bindings/src/main/java/org/picketlink/identity/federation/bindings/tomcat/idp/IDPWebBrowserSSOValve.java 2011-06-21 20:44:33 UTC (rev 1016) +++ federation/trunk/picketlink-bindings/src/main/java/org/picketlink/identity/federation/bindings/tomcat/idp/IDPWebBrowserSSOValve.java 2011-06-21 20:46:32 UTC (rev 1017) @@ -88,9 +88,9 @@ import org.picketlink.identity.federation.core.util.CoreConfigUtil; import org.picketlink.identity.federation.core.util.StringUtil; import org.picketlink.identity.federation.core.util.XMLSignatureUtil; -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.SAML2Object; +import org.picketlink.identity.federation.saml.v2.protocol.RequestAbstractType; +import org.picketlink.identity.federation.saml.v2.protocol.StatusResponseType; import org.picketlink.identity.federation.web.constants.GeneralConstants; import org.picketlink.identity.federation.web.core.HTTPContext; import org.picketlink.identity.federation.web.core.IdentityParticipantStack; Modified: federation/trunk/picketlink-bindings/src/main/java/org/picketlink/identity/federation/bindings/tomcat/sp/BaseFormAuthenticator.java =================================================================== --- federation/trunk/picketlink-bindings/src/main/java/org/picketlink/identity/federation/bindings/tomcat/sp/BaseFormAuthenticator.java 2011-06-21 20:44:33 UTC (rev 1016) +++ federation/trunk/picketlink-bindings/src/main/java/org/picketlink/identity/federation/bindings/tomcat/sp/BaseFormAuthenticator.java 2011-06-21 20:46:32 UTC (rev 1017) @@ -61,11 +61,11 @@ import org.picketlink.identity.federation.core.util.CoreConfigUtil; import org.picketlink.identity.federation.core.util.StringUtil; import org.picketlink.identity.federation.core.util.XMLSignatureUtil; -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.IDPSSODescriptorType; -import org.picketlink.identity.federation.newmodel.saml.v2.metadata.KeyDescriptorType; +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.KeyDescriptorType; import org.picketlink.identity.federation.web.constants.GeneralConstants; import org.picketlink.identity.federation.web.util.ConfigurationUtil; Modified: federation/trunk/picketlink-bindings/src/main/java/org/picketlink/identity/federation/bindings/tomcat/sp/SPPostFormAuthenticator.java =================================================================== --- federation/trunk/picketlink-bindings/src/main/java/org/picketlink/identity/federation/bindings/tomcat/sp/SPPostFormAuthenticator.java 2011-06-21 20:44:33 UTC (rev 1016) +++ federation/trunk/picketlink-bindings/src/main/java/org/picketlink/identity/federation/bindings/tomcat/sp/SPPostFormAuthenticator.java 2011-06-21 20:46:32 UTC (rev 1017) @@ -51,7 +51,7 @@ import org.picketlink.identity.federation.core.saml.v2.interfaces.SAML2Handler; import org.picketlink.identity.federation.core.saml.v2.interfaces.SAML2HandlerResponse; import org.picketlink.identity.federation.core.saml.v2.util.DocumentUtil; -import org.picketlink.identity.federation.newmodel.saml.v2.protocol.ResponseType; +import org.picketlink.identity.federation.saml.v2.protocol.ResponseType; import org.picketlink.identity.federation.web.constants.GeneralConstants; import org.picketlink.identity.federation.web.core.HTTPContext; import org.picketlink.identity.federation.web.process.ServiceProviderBaseProcessor; Modified: federation/trunk/picketlink-bindings/src/main/java/org/picketlink/identity/federation/bindings/tomcat/sp/SPRedirectFormAuthenticator.java =================================================================== --- federation/trunk/picketlink-bindings/src/main/java/org/picketlink/identity/federation/bindings/tomcat/sp/SPRedirectFormAuthenticator.java 2011-06-21 20:44:33 UTC (rev 1016) +++ federation/trunk/picketlink-bindings/src/main/java/org/picketlink/identity/federation/bindings/tomcat/sp/SPRedirectFormAuthenticator.java 2011-06-21 20:46:32 UTC (rev 1017) @@ -54,8 +54,8 @@ import org.picketlink.identity.federation.core.saml.v2.interfaces.SAML2Handler; import org.picketlink.identity.federation.core.saml.v2.interfaces.SAML2HandlerResponse; import org.picketlink.identity.federation.core.saml.v2.util.DocumentUtil; -import org.picketlink.identity.federation.newmodel.saml.v2.protocol.AuthnRequestType; -import org.picketlink.identity.federation.newmodel.saml.v2.protocol.ResponseType; +import org.picketlink.identity.federation.saml.v2.protocol.AuthnRequestType; +import org.picketlink.identity.federation.saml.v2.protocol.ResponseType; import org.picketlink.identity.federation.web.constants.GeneralConstants; import org.picketlink.identity.federation.web.core.HTTPContext; import org.picketlink.identity.federation.web.process.ServiceProviderBaseProcessor; Modified: federation/trunk/picketlink-bindings/src/main/java/org/picketlink/identity/federation/bindings/tomcat/sp/SPRedirectSignatureFormAuthenticator.java =================================================================== --- federation/trunk/picketlink-bindings/src/main/java/org/picketlink/identity/federation/bindings/tomcat/sp/SPRedirectSignatureFormAuthenticator.java 2011-06-21 20:44:33 UTC (rev 1016) +++ federation/trunk/picketlink-bindings/src/main/java/org/picketlink/identity/federation/bindings/tomcat/sp/SPRedirectSignatureFormAuthenticator.java 2011-06-21 20:46:32 UTC (rev 1017) @@ -46,8 +46,8 @@ import org.picketlink.identity.federation.core.saml.v2.util.SignatureUtil; import org.picketlink.identity.federation.core.util.CoreConfigUtil; import org.picketlink.identity.federation.core.util.XMLEncryptionUtil; -import org.picketlink.identity.federation.newmodel.saml.v2.assertion.EncryptedElementType; -import org.picketlink.identity.federation.newmodel.saml.v2.protocol.ResponseType; +import org.picketlink.identity.federation.saml.v2.assertion.EncryptedElementType; +import org.picketlink.identity.federation.saml.v2.protocol.ResponseType; import org.picketlink.identity.federation.web.constants.GeneralConstants; import org.picketlink.identity.federation.web.process.ServiceProviderBaseProcessor; import org.picketlink.identity.federation.web.util.RedirectBindingSignatureUtil; Modified: federation/trunk/picketlink-bindings/src/main/java/org/picketlink/identity/federation/bindings/tomcat/sp/SPUtil.java =================================================================== --- federation/trunk/picketlink-bindings/src/main/java/org/picketlink/identity/federation/bindings/tomcat/sp/SPUtil.java 2011-06-21 20:44:33 UTC (rev 1016) +++ federation/trunk/picketlink-bindings/src/main/java/org/picketlink/identity/federation/bindings/tomcat/sp/SPUtil.java 2011-06-21 20:46:32 UTC (rev 1017) @@ -35,16 +35,16 @@ import org.picketlink.identity.federation.core.saml.v2.constants.JBossSAMLURIConstants; import org.picketlink.identity.federation.core.saml.v2.exceptions.AssertionExpiredException; import org.picketlink.identity.federation.core.saml.v2.util.AssertionUtil; -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.NameIDType; -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.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.NameIDType; +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.protocol.AuthnRequestType; +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; /** * Common code useful for a SP Modified: federation/trunk/picketlink-bindings/src/test/java/org/picketlink/test/identity/federation/bindings/servlets/SOAPSAMLXACMLServletUnitTestCase.java =================================================================== --- federation/trunk/picketlink-bindings/src/test/java/org/picketlink/test/identity/federation/bindings/servlets/SOAPSAMLXACMLServletUnitTestCase.java 2011-06-21 20:44:33 UTC (rev 1016) +++ federation/trunk/picketlink-bindings/src/test/java/org/picketlink/test/identity/federation/bindings/servlets/SOAPSAMLXACMLServletUnitTestCase.java 2011-06-21 20:46:32 UTC (rev 1017) @@ -45,7 +45,7 @@ import org.picketlink.identity.federation.core.saml.v2.util.DocumentUtil; import org.picketlink.identity.federation.core.saml.v2.util.SOAPSAMLXACMLUtil; import org.picketlink.identity.federation.core.util.SOAPUtil; -import org.picketlink.identity.federation.newmodel.saml.v2.profiles.xacml.assertion.XACMLAuthzDecisionStatementType; +import org.picketlink.identity.federation.saml.v2.profiles.xacml.assertion.XACMLAuthzDecisionStatementType; import org.w3c.dom.Element; import org.w3c.dom.Node; Modified: federation/trunk/picketlink-bindings/src/test/java/org/picketlink/test/identity/federation/bindings/util/RedirectBindingSignatureUtilTestCase.java =================================================================== --- federation/trunk/picketlink-bindings/src/test/java/org/picketlink/test/identity/federation/bindings/util/RedirectBindingSignatureUtilTestCase.java 2011-06-21 20:44:33 UTC (rev 1016) +++ federation/trunk/picketlink-bindings/src/test/java/org/picketlink/test/identity/federation/bindings/util/RedirectBindingSignatureUtilTestCase.java 2011-06-21 20:46:32 UTC (rev 1017) @@ -31,7 +31,7 @@ import org.picketlink.identity.federation.core.saml.v2.common.IDGenerator; import org.picketlink.identity.federation.core.saml.v2.util.SignatureUtil; import org.picketlink.identity.federation.core.util.KeyStoreUtil; -import org.picketlink.identity.federation.newmodel.saml.v2.protocol.AuthnRequestType; +import org.picketlink.identity.federation.saml.v2.protocol.AuthnRequestType; import org.picketlink.identity.federation.web.util.RedirectBindingSignatureUtil; /** Modified: federation/trunk/picketlink-bindings/src/test/java/org/picketlink/test/identity/federation/bindings/util/RedirectBindingUtilTestCase.java =================================================================== --- federation/trunk/picketlink-bindings/src/test/java/org/picketlink/test/identity/federation/bindings/util/RedirectBindingUtilTestCase.java 2011-06-21 20:44:33 UTC (rev 1016) +++ federation/trunk/picketlink-bindings/src/test/java/org/picketlink/test/identity/federation/bindings/util/RedirectBindingUtilTestCase.java 2011-06-21 20:46:32 UTC (rev 1017) @@ -29,8 +29,8 @@ import org.picketlink.identity.federation.api.saml.v2.request.SAML2Request; import org.picketlink.identity.federation.core.saml.v2.common.IDGenerator; -import org.picketlink.identity.federation.newmodel.saml.v2.protocol.AuthnRequestType; -import org.picketlink.identity.federation.newmodel.saml.v2.protocol.RequestAbstractType; +import org.picketlink.identity.federation.saml.v2.protocol.AuthnRequestType; +import org.picketlink.identity.federation.saml.v2.protocol.RequestAbstractType; import org.picketlink.identity.federation.web.util.RedirectBindingUtil; /** Modified: federation/trunk/picketlink-bindings/src/test/java/org/picketlink/test/identity/federation/bindings/workflow/SAML2LogoutTomcatWorkflowUnitTestCase.java =================================================================== --- federation/trunk/picketlink-bindings/src/test/java/org/picketlink/test/identity/federation/bindings/workflow/SAML2LogoutTomcatWorkflowUnitTestCase.java 2011-06-21 20:44:33 UTC (rev 1016) +++ federation/trunk/picketlink-bindings/src/test/java/org/picketlink/test/identity/federation/bindings/workflow/SAML2LogoutTomcatWorkflowUnitTestCase.java 2011-06-21 20:46:32 UTC (rev 1017) @@ -44,8 +44,8 @@ import org.picketlink.identity.federation.api.saml.v2.response.SAML2Response; import org.picketlink.identity.federation.bindings.tomcat.idp.IDPWebBrowserSSOValve; import org.picketlink.identity.federation.bindings.tomcat.sp.SPRedirectFormAuthenticator; -import org.picketlink.identity.federation.newmodel.saml.v2.protocol.LogoutRequestType; -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.StatusResponseType; import org.picketlink.identity.federation.web.constants.GeneralConstants; import org.picketlink.identity.federation.web.core.IdentityServer; import org.picketlink.identity.federation.web.util.RedirectBindingUtil; Modified: federation/trunk/picketlink-bindings/src/test/java/org/picketlink/test/identity/federation/bindings/workflow/SAML2PostTomcatWorkflowUnitTestCase.java =================================================================== --- federation/trunk/picketlink-bindings/src/test/java/org/picketlink/test/identity/federation/bindings/workflow/SAML2PostTomcatWorkflowUnitTestCase.java 2011-06-21 20:44:33 UTC (rev 1016) +++ federation/trunk/picketlink-bindings/src/test/java/org/picketlink/test/identity/federation/bindings/workflow/SAML2PostTomcatWorkflowUnitTestCase.java 2011-06-21 20:46:32 UTC (rev 1017) @@ -43,8 +43,8 @@ import org.picketlink.identity.federation.core.saml.v2.common.IDGenerator; import org.picketlink.identity.federation.core.saml.v2.util.DocumentUtil; import org.picketlink.identity.federation.core.util.Base64; -import org.picketlink.identity.federation.newmodel.saml.v2.protocol.AuthnRequestType; -import org.picketlink.identity.federation.newmodel.saml.v2.protocol.ResponseType; +import org.picketlink.identity.federation.saml.v2.protocol.AuthnRequestType; +import org.picketlink.identity.federation.saml.v2.protocol.ResponseType; import org.picketlink.identity.federation.web.constants.GeneralConstants; import org.picketlink.identity.federation.web.core.IdentityServer; import org.picketlink.identity.federation.web.util.PostBindingUtil; Modified: federation/trunk/picketlink-bindings-jboss/src/main/java/org/picketlink/identity/federation/bindings/jboss/auth/SAML20TokenRoleAttributeProvider.java =================================================================== --- federation/trunk/picketlink-bindings-jboss/src/main/java/org/picketlink/identity/federation/bindings/jboss/auth/SAML20TokenRoleAttributeProvider.java 2011-06-21 20:44:33 UTC (rev 1016) +++ federation/trunk/picketlink-bindings-jboss/src/main/java/org/picketlink/identity/federation/bindings/jboss/auth/SAML20TokenRoleAttributeProvider.java 2011-06-21 20:46:32 UTC (rev 1017) @@ -10,9 +10,9 @@ import org.apache.log4j.Logger; import org.jboss.security.SecurityContextAssociation; import org.picketlink.identity.federation.core.wstrust.plugins.saml.SAML20TokenAttributeProvider; -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.saml.v2.assertion.AttributeStatementType; +import org.picketlink.identity.federation.saml.v2.assertion.AttributeType; +import org.picketlink.identity.federation.saml.v2.assertion.AttributeStatementType.ASTChoiceType; /** * Modified: federation/trunk/picketlink-bindings-jboss/src/main/java/org/picketlink/identity/federation/bindings/jboss/auth/SAML2STSLoginModule.java =================================================================== --- federation/trunk/picketlink-bindings-jboss/src/main/java/org/picketlink/identity/federation/bindings/jboss/auth/SAML2STSLoginModule.java 2011-06-21 20:44:33 UTC (rev 1016) +++ federation/trunk/picketlink-bindings-jboss/src/main/java/org/picketlink/identity/federation/bindings/jboss/auth/SAML2STSLoginModule.java 2011-06-21 20:46:32 UTC (rev 1017) @@ -64,10 +64,10 @@ import org.picketlink.identity.federation.core.wstrust.WSTrustConstants; 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.newmodel.saml.v2.assertion.BaseIDAbstractType; -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.BaseIDAbstractType; +import org.picketlink.identity.federation.saml.v2.assertion.NameIDType; +import org.picketlink.identity.federation.saml.v2.assertion.SubjectType; import org.w3c.dom.Element; /** Modified: federation/trunk/picketlink-bindings-jboss/src/main/java/org/picketlink/identity/federation/bindings/jboss/auth/mapping/STSGroupMappingProvider.java =================================================================== --- federation/trunk/picketlink-bindings-jboss/src/main/java/org/picketlink/identity/federation/bindings/jboss/auth/mapping/STSGroupMappingProvider.java 2011-06-21 20:44:33 UTC (rev 1016) +++ federation/trunk/picketlink-bindings-jboss/src/main/java/org/picketlink/identity/federation/bindings/jboss/auth/mapping/STSGroupMappingProvider.java 2011-06-21 20:46:32 UTC (rev 1017) @@ -13,11 +13,11 @@ import org.picketlink.identity.federation.bindings.jboss.auth.SAML20TokenRoleAttributeProvider; 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.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.StatementAbstractType; +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.StatementAbstractType; +import org.picketlink.identity.federation.saml.v2.assertion.AttributeStatementType.ASTChoiceType; import org.w3c.dom.Element; /** Modified: federation/trunk/picketlink-bindings-jboss/src/main/java/org/picketlink/identity/federation/bindings/jboss/auth/mapping/STSPrincipalMappingProvider.java =================================================================== --- federation/trunk/picketlink-bindings-jboss/src/main/java/org/picketlink/identity/federation/bindings/jboss/auth/mapping/STSPrincipalMappingProvider.java 2011-06-21 20:44:33 UTC (rev 1016) +++ federation/trunk/picketlink-bindings-jboss/src/main/java/org/picketlink/identity/federation/bindings/jboss/auth/mapping/STSPrincipalMappingProvider.java 2011-06-21 20:46:32 UTC (rev 1017) @@ -9,10 +9,10 @@ import org.jboss.security.mapping.providers.principal.AbstractPrincipalMappingProvider; 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.newmodel.saml.v2.assertion.BaseIDAbstractType; -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.BaseIDAbstractType; +import org.picketlink.identity.federation.saml.v2.assertion.NameIDType; +import org.picketlink.identity.federation.saml.v2.assertion.SubjectType; import org.w3c.dom.Element; /** Modified: federation/trunk/picketlink-bindings-jboss/src/test/java/org/picketlink/test/identity/federation/bindings/jboss/auth/SAML20TokenProviderUnitTestCase.java =================================================================== --- federation/trunk/picketlink-bindings-jboss/src/test/java/org/picketlink/test/identity/federation/bindings/jboss/auth/SAML20TokenProviderUnitTestCase.java 2011-06-21 20:44:33 UTC (rev 1016) +++ federation/trunk/picketlink-bindings-jboss/src/test/java/org/picketlink/test/identity/federation/bindings/jboss/auth/SAML20TokenProviderUnitTestCase.java 2011-06-21 20:46:32 UTC (rev 1017) @@ -45,16 +45,16 @@ import org.picketlink.identity.federation.core.wstrust.plugins.saml.SAML20TokenProvider; import org.picketlink.identity.federation.core.wstrust.plugins.saml.SAMLUtil; 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.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.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.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.AttributeType; +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.StatementAbstractType; +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.w3c.dom.Element; /** Modified: federation/trunk/picketlink-bindings-jboss/src/test/java/org/picketlink/test/identity/federation/bindings/jboss/auth/SAML2STSLoginModuleUnitTestCase.java =================================================================== --- federation/trunk/picketlink-bindings-jboss/src/test/java/org/picketlink/test/identity/federation/bindings/jboss/auth/SAML2STSLoginModuleUnitTestCase.java 2011-06-21 20:44:33 UTC (rev 1016) +++ federation/trunk/picketlink-bindings-jboss/src/test/java/org/picketlink/test/identity/federation/bindings/jboss/auth/SAML2STSLoginModuleUnitTestCase.java 2011-06-21 20:46:32 UTC (rev 1017) @@ -52,8 +52,8 @@ import org.picketlink.identity.federation.core.saml.v2.util.AssertionUtil; import org.picketlink.identity.federation.core.saml.v2.util.StatementUtil; import org.picketlink.identity.federation.core.wstrust.SamlCredential; -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.saml.v2.assertion.AssertionType; +import org.picketlink.identity.federation.saml.v2.assertion.NameIDType; /** * Unit Test the {@code SAML2STSLoginModule} Modified: federation/trunk/picketlink-bindings-jboss/src/test/java/org/picketlink/test/identity/federation/bindings/jboss/auth/STSMappingProviderUnitTestCase.java =================================================================== --- federation/trunk/picketlink-bindings-jboss/src/test/java/org/picketlink/test/identity/federation/bindings/jboss/auth/STSMappingProviderUnitTestCase.java 2011-06-21 20:44:33 UTC (rev 1016) +++ federation/trunk/picketlink-bindings-jboss/src/test/java/org/picketlink/test/identity/federation/bindings/jboss/auth/STSMappingProviderUnitTestCase.java 2011-06-21 20:46:32 UTC (rev 1017) @@ -37,13 +37,13 @@ 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.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.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.NameIDType; +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.Element; /** Modified: federation/trunk/picketlink-fed-api/src/main/java/org/picketlink/identity/federation/api/saml/v2/metadata/KeyDescriptorMetaDataBuilder.java =================================================================== --- federation/trunk/picketlink-fed-api/src/main/java/org/picketlink/identity/federation/api/saml/v2/metadata/KeyDescriptorMetaDataBuilder.java 2011-06-21 20:44:33 UTC (rev 1016) +++ federation/trunk/picketlink-fed-api/src/main/java/org/picketlink/identity/federation/api/saml/v2/metadata/KeyDescriptorMetaDataBuilder.java 2011-06-21 20:46:32 UTC (rev 1017) @@ -25,8 +25,8 @@ import java.math.BigInteger; -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.KeyDescriptorType; +import org.picketlink.identity.federation.saml.v2.metadata.KeyTypes; import org.picketlink.identity.xmlsec.w3.xmlenc.EncryptionMethodType; import org.picketlink.identity.xmlsec.w3.xmlenc.EncryptionMethodType.EncryptionMethod; import org.w3c.dom.Element; Modified: federation/trunk/picketlink-fed-api/src/main/java/org/picketlink/identity/federation/api/saml/v2/metadata/MetaDataBuilder.java =================================================================== --- federation/trunk/picketlink-fed-api/src/main/java/org/picketlink/identity/federation/api/saml/v2/metadata/MetaDataBuilder.java 2011-06-21 20:44:33 UTC (rev 1016) +++ federation/trunk/picketlink-fed-api/src/main/java/org/picketlink/identity/federation/api/saml/v2/metadata/MetaDataBuilder.java 2011-06-21 20:46:32 UTC (rev 1017) @@ -24,14 +24,14 @@ import java.util.List; import org.picketlink.identity.federation.core.saml.md.providers.MetaDataBuilderDelegate; -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.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.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.OrganizationType; +import org.picketlink.identity.federation.saml.v2.metadata.SPSSODescriptorType; +import org.picketlink.identity.federation.saml.v2.metadata.SSODescriptorType; /** Modified: federation/trunk/picketlink-fed-api/src/main/java/org/picketlink/identity/federation/api/saml/v2/metadata/MetaDataExtractor.java =================================================================== --- federation/trunk/picketlink-fed-api/src/main/java/org/picketlink/identity/federation/api/saml/v2/metadata/MetaDataExtractor.java 2011-06-21 20:44:33 UTC (rev 1016) +++ federation/trunk/picketlink-fed-api/src/main/java/org/picketlink/identity/federation/api/saml/v2/metadata/MetaDataExtractor.java 2011-06-21 20:46:32 UTC (rev 1017) @@ -31,13 +31,13 @@ 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.EndpointType; -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.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.newmodel.saml.v2.metadata.SSODescriptorType; +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.SPSSODescriptorType; +import org.picketlink.identity.federation.saml.v2.metadata.SSODescriptorType; /** Modified: federation/trunk/picketlink-fed-api/src/main/java/org/picketlink/identity/federation/api/saml/v2/request/SAML2Request.java =================================================================== --- federation/trunk/picketlink-fed-api/src/main/java/org/picketlink/identity/federation/api/saml/v2/request/SAML2Request.java 2011-06-21 20:44:33 UTC (rev 1016) +++ federation/trunk/picketlink-fed-api/src/main/java/org/picketlink/identity/federation/api/saml/v2/request/SAML2Request.java 2011-06-21 20:46:32 UTC (rev 1017) @@ -45,13 +45,13 @@ import org.picketlink.identity.federation.core.saml.v2.writers.SAMLRequestWriter; 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.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.NameIDPolicyType; -import org.picketlink.identity.federation.newmodel.saml.v2.protocol.RequestAbstractType; -import org.picketlink.identity.federation.newmodel.saml.v2.protocol.ResponseType; import org.picketlink.identity.federation.saml.v2.SAML2Object; +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.RequestAbstractType; +import org.picketlink.identity.federation.saml.v2.protocol.ResponseType; import org.w3c.dom.Document; import org.xml.sax.SAXException; Modified: federation/trunk/picketlink-fed-api/src/main/java/org/picketlink/identity/federation/api/saml/v2/response/SAML2Response.java =================================================================== --- federation/trunk/picketlink-fed-api/src/main/java/org/picketlink/identity/federation/api/saml/v2/response/SAML2Response.java 2011-06-21 20:44:33 UTC (rev 1016) +++ federation/trunk/picketlink-fed-api/src/main/java/org/picketlink/identity/federation/api/saml/v2/response/SAML2Response.java 2011-06-21 20:46:32 UTC (rev 1017) @@ -55,22 +55,22 @@ import org.picketlink.identity.federation.core.saml.v2.writers.SAMLResponseWriter; import org.picketlink.identity.federation.core.sts.PicketLinkCoreSTS; import org.picketlink.identity.federation.core.util.StaxUtil; -import org.picketlink.identity.federation.newmodel.saml.v2.assertion.ActionType; -import org.picketlink.identity.federation.newmodel.saml.v2.assertion.AssertionType; -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.AuthzDecisionStatementType; -import org.picketlink.identity.federation.newmodel.saml.v2.assertion.DecisionType; -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.EvidenceType; -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.protocol.ResponseType; -import org.picketlink.identity.federation.newmodel.saml.v2.protocol.StatusResponseType; import org.picketlink.identity.federation.saml.v2.SAML2Object; +import org.picketlink.identity.federation.saml.v2.assertion.ActionType; +import org.picketlink.identity.federation.saml.v2.assertion.AssertionType; +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.AuthzDecisionStatementType; +import org.picketlink.identity.federation.saml.v2.assertion.DecisionType; +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.EvidenceType; +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.protocol.ResponseType; +import org.picketlink.identity.federation.saml.v2.protocol.StatusResponseType; import org.w3c.dom.Document; import org.w3c.dom.Element; import org.w3c.dom.Node; Modified: federation/trunk/picketlink-fed-api/src/main/java/org/picketlink/identity/federation/api/saml/v2/sig/SAML2Signature.java =================================================================== --- federation/trunk/picketlink-fed-api/src/main/java/org/picketlink/identity/federation/api/saml/v2/sig/SAML2Signature.java 2011-06-21 20:44:33 UTC (rev 1016) +++ federation/trunk/picketlink-fed-api/src/main/java/org/picketlink/identity/federation/api/saml/v2/sig/SAML2Signature.java 2011-06-21 20:46:32 UTC (rev 1017) @@ -41,8 +41,8 @@ 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.util.XMLSignatureUtil; -import org.picketlink.identity.federation.newmodel.saml.v2.protocol.RequestAbstractType; -import org.picketlink.identity.federation.newmodel.saml.v2.protocol.ResponseType; +import org.picketlink.identity.federation.saml.v2.protocol.RequestAbstractType; +import org.picketlink.identity.federation.saml.v2.protocol.ResponseType; import org.w3c.dom.Document; import org.w3c.dom.Node; import org.xml.sax.SAXException; Modified: federation/trunk/picketlink-fed-api/src/main/java/org/picketlink/identity/federation/api/soap/SOAPSAMLXACML.java =================================================================== --- federation/trunk/picketlink-fed-api/src/main/java/org/picketlink/identity/federation/api/soap/SOAPSAMLXACML.java 2011-06-21 20:44:33 UTC (rev 1016) +++ federation/trunk/picketlink-fed-api/src/main/java/org/picketlink/identity/federation/api/soap/SOAPSAMLXACML.java 2011-06-21 20:46:32 UTC (rev 1017) @@ -49,11 +49,11 @@ import org.picketlink.identity.federation.core.saml.v2.writers.SAMLRequestWriter; import org.picketlink.identity.federation.core.util.SOAPUtil; 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.NameIDType; -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; +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.profiles.xacml.assertion.XACMLAuthzDecisionStatementType; +import org.picketlink.identity.federation.saml.v2.protocol.ResponseType; +import org.picketlink.identity.federation.saml.v2.protocol.XACMLAuthzDecisionQueryType; import org.w3c.dom.Document; import org.w3c.dom.Element; import org.w3c.dom.Node; Modified: federation/trunk/picketlink-fed-api/src/test/java/org/picketlink/test/identity/federation/api/saml/v2/DeflateEncodingDecodingUnitTestCase.java =================================================================== --- federation/trunk/picketlink-fed-api/src/test/java/org/picketlink/test/identity/federation/api/saml/v2/DeflateEncodingDecodingUnitTestCase.java 2011-06-21 20:44:33 UTC (rev 1016) +++ federation/trunk/picketlink-fed-api/src/test/java/org/picketlink/test/identity/federation/api/saml/v2/DeflateEncodingDecodingUnitTestCase.java 2011-06-21 20:46:32 UTC (rev 1017) @@ -32,7 +32,7 @@ import org.picketlink.identity.federation.api.util.DeflateUtil; import org.picketlink.identity.federation.core.saml.v2.common.IDGenerator; import org.picketlink.identity.federation.core.util.Base64; -import org.picketlink.identity.federation.newmodel.saml.v2.protocol.AuthnRequestType; +import org.picketlink.identity.federation.saml.v2.protocol.AuthnRequestType; /** * Unit test the DEFLATE compression Modified: federation/trunk/picketlink-fed-api/src/test/java/org/picketlink/test/identity/federation/api/saml/v2/SAML2AuthnRequestUnitTestCase.java =================================================================== --- federation/trunk/picketlink-fed-api/src/test/java/org/picketlink/test/identity/federation/api/saml/v2/SAML2AuthnRequestUnitTestCase.java 2011-06-21 20:44:33 UTC (rev 1016) +++ federation/trunk/picketlink-fed-api/src/test/java/org/picketlink/test/identity/federation/api/saml/v2/SAML2AuthnRequestUnitTestCase.java 2011-06-21 20:46:32 UTC (rev 1017) @@ -32,15 +32,15 @@ import org.junit.Test; import org.picketlink.identity.federation.api.saml.v2.request.SAML2Request; import org.picketlink.identity.federation.core.saml.v2.common.IDGenerator; -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.SubjectType; -import org.picketlink.identity.federation.newmodel.saml.v2.assertion.SubjectType.STSubType; -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.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.SubjectType; +import org.picketlink.identity.federation.saml.v2.assertion.SubjectType.STSubType; +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; import org.w3c.dom.Element; Modified: federation/trunk/picketlink-fed-api/src/test/java/org/picketlink/test/identity/federation/api/saml/v2/SAML2AuthnResponseUnitTestCase.java =================================================================== --- federation/trunk/picketlink-fed-api/src/test/java/org/picketlink/test/identity/federation/api/saml/v2/SAML2AuthnResponseUnitTestCase.java 2011-06-21 20:44:33 UTC (rev 1016) +++ federation/trunk/picketlink-fed-api/src/test/java/org/picketlink/test/identity/federation/api/saml/v2/SAML2AuthnResponseUnitTestCase.java 2011-06-21 20:46:32 UTC (rev 1017) @@ -33,7 +33,7 @@ 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.sts.PicketLinkCoreSTS; -import org.picketlink.identity.federation.newmodel.saml.v2.protocol.ResponseType; +import org.picketlink.identity.federation.saml.v2.protocol.ResponseType; /** Modified: federation/trunk/picketlink-fed-api/src/test/java/org/picketlink/test/identity/federation/api/saml/v2/SAML2RequestUnitTestCase.java =================================================================== --- federation/trunk/picketlink-fed-api/src/test/java/org/picketlink/test/identity/federation/api/saml/v2/SAML2RequestUnitTestCase.java 2011-06-21 20:44:33 UTC (rev 1016) +++ federation/trunk/picketlink-fed-api/src/test/java/org/picketlink/test/identity/federation/api/saml/v2/SAML2RequestUnitTestCase.java 2011-06-21 20:46:32 UTC (rev 1017) @@ -24,7 +24,7 @@ import junit.framework.TestCase; import org.picketlink.identity.federation.api.saml.v2.request.SAML2Request; -import org.picketlink.identity.federation.newmodel.saml.v2.protocol.LogoutRequestType; +import org.picketlink.identity.federation.saml.v2.protocol.LogoutRequestType; /** Modified: federation/trunk/picketlink-fed-api/src/test/java/org/picketlink/test/identity/federation/api/saml/v2/SignatureValidationUnitTestCase.java =================================================================== --- federation/trunk/picketlink-fed-api/src/test/java/org/picketlink/test/identity/federation/api/saml/v2/SignatureValidationUnitTestCase.java 2011-06-21 20:44:33 UTC (rev 1016) +++ federation/trunk/picketlink-fed-api/src/test/java/org/picketlink/test/identity/federation/api/saml/v2/SignatureValidationUnitTestCase.java 2011-06-21 20:46:32 UTC (rev 1017) @@ -41,10 +41,10 @@ import org.picketlink.identity.federation.core.saml.v2.util.SignatureUtil; import org.picketlink.identity.federation.core.saml.v2.util.XMLTimeUtil; 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.AuthnStatementType; -import org.picketlink.identity.federation.newmodel.saml.v2.protocol.AuthnRequestType; -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.AuthnStatementType; +import org.picketlink.identity.federation.saml.v2.protocol.AuthnRequestType; +import org.picketlink.identity.federation.saml.v2.protocol.ResponseType; import org.w3c.dom.Document; import org.w3c.dom.Node; Modified: federation/trunk/picketlink-fed-api/src/test/java/org/picketlink/test/identity/federation/api/saml/v2/metadata/KeyDescriptorMetaDataBuilderUnitTestCase.java =================================================================== --- federation/trunk/picketlink-fed-api/src/test/java/org/picketlink/test/identity/federation/api/saml/v2/metadata/KeyDescriptorMetaDataBuilderUnitTestCase.java 2011-06-21 20:44:33 UTC (rev 1016) +++ federation/trunk/picketlink-fed-api/src/test/java/org/picketlink/test/identity/federation/api/saml/v2/metadata/KeyDescriptorMetaDataBuilderUnitTestCase.java 2011-06-21 20:46:32 UTC (rev 1017) @@ -26,7 +26,7 @@ import org.junit.Test; import org.picketlink.identity.federation.api.saml.v2.metadata.KeyDescriptorMetaDataBuilder; import org.picketlink.identity.federation.api.w3.xmldsig.KeyInfoBuilder; -import org.picketlink.identity.federation.newmodel.saml.v2.metadata.KeyDescriptorType; +import org.picketlink.identity.federation.saml.v2.metadata.KeyDescriptorType; import org.w3c.dom.Element; Modified: federation/trunk/picketlink-fed-api/src/test/java/org/picketlink/test/identity/federation/api/saml/v2/metadata/MetaDataBuilderUnitTestCase.java =================================================================== --- federation/trunk/picketlink-fed-api/src/test/java/org/picketlink/test/identity/federation/api/saml/v2/metadata/MetaDataBuilderUnitTestCase.java 2011-06-21 20:44:33 UTC (rev 1016) +++ federation/trunk/picketlink-fed-api/src/test/java/org/picketlink/test/identity/federation/api/saml/v2/metadata/MetaDataBuilderUnitTestCase.java 2011-06-21 20:46:32 UTC (rev 1017) @@ -32,13 +32,13 @@ import org.picketlink.identity.federation.api.saml.v2.metadata.MetaDataBuilder; import org.picketlink.identity.federation.api.w3.xmldsig.KeyInfoBuilder; 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.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.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.IDPSSODescriptorType; +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; import org.w3c.dom.Element; /** Modified: federation/trunk/picketlink-fed-api/src/test/java/org/picketlink/test/identity/federation/api/util/XMLEncryptionUnitTestCase.java =================================================================== --- federation/trunk/picketlink-fed-api/src/test/java/org/picketlink/test/identity/federation/api/util/XMLEncryptionUnitTestCase.java 2011-06-21 20:44:33 UTC (rev 1016) +++ federation/trunk/picketlink-fed-api/src/test/java/org/picketlink/test/identity/federation/api/util/XMLEncryptionUnitTestCase.java 2011-06-21 20:46:32 UTC (rev 1017) @@ -45,11 +45,11 @@ import org.picketlink.identity.federation.core.saml.v2.util.StatementUtil; import org.picketlink.identity.federation.core.sts.PicketLinkCoreSTS; import org.picketlink.identity.federation.core.util.XMLEncryptionUtil; -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.EncryptedAssertionType; -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.AttributeStatementType; +import org.picketlink.identity.federation.saml.v2.assertion.EncryptedAssertionType; +import org.picketlink.identity.federation.saml.v2.protocol.ResponseType; +import org.picketlink.identity.federation.saml.v2.protocol.ResponseType.RTChoiceType; import org.w3c.dom.Document; import org.w3c.dom.Element; import org.w3c.dom.Node; Modified: federation/trunk/picketlink-web/src/main/java/org/picketlink/identity/federation/web/filters/SPFilter.java =================================================================== --- federation/trunk/picketlink-web/src/main/java/org/picketlink/identity/federation/web/filters/SPFilter.java 2011-06-21 20:44:33 UTC (rev 1016) +++ federation/trunk/picketlink-web/src/main/java/org/picketlink/identity/federation/web/filters/SPFilter.java 2011-06-21 20:46:32 UTC (rev 1017) @@ -93,18 +93,18 @@ import org.picketlink.identity.federation.core.util.CoreConfigUtil; import org.picketlink.identity.federation.core.util.StringUtil; 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.NameIDType; -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.RequestAbstractType; -import org.picketlink.identity.federation.newmodel.saml.v2.protocol.ResponseType; -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.SAML2Object; +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.NameIDType; +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.protocol.AuthnRequestType; +import org.picketlink.identity.federation.saml.v2.protocol.RequestAbstractType; +import org.picketlink.identity.federation.saml.v2.protocol.ResponseType; +import org.picketlink.identity.federation.saml.v2.protocol.StatusResponseType; +import org.picketlink.identity.federation.saml.v2.protocol.StatusType; import org.picketlink.identity.federation.web.constants.GeneralConstants; import org.picketlink.identity.federation.web.core.HTTPContext; import org.picketlink.identity.federation.web.interfaces.IRoleValidator; @@ -734,7 +734,7 @@ if(JBossSAMLURIConstants.STATUS_SUCCESS.get().equals(statusValue) == false) throw new SecurityException("IDP forbid the user"); - List<org.picketlink.identity.federation.newmodel.saml.v2.protocol.ResponseType.RTChoiceType> assertions = responseType.getAssertions(); + List<org.picketlink.identity.federation.saml.v2.protocol.ResponseType.RTChoiceType> assertions = responseType.getAssertions(); if(assertions.size() == 0) throw new IllegalStateException("No assertions in reply from IDP"); Modified: federation/trunk/picketlink-web/src/main/java/org/picketlink/identity/federation/web/handlers/saml2/RolesGenerationHandler.java =================================================================== --- federation/trunk/picketlink-web/src/main/java/org/picketlink/identity/federation/web/handlers/saml2/RolesGenerationHandler.java 2011-06-21 20:44:33 UTC (rev 1016) +++ federation/trunk/picketlink-web/src/main/java/org/picketlink/identity/federation/web/handlers/saml2/RolesGenerationHandler.java 2011-06-21 20:46:32 UTC (rev 1017) @@ -36,7 +36,7 @@ import org.picketlink.identity.federation.core.saml.v2.interfaces.SAML2HandlerConfig; import org.picketlink.identity.federation.core.saml.v2.interfaces.SAML2HandlerRequest; import org.picketlink.identity.federation.core.saml.v2.interfaces.SAML2HandlerResponse; -import org.picketlink.identity.federation.newmodel.saml.v2.protocol.LogoutRequestType; +import org.picketlink.identity.federation.saml.v2.protocol.LogoutRequestType; import org.picketlink.identity.federation.web.constants.GeneralConstants; import org.picketlink.identity.federation.web.core.HTTPContext; Modified: federation/trunk/picketlink-web/src/main/java/org/picketlink/identity/federation/web/handlers/saml2/SAML2AttributeHandler.java =================================================================== --- federation/trunk/picketlink-web/src/main/java/org/picketlink/identity/federation/web/handlers/saml2/SAML2AttributeHandler.java 2011-06-21 20:44:33 UTC (rev 1016) +++ federation/trunk/picketlink-web/src/main/java/org/picketlink/identity/federation/web/handlers/saml2/SAML2AttributeHandler.java 2011-06-21 20:46:32 UTC (rev 1017) @@ -41,12 +41,12 @@ import org.picketlink.identity.federation.core.saml.v2.interfaces.SAML2HandlerRequest; import org.picketlink.identity.federation.core.saml.v2.interfaces.SAML2HandlerResponse; 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.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.StatementAbstractType; -import org.picketlink.identity.federation.newmodel.saml.v2.protocol.LogoutRequestType; +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.StatementAbstractType; +import org.picketlink.identity.federation.saml.v2.assertion.AttributeStatementType.ASTChoiceType; +import org.picketlink.identity.federation.saml.v2.protocol.LogoutRequestType; import org.picketlink.identity.federation.web.constants.GeneralConstants; import org.picketlink.identity.federation.web.core.HTTPContext; Modified: federation/trunk/picketlink-web/src/main/java/org/picketlink/identity/federation/web/handlers/saml2/SAML2AuthenticationHandler.java =================================================================== --- federation/trunk/picketlink-web/src/main/java/org/picketlink/identity/federation/web/handlers/saml2/SAML2AuthenticationHandler.java 2011-06-21 20:44:33 UTC (rev 1016) +++ federation/trunk/picketlink-web/src/main/java/org/picketlink/identity/federation/web/handlers/saml2/SAML2AuthenticationHandler.java 2011-06-21 20:46:32 UTC (rev 1017) @@ -57,20 +57,20 @@ import org.picketlink.identity.federation.core.saml.v2.util.XMLTimeUtil; import org.picketlink.identity.federation.core.util.StringUtil; import org.picketlink.identity.federation.core.util.XMLEncryptionUtil; -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.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.newmodel.saml.v2.protocol.AuthnRequestType; -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.AuthnStatementType; +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.SubjectType; +import org.picketlink.identity.federation.saml.v2.assertion.AttributeStatementType.ASTChoiceType; +import org.picketlink.identity.federation.saml.v2.assertion.SubjectType.STSubType; +import org.picketlink.identity.federation.saml.v2.protocol.AuthnRequestType; +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; import org.picketlink.identity.federation.web.constants.GeneralConstants; import org.picketlink.identity.federation.web.core.HTTPContext; import org.picketlink.identity.federation.web.core.IdentityServer; Modified: federation/trunk/picketlink-web/src/main/java/org/picketlink/identity/federation/web/handlers/saml2/SAML2LogOutHandler.java =================================================================== --- federation/trunk/picketlink-web/src/main/java/org/picketlink/identity/federation/web/handlers/saml2/SAML2LogOutHandler.java 2011-06-21 20:44:33 UTC (rev 1016) +++ federation/trunk/picketlink-web/src/main/java/org/picketlink/identity/federation/web/handlers/saml2/SAML2LogOutHandler.java 2011-06-21 20:46:32 UTC (rev 1017) @@ -44,13 +44,13 @@ import org.picketlink.identity.federation.core.saml.v2.interfaces.SAML2HandlerResponse; import org.picketlink.identity.federation.core.saml.v2.util.XMLTimeUtil; 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.protocol.LogoutRequestType; -import org.picketlink.identity.federation.newmodel.saml.v2.protocol.ResponseType; -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.SAML2Object; +import org.picketlink.identity.federation.saml.v2.assertion.AssertionType; +import org.picketlink.identity.federation.saml.v2.protocol.LogoutRequestType; +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.StatusResponseType; +import org.picketlink.identity.federation.saml.v2.protocol.StatusType; import org.picketlink.identity.federation.web.constants.GeneralConstants; import org.picketlink.identity.federation.web.core.HTTPContext; import org.picketlink.identity.federation.web.core.IdentityServer; Modified: federation/trunk/picketlink-web/src/main/java/org/picketlink/identity/federation/web/process/SAMLHandlerChainProcessor.java =================================================================== --- federation/trunk/picketlink-web/src/main/java/org/picketlink/identity/federation/web/process/SAMLHandlerChainProcessor.java 2011-06-21 20:44:33 UTC (rev 1016) +++ federation/trunk/picketlink-web/src/main/java/org/picketlink/identity/federation/web/process/SAMLHandlerChainProcessor.java 2011-06-21 20:46:32 UTC (rev 1017) @@ -30,8 +30,8 @@ import org.picketlink.identity.federation.core.saml.v2.interfaces.SAML2Handler; import org.picketlink.identity.federation.core.saml.v2.interfaces.SAML2HandlerRequest; import org.picketlink.identity.federation.core.saml.v2.interfaces.SAML2HandlerResponse; -import org.picketlink.identity.federation.newmodel.saml.v2.protocol.RequestAbstractType; import org.picketlink.identity.federation.saml.v2.SAML2Object; +import org.picketlink.identity.federation.saml.v2.protocol.RequestAbstractType; import org.picketlink.identity.federation.web.core.HTTPContext; /** Modified: federation/trunk/picketlink-web/src/main/java/org/picketlink/identity/federation/web/process/ServiceProviderSAMLResponseProcessor.java =================================================================== --- federation/trunk/picketlink-web/src/main/java/org/picketlink/identity/federation/web/process/ServiceProviderSAMLResponseProcessor.java 2011-06-21 20:44:33 UTC (rev 1016) +++ federation/trunk/picketlink-web/src/main/java/org/picketlink/identity/federation/web/process/ServiceProviderSAMLResponseProcessor.java 2011-06-21 20:46:32 UTC (rev 1017) @@ -48,8 +48,8 @@ import org.picketlink.identity.federation.core.saml.v2.interfaces.SAML2HandlerResponse; import org.picketlink.identity.federation.core.util.CoreConfigUtil; import org.picketlink.identity.federation.core.util.XMLSignatureUtil; -import org.picketlink.identity.federation.newmodel.saml.v2.protocol.StatusResponseType; import org.picketlink.identity.federation.saml.v2.SAML2Object; +import org.picketlink.identity.federation.saml.v2.protocol.StatusResponseType; import org.picketlink.identity.federation.web.constants.GeneralConstants; import org.picketlink.identity.federation.web.core.HTTPContext; import org.picketlink.identity.federation.web.util.PostBindingUtil; Modified: federation/trunk/picketlink-web/src/main/java/org/picketlink/identity/federation/web/servlets/IDPServlet.java =================================================================== --- federation/trunk/picketlink-web/src/main/java/org/picketlink/identity/federation/web/servlets/IDPServlet.java 2011-06-21 20:44:33 UTC (rev 1016) +++ federation/trunk/picketlink-web/src/main/java/org/picketlink/identity/federation/web/servlets/IDPServlet.java 2011-06-21 20:46:32 UTC (rev 1017) @@ -78,9 +78,9 @@ import org.picketlink.identity.federation.core.util.CoreConfigUtil; import org.picketlink.identity.federation.core.util.StringUtil; import org.picketlink.identity.federation.core.util.XMLSignatureUtil; -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.SAML2Object; +import org.picketlink.identity.federation.saml.v2.protocol.RequestAbstractType; +import org.picketlink.identity.federation.saml.v2.protocol.StatusResponseType; import org.picketlink.identity.federation.web.constants.GeneralConstants; import org.picketlink.identity.federation.web.core.HTTPContext; import org.picketlink.identity.federation.web.core.IdentityParticipantStack; Modified: federation/trunk/picketlink-web/src/main/java/org/picketlink/identity/federation/web/servlets/saml/CircleOfTrustServlet.java =================================================================== --- federation/trunk/picketlink-web/src/main/java/org/picketlink/identity/federation/web/servlets/saml/CircleOfTrustServlet.java 2011-06-21 20:44:33 UTC (rev 1016) +++ federation/trunk/picketlink-web/src/main/java/org/picketlink/identity/federation/web/servlets/saml/CircleOfTrustServlet.java 2011-06-21 20:46:32 UTC (rev 1017) @@ -36,7 +36,7 @@ import org.picketlink.identity.federation.core.saml.v2.metadata.store.FileBasedMetadataConfigurationStore; import org.picketlink.identity.federation.core.saml.v2.metadata.store.IMetadataConfigurationStore; -import org.picketlink.identity.federation.newmodel.saml.v2.metadata.EntityDescriptorType; +import org.picketlink.identity.federation.saml.v2.metadata.EntityDescriptorType; /** * Circle of trust establishing servlet that accesses Modified: federation/trunk/picketlink-web/src/main/java/org/picketlink/identity/federation/web/servlets/saml/MetadataServlet.java =================================================================== --- federation/trunk/picketlink-web/src/main/java/org/picketlink/identity/federation/web/servlets/saml/MetadataServlet.java 2011-06-21 20:44:33 UTC (rev 1016) +++ federation/trunk/picketlink-web/src/main/java/org/picketlink/identity/federation/web/servlets/saml/MetadataServlet.java 2011-06-21 20:46:32 UTC (rev 1017) @@ -55,10 +55,10 @@ import org.picketlink.identity.federation.core.util.CoreConfigUtil; import org.picketlink.identity.federation.core.util.StaxUtil; import org.picketlink.identity.federation.core.util.XMLEncryptionUtil; -import org.picketlink.identity.federation.newmodel.saml.v2.metadata.EntityDescriptorType; -import org.picketlink.identity.federation.newmodel.saml.v2.metadata.EntityDescriptorType.EDTDescriptorChoiceType; -import org.picketlink.identity.federation.newmodel.saml.v2.metadata.KeyDescriptorType; -import org.picketlink.identity.federation.newmodel.saml.v2.metadata.RoleDescriptorType; +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.RoleDescriptorType; +import org.picketlink.identity.federation.saml.v2.metadata.EntityDescriptorType.EDTDescriptorChoiceType; import org.picketlink.identity.federation.web.constants.GeneralConstants; import org.picketlink.identity.federation.web.util.ConfigurationUtil; import org.w3c.dom.Element; Modified: federation/trunk/picketlink-web/src/main/java/org/picketlink/identity/federation/web/servlets/saml/SOAPSAMLXACMLServlet.java =================================================================== --- federation/trunk/picketlink-web/src/main/java/org/picketlink/identity/federation/web/servlets/saml/SOAPSAMLXACMLServlet.java 2011-06-21 20:44:33 UTC (rev 1016) +++ federation/trunk/picketlink-web/src/main/java/org/picketlink/identity/federation/web/servlets/saml/SOAPSAMLXACMLServlet.java 2011-06-21 20:46:32 UTC (rev 1017) @@ -52,7 +52,7 @@ import org.picketlink.identity.federation.core.saml.v2.writers.SAMLResponseWriter; import org.picketlink.identity.federation.core.util.SOAPUtil; 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.saml.v2.protocol.XACMLAuthzDecisionQueryType; import org.w3c.dom.Document; import org.w3c.dom.Node; import org.w3c.dom.NodeList; @@ -228,7 +228,7 @@ if (xacmlRequest == null) throw new IOException("XACML Request not parsed"); - org.picketlink.identity.federation.newmodel.saml.v2.protocol.ResponseType samlResponseType = SOAPSAMLXACMLUtil + org.picketlink.identity.federation.saml.v2.protocol.ResponseType samlResponseType = SOAPSAMLXACMLUtil .handleXACMLQuery(pdp, issuer, xacmlRequest); /*RequestType requestType = xacmlRequest.getRequest(); Modified: federation/trunk/picketlink-web/src/main/java/org/picketlink/identity/federation/web/util/IDPWebRequestUtil.java =================================================================== --- federation/trunk/picketlink-web/src/main/java/org/picketlink/identity/federation/web/util/IDPWebRequestUtil.java 2011-06-21 20:44:33 UTC (rev 1016) +++ federation/trunk/picketlink-web/src/main/java/org/picketlink/identity/federation/web/util/IDPWebRequestUtil.java 2011-06-21 20:46:32 UTC (rev 1017) @@ -56,8 +56,8 @@ 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.DocumentUtil; -import org.picketlink.identity.federation.newmodel.saml.v2.protocol.RequestAbstractType; -import org.picketlink.identity.federation.newmodel.saml.v2.protocol.ResponseType; +import org.picketlink.identity.federation.saml.v2.protocol.RequestAbstractType; +import org.picketlink.identity.federation.saml.v2.protocol.ResponseType; import org.w3c.dom.Document; /** Modified: federation/trunk/picketlink-web/src/main/java/org/picketlink/identity/federation/web/util/RedirectBindingSignatureUtil.java =================================================================== --- federation/trunk/picketlink-web/src/main/java/org/picketlink/identity/federation/web/util/RedirectBindingSignatureUtil.java 2011-06-21 20:44:33 UTC (rev 1016) +++ federation/trunk/picketlink-web/src/main/java/org/picketlink/identity/federation/web/util/RedirectBindingSignatureUtil.java 2011-06-21 20:46:32 UTC (rev 1017) @@ -38,8 +38,8 @@ import org.picketlink.identity.federation.core.exceptions.ProcessingException; import org.picketlink.identity.federation.core.saml.v2.util.DocumentUtil; import org.picketlink.identity.federation.core.saml.v2.util.SignatureUtil; -import org.picketlink.identity.federation.newmodel.saml.v2.protocol.AuthnRequestType; -import org.picketlink.identity.federation.newmodel.saml.v2.protocol.ResponseType; +import org.picketlink.identity.federation.saml.v2.protocol.AuthnRequestType; +import org.picketlink.identity.federation.saml.v2.protocol.ResponseType; import org.picketlink.identity.federation.web.constants.GeneralConstants; import org.w3c.dom.Document; import org.xml.sax.SAXException; Modified: federation/trunk/picketlink-web/src/test/java/org/picketlink/test/identity/federation/web/saml/handlers/SAML2AttributeHandlerUnitTestCase.java =================================================================== --- federation/trunk/picketlink-web/src/test/java/org/picketlink/test/identity/federation/web/saml/handlers/SAML2AttributeHandlerUnitTestCase.java 2011-06-21 20:44:33 UTC (rev 1016) +++ federation/trunk/picketlink-web/src/test/java/org/picketlink/test/identity/federation/web/saml/handlers/SAML2AttributeHandlerUnitTestCase.java 2011-06-21 20:46:32 UTC (rev 1017) @@ -49,9 +49,9 @@ import org.picketlink.identity.federation.core.saml.v2.interfaces.SAML2HandlerResponse; import org.picketlink.identity.federation.core.saml.v2.util.StatementUtil; 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.saml.v2.SAML2Object; +import org.picketlink.identity.federation.saml.v2.assertion.AssertionType; +import org.picketlink.identity.federation.saml.v2.assertion.AttributeStatementType; import org.picketlink.identity.federation.web.constants.GeneralConstants; import org.picketlink.identity.federation.web.core.HTTPContext; import org.picketlink.identity.federation.web.handlers.saml2.SAML2AttributeHandler; Modified: federation/trunk/picketlink-web/src/test/java/org/picketlink/test/identity/federation/web/saml/handlers/SAML2AuthenticationHandlerUnitTestCase.java =================================================================== --- federation/trunk/picketlink-web/src/test/java/org/picketlink/test/identity/federation/web/saml/handlers/SAML2AuthenticationHandlerUnitTestCase.java 2011-06-21 20:44:33 UTC (rev 1016) +++ federation/trunk/picketlink-web/src/test/java/org/picketlink/test/identity/federation/web/saml/handlers/SAML2AuthenticationHandlerUnitTestCase.java 2011-06-21 20:46:32 UTC (rev 1017) @@ -57,14 +57,14 @@ import org.picketlink.identity.federation.core.util.KeyStoreUtil; import org.picketlink.identity.federation.core.util.XMLEncryptionUtil; import org.picketlink.identity.federation.core.wstrust.WSTrustUtil; -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.newmodel.saml.v2.assertion.SubjectType.STSubType; -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.ResponseType; import org.picketlink.identity.federation.saml.v2.SAML2Object; +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.saml.v2.assertion.SubjectType.STSubType; +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.ResponseType; import org.picketlink.identity.federation.web.constants.GeneralConstants; import org.picketlink.identity.federation.web.core.HTTPContext; import org.picketlink.identity.federation.web.handlers.saml2.SAML2AuthenticationHandler; Modified: federation/trunk/picketlink-web/src/test/java/org/picketlink/test/identity/federation/web/saml/handlers/SAML2SignatureHandlerUnitTestCase.java =================================================================== --- federation/trunk/picketlink-web/src/test/java/org/picketlink/test/identity/federation/web/saml/handlers/SAML2SignatureHandlerUnitTestCase.java 2011-06-21 20:44:33 UTC (rev 1016) +++ federation/trunk/picketlink-web/src/test/java/org/picketlink/test/identity/federation/web/saml/handlers/SAML2SignatureHandlerUnitTestCase.java 2011-06-21 20:46:32 UTC (rev 1017) @@ -43,7 +43,7 @@ import org.picketlink.identity.federation.core.saml.v2.interfaces.SAML2HandlerRequest; import org.picketlink.identity.federation.core.saml.v2.interfaces.SAML2HandlerRequest.GENERATE_REQUEST_TYPE; import org.picketlink.identity.federation.core.saml.v2.interfaces.SAML2HandlerResponse; -import org.picketlink.identity.federation.newmodel.saml.v2.protocol.AuthnRequestType; +import org.picketlink.identity.federation.saml.v2.protocol.AuthnRequestType; import org.picketlink.identity.federation.web.constants.GeneralConstants; import org.picketlink.identity.federation.web.core.HTTPContext; import org.picketlink.identity.federation.web.handlers.saml2.SAML2AuthenticationHandler; Modified: federation/trunk/picketlink-web/src/test/java/org/picketlink/test/identity/federation/web/workflow/saml2/SAML2LogoutWorkflowUnitTestCase.java =================================================================== --- federation/trunk/picketlink-web/src/test/java/org/picketlink/test/identity/federation/web/workflow/saml2/SAML2LogoutWorkflowUnitTestCase.java 2011-06-21 20:44:33 UTC (rev 1016) +++ federation/trunk/picketlink-web/src/test/java/org/picketlink/test/identity/federation/web/workflow/saml2/SAML2LogoutWorkflowUnitTestCase.java 2011-06-21 20:46:32 UTC (rev 1017) @@ -42,8 +42,8 @@ import org.picketlink.identity.federation.api.saml.v2.request.SAML2Request; import org.picketlink.identity.federation.core.saml.v2.util.DocumentUtil; import org.picketlink.identity.federation.core.util.Base64; -import org.picketlink.identity.federation.newmodel.saml.v2.protocol.LogoutRequestType; import org.picketlink.identity.federation.saml.v2.SAML2Object; +import org.picketlink.identity.federation.saml.v2.protocol.LogoutRequestType; import org.picketlink.identity.federation.web.constants.GeneralConstants; import org.picketlink.identity.federation.web.core.IdentityServer; import org.picketlink.identity.federation.web.filters.SPFilter; Modified: federation/trunk/picketlink-web/src/test/java/org/picketlink/test/identity/federation/web/workflow/saml2/SAML2PostWorkflowUnitTestCase.java =================================================================== --- federation/trunk/picketlink-web/src/test/java/org/picketlink/test/identity/federation/web/workflow/saml2/SAML2PostWorkflowUnitTestCase.java 2011-06-21 20:44:33 UTC (rev 1016) +++ federation/trunk/picketlink-web/src/test/java/org/picketlink/test/identity/federation/web/workflow/saml2/SAML2PostWorkflowUnitTestCase.java 2011-06-21 20:46:32 UTC (rev 1017) @@ -37,8 +37,8 @@ import org.picketlink.identity.federation.core.saml.v2.common.IDGenerator; import org.picketlink.identity.federation.core.saml.v2.util.DocumentUtil; import org.picketlink.identity.federation.core.util.Base64; -import org.picketlink.identity.federation.newmodel.saml.v2.protocol.AuthnRequestType; -import org.picketlink.identity.federation.newmodel.saml.v2.protocol.ResponseType; +import org.picketlink.identity.federation.saml.v2.protocol.AuthnRequestType; +import org.picketlink.identity.federation.saml.v2.protocol.ResponseType; import org.picketlink.identity.federation.web.constants.GeneralConstants; import org.picketlink.identity.federation.web.core.IdentityServer; import org.picketlink.identity.federation.web.filters.SPFilter;

13 years, 6 months

1
0
0 / 0

Picketlink SVN: r1015 - federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/metadata.

by picketlink-commits＠lists.jboss.org

Author: anil.saldhana(a)jboss.com Date: 2011-06-21 16:35:05 -0400 (Tue, 21 Jun 2011) New Revision: 1015 Added: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/metadata/AdditionalMetadataLocationType.java federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/metadata/AffiliationDescriptorType.java federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/metadata/AttributeAuthorityDescriptorType.java federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/metadata/AttributeConsumingServiceType.java federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/metadata/AuthnAuthorityDescriptorType.java federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/metadata/ContactType.java federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/metadata/ContactTypeType.java federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/metadata/EndpointType.java federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/metadata/EntitiesDescriptorType.java federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/metadata/EntityDescriptorType.java federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/metadata/ExtensionsType.java federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/metadata/IDPSSODescriptorType.java federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/metadata/IndexedEndpointType.java federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/metadata/KeyDescriptorType.java federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/metadata/KeyTypes.java federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/metadata/LocalizedNameType.java federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/metadata/LocalizedURIType.java federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/metadata/OrganizationType.java federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/metadata/PDPDescriptorType.java federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/metadata/RequestedAttributeType.java federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/metadata/RoleDescriptorType.java federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/metadata/SPSSODescriptorType.java federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/metadata/SSODescriptorType.java federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/metadata/TypeWithOtherAttributes.java federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/metadata/package-info.java Log: move the classes from newmodel to saml pkg Added: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/metadata/AdditionalMetadataLocationType.java =================================================================== --- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/metadata/AdditionalMetadataLocationType.java (rev 0) +++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/metadata/AdditionalMetadataLocationType.java 2011-06-21 20:35:05 UTC (rev 1015) @@ -0,0 +1,79 @@ +package org.picketlink.identity.federation.saml.v2.metadata; + +import java.net.URI; + + +/** + * Java class for AdditionalMetadataLocationType complex type. + * + * The following schema fragment specifies the expected content contained within this class. + * + * <pre> + * <complexType name="AdditionalMetadataLocationType"> + * <simpleContent> + * <extension base="<http://www.w3.org/2001/XMLSchema>anyURI"> + * <attribute name="namespace" use="required" type="{http://www.w3.org/2001/XMLSchema}anyURI" /> + * </extension> + * </simpleContent> + * </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 Property changes on: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/metadata/AdditionalMetadataLocationType.java ___________________________________________________________________ Added: svn:executable + * Added: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/metadata/AffiliationDescriptorType.java =================================================================== --- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/metadata/AffiliationDescriptorType.java (rev 0) +++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/metadata/AffiliationDescriptorType.java 2011-06-21 20:35:05 UTC (rev 1015) @@ -0,0 +1,250 @@ +package org.picketlink.identity.federation.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; + + +/** + * Java class for AffiliationDescriptorType complex type. + * + * The following schema fragment specifies the expected content contained within this class. + * + * <pre> + * <complexType name="AffiliationDescriptorType"> + * <complexContent> + * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> + * <sequence> + * <element ref="{http://www.w3.org/2000/09/xmldsig#}Signature" minOccurs="0"/> + * <element ref="{urn:oasis:names:tc:SAML:2.0:metadata}Extensions" minOccurs="0"/> + * <element ref="{urn:oasis:names:tc:SAML:2.0:metadata}AffiliateMember" maxOccurs="unbounded"/> + * <element ref="{urn:oasis:names:tc:SAML:2.0:metadata}KeyDescriptor" maxOccurs="unbounded" minOccurs="0"/> + * </sequence> + * <attribute name="affiliationOwnerID" use="required" type="{urn:oasis:names:tc:SAML:2.0:metadata}entityIDType" /> + * <attribute name="validUntil" type="{http://www.w3.org/2001/XMLSchema}dateTime" /> + * <attribute name="cacheDuration" type="{http://www.w3.org/2001/XMLSchema}duration" /> + * <attribute name="ID" type="{http://www.w3.org/2001/XMLSchema}ID" /> + * </restriction> + * </complexContent> + * </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. + * + * + * 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. + * + * + * For example, to add a new item, do as follows: + * <pre> + * getAffiliateMember().add(newItem); + * </pre> + * + * + * + * 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. + * + * + * 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. + * + * + * For example, to add a new item, do as follows: + * <pre> + * getKeyDescriptor().add(newItem); + * </pre> + * + * + * + * 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 Property changes on: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/metadata/AffiliationDescriptorType.java ___________________________________________________________________ Added: svn:executable + * Added: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/metadata/AttributeAuthorityDescriptorType.java =================================================================== --- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/metadata/AttributeAuthorityDescriptorType.java (rev 0) +++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/metadata/AttributeAuthorityDescriptorType.java 2011-06-21 20:35:05 UTC (rev 1015) @@ -0,0 +1,201 @@ +package org.picketlink.identity.federation.saml.v2.metadata; + +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; + +import org.picketlink.identity.federation.saml.v2.assertion.AttributeType; + + +/** + * Java class for AttributeAuthorityDescriptorType complex type. + * + * The following schema fragment specifies the expected content contained within this class. + * + * <pre> + * <complexType name="AttributeAuthorityDescriptorType"> + * <complexContent> + * <extension base="{urn:oasis:names:tc:SAML:2.0:metadata}RoleDescriptorType"> + * <sequence> + * <element ref="{urn:oasis:names:tc:SAML:2.0:metadata}AttributeService" maxOccurs="unbounded"/> + * <element ref="{urn:oasis:names:tc:SAML:2.0:metadata}AssertionIDRequestService" maxOccurs="unbounded" minOccurs="0"/> + * <element ref="{urn:oasis:names:tc:SAML:2.0:metadata}NameIDFormat" maxOccurs="unbounded" minOccurs="0"/> + * <element ref="{urn:oasis:names:tc:SAML:2.0:metadata}AttributeProfile" maxOccurs="unbounded" minOccurs="0"/> + * <element ref="{urn:oasis:names:tc:SAML:2.0:assertion}Attribute" maxOccurs="unbounded" minOccurs="0"/> + * </sequence> + * </extension> + * </complexContent> + * </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. + * + * 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. + * + * + * 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. + * + * 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. + * + * 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. + * + * 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 Property changes on: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/metadata/AttributeAuthorityDescriptorType.java ___________________________________________________________________ Added: svn:executable + * Added: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/metadata/AttributeConsumingServiceType.java =================================================================== --- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/metadata/AttributeConsumingServiceType.java (rev 0) +++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/metadata/AttributeConsumingServiceType.java 2011-06-21 20:35:05 UTC (rev 1015) @@ -0,0 +1,200 @@ +package org.picketlink.identity.federation.saml.v2.metadata; + +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; + + +/** + * Java class for AttributeConsumingServiceType complex type. + * + * The following schema fragment specifies the expected content contained within this class. + * + * <pre> + * <complexType name="AttributeConsumingServiceType"> + * <complexContent> + * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> + * <sequence> + * <element ref="{urn:oasis:names:tc:SAML:2.0:metadata}ServiceName" maxOccurs="unbounded"/> + * <element ref="{urn:oasis:names:tc:SAML:2.0:metadata}ServiceDescription" maxOccurs="unbounded" minOccurs="0"/> + * <element ref="{urn:oasis:names:tc:SAML:2.0:metadata}RequestedAttribute" maxOccurs="unbounded"/> + * </sequence> + * <attribute name="index" use="required" type="{http://www.w3.org/2001/XMLSchema}unsignedShort" /> + * <attribute name="isDefault" type="{http://www.w3.org/2001/XMLSchema}boolean" /> + * </restriction> + * </complexContent> + * </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 + * + * Objects of the following type(s) are allowed in the list + * {@link LocalizedNameType } + * + * + */ + public void addServiceName( LocalizedNameType service ) + { + this.serviceName.add(service) ; + } + + /** + * Add serviceDescription. + * + * Objects of the following type(s) are allowed in the list + * {@link LocalizedNameType } + * + * + */ + public void addServiceDescription( LocalizedNameType desc ) + { + this.serviceDescription.add(desc); + } + + /** + * Add requestedAttribute + * + * Objects of the following type(s) are allowed in the list + * {@link RequestedAttributeType } + * + */ + public void addRequestedAttribute( RequestedAttributeType req ) + { + this.requestedAttribute.add(req); + } + + /** + * remove serviceName + * + * Objects of the following type(s) are allowed in the list + * {@link LocalizedNameType } + * + * + */ + public void removeServiceName( LocalizedNameType service ) + { + this.serviceName.remove(service) ; + } + + /** + * remove serviceDescription. + * + * Objects of the following type(s) are allowed in the list + * {@link LocalizedNameType } + * + * + */ + public void removeServiceDescription( LocalizedNameType desc ) + { + this.serviceDescription.remove(desc); + } + + /** + * remove requestedAttribute + * + * 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. + * + * 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. + * + * 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. + * + * 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 Property changes on: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/metadata/AttributeConsumingServiceType.java ___________________________________________________________________ Added: svn:executable + * Added: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/metadata/AuthnAuthorityDescriptorType.java =================================================================== --- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/metadata/AuthnAuthorityDescriptorType.java (rev 0) +++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/metadata/AuthnAuthorityDescriptorType.java 2011-06-21 20:35:05 UTC (rev 1015) @@ -0,0 +1,131 @@ +package org.picketlink.identity.federation.saml.v2.metadata; + +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; + + +/** + * Java class for AuthnAuthorityDescriptorType complex type. + * + * The following schema fragment specifies the expected content contained within this class. + * + * <pre> + * <complexType name="AuthnAuthorityDescriptorType"> + * <complexContent> + * <extension base="{urn:oasis:names:tc:SAML:2.0:metadata}RoleDescriptorType"> + * <sequence> + * <element ref="{urn:oasis:names:tc:SAML:2.0:metadata}AuthnQueryService" maxOccurs="unbounded"/> + * <element ref="{urn:oasis:names:tc:SAML:2.0:metadata}AssertionIDRequestService" maxOccurs="unbounded" minOccurs="0"/> + * <element ref="{urn:oasis:names:tc:SAML:2.0:metadata}NameIDFormat" maxOccurs="unbounded" minOccurs="0"/> + * </sequence> + * </extension> + * </complexContent> + * </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. + * + * 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. + * + * 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. + * + * 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 Property changes on: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/metadata/AuthnAuthorityDescriptorType.java ___________________________________________________________________ Added: svn:executable + * Added: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/metadata/ContactType.java =================================================================== --- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/metadata/ContactType.java (rev 0) +++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/metadata/ContactType.java 2011-06-21 20:35:05 UTC (rev 1015) @@ -0,0 +1,231 @@ +package org.picketlink.identity.federation.saml.v2.metadata; + +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; + + +/** + * Java class for ContactType complex type. + * + * The following schema fragment specifies the expected content contained within this class. + * + * <pre> + * <complexType name="ContactType"> + * <complexContent> + * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> + * <sequence> + * <element ref="{urn:oasis:names:tc:SAML:2.0:metadata}Extensions" minOccurs="0"/> + * <element ref="{urn:oasis:names:tc:SAML:2.0:metadata}Company" minOccurs="0"/> + * <element ref="{urn:oasis:names:tc:SAML:2.0:metadata}GivenName" minOccurs="0"/> + * <element ref="{urn:oasis:names:tc:SAML:2.0:metadata}SurName" minOccurs="0"/> + * <element ref="{urn:oasis:names:tc:SAML:2.0:metadata}EmailAddress" maxOccurs="unbounded" minOccurs="0"/> + * <element ref="{urn:oasis:names:tc:SAML:2.0:metadata}TelephoneNumber" maxOccurs="unbounded" minOccurs="0"/> + * </sequence> + * <attribute name="contactType" use="required" type="{urn:oasis:names:tc:SAML:2.0:metadata}ContactTypeType" /> + * </restriction> + * </complexContent> + * </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. + * + * 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. + * + * 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 Property changes on: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/metadata/ContactType.java ___________________________________________________________________ Added: svn:executable + * Added: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/metadata/ContactTypeType.java =================================================================== --- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/metadata/ContactTypeType.java (rev 0) +++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/metadata/ContactTypeType.java 2011-06-21 20:35:05 UTC (rev 1015) @@ -0,0 +1,49 @@ +package org.picketlink.identity.federation.saml.v2.metadata; + + + +/** + * Java class for ContactTypeType. + * + * The following schema fragment specifies the expected content contained within this class. + * + * <pre> + * <simpleType name="ContactTypeType"> + * <restriction base="{http://www.w3.org/2001/XMLSchema}string"> + * <enumeration value="technical"/> + * <enumeration value="support"/> + * <enumeration value="administrative"/> + * <enumeration value="billing"/> + * <enumeration value="other"/> + * </restriction> + * </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); + } + +} Property changes on: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/metadata/ContactTypeType.java ___________________________________________________________________ Added: svn:executable + * Added: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/metadata/EndpointType.java =================================================================== --- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/metadata/EndpointType.java (rev 0) +++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/metadata/EndpointType.java 2011-06-21 20:35:05 UTC (rev 1015) @@ -0,0 +1,131 @@ +package org.picketlink.identity.federation.saml.v2.metadata; + +import java.net.URI; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; + +import org.w3c.dom.Element; + + +/** + * Java class for EndpointType complex type. + * + * The following schema fragment specifies the expected content contained within this class. + * + * <pre> + * <complexType name="EndpointType"> + * <complexContent> + * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> + * <sequence> + * <any/> + * </sequence> + * <attribute name="Binding" use="required" type="{http://www.w3.org/2001/XMLSchema}anyURI" /> + * <attribute name="Location" use="required" type="{http://www.w3.org/2001/XMLSchema}anyURI" /> + * <attribute name="ResponseLocation" type="{http://www.w3.org/2001/XMLSchema}anyURI" /> + * </restriction> + * </complexContent> + * </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. + * + * 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 Property changes on: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/metadata/EndpointType.java ___________________________________________________________________ Added: svn:executable + * Added: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/metadata/EntitiesDescriptorType.java =================================================================== --- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/metadata/EntitiesDescriptorType.java (rev 0) +++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/metadata/EntitiesDescriptorType.java 2011-06-21 20:35:05 UTC (rev 1015) @@ -0,0 +1,235 @@ +package org.picketlink.identity.federation.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; + + +/** + * Java class for EntitiesDescriptorType complex type. + * + * The following schema fragment specifies the expected content contained within this class. + * + * <pre> + * <complexType name="EntitiesDescriptorType"> + * <complexContent> + * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> + * <sequence> + * <element ref="{http://www.w3.org/2000/09/xmldsig#}Signature" minOccurs="0"/> + * <element ref="{urn:oasis:names:tc:SAML:2.0:metadata}Extensions" minOccurs="0"/> + * <choice maxOccurs="unbounded"> + * <element ref="{urn:oasis:names:tc:SAML:2.0:metadata}EntityDescriptor"/> + * <element ref="{urn:oasis:names:tc:SAML:2.0:metadata}EntitiesDescriptor"/> + * </choice> + * </sequence> + * <attribute name="validUntil" type="{http://www.w3.org/2001/XMLSchema}dateTime" /> + * <attribute name="cacheDuration" type="{http://www.w3.org/2001/XMLSchema}duration" /> + * <attribute name="ID" type="{http://www.w3.org/2001/XMLSchema}ID" /> + * <attribute name="Name" type="{http://www.w3.org/2001/XMLSchema}string" /> + * </restriction> + * </complexContent> + * </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. + * + * 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 Property changes on: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/metadata/EntitiesDescriptorType.java ___________________________________________________________________ Added: svn:executable + * Added: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/metadata/EntityDescriptorType.java =================================================================== --- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/metadata/EntityDescriptorType.java (rev 0) +++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/metadata/EntityDescriptorType.java 2011-06-21 20:35:05 UTC (rev 1015) @@ -0,0 +1,409 @@ +package org.picketlink.identity.federation.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; + + +/** + * Java class for EntityDescriptorType complex type. + * + * The following schema fragment specifies the expected content contained within this class. + * + * <pre> + * <complexType name="EntityDescriptorType"> + * <complexContent> + * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> + * <sequence> + * <element ref="{http://www.w3.org/2000/09/xmldsig#}Signature" minOccurs="0"/> + * <element ref="{urn:oasis:names:tc:SAML:2.0:metadata}Extensions" minOccurs="0"/> + * <choice> + * <choice maxOccurs="unbounded"> + * <element ref="{urn:oasis:names:tc:SAML:2.0:metadata}RoleDescriptor"/> + * <element ref="{urn:oasis:names:tc:SAML:2.0:metadata}IDPSSODescriptor"/> + * <element ref="{urn:oasis:names:tc:SAML:2.0:metadata}SPSSODescriptor"/> + * <element ref="{urn:oasis:names:tc:SAML:2.0:metadata}AuthnAuthorityDescriptor"/> + * <element ref="{urn:oasis:names:tc:SAML:2.0:metadata}AttributeAuthorityDescriptor"/> + * <element ref="{urn:oasis:names:tc:SAML:2.0:metadata}PDPDescriptor"/> + * </choice> + * <element ref="{urn:oasis:names:tc:SAML:2.0:metadata}AffiliationDescriptor"/> + * </choice> + * <element ref="{urn:oasis:names:tc:SAML:2.0:metadata}Organization" minOccurs="0"/> + * <element ref="{urn:oasis:names:tc:SAML:2.0:metadata}ContactPerson" maxOccurs="unbounded" minOccurs="0"/> + * <element ref="{urn:oasis:names:tc:SAML:2.0:metadata}AdditionalMetadataLocation" maxOccurs="unbounded" minOccurs="0"/> + * </sequence> + * <attribute name="entityID" use="required" type="{urn:oasis:names:tc:SAML:2.0:metadata}entityIDType" /> + * <attribute name="validUntil" type="{http://www.w3.org/2001/XMLSchema}dateTime" /> + * <attribute name="cacheDuration" type="{http://www.w3.org/2001/XMLSchema}duration" /> + * <attribute name="ID" type="{http://www.w3.org/2001/XMLSchema}ID" /> + * </restriction> + * </complexContent> + * </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. + * + * 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. + * + * + * 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. + * + * + * For example, to add a new item, do as follows: + * <pre> + * getAdditionalMetadataLocation().add(newItem); + * </pre> + * + * + * + * 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 Property changes on: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/metadata/EntityDescriptorType.java ___________________________________________________________________ Added: svn:executable + * Added: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/metadata/ExtensionsType.java =================================================================== --- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/metadata/ExtensionsType.java (rev 0) +++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/metadata/ExtensionsType.java 2011-06-21 20:35:05 UTC (rev 1015) @@ -0,0 +1,64 @@ +package org.picketlink.identity.federation.saml.v2.metadata; + +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; + +import org.w3c.dom.Element; + + +/** + * Java class for ExtensionsType complex type. + * + * The following schema fragment specifies the expected content contained within this class. + * + * <pre> + * <complexType name="ExtensionsType"> + * <complexContent> + * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> + * <sequence> + * <any/> + * </sequence> + * </restriction> + * </complexContent> + * </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. + * + * 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 Property changes on: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/metadata/ExtensionsType.java ___________________________________________________________________ Added: svn:executable + * Added: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/metadata/IDPSSODescriptorType.java =================================================================== --- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/metadata/IDPSSODescriptorType.java (rev 0) +++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/metadata/IDPSSODescriptorType.java 2011-06-21 20:35:05 UTC (rev 1015) @@ -0,0 +1,237 @@ +package org.picketlink.identity.federation.saml.v2.metadata; + +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; + +import org.picketlink.identity.federation.saml.v2.assertion.AttributeType; + + +/** + * Java class for IDPSSODescriptorType complex type. + * + * The following schema fragment specifies the expected content contained within this class. + * + * <pre> + * <complexType name="IDPSSODescriptorType"> + * <complexContent> + * <extension base="{urn:oasis:names:tc:SAML:2.0:metadata}SSODescriptorType"> + * <sequence> + * <element ref="{urn:oasis:names:tc:SAML:2.0:metadata}SingleSignOnService" maxOccurs="unbounded"/> + * <element ref="{urn:oasis:names:tc:SAML:2.0:metadata}NameIDMappingService" maxOccurs="unbounded" minOccurs="0"/> + * <element ref="{urn:oasis:names:tc:SAML:2.0:metadata}AssertionIDRequestService" maxOccurs="unbounded" minOccurs="0"/> + * <element ref="{urn:oasis:names:tc:SAML:2.0:metadata}AttributeProfile" maxOccurs="unbounded" minOccurs="0"/> + * <element ref="{urn:oasis:names:tc:SAML:2.0:assertion}Attribute" maxOccurs="unbounded" minOccurs="0"/> + * </sequence> + * <attribute name="WantAuthnRequestsSigned" type="{http://www.w3.org/2001/XMLSchema}boolean" /> + * </extension> + * </complexContent> + * </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. + * + * 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. + + * + * 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. + * + * 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. + * + * + * 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. + * + * + * + * 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. + * + * + * 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 Property changes on: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/metadata/IDPSSODescriptorType.java ___________________________________________________________________ Added: svn:executable + * Added: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/metadata/IndexedEndpointType.java =================================================================== --- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/metadata/IndexedEndpointType.java (rev 0) +++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/metadata/IndexedEndpointType.java 2011-06-21 20:35:05 UTC (rev 1015) @@ -0,0 +1,76 @@ +package org.picketlink.identity.federation.saml.v2.metadata; + +import java.net.URI; + + + +/** + * Java class for IndexedEndpointType complex type. + * + * The following schema fragment specifies the expected content contained within this class. + * + * <pre> + * <complexType name="IndexedEndpointType"> + * <complexContent> + * <extension base="{urn:oasis:names:tc:SAML:2.0:metadata}EndpointType"> + * <attribute name="index" use="required" type="{http://www.w3.org/2001/XMLSchema}unsignedShort" /> + * <attribute name="isDefault" type="{http://www.w3.org/2001/XMLSchema}boolean" /> + * </extension> + * </complexContent> + * </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 Property changes on: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/metadata/IndexedEndpointType.java ___________________________________________________________________ Added: svn:executable + * Added: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/metadata/KeyDescriptorType.java =================================================================== --- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/metadata/KeyDescriptorType.java (rev 0) +++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/metadata/KeyDescriptorType.java 2011-06-21 20:35:05 UTC (rev 1015) @@ -0,0 +1,119 @@ + +package org.picketlink.identity.federation.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; + + +/** + * Java class for KeyDescriptorType complex type. + * + * The following schema fragment specifies the expected content contained within this class. + * + * <pre> + * <complexType name="KeyDescriptorType"> + * <complexContent> + * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> + * <sequence> + * <element ref="{http://www.w3.org/2000/09/xmldsig#}KeyInfo"/> + * <element ref="{urn:oasis:names:tc:SAML:2.0:metadata}EncryptionMethod" maxOccurs="unbounded" minOccurs="0"/> + * </sequence> + * <attribute name="use" type="{urn:oasis:names:tc:SAML:2.0:metadata}KeyTypes" /> + * </restriction> + * </complexContent> + * </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. + * + * 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 Property changes on: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/metadata/KeyDescriptorType.java ___________________________________________________________________ Added: svn:executable + * Added: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/metadata/KeyTypes.java =================================================================== --- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/metadata/KeyTypes.java (rev 0) +++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/metadata/KeyTypes.java 2011-06-21 20:35:05 UTC (rev 1015) @@ -0,0 +1,42 @@ +package org.picketlink.identity.federation.saml.v2.metadata; + + + +/** + * Java class for KeyTypes. + * + * The following schema fragment specifies the expected content contained within this class. + * + * <pre> + * <simpleType name="KeyTypes"> + * <restriction base="{http://www.w3.org/2001/XMLSchema}string"> + * <enumeration value="encryption"/> + * <enumeration value="signing"/> + * </restriction> + * </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 Property changes on: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/metadata/KeyTypes.java ___________________________________________________________________ Added: svn:executable + * Added: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/metadata/LocalizedNameType.java =================================================================== --- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/metadata/LocalizedNameType.java (rev 0) +++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/metadata/LocalizedNameType.java 2011-06-21 20:35:05 UTC (rev 1015) @@ -0,0 +1,68 @@ +package org.picketlink.identity.federation.saml.v2.metadata; + + + +/** + * Java class for localizedNameType complex type. + * + * The following schema fragment specifies the expected content contained within this class. + * + * <pre> + * <complexType name="localizedNameType"> + * <simpleContent> + * <extension base="<http://www.w3.org/2001/XMLSchema>string"> + * <attribute ref="{http://www.w3.org/XML/1998/namespace}lang use="required""/> + * </extension> + * </simpleContent> + * </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; + } +} Property changes on: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/metadata/LocalizedNameType.java ___________________________________________________________________ Added: svn:executable + * Added: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/metadata/LocalizedURIType.java =================================================================== --- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/metadata/LocalizedURIType.java (rev 0) +++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/metadata/LocalizedURIType.java 2011-06-21 20:35:05 UTC (rev 1015) @@ -0,0 +1,69 @@ +package org.picketlink.identity.federation.saml.v2.metadata; + +import java.net.URI; + + +/** + * Java class for localizedURIType complex type. + * + * The following schema fragment specifies the expected content contained within this class. + * + * <pre> + * <complexType name="localizedURIType"> + * <simpleContent> + * <extension base="<http://www.w3.org/2001/XMLSchema>anyURI"> + * <attribute ref="{http://www.w3.org/XML/1998/namespace}lang use="required""/> + * </extension> + * </simpleContent> + * </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 Property changes on: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/metadata/LocalizedURIType.java ___________________________________________________________________ Added: svn:executable + * Added: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/metadata/OrganizationType.java =================================================================== --- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/metadata/OrganizationType.java (rev 0) +++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/metadata/OrganizationType.java 2011-06-21 20:35:05 UTC (rev 1015) @@ -0,0 +1,155 @@ +package org.picketlink.identity.federation.saml.v2.metadata; + +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; + + +/** + * Java class for OrganizationType complex type. + * + * The following schema fragment specifies the expected content contained within this class. + * + * <pre> + * <complexType name="OrganizationType"> + * <complexContent> + * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> + * <sequence> + * <element ref="{urn:oasis:names:tc:SAML:2.0:metadata}Extensions" minOccurs="0"/> + * <element ref="{urn:oasis:names:tc:SAML:2.0:metadata}OrganizationName" maxOccurs="unbounded"/> + * <element ref="{urn:oasis:names:tc:SAML:2.0:metadata}OrganizationDisplayName" maxOccurs="unbounded"/> + * <element ref="{urn:oasis:names:tc:SAML:2.0:metadata}OrganizationURL" maxOccurs="unbounded"/> + * </sequence> + * </restriction> + * </complexContent> + * </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. + * + * + * 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. + * + * + * 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 Property changes on: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/metadata/OrganizationType.java ___________________________________________________________________ Added: svn:executable + * Added: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/metadata/PDPDescriptorType.java =================================================================== --- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/metadata/PDPDescriptorType.java (rev 0) +++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/metadata/PDPDescriptorType.java 2011-06-21 20:35:05 UTC (rev 1015) @@ -0,0 +1,130 @@ +package org.picketlink.identity.federation.saml.v2.metadata; + +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; + + +/** + * Java class for PDPDescriptorType complex type. + * + * The following schema fragment specifies the expected content contained within this class. + * + * <pre> + * <complexType name="PDPDescriptorType"> + * <complexContent> + * <extension base="{urn:oasis:names:tc:SAML:2.0:metadata}RoleDescriptorType"> + * <sequence> + * <element ref="{urn:oasis:names:tc:SAML:2.0:metadata}AuthzService" maxOccurs="unbounded"/> + * <element ref="{urn:oasis:names:tc:SAML:2.0:metadata}AssertionIDRequestService" maxOccurs="unbounded" minOccurs="0"/> + * <element ref="{urn:oasis:names:tc:SAML:2.0:metadata}NameIDFormat" maxOccurs="unbounded" minOccurs="0"/> + * </sequence> + * </extension> + * </complexContent> + * </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. + * + * 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. + * + * + * 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. + * + * 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 Property changes on: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/metadata/PDPDescriptorType.java ___________________________________________________________________ Added: svn:executable + * Added: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/metadata/RequestedAttributeType.java =================================================================== --- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/metadata/RequestedAttributeType.java (rev 0) +++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/metadata/RequestedAttributeType.java 2011-06-21 20:35:05 UTC (rev 1015) @@ -0,0 +1,62 @@ + + + +package org.picketlink.identity.federation.saml.v2.metadata; + +import org.picketlink.identity.federation.saml.v2.assertion.AttributeType; + + +/** + * Java class for RequestedAttributeType complex type. + * + * The following schema fragment specifies the expected content contained within this class. + * + * <pre> + * <complexType name="RequestedAttributeType"> + * <complexContent> + * <extension base="{urn:oasis:names:tc:SAML:2.0:assertion}AttributeType"> + * <attribute name="isRequired" type="{http://www.w3.org/2001/XMLSchema}boolean" /> + * </extension> + * </complexContent> + * </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 Property changes on: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/metadata/RequestedAttributeType.java ___________________________________________________________________ Added: svn:executable + * Added: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/metadata/RoleDescriptorType.java =================================================================== --- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/metadata/RoleDescriptorType.java (rev 0) +++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/metadata/RoleDescriptorType.java 2011-06-21 20:35:05 UTC (rev 1015) @@ -0,0 +1,298 @@ +package org.picketlink.identity.federation.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; + + +/** + * Java class for RoleDescriptorType complex type. + * + * The following schema fragment specifies the expected content contained within this class. + * + * <pre> + * <complexType name="RoleDescriptorType"> + * <complexContent> + * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> + * <sequence> + * <element ref="{http://www.w3.org/2000/09/xmldsig#}Signature" minOccurs="0"/> + * <element ref="{urn:oasis:names:tc:SAML:2.0:metadata}Extensions" minOccurs="0"/> + * <element ref="{urn:oasis:names:tc:SAML:2.0:metadata}KeyDescriptor" maxOccurs="unbounded" minOccurs="0"/> + * <element ref="{urn:oasis:names:tc:SAML:2.0:metadata}Organization" minOccurs="0"/> + * <element ref="{urn:oasis:names:tc:SAML:2.0:metadata}ContactPerson" maxOccurs="unbounded" minOccurs="0"/> + * </sequence> + * <attribute name="ID" type="{http://www.w3.org/2001/XMLSchema}ID" /> + * <attribute name="validUntil" type="{http://www.w3.org/2001/XMLSchema}dateTime" /> + * <attribute name="cacheDuration" type="{http://www.w3.org/2001/XMLSchema}duration" /> + * <attribute name="protocolSupportEnumeration" use="required" type="{urn:oasis:names:tc:SAML:2.0:metadata}anyURIListType" /> + * <attribute name="errorURL" type="{http://www.w3.org/2001/XMLSchema}anyURI" /> + * </restriction> + * </complexContent> + * </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. + * + * 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. + * + * 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. + * + * 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 Property changes on: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/metadata/RoleDescriptorType.java ___________________________________________________________________ Added: svn:executable + * Added: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/metadata/SPSSODescriptorType.java =================================================================== --- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/metadata/SPSSODescriptorType.java (rev 0) +++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/metadata/SPSSODescriptorType.java 2011-06-21 20:35:05 UTC (rev 1015) @@ -0,0 +1,150 @@ +package org.picketlink.identity.federation.saml.v2.metadata; + +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; + + +/** + * Java class for SPSSODescriptorType complex type. + * + * The following schema fragment specifies the expected content contained within this class. + * + * <pre> + * <complexType name="SPSSODescriptorType"> + * <complexContent> + * <extension base="{urn:oasis:names:tc:SAML:2.0:metadata}SSODescriptorType"> + * <sequence> + * <element ref="{urn:oasis:names:tc:SAML:2.0:metadata}AssertionConsumerService" maxOccurs="unbounded"/> + * <element ref="{urn:oasis:names:tc:SAML:2.0:metadata}AttributeConsumingService" maxOccurs="unbounded" minOccurs="0"/> + * </sequence> + * <attribute name="AuthnRequestsSigned" type="{http://www.w3.org/2001/XMLSchema}boolean" /> + * <attribute name="WantAssertionsSigned" type="{http://www.w3.org/2001/XMLSchema}boolean" /> + * </extension> + * </complexContent> + * </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. + * + * 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. + * + * 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 Property changes on: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/metadata/SPSSODescriptorType.java ___________________________________________________________________ Added: svn:executable + * Added: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/metadata/SSODescriptorType.java =================================================================== --- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/metadata/SSODescriptorType.java (rev 0) +++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/metadata/SSODescriptorType.java 2011-06-21 20:35:05 UTC (rev 1015) @@ -0,0 +1,160 @@ +package org.picketlink.identity.federation.saml.v2.metadata; + +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; + + +/** + * Java class for SSODescriptorType complex type. + * + * The following schema fragment specifies the expected content contained within this class. + * + * <pre> + * <complexType name="SSODescriptorType"> + * <complexContent> + * <extension base="{urn:oasis:names:tc:SAML:2.0:metadata}RoleDescriptorType"> + * <sequence> + * <element ref="{urn:oasis:names:tc:SAML:2.0:metadata}ArtifactResolutionService" maxOccurs="unbounded" minOccurs="0"/> + * <element ref="{urn:oasis:names:tc:SAML:2.0:metadata}SingleLogoutService" maxOccurs="unbounded" minOccurs="0"/> + * <element ref="{urn:oasis:names:tc:SAML:2.0:metadata}ManageNameIDService" maxOccurs="unbounded" minOccurs="0"/> + * <element ref="{urn:oasis:names:tc:SAML:2.0:metadata}NameIDFormat" maxOccurs="unbounded" minOccurs="0"/> + * </sequence> + * </extension> + * </complexContent> + * </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. + * + * 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. + * + * 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. + * + * 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. + * + * 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 Property changes on: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/metadata/SSODescriptorType.java ___________________________________________________________________ Added: svn:executable + * Added: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/metadata/TypeWithOtherAttributes.java =================================================================== --- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/metadata/TypeWithOtherAttributes.java (rev 0) +++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/metadata/TypeWithOtherAttributes.java 2011-06-21 20:35:05 UTC (rev 1015) @@ -0,0 +1,70 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2008, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.picketlink.identity.federation.saml.v2.metadata; + +import java.util.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(a)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 Property changes on: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/metadata/TypeWithOtherAttributes.java ___________________________________________________________________ Added: svn:executable + * Added: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/metadata/package-info.java =================================================================== --- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/metadata/package-info.java (rev 0) +++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/metadata/package-info.java 2011-06-21 20:35:05 UTC (rev 1015) @@ -0,0 +1,9 @@ +// +// 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 +// + +(a)javax.xml.bind.annotation.XmlSchema(namespace = "urn:oasis:names:tc:SAML:2.0:metadata", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED) +package org.picketlink.identity.federation.saml.v2.metadata; Property changes on: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/metadata/package-info.java ___________________________________________________________________ Added: svn:executable + *

13 years, 6 months

1
0
0 / 0

Picketlink SVN: r1014 - federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/protocol.

by picketlink-commits＠lists.jboss.org

Author: anil.saldhana(a)jboss.com Date: 2011-06-21 16:33:34 -0400 (Tue, 21 Jun 2011) New Revision: 1014 Added: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/protocol/ArtifactResolveType.java federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/protocol/ArtifactResponseType.java federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/protocol/AssertionIDRequestType.java federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/protocol/AttributeQueryType.java federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/protocol/AuthnContextComparisonType.java federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/protocol/AuthnQueryType.java federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/protocol/AuthnRequestType.java federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/protocol/AuthzDecisionQueryType.java federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/protocol/ExtensionsType.java federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/protocol/IDPEntryType.java federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/protocol/IDPListType.java federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/protocol/LogoutRequestType.java federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/protocol/ManageNameIDRequestType.java federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/protocol/NameIDMappingRequestType.java federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/protocol/NameIDMappingResponseType.java federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/protocol/NameIDPolicyType.java federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/protocol/RequestAbstractType.java federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/protocol/RequestedAuthnContextType.java federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/protocol/ResponseType.java federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/protocol/ScopingType.java federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/protocol/StatusCodeType.java federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/protocol/StatusDetailType.java federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/protocol/StatusResponseType.java federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/protocol/StatusType.java federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/protocol/SubjectQueryAbstractType.java federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/protocol/TerminateType.java federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/protocol/XACMLAuthzDecisionQueryType.java federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/protocol/XACMLPolicyQueryType.java federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/protocol/package-info.java Log: move the classes from newmodel to saml pkg Added: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/protocol/ArtifactResolveType.java =================================================================== --- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/protocol/ArtifactResolveType.java (rev 0) +++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/protocol/ArtifactResolveType.java 2011-06-21 20:33:34 UTC (rev 1014) @@ -0,0 +1,81 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2008, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.picketlink.identity.federation.saml.v2.protocol; + +import javax.xml.datatype.XMLGregorianCalendar; + + + +/** + * Java class for ArtifactResolveType complex type. + * + * The following schema fragment specifies the expected content contained within this class. + * + * <pre> + * <complexType name="ArtifactResolveType"> + * <complexContent> + * <extension base="{urn:oasis:names:tc:SAML:2.0:protocol}RequestAbstractType"> + * <sequence> + * <element ref="{urn:oasis:names:tc:SAML:2.0:protocol}Artifact"/> + * </sequence> + * </extension> + * </complexContent> + * </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 Property changes on: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/protocol/ArtifactResolveType.java ___________________________________________________________________ Added: svn:executable + * Added: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/protocol/ArtifactResponseType.java =================================================================== --- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/protocol/ArtifactResponseType.java (rev 0) +++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/protocol/ArtifactResponseType.java 2011-06-21 20:33:34 UTC (rev 1014) @@ -0,0 +1,79 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2008, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.picketlink.identity.federation.saml.v2.protocol; + + +import org.w3c.dom.Element; + + +/** + * Java class for ArtifactResponseType complex type. + * + * The following schema fragment specifies the expected content contained within this class. + * + * <pre> + * <complexType name="ArtifactResponseType"> + * <complexContent> + * <extension base="{urn:oasis:names:tc:SAML:2.0:protocol}StatusResponseType"> + * <sequence> + * <any/> + * </sequence> + * </extension> + * </complexContent> + * </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; + } + +} Property changes on: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/protocol/ArtifactResponseType.java ___________________________________________________________________ Added: svn:executable + * Added: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/protocol/AssertionIDRequestType.java =================================================================== --- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/protocol/AssertionIDRequestType.java (rev 0) +++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/protocol/AssertionIDRequestType.java 2011-06-21 20:33:34 UTC (rev 1014) @@ -0,0 +1,86 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2008, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.picketlink.identity.federation.saml.v2.protocol; + +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; + +import javax.xml.datatype.XMLGregorianCalendar; + + +/** + * Java class for AssertionIDRequestType complex type. + * + * The following schema fragment specifies the expected content contained within this class. + * + * <pre> + * <complexType name="AssertionIDRequestType"> + * <complexContent> + * <extension base="{urn:oasis:names:tc:SAML:2.0:protocol}RequestAbstractType"> + * <sequence> + * <element ref="{urn:oasis:names:tc:SAML:2.0:assertion}AssertionIDRef" maxOccurs="unbounded"/> + * </sequence> + * </extension> + * </complexContent> + * </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 Property changes on: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/protocol/AssertionIDRequestType.java ___________________________________________________________________ Added: svn:executable + * Added: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/protocol/AttributeQueryType.java =================================================================== --- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/protocol/AttributeQueryType.java (rev 0) +++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/protocol/AttributeQueryType.java 2011-06-21 20:33:34 UTC (rev 1014) @@ -0,0 +1,88 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2008, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.picketlink.identity.federation.saml.v2.protocol; + +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; + +import javax.xml.datatype.XMLGregorianCalendar; + +import org.picketlink.identity.federation.saml.v2.assertion.AttributeType; + + + +/** + * Java class for AttributeQueryType complex type. + * + * The following schema fragment specifies the expected content contained within this class. + * + * <pre> + * <complexType name="AttributeQueryType"> + * <complexContent> + * <extension base="{urn:oasis:names:tc:SAML:2.0:protocol}SubjectQueryAbstractType"> + * <sequence> + * <element ref="{urn:oasis:names:tc:SAML:2.0:assertion}Attribute" maxOccurs="unbounded" minOccurs="0"/> + * </sequence> + * </extension> + * </complexContent> + * </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 Property changes on: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/protocol/AttributeQueryType.java ___________________________________________________________________ Added: svn:executable + * Added: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/protocol/AuthnContextComparisonType.java =================================================================== --- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/protocol/AuthnContextComparisonType.java (rev 0) +++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/protocol/AuthnContextComparisonType.java 2011-06-21 20:33:34 UTC (rev 1014) @@ -0,0 +1,72 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2008, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.picketlink.identity.federation.saml.v2.protocol; + + +/** + * Java class for AuthnContextComparisonType. + * + * The following schema fragment specifies the expected content contained within this class. + * + * <pre> + * <simpleType name="AuthnContextComparisonType"> + * <restriction base="{http://www.w3.org/2001/XMLSchema}string"> + * <enumeration value="exact"/> + * <enumeration value="minimum"/> + * <enumeration value="maximum"/> + * <enumeration value="better"/> + * </restriction> + * </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 Property changes on: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/protocol/AuthnContextComparisonType.java ___________________________________________________________________ Added: svn:executable + * Added: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/protocol/AuthnQueryType.java =================================================================== --- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/protocol/AuthnQueryType.java (rev 0) +++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/protocol/AuthnQueryType.java 2011-06-21 20:33:34 UTC (rev 1014) @@ -0,0 +1,106 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2008, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.picketlink.identity.federation.saml.v2.protocol; + +import javax.xml.datatype.XMLGregorianCalendar; + + +/** + * Java class for AuthnQueryType complex type. + * + * The following schema fragment specifies the expected content contained within this class. + * + * <pre> + * <complexType name="AuthnQueryType"> + * <complexContent> + * <extension base="{urn:oasis:names:tc:SAML:2.0:protocol}SubjectQueryAbstractType"> + * <sequence> + * <element ref="{urn:oasis:names:tc:SAML:2.0:protocol}RequestedAuthnContext" minOccurs="0"/> + * </sequence> + * <attribute name="SessionIndex" type="{http://www.w3.org/2001/XMLSchema}string" /> + * </extension> + * </complexContent> + * </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 Property changes on: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/protocol/AuthnQueryType.java ___________________________________________________________________ Added: svn:executable + * Added: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/protocol/AuthnRequestType.java =================================================================== --- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/protocol/AuthnRequestType.java (rev 0) +++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/protocol/AuthnRequestType.java 2011-06-21 20:33:34 UTC (rev 1014) @@ -0,0 +1,371 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2008, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.picketlink.identity.federation.saml.v2.protocol; + +import java.net.URI; + +import javax.xml.datatype.XMLGregorianCalendar; + +import org.picketlink.identity.federation.saml.v2.assertion.ConditionsType; +import org.picketlink.identity.federation.saml.v2.assertion.SubjectType; + + + +/** + * Java class for AuthnRequestType complex type. + * + * The following schema fragment specifies the expected content contained within this class. + * + * <pre> + * <complexType name="AuthnRequestType"> + * <complexContent> + * <extension base="{urn:oasis:names:tc:SAML:2.0:protocol}RequestAbstractType"> + * <sequence> + * <element ref="{urn:oasis:names:tc:SAML:2.0:assertion}Subject" minOccurs="0"/> + * <element ref="{urn:oasis:names:tc:SAML:2.0:protocol}NameIDPolicy" minOccurs="0"/> + * <element ref="{urn:oasis:names:tc:SAML:2.0:assertion}Conditions" minOccurs="0"/> + * <element ref="{urn:oasis:names:tc:SAML:2.0:protocol}RequestedAuthnContext" minOccurs="0"/> + * <element ref="{urn:oasis:names:tc:SAML:2.0:protocol}Scoping" minOccurs="0"/> + * </sequence> + * <attribute name="ForceAuthn" type="{http://www.w3.org/2001/XMLSchema}boolean" /> + * <attribute name="IsPassive" type="{http://www.w3.org/2001/XMLSchema}boolean" /> + * <attribute name="ProtocolBinding" type="{http://www.w3.org/2001/XMLSchema}anyURI" /> + * <attribute name="AssertionConsumerServiceIndex" type="{http://www.w3.org/2001/XMLSchema}unsignedShort" /> + * <attribute name="AssertionConsumerServiceURL" type="{http://www.w3.org/2001/XMLSchema}anyURI" /> + * <attribute name="AttributeConsumingServiceIndex" type="{http://www.w3.org/2001/XMLSchema}unsignedShort" /> + * <attribute name="ProviderName" type="{http://www.w3.org/2001/XMLSchema}string" /> + * </extension> + * </complexContent> + * </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 Property changes on: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/protocol/AuthnRequestType.java ___________________________________________________________________ Added: svn:executable + * Added: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/protocol/AuthzDecisionQueryType.java =================================================================== --- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/protocol/AuthzDecisionQueryType.java (rev 0) +++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/protocol/AuthzDecisionQueryType.java 2011-06-21 20:33:34 UTC (rev 1014) @@ -0,0 +1,143 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2008, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.picketlink.identity.federation.saml.v2.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.saml.v2.assertion.ActionType; +import org.picketlink.identity.federation.saml.v2.assertion.EvidenceType; + + +/** + * Java class for AuthzDecisionQueryType complex type. + * + * The following schema fragment specifies the expected content contained within this class. + * + * <pre> + * <complexType name="AuthzDecisionQueryType"> + * <complexContent> + * <extension base="{urn:oasis:names:tc:SAML:2.0:protocol}SubjectQueryAbstractType"> + * <sequence> + * <element ref="{urn:oasis:names:tc:SAML:2.0:assertion}Action" maxOccurs="unbounded"/> + * <element ref="{urn:oasis:names:tc:SAML:2.0:assertion}Evidence" minOccurs="0"/> + * </sequence> + * <attribute name="Resource" use="required" type="{http://www.w3.org/2001/XMLSchema}anyURI" /> + * </extension> + * </complexContent> + * </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 Property changes on: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/protocol/AuthzDecisionQueryType.java ___________________________________________________________________ Added: svn:executable + * Added: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/protocol/ExtensionsType.java =================================================================== --- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/protocol/ExtensionsType.java (rev 0) +++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/protocol/ExtensionsType.java 2011-06-21 20:33:34 UTC (rev 1014) @@ -0,0 +1,77 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2008, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.picketlink.identity.federation.saml.v2.protocol; + +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; + + +/** + * Java class for ExtensionsType complex type. + * + * The following schema fragment specifies the expected content contained within this class. + * + * <pre> + * <complexType name="ExtensionsType"> + * <complexContent> + * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> + * <sequence> + * <any/> + * </sequence> + * </restriction> + * </complexContent> + * </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 Property changes on: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/protocol/ExtensionsType.java ___________________________________________________________________ Added: svn:executable + * Added: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/protocol/IDPEntryType.java =================================================================== --- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/protocol/IDPEntryType.java (rev 0) +++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/protocol/IDPEntryType.java 2011-06-21 20:33:34 UTC (rev 1014) @@ -0,0 +1,126 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2008, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.picketlink.identity.federation.saml.v2.protocol; + +import java.net.URI; + + +/** + * Java class for IDPEntryType complex type. + * + * The following schema fragment specifies the expected content contained within this class. + * + * <pre> + * <complexType name="IDPEntryType"> + * <complexContent> + * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> + * <attribute name="ProviderID" use="required" type="{http://www.w3.org/2001/XMLSchema}anyURI" /> + * <attribute name="Name" type="{http://www.w3.org/2001/XMLSchema}string" /> + * <attribute name="Loc" type="{http://www.w3.org/2001/XMLSchema}anyURI" /> + * </restriction> + * </complexContent> + * </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 Property changes on: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/protocol/IDPEntryType.java ___________________________________________________________________ Added: svn:executable + * Added: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/protocol/IDPListType.java =================================================================== --- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/protocol/IDPListType.java (rev 0) +++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/protocol/IDPListType.java 2011-06-21 20:33:34 UTC (rev 1014) @@ -0,0 +1,106 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2008, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.picketlink.identity.federation.saml.v2.protocol; + +import java.net.URI; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; + + +/** + * Java class for IDPListType complex type. + * + * The following schema fragment specifies the expected content contained within this class. + * + * <pre> + * <complexType name="IDPListType"> + * <complexContent> + * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> + * <sequence> + * <element ref="{urn:oasis:names:tc:SAML:2.0:protocol}IDPEntry" maxOccurs="unbounded"/> + * <element ref="{urn:oasis:names:tc:SAML:2.0:protocol}GetComplete" minOccurs="0"/> + * </sequence> + * </restriction> + * </complexContent> + * </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 Property changes on: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/protocol/IDPListType.java ___________________________________________________________________ Added: svn:executable + * Added: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/protocol/LogoutRequestType.java =================================================================== --- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/protocol/LogoutRequestType.java (rev 0) +++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/protocol/LogoutRequestType.java 2011-06-21 20:33:34 UTC (rev 1014) @@ -0,0 +1,224 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2008, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.picketlink.identity.federation.saml.v2.protocol; + +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; +import javax.xml.datatype.XMLGregorianCalendar; + +import org.picketlink.identity.federation.saml.v2.assertion.BaseIDAbstractType; +import org.picketlink.identity.federation.saml.v2.assertion.EncryptedElementType; +import org.picketlink.identity.federation.saml.v2.assertion.NameIDType; + + + +/** + * Java class for LogoutRequestType complex type. + * + * The following schema fragment specifies the expected content contained within this class. + * + * <pre> + * <complexType name="LogoutRequestType"> + * <complexContent> + * <extension base="{urn:oasis:names:tc:SAML:2.0:protocol}RequestAbstractType"> + * <sequence> + * <choice> + * <element ref="{urn:oasis:names:tc:SAML:2.0:assertion}BaseID"/> + * <element ref="{urn:oasis:names:tc:SAML:2.0:assertion}NameID"/> + * <element ref="{urn:oasis:names:tc:SAML:2.0:assertion}EncryptedID"/> + * </choice> + * <element ref="{urn:oasis:names:tc:SAML:2.0:protocol}SessionIndex" maxOccurs="unbounded" minOccurs="0"/> + * </sequence> + * <attribute name="Reason" type="{http://www.w3.org/2001/XMLSchema}string" /> + * <attribute name="NotOnOrAfter" type="{http://www.w3.org/2001/XMLSchema}dateTime" /> + * </extension> + * </complexContent> + * </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; + } + +} Property changes on: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/protocol/LogoutRequestType.java ___________________________________________________________________ Added: svn:executable + * Added: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/protocol/ManageNameIDRequestType.java =================================================================== --- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/protocol/ManageNameIDRequestType.java (rev 0) +++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/protocol/ManageNameIDRequestType.java 2011-06-21 20:33:34 UTC (rev 1014) @@ -0,0 +1,193 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2008, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.picketlink.identity.federation.saml.v2.protocol; + +import javax.xml.datatype.XMLGregorianCalendar; + +import org.picketlink.identity.federation.saml.v2.assertion.EncryptedElementType; +import org.picketlink.identity.federation.saml.v2.assertion.NameIDType; + + + +/** + * Java class for ManageNameIDRequestType complex type. + * + * The following schema fragment specifies the expected content contained within this class. + * + * <pre> + * <complexType name="ManageNameIDRequestType"> + * <complexContent> + * <extension base="{urn:oasis:names:tc:SAML:2.0:protocol}RequestAbstractType"> + * <sequence> + * <choice> + * <element ref="{urn:oasis:names:tc:SAML:2.0:assertion}NameID"/> + * <element ref="{urn:oasis:names:tc:SAML:2.0:assertion}EncryptedID"/> + * </choice> + * <choice> + * <element ref="{urn:oasis:names:tc:SAML:2.0:protocol}NewID"/> + * <element ref="{urn:oasis:names:tc:SAML:2.0:protocol}NewEncryptedID"/> + * <element ref="{urn:oasis:names:tc:SAML:2.0:protocol}Terminate"/> + * </choice> + * </sequence> + * </extension> + * </complexContent> + * </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 Property changes on: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/protocol/ManageNameIDRequestType.java ___________________________________________________________________ Added: svn:executable + * Added: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/protocol/NameIDMappingRequestType.java =================================================================== --- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/protocol/NameIDMappingRequestType.java (rev 0) +++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/protocol/NameIDMappingRequestType.java 2011-06-21 20:33:34 UTC (rev 1014) @@ -0,0 +1,165 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2008, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.picketlink.identity.federation.saml.v2.protocol; + +import javax.xml.datatype.XMLGregorianCalendar; + +import org.picketlink.identity.federation.saml.v2.assertion.BaseIDAbstractType; +import org.picketlink.identity.federation.saml.v2.assertion.EncryptedElementType; +import org.picketlink.identity.federation.saml.v2.assertion.NameIDType; + + + +/** + * Java class for NameIDMappingRequestType complex type. + * + * The following schema fragment specifies the expected content contained within this class. + * + * <pre> + * <complexType name="NameIDMappingRequestType"> + * <complexContent> + * <extension base="{urn:oasis:names:tc:SAML:2.0:protocol}RequestAbstractType"> + * <sequence> + * <choice> + * <element ref="{urn:oasis:names:tc:SAML:2.0:assertion}BaseID"/> + * <element ref="{urn:oasis:names:tc:SAML:2.0:assertion}NameID"/> + * <element ref="{urn:oasis:names:tc:SAML:2.0:assertion}EncryptedID"/> + * </choice> + * <element ref="{urn:oasis:names:tc:SAML:2.0:protocol}NameIDPolicy"/> + * </sequence> + * </extension> + * </complexContent> + * </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 Property changes on: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/protocol/NameIDMappingRequestType.java ___________________________________________________________________ Added: svn:executable + * Added: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/protocol/NameIDMappingResponseType.java =================================================================== --- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/protocol/NameIDMappingResponseType.java (rev 0) +++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/protocol/NameIDMappingResponseType.java 2011-06-21 20:33:34 UTC (rev 1014) @@ -0,0 +1,100 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2008, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.picketlink.identity.federation.saml.v2.protocol; + +import org.picketlink.identity.federation.saml.v2.assertion.EncryptedElementType; +import org.picketlink.identity.federation.saml.v2.assertion.NameIDType; + +/** + * Java class for NameIDMappingResponseType complex type. + * + * The following schema fragment specifies the expected content contained within this class. + * + * <pre> + * <complexType name="NameIDMappingResponseType"> + * <complexContent> + * <extension base="{urn:oasis:names:tc:SAML:2.0:protocol}StatusResponseType"> + * <choice> + * <element ref="{urn:oasis:names:tc:SAML:2.0:assertion}NameID"/> + * <element ref="{urn:oasis:names:tc:SAML:2.0:assertion}EncryptedID"/> + * </choice> + * </extension> + * </complexContent> + * </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 Property changes on: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/protocol/NameIDMappingResponseType.java ___________________________________________________________________ Added: svn:executable + * Added: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/protocol/NameIDPolicyType.java =================================================================== --- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/protocol/NameIDPolicyType.java (rev 0) +++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/protocol/NameIDPolicyType.java 2011-06-21 20:33:34 UTC (rev 1014) @@ -0,0 +1,123 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2008, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.picketlink.identity.federation.saml.v2.protocol; + +import java.net.URI; + + +/** + * Java class for NameIDPolicyType complex type. + * + * The following schema fragment specifies the expected content contained within this class. + * + * <pre> + * <complexType name="NameIDPolicyType"> + * <complexContent> + * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> + * <attribute name="Format" type="{http://www.w3.org/2001/XMLSchema}anyURI" /> + * <attribute name="SPNameQualifier" type="{http://www.w3.org/2001/XMLSchema}string" /> + * <attribute name="AllowCreate" type="{http://www.w3.org/2001/XMLSchema}boolean" /> + * </restriction> + * </complexContent> + * </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 Property changes on: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/protocol/NameIDPolicyType.java ___________________________________________________________________ Added: svn:executable + * Added: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/protocol/RequestAbstractType.java =================================================================== --- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/protocol/RequestAbstractType.java (rev 0) +++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/protocol/RequestAbstractType.java 2011-06-21 20:33:34 UTC (rev 1014) @@ -0,0 +1,236 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2008, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.picketlink.identity.federation.saml.v2.protocol; + +import java.net.URI; + +import javax.xml.datatype.XMLGregorianCalendar; + +import org.picketlink.identity.federation.saml.v2.SAML2Object; +import org.picketlink.identity.federation.saml.v2.assertion.NameIDType; +import org.picketlink.identity.xmlsec.w3.xmldsig.SignatureType; +import org.w3c.dom.Element; + + +/** + * Java class for RequestAbstractType complex type. + * + * The following schema fragment specifies the expected content contained within this class. + * + * <pre> + * <complexType name="RequestAbstractType"> + * <complexContent> + * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> + * <sequence> + * <element ref="{urn:oasis:names:tc:SAML:2.0:assertion}Issuer" minOccurs="0"/> + * <element ref="{http://www.w3.org/2000/09/xmldsig#}Signature" minOccurs="0"/> + * <element ref="{urn:oasis:names:tc:SAML:2.0:protocol}Extensions" minOccurs="0"/> + * </sequence> + * <attribute name="ID" use="required" type="{http://www.w3.org/2001/XMLSchema}ID" /> + * <attribute name="Version" use="required" type="{http://www.w3.org/2001/XMLSchema}string" /> + * <attribute name="IssueInstant" use="required" type="{http://www.w3.org/2001/XMLSchema}dateTime" /> + * <attribute name="Destination" type="{http://www.w3.org/2001/XMLSchema}anyURI" /> + * <attribute name="Consent" type="{http://www.w3.org/2001/XMLSchema}anyURI" /> + * </restriction> + * </complexContent> + * </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 Property changes on: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/protocol/RequestAbstractType.java ___________________________________________________________________ Added: svn:executable + * Added: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/protocol/RequestedAuthnContextType.java =================================================================== --- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/protocol/RequestedAuthnContextType.java (rev 0) +++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/protocol/RequestedAuthnContextType.java 2011-06-21 20:33:34 UTC (rev 1014) @@ -0,0 +1,152 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2008, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.picketlink.identity.federation.saml.v2.protocol; + +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; + +/** + * Java class for RequestedAuthnContextType complex type. + * + * The following schema fragment specifies the expected content contained within this class. + * + * <pre> + * <complexType name="RequestedAuthnContextType"> + * <complexContent> + * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> + * <choice> + * <element ref="{urn:oasis:names:tc:SAML:2.0:assertion}AuthnContextClassRef" maxOccurs="unbounded"/> + * <element ref="{urn:oasis:names:tc:SAML:2.0:assertion}AuthnContextDeclRef" maxOccurs="unbounded"/> + * </choice> + * <attribute name="Comparison" type="{urn:oasis:names:tc:SAML:2.0:protocol}AuthnContextComparisonType" /> + * </restriction> + * </complexContent> + * </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. + * + * + * 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. + * + * + * For example, to add a new item, do as follows: + * <pre> + * getAuthnContextDeclRef().add(newItem); + * </pre> + * + * + * + * 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 Property changes on: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/protocol/RequestedAuthnContextType.java ___________________________________________________________________ Added: svn:executable + * Added: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/protocol/ResponseType.java =================================================================== --- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/protocol/ResponseType.java (rev 0) +++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/protocol/ResponseType.java 2011-06-21 20:33:34 UTC (rev 1014) @@ -0,0 +1,133 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2008, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.picketlink.identity.federation.saml.v2.protocol; + +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; + +import org.picketlink.identity.federation.saml.v2.assertion.AssertionType; +import org.picketlink.identity.federation.saml.v2.assertion.EncryptedAssertionType; + +/** + * Java class for ResponseType complex type. + * + * The following schema fragment specifies the expected content contained within this class. + * + * <pre> + * <complexType name="ResponseType"> + * <complexContent> + * <extension base="{urn:oasis:names:tc:SAML:2.0:protocol}StatusResponseType"> + * <choice maxOccurs="unbounded" minOccurs="0"> + * <element ref="{urn:oasis:names:tc:SAML:2.0:assertion}Assertion"/> + * <element ref="{urn:oasis:names:tc:SAML:2.0:assertion}EncryptedAssertion"/> + * </choice> + * </extension> + * </complexContent> + * </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 Property changes on: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/protocol/ResponseType.java ___________________________________________________________________ Added: svn:executable + * Added: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/protocol/ScopingType.java =================================================================== --- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/protocol/ScopingType.java (rev 0) +++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/protocol/ScopingType.java 2011-06-21 20:33:34 UTC (rev 1014) @@ -0,0 +1,145 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2008, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.picketlink.identity.federation.saml.v2.protocol; + +import java.math.BigInteger; +import java.net.URI; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; + + +/** + * Java class for ScopingType complex type. + * + * The following schema fragment specifies the expected content contained within this class. + * + * <pre> + * <complexType name="ScopingType"> + * <complexContent> + * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> + * <sequence> + * <element ref="{urn:oasis:names:tc:SAML:2.0:protocol}IDPList" minOccurs="0"/> + * <element ref="{urn:oasis:names:tc:SAML:2.0:protocol}RequesterID" maxOccurs="unbounded" minOccurs="0"/> + * </sequence> + * <attribute name="ProxyCount" type="{http://www.w3.org/2001/XMLSchema}nonNegativeInteger" /> + * </restriction> + * </complexContent> + * </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. + * + * For example, to add a new item, do as follows: + * <pre> + * getRequesterID().add(newItem); + * </pre> + * + * + * + * 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; + } + +} Property changes on: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/protocol/ScopingType.java ___________________________________________________________________ Added: svn:executable + * Added: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/protocol/StatusCodeType.java =================================================================== --- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/protocol/StatusCodeType.java (rev 0) +++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/protocol/StatusCodeType.java 2011-06-21 20:33:34 UTC (rev 1014) @@ -0,0 +1,101 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2008, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.picketlink.identity.federation.saml.v2.protocol; + +import java.net.URI; + + + +/** + * Java class for StatusCodeType complex type. + * + * The following schema fragment specifies the expected content contained within this class. + * + * <pre> + * <complexType name="StatusCodeType"> + * <complexContent> + * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> + * <sequence> + * <element ref="{urn:oasis:names:tc:SAML:2.0:protocol}StatusCode" minOccurs="0"/> + * </sequence> + * <attribute name="Value" use="required" type="{http://www.w3.org/2001/XMLSchema}anyURI" /> + * </restriction> + * </complexContent> + * </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 Property changes on: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/protocol/StatusCodeType.java ___________________________________________________________________ Added: svn:executable + * Added: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/protocol/StatusDetailType.java =================================================================== --- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/protocol/StatusDetailType.java (rev 0) +++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/protocol/StatusDetailType.java 2011-06-21 20:33:34 UTC (rev 1014) @@ -0,0 +1,77 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2008, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.picketlink.identity.federation.saml.v2.protocol; + +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; + + +/** + * Java class for StatusDetailType complex type. + * + * The following schema fragment specifies the expected content contained within this class. + * + * <pre> + * <complexType name="StatusDetailType"> + * <complexContent> + * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> + * <sequence> + * <any/> + * </sequence> + * </restriction> + * </complexContent> + * </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 Property changes on: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/protocol/StatusDetailType.java ___________________________________________________________________ Added: svn:executable + * Added: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/protocol/StatusResponseType.java =================================================================== --- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/protocol/StatusResponseType.java (rev 0) +++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/protocol/StatusResponseType.java 2011-06-21 20:33:34 UTC (rev 1014) @@ -0,0 +1,312 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2008, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.picketlink.identity.federation.saml.v2.protocol; + +import javax.xml.datatype.XMLGregorianCalendar; + +import org.picketlink.identity.federation.saml.v2.SAML2Object; +import org.picketlink.identity.federation.saml.v2.assertion.NameIDType; +import org.w3c.dom.Element; + + +/** + * Java class for StatusResponseType complex type. + * + * The following schema fragment specifies the expected content contained within this class. + * + * <pre> + * <complexType name="StatusResponseType"> + * <complexContent> + * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> + * <sequence> + * <element ref="{urn:oasis:names:tc:SAML:2.0:assertion}Issuer" minOccurs="0"/> + * <element ref="{http://www.w3.org/2000/09/xmldsig#}Signature" minOccurs="0"/> + * <element ref="{urn:oasis:names:tc:SAML:2.0:protocol}Extensions" minOccurs="0"/> + * <element ref="{urn:oasis:names:tc:SAML:2.0:protocol}Status"/> + * </sequence> + * <attribute name="ID" use="required" type="{http://www.w3.org/2001/XMLSchema}ID" /> + * <attribute name="InResponseTo" type="{http://www.w3.org/2001/XMLSchema}NCName" /> + * <attribute name="Version" use="required" type="{http://www.w3.org/2001/XMLSchema}string" /> + * <attribute name="IssueInstant" use="required" type="{http://www.w3.org/2001/XMLSchema}dateTime" /> + * <attribute name="Destination" type="{http://www.w3.org/2001/XMLSchema}anyURI" /> + * <attribute name="Consent" type="{http://www.w3.org/2001/XMLSchema}anyURI" /> + * </restriction> + * </complexContent> + * </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 Property changes on: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/protocol/StatusResponseType.java ___________________________________________________________________ Added: svn:executable + * Added: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/protocol/StatusType.java =================================================================== --- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/protocol/StatusType.java (rev 0) +++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/protocol/StatusType.java 2011-06-21 20:33:34 UTC (rev 1014) @@ -0,0 +1,125 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2008, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.picketlink.identity.federation.saml.v2.protocol; + + + +/** + * Java class for StatusType complex type. + * + * The following schema fragment specifies the expected content contained within this class. + * + * <pre> + * <complexType name="StatusType"> + * <complexContent> + * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> + * <sequence> + * <element ref="{urn:oasis:names:tc:SAML:2.0:protocol}StatusCode"/> + * <element ref="{urn:oasis:names:tc:SAML:2.0:protocol}StatusMessage" minOccurs="0"/> + * <element ref="{urn:oasis:names:tc:SAML:2.0:protocol}StatusDetail" minOccurs="0"/> + * </sequence> + * </restriction> + * </complexContent> + * </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; + } + +} Property changes on: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/protocol/StatusType.java ___________________________________________________________________ Added: svn:executable + * Added: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/protocol/SubjectQueryAbstractType.java =================================================================== --- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/protocol/SubjectQueryAbstractType.java (rev 0) +++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/protocol/SubjectQueryAbstractType.java 2011-06-21 20:33:34 UTC (rev 1014) @@ -0,0 +1,77 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2008, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.picketlink.identity.federation.saml.v2.protocol; + +import javax.xml.datatype.XMLGregorianCalendar; + +import org.picketlink.identity.federation.saml.v2.assertion.SubjectType; + + +/** + * Java class for SubjectQueryAbstractType complex type. + * + * The following schema fragment specifies the expected content contained within this class. + * + * <pre> + * <complexType name="SubjectQueryAbstractType"> + * <complexContent> + * <extension base="{urn:oasis:names:tc:SAML:2.0:protocol}RequestAbstractType"> + * <sequence> + * <element ref="{urn:oasis:names:tc:SAML:2.0:assertion}Subject"/> + * </sequence> + * </extension> + * </complexContent> + * </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 Property changes on: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/protocol/SubjectQueryAbstractType.java ___________________________________________________________________ Added: svn:executable + * Added: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/protocol/TerminateType.java =================================================================== --- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/protocol/TerminateType.java (rev 0) +++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/protocol/TerminateType.java 2011-06-21 20:33:34 UTC (rev 1014) @@ -0,0 +1,42 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2008, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.picketlink.identity.federation.saml.v2.protocol; + +/** + * Java class for TerminateType complex type. + * + * The following schema fragment specifies the expected content contained within this class. + * + * <pre> + * <complexType name="TerminateType"> + * <complexContent> + * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> + * </restriction> + * </complexContent> + * </complexType> + * </pre> + * + * + */ +public class TerminateType +{ +} \ No newline at end of file Property changes on: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/protocol/TerminateType.java ___________________________________________________________________ Added: svn:executable + * Added: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/protocol/XACMLAuthzDecisionQueryType.java =================================================================== --- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/protocol/XACMLAuthzDecisionQueryType.java (rev 0) +++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/protocol/XACMLAuthzDecisionQueryType.java 2011-06-21 20:33:34 UTC (rev 1014) @@ -0,0 +1,143 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2008, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.picketlink.identity.federation.saml.v2.protocol; + +import javax.xml.datatype.XMLGregorianCalendar; + +import org.jboss.security.xacml.core.model.context.RequestType; + + +/** + * Java class for XACMLAuthzDecisionQueryType complex type. + * + * The following schema fragment specifies the expected content contained within this class. + * + * <pre> + * <complexType name="XACMLAuthzDecisionQueryType"> + * <complexContent> + * <extension base="{urn:oasis:names:tc:SAML:2.0:protocol}RequestAbstractType"> + * <sequence> + * <element ref="{urn:oasis:names:tc:xacml:2.0:context:schema:os}Request"/> + * </sequence> + * <attribute name="InputContextOnly" type="{http://www.w3.org/2001/XMLSchema}boolean" default="false" /> + * <attribute name="ReturnContext" type="{http://www.w3.org/2001/XMLSchema}boolean" default="false" /> + * </extension> + * </complexContent> + * </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 Property changes on: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/protocol/XACMLAuthzDecisionQueryType.java ___________________________________________________________________ Added: svn:executable + * Added: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/protocol/XACMLPolicyQueryType.java =================================================================== --- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/protocol/XACMLPolicyQueryType.java (rev 0) +++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/protocol/XACMLPolicyQueryType.java 2011-06-21 20:33:34 UTC (rev 1014) @@ -0,0 +1,114 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2008, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.picketlink.identity.federation.saml.v2.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; + + +/** + * Java class for XACMLPolicyQueryType complex type. + * + * The following schema fragment specifies the expected content contained within this class. + * + * <pre> + * <complexType name="XACMLPolicyQueryType"> + * <complexContent> + * <extension base="{urn:oasis:names:tc:SAML:2.0:protocol}RequestAbstractType"> + * <choice maxOccurs="unbounded" minOccurs="0"> + * <element ref="{urn:oasis:names:tc:xacml:2.0:context:schema:os}Request"/> + * <element ref="{urn:oasis:names:tc:xacml:2.0:policy:schema:os}Target"/> + * <element ref="{urn:oasis:names:tc:xacml:2.0:policy:schema:os}PolicySetIdReference"/> + * <element ref="{urn:oasis:names:tc:xacml:2.0:policy:schema:os}PolicyIdReference"/> + * </choice> + * </extension> + * </complexContent> + * </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 Property changes on: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/protocol/XACMLPolicyQueryType.java ___________________________________________________________________ Added: svn:executable + * Added: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/protocol/package-info.java =================================================================== --- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/protocol/package-info.java (rev 0) +++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/protocol/package-info.java 2011-06-21 20:33:34 UTC (rev 1014) @@ -0,0 +1,4 @@ +/** + * Package containing the classes for the protocol of SAMLv2 + */ +package org.picketlink.identity.federation.saml.v2.protocol; Property changes on: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/protocol/package-info.java ___________________________________________________________________ Added: svn:executable + *

13 years, 6 months

1
0
0 / 0

Picketlink SVN: r1013 - in federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2: profiles/sso/ecp and 1 other directories.

by picketlink-commits＠lists.jboss.org

Author: anil.saldhana(a)jboss.com Date: 2011-06-21 16:31:55 -0400 (Tue, 21 Jun 2011) New Revision: 1013 Added: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/assertion/ActionType.java federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/assertion/AdviceType.java federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/assertion/AssertionType.java federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/assertion/AttributeStatementType.java federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/assertion/AttributeType.java federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/assertion/AudienceRestrictionType.java federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/assertion/AuthnContextClassRefType.java federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/assertion/AuthnContextDeclRefType.java federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/assertion/AuthnContextDeclType.java federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/assertion/AuthnContextType.java federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/assertion/AuthnStatementType.java federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/assertion/AuthzDecisionStatementType.java federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/assertion/BaseIDAbstractType.java federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/assertion/ConditionAbstractType.java federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/assertion/ConditionsType.java federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/assertion/DecisionType.java federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/assertion/EncryptedAssertionType.java federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/assertion/EncryptedElementType.java federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/assertion/EvidenceType.java federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/assertion/KeyInfoConfirmationDataType.java federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/assertion/NameIDType.java federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/assertion/OneTimeUseType.java federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/assertion/ProxyRestrictionType.java federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/assertion/StatementAbstractType.java federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/assertion/SubjectConfirmationDataType.java federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/assertion/SubjectConfirmationType.java federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/assertion/SubjectLocalityType.java federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/assertion/SubjectType.java federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/assertion/URIType.java federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/assertion/package-info.java federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/profiles/xacml/assertion/XACMLAuthzDecisionStatementType.java federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/profiles/xacml/assertion/XACMLPolicyStatementType.java Modified: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/profiles/sso/ecp/RequestType.java Log: move the classes from newmodel to saml pkg Added: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/assertion/ActionType.java =================================================================== --- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/assertion/ActionType.java (rev 0) +++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/assertion/ActionType.java 2011-06-21 20:31:55 UTC (rev 1013) @@ -0,0 +1,98 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2008, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.picketlink.identity.federation.saml.v2.assertion; + +import java.io.Serializable; + + +/** + * Java class for ActionType complex type. + * + * The following schema fragment specifies the expected content contained within this class. + * + * <pre> + * <complexType name="ActionType"> + * <simpleContent> + * <extension base="<http://www.w3.org/2001/XMLSchema>string"> + * <attribute name="Namespace" use="required" type="{http://www.w3.org/2001/XMLSchema}anyURI" /> + * </extension> + * </simpleContent> + * </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 Added: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/assertion/AdviceType.java =================================================================== --- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/assertion/AdviceType.java (rev 0) +++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/assertion/AdviceType.java 2011-06-21 20:31:55 UTC (rev 1013) @@ -0,0 +1,76 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2008, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ + +package org.picketlink.identity.federation.saml.v2.assertion; + +import java.io.Serializable; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; + + +/** + * Java class for AdviceType complex type. + * + * The following schema fragment specifies the expected content contained within this class. + * + * <pre> + * <complexType name="AdviceType"> + * <complexContent> + * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> + * <choice maxOccurs="unbounded" minOccurs="0"> + * <element ref="{urn:oasis:names:tc:SAML:2.0:assertion}AssertionIDRef"/> + * <element ref="{urn:oasis:names:tc:SAML:2.0:assertion}AssertionURIRef"/> + * <element ref="{urn:oasis:names:tc:SAML:2.0:assertion}Assertion"/> + * <element ref="{urn:oasis:names:tc:SAML:2.0:assertion}EncryptedAssertion"/> + * <any/> + * </choice> + * </restriction> + * </complexContent> + * </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 Added: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/assertion/AssertionType.java =================================================================== --- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/assertion/AssertionType.java (rev 0) +++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/assertion/AssertionType.java 2011-06-21 20:31:55 UTC (rev 1013) @@ -0,0 +1,286 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2008, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.picketlink.identity.federation.saml.v2.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(a)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 Property changes on: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/assertion/AssertionType.java ___________________________________________________________________ Added: svn:executable + * Added: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/assertion/AttributeStatementType.java =================================================================== --- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/assertion/AttributeStatementType.java (rev 0) +++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/assertion/AttributeStatementType.java 2011-06-21 20:31:55 UTC (rev 1013) @@ -0,0 +1,110 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2008, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ + +package org.picketlink.identity.federation.saml.v2.assertion; + +import java.io.Serializable; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; + + + +/** + * Java class for AttributeStatementType complex type. + * + * The following schema fragment specifies the expected content contained within this class. + * + * <pre> + * <complexType name="AttributeStatementType"> + * <complexContent> + * <extension base="{urn:oasis:names:tc:SAML:2.0:assertion}StatementAbstractType"> + * <choice maxOccurs="unbounded"> + * <element ref="{urn:oasis:names:tc:SAML:2.0:assertion}Attribute"/> + * <element ref="{urn:oasis:names:tc:SAML:2.0:assertion}EncryptedAttribute"/> + * </choice> + * </extension> + * </complexContent> + * </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 Added: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/assertion/AttributeType.java =================================================================== --- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/assertion/AttributeType.java (rev 0) +++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/assertion/AttributeType.java 2011-06-21 20:31:55 UTC (rev 1013) @@ -0,0 +1,204 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2008, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.picketlink.identity.federation.saml.v2.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; + +/** + * Java class for AttributeType complex type. + * + * The following schema fragment specifies the expected content contained within this class. + * + * <pre> + * <complexType name="AttributeType"> + * <complexContent> + * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> + * <sequence> + * <element ref="{urn:oasis:names:tc:SAML:2.0:assertion}AttributeValue" maxOccurs="unbounded" minOccurs="0"/> + * </sequence> + * <attribute name="Name" use="required" type="{http://www.w3.org/2001/XMLSchema}string" /> + * <attribute name="NameFormat" type="{http://www.w3.org/2001/XMLSchema}anyURI" /> + * <attribute name="FriendlyName" type="{http://www.w3.org/2001/XMLSchema}string" /> + * </restriction> + * </complexContent> + * </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. + * + * + * For example, to add a new item, do as follows: + * <pre> + * getAttributeValue().add(newItem); + * </pre> + * + * + * + * 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. + * + * + * 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 Added: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/assertion/AudienceRestrictionType.java =================================================================== --- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/assertion/AudienceRestrictionType.java (rev 0) +++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/assertion/AudienceRestrictionType.java 2011-06-21 20:31:55 UTC (rev 1013) @@ -0,0 +1,80 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2008, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.picketlink.identity.federation.saml.v2.assertion; + +import java.io.Serializable; +import java.net.URI; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; + +/** + * Java class for AudienceRestrictionType complex type. + * + * The following schema fragment specifies the expected content contained within this class. + * + * <pre> + * <complexType name="AudienceRestrictionType"> + * <complexContent> + * <extension base="{urn:oasis:names:tc:SAML:2.0:assertion}ConditionAbstractType"> + * <sequence> + * <element ref="{urn:oasis:names:tc:SAML:2.0:assertion}Audience" maxOccurs="unbounded"/> + * </sequence> + * </extension> + * </complexContent> + * </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 Property changes on: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/assertion/AudienceRestrictionType.java ___________________________________________________________________ Added: svn:executable + * Added: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/assertion/AuthnContextClassRefType.java =================================================================== --- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/assertion/AuthnContextClassRefType.java (rev 0) +++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/assertion/AuthnContextClassRefType.java 2011-06-21 20:31:55 UTC (rev 1013) @@ -0,0 +1,82 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2008, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.picketlink.identity.federation.saml.v2.assertion; + +import java.io.Serializable; +import java.net.URI; + +/** + * Type that represents an AuthnContextClassRef + * @author Anil.Saldhana(a)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 Property changes on: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/assertion/AuthnContextClassRefType.java ___________________________________________________________________ Added: svn:executable + * Added: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/assertion/AuthnContextDeclRefType.java =================================================================== --- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/assertion/AuthnContextDeclRefType.java (rev 0) +++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/assertion/AuthnContextDeclRefType.java 2011-06-21 20:31:55 UTC (rev 1013) @@ -0,0 +1,75 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2008, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.picketlink.identity.federation.saml.v2.assertion; + +import java.io.Serializable; +import java.net.URI; + +/** + * Type that represents an AuthnContextDeclRef + * @author Anil.Saldhana(a)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; + } +} Added: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/assertion/AuthnContextDeclType.java =================================================================== --- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/assertion/AuthnContextDeclType.java (rev 0) +++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/assertion/AuthnContextDeclType.java 2011-06-21 20:31:55 UTC (rev 1013) @@ -0,0 +1,82 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2008, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.picketlink.identity.federation.saml.v2.assertion; + +import java.io.Serializable; +import java.net.URI; + +/** + * Type that represents an AuthnContextDecl + * @author Anil.Saldhana(a)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 Added: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/assertion/AuthnContextType.java =================================================================== --- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/assertion/AuthnContextType.java (rev 0) +++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/assertion/AuthnContextType.java 2011-06-21 20:31:55 UTC (rev 1013) @@ -0,0 +1,209 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2008, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.picketlink.identity.federation.saml.v2.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; + +/** + * Java class for AuthnContextType complex type. + * + * The following schema fragment specifies the expected content contained within this class. + * + * <pre> + * <complexType name="AuthnContextType"> + * <complexContent> + * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> + * <sequence> + * <choice> + * <sequence> + * <element ref="{urn:oasis:names:tc:SAML:2.0:assertion}AuthnContextClassRef"/> + * <choice minOccurs="0"> + * <element ref="{urn:oasis:names:tc:SAML:2.0:assertion}AuthnContextDecl"/> + * <element ref="{urn:oasis:names:tc:SAML:2.0:assertion}AuthnContextDeclRef"/> + * </choice> + * </sequence> + * <choice> + * <element ref="{urn:oasis:names:tc:SAML:2.0:assertion}AuthnContextDecl"/> + * <element ref="{urn:oasis:names:tc:SAML:2.0:assertion}AuthnContextDeclRef"/> + * </choice> + * </choice> + * <element ref="{urn:oasis:names:tc:SAML:2.0:assertion}AuthenticatingAuthority" maxOccurs="unbounded" minOccurs="0"/> + * </sequence> + * </restriction> + * </complexContent> + * </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 Property changes on: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/assertion/AuthnContextType.java ___________________________________________________________________ Added: svn:executable + * Added: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/assertion/AuthnStatementType.java =================================================================== --- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/assertion/AuthnStatementType.java (rev 0) +++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/assertion/AuthnStatementType.java 2011-06-21 20:31:55 UTC (rev 1013) @@ -0,0 +1,174 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2008, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.picketlink.identity.federation.saml.v2.assertion; + +import javax.xml.datatype.XMLGregorianCalendar; + + +/** + * Java class for AuthnStatementType complex type. + * + * The following schema fragment specifies the expected content contained within this class. + * + * <pre> + * <complexType name="AuthnStatementType"> + * <complexContent> + * <extension base="{urn:oasis:names:tc:SAML:2.0:assertion}StatementAbstractType"> + * <sequence> + * <element ref="{urn:oasis:names:tc:SAML:2.0:assertion}SubjectLocality" minOccurs="0"/> + * <element ref="{urn:oasis:names:tc:SAML:2.0:assertion}AuthnContext"/> + * </sequence> + * <attribute name="AuthnInstant" use="required" type="{http://www.w3.org/2001/XMLSchema}dateTime" /> + * <attribute name="SessionIndex" type="{http://www.w3.org/2001/XMLSchema}string" /> + * <attribute name="SessionNotOnOrAfter" type="{http://www.w3.org/2001/XMLSchema}dateTime" /> + * </extension> + * </complexContent> + * </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 Property changes on: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/assertion/AuthnStatementType.java ___________________________________________________________________ Added: svn:executable + * Added: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/assertion/AuthzDecisionStatementType.java =================================================================== --- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/assertion/AuthzDecisionStatementType.java (rev 0) +++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/assertion/AuthzDecisionStatementType.java 2011-06-21 20:31:55 UTC (rev 1013) @@ -0,0 +1,158 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2008, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.picketlink.identity.federation.saml.v2.assertion; + +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; + + +/** + * Java class for AuthzDecisionStatementType complex type. + * + * The following schema fragment specifies the expected content contained within this class. + * + * <pre> + * <complexType name="AuthzDecisionStatementType"> + * <complexContent> + * <extension base="{urn:oasis:names:tc:SAML:2.0:assertion}StatementAbstractType"> + * <sequence> + * <element ref="{urn:oasis:names:tc:SAML:2.0:assertion}Action" maxOccurs="unbounded"/> + * <element ref="{urn:oasis:names:tc:SAML:2.0:assertion}Evidence" minOccurs="0"/> + * </sequence> + * <attribute name="Resource" use="required" type="{http://www.w3.org/2001/XMLSchema}anyURI" /> + * <attribute name="Decision" use="required" type="{urn:oasis:names:tc:SAML:2.0:assertion}DecisionType" /> + * </extension> + * </complexContent> + * </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 Property changes on: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/assertion/AuthzDecisionStatementType.java ___________________________________________________________________ Added: svn:executable + * Added: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/assertion/BaseIDAbstractType.java =================================================================== --- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/assertion/BaseIDAbstractType.java (rev 0) +++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/assertion/BaseIDAbstractType.java 2011-06-21 20:31:55 UTC (rev 1013) @@ -0,0 +1,63 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2008, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.picketlink.identity.federation.saml.v2.assertion; + +import java.io.Serializable; + +/** + * Abstract Type that represents an ID + <pre> + <attributeGroup name="IDNameQualifiers"> + <attribute name="NameQualifier" type="string" use="optional"/> + <attribute name="SPNameQualifier" type="string" use="optional"/> + </attributeGroup> + + <complexType name="BaseIDAbstractType" abstract="true"> + <attributeGroup ref="saml:IDNameQualifiers"/> + </complexType> + </pre> + * @author Anil.Saldhana(a)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 Property changes on: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/assertion/BaseIDAbstractType.java ___________________________________________________________________ Added: svn:executable + * Added: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/assertion/ConditionAbstractType.java =================================================================== --- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/assertion/ConditionAbstractType.java (rev 0) +++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/assertion/ConditionAbstractType.java 2011-06-21 20:31:55 UTC (rev 1013) @@ -0,0 +1,46 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2008, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.picketlink.identity.federation.saml.v2.assertion; + +import java.io.Serializable; + + +/** + * Java class for ConditionAbstractType complex type. + * + * The following schema fragment specifies the expected content contained within this class. + * + * <pre> + * <complexType name="ConditionAbstractType"> + * <complexContent> + * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> + * </restriction> + * </complexContent> + * </complexType> + * </pre> + * + * + */ +public abstract class ConditionAbstractType implements Serializable +{ + private static final long serialVersionUID = 1L; +} \ No newline at end of file Added: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/assertion/ConditionsType.java =================================================================== --- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/assertion/ConditionsType.java (rev 0) +++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/assertion/ConditionsType.java 2011-06-21 20:31:55 UTC (rev 1013) @@ -0,0 +1,136 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2008, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.picketlink.identity.federation.saml.v2.assertion; + +import java.io.Serializable; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; + +import javax.xml.datatype.XMLGregorianCalendar; + + +/** + * Java class for ConditionsType complex type. + * + * The following schema fragment specifies the expected content contained within this class. + * + * <pre> + * <complexType name="ConditionsType"> + * <complexContent> + * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> + * <choice maxOccurs="unbounded" minOccurs="0"> + * <element ref="{urn:oasis:names:tc:SAML:2.0:assertion}Condition"/> + * <element ref="{urn:oasis:names:tc:SAML:2.0:assertion}AudienceRestriction"/> + * <element ref="{urn:oasis:names:tc:SAML:2.0:assertion}OneTimeUse"/> + * <element ref="{urn:oasis:names:tc:SAML:2.0:assertion}ProxyRestriction"/> + * </choice> + * <attribute name="NotBefore" type="{http://www.w3.org/2001/XMLSchema}dateTime" /> + * <attribute name="NotOnOrAfter" type="{http://www.w3.org/2001/XMLSchema}dateTime" /> + * </restriction> + * </complexContent> + * </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 Property changes on: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/assertion/ConditionsType.java ___________________________________________________________________ Added: svn:executable + * Added: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/assertion/DecisionType.java =================================================================== --- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/assertion/DecisionType.java (rev 0) +++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/assertion/DecisionType.java 2011-06-21 20:31:55 UTC (rev 1013) @@ -0,0 +1,66 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2008, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.picketlink.identity.federation.saml.v2.assertion; + +/** + * Java class for DecisionType. + * + * The following schema fragment specifies the expected content contained within this class. + * + * <pre> + * <simpleType name="DecisionType"> + * <restriction base="{http://www.w3.org/2001/XMLSchema}string"> + * <enumeration value="Permit"/> + * <enumeration value="Deny"/> + * <enumeration value="Indeterminate"/> + * </restriction> + * </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 Property changes on: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/assertion/DecisionType.java ___________________________________________________________________ Added: svn:executable + * Added: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/assertion/EncryptedAssertionType.java =================================================================== --- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/assertion/EncryptedAssertionType.java (rev 0) +++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/assertion/EncryptedAssertionType.java 2011-06-21 20:31:55 UTC (rev 1013) @@ -0,0 +1,49 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2008, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.picketlink.identity.federation.saml.v2.assertion; + +import org.w3c.dom.Element; + +/** + * Assertion that is encrypted + * @author Anil.Saldhana(a)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 Property changes on: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/assertion/EncryptedAssertionType.java ___________________________________________________________________ Added: svn:executable + * Added: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/assertion/EncryptedElementType.java =================================================================== --- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/assertion/EncryptedElementType.java (rev 0) +++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/assertion/EncryptedElementType.java 2011-06-21 20:31:55 UTC (rev 1013) @@ -0,0 +1,66 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2008, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.picketlink.identity.federation.saml.v2.assertion; + +import java.io.Serializable; + +import org.w3c.dom.Element; + +/** + * Represents an element that is encrypted + * @author Anil.Saldhana(a)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 Property changes on: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/assertion/EncryptedElementType.java ___________________________________________________________________ Added: svn:executable + * Added: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/assertion/EvidenceType.java =================================================================== --- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/assertion/EvidenceType.java (rev 0) +++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/assertion/EvidenceType.java 2011-06-21 20:31:55 UTC (rev 1013) @@ -0,0 +1,134 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2008, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ + +package org.picketlink.identity.federation.saml.v2.assertion; + +import java.io.Serializable; +import java.net.URI; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; + + +/** + * Java class for EvidenceType complex type. + * + * The following schema fragment specifies the expected content contained within this class. + * + * <pre> + * <complexType name="EvidenceType"> + * <complexContent> + * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> + * <choice maxOccurs="unbounded"> + * <element ref="{urn:oasis:names:tc:SAML:2.0:assertion}AssertionIDRef"/> + * <element ref="{urn:oasis:names:tc:SAML:2.0:assertion}AssertionURIRef"/> + * <element ref="{urn:oasis:names:tc:SAML:2.0:assertion}Assertion"/> + * <element ref="{urn:oasis:names:tc:SAML:2.0:assertion}EncryptedAssertion"/> + * </choice> + * </restriction> + * </complexContent> + * </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 Added: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/assertion/KeyInfoConfirmationDataType.java =================================================================== --- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/assertion/KeyInfoConfirmationDataType.java (rev 0) +++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/assertion/KeyInfoConfirmationDataType.java 2011-06-21 20:31:55 UTC (rev 1013) @@ -0,0 +1,60 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2008, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.picketlink.identity.federation.saml.v2.assertion; + +import org.w3c.dom.Element; + +/** + * Java class for KeyInfoConfirmationDataType complex type. + * + * The following schema fragment specifies the expected content contained within this class. + * + * <pre> + * <complexType name="KeyInfoConfirmationDataType"> + * <complexContent> + * <restriction base="{urn:oasis:names:tc:SAML:2.0:assertion}SubjectConfirmationDataType"> + * <sequence> + * <element ref="{http://www.w3.org/2000/09/xmldsig#}KeyInfo" maxOccurs="unbounded"/> + * </sequence> + * </restriction> + * </complexContent> + * </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 Property changes on: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/assertion/KeyInfoConfirmationDataType.java ___________________________________________________________________ Added: svn:executable + * Added: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/assertion/NameIDType.java =================================================================== --- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/assertion/NameIDType.java (rev 0) +++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/assertion/NameIDType.java 2011-06-21 20:31:55 UTC (rev 1013) @@ -0,0 +1,88 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2008, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.picketlink.identity.federation.saml.v2.assertion; + +import java.net.URI; + +/** + * Represents a NameIDType + * @author Anil.Saldhana(a)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 Property changes on: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/assertion/NameIDType.java ___________________________________________________________________ Added: svn:executable + * Added: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/assertion/OneTimeUseType.java =================================================================== --- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/assertion/OneTimeUseType.java (rev 0) +++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/assertion/OneTimeUseType.java 2011-06-21 20:31:55 UTC (rev 1013) @@ -0,0 +1,44 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2008, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.picketlink.identity.federation.saml.v2.assertion; + + +/** + * Java class for OneTimeUseType complex type. + * + * The following schema fragment specifies the expected content contained within this class. + * + * <pre> + * <complexType name="OneTimeUseType"> + * <complexContent> + * <extension base="{urn:oasis:names:tc:SAML:2.0:assertion}ConditionAbstractType"> + * </extension> + * </complexContent> + * </complexType> + * </pre> + * + * + */ +public class OneTimeUseType + extends ConditionAbstractType +{ +} \ No newline at end of file Property changes on: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/assertion/OneTimeUseType.java ___________________________________________________________________ Added: svn:executable + * Added: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/assertion/ProxyRestrictionType.java =================================================================== --- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/assertion/ProxyRestrictionType.java (rev 0) +++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/assertion/ProxyRestrictionType.java 2011-06-21 20:31:55 UTC (rev 1013) @@ -0,0 +1,108 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2008, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.picketlink.identity.federation.saml.v2.assertion; + +import java.math.BigInteger; +import java.net.URI; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; + + +/** + * Java class for ProxyRestrictionType complex type. + * + * The following schema fragment specifies the expected content contained within this class. + * + * <pre> + * <complexType name="ProxyRestrictionType"> + * <complexContent> + * <extension base="{urn:oasis:names:tc:SAML:2.0:assertion}ConditionAbstractType"> + * <sequence> + * <element ref="{urn:oasis:names:tc:SAML:2.0:assertion}Audience" maxOccurs="unbounded" minOccurs="0"/> + * </sequence> + * <attribute name="Count" type="{http://www.w3.org/2001/XMLSchema}nonNegativeInteger" /> + * </extension> + * </complexContent> + * </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 Property changes on: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/assertion/ProxyRestrictionType.java ___________________________________________________________________ Added: svn:executable + * Added: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/assertion/StatementAbstractType.java =================================================================== --- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/assertion/StatementAbstractType.java (rev 0) +++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/assertion/StatementAbstractType.java 2011-06-21 20:31:55 UTC (rev 1013) @@ -0,0 +1,48 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2008, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ + +package org.picketlink.identity.federation.saml.v2.assertion; + +import java.io.Serializable; + + + +/** + * Java class for StatementAbstractType complex type. + * + * The following schema fragment specifies the expected content contained within this class. + * + * <pre> + * <complexType name="StatementAbstractType"> + * <complexContent> + * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> + * </restriction> + * </complexContent> + * </complexType> + * </pre> + * + * + */ +public abstract class StatementAbstractType implements Serializable +{ + private static final long serialVersionUID = 1L; +} \ No newline at end of file Property changes on: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/assertion/StatementAbstractType.java ___________________________________________________________________ Added: svn:executable + * Added: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/assertion/SubjectConfirmationDataType.java =================================================================== --- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/assertion/SubjectConfirmationDataType.java (rev 0) +++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/assertion/SubjectConfirmationDataType.java 2011-06-21 20:31:55 UTC (rev 1013) @@ -0,0 +1,247 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2008, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.picketlink.identity.federation.saml.v2.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; + +/** + * Java class for SubjectConfirmationDataType complex type. + * + * The following schema fragment specifies the expected content contained within this class. + * + * <pre> + * <complexType name="SubjectConfirmationDataType"> + * <complexContent> + * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> + * <sequence> + * <any/> + * </sequence> + * <attribute name="NotBefore" type="{http://www.w3.org/2001/XMLSchema}dateTime" /> + * <attribute name="NotOnOrAfter" type="{http://www.w3.org/2001/XMLSchema}dateTime" /> + * <attribute name="Recipient" type="{http://www.w3.org/2001/XMLSchema}anyURI" /> + * <attribute name="InResponseTo" type="{http://www.w3.org/2001/XMLSchema}NCName" /> + * <attribute name="Address" type="{http://www.w3.org/2001/XMLSchema}string" /> + * </restriction> + * </complexContent> + * </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. + * + * + * 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 Property changes on: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/assertion/SubjectConfirmationDataType.java ___________________________________________________________________ Added: svn:executable + * Added: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/assertion/SubjectConfirmationType.java =================================================================== --- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/assertion/SubjectConfirmationType.java (rev 0) +++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/assertion/SubjectConfirmationType.java 2011-06-21 20:31:55 UTC (rev 1013) @@ -0,0 +1,182 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2008, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ + +package org.picketlink.identity.federation.saml.v2.assertion; + +import java.io.Serializable; + + + +/** + * Java class for SubjectConfirmationType complex type. + * + * The following schema fragment specifies the expected content contained within this class. + * + * <pre> + * <complexType name="SubjectConfirmationType"> + * <complexContent> + * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> + * <sequence> + * <choice minOccurs="0"> + * <element ref="{urn:oasis:names:tc:SAML:2.0:assertion}BaseID"/> + * <element ref="{urn:oasis:names:tc:SAML:2.0:assertion}NameID"/> + * <element ref="{urn:oasis:names:tc:SAML:2.0:assertion}EncryptedID"/> + * </choice> + * <element ref="{urn:oasis:names:tc:SAML:2.0:assertion}SubjectConfirmationData" minOccurs="0"/> + * </sequence> + * <attribute name="Method" use="required" type="{http://www.w3.org/2001/XMLSchema}anyURI" /> + * </restriction> + * </complexContent> + * </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 Property changes on: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/assertion/SubjectConfirmationType.java ___________________________________________________________________ Added: svn:executable + * Added: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/assertion/SubjectLocalityType.java =================================================================== --- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/assertion/SubjectLocalityType.java (rev 0) +++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/assertion/SubjectLocalityType.java 2011-06-21 20:31:55 UTC (rev 1013) @@ -0,0 +1,103 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2008, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.picketlink.identity.federation.saml.v2.assertion; + +import java.io.Serializable; + +/** + * Java class for SubjectLocalityType complex type. + * + * The following schema fragment specifies the expected content contained within this class. + * + * <pre> + * <complexType name="SubjectLocalityType"> + * <complexContent> + * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> + * <attribute name="Address" type="{http://www.w3.org/2001/XMLSchema}string" /> + * <attribute name="DNSName" type="{http://www.w3.org/2001/XMLSchema}string" /> + * </restriction> + * </complexContent> + * </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 Added: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/assertion/SubjectType.java =================================================================== --- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/assertion/SubjectType.java (rev 0) +++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/assertion/SubjectType.java 2011-06-21 20:31:55 UTC (rev 1013) @@ -0,0 +1,163 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2008, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.picketlink.identity.federation.saml.v2.assertion; + +import java.io.Serializable; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; + +/** + * Java class for SubjectType complex type. + * + * The following schema fragment specifies the expected content contained within this class. + * + * <pre> + * <complexType name="SubjectType"> + * <complexContent> + * <restriction base="{http://www.w3.org/2001/XMLSchema}anyType"> + * <choice> + * <sequence> + * <choice> + * <element ref="{urn:oasis:names:tc:SAML:2.0:assertion}BaseID"/> + * <element ref="{urn:oasis:names:tc:SAML:2.0:assertion}NameID"/> + * <element ref="{urn:oasis:names:tc:SAML:2.0:assertion}EncryptedID"/> + * </choice> + * <element ref="{urn:oasis:names:tc:SAML:2.0:assertion}SubjectConfirmation" maxOccurs="unbounded" minOccurs="0"/> + * </sequence> + * <element ref="{urn:oasis:names:tc:SAML:2.0:assertion}SubjectConfirmation" maxOccurs="unbounded"/> + * </choice> + * </restriction> + * </complexContent> + * </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 Property changes on: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/assertion/SubjectType.java ___________________________________________________________________ Added: svn:executable + * Added: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/assertion/URIType.java =================================================================== --- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/assertion/URIType.java (rev 0) +++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/assertion/URIType.java 2011-06-21 20:31:55 UTC (rev 1013) @@ -0,0 +1,34 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2008, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.picketlink.identity.federation.saml.v2.assertion; + +import java.net.URI; + +/** + * A type that holds {@code URI} + * @author Anil.Saldhana(a)redhat.com + * @since Nov 24, 2010 + */ +public interface URIType +{ + URI getValue(); +} \ No newline at end of file Property changes on: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/assertion/URIType.java ___________________________________________________________________ Added: svn:executable + * Added: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/assertion/package-info.java =================================================================== --- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/assertion/package-info.java (rev 0) +++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/assertion/package-info.java 2011-06-21 20:31:55 UTC (rev 1013) @@ -0,0 +1,4 @@ +/** + * Package for the model classes for the SAML2 Assertion + */ +package org.picketlink.identity.federation.saml.v2.assertion; \ No newline at end of file Property changes on: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/assertion/package-info.java ___________________________________________________________________ Added: svn:executable + * Modified: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/profiles/sso/ecp/RequestType.java =================================================================== --- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/profiles/sso/ecp/RequestType.java 2011-06-17 20:17:09 UTC (rev 1012) +++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/profiles/sso/ecp/RequestType.java 2011-06-21 20:31:55 UTC (rev 1013) @@ -1,7 +1,7 @@ package org.picketlink.identity.federation.saml.v2.profiles.sso.ecp; -import org.picketlink.identity.federation.newmodel.saml.v2.assertion.NameIDType; -import org.picketlink.identity.federation.newmodel.saml.v2.protocol.IDPListType; +import org.picketlink.identity.federation.saml.v2.assertion.NameIDType; +import org.picketlink.identity.federation.saml.v2.protocol.IDPListType; Added: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/profiles/xacml/assertion/XACMLAuthzDecisionStatementType.java =================================================================== --- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/profiles/xacml/assertion/XACMLAuthzDecisionStatementType.java (rev 0) +++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/profiles/xacml/assertion/XACMLAuthzDecisionStatementType.java 2011-06-21 20:31:55 UTC (rev 1013) @@ -0,0 +1,104 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2008, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.picketlink.identity.federation.saml.v2.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.saml.v2.assertion.StatementAbstractType; + + +/** + * Java class for XACMLAuthzDecisionStatementType complex type. + * + * The following schema fragment specifies the expected content contained within this class. + * + * <pre> + * <complexType name="XACMLAuthzDecisionStatementType"> + * <complexContent> + * <extension base="{urn:oasis:names:tc:SAML:2.0:assertion}StatementAbstractType"> + * <sequence> + * <element ref="{urn:oasis:names:tc:xacml:2.0:context:schema:os}Response"/> + * <element ref="{urn:oasis:names:tc:xacml:2.0:context:schema:os}Request" minOccurs="0"/> + * </sequence> + * </extension> + * </complexContent> + * </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 Property changes on: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/profiles/xacml/assertion/XACMLAuthzDecisionStatementType.java ___________________________________________________________________ Added: svn:executable + * Added: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/profiles/xacml/assertion/XACMLPolicyStatementType.java =================================================================== --- federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/profiles/xacml/assertion/XACMLPolicyStatementType.java (rev 0) +++ federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/profiles/xacml/assertion/XACMLPolicyStatementType.java 2011-06-21 20:31:55 UTC (rev 1013) @@ -0,0 +1,93 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2008, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.picketlink.identity.federation.saml.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.saml.v2.assertion.StatementAbstractType; + +/** + * Java class for XACMLPolicyStatementType complex type. + * + * The following schema fragment specifies the expected content contained within this class. + * + * <pre> + * <complexType name="XACMLPolicyStatementType"> + * <complexContent> + * <extension base="{urn:oasis:names:tc:SAML:2.0:assertion}StatementAbstractType"> + * <choice maxOccurs="unbounded" minOccurs="0"> + * <element ref="{urn:oasis:names:tc:xacml:2.0:policy:schema:os}Policy"/> + * <element ref="{urn:oasis:names:tc:xacml:2.0:policy:schema:os}PolicySet"/> + * </choice> + * </extension> + * </complexContent> + * </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 Property changes on: federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/profiles/xacml/assertion/XACMLPolicyStatementType.java ___________________________________________________________________ Added: svn:executable + *

13 years, 6 months

1
0
0 / 0

Picketlink SVN: r1012 - in federation/trunk: picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/util and 1 other directories.

by picketlink-commits＠lists.jboss.org

Author: anil.saldhana(a)jboss.com Date: 2011-06-17 16:17:09 -0400 (Fri, 17 Jun 2011) New Revision: 1012 Modified: federation/trunk/picketlink-bindings-jboss/src/main/java/org/picketlink/identity/federation/bindings/jboss/auth/SAML2STSLoginModule.java federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/util/SOAPUtil.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/STSClient.java Log: revert back to use Source rather than SOAPMessage on the client side for Dispatch Modified: federation/trunk/picketlink-bindings-jboss/src/main/java/org/picketlink/identity/federation/bindings/jboss/auth/SAML2STSLoginModule.java =================================================================== --- federation/trunk/picketlink-bindings-jboss/src/main/java/org/picketlink/identity/federation/bindings/jboss/auth/SAML2STSLoginModule.java 2011-06-17 20:11:43 UTC (rev 1011) +++ federation/trunk/picketlink-bindings-jboss/src/main/java/org/picketlink/identity/federation/bindings/jboss/auth/SAML2STSLoginModule.java 2011-06-17 20:17:09 UTC (rev 1012) @@ -40,7 +40,7 @@ import javax.security.auth.callback.CallbackHandler; import javax.security.auth.login.LoginException; import javax.xml.datatype.XMLGregorianCalendar; -import javax.xml.soap.SOAPMessage; +import javax.xml.transform.Source; import javax.xml.ws.Dispatch; import org.apache.log4j.Logger; @@ -506,7 +506,7 @@ // to the STS and set them in the Dispatch request context. if (!this.options.isEmpty()) { - Dispatch<SOAPMessage> dispatch = client.getDispatch(); + Dispatch<Source> dispatch = client.getDispatch(); for (Map.Entry<String, ?> entry : this.options.entrySet()) dispatch.getRequestContext().put(entry.getKey(), entry.getValue()); } Modified: federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/util/SOAPUtil.java =================================================================== --- federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/util/SOAPUtil.java 2011-06-17 20:11:43 UTC (rev 1011) +++ federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/util/SOAPUtil.java 2011-06-17 20:17:09 UTC (rev 1012) @@ -34,7 +34,7 @@ import javax.xml.transform.Source; import org.picketlink.identity.federation.core.saml.v2.util.DocumentUtil; -import org.w3c.dom.Node; +import org.w3c.dom.Document; /** * Utility class dealing with SAAJ @@ -43,6 +43,11 @@ */ public class SOAPUtil { + /** + * Create an empty {@link SOAPMessage} + * @return + * @throws SOAPException + */ public static SOAPMessage create() throws SOAPException { MessageFactory messageFactory = MessageFactory.newInstance(); @@ -51,12 +56,25 @@ return soapMessage; } + /** + * Given a stream of {@link SOAPMessage}, construct the {@link SOAPMessage} + * @param is + * @return + * @throws IOException + * @throws SOAPException + */ public static SOAPMessage getSOAPMessage(InputStream is) throws IOException, SOAPException { MessageFactory messageFactory = MessageFactory.newInstance(); return messageFactory.createMessage(null, is); } + /** + * Given a string message, create a {@link SOAPFault} + * @param message + * @return + * @throws SOAPException + */ public static SOAPMessage createFault(String message) throws SOAPException { MessageFactory messageFactory = MessageFactory.newInstance(); @@ -70,11 +88,23 @@ return msg; } - public static Node getSOAPData(SOAPMessage soapMessage) throws SOAPException + /** + * Given a {@link SOAPMessage}, get the content as a {@link Document} + * @param soapMessage + * @return + * @throws SOAPException + */ + public static Document getSOAPData(SOAPMessage soapMessage) throws SOAPException { - return soapMessage.getSOAPBody().getFirstChild(); + return soapMessage.getSOAPBody().extractContentAsDocument(); } + /** + * Add content to {@link SOAPMessage} + * @param data + * @param soapMessage + * @throws SOAPException + */ public static void addData(Source data, SOAPMessage soapMessage) throws SOAPException { try 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-17 20:11:43 UTC (rev 1011) +++ federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/wstrust/PicketLinkSTS.java 2011-06-17 20:17:09 UTC (rev 1012) @@ -122,18 +122,16 @@ { throw new WebServiceException(e); } - Document document; + Node payLoad; BaseRequestSecurityToken baseRequest; try { - Node payLoad = request.getSOAPBody().getFirstChild(); - document = DocumentUtil.createDocument(); - payLoad = document.importNode(payLoad, true); - document.appendChild(payLoad); + payLoad = SOAPUtil.getSOAPData(request); WSTrustParser parser = new WSTrustParser(); - baseRequest = (BaseRequestSecurityToken) parser.parse(DocumentUtil.getNodeAsStream(document)); + System.out.println(DocumentUtil.getNodeAsString(payLoad)); + baseRequest = (BaseRequestSecurityToken) parser.parse(DocumentUtil.getNodeAsStream(payLoad)); } catch (Exception e) { @@ -143,7 +141,15 @@ if (baseRequest instanceof RequestSecurityToken) { RequestSecurityToken req = (RequestSecurityToken) baseRequest; - req.setRSTDocument(document); + try + { + req.setRSTDocument((Document) payLoad); + } + catch (Exception e) + { + throw new RuntimeException(e); + } + if (valueType != null) { req.setBinaryValueType(URI.create(valueType)); @@ -194,13 +200,14 @@ * * @see org.picketlink.identity.federation.core.wstrust.SecurityTokenService#invoke(javax.xml.transform.Source) */ - public Source invoke(Source request) + /*public Source invoke(Source request) { BaseRequestSecurityToken baseRequest; Document document; try { document = (Document) DocumentUtil.getNodeFromSource(request); + System.out.println(DocumentUtil.asString(document)); baseRequest = (BaseRequestSecurityToken) new WSTrustParser().parse(DocumentUtil.getSourceAsStream(request)); } catch (Exception e) @@ -218,7 +225,7 @@ return this.handleTokenRequestCollection((RequestSecurityTokenCollection) baseRequest); else throw new WebServiceException("Invalid security token request"); - } + }*/ /** * Modified: federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/wstrust/STSClient.java =================================================================== --- federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/wstrust/STSClient.java 2011-06-17 20:11:43 UTC (rev 1011) +++ federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/wstrust/STSClient.java 2011-06-17 20:17:09 UTC (rev 1012) @@ -25,8 +25,6 @@ import javax.xml.namespace.QName; import javax.xml.soap.SOAPBody; import javax.xml.soap.SOAPEnvelope; -import javax.xml.soap.SOAPException; -import javax.xml.soap.SOAPMessage; import javax.xml.soap.SOAPPart; import javax.xml.transform.Source; import javax.xml.transform.dom.DOMResult; @@ -39,7 +37,6 @@ import org.picketlink.identity.federation.core.parsers.wst.WSTrustParser; import org.picketlink.identity.federation.core.saml.v2.util.DocumentUtil; -import org.picketlink.identity.federation.core.util.SOAPUtil; import org.picketlink.identity.federation.core.util.StringUtil; import org.picketlink.identity.federation.core.wstrust.wrappers.RequestSecurityToken; import org.picketlink.identity.federation.core.wstrust.wrappers.RequestSecurityTokenResponse; @@ -62,7 +59,7 @@ */ public class STSClient { - private final ThreadLocal<Dispatch<SOAPMessage>> dispatchLocal = new InheritableThreadLocal<Dispatch<SOAPMessage>>(); + private final ThreadLocal<Dispatch<Source>> dispatchLocal = new InheritableThreadLocal<Dispatch<Source>>(); private final String targetNS = "http://org.picketlink.trust/sts/"; @@ -105,7 +102,7 @@ Service jaxwsService = Service.create(service); jaxwsService.addPort(portName, SOAPBinding.SOAP11HTTP_BINDING, config.getEndPointAddress()); - Dispatch<SOAPMessage> dispatch = jaxwsService.createDispatch(portName, SOAPMessage.class, Mode.MESSAGE); + Dispatch<Source> dispatch = jaxwsService.createDispatch(portName, Source.class, Mode.PAYLOAD); Map<String, Object> reqContext = dispatch.getRequestContext(); String username = config.getUsername(); @@ -122,7 +119,7 @@ * Set the {@link Dispatch} object for use * @param dispatch */ - public void setDispatch(Dispatch<SOAPMessage> dispatch) + public void setDispatch(Dispatch<Source> dispatch) { if (dispatch == null) throw new IllegalArgumentException("dispatch is null"); @@ -285,22 +282,13 @@ validateDispatch(); DOMSource requestSource = this.createSourceFromRequest(request); - SOAPMessage requestMessage; - try - { - requestMessage = SOAPUtil.create(); - SOAPUtil.addData(requestSource, requestMessage); - } - catch (SOAPException e1) - { - throw new WSTrustException("Unable to create SOAP Message:", e1); - } - SOAPMessage responseMessage = dispatchLocal.get().invoke(requestMessage); + Source response = dispatchLocal.get().invoke(requestSource); NodeList nodes; try { - Node documentNode = SOAPUtil.getSOAPData(responseMessage); + Node documentNode = DocumentUtil.getNodeFromSource(response); + Document responseDoc = documentNode instanceof Document ? (Document) documentNode : documentNode .getOwnerDocument(); @@ -331,6 +319,8 @@ throw new WSTrustException("NodeList is null"); Node rstr = nodes.item(0); + if (rstr == null) + throw new WSTrustException("Have not found RSTR in the payload"); return (Element) rstr.getFirstChild(); } @@ -356,12 +346,11 @@ // send the token request to JBoss STS and get the response. DOMSource requestSource = this.createSourceFromRequest(request); - SOAPMessage responseMessage = dispatchLocal.get().invoke(createSOAPMessage(requestSource)); - + Source response = dispatchLocal.get().invoke(requestSource); NodeList nodes; try { - Node documentNode = SOAPUtil.getSOAPData(responseMessage); + Node documentNode = DocumentUtil.getNodeFromSource(response); Document responseDoc = documentNode instanceof Document ? (Document) documentNode : documentNode .getOwnerDocument(); @@ -416,10 +405,10 @@ DOMSource requestSource = this.createSourceFromRequest(request); - SOAPMessage responseMessage = dispatchLocal.get().invoke(createSOAPMessage(requestSource)); + Source response = dispatchLocal.get().invoke(requestSource); try { - InputStream stream = DocumentUtil.getNodeAsStream(SOAPUtil.getSOAPData(responseMessage)); + InputStream stream = DocumentUtil.getNodeAsStream(DocumentUtil.getNodeFromSource(response)); RequestSecurityTokenResponseCollection responseCollection = (RequestSecurityTokenResponseCollection) new WSTrustParser() .parse(stream); RequestSecurityTokenResponse tokenResponse = responseCollection.getRequestSecurityTokenResponses().get(0); @@ -461,12 +450,11 @@ request.setContext("context"); DOMSource requestSource = this.createSourceFromRequest(request); - SOAPMessage responseMessage = dispatchLocal.get().invoke(createSOAPMessage(requestSource)); - + Source response = dispatchLocal.get().invoke(requestSource); // get the WS-Trust response and check for presence of the RequestTokenCanceled element. try { - InputStream stream = DocumentUtil.getNodeAsStream(SOAPUtil.getSOAPData(responseMessage)); + InputStream stream = DocumentUtil.getNodeAsStream(DocumentUtil.getNodeFromSource(response)); RequestSecurityTokenResponseCollection responseCollection = (RequestSecurityTokenResponseCollection) new WSTrustParser() .parse(stream); RequestSecurityTokenResponse tokenResponse = responseCollection.getRequestSecurityTokenResponses().get(0); @@ -484,7 +472,7 @@ * Get the dispatch object * @return */ - public Dispatch<SOAPMessage> getDispatch() + public Dispatch<Source> getDispatch() { return dispatchLocal.get(); } @@ -512,18 +500,4 @@ if (getDispatch() == null) throw new RuntimeException("Dispatch has not been set"); } - - private SOAPMessage createSOAPMessage(Source source) - { - try - { - SOAPMessage soap = SOAPUtil.create(); - SOAPUtil.addData(source, soap); - return soap; - } - catch (SOAPException e) - { - throw new RuntimeException(e); - } - } -} +} \ No newline at end of file

13 years, 6 months

1
0
0 / 0

Picketlink SVN: r1011 - federation/trunk/picketlink-fed-core/src/test/java/org/picketlink/test/identity/federation/core/wstrust.

by picketlink-commits＠lists.jboss.org

Author: anil.saldhana(a)jboss.com Date: 2011-06-17 16:11:43 -0400 (Fri, 17 Jun 2011) New Revision: 1011 Modified: federation/trunk/picketlink-fed-core/src/test/java/org/picketlink/test/identity/federation/core/wstrust/PicketLinkSTSUnitTestCase.java Log: override to use the SOAPMessage version of invoke in the STS 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-17 20:10:37 UTC (rev 1010) +++ federation/trunk/picketlink-fed-core/src/test/java/org/picketlink/test/identity/federation/core/wstrust/PicketLinkSTSUnitTestCase.java 2011-06-17 20:11:43 UTC (rev 1011) @@ -41,6 +41,8 @@ import javax.xml.datatype.DatatypeConstants; import javax.xml.namespace.QName; +import javax.xml.soap.SOAPException; +import javax.xml.soap.SOAPMessage; import javax.xml.transform.Source; import javax.xml.transform.dom.DOMResult; import javax.xml.transform.dom.DOMSource; @@ -62,6 +64,7 @@ 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.util.Base64; +import org.picketlink.identity.federation.core.util.SOAPUtil; import org.picketlink.identity.federation.core.wstrust.PicketLinkSTS; import org.picketlink.identity.federation.core.wstrust.PicketLinkSTSConfiguration; import org.picketlink.identity.federation.core.wstrust.STSConfiguration; @@ -642,7 +645,6 @@ // invoke the token service. responseMessage = this.tokenService.invoke(this.createSourceFromRequest(request)); - System.out.println(DocumentUtil.getNodeAsString(DocumentUtil.getNodeFromSource(responseMessage))); baseResponse = (BaseRequestSecurityTokenResponse) parser.parse(DocumentUtil.getSourceAsStream(responseMessage)); // validate the response contents. @@ -662,7 +664,6 @@ assertion.getFirstChild().getFirstChild().setNodeValue("Tempered Issuer"); request.getValidateTarget().add(assertion); Source theRequest = this.createSourceFromRequest(request); - System.out.println("ANIL::" + DocumentUtil.asString((Document) DocumentUtil.getNodeFromSource(theRequest))); responseMessage = this.tokenService.invoke(theRequest); collection = (RequestSecurityTokenResponseCollection) parser.parse(DocumentUtil .getSourceAsStream(responseMessage)); @@ -1192,7 +1193,6 @@ // unmarshall the SAMLV2.0 assertion. Element assertionElement = (Element) requestedToken.getAny().get(0); - System.out.println(DocumentUtil.getNodeAsString(assertionElement)); AssertionType assertion = SAMLUtil.fromElement(assertionElement); // verify the contents of the unmarshalled assertion. @@ -1401,6 +1401,21 @@ this.configFileName = configFileName; } + public Source invoke(Source source) + { + try + { + SOAPMessage request = SOAPUtil.create(); + SOAPUtil.addData(source, request); + SOAPMessage response = super.invoke(request); + return new DOMSource(SOAPUtil.getSOAPData(response)); + } + catch (SOAPException e) + { + throw new RuntimeException(e); + } + } + @Override public STSConfiguration getConfiguration() throws ConfigurationException {

13 years, 6 months

1
0
0 / 0

Picketlink SVN: r1010 - in trust/trunk/jbossws/src/main/java/org/picketlink/trust/jbossws: jaas and 1 other directory.

by picketlink-commits＠lists.jboss.org

Author: anil.saldhana(a)jboss.com Date: 2011-06-17 16:10:37 -0400 (Fri, 17 Jun 2011) New Revision: 1010 Modified: trust/trunk/jbossws/src/main/java/org/picketlink/trust/jbossws/PicketLinkDispatch.java trust/trunk/jbossws/src/main/java/org/picketlink/trust/jbossws/jaas/JBWSTokenIssuingLoginModule.java Log: revert the change back to use Source Modified: trust/trunk/jbossws/src/main/java/org/picketlink/trust/jbossws/PicketLinkDispatch.java =================================================================== --- trust/trunk/jbossws/src/main/java/org/picketlink/trust/jbossws/PicketLinkDispatch.java 2011-06-17 18:37:01 UTC (rev 1009) +++ trust/trunk/jbossws/src/main/java/org/picketlink/trust/jbossws/PicketLinkDispatch.java 2011-06-17 20:10:37 UTC (rev 1010) @@ -43,6 +43,8 @@ import javax.xml.soap.SOAPException; import javax.xml.soap.SOAPFactory; import javax.xml.soap.SOAPMessage; +import javax.xml.transform.Source; +import javax.xml.transform.dom.DOMSource; import javax.xml.ws.AsyncHandler; import javax.xml.ws.Binding; import javax.xml.ws.BindingProvider; @@ -56,6 +58,7 @@ import org.picketlink.identity.federation.core.saml.v2.common.IDGenerator; import org.picketlink.identity.federation.core.util.Base64; +import org.picketlink.identity.federation.core.util.SOAPUtil; import org.picketlink.identity.federation.core.util.StringUtil; /** @@ -71,7 +74,7 @@ * @author Anil.Saldhana(a)redhat.com * @since May 10, 2011 */ -public class PicketLinkDispatch implements Dispatch<SOAPMessage> +public class PicketLinkDispatch implements Dispatch<Source> { @SuppressWarnings("rawtypes") private Dispatch parent; @@ -123,7 +126,7 @@ } @SuppressWarnings({"unchecked", "rawtypes"}) - public SOAPMessage invoke(SOAPMessage soapMessage) + public Source invoke(Source requestMessage) { PLMessageContext msgContext = new PLMessageContext(); msgContext.put(MessageContext.MESSAGE_OUTBOUND_PROPERTY, Boolean.TRUE); @@ -142,6 +145,15 @@ } msgContext.put(MessageContext.SERVLET_REQUEST, request); + SOAPMessage soapMessage = null; + try + { + soapMessage = SOAPUtil.create(); + } + catch (SOAPException e2) + { + throw new RuntimeException(e2); + } String userName = (String) parent.getRequestContext().get(BindingProvider.USERNAME_PROPERTY); String passwd = (String) parent.getRequestContext().get(BindingProvider.PASSWORD_PROPERTY); if( StringUtil.isNotNull(userName)) @@ -165,6 +177,14 @@ } } + try + { + SOAPUtil.addData(requestMessage, soapMessage); + } + catch (SOAPException e1) + { + throw new RuntimeException(e1); + } msgContext.setMessage(soapMessage); List<Handler> handlers = getBinding().getHandlerChain(); @@ -195,23 +215,30 @@ throw new RuntimeException(e); } - return response; + try + { + return new DOMSource(SOAPUtil.getSOAPData(response)); + } + catch (SOAPException e) + { + throw new RuntimeException(e); + } } @SuppressWarnings("unchecked") - public Response<SOAPMessage> invokeAsync(SOAPMessage msg) + public Response<Source> invokeAsync(Source msg) { return parent.invokeAsync(msg); } @SuppressWarnings("unchecked") - public Future<?> invokeAsync(SOAPMessage msg, AsyncHandler<SOAPMessage> handler) + public Future<?> invokeAsync(Source msg, AsyncHandler<Source> handler) { return parent.invokeAsync(msg, handler); } @SuppressWarnings("unchecked") - public void invokeOneWay(SOAPMessage msg) + public void invokeOneWay(Source msg) { parent.invokeOneWay(msg); } Modified: trust/trunk/jbossws/src/main/java/org/picketlink/trust/jbossws/jaas/JBWSTokenIssuingLoginModule.java =================================================================== --- trust/trunk/jbossws/src/main/java/org/picketlink/trust/jbossws/jaas/JBWSTokenIssuingLoginModule.java 2011-06-17 18:37:01 UTC (rev 1009) +++ trust/trunk/jbossws/src/main/java/org/picketlink/trust/jbossws/jaas/JBWSTokenIssuingLoginModule.java 2011-06-17 20:10:37 UTC (rev 1010) @@ -28,7 +28,7 @@ import javax.net.ssl.SSLSocketFactory; import javax.security.auth.login.LoginException; -import javax.xml.soap.SOAPMessage; +import javax.xml.transform.Source; import javax.xml.ws.Binding; import javax.xml.ws.Dispatch; import javax.xml.ws.handler.Handler; @@ -129,7 +129,7 @@ super(config); //Get pre-constructed Dispatch from super - Dispatch<SOAPMessage> dispatch = super.getDispatch(); + Dispatch<Source> dispatch = super.getDispatch(); String overrideDispatchStr = (String) options.get("overrideDispatch"); if( StringUtil.isNotNull(overrideDispatchStr))

13 years, 6 months

1
0
0 / 0

Picketlink SVN: r1009 - in trust/trunk/jbossws/src/main/java/org/picketlink/trust/jbossws: jaas and 1 other directory.

by picketlink-commits＠lists.jboss.org

Author: anil.saldhana(a)jboss.com Date: 2011-06-17 14:37:01 -0400 (Fri, 17 Jun 2011) New Revision: 1009 Modified: trust/trunk/jbossws/src/main/java/org/picketlink/trust/jbossws/PicketLinkDispatch.java trust/trunk/jbossws/src/main/java/org/picketlink/trust/jbossws/jaas/JBWSTokenIssuingLoginModule.java Log: use SOAPMessage rather than source Modified: trust/trunk/jbossws/src/main/java/org/picketlink/trust/jbossws/PicketLinkDispatch.java =================================================================== --- trust/trunk/jbossws/src/main/java/org/picketlink/trust/jbossws/PicketLinkDispatch.java 2011-06-17 18:30:34 UTC (rev 1008) +++ trust/trunk/jbossws/src/main/java/org/picketlink/trust/jbossws/PicketLinkDispatch.java 2011-06-17 18:37:01 UTC (rev 1009) @@ -37,17 +37,12 @@ import javax.servlet.http.HttpServletRequest; import javax.xml.bind.JAXBContext; import javax.xml.namespace.QName; -import javax.xml.soap.MessageFactory; -import javax.xml.soap.SOAPBody; import javax.xml.soap.SOAPConnection; import javax.xml.soap.SOAPConnectionFactory; import javax.xml.soap.SOAPElement; import javax.xml.soap.SOAPException; import javax.xml.soap.SOAPFactory; import javax.xml.soap.SOAPMessage; -import javax.xml.transform.Source; -import javax.xml.transform.dom.DOMResult; -import javax.xml.transform.dom.DOMSource; import javax.xml.ws.AsyncHandler; import javax.xml.ws.Binding; import javax.xml.ws.BindingProvider; @@ -62,9 +57,6 @@ import org.picketlink.identity.federation.core.saml.v2.common.IDGenerator; import org.picketlink.identity.federation.core.util.Base64; import org.picketlink.identity.federation.core.util.StringUtil; -import org.picketlink.identity.federation.core.util.TransformerUtil; -import org.w3c.dom.Document; -import org.w3c.dom.Node; /** * @@ -79,7 +71,7 @@ * @author Anil.Saldhana(a)redhat.com * @since May 10, 2011 */ -public class PicketLinkDispatch implements Dispatch<Source> +public class PicketLinkDispatch implements Dispatch<SOAPMessage> { @SuppressWarnings("rawtypes") private Dispatch parent; @@ -131,7 +123,7 @@ } @SuppressWarnings({"unchecked", "rawtypes"}) - public Source invoke(Source msg) + public SOAPMessage invoke(SOAPMessage soapMessage) { PLMessageContext msgContext = new PLMessageContext(); msgContext.put(MessageContext.MESSAGE_OUTBOUND_PROPERTY, Boolean.TRUE); @@ -148,21 +140,8 @@ { throw new RuntimeException(e1); } - msgContext.put(MessageContext.SERVLET_REQUEST, request); + msgContext.put(MessageContext.SERVLET_REQUEST, request); - MessageFactory messageFactory = null ; - SOAPMessage soapMessage = null; - - try - { - messageFactory = MessageFactory.newInstance(); - soapMessage = messageFactory.createMessage(); - } - catch (SOAPException e) - { - throw new RuntimeException( e ); - } - String userName = (String) parent.getRequestContext().get(BindingProvider.USERNAME_PROPERTY); String passwd = (String) parent.getRequestContext().get(BindingProvider.PASSWORD_PROPERTY); if( StringUtil.isNotNull(userName)) @@ -187,27 +166,7 @@ } msgContext.setMessage(soapMessage); - DOMResult domresult = new DOMResult(); - try - { - TransformerUtil.getTransformer().transform(msg, domresult); - } - catch (Exception e) - { - throw new RuntimeException(e); - } - Node doc = domresult.getNode(); - - try - { - soapMessage.getSOAPBody().addDocument((Document) doc); - } - catch (SOAPException e) - { - throw new RuntimeException(e); - } - List<Handler> handlers = getBinding().getHandlerChain(); for( Handler handler: handlers) { @@ -221,7 +180,7 @@ HttpsURLConnection.setDefaultSSLSocketFactory(sslSocketFactory); } - SOAPBody body; + SOAPMessage response = null; try { SOAPConnectionFactory connectFactory = SOAPConnectionFactory.newInstance(); @@ -229,33 +188,30 @@ //Send it across the wire URL url = new URL(endpoint); - SOAPMessage response = connection.call(soapMessage, url); - body = response.getSOAPBody(); + response = connection.call(soapMessage, url); } catch (Exception e) { throw new RuntimeException(e); } - DOMSource resultSource = new DOMSource(body.getFirstChild()); - - return resultSource; + return response; } @SuppressWarnings("unchecked") - public Response<Source> invokeAsync(Source msg) + public Response<SOAPMessage> invokeAsync(SOAPMessage msg) { return parent.invokeAsync(msg); } @SuppressWarnings("unchecked") - public Future<?> invokeAsync(Source msg, AsyncHandler<Source> handler) + public Future<?> invokeAsync(SOAPMessage msg, AsyncHandler<SOAPMessage> handler) { return parent.invokeAsync(msg, handler); } @SuppressWarnings("unchecked") - public void invokeOneWay(Source msg) + public void invokeOneWay(SOAPMessage msg) { parent.invokeOneWay(msg); } Modified: trust/trunk/jbossws/src/main/java/org/picketlink/trust/jbossws/jaas/JBWSTokenIssuingLoginModule.java =================================================================== --- trust/trunk/jbossws/src/main/java/org/picketlink/trust/jbossws/jaas/JBWSTokenIssuingLoginModule.java 2011-06-17 18:30:34 UTC (rev 1008) +++ trust/trunk/jbossws/src/main/java/org/picketlink/trust/jbossws/jaas/JBWSTokenIssuingLoginModule.java 2011-06-17 18:37:01 UTC (rev 1009) @@ -28,7 +28,7 @@ import javax.net.ssl.SSLSocketFactory; import javax.security.auth.login.LoginException; -import javax.xml.transform.Source; +import javax.xml.soap.SOAPMessage; import javax.xml.ws.Binding; import javax.xml.ws.Dispatch; import javax.xml.ws.handler.Handler; @@ -129,7 +129,7 @@ super(config); //Get pre-constructed Dispatch from super - Dispatch<Source> dispatch = super.getDispatch(); + Dispatch<SOAPMessage> dispatch = super.getDispatch(); String overrideDispatchStr = (String) options.get("overrideDispatch"); if( StringUtil.isNotNull(overrideDispatchStr))

13 years, 6 months

1
0
0 / 0

Picketlink SVN: r1008 - in federation/trunk: picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/saml/v2/util and 3 other directories.

by picketlink-commits＠lists.jboss.org

Author: anil.saldhana(a)jboss.com Date: 2011-06-17 14:30:34 -0400 (Fri, 17 Jun 2011) New Revision: 1008 Modified: federation/trunk/picketlink-bindings/src/test/java/org/picketlink/test/identity/federation/bindings/servlets/SOAPSAMLXACMLServletUnitTestCase.java federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/saml/v2/util/DocumentUtil.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/util/SOAPUtil.java federation/trunk/picketlink-fed-core/src/test/java/org/picketlink/identity/federation/core/wstrust/handlers/STSSaml20HandlerTestCase.java federation/trunk/picketlink-web/src/main/java/org/picketlink/identity/federation/web/servlets/saml/SOAPSAMLXACMLServlet.java Log: soap util Modified: federation/trunk/picketlink-bindings/src/test/java/org/picketlink/test/identity/federation/bindings/servlets/SOAPSAMLXACMLServletUnitTestCase.java =================================================================== --- federation/trunk/picketlink-bindings/src/test/java/org/picketlink/test/identity/federation/bindings/servlets/SOAPSAMLXACMLServletUnitTestCase.java 2011-06-17 18:29:57 UTC (rev 1007) +++ federation/trunk/picketlink-bindings/src/test/java/org/picketlink/test/identity/federation/bindings/servlets/SOAPSAMLXACMLServletUnitTestCase.java 2011-06-17 18:30:34 UTC (rev 1008) @@ -33,7 +33,6 @@ import javax.servlet.ServletContext; import javax.servlet.ServletRequest; import javax.servlet.ServletResponse; -import javax.xml.soap.MessageFactory; import javax.xml.soap.SOAPBody; import javax.xml.soap.SOAPEnvelope; import javax.xml.soap.SOAPMessage; @@ -45,6 +44,7 @@ import org.picketlink.identity.federation.bindings.servlets.SOAPSAMLXACMLServlet; import org.picketlink.identity.federation.core.saml.v2.util.DocumentUtil; import org.picketlink.identity.federation.core.saml.v2.util.SOAPSAMLXACMLUtil; +import org.picketlink.identity.federation.core.util.SOAPUtil; import org.picketlink.identity.federation.newmodel.saml.v2.profiles.xacml.assertion.XACMLAuthzDecisionStatementType; import org.w3c.dom.Element; import org.w3c.dom.Node; @@ -88,7 +88,7 @@ bis = new ByteArrayInputStream(baos.toByteArray()); - SOAPMessage soapMessage = SOAPSAMLXACMLUtil.getSOAPMessage(bis); + SOAPMessage soapMessage = SOAPUtil.getSOAPMessage(bis); Node xacmlNode = soapMessage.getSOAPBody().getChildNodes().item(0); assertTrue(xacmlNode instanceof Element); Element xacmlElement = (Element) xacmlNode; @@ -129,7 +129,7 @@ ByteArrayInputStream bis = new ByteArrayInputStream(baos.toByteArray()); - SOAPMessage soapMessage = SOAPSAMLXACMLUtil.getSOAPMessage(bis); + SOAPMessage soapMessage = SOAPUtil.getSOAPMessage(bis); Node xacmlNode = soapMessage.getSOAPBody().getChildNodes().item(0); XACMLAuthzDecisionStatementType xacmlStatement = SOAPSAMLXACMLUtil.getDecisionStatement(xacmlNode); @@ -169,8 +169,7 @@ private InputStream getSOAPStream(InputStream dataStream) throws Exception { - MessageFactory messageFactory = MessageFactory.newInstance(); - SOAPMessage message = messageFactory.createMessage(); + SOAPMessage message = SOAPUtil.create(); SOAPPart soapPart = message.getSOAPPart(); SOAPEnvelope envelope = soapPart.getEnvelope(); SOAPBody body = envelope.getBody(); Modified: federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/saml/v2/util/DocumentUtil.java =================================================================== --- federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/saml/v2/util/DocumentUtil.java 2011-06-17 18:29:57 UTC (rev 1007) +++ federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/saml/v2/util/DocumentUtil.java 2011-06-17 18:30:34 UTC (rev 1008) @@ -268,7 +268,7 @@ return sw.toString(); } - + /** * Get an element from the document given its {@link QName} * First an attempt to get the element based on its namespace is made, failing which @@ -277,16 +277,16 @@ * @param elementQName * @return */ - public static Element getElement( Document doc, QName elementQName ) + public static Element getElement(Document doc, QName elementQName) { - NodeList nl = doc.getElementsByTagNameNS( elementQName.getNamespaceURI(), elementQName.getLocalPart() ); - if( nl.getLength() == 0 ) + NodeList nl = doc.getElementsByTagNameNS(elementQName.getNamespaceURI(), elementQName.getLocalPart()); + if (nl.getLength() == 0) { - nl = doc.getElementsByTagNameNS( "*", elementQName.getLocalPart() ); - if( nl.getLength() == 0 ) - nl = doc.getElementsByTagName( elementQName.getPrefix() + ":" + elementQName.getLocalPart() ); - if( nl.getLength() == 0 ) - return null; + nl = doc.getElementsByTagNameNS("*", elementQName.getLocalPart()); + if (nl.getLength() == 0) + nl = doc.getElementsByTagName(elementQName.getPrefix() + ":" + elementQName.getLocalPart()); + if (nl.getLength() == 0) + return null; } return (Element) nl.item(0); } @@ -310,7 +310,7 @@ * @throws ConfigurationException * @throws ProcessingException */ - public static InputStream getSourceAsStream(Source source) throws ConfigurationException, ProcessingException + public static InputStream getSourceAsStream(Source source) throws ConfigurationException, ProcessingException { ByteArrayOutputStream baos = new ByteArrayOutputStream(); Result streamResult = new StreamResult(baos); @@ -327,7 +327,7 @@ return new ByteArrayInputStream(baos.toByteArray()); } - + /** * Stream a DOM Node as a String * @param node @@ -460,6 +460,21 @@ } } + public static Document getDocumentFromSource(Source source) throws ProcessingException, ConfigurationException + { + try + { + Transformer transformer = TransformerUtil.getTransformer(); + DOMResult result = new DOMResult(); + transformer.transform(source, result); + return (Document) result.getNode(); + } + catch (TransformerException te) + { + throw new ProcessingException(te); + } + } + private static void visit(Node node, int level) { // Visit each child @@ -485,5 +500,5 @@ factory.setNamespaceAware(true); factory.setXIncludeAware(true); return factory; - } + } } \ No newline at end of file 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-17 18:29:57 UTC (rev 1007) +++ federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/saml/v2/util/SOAPSAMLXACMLUtil.java 2011-06-17 18:30:34 UTC (rev 1008) @@ -22,17 +22,10 @@ package org.picketlink.identity.federation.core.saml.v2.util; import java.io.IOException; -import java.io.InputStream; import java.util.ArrayList; import java.util.List; import java.util.Set; -import javax.xml.soap.MessageFactory; -import javax.xml.soap.SOAPBody; -import javax.xml.soap.SOAPEnvelope; -import javax.xml.soap.SOAPException; -import javax.xml.soap.SOAPFault; -import javax.xml.soap.SOAPMessage; import javax.xml.stream.XMLEventReader; import org.jboss.security.xacml.core.JBossRequestContext; @@ -56,7 +49,7 @@ 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.profiles.xacml.protocol.XACMLAuthzDecisionQueryType; import org.picketlink.identity.federation.newmodel.saml.v2.protocol.ResponseType.RTChoiceType; import org.w3c.dom.Node; @@ -67,7 +60,7 @@ * @since Jan 28, 2009 */ public class SOAPSAMLXACMLUtil -{ +{ /** * Parse the XACML Authorization Decision Query from the Dom Element * @param samlRequest @@ -76,16 +69,16 @@ * @throws ConfigurationException * @throws ParsingException */ - public static XACMLAuthzDecisionQueryType getXACMLQueryType( Node samlRequest ) - throws ParsingException, ConfigurationException, ProcessingException + public static XACMLAuthzDecisionQueryType getXACMLQueryType(Node samlRequest) throws ParsingException, + ConfigurationException, ProcessingException { //We reparse it because the document may have issues with namespaces //String elementString = DocumentUtil.getDOMElementAsString(samlRequest); - - XMLEventReader xmlEventReader = StaxParserUtil.getXMLEventReader( DocumentUtil.getNodeAsStream( samlRequest )); + + XMLEventReader xmlEventReader = StaxParserUtil.getXMLEventReader(DocumentUtil.getNodeAsStream(samlRequest)); SAMLXACMLRequestParser samlXACMLRequestParser = new SAMLXACMLRequestParser(); return (XACMLAuthzDecisionQueryType) samlXACMLRequestParser.parse(xmlEventReader); - + /*Unmarshaller um = JAXBUtil.getUnmarshaller(collectivePackage); um.setEventHandler(new javax.xml.bind.helpers.DefaultValidationEventHandler()); @@ -95,54 +88,37 @@ throw new RuntimeException("Unsupported type:" + xacmlObject); return (XACMLAuthzDecisionQueryType)xacmlObject; */ } - - public static XACMLAuthzDecisionStatementType getDecisionStatement( Node samlResponse ) throws ConfigurationException, ProcessingException, ParsingException + + public static XACMLAuthzDecisionStatementType getDecisionStatement(Node samlResponse) throws ConfigurationException, + ProcessingException, ParsingException { - XMLEventReader xmlEventReader = StaxParserUtil.getXMLEventReader( DocumentUtil.getNodeAsStream( samlResponse )); + 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.parse( xmlEventReader ); + org.picketlink.identity.federation.newmodel.saml.v2.protocol.ResponseType response = (org.picketlink.identity.federation.newmodel.saml.v2.protocol.ResponseType) samlParser + .parse(xmlEventReader); List<RTChoiceType> choices = response.getAssertions(); - for( RTChoiceType rst: choices ) + for (RTChoiceType rst : choices) { AssertionType assertion = rst.getAssertion(); - if( assertion == null ) + if (assertion == null) continue; Set<StatementAbstractType> stats = assertion.getStatements(); - for( StatementAbstractType stat: stats ) + for (StatementAbstractType stat : stats) { - if( stat instanceof XACMLAuthzDecisionStatementType ) + if (stat instanceof XACMLAuthzDecisionStatementType) { return (XACMLAuthzDecisionStatementType) stat; } } } - - throw new RuntimeException( "Not found XACMLAuthzDecisionStatementType" ); + + throw new RuntimeException("Not found XACMLAuthzDecisionStatementType"); } - - public static SOAPMessage getSOAPMessage( InputStream is ) throws IOException, SOAPException + + public synchronized static org.picketlink.identity.federation.newmodel.saml.v2.protocol.ResponseType handleXACMLQuery( + PolicyDecisionPoint pdp, String issuer, XACMLAuthzDecisionQueryType xacmlRequest) throws ProcessingException, + ConfigurationException { - MessageFactory messageFactory = MessageFactory.newInstance(); - return messageFactory.createMessage(null, is ); - } - - public static SOAPMessage createFault( String message ) throws SOAPException - { - MessageFactory messageFactory = MessageFactory.newInstance(); - SOAPMessage msg = messageFactory.createMessage() ; - SOAPEnvelope envelope = msg.getSOAPPart().getEnvelope(); - SOAPBody body = envelope.getBody(); - SOAPFault fault = body.addFault(); - fault.setFaultCode("Server"); - fault.setFaultActor( "urn:picketlink" ); - fault.setFaultString( message ); - return msg; - } - - public synchronized static org.picketlink.identity.federation.newmodel.saml.v2.protocol.ResponseType handleXACMLQuery( - PolicyDecisionPoint pdp, String issuer, XACMLAuthzDecisionQueryType xacmlRequest ) throws ProcessingException, ConfigurationException - { RequestType requestType = xacmlRequest.getRequest(); RequestContext requestContext = new JBossRequestContext(); @@ -152,38 +128,34 @@ } catch (IOException e) { - throw new ProcessingException( e ); + throw new ProcessingException(e); } //pdp evaluation is thread safe - ResponseContext responseContext = pdp.evaluate(requestContext); + ResponseContext responseContext = pdp.evaluate(requestContext); ResponseType responseType = new ResponseType(); ResultType resultType = responseContext.getResult(); responseType.getResult().add(resultType); - XACMLAuthzDecisionStatementType xacmlStatement = - XACMLContextFactory.createXACMLAuthzDecisionStatementType(requestType, responseType); + XACMLAuthzDecisionStatementType xacmlStatement = XACMLContextFactory.createXACMLAuthzDecisionStatementType( + requestType, responseType); //Place the xacml statement in an assertion //Then the assertion goes inside a SAML Response - String ID = IDGenerator.create("ID_"); - IssuerInfoHolder issuerInfo = new IssuerInfoHolder( issuer ); + String ID = IDGenerator.create("ID_"); + IssuerInfoHolder issuerInfo = new IssuerInfoHolder(issuer); List<StatementAbstractType> statements = new ArrayList<StatementAbstractType>(); statements.add(xacmlStatement); - AssertionType assertion = SAMLAssertionFactory.createAssertion(ID, - issuerInfo.getIssuer(), - XMLTimeUtil.getIssueInstant(), - null, - null, - statements); + AssertionType assertion = SAMLAssertionFactory.createAssertion(ID, issuerInfo.getIssuer(), + XMLTimeUtil.getIssueInstant(), null, null, statements); - org.picketlink.identity.federation.newmodel.saml.v2.protocol.ResponseType samlResponseType = JBossSAMLAuthnResponseFactory.createResponseType( ID, issuerInfo, assertion ); + org.picketlink.identity.federation.newmodel.saml.v2.protocol.ResponseType samlResponseType = JBossSAMLAuthnResponseFactory + .createResponseType(ID, issuerInfo, assertion); - return samlResponseType; } } \ No newline at end of file Modified: federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/util/SOAPUtil.java =================================================================== --- federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/util/SOAPUtil.java 2011-06-17 18:29:57 UTC (rev 1007) +++ federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/util/SOAPUtil.java 2011-06-17 18:30:34 UTC (rev 1008) @@ -21,10 +21,21 @@ */ package org.picketlink.identity.federation.core.util; +import java.io.IOException; +import java.io.InputStream; +import java.security.GeneralSecurityException; + import javax.xml.soap.MessageFactory; +import javax.xml.soap.SOAPBody; +import javax.xml.soap.SOAPEnvelope; import javax.xml.soap.SOAPException; +import javax.xml.soap.SOAPFault; import javax.xml.soap.SOAPMessage; +import javax.xml.transform.Source; +import org.picketlink.identity.federation.core.saml.v2.util.DocumentUtil; +import org.w3c.dom.Node; + /** * Utility class dealing with SAAJ * @author Anil.Saldhana(a)redhat.com @@ -40,4 +51,39 @@ return soapMessage; } + public static SOAPMessage getSOAPMessage(InputStream is) throws IOException, SOAPException + { + MessageFactory messageFactory = MessageFactory.newInstance(); + return messageFactory.createMessage(null, is); + } + + public static SOAPMessage createFault(String message) throws SOAPException + { + MessageFactory messageFactory = MessageFactory.newInstance(); + SOAPMessage msg = messageFactory.createMessage(); + SOAPEnvelope envelope = msg.getSOAPPart().getEnvelope(); + SOAPBody body = envelope.getBody(); + SOAPFault fault = body.addFault(); + fault.setFaultCode("Server"); + fault.setFaultActor("urn:picketlink"); + fault.setFaultString(message); + return msg; + } + + public static Node getSOAPData(SOAPMessage soapMessage) throws SOAPException + { + return soapMessage.getSOAPBody().getFirstChild(); + } + + public static void addData(Source data, SOAPMessage soapMessage) throws SOAPException + { + try + { + soapMessage.getSOAPBody().addDocument(DocumentUtil.getDocumentFromSource(data)); + } + catch (GeneralSecurityException e) + { + throw new RuntimeException(e); + } + } } \ No newline at end of file Modified: federation/trunk/picketlink-fed-core/src/test/java/org/picketlink/identity/federation/core/wstrust/handlers/STSSaml20HandlerTestCase.java =================================================================== --- federation/trunk/picketlink-fed-core/src/test/java/org/picketlink/identity/federation/core/wstrust/handlers/STSSaml20HandlerTestCase.java 2011-06-17 18:29:57 UTC (rev 1007) +++ federation/trunk/picketlink-fed-core/src/test/java/org/picketlink/identity/federation/core/wstrust/handlers/STSSaml20HandlerTestCase.java 2011-06-17 18:30:34 UTC (rev 1008) @@ -20,30 +20,30 @@ */ package org.picketlink.identity.federation.core.wstrust.handlers; -import static org.junit.Assert.*; +import static javax.xml.ws.handler.MessageContext.MESSAGE_OUTBOUND_PROPERTY; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; +import static org.junit.Assert.fail; import static org.mockito.Matchers.any; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; -import static javax.xml.ws.handler.soap.SOAPMessageContext.MESSAGE_OUTBOUND_PROPERTY; -import javax.xml.ws.handler.soap.SOAPMessageContext; import javax.xml.namespace.QName; -import javax.xml.soap.MessageFactory; import javax.xml.soap.SOAPElement; import javax.xml.soap.SOAPException; import javax.xml.soap.SOAPFault; import javax.xml.soap.SOAPHeader; import javax.xml.soap.SOAPHeaderElement; import javax.xml.soap.SOAPMessage; +import javax.xml.ws.handler.soap.SOAPMessageContext; import javax.xml.ws.soap.SOAPFaultException; import org.junit.Before; import org.junit.Test; import org.picketlink.identity.federation.core.exceptions.ParsingException; +import org.picketlink.identity.federation.core.util.SOAPUtil; import org.picketlink.identity.federation.core.wstrust.STSClient; import org.picketlink.identity.federation.core.wstrust.STSClientConfig.Builder; -import org.picketlink.identity.federation.core.wstrust.handlers.STSSaml20Handler; -import org.picketlink.identity.federation.core.wstrust.handlers.STSSecurityHandler; import org.w3c.dom.Element; /** @@ -63,174 +63,178 @@ */ public class STSSaml20HandlerTestCase { - private SOAPMessageContext soapMessageContext; - private SOAPMessage soapMessage; - private STSClient wsTrustClient; - private STSSaml20Handler samlHandler; - - @Test - public void handleMessageValidToken() throws Exception - { - when(wsTrustClient.validateToken((any(Element.class)))).thenReturn(true); - - final SOAPHeaderElement securityHeader = addSecurityHeader(soapMessage.getSOAPHeader()); - addSecurityAssertionElement(securityHeader); - - when(soapMessageContext.get(MESSAGE_OUTBOUND_PROPERTY)).thenReturn(false); - when(soapMessageContext.getMessage()).thenReturn(soapMessage); - - boolean result = samlHandler.handleMessage(soapMessageContext); - assertTrue(result); - } - - @Test - public void handleMessageInValidToken() throws Exception - { - when(wsTrustClient.validateToken((any(Element.class)))).thenReturn(false); - - final SOAPHeaderElement securityHeader = addSecurityHeader(soapMessage.getSOAPHeader()); - addSecurityAssertionElement(securityHeader); + private SOAPMessageContext soapMessageContext; - when(soapMessageContext.get(MESSAGE_OUTBOUND_PROPERTY)).thenReturn(false); - when(soapMessageContext.getMessage()).thenReturn(soapMessage); - try - { - samlHandler.handleMessage(soapMessageContext); - fail("handleMessage should have thrown an exception"); - } - catch (final Exception e) - { - assertTrue (e instanceof SOAPFaultException); - assertSoapFaultString(e, "The security token could not be authenticated or authorized"); - } - } - - @Test - public void handleMessageMissingSecurityToken() throws Exception - { - when(soapMessageContext.get(MESSAGE_OUTBOUND_PROPERTY)).thenReturn(false); - when(soapMessageContext.getMessage()).thenReturn(soapMessage); - try - { - samlHandler.handleMessage(soapMessageContext); - fail("handleMessage should have thrown a exception!"); - } - catch (final Exception e) - { - assertTrue (e instanceof SOAPFaultException); - assertSoapFaultString(e, "No security token could be found in the SOAP Header"); - } - } + private SOAPMessage soapMessage; - @Test - public void handleMessageInvalidSecurityToken() throws Exception - { - when(wsTrustClient.validateToken((any(Element.class)))).thenReturn(false); - - final SOAPHeaderElement securityHeader = addSecurityHeader(soapMessage.getSOAPHeader()); - addSecurityAssertionElement(securityHeader); - - when(soapMessageContext.get(MESSAGE_OUTBOUND_PROPERTY)).thenReturn(false); - when(soapMessageContext.getMessage()).thenReturn(soapMessage); - try - { - samlHandler.handleMessage(soapMessageContext); - fail("handleMessage should have thrown a exception!"); - } - catch (final Exception e) - { - assertTrue (e instanceof SOAPFaultException); - assertSoapFaultString(e, "The security token could not be authenticated or authorized"); - } - } + private STSClient wsTrustClient; - @Test - public void usernamePasswordFromSOAPMessageContext() throws Exception - { - when(wsTrustClient.validateToken((any(Element.class)))).thenReturn(true); - - final SOAPHeaderElement securityHeader = addSecurityHeader(soapMessage.getSOAPHeader()); - addSecurityAssertionElement(securityHeader); - - when(soapMessageContext.get(MESSAGE_OUTBOUND_PROPERTY)).thenReturn(false); - when(soapMessageContext.getMessage()).thenReturn(soapMessage); - - when(soapMessageContext.get(STSSecurityHandler.USERNAME_MSG_CONTEXT_PROPERTY)).thenReturn("Fletch"); - when(soapMessageContext.get(STSSecurityHandler.PASSWORD_MSG_CONTEXT_PROPERTY)).thenReturn("letmein"); - - samlHandler.handleMessage(soapMessageContext); - - assertEquals("Fletch", samlHandler.getConfigBuilder().getUsername()); - assertEquals("letmein", samlHandler.getConfigBuilder().getPassword()); - } - - @Test - public void handleMessageOutbound() - { - when(soapMessageContext.get(MESSAGE_OUTBOUND_PROPERTY)).thenReturn(true); - assertTrue(new STSSaml20Handler().handleMessage(soapMessageContext)); - } + private STSSaml20Handler samlHandler; - @Before - public void setUp() - { - // Create a Mock for WSTrustClient. - wsTrustClient = mock(STSClient.class); - - samlHandler = new FakeSamlHandler(wsTrustClient); - samlHandler.setConfigFile("wstrust/auth/jboss-sts-client.properties"); - // Simulate the WS Engine calling @PostConstruct. - samlHandler.parseSTSConfig(); - - soapMessageContext = mock(SOAPMessageContext.class); - - try - { - soapMessage = MessageFactory.newInstance().createMessage(); - } - catch (SOAPException e) - { - e.printStackTrace(); - fail(e.getMessage()); - } - } - - private SOAPHeaderElement addSecurityHeader(final SOAPHeader soapHeader) throws SOAPException - { - final QName securityQName = samlHandler.getSecurityElementQName(); - final SOAPHeaderElement securityHeader = soapHeader.addHeaderElement(new QName(securityQName.getNamespaceURI(), securityQName.getLocalPart(), "wsse")); - soapHeader.addChildElement(securityHeader); - return securityHeader; - } + @Test + public void handleMessageValidToken() throws Exception + { + when(wsTrustClient.validateToken((any(Element.class)))).thenReturn(true); - private SOAPElement addSecurityAssertionElement(final SOAPHeaderElement securityHeader) throws SOAPException - { - final QName tokenElementQName = this.samlHandler.getTokenElementQName(); - final SOAPElement tokenElement = securityHeader.addChildElement(new QName(tokenElementQName.getNamespaceURI(), tokenElementQName.getLocalPart(), "saml")); - return securityHeader.addChildElement(tokenElement); - } + final SOAPHeaderElement securityHeader = addSecurityHeader(soapMessage.getSOAPHeader()); + addSecurityAssertionElement(securityHeader); - private void assertSoapFaultString(final Exception e, final String str) - { - SOAPFaultException soapFaultException = (SOAPFaultException) e; - SOAPFault fault = soapFaultException.getFault(); - assertEquals(str, fault.getFaultString()); - } + when(soapMessageContext.get(MESSAGE_OUTBOUND_PROPERTY)).thenReturn(false); + when(soapMessageContext.getMessage()).thenReturn(soapMessage); - private class FakeSamlHandler extends STSSaml20Handler - { - private final STSClient stsClient; + boolean result = samlHandler.handleMessage(soapMessageContext); + assertTrue(result); + } - public FakeSamlHandler(final STSClient stsClient) - { - this.stsClient = stsClient; - } + @Test + public void handleMessageInValidToken() throws Exception + { + when(wsTrustClient.validateToken((any(Element.class)))).thenReturn(false); - @Override - protected STSClient createSTSClient(Builder builder) throws ParsingException - { - return stsClient; - } - } + final SOAPHeaderElement securityHeader = addSecurityHeader(soapMessage.getSOAPHeader()); + addSecurityAssertionElement(securityHeader); + + when(soapMessageContext.get(MESSAGE_OUTBOUND_PROPERTY)).thenReturn(false); + when(soapMessageContext.getMessage()).thenReturn(soapMessage); + try + { + samlHandler.handleMessage(soapMessageContext); + fail("handleMessage should have thrown an exception"); + } + catch (final Exception e) + { + assertTrue(e instanceof SOAPFaultException); + assertSoapFaultString(e, "The security token could not be authenticated or authorized"); + } + } + + @Test + public void handleMessageMissingSecurityToken() throws Exception + { + when(soapMessageContext.get(MESSAGE_OUTBOUND_PROPERTY)).thenReturn(false); + when(soapMessageContext.getMessage()).thenReturn(soapMessage); + try + { + samlHandler.handleMessage(soapMessageContext); + fail("handleMessage should have thrown a exception!"); + } + catch (final Exception e) + { + assertTrue(e instanceof SOAPFaultException); + assertSoapFaultString(e, "No security token could be found in the SOAP Header"); + } + } + + @Test + public void handleMessageInvalidSecurityToken() throws Exception + { + when(wsTrustClient.validateToken((any(Element.class)))).thenReturn(false); + + final SOAPHeaderElement securityHeader = addSecurityHeader(soapMessage.getSOAPHeader()); + addSecurityAssertionElement(securityHeader); + + when(soapMessageContext.get(MESSAGE_OUTBOUND_PROPERTY)).thenReturn(false); + when(soapMessageContext.getMessage()).thenReturn(soapMessage); + try + { + samlHandler.handleMessage(soapMessageContext); + fail("handleMessage should have thrown a exception!"); + } + catch (final Exception e) + { + assertTrue(e instanceof SOAPFaultException); + assertSoapFaultString(e, "The security token could not be authenticated or authorized"); + } + } + + @Test + public void usernamePasswordFromSOAPMessageContext() throws Exception + { + when(wsTrustClient.validateToken((any(Element.class)))).thenReturn(true); + + final SOAPHeaderElement securityHeader = addSecurityHeader(soapMessage.getSOAPHeader()); + addSecurityAssertionElement(securityHeader); + + when(soapMessageContext.get(MESSAGE_OUTBOUND_PROPERTY)).thenReturn(false); + when(soapMessageContext.getMessage()).thenReturn(soapMessage); + + when(soapMessageContext.get(STSSecurityHandler.USERNAME_MSG_CONTEXT_PROPERTY)).thenReturn("Fletch"); + when(soapMessageContext.get(STSSecurityHandler.PASSWORD_MSG_CONTEXT_PROPERTY)).thenReturn("letmein"); + + samlHandler.handleMessage(soapMessageContext); + + assertEquals("Fletch", samlHandler.getConfigBuilder().getUsername()); + assertEquals("letmein", samlHandler.getConfigBuilder().getPassword()); + } + + @Test + public void handleMessageOutbound() + { + when(soapMessageContext.get(MESSAGE_OUTBOUND_PROPERTY)).thenReturn(true); + assertTrue(new STSSaml20Handler().handleMessage(soapMessageContext)); + } + + @Before + public void setUp() + { + // Create a Mock for WSTrustClient. + wsTrustClient = mock(STSClient.class); + + samlHandler = new FakeSamlHandler(wsTrustClient); + samlHandler.setConfigFile("wstrust/auth/jboss-sts-client.properties"); + // Simulate the WS Engine calling @PostConstruct. + samlHandler.parseSTSConfig(); + + soapMessageContext = mock(SOAPMessageContext.class); + + try + { + soapMessage = SOAPUtil.create(); + } + catch (SOAPException e) + { + e.printStackTrace(); + fail(e.getMessage()); + } + } + + private SOAPHeaderElement addSecurityHeader(final SOAPHeader soapHeader) throws SOAPException + { + final QName securityQName = samlHandler.getSecurityElementQName(); + final SOAPHeaderElement securityHeader = soapHeader.addHeaderElement(new QName(securityQName.getNamespaceURI(), + securityQName.getLocalPart(), "wsse")); + soapHeader.addChildElement(securityHeader); + return securityHeader; + } + + private SOAPElement addSecurityAssertionElement(final SOAPHeaderElement securityHeader) throws SOAPException + { + final QName tokenElementQName = this.samlHandler.getTokenElementQName(); + final SOAPElement tokenElement = securityHeader.addChildElement(new QName(tokenElementQName.getNamespaceURI(), + tokenElementQName.getLocalPart(), "saml")); + return securityHeader.addChildElement(tokenElement); + } + + private void assertSoapFaultString(final Exception e, final String str) + { + SOAPFaultException soapFaultException = (SOAPFaultException) e; + SOAPFault fault = soapFaultException.getFault(); + assertEquals(str, fault.getFaultString()); + } + + private class FakeSamlHandler extends STSSaml20Handler + { + private final STSClient stsClient; + + public FakeSamlHandler(final STSClient stsClient) + { + this.stsClient = stsClient; + } + + @Override + protected STSClient createSTSClient(Builder builder) throws ParsingException + { + return stsClient; + } + } } - Modified: federation/trunk/picketlink-web/src/main/java/org/picketlink/identity/federation/web/servlets/saml/SOAPSAMLXACMLServlet.java =================================================================== --- federation/trunk/picketlink-web/src/main/java/org/picketlink/identity/federation/web/servlets/saml/SOAPSAMLXACMLServlet.java 2011-06-17 18:29:57 UTC (rev 1007) +++ federation/trunk/picketlink-web/src/main/java/org/picketlink/identity/federation/web/servlets/saml/SOAPSAMLXACMLServlet.java 2011-06-17 18:30:34 UTC (rev 1008) @@ -33,7 +33,6 @@ import javax.servlet.http.HttpServlet; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import javax.xml.soap.MessageFactory; import javax.xml.soap.SOAPBody; import javax.xml.soap.SOAPEnvelope; import javax.xml.soap.SOAPException; @@ -51,6 +50,7 @@ import org.picketlink.identity.federation.core.saml.v2.util.DocumentUtil; 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.SOAPUtil; import org.picketlink.identity.federation.core.util.StaxUtil; import org.picketlink.identity.federation.newmodel.saml.v2.profiles.xacml.protocol.XACMLAuthzDecisionQueryType; import org.w3c.dom.Document; @@ -64,15 +64,17 @@ * @since Jan 27, 2009 */ public class SOAPSAMLXACMLServlet extends HttpServlet -{ +{ private static Logger log = Logger.getLogger(SOAPSAMLXACMLServlet.class); - private boolean trace = log.isTraceEnabled(); + private final boolean trace = log.isTraceEnabled(); + private static final long serialVersionUID = 1L; private String policyConfigFileName = null; private String issuerId = null; + private String issuer = null; boolean debug = false; @@ -80,37 +82,37 @@ private transient PolicyDecisionPoint pdp = null; public void init(ServletConfig config) throws ServletException - { + { issuerId = config.getInitParameter("issuerID"); - if(issuerId == null) + if (issuerId == null) issuerId = "issue-id:1"; - issuer = config.getInitParameter("issuer"); - if(issuer == null) + issuer = config.getInitParameter("issuer"); + if (issuer == null) issuer = "urn:jboss-identity"; policyConfigFileName = config.getInitParameter("policyConfigFileName"); - if(policyConfigFileName == null) - policyConfigFileName = "policyConfig.xml"; + if (policyConfigFileName == null) + policyConfigFileName = "policyConfig.xml"; String debugStr = config.getInitParameter("debug"); try { debug = Boolean.parseBoolean(debugStr); } - catch(Exception ignore) + catch (Exception ignore) { debug = false; } - if(trace) + if (trace) { log.trace("Issuer=" + issuer + " :: issuerID=" + issuerId); log.trace("PolicyConfig File:" + policyConfigFileName); - log.trace("Debug="+debug); + log.trace("Debug=" + debug); } - if(debug) + if (debug) { SecurityActions.setSystemProperty("jaxb.debug", "true"); } @@ -121,70 +123,69 @@ } catch (PrivilegedActionException e) { - log("Exception loading PDP::",e); + log("Exception loading PDP::", e); throw new ServletException("Unable to load PDP"); } - super.init(config); + super.init(config); } @Override protected void service(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException { XACMLAuthzDecisionQueryType xacmlRequest = null; - MessageFactory messageFactory = null; SOAPMessage returnSOAPMessage = null; try { try { - messageFactory = MessageFactory.newInstance(); - SOAPMessage soapMessage = messageFactory.createMessage( null, req.getInputStream() ); + SOAPMessage soapMessage = SOAPUtil.getSOAPMessage(req.getInputStream()); SOAPEnvelope soapEnvelope = soapMessage.getSOAPPart().getEnvelope(); SOAPBody soapBody = soapEnvelope.getBody(); NodeList nl = soapBody.getChildNodes(); Node node = null; - + int length = nl != null ? nl.getLength() : 0; - for( int i = 0; i < length; i++ ) + for (int i = 0; i < length; i++) { - Node n = nl.item(i); + Node n = nl.item(i); String localName = n.getLocalName(); - if( localName != null && ( localName.contains( JBossSAMLConstants.XACML_AUTHZ_DECISION_QUERY.get() ) - || localName.contains( JBossSAMLConstants.REQUEST_ABSTRACT.get() ))) + if (localName != null + && (localName.contains(JBossSAMLConstants.XACML_AUTHZ_DECISION_QUERY.get()) || localName + .contains(JBossSAMLConstants.REQUEST_ABSTRACT.get()))) { node = n; break; } } - if( node == null ) - throw new ServletException( "Did not find XACML query nodes" ); - xacmlRequest = SOAPSAMLXACMLUtil.getXACMLQueryType( node ); + if (node == null) + throw new ServletException("Did not find XACML query nodes"); + xacmlRequest = SOAPSAMLXACMLUtil.getXACMLQueryType(node); } catch (SOAPException e) - { + { e.printStackTrace(); - throw new ServletException( e ); + throw new ServletException(e); } catch (ParsingException e) { - throw new ServletException( e ); + throw new ServletException(e); } catch (ConfigurationException e) { - throw new ServletException( e ); + throw new ServletException(e); } catch (ProcessingException e) { - throw new ServletException( e ); + throw new ServletException(e); } /*JAXBElement<RequestAbstractType> jaxbRequestType = null; - Envelope envelope = null; - XACMLAuthzDecisionQueryType xacmlRequest = null; + Envelope envelope = null; + XACMLAuthzDecisionQueryType xacmlRequest = null; - try - { + try + { Document inputDoc = DocumentUtil.getDocument(req.getInputStream()); if(debug && trace) log.trace("Received SOAP:"+DocumentUtil.asString(inputDoc)); @@ -224,12 +225,11 @@ */ + if (xacmlRequest == null) + throw new IOException("XACML Request not parsed"); - if(xacmlRequest == null) - throw new IOException("XACML Request not parsed"); - - org.picketlink.identity.federation.newmodel.saml.v2.protocol.ResponseType samlResponseType = - SOAPSAMLXACMLUtil.handleXACMLQuery(pdp, issuer, xacmlRequest); + org.picketlink.identity.federation.newmodel.saml.v2.protocol.ResponseType samlResponseType = SOAPSAMLXACMLUtil + .handleXACMLQuery(pdp, issuer, xacmlRequest); /*RequestType requestType = xacmlRequest.getRequest(); @@ -264,65 +264,65 @@ statements); org.picketlink.identity.federation.newmodel.saml.v2.protocol.ResponseType samlResponseType = saml2Response.createResponseType(ID, issuerInfo, assertion); -*/ + */ ByteArrayOutputStream baos = new ByteArrayOutputStream(); XMLStreamWriter xmlStreamWriter = StaxUtil.getXMLStreamWriter(baos); - SAMLResponseWriter samlResponseWriter = new SAMLResponseWriter( xmlStreamWriter ); - samlResponseWriter.write( samlResponseType ); - Document responseDocument = DocumentUtil.getDocument( new ByteArrayInputStream( baos.toByteArray() )); + SAMLResponseWriter samlResponseWriter = new SAMLResponseWriter(xmlStreamWriter); + samlResponseWriter.write(samlResponseType); + Document responseDocument = DocumentUtil.getDocument(new ByteArrayInputStream(baos.toByteArray())); - returnSOAPMessage = messageFactory.createMessage(); + returnSOAPMessage = SOAPUtil.create(); SOAPBody returnSOAPBody = returnSOAPMessage.getSOAPBody(); - returnSOAPBody.addDocument( responseDocument ); + returnSOAPBody.addDocument(responseDocument); /*JAXBElement<?> jaxbResponse = JAXBElementMappingUtil.get(); //Create a SOAP Envelope to hold the SAML response envelope = this.createEnvelope(jaxbResponse); */ } - catch ( Exception e ) - { + catch (Exception e) + { e.printStackTrace(); String id = IDGenerator.create(); - log.error(id + "::Exception:", e); + log.error(id + "::Exception:", e); try { - returnSOAPMessage = SOAPSAMLXACMLUtil.createFault( "Server Error" ); + returnSOAPMessage = SOAPUtil.createFault("Server Error"); } catch (SOAPException e1) - { + { } //envelope = this.createEnvelope(this.createFault("Server Error. Reference::" + id)); - } + } finally { resp.setContentType("text/xml;charset=utf-8");; - OutputStream os = resp.getOutputStream(); + OutputStream os = resp.getOutputStream(); try { - if( returnSOAPMessage == null ) - throw new RuntimeException( "SOAPMessage for return is null" ); - returnSOAPMessage.writeTo( os ); + if (returnSOAPMessage == null) + throw new RuntimeException("SOAPMessage for return is null"); + returnSOAPMessage.writeTo(os); /*if(envelope == null) throw new IllegalStateException("SOAPEnvelope is null"); JAXBElement<?> jaxbEnvelope = JAXBElementMappingUtil.get(envelope); Marshaller marshaller = JAXBUtil.getMarshaller(SOAPSAMLXACMLUtil.getPackage()); marshaller.marshal(jaxbEnvelope, os); */ } - catch ( Exception e ) + catch (Exception e) { - log("marshalling exception",e); - } - } - } + log("marshalling exception", e); + } + } + } private PolicyDecisionPoint getPDP() throws PrivilegedActionException { ClassLoader tcl = SecurityActions.getContextClassLoader(); InputStream is = tcl.getResourceAsStream(this.policyConfigFileName); - if(is == null) - throw new IllegalStateException(policyConfigFileName + " could not be located"); - return new JBossPDP(is); - } + if (is == null) + throw new IllegalStateException(policyConfigFileName + " could not be located"); + return new JBossPDP(is); + } } \ No newline at end of file

13 years, 6 months

1
0
0 / 0

Picketlink SVN: r1007 - in federation/trunk: picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/wstrust and 1 other directory.

by picketlink-commits＠lists.jboss.org

Author: anil.saldhana(a)jboss.com Date: 2011-06-17 14:29:57 -0400 (Fri, 17 Jun 2011) New Revision: 1007 Modified: federation/trunk/picketlink-bindings-jboss/src/main/java/org/picketlink/identity/federation/bindings/jboss/auth/SAML2STSLoginModule.java federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/wstrust/STSClient.java Log: use soapmessage Modified: federation/trunk/picketlink-bindings-jboss/src/main/java/org/picketlink/identity/federation/bindings/jboss/auth/SAML2STSLoginModule.java =================================================================== --- federation/trunk/picketlink-bindings-jboss/src/main/java/org/picketlink/identity/federation/bindings/jboss/auth/SAML2STSLoginModule.java 2011-06-16 20:55:45 UTC (rev 1006) +++ federation/trunk/picketlink-bindings-jboss/src/main/java/org/picketlink/identity/federation/bindings/jboss/auth/SAML2STSLoginModule.java 2011-06-17 18:29:57 UTC (rev 1007) @@ -40,7 +40,7 @@ import javax.security.auth.callback.CallbackHandler; import javax.security.auth.login.LoginException; import javax.xml.datatype.XMLGregorianCalendar; -import javax.xml.transform.Source; +import javax.xml.soap.SOAPMessage; import javax.xml.ws.Dispatch; import org.apache.log4j.Logger; @@ -506,7 +506,7 @@ // to the STS and set them in the Dispatch request context. if (!this.options.isEmpty()) { - Dispatch<Source> dispatch = client.getDispatch(); + Dispatch<SOAPMessage> dispatch = client.getDispatch(); for (Map.Entry<String, ?> entry : this.options.entrySet()) dispatch.getRequestContext().put(entry.getKey(), entry.getValue()); } Modified: federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/wstrust/STSClient.java =================================================================== --- federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/wstrust/STSClient.java 2011-06-16 20:55:45 UTC (rev 1006) +++ federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/wstrust/STSClient.java 2011-06-17 18:29:57 UTC (rev 1007) @@ -17,6 +17,7 @@ */ package org.picketlink.identity.federation.core.wstrust; +import java.io.InputStream; import java.net.URI; import java.security.Principal; import java.util.Map; @@ -24,6 +25,8 @@ import javax.xml.namespace.QName; import javax.xml.soap.SOAPBody; import javax.xml.soap.SOAPEnvelope; +import javax.xml.soap.SOAPException; +import javax.xml.soap.SOAPMessage; import javax.xml.soap.SOAPPart; import javax.xml.transform.Source; import javax.xml.transform.dom.DOMResult; @@ -36,6 +39,7 @@ import org.picketlink.identity.federation.core.parsers.wst.WSTrustParser; import org.picketlink.identity.federation.core.saml.v2.util.DocumentUtil; +import org.picketlink.identity.federation.core.util.SOAPUtil; import org.picketlink.identity.federation.core.util.StringUtil; import org.picketlink.identity.federation.core.wstrust.wrappers.RequestSecurityToken; import org.picketlink.identity.federation.core.wstrust.wrappers.RequestSecurityTokenResponse; @@ -58,7 +62,7 @@ */ public class STSClient { - private final ThreadLocal<Dispatch<Source>> dispatchLocal = new InheritableThreadLocal<Dispatch<Source>>(); + private final ThreadLocal<Dispatch<SOAPMessage>> dispatchLocal = new InheritableThreadLocal<Dispatch<SOAPMessage>>(); private final String targetNS = "http://org.picketlink.trust/sts/"; @@ -101,7 +105,7 @@ Service jaxwsService = Service.create(service); jaxwsService.addPort(portName, SOAPBinding.SOAP11HTTP_BINDING, config.getEndPointAddress()); - Dispatch<Source> dispatch = jaxwsService.createDispatch(portName, Source.class, Mode.PAYLOAD); + Dispatch<SOAPMessage> dispatch = jaxwsService.createDispatch(portName, SOAPMessage.class, Mode.MESSAGE); Map<String, Object> reqContext = dispatch.getRequestContext(); String username = config.getUsername(); @@ -118,7 +122,7 @@ * Set the {@link Dispatch} object for use * @param dispatch */ - public void setDispatch(Dispatch<Source> dispatch) + public void setDispatch(Dispatch<SOAPMessage> dispatch) { if (dispatch == null) throw new IllegalArgumentException("dispatch is null"); @@ -281,12 +285,22 @@ validateDispatch(); DOMSource requestSource = this.createSourceFromRequest(request); - Source response = dispatchLocal.get().invoke(requestSource); + SOAPMessage requestMessage; + try + { + requestMessage = SOAPUtil.create(); + SOAPUtil.addData(requestSource, requestMessage); + } + catch (SOAPException e1) + { + throw new WSTrustException("Unable to create SOAP Message:", e1); + } + SOAPMessage responseMessage = dispatchLocal.get().invoke(requestMessage); NodeList nodes; try { - Node documentNode = DocumentUtil.getNodeFromSource(response); + Node documentNode = SOAPUtil.getSOAPData(responseMessage); Document responseDoc = documentNode instanceof Document ? (Document) documentNode : documentNode .getOwnerDocument(); @@ -342,12 +356,12 @@ // send the token request to JBoss STS and get the response. DOMSource requestSource = this.createSourceFromRequest(request); - Source response = dispatchLocal.get().invoke(requestSource); + SOAPMessage responseMessage = dispatchLocal.get().invoke(createSOAPMessage(requestSource)); NodeList nodes; try { - Node documentNode = DocumentUtil.getNodeFromSource(response); + Node documentNode = SOAPUtil.getSOAPData(responseMessage); Document responseDoc = documentNode instanceof Document ? (Document) documentNode : documentNode .getOwnerDocument(); @@ -402,11 +416,12 @@ DOMSource requestSource = this.createSourceFromRequest(request); - Source response = dispatchLocal.get().invoke(requestSource); + SOAPMessage responseMessage = dispatchLocal.get().invoke(createSOAPMessage(requestSource)); try { + InputStream stream = DocumentUtil.getNodeAsStream(SOAPUtil.getSOAPData(responseMessage)); RequestSecurityTokenResponseCollection responseCollection = (RequestSecurityTokenResponseCollection) new WSTrustParser() - .parse(DocumentUtil.getSourceAsStream(response)); + .parse(stream); RequestSecurityTokenResponse tokenResponse = responseCollection.getRequestSecurityTokenResponses().get(0); StatusType status = tokenResponse.getStatus(); @@ -446,13 +461,14 @@ request.setContext("context"); DOMSource requestSource = this.createSourceFromRequest(request); - Source response = dispatchLocal.get().invoke(requestSource); + SOAPMessage responseMessage = dispatchLocal.get().invoke(createSOAPMessage(requestSource)); // get the WS-Trust response and check for presence of the RequestTokenCanceled element. try { + InputStream stream = DocumentUtil.getNodeAsStream(SOAPUtil.getSOAPData(responseMessage)); RequestSecurityTokenResponseCollection responseCollection = (RequestSecurityTokenResponseCollection) new WSTrustParser() - .parse(DocumentUtil.getSourceAsStream(response)); + .parse(stream); RequestSecurityTokenResponse tokenResponse = responseCollection.getRequestSecurityTokenResponses().get(0); if (tokenResponse.getRequestedTokenCancelled() != null) return true; @@ -468,7 +484,7 @@ * Get the dispatch object * @return */ - public Dispatch<Source> getDispatch() + public Dispatch<SOAPMessage> getDispatch() { return dispatchLocal.get(); } @@ -496,4 +512,18 @@ if (getDispatch() == null) throw new RuntimeException("Dispatch has not been set"); } + + private SOAPMessage createSOAPMessage(Source source) + { + try + { + SOAPMessage soap = SOAPUtil.create(); + SOAPUtil.addData(source, soap); + return soap; + } + catch (SOAPException e) + { + throw new RuntimeException(e); + } + } }

13 years, 6 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

picketlink-commits June 2011