Author: anil.saldhana(a)jboss.com Date: 2011-07-26 23:57:27 -0400 (Tue, 26 Jul 2011) New Revision: 1134 Modified: federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/saml/v2/writers/SAMLMetadataWriter.java Log: PLFED-115: addtl metadata writing Modified: federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/saml/v2/writers/SAMLMetadataWriter.java =================================================================== --- federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/saml/v2/writers/SAMLMetadataWriter.java 2011-07-27 03:54:32 UTC (rev 1133) +++ federation/trunk/picketlink-fed-core/src/main/java/org/picketlink/identity/federation/core/saml/v2/writers/SAMLMetadataWriter.java 2011-07-27 03:57:27 UTC (rev 1134) @@ -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); }