[java-opensaml COMMIT] /trunk/opensaml-security-impl/src/test/java/org/opensaml/security/trust/impl/InMemoryDirectory...

[noreply at shibboleth.net]

Author: dfisher
Date: Fri Feb  3 00:53:40 2017
New Revision: 4604

URL: http://svn.shibboleth.net/view/java-opensaml?rev=4604&view=rev
Log:
Remove non startTLS test directory.

Modified:
    trunk/opensaml-security-impl/src/test/java/org/opensaml/security/trust/impl/InMemoryDirectory.java

Modified: trunk/opensaml-security-impl/src/test/java/org/opensaml/security/trust/impl/InMemoryDirectory.java
URL: http://svn.shibboleth.net/view/java-opensaml/trunk/opensaml-security-impl/src/test/java/org/opensaml/security/trust/impl/InMemoryDirectory.java?rev=4604&r1=4603&r2=4604&view=diff
==============================================================================
--- trunk/opensaml-security-impl/src/test/java/org/opensaml/security/trust/impl/InMemoryDirectory.java	(original)
+++ trunk/opensaml-security-impl/src/test/java/org/opensaml/security/trust/impl/InMemoryDirectory.java	Fri Feb  3 00:53:40 2017
@@ -32,7 +32,6 @@
 import com.unboundid.util.ssl.KeyStoreKeyManager;
 import com.unboundid.util.ssl.SSLUtil;
 
-import net.shibboleth.utilities.java.support.annotation.constraint.Positive;
 import net.shibboleth.utilities.java.support.logic.Constraint;
 
 /**
@@ -43,36 +42,6 @@
     /** Directory server. */
     @Nonnull private final InMemoryDirectoryServer directoryServer;
 
-    /**
-     * Constructor without STARTTLS support. Listens on port 10389.
-     * 
-     * @param ldif the LDIF resource to be imported
-     * 
-     * @throws LDAPException if the in-memory directory server cannot be created
-     * @throws IOException if the LDIF resource cannot be imported
-     */
-    public InMemoryDirectory(@Nonnull final File ldif) throws LDAPException, IOException {
-       this(ldif, 10389);
-    }
-    
-    /**
-     * Constructor without STARTTLS support.
-     *
-     * @param ldif the LDIF resource to be imported
-     * @param port port to listen on
-     * @throws LDAPException if the in-memory directory server cannot be created
-     * @throws IOException if the LDIF resource cannot be imported
-     */
-    public InMemoryDirectory(@Nonnull final File ldif, @Positive final int port) throws LDAPException, IOException {
-        Constraint.isNotNull(ldif, "LDIF resource cannot be null");
-        Constraint.isGreaterThan(-1, port, "Port must be greater than -1");
-        final InMemoryDirectoryServerConfig config = new InMemoryDirectoryServerConfig("dc=example,dc=org");
-        config.setListenerConfigs(InMemoryListenerConfig.createLDAPConfig("default", port));
-        config.addAdditionalBindCredentials("cn=Directory Manager", "password");
-        directoryServer = new InMemoryDirectoryServer(config);
-        directoryServer.importFromLDIF(true, new LDIFReader(new FileInputStream(ldif)));
-    }
-    
     /**
      * Constructor with STARTTLS support.
      *