geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From xiam...@apache.org
Subject svn commit: r1245332 - in /geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat: TomcatManagerImpl.java connector/BaseHttp11ConnectorGBean.java connector/ConnectorGBean.java
Date Fri, 17 Feb 2012 07:18:32 GMT
Author: xiaming
Date: Fri Feb 17 07:18:31 2012
New Revision: 1245332

URL: http://svn.apache.org/viewvc?rev=1245332&view=rev
Log:
GERONIMO-6274 Add @Persistent(manageable=false) annotation to some setter methods of connector
parameters so that those parameters could be set via admin console, for trunk

Modified:
    geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/TomcatManagerImpl.java
    geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/connector/BaseHttp11ConnectorGBean.java
    geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/connector/ConnectorGBean.java

Modified: geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/TomcatManagerImpl.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/TomcatManagerImpl.java?rev=1245332&r1=1245331&r2=1245332&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/TomcatManagerImpl.java
(original)
+++ geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/TomcatManagerImpl.java
Fri Feb 17 07:18:31 2012
@@ -413,7 +413,7 @@ public class TomcatManagerImpl implement
     // see http://tomcat.apache.org/tomcat-7.0-doc/config/http.html
     private static void addCommonConnectorAttributes(List<ConnectorAttribute> connectorAttributes)
{
         connectorAttributes.add(new ConnectorAttribute<Boolean>("allowTrace", false,
Messages.getString("TomcatManagerImpl.80"), Boolean.class)); //$NON-NLS-1$ //$NON-NLS-2$
-        connectorAttributes.add(new ConnectorAttribute<Integer>("asyncTimeout", 10000,
Messages.getString("TomcatManagerImpl.82"), Integer.class)); //$NON-NLS-1$ //$NON-NLS-2$
+        connectorAttributes.add(new ConnectorAttribute<Long>("asyncTimeout", 10000l,
Messages.getString("TomcatManagerImpl.82"), Long.class)); //$NON-NLS-1$ //$NON-NLS-2$
         connectorAttributes.add(new ConnectorAttribute<Boolean>("enableLookups", true,
Messages.getString("TomcatManagerImpl.84"), Boolean.class)); //$NON-NLS-1$ //$NON-NLS-2$
         connectorAttributes.add(new ConnectorAttribute<Integer>("maxParameterCount",
10000, Messages.getString("TomcatManagerImpl.85"), Integer.class)); //$NON-NLS-1$ //$NON-NLS-2$
         connectorAttributes.add(new ConnectorAttribute<Integer>("maxPostSize", 2097152,
Messages.getString("TomcatManagerImpl.86"), Integer.class)); //$NON-NLS-1$ //$NON-NLS-2$

Modified: geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/connector/BaseHttp11ConnectorGBean.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/connector/BaseHttp11ConnectorGBean.java?rev=1245332&r1=1245331&r2=1245332&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/connector/BaseHttp11ConnectorGBean.java
(original)
+++ geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/connector/BaseHttp11ConnectorGBean.java
Fri Feb 17 07:18:31 2012
@@ -234,7 +234,7 @@ public abstract class BaseHttp11Connecto
         return value == null ? Thread.NORM_PRIORITY : Integer.parseInt(value.toString());
     }
 
-
+    @Persistent(manageable=false)
     public void setAcceptCount(int acceptCount) {
         connector.setAttribute("acceptCount", Integer.valueOf(acceptCount));
     }

Modified: geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/connector/ConnectorGBean.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/connector/ConnectorGBean.java?rev=1245332&r1=1245331&r2=1245332&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/connector/ConnectorGBean.java
(original)
+++ geronimo/server/trunk/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/connector/ConnectorGBean.java
Fri Feb 17 07:18:31 2012
@@ -236,7 +236,8 @@ public abstract class ConnectorGBean ext
     public String getName() {
         return name;
     }
-
+    
+    @Persistent(manageable=false)
     public void setAllowTrace(boolean allow) {
         connector.setAllowTrace(allow);
     }
@@ -249,10 +250,12 @@ public abstract class ConnectorGBean ext
         return  connector.getAsyncTimeout();
     }
 
+    @Persistent(manageable=false)
     public void setAsyncTimeout(long asyncTimeout) {
         connector.setAsyncTimeout(asyncTimeout);
     }
 
+    @Persistent(manageable=false)
     public void setEnableLookups(boolean enabled) {
         connector.setEnableLookups(enabled);
     }
@@ -262,6 +265,7 @@ public abstract class ConnectorGBean ext
         return value == 0 ? 2097152 : value;
     }
 
+    @Persistent(manageable=false)
     public void setMaxPostSize(int bytes) {
         connector.setMaxPostSize(bytes);
     }
@@ -271,6 +275,7 @@ public abstract class ConnectorGBean ext
     	return value == 0 ? 10000 : value;
     }
     
+    @Persistent(manageable=false)
     public void setMaxParameterCount(int count){
     	connector.setMaxParameterCount(count);
     }



Mime
View raw message