geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From genspr...@apache.org
Subject svn commit: r813250 - /geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/connector/
Date Thu, 10 Sep 2009 06:23:43 GMT
Author: genspring
Date: Thu Sep 10 06:23:42 2009
New Revision: 813250

URL: http://svn.apache.org/viewvc?rev=813250&view=rev
Log:
GERONIMO-4853 Can't define tomcat connector with GBean.

Modified:
    geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/connector/AJP13ConnectorGBean.java
    geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/connector/AbstractHttp11ConnectorGBean.java
    geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/connector/BaseHttp11ConnectorGBean.java
    geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/connector/ConnectorGBean.java
    geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/connector/Http11APRConnectorGBean.java
    geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/connector/Http11ConnectorGBean.java
    geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/connector/Http11NIOConnectorGBean.java
    geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/connector/Https11APRConnectorGBean.java
    geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/connector/Https11ConnectorGBean.java
    geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/connector/Https11NIOConnectorGBean.java

Modified: geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/connector/AJP13ConnectorGBean.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/connector/AJP13ConnectorGBean.java?rev=813250&r1=813249&r2=813250&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/connector/AJP13ConnectorGBean.java
(original)
+++ geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/connector/AJP13ConnectorGBean.java
Thu Sep 10 06:23:42 2009
@@ -47,13 +47,13 @@
 
     protected String connectHost;
     
