svn commit: r809587 - /geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/model/ConnectorType.java

[xu...@apache.org]

Author: xuhaihong
Date: Mon Aug 31 13:37:20 2009
New Revision: 809587

URL: http://svn.apache.org/viewvc?rev=809587&view=rev
Log:
GERONIMO-4812 can not configure httpd server

Modified:
    geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/model/ConnectorType.java

Modified: geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/model/ConnectorType.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/model/ConnectorType.java?rev=809587&r1=809586&r2=809587&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/model/ConnectorType.java (original)
+++ geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/model/ConnectorType.java Mon Aug 31 13:37:20 2009
@@ -590,10 +590,13 @@
         }
         ObjectRecipe recipe = new ObjectRecipe(className, properties);
         recipe.allow(Option.IGNORE_MISSING_PROPERTIES);
+        recipe.setConstructorArgTypes(new Class[] { String.class });
+        recipe.setConstructorArgNames(new String[] { "protocol" });
         Connector connector = (Connector) recipe.create(cl);
+        boolean executorSupported = !connector.getProtocolHandlerClassName().equals("org.apache.jk.server.JkCoyoteHandler");
         for (Map.Entry<QName, String> entry : otherAttributes.entrySet()) {
             String name = entry.getKey().getLocalPart();
-            if ("executor".equals(name)) {
+            if (executorSupported && "executor".equals(name)) {
                 Executor executor = service.getExecutor(entry.getValue());
                 if (executor == null) {
                     throw new IllegalArgumentException("No executor found in service with name: " + entry.getValue());