You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by ga...@apache.org on 2012/08/01 22:08:04 UTC
svn commit: r1368229 - in
/geronimo/server/branches/3.0/plugins/tomcat/geronimo-tomcat7: pom.xml
src/main/java/org/apache/geronimo/tomcat/model/ConnectorType.java
src/main/xsd/server.xsd
Author: gawor
Date: Wed Aug 1 20:08:03 2012
New Revision: 1368229
URL: http://svn.apache.org/viewvc?rev=1368229&view=rev
Log:
GERONIMO-6378: Recognize URIEncoding and asyncTimeout parameters in server.xml
Modified:
geronimo/server/branches/3.0/plugins/tomcat/geronimo-tomcat7/pom.xml
geronimo/server/branches/3.0/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/model/ConnectorType.java
geronimo/server/branches/3.0/plugins/tomcat/geronimo-tomcat7/src/main/xsd/server.xsd
Modified: geronimo/server/branches/3.0/plugins/tomcat/geronimo-tomcat7/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0/plugins/tomcat/geronimo-tomcat7/pom.xml?rev=1368229&r1=1368228&r2=1368229&view=diff
==============================================================================
--- geronimo/server/branches/3.0/plugins/tomcat/geronimo-tomcat7/pom.xml (original)
+++ geronimo/server/branches/3.0/plugins/tomcat/geronimo-tomcat7/pom.xml Wed Aug 1 20:08:03 2012
@@ -125,6 +125,23 @@
</instructions>
</configuration>
</plugin>
+<!--
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>jaxb2-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <goals>
+ <goal>xjc</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <packageName>org.apache.geronimo.tomcat.model.test</packageName>
+ <extension>true</extension>
+ </configuration>
+ </plugin>
+-->
</plugins>
</build>
Modified: geronimo/server/branches/3.0/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/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/model/ConnectorType.java?rev=1368229&r1=1368228&r2=1368229&view=diff
==============================================================================
--- geronimo/server/branches/3.0/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/model/ConnectorType.java (original)
+++ geronimo/server/branches/3.0/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/model/ConnectorType.java Wed Aug 1 20:08:03 2012
@@ -56,8 +56,10 @@ import org.apache.xbean.recipe.Option;
* </sequence>
* <attribute name="className" type="{http://www.w3.org/2001/XMLSchema}string" />
* <attribute name="allowTrace" type="{http://www.w3.org/2001/XMLSchema}boolean" />
+ * <attribute name="asyncTimeout" type="{http://www.w3.org/2001/XMLSchema}long" />
* <attribute name="emptySessionPath" type="{http://www.w3.org/2001/XMLSchema}boolean" />
* <attribute name="enableLookups" type="{http://www.w3.org/2001/XMLSchema}boolean" />
+ * <attribute name="maxParameterCount" type="{http://www.w3.org/2001/XMLSchema}int" />
* <attribute name="maxPostSize" type="{http://www.w3.org/2001/XMLSchema}int" />
* <attribute name="maxSavePostSize" type="{http://www.w3.org/2001/XMLSchema}int" />
* <attribute name="port" type="{http://www.w3.org/2001/XMLSchema}int" />
@@ -69,6 +71,7 @@ import org.apache.xbean.recipe.Option;
* <attribute name="scheme" type="{http://www.w3.org/2001/XMLSchema}string" />
* <attribute name="secure" type="{http://www.w3.org/2001/XMLSchema}boolean" />
* <attribute name="encoding" type="{http://www.w3.org/2001/XMLSchema}string" />
+ * <attribute name="URIEncoding" type="{http://www.w3.org/2001/XMLSchema}string" />
* <attribute name="useBodyEncodingForURI" type="{http://www.w3.org/2001/XMLSchema}string" />
* <attribute name="xpoweredBy" type="{http://www.w3.org/2001/XMLSchema}string" />
* <attribute name="useIPVHosts" type="{http://www.w3.org/2001/XMLSchema}boolean" />
@@ -90,6 +93,8 @@ public class ConnectorType {
@XmlAttribute
protected Boolean allowTrace;
@XmlAttribute
+ protected Long asyncTimeout;
+ @XmlAttribute
protected Boolean emptySessionPath;
@XmlAttribute
protected Boolean enableLookups;
@@ -117,6 +122,8 @@ public class ConnectorType {
protected Boolean secure;
@XmlAttribute
protected String encoding;
+ @XmlAttribute(name = "URIEncoding")
+ protected String uriEncoding;
@XmlAttribute
protected String useBodyEncodingForURI;
@XmlAttribute
@@ -143,6 +150,8 @@ public class ConnectorType {
private static final String X_POWERED_BY = "xPoweredBy";
private static final String USE_IPVHOSTS = "useIPVHosts";
private static final String ALLOW_TRACE = "allowTrace";
+ private static final String ASYNC_TIMEOUT = "asyncTimeout";
+ private static final String URI_ENCODING = "URIEncoding";
/**
@@ -213,6 +222,30 @@ public class ConnectorType {
}
/**
+ * Gets the value of the asyncTimeout property.
+ *
+ * @return
+ * possible object is
+ * {@link Long }
+ *
+ */
+ public Long getAsyncTimeout() {
+ return asyncTimeout;
+ }
+
+ /**
+ * Sets the value of the asyncTimeout property.
+ *
+ * @param value
+ * allowed object is
+ * {@link Long }
+ *
+ */
+ public void setAsyncTimeout(Long value) {
+ this.asyncTimeout = value;
+ }
+
+ /**
* Gets the value of the emptySessionPath property.
*
* @return possible object is
@@ -493,6 +526,30 @@ public class ConnectorType {
}
/**
+ * Gets the value of the uriEncoding property.
+ *
+ * @return
+ * possible object is
+ * {@link String }
+ *
+ */
+ public String getURIEncoding() {
+ return uriEncoding;
+ }
+
+ /**
+ * Sets the value of the uriEncoding property.
+ *
+ * @param value
+ * allowed object is
+ * {@link String }
+ *
+ */
+ public void setURIEncoding(String value) {
+ this.uriEncoding = value;
+ }
+
+ /**
* Gets the value of the useBodyEncodingForURI property.
*
* @return possible object is
@@ -574,6 +631,9 @@ public class ConnectorType {
if (isAllowTrace() != null) {
properties.put(ALLOW_TRACE, isAllowTrace());
}
+ if (getAsyncTimeout() != null) {
+ properties.put(ASYNC_TIMEOUT, getAsyncTimeout());
+ }
if (isEmptySessionPath() != null) {
properties.put(EMPTY_SESSION_PATH, isEmptySessionPath());
}
@@ -616,6 +676,9 @@ public class ConnectorType {
if (getEncoding() != null) {
properties.put(ENCODING, getEncoding());
}
+ if (getURIEncoding() != null) {
+ properties.put(URI_ENCODING, getURIEncoding());
+ }
if (getUseBodyEncodingForURI() != null) {
properties.put(USE_BODY_ENCODING_FOR_URI, getUseBodyEncodingForURI());
}
Modified: geronimo/server/branches/3.0/plugins/tomcat/geronimo-tomcat7/src/main/xsd/server.xsd
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0/plugins/tomcat/geronimo-tomcat7/src/main/xsd/server.xsd?rev=1368229&r1=1368228&r2=1368229&view=diff
==============================================================================
--- geronimo/server/branches/3.0/plugins/tomcat/geronimo-tomcat7/src/main/xsd/server.xsd (original)
+++ geronimo/server/branches/3.0/plugins/tomcat/geronimo-tomcat7/src/main/xsd/server.xsd Wed Aug 1 20:08:03 2012
@@ -128,6 +128,7 @@
</xs:sequence>
<xs:attribute type="xs:string" name="className"/>
<xs:attribute type="xs:boolean" name="allowTrace"/>
+ <xs:attribute type="xs:long" name="asyncTimeout"/>
<xs:attribute type="xs:boolean" name="emptySessionPath"/>
<xs:attribute type="xs:boolean" name="enableLookups"/>
<xs:attribute type="xs:int" name="maxParameterCount"/>
@@ -142,6 +143,7 @@
<xs:attribute type="xs:string" name="scheme"/>
<xs:attribute type="xs:boolean" name="secure"/>
<xs:attribute type="xs:string" name="encoding"/>
+ <xs:attribute type="xs:string" name="URIEncoding"/>
<xs:attribute type="xs:string" name="useBodyEncodingForURI"/>
<xs:attribute type="xs:string" name="xpoweredBy"/>
<xs:attribute type="xs:boolean" name="useIPVHosts"/>
@@ -265,4 +267,4 @@
<!-- see ContextRuleSet. Very incomplete -->
</xs:complexContent>
</xs:complexType>
-</xs:schema>
\ No newline at end of file
+</xs:schema>