Code cleanups.
authorwassa <wassa@ab3bd59b-922f-494d-bb5f-6f0a3c29deca>
Wed, 4 Feb 2004 20:27:01 +0000 (20:27 +0000)
committerwassa <wassa@ab3bd59b-922f-494d-bb5f-6f0a3c29deca>
Wed, 4 Feb 2004 20:27:01 +0000 (20:27 +0000)
git-svn-id: https://subversion.switch.ch/svn/shibboleth/java-idp/trunk@877 ab3bd59b-922f-494d-bb5f-6f0a3c29deca

src/edu/internet2/middleware/shibboleth/aa/AAServiceProviderMapper.java
src/edu/internet2/middleware/shibboleth/aa/AAServlet.java
src/edu/internet2/middleware/shibboleth/aa/arp/ArpRepositoryFactory.java
src/edu/internet2/middleware/shibboleth/hs/HandleServlet.java

index 00a7083..3171fbe 100644 (file)
@@ -92,7 +92,6 @@ public class AAServiceProviderMapper extends ServiceProviderMapper {
        }
 
        public AARelyingParty getRelyingParty(String providerIdFromTarget) {
-               //TODO hmmm...
                return (AARelyingParty) getRelyingPartyImpl(providerIdFromTarget);
        }
 
index 6f37159..de1bd3a 100755 (executable)
@@ -54,7 +54,6 @@ import javax.servlet.http.HttpServletResponse;
 
 import org.apache.log4j.Logger;
 import org.apache.log4j.MDC;
-import org.apache.xerces.parsers.DOMParser;
 import org.opensaml.QName;
 import org.opensaml.SAMLAssertion;
 import org.opensaml.SAMLAttribute;
@@ -69,11 +68,9 @@ import org.opensaml.SAMLRequest;
 import org.opensaml.SAMLResponse;
 import org.opensaml.SAMLStatement;
 import org.opensaml.SAMLSubject;
+import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 import org.w3c.dom.NodeList;
-import org.w3c.dom.Document;
-import org.xml.sax.InputSource;
-import org.xml.sax.SAXException;
 
 import sun.misc.BASE64Decoder;
 import edu.internet2.middleware.shibboleth.aa.arp.ArpEngine;
@@ -88,7 +85,6 @@ import edu.internet2.middleware.shibboleth.common.OriginComponent;
 import edu.internet2.middleware.shibboleth.common.RelyingParty;
 import edu.internet2.middleware.shibboleth.common.SAMLBindingFactory;
 import edu.internet2.middleware.shibboleth.common.ServiceProviderMapperException;
-import edu.internet2.middleware.shibboleth.common.ShibResource;
 import edu.internet2.middleware.shibboleth.common.ShibbolethConfigurationException;
 import edu.internet2.middleware.shibboleth.common.ShibbolethOriginConfig;
 
@@ -251,7 +247,7 @@ public class AAServlet extends OriginComponent {
                                                        relyingParty,
                                                        relyingParty.getIdentityProvider());
                                }
-                               log.info("Request is for principal (" + principal + ").");
+                               log.info("Request is for principal (" + principal.getName() + ").");
 
                                //TODO Do something about these silly passthru errors
 
index 3a6c88f..57b4b4b 100755 (executable)
@@ -66,8 +66,6 @@ public class ArpRepositoryFactory {
 
        public static ArpRepository getInstance(Element repositoryConfig) throws ArpRepositoryException {
 
-               String implementation = repositoryConfig.getAttribute("implementation");
-
                if (repositoryConfig.getAttribute("implementation") == null) {
                        throw new ArpRepositoryException("No ARP Repository implementaiton specified.");
                }
index 59c7a60..0b59091 100644 (file)
@@ -50,7 +50,6 @@ import javax.servlet.http.HttpServletResponse;
 import org.apache.log4j.Level;
 import org.apache.log4j.Logger;
 import org.apache.log4j.MDC;
-import org.apache.xerces.parsers.DOMParser;
 import org.doomdark.uuid.UUIDGenerator;
 import org.opensaml.QName;
 import org.opensaml.SAMLAuthorityBinding;
@@ -58,11 +57,9 @@ import org.opensaml.SAMLBinding;
 import org.opensaml.SAMLException;
 import org.opensaml.SAMLNameIdentifier;
 import org.opensaml.SAMLResponse;
+import org.w3c.dom.Document;
 import org.w3c.dom.Element;
 import org.w3c.dom.NodeList;
-import org.w3c.dom.Document;
-import org.xml.sax.InputSource;
-import org.xml.sax.SAXException;
 
 import sun.misc.BASE64Decoder;
 import edu.internet2.middleware.shibboleth.common.AuthNPrincipal;
@@ -72,7 +69,6 @@ import edu.internet2.middleware.shibboleth.common.NameIdentifierMappingException
 import edu.internet2.middleware.shibboleth.common.OriginComponent;
 import edu.internet2.middleware.shibboleth.common.ServiceProviderMapperException;
 import edu.internet2.middleware.shibboleth.common.ShibPOSTProfile;
-import edu.internet2.middleware.shibboleth.common.ShibResource;
 import edu.internet2.middleware.shibboleth.common.ShibbolethConfigurationException;
 
 public class HandleServlet extends OriginComponent {