geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ga...@apache.org
Subject svn commit: r787425 - in /geronimo/server/trunk/plugins/tomcat: geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/model/ConnectorType.java tomcat6/src/main/resources/tomcat-base/server.xml
Date Mon, 22 Jun 2009 22:22:07 GMT
Author: gawor
Date: Mon Jun 22 22:22:07 2009
New Revision: 787425

URL: http://svn.apache.org/viewvc?rev=787425&view=rev
Log:
Make https port work right on Tomcat (pass all properites to Tomcat Connector via setProperties()
call and point to the right keystoreFile/keystorePass)

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

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=787425&r1=787424&r2=787425&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 Jun 22 22:22:07 2009
@@ -663,13 +663,13 @@
         if (isUseIPVHosts() != null) {
             properties.put(USE_IPVHOSTS, isUseIPVHosts());
         }
-        for (Map.Entry<QName, String> entry: otherAttributes.entrySet()) {
-            String name = entry.getKey().getLocalPart();
-            properties.put(name, entry.getValue());
-        }
         ObjectRecipe recipe = new ObjectRecipe(className, properties);
         recipe.allow(Option.IGNORE_MISSING_PROPERTIES);
         Connector connector = (Connector) recipe.create(cl);
+        for (Map.Entry<QName, String> entry: otherAttributes.entrySet()) {
+            String name = entry.getKey().getLocalPart();
+            connector.setProperty(name, entry.getValue());
+        }
         
         for (ListenerType listenerType: getListener()) {
             LifecycleListener listener = listenerType.getLifecycleListener(cl);

Modified: geronimo/server/trunk/plugins/tomcat/tomcat6/src/main/resources/tomcat-base/server.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/tomcat/tomcat6/src/main/resources/tomcat-base/server.xml?rev=787425&r1=787424&r2=787425&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/tomcat/tomcat6/src/main/resources/tomcat-base/server.xml
(original)
+++ geronimo/server/trunk/plugins/tomcat/tomcat6/src/main/resources/tomcat-base/server.xml
Mon Jun 22 22:22:07 2009
@@ -91,6 +91,8 @@
                scheme="https"
                secure="true"
                clientAuth="false"
+               keystoreFile="../security/keystores/geronimo-default"
+               keystorePass="secret"
                sslProtocol="TLS" />
 
     <!-- Define an AJP 1.3 Connector on port 8009 -->



Mime
View raw message