-    public AJP13ConnectorGBean(@ParamAttribute(name = "name") String name,
-                               @ParamAttribute(name = "initParams") Map<String, String>
initParams,
-                               @ParamAttribute(name = "host") String host,
-                               @ParamAttribute(name = "port") int port,
+    public AJP13ConnectorGBean(@ParamAttribute(manageable=false, name = "name") String name,
+                               @ParamAttribute(manageable=false, name = "initParams") Map<String,
String> initParams,
+                               @ParamAttribute(manageable=false, name = "host") String host,
+                               @ParamAttribute(manageable=false, name = "port") int port,
                                @ParamReference(name = "TomcatContainer") TomcatContainer
container,
                                @ParamReference(name = "ServerInfo") ServerInfo serverInfo,
-                               @ParamAttribute(name = "connector") Connector conn)  throws
Exception {
+                               @ParamAttribute(manageable=false, name = "connector") Connector
conn)  throws Exception {
     
 
         super(name, initParams, "AJP/1.3", container, serverInfo, conn);
@@ -190,72 +190,72 @@
         return value == null ? true : new Boolean(value.toString()).booleanValue();
     }
     
-    @Persistent
+    @Persistent(manageable=false)
     public void setAddress(String address) {
         connector.setAttribute("address", address);
     }
     
-    @Persistent
+    @Persistent(manageable=false)
     public void setBacklog(int backlog) {
         connector.setAttribute("backlog", new Integer(backlog));
     }
     
-    @Persistent
+    @Persistent(manageable=false)
     public void setBufferSize(int bufferSize) {
         connector.setAttribute("bufferSize", new Integer(bufferSize));
     }
     
-    @Persistent
+    @Persistent(manageable=false)
     public void setConnectionTimeout(int connectionTimeout) {
         connector.setAttribute("connectionTimeout", new Integer(connectionTimeout));
     }
     
-    @Persistent
+    @Persistent(manageable=false)
     public void setExecutor(String executor) {
         connector.setAttribute("executor", executor);
     }
     
-    @Persistent
+    @Persistent(manageable=false)
     public void setHost(String host) {
         setAddress(host);
     }
     
-    @Persistent
+    @Persistent(manageable=false)
     public void setKeepAliveTimeout(int keepAliveTimeout) {
         connector.setAttribute("keepAliveTimeout", keepAliveTimeout);        
     }
     
-    @Persistent
+    @Persistent(manageable=false)
     public void setMaxThreads(int maxThreads) {
         connector.setAttribute("maxThreads", maxThreads);        
     }
     
-    @Persistent
+    @Persistent(manageable=false)
     public void setMaxSpareThreads(int maxSpareThreads) {
         connector.setAttribute("maxSpareThreads", new Integer(maxSpareThreads));
     }
     
-    @Persistent 
+    @Persistent(manageable=false) 
     public void setMinSpareThreads(int minSpareThreads) {
         connector.setAttribute("minSpareThreads", new Integer(minSpareThreads));
     }
     
-    @Persistent
+    @Persistent(manageable=false)
     public void setNoCompressionUserAgents(String noCompressionUserAgents) {
         connector.setAttribute("noCompressionUserAgents", noCompressionUserAgents);
     }
     
-    @Persistent
+    @Persistent(manageable=false)
     public void setPort(int port) {
         connector.setPort(port);
     }
     
-    @Persistent
+    @Persistent(manageable=false)
     public void setTcpNoDelay(boolean tcpNoDelay) {
         connector.setAttribute("tcpNoDelay", new Boolean(tcpNoDelay));
     }
     
-    @Persistent
+    @Persistent(manageable=false)
     public void setTomcatAuthentication(boolean tomcatAuthentication) {
         connector.setAttribute("tomcatAuthentication", new Boolean(tomcatAuthentication));
     }

Modified: geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/connector/AbstractHttp11ConnectorGBean.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/connector/AbstractHttp11ConnectorGBean.java?rev=813250&r1=813249&r2=813250&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/connector/AbstractHttp11ConnectorGBean.java
(original)
+++ geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/connector/AbstractHttp11ConnectorGBean.java
Thu Sep 10 06:23:42 2009
@@ -39,14 +39,14 @@
 
     private String algorithm;
     
-    public AbstractHttp11ConnectorGBean(@ParamAttribute(name = "name") String name,
-                                        @ParamAttribute(name = "initParams") Map<String,
String> initParams,
-                                        @ParamAttribute(name = "protocol") String tomcatProtocol,
-                                        @ParamAttribute(name = "host") String host,
-                                        @ParamAttribute(name = "port") int port,
+    public AbstractHttp11ConnectorGBean(@ParamAttribute(manageable=false, name = "name")
String name,
+                                        @ParamAttribute(manageable=false, name = "initParams")
Map<String, String> initParams,
+                                        @ParamAttribute(manageable=false, name = "protocol")
String tomcatProtocol,
+                                        @ParamAttribute(manageable=false, name = "host")
String host,
+                                        @ParamAttribute(manageable=false, name = "port")
int port,
                                         @ParamReference(name = "TomcatContainer") TomcatContainer
container,
                                         @ParamReference(name = "ServerInfo") ServerInfo serverInfo,
-                                        @ParamAttribute(name = "connector") Connector conn)
 throws Exception {
+                                        @ParamAttribute(manageable=false, name = "connector")
Connector conn)  throws Exception {
                                         
         super(name, initParams, tomcatProtocol, host, port, container, serverInfo, conn);
     }
@@ -107,7 +107,7 @@
         return (String) connector.getAttribute("keystorePass");
     }
     
-    @Persistent
+    @Persistent(manageable=false)
     public void setAlgorithm(String algorithm) {
         this.algorithm = algorithm;
         if ("default".equalsIgnoreCase(algorithm)) {
@@ -116,24 +116,24 @@
         connector.setAttribute("algorithm", algorithm);
     }
 
-    @Persistent
+    @Persistent(manageable=false)
     public void setCiphers(String ciphers) {
         connector.setAttribute("ciphers", ciphers);
     }
     
-    @Persistent
+    @Persistent(manageable=false)
     public void setClientAuth(boolean clientAuth) {
         connector.setAttribute("clientAuth", new Boolean(clientAuth));
     }
 
-    @Persistent
+    @Persistent(manageable=false)
     public void setKeyAlias(String keyAlias) {
         if (keyAlias.equals(""))
             keyAlias = null;
         connector.setAttribute("keyAlias", keyAlias);
     }
 
-    @Persistent
+    @Persistent(manageable=false)
     public void setKeystoreFile(String keystoreFile) {
         if (keystoreFile!= null && keystoreFile.equals("")) 
             keystoreFile = null;
@@ -144,28 +144,28 @@
             connector.setAttribute("keystoreFile", serverInfo.resolveServerPath(keystoreFileName));
     }
 
-    @Persistent
+    @Persistent(manageable=false)
     public void setKeystorePass(String keystorePass) {
         if (keystorePass!= null && keystorePass.equals("")) 
             keystorePass = null;
         connector.setAttribute("keystorePass", keystorePass);
     }
 
-    @Persistent
+    @Persistent(manageable=false)
     public void setKeystoreType(String keystoreType) {
         if (keystoreType!= null && keystoreType.equals("")) 
             keystoreType = null;
         connector.setAttribute("keystoreType", keystoreType);
     }
 
-    @Persistent
+    @Persistent(manageable=false)
     public void setSslProtocol(String sslProtocol) {
         if (sslProtocol!= null && sslProtocol.equals("")) 
             sslProtocol = null;
         connector.setAttribute("sslProtocol", sslProtocol);
     }
 
-    @Persistent
+    @Persistent(manageable=false)
     public void setTruststoreFile(String truststoreFile) {
         if (truststoreFile!= null && truststoreFile.equals("")) 
             truststoreFile = null;
@@ -176,14 +176,14 @@
             connector.setAttribute("truststoreFile", serverInfo.resolveServerPath(truststoreFileName));
     }
     
-    @Persistent
+    @Persistent(manageable=false)
     public void setTruststorePass(String truststorePass) {
         if (truststorePass!= null && truststorePass.equals("")) 
             truststorePass = null;
         connector.setAttribute("truststorePass", truststorePass);
     }
     
-    @Persistent
+    @Persistent(manageable=false)
     public void setTruststoreType(String truststoreType) {
         if (truststoreType!= null && truststoreType.equals("")) 
             truststoreType = null;

Modified: geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/connector/BaseHttp11ConnectorGBean.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/connector/BaseHttp11ConnectorGBean.java?rev=813250&r1=813249&r2=813250&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/connector/BaseHttp11ConnectorGBean.java
(original)
+++ geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/connector/BaseHttp11ConnectorGBean.java
Thu Sep 10 06:23:42 2009
@@ -46,14 +46,14 @@
 
     private boolean reset = true;
 
-    public BaseHttp11ConnectorGBean(@ParamAttribute(name = "name") String name,
-                                    @ParamAttribute(name = "initParams") Map<String, String>
initParams,
-                                    @ParamAttribute(name = "protocol") String tomcatProtocol,
-                                    @ParamAttribute(name = "host") String host,
-                                    @ParamAttribute(name = "port") int port,
+    public BaseHttp11ConnectorGBean(@ParamAttribute(manageable=false, name = "name") String
name,
+                                    @ParamAttribute(manageable=false, name = "initParams")
Map<String, String> initParams,
+                                    @ParamAttribute(manageable=false, name = "protocol")
String tomcatProtocol,
+                                    @ParamAttribute(manageable=false, name = "host") String
host,
+                                    @ParamAttribute(manageable=false, name = "port") int
port,
                                     @ParamReference(name = "TomcatContainer") TomcatContainer
container,
                                     @ParamReference(name = "ServerInfo") ServerInfo serverInfo,
-                                    @ParamAttribute(name = "connector") Connector conn) 
throws Exception {
+                                    @ParamAttribute(manageable=false, name = "connector")
Connector conn)  throws Exception {
                                     
         super(name, initParams, tomcatProtocol, container, serverInfo, conn);
 
@@ -238,112 +238,112 @@
         connector.setAttribute("acceptCount", new Integer(acceptCount));
     }
     
-    @Persistent
+    @Persistent(manageable=false)
     public void setAddress(String address) {
         connector.setAttribute("address", address);
     }
     
-    @Persistent
+    @Persistent(manageable=false)
     public void setBufferSize(int bufferSize) {
         connector.setAttribute("bufferSize", new Integer(bufferSize));
     }
     
-    @Persistent
+    @Persistent(manageable=false)
     public void setCompressableMimeType(String compressableMimeType) {
         connector.setAttribute("compressableMimeType", compressableMimeType);
     }
     
-    @Persistent
+    @Persistent(manageable=false)
     public void setCompression(String compression) {
         connector.setAttribute("compression", compression);
     }
     
-    @Persistent
+    @Persistent(manageable=false)
     public void setConnectionLinger(int connectionLinger) {
         connector.setAttribute("connectionLinger", new Integer(connectionLinger));
     }
     
-    @Persistent
+    @Persistent(manageable=false)
     public void setConnectionTimeout(int connectionTimeout) {
         connector.setAttribute("connectionTimeout", new Integer(connectionTimeout));
     }
     
-    @Persistent
+    @Persistent(manageable=false)
     public void setDisableUploadTimeout(boolean disableUploadTimeout) {
         connector.setAttribute("disableUploadTimeout", new Boolean(disableUploadTimeout));
     }
     
-    @Persistent
+    @Persistent(manageable=false)
     public void setExecutor(String executor) {
         connector.setAttribute("executor", executor);
     }
     
-    @Persistent
+    @Persistent(manageable=false)
     public void setHost(String host) {
         setAddress(host);
     }
     
-    @Persistent
+    @Persistent(manageable=false)
     public void setKeepAliveTimeout(int keepAliveTimeout) {
         connector.setAttribute("keepAliveTimeout", keepAliveTimeout);
     }
     
-    @Persistent
+    @Persistent(manageable=false)
     public void setMaxHttpHeaderSize(int maxHttpHeaderSize) {
         connector.setAttribute("maxHttpHeaderSize", new Integer(maxHttpHeaderSize));
     }
     
-    @Persistent
+    @Persistent(manageable=false)
     public void setMaxKeepAliveRequests(int maxKeepAliveRequests) {
         connector.setAttribute("maxKeepAliveRequests", new Integer(maxKeepAliveRequests));
     }
     
-    @Persistent
+    @Persistent(manageable=false)
     public void setMaxThreads(int maxThreads) {
         connector.setAttribute("maxThreads", new Integer(maxThreads));
     }
     
-    @Persistent
+    @Persistent(manageable=false)
     public void setMaxSpareThreads(int maxSpareThreads) {
         connector.setAttribute("maxSpareThreads", new Integer(maxSpareThreads));
     }
     
-    @Persistent
+    @Persistent(manageable=false)
     public void setMinSpareThreads(int minSpareThreads) {
         connector.setAttribute("minSpareThreads", new Integer(minSpareThreads));
     }
     
-    @Persistent
+    @Persistent(manageable=false)
     public void setNoCompressionUserAgents(String noCompressionUserAgents) {
         connector.setAttribute("noCompressionUserAgents", noCompressionUserAgents);
     }
-    @Persistent
+    @Persistent(manageable=false)
     public void setPort(int port) {
         connector.setPort(port);
     }
-    @Persistent
+    @Persistent(manageable=false)
     public void setRestrictedUserAgents(String restrictedUserAgents) {
         connector.setAttribute("restrictedUserAgents", restrictedUserAgents);
     }
     
-    @Persistent
+    @Persistent(manageable=false)
     public void setServer(String server) {
         if (server.equals(""))
             server = null;
         connector.setAttribute("server", server);
     }
     
-    @Persistent
+    @Persistent(manageable=false)
     public void setSocketBuffer(int socketBuffer) {
         connector.setAttribute("socketBuffer", new Integer(socketBuffer));
     }
     
-    @Persistent
+    @Persistent(manageable=false)
     public void setTcpNoDelay(boolean tcpNoDelay) {
         connector.setAttribute("tcpNoDelay", new Boolean(tcpNoDelay));
     }
     
-    @Persistent
+    @Persistent(manageable=false)
     public void setThreadPriority(int threadPriority) {
         connector.setAttribute("threadPriority", new Integer(threadPriority));
     }

Modified: geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/connector/ConnectorGBean.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/connector/ConnectorGBean.java?rev=813250&r1=813249&r2=813250&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/connector/ConnectorGBean.java
(original)
+++ geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/connector/ConnectorGBean.java
Thu Sep 10 06:23:42 2009
@@ -55,12 +55,12 @@
     private String name;
     
 
-    public ConnectorGBean(@ParamAttribute(name = "name") String name,
-                        @ParamAttribute(name = "initParams") Map<String, String> initParams,
-                        @ParamAttribute(name = "protocol") String tomcatProtocol,
+    public ConnectorGBean(@ParamAttribute(manageable=false, name = "name") String name,
+                        @ParamAttribute(manageable=false, name = "initParams") Map<String,
String> initParams,
+                        @ParamAttribute(manageable=false, name = "protocol") String tomcatProtocol,
                         @ParamReference(name = "TomcatContainer") TomcatContainer container,
                         @ParamReference(name = "ServerInfo") ServerInfo serverInfo,
-                        @ParamAttribute(name = "connector") Connector conn)  throws Exception
{
+                        @ParamAttribute(manageable=false, name = "connector") Connector conn)
 throws Exception {
         
         //Relief for new Tomcat-only parameters that may come in the future
         if (initParams == null){
@@ -211,34 +211,34 @@
         return connector.getUseIPVHosts();
     }
     
-    @Persistent
+    @Persistent(manageable=false)
     public void setMaxSavePostSize(int maxSavePostSize) {
         connector.setMaxSavePostSize(maxSavePostSize);
     }
     
-    @Persistent
+    @Persistent(manageable=false)
     public void setProxyName(String proxyName) {
         if (proxyName.equals(""))
             proxyName = null;
         connector.setProxyName(proxyName);
     }
     
-    @Persistent
+    @Persistent(manageable=false)
     public void setProxyPort(int port) {
         connector.setProxyPort(port);
     }
     
-    @Persistent
+    @Persistent(manageable=false)
     public void setRedirectPort(int port) {
         connector.setRedirectPort(port);
     }
     
-    @Persistent
+    @Persistent(manageable=false)
     public void setScheme(String scheme) {
         connector.setScheme(scheme);
     }
     
-    @Persistent
+    @Persistent(manageable=false)
     public void setSecure(boolean secure) {
         connector.setSecure(secure);
     }
@@ -248,27 +248,27 @@
         return value == null ? false : new Boolean(value.toString()).booleanValue();
     }
     
-    @Persistent
+    @Persistent(manageable=false)
     public void setSslEnabled(boolean sslEnabled) {
         connector.setAttribute("SSLEnabled", sslEnabled);
     }
     
-    @Persistent
+    @Persistent(manageable=false)
     public void setUriEncoding(String uriEncoding) {
         connector.setURIEncoding(uriEncoding);
     }
     
-    @Persistent
+    @Persistent(manageable=false)
     public void setUseBodyEncodingForURI(boolean useBodyEncodingForURI) {
         connector.setUseBodyEncodingForURI(useBodyEncodingForURI);
     }
     
-    @Persistent
+    @Persistent(manageable=false)
     public void setUseIPVHosts(boolean useIPVHosts) {
         connector.setUseIPVHosts(useIPVHosts);
     }
     
-    @Persistent
+    @Persistent(manageable=false)
     public void setXpoweredBy(boolean xpoweredBy) {
         connector.setXpoweredBy(xpoweredBy);
     }

Modified: geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/connector/Http11APRConnectorGBean.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/connector/Http11APRConnectorGBean.java?rev=813250&r1=813249&r2=813250&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/connector/Http11APRConnectorGBean.java
(original)
+++ geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/connector/Http11APRConnectorGBean.java
Thu Sep 10 06:23:42 2009
@@ -40,13 +40,13 @@
     private String revocationPath;
     private String revocationFile;
     
-    public Http11APRConnectorGBean(@ParamAttribute(name = "name") String name,
-                                   @ParamAttribute(name = "initParams") Map<String, String>
initParams,
-                                   @ParamAttribute(name = "host") String host,
-                                   @ParamAttribute(name = "port") int port,
+    public Http11APRConnectorGBean(@ParamAttribute(manageable=false, name = "name") String
name,
+                                   @ParamAttribute(manageable=false, name = "initParams")
Map<String, String> initParams,
+                                   @ParamAttribute(manageable=false, name = "host") String
host,
+                                   @ParamAttribute(manageable=false, name = "port") int port,
                                    @ParamReference(name = "TomcatContainer") TomcatContainer
container,
                                    @ParamReference(name = "ServerInfo") ServerInfo serverInfo,
-                                   @ParamAttribute(name = "connector") Connector conn)  throws
Exception {
+                                   @ParamAttribute(manageable=false, name = "connector")
Connector conn)  throws Exception {
                                    
         super(name, initParams, "org.apache.coyote.http11.Http11AprProtocol", host, port,
container, serverInfo, conn);
     }
@@ -130,22 +130,22 @@
         return (String) connector.getAttribute("SSLPassword");
     }
     
-    @Persistent
+    @Persistent(manageable=false)
     public void setPollTime(int pollTime) {
         connector.setAttribute("pollTime", pollTime);
     }
     
-    @Persistent
+    @Persistent(manageable=false)
     public void setPollerSize(int pollerSize) {
         connector.setAttribute("pollerSize", pollerSize);
     }
     
-    @Persistent
+    @Persistent(manageable=false)
     public void setSendfileSize(int sendfileSize) {
         connector.setAttribute("sendfileSize", sendfileSize);
     }
     
-    @Persistent
+    @Persistent(manageable=false)
     public void setSslCACertificateFile(String sslCACertificateFile) {
         if (sslCACertificateFile != null && sslCACertificateFile.equals(""))
             sslCACertificateFile = null;
@@ -156,7 +156,7 @@
             connector.setAttribute("SSLCACertificateFile", serverInfo.resolveServerPath(caCertificateFile));
     }
     
-    @Persistent
+    @Persistent(manageable=false)
     public void setSslCACertificatePath(String sslCACertificatePath) {
         if (sslCACertificatePath != null && sslCACertificatePath.equals(""))
             sslCACertificatePath = null;
@@ -167,7 +167,7 @@
             connector.setAttribute("SSLCACertificatePath", serverInfo.resolveServerPath(caCertificatePath));
     }
     
-    @Persistent
+    @Persistent(manageable=false)
     public void setSslCertificateChainFile(String sslCertificateChainFile) {
         if (sslCertificateChainFile != null && sslCertificateChainFile.equals(""))
             sslCertificateChainFile = null;
@@ -178,7 +178,7 @@
             connector.setAttribute("SSLCertificateChainFile", serverInfo.resolveServerPath(certificateChainFile));
     }
     
-    @Persistent
+    @Persistent(manageable=false)
     public void setSslCertificateFile(String sslCertificateFile) {
         if (sslCertificateFile != null && sslCertificateFile.equals(""))
             sslCertificateFile = null;
@@ -189,7 +189,7 @@
             connector.setAttribute("SSLCertificateFile", serverInfo.resolveServerPath(certificateFile));
     }
     
-    @Persistent
+    @Persistent(manageable=false)
     public void setSslCertificateKeyFile(String sslCertificateKeyFile) {
         if (sslCertificateKeyFile != null && sslCertificateKeyFile.equals(""))
             sslCertificateKeyFile = null;
@@ -200,24 +200,24 @@
             connector.setAttribute("SSLCertificateKeyFile", serverInfo.resolveServerPath(certificateKeyFile));
     }
     
-    @Persistent
+    @Persistent(manageable=false)
     public void setSslCipherSuite(String sslCipherSuite) {
         connector.setAttribute("SSLCipherSuite", sslCipherSuite);
     }
     
-    @Persistent
+    @Persistent(manageable=false)
     public void setSslPassword(String sslPassword) {
         if (sslPassword != null && sslPassword.equals(""))
             sslPassword = null;
         connector.setAttribute("SSLPassword", sslPassword);
     }
     
-    @Persistent
+    @Persistent(manageable=false)
     public void setSslProtocol(String sslProtocol) {
         connector.setAttribute("SSLProtocol", sslProtocol);
     }
     
-    @Persistent
+    @Persistent(manageable=false)
     public void setSslCARevocationFile(String sslCARevocationFile) {
         if (sslCARevocationFile!= null && sslCARevocationFile.equals("")) 
             sslCARevocationFile = null;
@@ -228,7 +228,7 @@
             connector.setAttribute("SSLCARevocationFile", serverInfo.resolveServerPath(revocationFile));
     }
     
-    @Persistent
+    @Persistent(manageable=false)
     public void setSslCARevocationPath(String sslCARevocationPath) {
         if (sslCARevocationPath!= null && sslCARevocationPath.equals("")) 
             sslCARevocationPath = null;
@@ -240,17 +240,17 @@
 
     }
     
-    @Persistent
+    @Persistent(manageable=false)
     public void setSslVerifyClient(String sslVerifyClient) {
         connector.setAttribute("SSLVerifyClient", sslVerifyClient);
     }
     
-    @Persistent
+    @Persistent(manageable=false)
     public void setSslVerifyDepth(int sslVerifyDepth) {
         connector.setAttribute("SSLVerifyDepth", sslVerifyDepth);
     }
     
-    @Persistent
+    @Persistent(manageable=false)
     public void setUseSendfile(boolean useSendfile) {
         connector.setAttribute("useSendfile", useSendfile);
     }

Modified: geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/connector/Http11ConnectorGBean.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/connector/Http11ConnectorGBean.java?rev=813250&r1=813249&r2=813250&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/connector/Http11ConnectorGBean.java
(original)
+++ geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/connector/Http11ConnectorGBean.java
Thu Sep 10 06:23:42 2009
@@ -30,13 +30,13 @@
 @GBean(name="Tomcat Connector HTTP BIO")
 public class Http11ConnectorGBean extends AbstractHttp11ConnectorGBean {
     
-    public Http11ConnectorGBean(@ParamAttribute(name = "name") String name,
-                                @ParamAttribute(name = "initParams") Map<String, String>
initParams,
-                                @ParamAttribute(name = "host") String host,
-                                @ParamAttribute(name = "port") int port,
+    public Http11ConnectorGBean(@ParamAttribute(manageable=false, name = "name") String name,
+                                @ParamAttribute(manageable=false, name = "initParams") Map<String,
String> initParams,
+                                @ParamAttribute(manageable=false, name = "host") String host,
+                                @ParamAttribute(manageable=false, name = "port") int port,
                                 @ParamReference(name = "TomcatContainer") TomcatContainer
container,
                                 @ParamReference(name = "ServerInfo") ServerInfo serverInfo,
-                                @ParamAttribute(name = "connector") Connector conn)  throws
Exception {
+                                @ParamAttribute(manageable=false, name = "connector") Connector
conn)  throws Exception {
                                 
         super(name, initParams, "org.apache.coyote.http11.Http11Protocol", host, port, container,
serverInfo, conn);
     }

Modified: geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/connector/Http11NIOConnectorGBean.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/connector/Http11NIOConnectorGBean.java?rev=813250&r1=813249&r2=813250&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/connector/Http11NIOConnectorGBean.java
(original)
+++ geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/connector/Http11NIOConnectorGBean.java
Thu Sep 10 06:23:42 2009
@@ -32,13 +32,13 @@
 @GBean(name="Tomcat Connector HTTP NIO")
 public class Http11NIOConnectorGBean extends AbstractHttp11ConnectorGBean implements Http11NIOProtocol{
 
-    public Http11NIOConnectorGBean(@ParamAttribute(name = "name") String name,
-                                   @ParamAttribute(name = "initParams") Map<String, String>
initParams,
-                                   @ParamAttribute(name = "host") String host,
-                                   @ParamAttribute(name = "port") int port,
+    public Http11NIOConnectorGBean(@ParamAttribute(manageable=false, name = "name") String
name,
+                                   @ParamAttribute(manageable=false, name = "initParams")
Map<String, String> initParams,
+                                   @ParamAttribute(manageable=false, name = "host") String
host,
+                                   @ParamAttribute(manageable=false, name = "port") int port,
                                    @ParamReference(name = "TomcatContainer") TomcatContainer
container,
                                    @ParamReference(name = "ServerInfo") ServerInfo serverInfo,
-                                   @ParamAttribute(name = "connector") Connector conn)  throws
Exception {
+                                   @ParamAttribute(manageable=false, name = "connector")
Connector conn)  throws Exception {
                                    
         super(name, initParams, "org.apache.coyote.http11.Http11NioProtocol", host, port,
container, serverInfo, conn);
     }
@@ -221,172 +221,172 @@
         return value == null ? true : new Boolean(value.toString()).booleanValue();
     }
     
-    @Persistent
+    @Persistent(manageable=false)
     public void setAcceptorThreadCount(int acceptorThreadCount) {
         connector.setAttribute("acceptorThreadCount", new Integer(acceptorThreadCount));
     }
     
-    @Persistent
+    @Persistent(manageable=false)
     public void setAcceptorThreadPriority(int acceptorThreadPriority) {
         connector.setAttribute("acceptorThreadPriority", new Integer(acceptorThreadPriority));
     }
     
-    @Persistent
+    @Persistent(manageable=false)
     public void setCommand_line_options(boolean command_line_options) {
         connector.setAttribute("command-line-options", new Boolean(command_line_options));
     }
     
-    @Persistent
+    @Persistent(manageable=false)
     public void setOomParachute(int oomParachute) {
         connector.setAttribute("oomParachute", new Integer(oomParachute));
     }
     
-    @Persistent
+    @Persistent(manageable=false)
     public void setPollerThreadCount(int pollerThreadCount) {
         connector.setAttribute("pollerThreadCount", new Integer(pollerThreadCount));
     }
     
-    @Persistent   
+    @Persistent(manageable=false)   
     public void setPollerThreadPriority(int pollerThreadPriority) {
         connector.setAttribute("pollerThreadPriority", new Integer(pollerThreadPriority));
     }
     
-    @Persistent
+    @Persistent(manageable=false)
     public void setProcessCache(int processCache) {
         connector.setAttribute("processCache", new Integer(processCache));
     }
     
-    @Persistent
+    @Persistent(manageable=false)
     public void setSelectorPool_maxSelectors(int selectorPool_maxSelectors) {
         connector.setAttribute("selectorPool.maxSelectors", new Integer(selectorPool_maxSelectors));
     }
     
-    @Persistent
+    @Persistent(manageable=false)
     public void setSelectorPool_maxSpareSelectors(int selectorPool_maxSpareSelectors) {
         connector.setAttribute("selectorPool.maxSpareSelectors", new Integer(selectorPool_maxSpareSelectors));
     }
     
-    @Persistent
+    @Persistent(manageable=false)
     public void setSelectorTimeout(int selectorTimeout) {
         connector.setAttribute("selectorTimeout", new Integer(selectorTimeout));
     }
     
-    @Persistent
+    @Persistent(manageable=false)
     public void setSocket_appReadBufSize(int socket_appReadBufSize) {
         connector.setAttribute("socket.appReadBufSize", new Integer(socket_appReadBufSize));
     }
     
-    @Persistent
+    @Persistent(manageable=false)
     public void setSocket_appWriteBufSize(int socket_appWriteBufSize) {
         connector.setAttribute("socket.appWriteBufSize", new Integer(socket_appWriteBufSize));
     }
     
-    @Persistent
+    @Persistent(manageable=false)
     public void setSocket_bufferPool(int socket_bufferPool) {
         connector.setAttribute("socket.bufferPool", new Integer(socket_bufferPool));
     }
     
-    @Persistent
+    @Persistent(manageable=false)
     public void setSocket_bufferPoolSize(int socket_bufferPoolSize) {
         connector.setAttribute("socket.bufferPoolSize", new Integer(socket_bufferPoolSize));
     }
     
-    @Persistent
+    @Persistent(manageable=false)
     public void setSocket_directBuffer(boolean socket_directBuffer) {
         connector.setAttribute("socket.directBuffer", new Boolean(socket_directBuffer));
     }
     
-    @Persistent
+    @Persistent(manageable=false)
     public void setSocket_eventCache(int socket_eventCache) {
         connector.setAttribute("socket.eventCache", new Integer(socket_eventCache));
     }
     
-    @Persistent
+    @Persistent(manageable=false)
     public void setSocket_keyCache(int socket_keyCache) {
         connector.setAttribute("socket.keyCache", new Integer(socket_keyCache));
     }
     
-    @Persistent
+    @Persistent(manageable=false)
     public void setSocket_ooBInline(boolean socket_ooBInline) {
         connector.setAttribute("socket.ooBInline", new Boolean(socket_ooBInline));
     }
     
-    @Persistent
+    @Persistent(manageable=false)
     public void setSocket_performanceBandwidth(int socket_performanceBandwidth) {
         connector.setAttribute("socket.performanceBandwidth", new Integer(socket_performanceBandwidth));
     }
     
-    @Persistent
+    @Persistent(manageable=false)
     public void setSocket_performanceConnectionTime(int socket_performanceConnectionTime)
{
         connector.setAttribute("socket.performanceConnectionTime", new Integer(socket_performanceConnectionTime));
     }
     
-    @Persistent
+    @Persistent(manageable=false)
     public void setSocket_performanceLatency(int socket_performanceLatency) {
         connector.setAttribute("socket.performanceLatency", new Integer(socket_performanceLatency));
     }
     
-    @Persistent
+    @Persistent(manageable=false)
     public void setSocket_processorCache(int socket_processorCache) {
         connector.setAttribute("socket.processorCache", new Integer(socket_processorCache));
     }
     
-    @Persistent
+    @Persistent(manageable=false)
     public void setSocket_rxBufSize(int socket_rxBufSize) {
         connector.setAttribute("socket.rxBufSize", new Integer(socket_rxBufSize));
     }
     
-    @Persistent
+    @Persistent(manageable=false)
     public void setSocket_soKeepAlive(boolean socket_soKeepAlive) {
         connector.setAttribute("socket.soKeepAlive", new Boolean(socket_soKeepAlive));
     }
     
-    @Persistent
+    @Persistent(manageable=false)
     public void setSocket_soLingerOn(boolean socket_soLingerOn) {
         connector.setAttribute("socket.soLingerOn", new Boolean(socket_soLingerOn));
     }
     
-    @Persistent
+    @Persistent(manageable=false)
     public void setSocket_soLingerTime(int socket_soLingerTime) {
         connector.setAttribute("socket.soLingerTime", new Integer(socket_soLingerTime));
     }
     
-    @Persistent
+    @Persistent(manageable=false)
     public void setSocket_soReuseAddress(boolean socket_soReuseAddress) {
         connector.setAttribute("socket.soReuseAddress", new Boolean(socket_soReuseAddress));
     }
     
-    @Persistent
+    @Persistent(manageable=false)
     public void setSocket_soTimeout(int socket_soTimeout) {
         connector.setAttribute("socket.soTimeout", new Integer(socket_soTimeout));
     }
     
-    @Persistent
+    @Persistent(manageable=false)
     public void setSocket_soTrafficClass(int socket_soTrafficClass) {
         connector.setAttribute("socket.soTrafficClass", new Integer(socket_soTrafficClass));
     }
     
-    @Persistent
+    @Persistent(manageable=false)
     public void setSocket_tcpNoDelay(boolean socket_tcpNoDelay) {
         connector.setAttribute("socket.tcpNoDelay", new Boolean(socket_tcpNoDelay));
     }
     
-    @Persistent
+    @Persistent(manageable=false)
     public void setSocket_txBufSize(int socket_txBufSize) {
         connector.setAttribute("socket.txBufSize", new Integer(socket_txBufSize));
     }
     
-    @Persistent
+    @Persistent(manageable=false)
     public void setUseComet(boolean useComet) {
         connector.setAttribute("useExecutor", new Boolean(useComet));
     }
     
-    @Persistent
+    @Persistent(manageable=false)
     public void setUseExecutor(boolean useExecutor) {
         connector.setAttribute("useExecutor", new Boolean(useExecutor));
     }
     
-    @Persistent
+    @Persistent(manageable=false)
     public void setUseSendfile(boolean useSendfile) {
         connector.setAttribute("useSendfile", new Boolean(useSendfile));
     }

Modified: geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/connector/Https11APRConnectorGBean.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/connector/Https11APRConnectorGBean.java?rev=813250&r1=813249&r2=813250&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/connector/Https11APRConnectorGBean.java
(original)
+++ geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/connector/Https11APRConnectorGBean.java
Thu Sep 10 06:23:42 2009
@@ -31,13 +31,13 @@
 @GBean(name="Tomcat Connector HTTPS APR")
 public class Https11APRConnectorGBean extends Http11APRConnectorGBean {
 
-    public Https11APRConnectorGBean(@ParamAttribute(name = "name") String name,
-                                    @ParamAttribute(name = "initParams") Map<String, String>
initParams,
-                                    @ParamAttribute(name = "host") String host,
-                                    @ParamAttribute(name = "port") int port,
+    public Https11APRConnectorGBean(@ParamAttribute(manageable=false, name = "name") String
name,
+                                    @ParamAttribute(manageable=false, name = "initParams")
Map<String, String> initParams,
+                                    @ParamAttribute(manageable=false, name = "host") String
host,
+                                    @ParamAttribute(manageable=false, name = "port") int
port,
                                     @ParamReference(name = "TomcatContainer") TomcatContainer
container,
                                     @ParamReference(name = "ServerInfo") ServerInfo serverInfo,
-                                    @ParamAttribute(name = "connector") Connector conn) 
throws Exception {
+                                    @ParamAttribute(manageable=false, name = "connector")
Connector conn)  throws Exception {
                                     
         super(name, initParams, host, port, container, serverInfo, conn);
         

Modified: geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/connector/Https11ConnectorGBean.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/connector/Https11ConnectorGBean.java?rev=813250&r1=813249&r2=813250&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/connector/Https11ConnectorGBean.java
(original)
+++ geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/connector/Https11ConnectorGBean.java
Thu Sep 10 06:23:42 2009
@@ -31,13 +31,13 @@
 @GBean(name="Tomcat Connector HTTPS BIO")
 public class Https11ConnectorGBean extends Http11ConnectorGBean {
 
-    public Https11ConnectorGBean(@ParamAttribute(name = "name") String name,
-                                 @ParamAttribute(name = "initParams") Map<String, String>
initParams,
-                                 @ParamAttribute(name = "host") String host,
-                                 @ParamAttribute(name = "port") int port,
+    public Https11ConnectorGBean(@ParamAttribute(manageable=false, name = "name") String
name,
+                                 @ParamAttribute(manageable=false, name = "initParams") Map<String,
String> initParams,
+                                 @ParamAttribute(manageable=false, name = "host") String
host,
+                                 @ParamAttribute(manageable=false, name = "port") int port,
                                  @ParamReference(name = "TomcatContainer") TomcatContainer
container,
                                  @ParamReference(name = "ServerInfo") ServerInfo serverInfo,
-                                 @ParamAttribute(name = "connector") Connector conn)  throws
Exception {
+                                 @ParamAttribute(manageable=false, name = "connector") Connector
conn)  throws Exception {
                                  
         super(name, initParams, host, port, container, serverInfo, conn);
         setSslEnabled(true);

Modified: geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/connector/Https11NIOConnectorGBean.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/connector/Https11NIOConnectorGBean.java?rev=813250&r1=813249&r2=813250&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/connector/Https11NIOConnectorGBean.java
(original)
+++ geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/connector/Https11NIOConnectorGBean.java
Thu Sep 10 06:23:42 2009
@@ -31,13 +31,13 @@
 @GBean(name="Tomcat Connector HTTPS NIO")
 public class Https11NIOConnectorGBean extends Http11NIOConnectorGBean {
 
-    public Https11NIOConnectorGBean(@ParamAttribute(name = "name") String name,
-                                    @ParamAttribute(name = "initParams") Map<String, String>
initParams,
-                                    @ParamAttribute(name = "host") String host,
-                                    @ParamAttribute(name = "port") int port,
+    public Https11NIOConnectorGBean(@ParamAttribute(manageable=false, name = "name") String
name,
+                                    @ParamAttribute(manageable=false, name = "initParams")
Map<String, String> initParams,
+                                    @ParamAttribute(manageable=false, name = "host") String
host,
+                                    @ParamAttribute(manageable=false, name = "port") int
port,
                                     @ParamReference(name = "TomcatContainer") TomcatContainer
container,
                                     @ParamReference(name = "ServerInfo") ServerInfo serverInfo,
-                                    @ParamAttribute(name = "connector") Connector conn) 
throws Exception {
+                                    @ParamAttribute(manageable=false, name = "connector")
Connector conn)  throws Exception {
             
         super(name, initParams, host, port, container, serverInfo, conn);
         setSslEnabled(true);



Mime
View raw message