You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by jg...@apache.org on 2006/09/09 21:08:48 UTC
svn commit: r441844 - in
/geronimo/server/trunk/modules/geronimo-tomcat/src/main/java/org/apache/geronimo/tomcat:
ConnectorGBean.java HttpsConnectorGBean.java TomcatSecureConnector.java
TomcatWebConnector.java
Author: jgenender
Date: Sat Sep 9 12:08:47 2006
New Revision: 441844
URL: http://svn.apache.org/viewvc?view=rev&rev=441844
Log:
GERONIMO-2390 - add missing attributes to the connectors
Modified:
geronimo/server/trunk/modules/geronimo-tomcat/src/main/java/org/apache/geronimo/tomcat/ConnectorGBean.java
geronimo/server/trunk/modules/geronimo-tomcat/src/main/java/org/apache/geronimo/tomcat/HttpsConnectorGBean.java
geronimo/server/trunk/modules/geronimo-tomcat/src/main/java/org/apache/geronimo/tomcat/TomcatSecureConnector.java
geronimo/server/trunk/modules/geronimo-tomcat/src/main/java/org/apache/geronimo/tomcat/TomcatWebConnector.java
Modified: geronimo/server/trunk/modules/geronimo-tomcat/src/main/java/org/apache/geronimo/tomcat/ConnectorGBean.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-tomcat/src/main/java/org/apache/geronimo/tomcat/ConnectorGBean.java?view=diff&rev=441844&r1=441843&r2=441844
==============================================================================
--- geronimo/server/trunk/modules/geronimo-tomcat/src/main/java/org/apache/geronimo/tomcat/ConnectorGBean.java (original)
+++ geronimo/server/trunk/modules/geronimo-tomcat/src/main/java/org/apache/geronimo/tomcat/ConnectorGBean.java Sat Sep 9 12:08:47 2006
@@ -456,6 +456,102 @@
connector.setAttribute("useBodyEncodingForURI", new Boolean(enabled));
}
+ public void setAllowTrace(boolean allow) {
+ connector.setAllowTrace(allow);
+ }
+
+ public boolean getAllowTrace() {
+ return connector.getAllowTrace();
+ }
+
+ public void setProxyName(String proxyName) {
+ connector.setProxyName(proxyName);
+ }
+
+ public String getProxyName() {
+ return connector.getProxyName();
+ }
+
+ public void setProxyPort(int port) {
+ connector.setProxyPort(port);
+ }
+
+ public int getProxyPort() {
+ return connector.getProxyPort();
+ }
+
+ public void setScheme(String scheme) {
+ connector.setScheme(scheme);
+ }
+
+ public String getSceme() {
+ return connector.getScheme();
+ }
+
+ public void setUriEncoding(String encoding) {
+ connector.setURIEncoding(encoding);
+ }
+
+ public String getUriEncoding() {
+ return connector.getURIEncoding();
+ }
+
+ public void setUseIPVHosts(boolean useIPVHosts) {
+ connector.setUseIPVHosts(useIPVHosts);
+ }
+
+ public boolean getUseIPVHosts() {
+ return connector.getUseIPVHosts();
+ }
+
+ public void setXpoweredBy(boolean xpoweredBy) {
+ connector.setXpoweredBy(xpoweredBy);
+ }
+
+ public boolean getXpoweredBy() {
+ return connector.getXpoweredBy();
+ }
+
+ public void setCompressableMimeType(String compressableMimeType) {
+ connector.setAttribute("compressableMimeType", compressableMimeType);
+ }
+
+ public String getCompressableMimeType() {
+ return (String) connector.getAttribute("compressableMimeType");
+ }
+
+ public void setCompression(String compression) {
+ connector.setAttribute("compression", compression);
+ }
+
+ public String getCompression() {
+ return (String) connector.getAttribute("compression");
+ }
+
+ public void setNoCompressionUserAgents(String noCompressionUserAgents) {
+ connector.setAttribute("noCompressionUserAgents", noCompressionUserAgents);
+ }
+
+ public String getNoCompressionUserAgents() {
+ return (String) connector.getAttribute("noCompressionUserAgents");
+ }
+
+ public void setRestrictedUserAgents(String restrictedUserAgents) {
+ connector.setAttribute("restrictedUserAgents", restrictedUserAgents);
+ }
+
+ public String getRestrictedUserAgents() {
+ return (String) connector.getAttribute("restrictedUserAgents");
+ }
+
+ public void setThreadPriority(int threadPriority) {
+ connector.setAttribute("threadPriority", new Integer(threadPriority));
+ }
+
+ public int getThreadPriority() {
+ Object value = connector.getAttribute("threadPriority");
+ return Integer.parseInt(value.toString());
+ }
public static final GBeanInfo GBEAN_INFO;
@@ -465,8 +561,49 @@
infoFactory.addAttribute("protocol", String.class, true);
infoFactory.addReference(CONNECTOR_CONTAINER_REFERENCE, TomcatContainer.class, NameFactory.GERONIMO_SERVICE);
infoFactory.addOperation("getInternalObject");
- infoFactory.addInterface(TomcatWebConnector.class, new String[]{"host","port","bufferSizeBytes","maxThreads","acceptQueueSize","lingerMillis","tcpNoDelay","redirectPort","minSpareThreads","maxSpareThreads","maxHttpHeaderSizeBytes","hostLookupEnabled","connectionTimeoutMillis","uploadTimeoutEnabled","connectUrl","maxPostSize","maxSavePostSize","emptySessionPath", "maxKeepAliveRequests", "socketBuffer", "useBodyEncodingForURI"},
- new String[]{"host","port","redirectPort","maxThreads"});
+ infoFactory.addInterface(TomcatWebConnector.class,
+ new String[]{
+ "host",
+ "port",
+ "bufferSizeBytes",
+ "maxThreads",
+ "acceptQueueSize",
+ "lingerMillis",
+ "tcpNoDelay",
+ "redirectPort",
+ "minSpareThreads",
+ "maxSpareThreads",
+ "maxHttpHeaderSizeBytes",
+ "hostLookupEnabled",
+ "connectionTimeoutMillis",
+ "uploadTimeoutEnabled",
+ "connectUrl",
+ "maxPostSize",
+ "maxSavePostSize",
+ "emptySessionPath",
+ "maxKeepAliveRequests",
+ "socketBuffer",
+ "useBodyEncodingForURI",
+ "allowTrace",
+ "proxyName",
+ "proxyPort",
+ "scheme",
+ "secure",
+ "uriEncoding",
+ "useIPVHosts",
+ "xpoweredBy",
+ "compressableMimeType",
+ "compression",
+ "noCompressionUserAgents",
+ "restrictedUserAgents",
+ "threadPriority"
+ },
+
+ new String[]{
+ "host",
+ "port",
+ "redirectPort",
+ "maxThreads"});
infoFactory.setConstructor(new String[] { "name", "protocol", "host", "port", "TomcatContainer"});
GBEAN_INFO = infoFactory.getBeanInfo();
}
Modified: geronimo/server/trunk/modules/geronimo-tomcat/src/main/java/org/apache/geronimo/tomcat/HttpsConnectorGBean.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-tomcat/src/main/java/org/apache/geronimo/tomcat/HttpsConnectorGBean.java?view=diff&rev=441844&r1=441843&r2=441844
==============================================================================
--- geronimo/server/trunk/modules/geronimo-tomcat/src/main/java/org/apache/geronimo/tomcat/HttpsConnectorGBean.java (original)
+++ geronimo/server/trunk/modules/geronimo-tomcat/src/main/java/org/apache/geronimo/tomcat/HttpsConnectorGBean.java Sat Sep 9 12:08:47 2006
@@ -191,6 +191,22 @@
connector.setAttribute("clientAuth", new Boolean(clientCert));
}
+ /**
+ * Gets a comma seperated list of the encryption ciphers that may be used. If not
+ * specified, then any available cipher may be used.
+ */
+ public String getCiphers() {
+ return (String)connector.getAttribute("ciphers");
+ }
+
+ /**
+ * Sets a comma seperated list of the encryption ciphers that may be used. If not
+ * specified, then any available cipher may be used.
+ */
+ public void setCiphers(String ciphers) {
+ connector.setAttribute("ciphers", ciphers);
+ }
+
public static final GBeanInfo GBEAN_INFO;
static {
@@ -206,6 +222,7 @@
infoFactory.addAttribute("keystoreType", String.class, true, true);
infoFactory.addAttribute("truststoreType", String.class, true, true);
infoFactory.addAttribute("clientAuthRequired", boolean.class, true, true);
+ infoFactory.addAttribute("ciphers", String.class, true, true);
infoFactory.addInterface(TomcatSecureConnector.class);
infoFactory.addReference("ServerInfo", ServerInfo.class, "GBean");
Modified: geronimo/server/trunk/modules/geronimo-tomcat/src/main/java/org/apache/geronimo/tomcat/TomcatSecureConnector.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-tomcat/src/main/java/org/apache/geronimo/tomcat/TomcatSecureConnector.java?view=diff&rev=441844&r1=441843&r2=441844
==============================================================================
--- geronimo/server/trunk/modules/geronimo-tomcat/src/main/java/org/apache/geronimo/tomcat/TomcatSecureConnector.java (original)
+++ geronimo/server/trunk/modules/geronimo-tomcat/src/main/java/org/apache/geronimo/tomcat/TomcatSecureConnector.java Sat Sep 9 12:08:47 2006
@@ -50,4 +50,16 @@
* PCKS12 (and possibly other formats).
*/
public void setTruststoreType(String type);
+
+ /**
+ * Gets a comma seperated list of the encryption ciphers that may be used. If not
+ * specified, then any available cipher may be used.
+ */
+ public String getCiphers();
+
+ /**
+ * Sets a comma seperated list of the encryption ciphers that may be used. If not
+ * specified, then any available cipher may be used.
+ */
+ public void setCiphers(String ciphers);
}
Modified: geronimo/server/trunk/modules/geronimo-tomcat/src/main/java/org/apache/geronimo/tomcat/TomcatWebConnector.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-tomcat/src/main/java/org/apache/geronimo/tomcat/TomcatWebConnector.java?view=diff&rev=441844&r1=441843&r2=441844
==============================================================================
--- geronimo/server/trunk/modules/geronimo-tomcat/src/main/java/org/apache/geronimo/tomcat/TomcatWebConnector.java (original)
+++ geronimo/server/trunk/modules/geronimo-tomcat/src/main/java/org/apache/geronimo/tomcat/TomcatWebConnector.java Sat Sep 9 12:08:47 2006
@@ -34,4 +34,28 @@
public void setUseBodyEncodingForURI(boolean enabled);
public int getMaxKeepAliveRequests();
public void setMaxKeepAliveRequests(int maxKeepAliveRequests);
+ public void setAllowTrace(boolean allow);
+ public boolean getAllowTrace();
+ public void setProxyName(String proxyName);
+ public String getProxyName();
+ public void setProxyPort(int port);
+ public int getProxyPort();
+ public void setScheme(String scheme);
+ public String getSceme();
+ public void setUriEncoding(String scheme);
+ public String getUriEncoding();
+ public void setUseIPVHosts(boolean useIPVHosts);
+ public boolean getUseIPVHosts();
+ public void setXpoweredBy(boolean xpoweredBy);
+ public boolean getXpoweredBy();
+ public void setCompressableMimeType(String compressableMimeType);
+ public String getCompressableMimeType();
+ public void setCompression(String compression);
+ public String getCompression();
+ public void setNoCompressionUserAgents(String noRestrictedUserAgents);
+ public String getNoCompressionUserAgents();
+ public void setRestrictedUserAgents(String noRestrictedUserAgents);
+ public String getRestrictedUserAgents();
+ public void setThreadPriority(int threadPriority);
+ public int getThreadPriority();
}