geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jgenen...@apache.org
Subject svn commit: r561375 - /geronimo/server/trunk/modules/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/TomcatManagerImpl.java
Date Tue, 31 Jul 2007 16:12:37 GMT
Author: jgenender
Date: Tue Jul 31 09:12:35 2007
New Revision: 561375

URL: http://svn.apache.org/viewvc?view=rev&rev=561375
Log:
Fix compile issue

Modified:
    geronimo/server/trunk/modules/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/TomcatManagerImpl.java

Modified: geronimo/server/trunk/modules/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/TomcatManagerImpl.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/TomcatManagerImpl.java?view=diff&rev=561375&r1=561374&r2=561375
==============================================================================
--- geronimo/server/trunk/modules/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/TomcatManagerImpl.java
(original)
+++ geronimo/server/trunk/modules/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/TomcatManagerImpl.java
Tue Jul 31 09:12:35 2007
@@ -90,8 +90,8 @@
     static {
         List<ConnectorAttribute> connectorAttributes = new ArrayList<ConnectorAttribute>();
         //HTTP Attributes
-        connectorAttributes.add(new ConnectorAttribute<String>("host", "0.0.0.0", "Host",
String.class), true);
-        connectorAttributes.add(new ConnectorAttribute<Integer>("port", 8080, "Port",
Integer.class), true);
+        connectorAttributes.add(new ConnectorAttribute<String>("host", "0.0.0.0", "Host",
String.class, true));
+        connectorAttributes.add(new ConnectorAttribute<Integer>("port", 8080, "Port",
Integer.class, true));
         connectorAttributes.add(new ConnectorAttribute<Integer>("maxThreads", 40, "Maximum
number of threads", Integer.class));
         connectorAttributes.add(new ConnectorAttribute<Integer>("minSpareThreads",
10, "Minimum spare threads", Integer.class));
         connectorAttributes.add(new ConnectorAttribute<Integer>("maxSpareThreads",
100, "Maximum spare threads", Integer.class));
@@ -130,6 +130,9 @@
         
         connectorAttributes = new ArrayList<ConnectorAttribute>();
         
+        //HTTP Attributes
+        connectorAttributes.add(new ConnectorAttribute<String>("host", "0.0.0.0", "Host",
String.class, true));
+        connectorAttributes.add(new ConnectorAttribute<Integer>("port", 8443, "Port",
Integer.class, true));
         connectorAttributes.add(new ConnectorAttribute<String>("algorithm", KeyManagerFactory.getDefaultAlgorithm(),
"Algorithm", String.class));
         connectorAttributes.add(new ConnectorAttribute<Boolean>("clientAuth", false,
"clientAuth", Boolean.class));
         connectorAttributes.add(new ConnectorAttribute<String>("keystoreFile", "",
"keystoreFile", String.class));
@@ -141,9 +144,7 @@
         connectorAttributes.add(new ConnectorAttribute<String>("truststoreFile", "",
"truststoreFile", String.class));
         connectorAttributes.add(new ConnectorAttribute<String>("truststorePass", "",
"truststorePass", String.class));
         connectorAttributes.add(new ConnectorAttribute<String>("truststoreType", "",
"truststoreType", String.class));
-        //HTTP Attributes
-        connectorAttributes.add(new ConnectorAttribute<String>("host", "0.0.0.0", "Host",
String.class), true);
-        connectorAttributes.add(new ConnectorAttribute<Integer>("port", 8443, "Port",
Integer.class), true);
+
         connectorAttributes.add(new ConnectorAttribute<Integer>("maxThreads", 40, "Maximum
number of threads", Integer.class));
         connectorAttributes.add(new ConnectorAttribute<Integer>("minSpareThreads",
10, "Minimum spare threads", Integer.class));
         connectorAttributes.add(new ConnectorAttribute<Integer>("maxSpareThreads",
100, "Maximum spare threads", Integer.class));
@@ -372,7 +373,7 @@
     }
 
     public List<ConnectorType> getConnectorTypes() {
-        return null;
+        return CONNECTOR_TYPES;
     }
 
     public List<ConnectorAttribute> getConnectorAttributes(ConnectorType connectorType)
{



Mime
View raw message