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

[noreply at shibboleth.net]

Author: scantor
Date: Tue Jan 20 18:17:00 2015
New Revision: 7270

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=7270&view=rev
Log:
IDP-576 - comment out SLO endpoints by default since we're defaulting to a client-side session cache

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=7270&r1=7269&r2=7270&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 Tue Jan 20 18:17:00 2015
@@ -134,9 +134,14 @@
     private String scope;
     
     /**
-     * Whether to comment out the SAML2 AA port.
+     * Whether to comment out the SAML2 AA endpoint.
      */
     private boolean saml2AttributeQueryCommented = true;
+
+    /**
+     * Whether to comment out the SAML2 SLO endpoints.
+     */
+    private boolean saml2LogoutCommented = true;
 
     /**
      * The signing certificates.
@@ -282,7 +287,7 @@
     }
 
     /** Returns whether to comment the SAML2 AA endpoint.
-     * @return Returns when to comment the SAML2 AA endpoint.
+     * @return  whether to comment the SAML2 AA endpoint
      */
     public boolean isSAML2AttributeQueryCommented() {
         return saml2AttributeQueryCommented;
@@ -293,6 +298,20 @@
      */
     public void setSAML2AttributeQueryCommented(boolean asComment) {
         saml2AttributeQueryCommented = asComment;
+    }
+
+    /** Returns whether to comment the SAML2 Logout endpoints.
+     * @return  whether to comment the SAML2 Logout endpoints
+     */
+    public boolean isSAML2LogoutCommented() {
+        return saml2LogoutCommented;
+    }
+
+    /** Sets whether to comment the SAML2 Logout endpoints.
+     * @param asComment whether to comment or not
+     */
+    public void setSAML2LogoutCommented(boolean asComment) {
+        saml2LogoutCommented = asComment;
     }
 
     /**
@@ -386,10 +405,18 @@
             }
         }
         writer.newLine();
+        if (isSAML2LogoutCommented()) {
+            writer.write("        <!--");
+            writer.newLine();
+        }
         for (Endpoints endpoint : SLO_ENDPOINTS) {
             if (getEndpoints().contains(endpoint)) {
                 outputEndpoint(endpoint);
             }
+        }
+        if (isSAML2LogoutCommented()) {
+            writer.write("        -->");
+            writer.newLine();
         }
         writer.newLine();
         writeNameIdFormat(net.shibboleth.idp.saml.xml.SAMLConstants.SAML1_NAMEID_TRANSIENT);