[java-shib-idp2 COMMIT] /branches/REL_2/src/main/java/edu/internet2/middleware/shibboleth/idp/profile/saml2/SLOProfil...

[noreply at shibboleth.net]

Author: scantor
Date: Mon Jan 28 23:01:34 2013
New Revision: 3131

URL: http://svn.shibboleth.net/view/java-shib-idp2?rev=3131&view=rev
Log:
Fix some warnings.

Modified:
    branches/REL_2/src/main/java/edu/internet2/middleware/shibboleth/idp/profile/saml2/SLOProfileHandler.java

Modified: branches/REL_2/src/main/java/edu/internet2/middleware/shibboleth/idp/profile/saml2/SLOProfileHandler.java
URL: http://svn.shibboleth.net/view/java-shib-idp2/branches/REL_2/src/main/java/edu/internet2/middleware/shibboleth/idp/profile/saml2/SLOProfileHandler.java?rev=3131&r1=3130&r2=3131&view=diff
==============================================================================
--- branches/REL_2/src/main/java/edu/internet2/middleware/shibboleth/idp/profile/saml2/SLOProfileHandler.java (original)
+++ branches/REL_2/src/main/java/edu/internet2/middleware/shibboleth/idp/profile/saml2/SLOProfileHandler.java Mon Jan 28 23:01:34 2013
@@ -1,25 +1,24 @@
 /*
- *  Copyright 2009 NIIF Institute.
- * 
- *  Licensed under the Apache License, Version 2.0 (the "License");
- *  you may not use this file except in compliance with the License.
- *  You may obtain a copy of the License at
- * 
- *       http://www.apache.org/licenses/LICENSE-2.0
- * 
- *  Unless required by applicable law or agreed to in writing, software
- *  distributed under the License is distributed on an "AS IS" BASIS,
- *  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- *  See the License for the specific language governing permissions and
- *  limitations under the License.
- *  under the License.
+ * Licensed to the University Corporation for Advanced Internet Development, 
+ * Inc. (UCAID) under one or more contributor license agreements.  See the 
+ * NOTICE file distributed with this work for additional information regarding
+ * copyright ownership. The UCAID licenses this file to You under the Apache 
+ * License, Version 2.0 (the "License"); you may not use this file except in 
+ * compliance with the License.  You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
  */
 package edu.internet2.middleware.shibboleth.idp.profile.saml2;
 
 import edu.internet2.middleware.shibboleth.common.profile.ProfileException;
 import edu.internet2.middleware.shibboleth.common.profile.provider.BaseSAMLProfileRequestContext;
 import edu.internet2.middleware.shibboleth.common.relyingparty.ProfileConfiguration;
-import edu.internet2.middleware.shibboleth.common.relyingparty.RelyingPartyConfiguration;
 import edu.internet2.middleware.shibboleth.common.relyingparty.provider.AbstractSAMLProfileConfiguration;
 import edu.internet2.middleware.shibboleth.common.relyingparty.provider.saml2.LogoutRequestConfiguration;
 import edu.internet2.middleware.shibboleth.common.session.SessionManager;
@@ -65,32 +64,18 @@
 import org.slf4j.LoggerFactory;
 
 /**
- *
+ * Profile handler for limited logout capability.
  */
 public class SLOProfileHandler extends AbstractSAML2ProfileHandler {
 
-    /** Class logger. */
-    private static final Logger log =  LoggerFactory.getLogger(SLOProfileHandler.class);
-    
     /** Binding identifier representing "local" logout. */
     public static final String LOCAL_LOGOUT_BINDING = "urn:mace:shibboleth:2.0:profiles:LocalLogout";
     
+    /** Name of attribute for tracking logged out session. */
     public static final String HTTP_LOGOUT_BINDING_ATTRIBUTE = "ShibbolethLogoutSession";
-    
-    /** Builder of SingleLogoutService objects. */
-    private final SAMLObjectBuilder<SingleLogoutService> sloServiceBuilder;
-    
-    /** Builder of LogoutResponse objects. */
-    private final SAMLObjectBuilder<LogoutResponse> responseBuilder;
-    
-    /** Velocity engine to use to render logout response to user. */
-    private VelocityEngine velocity;
-
-    /** Path to Velocity or JSP template for logout response to user. */
-    private String templatePath;
-    
+        
     /** Canned SOAP fault. */
-    private static String soapFaultResponseMessage =
+    private final String soapFaultResponseMessage =
 "<env:Envelope xmlns:env=\"http://schemas.xmlsoap.org/soap/envelope/\">" +
 " <env:Body>" +
 " <env:Fault>" +
@@ -100,19 +85,34 @@
 " </env:Fault>" +
 " </env:Body>" +
 "</env:Envelope>";
+
+    /** Class logger. */
+    private final Logger log = LoggerFactory.getLogger(SLOProfileHandler.class);
+    
+    /** Builder of SingleLogoutService objects. */
+    private final SAMLObjectBuilder<SingleLogoutService> sloServiceBuilder;
+    
+    /** Builder of LogoutResponse objects. */
+    private final SAMLObjectBuilder<LogoutResponse> responseBuilder;
+    
+    /** Velocity engine to use to render logout response to user. */
+    private VelocityEngine velocity;
+

[... 157 lines stripped ...]