directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From trus...@apache.org
Subject svn commit: r368598 - /directory/trunks/apacheds-server/src/main/java/org/apache/ldap/server/configuration/MutableServerStartupConfiguration.java
Date Fri, 13 Jan 2006 05:20:33 GMT
Author: trustin
Date: Thu Jan 12 21:20:30 2006
New Revision: 368598

URL: http://svn.apache.org/viewcvs?rev=368598&view=rev
Log:
* Resolved conflicts occurred while merging the branch 'ldaps'

Modified:
    directory/trunks/apacheds-server/src/main/java/org/apache/ldap/server/configuration/MutableServerStartupConfiguration.java

Modified: directory/trunks/apacheds-server/src/main/java/org/apache/ldap/server/configuration/MutableServerStartupConfiguration.java
URL: http://svn.apache.org/viewcvs/directory/trunks/apacheds-server/src/main/java/org/apache/ldap/server/configuration/MutableServerStartupConfiguration.java?rev=368598&r1=368597&r2=368598&view=diff
==============================================================================
--- directory/trunks/apacheds-server/src/main/java/org/apache/ldap/server/configuration/MutableServerStartupConfiguration.java
(original)
+++ directory/trunks/apacheds-server/src/main/java/org/apache/ldap/server/configuration/MutableServerStartupConfiguration.java
Thu Jan 12 21:20:30 2006
@@ -125,4 +125,19 @@
     {
         super.setLdifFilters( ldifFilters );
     }
+
+    public void setEnableLdaps( boolean enableLdaps )
+    {
+        super.setEnableLdaps( enableLdaps );
+    }
+
+    public void setLdapsCertificateFile( File ldapsCertificateFile )
+    {
+        super.setLdapsCertificateFile( ldapsCertificateFile );
+    }
+
+    public void setLdapsCertificatePassword( String ldapsCertificatePassword )
+    {
+        super.setLdapsCertificatePassword( ldapsCertificatePassword );
+    }
 }



Mime
View raw message