Author: markt Date: Thu Apr 20 12:37:27 2006 New Revision: 395680 URL: http://svn.apache.org/viewcvs?rev=395680&view=rev Log: Fix gump errors by adding new classes that should have been included in the update to the TC4 CoyoteConnector to enable the full range of protocol config options
Added: tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/startup/ConnectorCreateRule.java (with props) tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/startup/SetAllPropertiesRule.java (with props) Added: tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/startup/ConnectorCreateRule.java URL: http://svn.apache.org/viewcvs/tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/startup/ConnectorCreateRule.java?rev=395680&view=auto ============================================================================== --- tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/startup/ConnectorCreateRule.java (added) +++ tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/startup/ConnectorCreateRule.java Thu Apr 20 12:37:27 2006 @@ -0,0 +1,66 @@ +/* $Id: ConnectorCreateRule.java 303287 2004-09-29 09:55:39Z remm $ + * + * Copyright 2001-2004 The Apache Software Foundation. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package org.apache.catalina.startup; + +import org.apache.catalina.Connector; +import org.apache.commons.digester.Rule; +import org.xml.sax.Attributes; + +/** + * Rule implementation that creates a connector. + */ + +public class ConnectorCreateRule extends Rule { + + // --------------------------------------------------------- Public Methods + + /** + * Process the beginning of this element. + * + * @param attributes + * The attribute list of this element + */ + public void begin(Attributes attributes) throws Exception { + Class clazz; + Connector connector; + + String className = attributes.getValue("className"); + clazz = Class.forName(className); + + if (className.equals("org.apache.coyote.tomcat4.CoyoteConnector")) { + Class argsClass[] = { String.class }; + Object argsObjs[] = { attributes.getValue("protocolHandler") }; + connector = (Connector) clazz.getConstructor(argsClass) + .newInstance(argsObjs); + } else { + Class argsClass[] = {}; + Object argsObjs[] = {}; + connector = (Connector) clazz.getConstructor(argsClass) + .newInstance(argsObjs); + } + digester.push(connector); + } + + /** + * Process the end of this element. + */ + public void end() throws Exception { + Object top = digester.pop(); + } + +} Propchange: tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/startup/ConnectorCreateRule.java ------------------------------------------------------------------------------ svn:eol-style = native Added: tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/startup/SetAllPropertiesRule.java URL: http://svn.apache.org/viewcvs/tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/startup/SetAllPropertiesRule.java?rev=395680&view=auto ============================================================================== --- tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/startup/SetAllPropertiesRule.java (added) +++ tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/startup/SetAllPropertiesRule.java Thu Apr 20 12:37:27 2006 @@ -0,0 +1,64 @@ +/* + * Copyright 1999-2001,2004 The Apache Software Foundation. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + + +package org.apache.catalina.startup; + +import org.xml.sax.Attributes; + +import org.apache.commons.digester.Rule; +import org.apache.tomcat.util.IntrospectionUtils; + +/** + * Rule that uses the introspection utils to set properties. + * + * @author Remy Maucherat + */ +public class SetAllPropertiesRule extends Rule { + + + // ----------------------------------------------------------- Constructors + + + // ----------------------------------------------------- Instance Variables + + + // --------------------------------------------------------- Public Methods + + + /** + * Handle the beginning of an XML element. + * + * @param attributes The attributes of this element + * + * @exception Exception if a processing error occurs + */ + public void begin(String namespace, String nameX, Attributes attributes) + throws Exception { + + for (int i = 0; i < attributes.getLength(); i++) { + String name = attributes.getLocalName(i); + if ("".equals(name)) { + name = attributes.getQName(i); + } + String value = attributes.getValue(i); + IntrospectionUtils.setProperty(digester.peek(), name, value); + } + + } + + +} Propchange: tomcat/container/branches/tc4.1.x/catalina/src/share/org/apache/catalina/startup/SetAllPropertiesRule.java ------------------------------------------------------------------------------ svn:eol-style = native --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]