Author: remy.maucherat(a)jboss.com Date: 2007-08-20 11:04:17 -0400 (Mon, 20 Aug 2007) New Revision: 229 Modified: branches/2.0.x/src/share/classes/org/apache/catalina/connector/Connector.java branches/2.0.x/src/share/classes/org/apache/catalina/startup/Catalina.java branches/2.0.x/src/share/classes/org/apache/catalina/startup/Embedded.java branches/2.0.x/src/share/classes/org/apache/catalina/startup/SetAllPropertiesRule.java branches/2.0.x/src/share/classes/org/apache/catalina/startup/SetContextPropertiesRule.java branches/2.0.x/src/share/classes/org/apache/coyote/ajp/AjpAprProtocol.java branches/2.0.x/src/share/classes/org/apache/coyote/ajp/AjpProtocol.java branches/2.0.x/src/share/classes/org/apache/coyote/http11/Http11AprProtocol.java branches/2.0.x/src/share/classes/org/apache/coyote/http11/Http11Protocol.java branches/2.0.x/src/share/classes/org/apache/tomcat/util/IntrospectionUtils.java branches/2.0.x/src/share/classes/org/apache/tomcat/util/digester/Digester.java branches/2.0.x/src/share/classes/org/apache/tomcat/util/digester/SetPropertiesRule.java branches/2.0.x/src/share/classes/org/apache/tomcat/util/digester/SetPropertyRule.java Log: - Port server.xml validation code. - Note: will not compile until switching to JBoss Logging (which will be done ASAP). Modified: branches/2.0.x/src/share/classes/org/apache/catalina/connector/Connector.java =================================================================== --- branches/2.0.x/src/share/classes/org/apache/catalina/connector/Connector.java 2007-08-17 13:18:44 UTC (rev 228) +++ branches/2.0.x/src/share/classes/org/apache/catalina/connector/Connector.java 2007-08-20 15:04:17 UTC (rev 229) @@ -35,13 +35,13 @@ import org.apache.catalina.core.StandardEngine; import org.apache.catalina.util.LifecycleSupport; import org.apache.catalina.util.StringManager; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.apache.coyote.Adapter; import org.apache.coyote.ProtocolHandler; import org.apache.tomcat.util.IntrospectionUtils; 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; /** @@ -56,7 +56,7 @@ public class Connector implements Lifecycle, MBeanRegistration { - private static Log log = LogFactory.getLog(Connector.class); + private static Logger log = Logger.getLogger(Connector.class); /** @@ -318,6 +318,20 @@ 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."); + } + } + + + /** + * 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); } @@ -388,7 +402,7 @@ public void setAllowTrace(boolean allowTrace) { this.allowTrace = allowTrace; - setProperty("allowTrace", String.valueOf(allowTrace)); + setPropertyInternal("allowTrace", String.valueOf(allowTrace)); } @@ -466,7 +480,7 @@ public void setEmptySessionPath(boolean emptySessionPath) { this.emptySessionPath = emptySessionPath; - setProperty("emptySessionPath", String.valueOf(emptySessionPath)); + setPropertyInternal("emptySessionPath", String.valueOf(emptySessionPath)); } @@ -489,7 +503,7 @@ public void setEnableLookups(boolean enableLookups) { this.enableLookups = enableLookups; - setProperty("enableLookups", String.valueOf(enableLookups)); + setPropertyInternal("enableLookups", String.valueOf(enableLookups)); } @@ -559,7 +573,7 @@ public void setMaxSavePostSize(int maxSavePostSize) { this.maxSavePostSize = maxSavePostSize; - setProperty("maxSavePostSize", String.valueOf(maxSavePostSize)); + setPropertyInternal("maxSavePostSize", String.valueOf(maxSavePostSize)); } @@ -581,7 +595,7 @@ public void setPort(int port) { this.port = port; - setProperty("port", String.valueOf(port)); + setPropertyInternal("port", String.valueOf(port)); } @@ -745,7 +759,7 @@ if(proxyName != null && proxyName.length() > 0) { this.proxyName = proxyName; - setProperty("proxyName", proxyName); + setPropertyInternal("proxyName", proxyName); } else { this.proxyName = null; removeProperty("proxyName"); @@ -772,7 +786,7 @@ public void setProxyPort(int proxyPort) { this.proxyPort = proxyPort; - setProperty("proxyPort", String.valueOf(proxyPort)); + setPropertyInternal("proxyPort", String.valueOf(proxyPort)); } @@ -797,7 +811,7 @@ public void setRedirectPort(int redirectPort) { this.redirectPort = redirectPort; - setProperty("redirectPort", String.valueOf(redirectPort)); + setPropertyInternal("redirectPort", String.valueOf(redirectPort)); } @@ -846,7 +860,7 @@ public void setSecure(boolean secure) { this.secure = secure; - setProperty("secure", Boolean.toString(secure)); + setPropertyInternal("secure", Boolean.toString(secure)); } /** @@ -867,7 +881,7 @@ public void setURIEncoding(String URIEncoding) { this.URIEncoding = URIEncoding; - setProperty("uRIEncoding", URIEncoding); + setPropertyInternal("uRIEncoding", URIEncoding); } @@ -890,7 +904,7 @@ public void setUseBodyEncodingForURI(boolean useBodyEncodingForURI) { this.useBodyEncodingForURI = useBodyEncodingForURI; - setProperty + setPropertyInternal ("useBodyEncodingForURI", String.valueOf(useBodyEncodingForURI)); } @@ -918,7 +932,7 @@ */ public void setXpoweredBy(boolean xpoweredBy) { this.xpoweredBy = xpoweredBy; - setProperty("xpoweredBy", String.valueOf(xpoweredBy)); + setPropertyInternal("xpoweredBy", String.valueOf(xpoweredBy)); } /** @@ -929,7 +943,7 @@ */ public void setUseIPVHosts(boolean useIPVHosts) { this.useIPVHosts = useIPVHosts; - setProperty("useIPVHosts", String.valueOf(useIPVHosts)); + setPropertyInternal("useIPVHosts", String.valueOf(useIPVHosts)); } /** Modified: branches/2.0.x/src/share/classes/org/apache/catalina/startup/Catalina.java =================================================================== --- branches/2.0.x/src/share/classes/org/apache/catalina/startup/Catalina.java 2007-08-17 13:18:44 UTC (rev 228) +++ branches/2.0.x/src/share/classes/org/apache/catalina/startup/Catalina.java 2007-08-20 15:04:17 UTC (rev 229) @@ -25,6 +25,10 @@ import java.io.IOException; import java.io.OutputStream; import java.net.Socket; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; + import org.apache.catalina.Container; import org.apache.catalina.Lifecycle; import org.apache.catalina.LifecycleException; @@ -260,6 +264,12 @@ // Initialize the digester Digester digester = new Digester(); digester.setValidating(false); + digester.setRulesValidation(true); + HashMap<Class, List<String>> fakeAttributes = new HashMap<Class, List<String>>(); + ArrayList<String> attrs = new ArrayList<String>(); + attrs.add("className"); + fakeAttributes.put(Object.class, attrs); + digester.setFakeAttributes(fakeAttributes); digester.setClassLoader(StandardServer.class.getClassLoader()); // Configure the actions we will be using @@ -664,8 +674,8 @@ } - private static org.apache.commons.logging.Log log= - org.apache.commons.logging.LogFactory.getLog( Catalina.class ); + private static org.jboss.logging.Logger log= + org.jboss.logging.Logger.getLogger( Catalina.class ); } Modified: branches/2.0.x/src/share/classes/org/apache/catalina/startup/Embedded.java =================================================================== --- branches/2.0.x/src/share/classes/org/apache/catalina/startup/Embedded.java 2007-08-17 13:18:44 UTC (rev 228) +++ branches/2.0.x/src/share/classes/org/apache/catalina/startup/Embedded.java 2007-08-20 15:04:17 UTC (rev 229) @@ -44,10 +44,10 @@ import org.apache.catalina.security.SecurityConfig; import org.apache.catalina.util.LifecycleSupport; import org.apache.catalina.util.StringManager; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.apache.tomcat.util.IntrospectionUtils; import org.apache.tomcat.util.log.SystemLogHandler; +import org.jboss.logging.Logger; +import org.jboss.logging.Logger; /** @@ -102,7 +102,7 @@ */ public class Embedded extends StandardService implements Lifecycle { - private static Log log = LogFactory.getLog(Embedded.class); + private static Logger log = Logger.getLogger(Embedded.class); // ----------------------------------------------------------- Constructors @@ -427,7 +427,7 @@ connector = new Connector(); connector.setScheme("https"); connector.setSecure(true); - connector.setProperty("SSLEnabled","true"); + connector.setPropertyInternal("SSLEnabled","true"); // FIXME !!!! SET SSL PROPERTIES } else { connector = new Connector(protocol); Modified: branches/2.0.x/src/share/classes/org/apache/catalina/startup/SetAllPropertiesRule.java =================================================================== --- branches/2.0.x/src/share/classes/org/apache/catalina/startup/SetAllPropertiesRule.java 2007-08-17 13:18:44 UTC (rev 228) +++ branches/2.0.x/src/share/classes/org/apache/catalina/startup/SetAllPropertiesRule.java 2007-08-20 15:04:17 UTC (rev 229) @@ -62,8 +62,15 @@ name = attributes.getQName(i); } String value = attributes.getValue(i); - if ( !excludes.containsKey(name)) - IntrospectionUtils.setProperty(digester.peek(), name, value); + if ( !excludes.containsKey(name)) { + if (!digester.isFakeAttribute(digester.peek(), name) + && !IntrospectionUtils.setProperty(digester.peek(), name, value) + && digester.getRulesValidation()) { + digester.getLogger().warn("[SetAllPropertiesRule]{" + digester.getMatch() + + "} Setting property '" + name + "' to '" + + value + "' did not find a matching property."); + } + } } } Modified: branches/2.0.x/src/share/classes/org/apache/catalina/startup/SetContextPropertiesRule.java =================================================================== --- branches/2.0.x/src/share/classes/org/apache/catalina/startup/SetContextPropertiesRule.java 2007-08-17 13:18:44 UTC (rev 228) +++ branches/2.0.x/src/share/classes/org/apache/catalina/startup/SetContextPropertiesRule.java 2007-08-20 15:04:17 UTC (rev 229) @@ -60,7 +60,13 @@ continue; } String value = attributes.getValue(i); - IntrospectionUtils.setProperty(digester.peek(), name, value); + if (!digester.isFakeAttribute(digester.peek(), name) + && !IntrospectionUtils.setProperty(digester.peek(), name, value) + && digester.getRulesValidation()) { + digester.getLogger().warn("[SetContextPropertiesRule]{" + digester.getMatch() + + "} Setting property '" + name + "' to '" + + value + "' did not find a matching property."); + } } } Modified: branches/2.0.x/src/share/classes/org/apache/coyote/ajp/AjpAprProtocol.java =================================================================== --- branches/2.0.x/src/share/classes/org/apache/coyote/ajp/AjpAprProtocol.java 2007-08-17 13:18:44 UTC (rev 228) +++ branches/2.0.x/src/share/classes/org/apache/coyote/ajp/AjpAprProtocol.java 2007-08-20 15:04:17 UTC (rev 229) @@ -55,8 +55,8 @@ implements ProtocolHandler, MBeanRegistration { - protected static org.apache.commons.logging.Log log = - org.apache.commons.logging.LogFactory.getLog(AjpAprProtocol.class); + protected static org.jboss.logging.Logger log = + org.jboss.logging.Logger.getLogger(AjpAprProtocol.class); /** * The string manager for this package. @@ -137,22 +137,6 @@ /** - * Set a property. - */ - public void setProperty(String name, String value) { - setAttribute(name, value); - } - - - /** - * Get a property - */ - public String getProperty(String name) { - return (String) getAttribute(name); - } - - - /** * The adapter, used to call the connector */ public void setAdapter(Adapter adapter) { Modified: branches/2.0.x/src/share/classes/org/apache/coyote/ajp/AjpProtocol.java =================================================================== --- branches/2.0.x/src/share/classes/org/apache/coyote/ajp/AjpProtocol.java 2007-08-17 13:18:44 UTC (rev 228) +++ branches/2.0.x/src/share/classes/org/apache/coyote/ajp/AjpProtocol.java 2007-08-20 15:04:17 UTC (rev 229) @@ -55,8 +55,8 @@ implements ProtocolHandler, MBeanRegistration { - protected static org.apache.commons.logging.Log log = - org.apache.commons.logging.LogFactory.getLog(AjpProtocol.class); + protected static org.jboss.logging.Logger log = + org.jboss.logging.Logger.getLogger(AjpProtocol.class); /** * The string manager for this package. @@ -137,22 +137,6 @@ /** - * Set a property. - */ - public void setProperty(String name, String value) { - setAttribute(name, value); - } - - - /** - * Get a property - */ - public String getProperty(String name) { - return (String) getAttribute(name); - } - - - /** * The adapter, used to call the connector */ public void setAdapter(Adapter adapter) { Modified: branches/2.0.x/src/share/classes/org/apache/coyote/http11/Http11AprProtocol.java =================================================================== --- branches/2.0.x/src/share/classes/org/apache/coyote/http11/Http11AprProtocol.java 2007-08-17 13:18:44 UTC (rev 228) +++ branches/2.0.x/src/share/classes/org/apache/coyote/http11/Http11AprProtocol.java 2007-08-20 15:04:17 UTC (rev 229) @@ -54,8 +54,8 @@ */ public class Http11AprProtocol implements ProtocolHandler, MBeanRegistration { - protected static org.apache.commons.logging.Log log = - org.apache.commons.logging.LogFactory.getLog(Http11AprProtocol.class); + protected static org.jboss.logging.Logger log = + org.jboss.logging.Logger.getLogger(Http11AprProtocol.class); /** * The string manager for this package. @@ -90,20 +90,6 @@ } /** - * Set a property. - */ - public void setProperty(String name, String value) { - setAttribute(name, value); - } - - /** - * Get a property - */ - public String getProperty(String name) { - return (String)getAttribute(name); - } - - /** * The adapter, used to call the connector. */ protected Adapter adapter; @@ -325,15 +311,11 @@ public void setRestrictedUserAgents(String valueS) { restrictedUserAgents = valueS; } - public String getProtocol() { - return getProperty("protocol"); - } + // HTTP + protected String protocol = null; + public String getProtocol() { return protocol; } + public void setProtocol(String protocol) { setSecure(true); this.protocol = protocol; } - public void setProtocol( String k ) { - setSecure(true); - setAttribute("protocol", k); - } - /** * Maximum number of requests which can be performed over a keepalive * connection. The default is the same as for Apache HTTP Server. Modified: branches/2.0.x/src/share/classes/org/apache/coyote/http11/Http11Protocol.java =================================================================== --- branches/2.0.x/src/share/classes/org/apache/coyote/http11/Http11Protocol.java 2007-08-17 13:18:44 UTC (rev 228) +++ branches/2.0.x/src/share/classes/org/apache/coyote/http11/Http11Protocol.java 2007-08-20 15:04:17 UTC (rev 229) @@ -57,8 +57,8 @@ implements ProtocolHandler, MBeanRegistration { - protected static org.apache.commons.logging.Log log - = org.apache.commons.logging.LogFactory.getLog(Http11Protocol.class); + protected static org.jboss.logging.Logger log + = org.jboss.logging.Logger.getLogger(Http11Protocol.class); /** * The string manager for this package. @@ -103,20 +103,6 @@ /** - * Set a property. - */ - public void setProperty(String name, String value) { - setAttribute(name, value); - } - - /** - * Get a property - */ - public String getProperty(String name) { - return (String)getAttribute(name); - } - - /** * Pass config info */ public void setAttribute(String name, Object value) { Modified: branches/2.0.x/src/share/classes/org/apache/tomcat/util/IntrospectionUtils.java =================================================================== --- branches/2.0.x/src/share/classes/org/apache/tomcat/util/IntrospectionUtils.java 2007-08-17 13:18:44 UTC (rev 228) +++ branches/2.0.x/src/share/classes/org/apache/tomcat/util/IntrospectionUtils.java 2007-08-20 15:04:17 UTC (rev 229) @@ -38,8 +38,8 @@ public final class IntrospectionUtils { - private static org.apache.commons.logging.Log log= - org.apache.commons.logging.LogFactory.getLog( IntrospectionUtils.class ); + private static org.jboss.logging.Logger log= + org.jboss.logging.Logger.getLogger( IntrospectionUtils.class ); /** * Call execute() - any ant-like task should work @@ -258,7 +258,7 @@ * int or boolean we'll convert value to the right type before) - that means * you can have setDebug(1). */ - public static void setProperty(Object o, String name, String value) { + public static boolean setProperty(Object o, String name, String value) { if (dbg > 1) d("setProperty(" + o.getClass() + " " + name + "=" + value + ")"); @@ -275,7 +275,7 @@ && "java.lang.String".equals(paramT[0].getName())) { methods[i].invoke(o, new Object[] { value }); - return; + return true; } } @@ -328,7 +328,7 @@ if (ok) { methods[i].invoke(o, params); - return; + return true; } } @@ -344,6 +344,7 @@ params[0] = name; params[1] = value; setPropertyMethod.invoke(o, params); + return true; } } catch (IllegalArgumentException ex2) { @@ -367,6 +368,7 @@ if (dbg > 1) ie.printStackTrace(); } + return false; } public static Object getProperty(Object o, String name) { Modified: branches/2.0.x/src/share/classes/org/apache/tomcat/util/digester/Digester.java =================================================================== --- branches/2.0.x/src/share/classes/org/apache/tomcat/util/digester/Digester.java 2007-08-17 13:18:44 UTC (rev 228) +++ branches/2.0.x/src/share/classes/org/apache/tomcat/util/digester/Digester.java 2007-08-20 15:04:17 UTC (rev 229) @@ -36,9 +36,9 @@ import javax.xml.parsers.SAXParser; import javax.xml.parsers.SAXParserFactory; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; import org.apache.tomcat.util.IntrospectionUtils; +import org.jboss.logging.Logger; +import org.jboss.logging.Logger; import org.xml.sax.Attributes; import org.xml.sax.EntityResolver; import org.xml.sax.ErrorHandler; @@ -313,17 +313,29 @@ /** + * Warn on missing attributes and elements. + */ + protected boolean rulesValidation = false; + + + /** + * Fake attributes map (attributes are often used for object creation). + */ + protected Map<Class, List<String>> fakeAttributes = null; + + + /** * The Log to which most logging calls will be made. */ - protected Log log = - LogFactory.getLog("org.apache.commons.digester.Digester"); + protected Logger log = + Logger.getLogger("org.apache.commons.digester.Digester"); /** * The Log to which all SAX event related logging calls will be made. */ - protected Log saxLog = - LogFactory.getLog("org.apache.commons.digester.Digester.sax"); + protected Logger saxLog = + Logger.getLogger("org.apache.commons.digester.Digester.sax"); /** @@ -550,7 +562,7 @@ /** * Return the current Logger associated with this instance of the Digester */ - public Log getLogger() { + public Logger getLogger() { return log; @@ -560,7 +572,7 @@ /** * Set the current logger for this Digester. */ - public void setLogger(Log log) { + public void setLogger(Logger log) { this.log = log; @@ -572,7 +584,7 @@ * * @since 1.6 */ - public Log getSAXLogger() { + public Logger getSAXLogger() { return saxLog; } @@ -585,7 +597,7 @@ * * @since 1.6 */ - public void setSAXLogger(Log saxLog) { + public void setSAXLogger(Logger saxLog) { this.saxLog = saxLog; } @@ -889,6 +901,72 @@ /** + * Return the rules validation flag. + */ + public boolean getRulesValidation() { + + return (this.rulesValidation); + + } + + + /** + * Set the rules validation flag. This must be called before + * <code>parse()</code> is called the first time. + * + * @param rulesValidation The new rules validation flag. + */ + public void setRulesValidation(boolean rulesValidation) { + + this.rulesValidation = rulesValidation; + + } + + + /** + * Return the fake attributes list. + */ + public Map<Class, List<String>> getFakeAttributes() { + + return (this.fakeAttributes); + + } + + + /** + * Determine if an attribute is a fake attribute. + */ + public boolean isFakeAttribute(Object object, String name) { + + if (fakeAttributes == null) { + return false; + } + List<String> result = fakeAttributes.get(object.getClass()); + if (result == null) { + result = fakeAttributes.get(Object.class); + } + if (result == null) { + return false; + } else { + return result.contains(name); + } + + } + + + /** + * Set the fake attributes. + * + * @param fakeAttributes The new fake attributes. + */ + public void setFakeAttributes(Map<Class, List<String>> fakeAttributes) { + + this.fakeAttributes = fakeAttributes; + + } + + + /** * Return the XMLReader to be used for parsing the input document. * * FIX ME: there is a bug in JAXP/XERCES that prevent the use of a @@ -1286,6 +1364,9 @@ if (debug) { log.debug(" No rules found matching '" + match + "'."); } + if (rulesValidation) { + log.warn(" No rules found matching '" + match + "'."); + } } } @@ -2555,8 +2636,8 @@ return; } - log = LogFactory.getLog("org.apache.commons.digester.Digester"); - saxLog = LogFactory.getLog("org.apache.commons.digester.Digester.sax"); + log = Logger.getLogger("org.apache.commons.digester.Digester"); + saxLog = Logger.getLogger("org.apache.commons.digester.Digester.sax"); // Perform lazy configuration as needed initialize(); // call hook method for subclasses that want to be initialized once only Modified: branches/2.0.x/src/share/classes/org/apache/tomcat/util/digester/SetPropertiesRule.java =================================================================== --- branches/2.0.x/src/share/classes/org/apache/tomcat/util/digester/SetPropertiesRule.java 2007-08-17 13:18:44 UTC (rev 228) +++ branches/2.0.x/src/share/classes/org/apache/tomcat/util/digester/SetPropertiesRule.java 2007-08-20 15:04:17 UTC (rev 229) @@ -205,7 +205,13 @@ "} Setting property '" + name + "' to '" + value + "'"); } - IntrospectionUtils.setProperty(top, name, value); + if (!digester.isFakeAttribute(top, name) + && !IntrospectionUtils.setProperty(top, name, value) + && digester.getRulesValidation()) { + digester.log.warn("[SetPropertiesRule]{" + digester.match + + "} Setting property '" + name + "' to '" + + value + "' did not find a matching property."); + } } } Modified: branches/2.0.x/src/share/classes/org/apache/tomcat/util/digester/SetPropertyRule.java =================================================================== --- branches/2.0.x/src/share/classes/org/apache/tomcat/util/digester/SetPropertyRule.java 2007-08-17 13:18:44 UTC (rev 228) +++ branches/2.0.x/src/share/classes/org/apache/tomcat/util/digester/SetPropertyRule.java 2007-08-20 15:04:17 UTC (rev 229) @@ -125,8 +125,13 @@ } // Set the property (with conversion as necessary) - // FIXME: Exception if property doesn't exist ? - IntrospectionUtils.setProperty(top, actualName, actualValue); + if (!digester.isFakeAttribute(top, actualName) + && !IntrospectionUtils.setProperty(top, actualName, actualValue) + && digester.getRulesValidation()) { + digester.log.warn("[SetPropertyRule]{" + digester.match + + "} Setting property '" + name + "' to '" + + value + "' did not find a matching property."); + } }