You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by xi...@apache.org on 2012/02/17 04:50:44 UTC
svn commit: r1245311 - in
/geronimo/server/branches/3.0-beta/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat:
TomcatManagerImpl.java connector/BaseHttp11ConnectorGBean.java
connector/ConnectorGBean.java
Author: xiaming
Date: Fri Feb 17 03:50:43 2012
New Revision: 1245311
URL: http://svn.apache.org/viewvc?rev=1245311&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
Modified:
geronimo/server/branches/3.0-beta/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/TomcatManagerImpl.java
geronimo/server/branches/3.0-beta/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/connector/BaseHttp11ConnectorGBean.java
geronimo/server/branches/3.0-beta/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/connector/ConnectorGBean.java
Modified: geronimo/server/branches/3.0-beta/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/TomcatManagerImpl.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-beta/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/TomcatManagerImpl.java?rev=1245311&r1=1245310&r2=1245311&view=diff
==============================================================================
--- geronimo/server/branches/3.0-beta/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/TomcatManagerImpl.java (original)
+++ geronimo/server/branches/3.0-beta/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/TomcatManagerImpl.java Fri Feb 17 03:50:43 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/branches/3.0-beta/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/connector/BaseHttp11ConnectorGBean.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-beta/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/connector/BaseHttp11ConnectorGBean.java?rev=1245311&r1=1245310&r2=1245311&view=diff
==============================================================================
--- geronimo/server/branches/3.0-beta/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/connector/BaseHttp11ConnectorGBean.java (original)
+++ geronimo/server/branches/3.0-beta/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/connector/BaseHttp11ConnectorGBean.java Fri Feb 17 03:50:43 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/branches/3.0-beta/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/connector/ConnectorGBean.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-beta/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/connector/ConnectorGBean.java?rev=1245311&r1=1245310&r2=1245311&view=diff
==============================================================================
--- geronimo/server/branches/3.0-beta/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/connector/ConnectorGBean.java (original)
+++ geronimo/server/branches/3.0-beta/plugins/tomcat/geronimo-tomcat7/src/main/java/org/apache/geronimo/tomcat/connector/ConnectorGBean.java Fri Feb 17 03:50:43 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);
}