From scm-return-48365-apmail-geronimo-scm-archive=geronimo.apache.org@geronimo.apache.org Fri Apr 27 07:51:28 2012 Return-Path: X-Original-To: apmail-geronimo-scm-archive@www.apache.org Delivered-To: apmail-geronimo-scm-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id EDC63C4DD for ; Fri, 27 Apr 2012 07:51:27 +0000 (UTC) Received: (qmail 93566 invoked by uid 500); 27 Apr 2012 07:51:27 -0000 Delivered-To: apmail-geronimo-scm-archive@geronimo.apache.org Received: (qmail 93463 invoked by uid 500); 27 Apr 2012 07:51:27 -0000 Mailing-List: contact scm-help@geronimo.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: List-Post: Reply-To: dev@geronimo.apache.org List-Id: Delivered-To: mailing list scm@geronimo.apache.org Received: (qmail 93445 invoked by uid 99); 27 Apr 2012 07:51:26 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 27 Apr 2012 07:51:26 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 27 Apr 2012 07:51:25 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 157DF2388B1B; Fri, 27 Apr 2012 07:51:05 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1331274 - in /geronimo/server/branches/3.0-beta/plugins/tomcat/geronimo-tomcat7/src/main: java/org/apache/geronimo/tomcat/model/ConnectorType.java xsd/server.xsd Date: Fri, 27 Apr 2012 07:51:04 -0000 To: scm@geronimo.apache.org From: xiaming@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120427075105.157DF2388B1B@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: xiaming Date: Fri Apr 27 07:51:04 2012 New Revision: 1331274 URL: http://svn.apache.org/viewvc?rev=1331274&view=rev Log: GERONIMO-6339 Update ConnectorType model class to include the new property maxParameterCount for 3.0-beta branch Modified: geronimo/server/branches/3.0-beta/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/model/ConnectorType.java geronimo/server/branches/3.0-beta/plugins/tomcat/geronimo-tomcat7/src/main/xsd/server.xsd Modified: geronimo/server/branches/3.0-beta/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/model/ConnectorType.java URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-beta/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/model/ConnectorType.java?rev=1331274&r1=1331273&r2=1331274&view=diff ============================================================================== --- geronimo/server/branches/3.0-beta/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/model/ConnectorType.java (original) +++ geronimo/server/branches/3.0-beta/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/model/ConnectorType.java Fri Apr 27 07:51:04 2012 @@ -94,6 +94,8 @@ public class ConnectorType { @XmlAttribute protected Boolean enableLookups; @XmlAttribute + protected Integer maxParameterCount; + @XmlAttribute protected Integer maxPostSize; @XmlAttribute protected Integer maxSavePostSize; @@ -125,6 +127,7 @@ public class ConnectorType { private Map otherAttributes = new HashMap(); private static final String EMPTY_SESSION_PATH = "emptySessionPath"; private static final String ENABLE_LOOKUPS = "enableLookups"; + private static final String MAX_PARAMETER_COUNT = "maxParameterCount"; private static final String MAX_POST_SIZE = "maxPostSize"; private static final String MAX_SAVE_POST_SIZE = "maxSavePostSize"; private static final String PORT = "port"; @@ -248,6 +251,26 @@ public class ConnectorType { public void setEnableLookups(Boolean value) { this.enableLookups = value; } + + /** + * Gets the value of the maxParameterCount property. + * + * @return possible object is + * {@link Integer } + */ + public Integer getMaxParameterCount() { + return maxParameterCount; + } + + /** + * Sets the value of the maxParameterCount property. + * + * @param value allowed object is + * {@link Integer } + */ + public void setMaxParameterCount(Integer value) { + this.maxParameterCount = value; + } /** * Gets the value of the maxPostSize property. @@ -557,6 +580,9 @@ public class ConnectorType { if (isEnableLookups() != null) { properties.put(ENABLE_LOOKUPS, isEnableLookups()); } + if (getMaxParameterCount() != null) { + properties.put(MAX_PARAMETER_COUNT, getMaxParameterCount()); + } if (getMaxPostSize() != null) { properties.put(MAX_POST_SIZE, getMaxPostSize()); } Modified: geronimo/server/branches/3.0-beta/plugins/tomcat/geronimo-tomcat7/src/main/xsd/server.xsd URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-beta/plugins/tomcat/geronimo-tomcat7/src/main/xsd/server.xsd?rev=1331274&r1=1331273&r2=1331274&view=diff ============================================================================== --- geronimo/server/branches/3.0-beta/plugins/tomcat/geronimo-tomcat7/src/main/xsd/server.xsd (original) +++ geronimo/server/branches/3.0-beta/plugins/tomcat/geronimo-tomcat7/src/main/xsd/server.xsd Fri Apr 27 07:51:04 2012 @@ -130,6 +130,7 @@ +