Author: remy.maucherat(a)jboss.com Date: 2007-10-11 19:41:30 -0400 (Thu, 11 Oct 2007) New Revision: 308 Modified: trunk/java/org/apache/catalina/connector/Connector.java trunk/java/org/apache/catalina/startup/Embedded.java trunk/java/org/apache/tomcat/util/IntrospectionUtils.java Log: - Port improvement of attribute checking for the connector, as it has fancier output. Modified: trunk/java/org/apache/catalina/connector/Connector.java =================================================================== --- trunk/java/org/apache/catalina/connector/Connector.java 2007-10-11 17:56:35 UTC (rev 307) +++ trunk/java/org/apache/catalina/connector/Connector.java 2007-10-11 23:41:30 UTC (rev 308) @@ -41,7 +41,6 @@ import org.apache.tomcat.util.http.mapper.Mapper; import org.apache.tomcat.util.modeler.Registry; import org.jboss.logging.Logger; -import org.jboss.logging.Logger; /** @@ -307,30 +306,16 @@ /** * Set a configured property. */ - public void setProperty(String name, String value) { + public boolean setProperty(String name, String value) { String repl = name; if (replacements.get(name) != null) { repl = (String) replacements.get(name); } - if (!IntrospectionUtils.setProperty(protocolHandler, repl, value)) { - log.warn("Property " + name + " not found on the protocol handler."); - } + return IntrospectionUtils.setProperty(protocolHandler, repl, value); } /** - * Set a configured property. - */ - public void setPropertyInternal(String name, String value) { - String repl = name; - if (replacements.get(name) != null) { - repl = (String) replacements.get(name); - } - IntrospectionUtils.setProperty(protocolHandler, repl, value); - } - - - /** * Return a configured property. */ public Object getAttribute(String name) { @@ -396,7 +381,7 @@ public void setAllowTrace(boolean allowTrace) { this.allowTrace = allowTrace; - setPropertyInternal("allowTrace", String.valueOf(allowTrace)); + setProperty("allowTrace", String.valueOf(allowTrace)); } @@ -474,7 +459,7 @@ public void setEnableLookups(boolean enableLookups) { this.enableLookups = enableLookups; - setPropertyInternal("enableLookups", String.valueOf(enableLookups)); + setProperty("enableLookups", String.valueOf(enableLookups)); } @@ -544,7 +529,7 @@ public void setMaxSavePostSize(int maxSavePostSize) { this.maxSavePostSize = maxSavePostSize; - setPropertyInternal("maxSavePostSize", String.valueOf(maxSavePostSize)); + setProperty("maxSavePostSize", String.valueOf(maxSavePostSize)); } @@ -566,7 +551,7 @@ public void setPort(int port) { this.port = port; - setPropertyInternal("port", String.valueOf(port)); + setProperty("port", String.valueOf(port)); } @@ -730,7 +715,7 @@ if(proxyName != null && proxyName.length() > 0) { this.proxyName = proxyName; - setPropertyInternal("proxyName", proxyName); + setProperty("proxyName", proxyName); } else { this.proxyName = null; removeProperty("proxyName"); @@ -757,7 +742,7 @@ public void setProxyPort(int proxyPort) { this.proxyPort = proxyPort; - setPropertyInternal("proxyPort", String.valueOf(proxyPort)); + setProperty("proxyPort", String.valueOf(proxyPort)); } @@ -782,7 +767,7 @@ public void setRedirectPort(int redirectPort) { this.redirectPort = redirectPort; - setPropertyInternal("redirectPort", String.valueOf(redirectPort)); + setProperty("redirectPort", String.valueOf(redirectPort)); } @@ -831,7 +816,7 @@ public void setSecure(boolean secure) { this.secure = secure; - setPropertyInternal("secure", Boolean.toString(secure)); + setProperty("secure", Boolean.toString(secure)); } /** @@ -852,7 +837,7 @@ public void setURIEncoding(String URIEncoding) { this.URIEncoding = URIEncoding; - setPropertyInternal("uRIEncoding", URIEncoding); + setProperty("uRIEncoding", URIEncoding); } @@ -875,7 +860,7 @@ public void setUseBodyEncodingForURI(boolean useBodyEncodingForURI) { this.useBodyEncodingForURI = useBodyEncodingForURI; - setPropertyInternal + setProperty ("useBodyEncodingForURI", String.valueOf(useBodyEncodingForURI)); } @@ -903,7 +888,7 @@ */ public void setXpoweredBy(boolean xpoweredBy) { this.xpoweredBy = xpoweredBy; - setPropertyInternal("xpoweredBy", String.valueOf(xpoweredBy)); + setProperty("xpoweredBy", String.valueOf(xpoweredBy)); } /** @@ -914,7 +899,7 @@ */ public void setUseIPVHosts(boolean useIPVHosts) { this.useIPVHosts = useIPVHosts; - setPropertyInternal("useIPVHosts", String.valueOf(useIPVHosts)); + setProperty("useIPVHosts", String.valueOf(useIPVHosts)); } /** Modified: trunk/java/org/apache/catalina/startup/Embedded.java =================================================================== --- trunk/java/org/apache/catalina/startup/Embedded.java 2007-10-11 17:56:35 UTC (rev 307) +++ trunk/java/org/apache/catalina/startup/Embedded.java 2007-10-11 23:41:30 UTC (rev 308) @@ -47,7 +47,6 @@ import org.apache.tomcat.util.IntrospectionUtils; import org.apache.tomcat.util.log.SystemLogHandler; import org.jboss.logging.Logger; -import org.jboss.logging.Logger; /** @@ -427,7 +426,7 @@ connector = new Connector(); connector.setScheme("https"); connector.setSecure(true); - connector.setPropertyInternal("SSLEnabled","true"); + connector.setProperty("SSLEnabled","true"); // FIXME !!!! SET SSL PROPERTIES } else { connector = new Connector(protocol); Modified: trunk/java/org/apache/tomcat/util/IntrospectionUtils.java =================================================================== --- trunk/java/org/apache/tomcat/util/IntrospectionUtils.java 2007-10-11 17:56:35 UTC (rev 307) +++ trunk/java/org/apache/tomcat/util/IntrospectionUtils.java 2007-10-11 23:41:30 UTC (rev 308) @@ -266,7 +266,8 @@ try { Method methods[] = findMethods(o.getClass()); - Method setPropertyMethod = null; + Method setPropertyMethodVoid = null; + Method setPropertyMethodBool = null; // First, the ideal case - a setFoo( String ) method for (int i = 0; i < methods.length; i++) { @@ -333,18 +334,26 @@ } // save "setProperty" for later - if ("setProperty".equals(methods[i].getName())) { - setPropertyMethod = methods[i]; + if ("setProperty".equals(methods[i].getName())) { + if (methods[i].getReturnType() == Boolean.TYPE){ + setPropertyMethodBool = methods[i]; + } else { + setPropertyMethodVoid = methods[i]; + } } } // Ok, no setXXX found, try a setProperty("name", "value") - if (setPropertyMethod != null) { + if (setPropertyMethodBool != null || setPropertyMethodVoid != null) { Object params[] = new Object[2]; params[0] = name; params[1] = value; - setPropertyMethod.invoke(o, params); - return true; + if (setPropertyMethodBool != null) { + return (Boolean) setPropertyMethodBool.invoke(o, params); + } else { + setPropertyMethodVoid.invoke(o, params); + return true; + } } } catch (IllegalArgumentException ex2) {