Author: anil.saldhana(a)jboss.com Date: 2011-07-27 15:15:46 -0400 (Wed, 27 Jul 2011) New Revision: 1136 Modified: product/trunk/picketlink-core/src/main/java/org/picketlink/identity/federation/core/parsers/saml/metadata/SAMLEntityDescriptorParser.java product/trunk/picketlink-core/src/main/java/org/picketlink/identity/federation/core/saml/v2/constants/JBossSAMLConstants.java product/trunk/picketlink-core/src/main/java/org/picketlink/identity/federation/core/saml/v2/writers/SAMLMetadataWriter.java product/trunk/picketlink-core/src/main/java/org/picketlink/identity/federation/saml/v2/metadata/EntityDescriptorType.java Log: merge r1133 and 1134 Modified: product/trunk/picketlink-core/src/main/java/org/picketlink/identity/federation/core/parsers/saml/metadata/SAMLEntityDescriptorParser.java =================================================================== --- product/trunk/picketlink-core/src/main/java/org/picketlink/identity/federation/core/parsers/saml/metadata/SAMLEntityDescriptorParser.java 2011-07-27 19:07:26 UTC (rev 1135) +++ product/trunk/picketlink-core/src/main/java/org/picketlink/identity/federation/core/parsers/saml/metadata/SAMLEntityDescriptorParser.java 2011-07-27 19:15:46 UTC (rev 1136) @@ -134,6 +134,18 @@ EDTChoiceType edtChoice = EDTChoiceType.oneValue(edtDescChoice); entityDescriptorType.addChoiceType(edtChoice); } + else if (JBossSAMLConstants.AUTHN_AUTHORITY_DESCRIPTOR.get().equals(localPart)) + { + throw new ParsingException("AuthnAuthorityDescriptor type not supported"); + } + else if (JBossSAMLConstants.AFFILIATION_DESCRIPTOR.get().equals(localPart)) + { + throw new ParsingException("AffiliationDescriptor type not supported"); + } + else if (JBossSAMLConstants.PDP_DESCRIPTOR.get().equals(localPart)) + { + throw new ParsingException("PDPDescriptor type not supported"); + } else if (localPart.equals(JBossSAMLConstants.SIGNATURE.get())) { entityDescriptorType.setSignature(StaxParserUtil.getDOMElement(xmlEventReader)); @@ -148,6 +160,10 @@ { entityDescriptorType.addContactPerson(parseContactPerson(xmlEventReader)); } + else if (JBossSAMLConstants.ADDITIONAL_METADATA_LOCATION.get().equals(localPart)) + { + throw new ParsingException("AdditionalMetadataLocation type not supported"); + } else if (JBossSAMLConstants.EXTENSIONS.get().equalsIgnoreCase(localPart)) { entityDescriptorType.setExtensions(parseExtensions(xmlEventReader)); Property changes on: product/trunk/picketlink-core/src/main/java/org/picketlink/identity/federation/core/parsers/saml/metadata/SAMLEntityDescriptorParser.java ___________________________________________________________________ Added: svn:mergeinfo + /federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/parsers/saml/metadata/SAMLEntityDescriptorParser.java:1095-1096,1098-1134 Modified: product/trunk/picketlink-core/src/main/java/org/picketlink/identity/federation/core/saml/v2/constants/JBossSAMLConstants.java =================================================================== --- product/trunk/picketlink-core/src/main/java/org/picketlink/identity/federation/core/saml/v2/constants/JBossSAMLConstants.java 2011-07-27 19:07:26 UTC (rev 1135) +++ product/trunk/picketlink-core/src/main/java/org/picketlink/identity/federation/core/saml/v2/constants/JBossSAMLConstants.java 2011-07-27 19:15:46 UTC (rev 1136) @@ -29,6 +29,8 @@ public enum JBossSAMLConstants { ADDRESS( "Address" ), + ADDITIONAL_METADATA_LOCATION("AdditionalMetadataLocation"), + AFFILIATION_DESCRIPTOR("AffiliationDescriptor"), ALLOW_CREATE( "AllowCreate" ), ARTIFACT( "Artifact" ), ARTIFACT_RESOLVE( "ArtifactResolve" ), @@ -51,6 +53,7 @@ AUDIENCE_RESTRICTION( "AudienceRestriction" ), AUTHN_CONTEXT( "AuthnContext" ), AUTHENTICATING_AUTHORITY( "AuthenticatingAuthority" ), + AUTHN_AUTHORITY_DESCRIPTOR("AuthnAuthorityDescriptor"), AUTHN_CONTEXT_CLASS_REF( "AuthnContextClassRef" ), AUTHN_CONTEXT_DECLARATION( "AuthnContextDecl" ), AUTHN_CONTEXT_DECLARATION_REF( "AuthnContextDeclRef" ), @@ -111,6 +114,7 @@ ORGANIZATION_NAME( "OrganizationName" ), ORGANIZATION_DISPLAY_NAME( "OrganizationDisplayName" ), ORGANIZATION_URL( "OrganizationURL" ), + PDP_DESCRIPTOR("PDPDescriptor"), PROTOCOL_BINDING( "ProtocolBinding" ), PROTOCOL_SUPPORT_ENUMERATION( "protocolSupportEnumeration" ), PROVIDER_NAME( "ProviderName" ), Property changes on: product/trunk/picketlink-core/src/main/java/org/picketlink/identity/federation/core/saml/v2/constants/JBossSAMLConstants.java ___________________________________________________________________ Added: svn:mergeinfo + /federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/saml/v2/constants/JBossSAMLConstants.java:1098-1134 Modified: product/trunk/picketlink-core/src/main/java/org/picketlink/identity/federation/core/saml/v2/writers/SAMLMetadataWriter.java =================================================================== --- product/trunk/picketlink-core/src/main/java/org/picketlink/identity/federation/core/saml/v2/writers/SAMLMetadataWriter.java 2011-07-27 19:07:26 UTC (rev 1135) +++ product/trunk/picketlink-core/src/main/java/org/picketlink/identity/federation/core/saml/v2/writers/SAMLMetadataWriter.java 2011-07-27 19:15:46 UTC (rev 1136) @@ -34,6 +34,7 @@ import org.picketlink.identity.federation.core.saml.v2.constants.JBossSAMLURIConstants; import org.picketlink.identity.federation.core.util.StaxUtil; import org.picketlink.identity.federation.saml.v2.assertion.AttributeType; +import org.picketlink.identity.federation.saml.v2.metadata.AdditionalMetadataLocationType; import org.picketlink.identity.federation.saml.v2.metadata.AffiliationDescriptorType; import org.picketlink.identity.federation.saml.v2.metadata.AttributeAuthorityDescriptorType; import org.picketlink.identity.federation.saml.v2.metadata.AttributeConsumingServiceType; @@ -53,6 +54,7 @@ import org.picketlink.identity.federation.saml.v2.metadata.LocalizedNameType; import org.picketlink.identity.federation.saml.v2.metadata.LocalizedURIType; import org.picketlink.identity.federation.saml.v2.metadata.OrganizationType; +import org.picketlink.identity.federation.saml.v2.metadata.PDPDescriptorType; import org.picketlink.identity.federation.saml.v2.metadata.RequestedAttributeType; import org.picketlink.identity.federation.saml.v2.metadata.RoleDescriptorType; import org.picketlink.identity.federation.saml.v2.metadata.SPSSODescriptorType; @@ -184,6 +186,10 @@ AuthnAuthorityDescriptorType authNDesc = edtDescChoice.getAuthnDescriptor(); if (authNDesc != null) throw new RuntimeException("NYI"); + + PDPDescriptorType pdpDesc = edtDescChoice.getPdpDescriptor(); + if (pdpDesc != null) + throw new RuntimeException("NYI"); } } OrganizationType organization = entityDescriptor.getOrganization(); @@ -198,6 +204,10 @@ write(contact); } + List<AdditionalMetadataLocationType> addl = entityDescriptor.getAdditionalMetadataLocation(); + if (addl.size() > 0) + throw new RuntimeException("NYI"); + StaxUtil.writeEndElement(writer); StaxUtil.flush(writer); } Property changes on: product/trunk/picketlink-core/src/main/java/org/picketlink/identity/federation/core/saml/v2/writers/SAMLMetadataWriter.java ___________________________________________________________________ Modified: svn:mergeinfo - /federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/saml/v2/writers/SAMLMetadataWriter.java:1095-1096 + /federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/saml/v2/writers/SAMLMetadataWriter.java:1095-1096,1098-1134 Modified: product/trunk/picketlink-core/src/main/java/org/picketlink/identity/federation/saml/v2/metadata/EntityDescriptorType.java =================================================================== --- product/trunk/picketlink-core/src/main/java/org/picketlink/identity/federation/saml/v2/metadata/EntityDescriptorType.java 2011-07-27 19:07:26 UTC (rev 1135) +++ product/trunk/picketlink-core/src/main/java/org/picketlink/identity/federation/saml/v2/metadata/EntityDescriptorType.java 2011-07-27 19:15:46 UTC (rev 1136) @@ -337,6 +337,24 @@ } /** + * Add a {@link AdditionalMetadataLocationType} + * @param amld + */ + public void addAdditionalMetadataLocationType(AdditionalMetadataLocationType amld) + { + this.additionalMetadataLocation.add(amld); + } + + /** + * Remove a {@link AdditionalMetadataLocationType} + * @param amld + */ + public void removeAdditionalMetadataLocationType(AdditionalMetadataLocationType amld) + { + this.additionalMetadataLocation.remove(amld); + } + + /** * Gets the value of the additionalMetadataLocation property. * * <p> Property changes on: product/trunk/picketlink-core/src/main/java/org/picketlink/identity/federation/saml/v2/metadata/EntityDescriptorType.java ___________________________________________________________________ Added: svn:mergeinfo + /federation/trunk/picketlink-fed-model/src/main/java/org/picketlink/identity/federation/saml/v2/metadata/EntityDescriptorType.java:1098-1134