[java-identity-provider COMMIT] /trunk/idp-installer/src/main/java/net/shibboleth/idp/installer/metadata/MetadataGene...

[noreply at shibboleth.net]

Author: rdw
Date: Wed Feb 11 06:26:16 2015
New Revision: 7334

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=7334&view=rev
Log:
IDP-600 pull MDUI from the AA

Modified:
    trunk/idp-installer/src/main/java/net/shibboleth/idp/installer/metadata/MetadataGenerator.java

Modified: trunk/idp-installer/src/main/java/net/shibboleth/idp/installer/metadata/MetadataGenerator.java
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-installer/src/main/java/net/shibboleth/idp/installer/metadata/MetadataGenerator.java?rev=7334&r1=7333&r2=7334&view=diff
==============================================================================
--- trunk/idp-installer/src/main/java/net/shibboleth/idp/installer/metadata/MetadataGenerator.java (original)
+++ trunk/idp-installer/src/main/java/net/shibboleth/idp/installer/metadata/MetadataGenerator.java Wed Feb 11 06:26:16 2015
@@ -66,7 +66,7 @@
  */
 // Checkstyle: HideUtilityClassConstructor OFF
 public class MetadataGenerator {
-
+    
     /**
      * The end points we understand.
      */
@@ -396,7 +396,10 @@
         writeRoleDescriptor(IDPSSODescriptor.DEFAULT_ELEMENT_LOCAL_NAME,
                 Arrays.asList(SAMLConstants.SAML20P_NS, SAMLConstants.SAML11P_NS, "urn:mace:shibboleth:1.0"));
         writer.newLine();
-        writeExtensions();
+        openExtensions();
+        writeScope();
+        writeMDUI();
+        closeExtensions();
         writer.newLine();
         writeKeyDescriptors();
         for (Endpoints endpoint : ARTIFACT_ENDPOINTS) {
@@ -462,7 +465,9 @@
         writeRoleDescriptor(AttributeAuthorityDescriptor.DEFAULT_ELEMENT_LOCAL_NAME,
                 Arrays.asList(SAMLConstants.SAML20P_NS, SAMLConstants.SAML11P_NS));
         writer.newLine();
-        writeExtensions();
+        openExtensions();
+        writeScope();
+        closeExtensions();
         writer.newLine();
         writeKeyDescriptors();
         for (Endpoints endpoint : AA_ENDPOINTS) {
@@ -501,22 +506,42 @@
     }
 
     /**
-     * Write out any <Extensions>Elements. Currently this is just the scope TODO: mdui TODO: entityAttributes
-     * 
-     * @throws IOException if badness happens
-     */
-    protected void writeExtensions() throws IOException {
+     * Write the open <Extensions> elements.
+     * 
+     * @throws IOException if badness happens
+     */
+    protected void openExtensions() throws IOException {
 
         writer.write("        <");
         writer.write(Extensions.DEFAULT_ELEMENT_LOCAL_NAME);
         writer.write('>');
         writer.newLine();
+    }
+
+    /**
+     * Write out the close &lt;\Extensions&gt; Element.
+     * 
+     * @throws IOException if badness happens
+     */
+    protected void closeExtensions() throws IOException {
+
+        writer.write("        </");
+        writer.write(Extensions.DEFAULT_ELEMENT_LOCAL_NAME);
+        writer.write('>');
+        writer.newLine();
+    }
+
+    /**
+     * Write out any &lt;Extensions&gt;Elements. Currently this is just the scope TODO: mdui TODO: entityAttributes
+     * @deprecated use {@link #openExtensions()} and  {@link #closeExtensions()}
+     * @throws IOException if badness happens
+     */
+    @Deprecated protected void writeExtensions() throws IOException {
+
+        openExtensions();
         writeScope();
         writeMDUI();
-        writer.write("        </");
-        writer.write(Extensions.DEFAULT_ELEMENT_LOCAL_NAME);
-        writer.write('>');
-        writer.newLine();
+        closeExtensions();
     }
 
     /**