Return-Path: X-Original-To: apmail-directory-commits-archive@www.apache.org Delivered-To: apmail-directory-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 01B7417846 for ; Mon, 6 Apr 2015 11:15:59 +0000 (UTC) Received: (qmail 55907 invoked by uid 500); 6 Apr 2015 11:15:58 -0000 Delivered-To: apmail-directory-commits-archive@directory.apache.org Received: (qmail 55855 invoked by uid 500); 6 Apr 2015 11:15:58 -0000 Mailing-List: contact commits-help@directory.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@directory.apache.org Delivered-To: mailing list commits@directory.apache.org Received: (qmail 55846 invoked by uid 99); 6 Apr 2015 11:15:58 -0000 Received: from eris.apache.org (HELO hades.apache.org) (140.211.11.105) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 06 Apr 2015 11:15:58 +0000 Received: from hades.apache.org (localhost [127.0.0.1]) by hades.apache.org (ASF Mail Server at hades.apache.org) with ESMTP id B57D4AC0044 for ; Mon, 6 Apr 2015 11:15:58 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1671511 - /directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/model/OlcLDAPConfig.java Date: Mon, 06 Apr 2015 11:15:58 -0000 To: commits@directory.apache.org From: elecharny@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20150406111558.B57D4AC0044@hades.apache.org> Author: elecharny Date: Mon Apr 6 11:15:58 2015 New Revision: 1671511 URL: http://svn.apache.org/r1671511 Log: o Added the missing attributes for OpenLDAP 2.4.40 (olcDbKeepalive, olcDbOnErr, olcDbSessionTrackingRequest) o Copied the List instead of storing them as is. Modified: directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/model/OlcLDAPConfig.java Modified: directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/model/OlcLDAPConfig.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/model/OlcLDAPConfig.java?rev=1671511&r1=1671510&r2=1671511&view=diff ============================================================================== --- directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/model/OlcLDAPConfig.java (original) +++ directory/studio/trunk/plugins/openldap.config.editor/src/main/java/org/apache/directory/studio/openldap/config/model/OlcLDAPConfig.java Mon Apr 6 11:15:58 2015 @@ -118,6 +118,12 @@ public class OlcLDAPConfig extends OlcDa private String olcDbIdleTimeout; /** + * Field for the 'olcDbKeepalive' attribute. + */ + @ConfigurationElement(attributeType = "olcDbKeepalive") + private String olcDbKeepalive; + + /** * Field for the 'olcDbNetworkTimeout' attribute. */ @ConfigurationElement(attributeType = "olcDbNetworkTimeout") @@ -136,6 +142,12 @@ public class OlcLDAPConfig extends OlcDa private Boolean olcDbNoUndefFilter; /** + * Field for the 'olcDbOnErr' attribute. + */ + @ConfigurationElement(attributeType = "olcDbOnErr") + private String olcDbOnErr; + + /** * Field for the 'olcDbProtocolVersion' attribute. */ @ConfigurationElement(attributeType = "olcDbProtocolVersion") @@ -160,6 +172,12 @@ public class OlcLDAPConfig extends OlcDa private Boolean olcDbRebindAsUser; /** + * Field for the 'olcDbSessionTrackingRequest' attribute. + */ + @ConfigurationElement(attributeType = "olcDbSessionTrackingRequest") + private Boolean olcDbSessionTrackingRequest; + + /** * Field for the 'olcDbSingleConn' attribute. */ @ConfigurationElement(attributeType = "olcDbSingleConn") @@ -309,7 +327,7 @@ public class OlcLDAPConfig extends OlcDa */ public List getOlcDbIDAssertAuthzFrom() { - return olcDbIDAssertAuthzFrom; + return copyListString( olcDbIDAssertAuthzFrom ); } @@ -336,7 +354,7 @@ public class OlcLDAPConfig extends OlcDa */ public List getOlcDbIDAssertPassThru() { - return olcDbIDAssertPassThru; + return copyListString( olcDbIDAssertPassThru ); } @@ -359,6 +377,15 @@ public class OlcLDAPConfig extends OlcDa /** + * @return the olcDbKeepalive + */ + public String getOlcDbKeepalive() + { + return olcDbKeepalive; + } + + + /** * @return the olcDbNetworkTimeout */ public String getOlcDbNetworkTimeout() @@ -386,6 +413,15 @@ public class OlcLDAPConfig extends OlcDa /** + * @return the olcDbOnErr + */ + public String getOlcDbOnErr() + { + return olcDbOnErr; + } + + + /** * @return the olcDbProtocolVersion */ public Integer getOlcDbProtocolVersion() @@ -422,6 +458,15 @@ public class OlcLDAPConfig extends OlcDa /** + * @return the olcDbSessionTrackingRequest + */ + public Boolean getOlcDbSessionTrackingRequest() + { + return olcDbSessionTrackingRequest; + } + + + /** * @return the olcDbSingleConn */ public Boolean getOlcDbSingleConn() @@ -552,7 +597,7 @@ public class OlcLDAPConfig extends OlcDa */ public void setOlcDbIDAssertAuthzFrom( List olcDbIDAssertAuthzFrom ) { - this.olcDbIDAssertAuthzFrom = olcDbIDAssertAuthzFrom; + this.olcDbIDAssertAuthzFrom = copyListString( olcDbIDAssertAuthzFrom ); } @@ -579,7 +624,7 @@ public class OlcLDAPConfig extends OlcDa */ public void setOlcDbIDAssertPassThru( List olcDbIDAssertPassThru ) { - this.olcDbIDAssertPassThru = olcDbIDAssertPassThru; + this.olcDbIDAssertPassThru = copyListString( olcDbIDAssertPassThru ); } @@ -602,6 +647,15 @@ public class OlcLDAPConfig extends OlcDa /** + * @param olcDbKeepalive the olcDbKeepalive to set + */ + public void setOlcDbKeepalive( String olcDbKeepalive ) + { + this.olcDbKeepalive = olcDbKeepalive; + } + + + /** * @param olcDbNetworkTimeout the olcDbNetworkTimeout to set */ public void setOlcDbNetworkTimeout( String olcDbNetworkTimeout ) @@ -629,6 +683,15 @@ public class OlcLDAPConfig extends OlcDa /** + * @param olcDbOnErr the olcDbOnErr to set + */ + public void setOlcDbOnErr( String olcDbOnErr ) + { + this.olcDbOnErr = olcDbOnErr; + } + + + /** * @param olcDbProtocolVersion the olcDbProtocolVersion to set */ public void setOlcDbProtocolVersion( Integer olcDbProtocolVersion ) @@ -664,6 +727,15 @@ public class OlcLDAPConfig extends OlcDa } + /** + * @param olcDbSessionTrackingRequest the olcDbSessionTrackingRequest to set + */ + public void setOlcDbSessionTrackingRequest( Boolean olcDbSessionTrackingRequest ) + { + this.olcDbSessionTrackingRequest = olcDbSessionTrackingRequest; + } + + /** * @param olcDbSingleConn the olcDbSingleConn to set */