Re: svn commit: r666816 - in /geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/connector: Http11APRConnectorGBean.java Http11APRProtocol.java

[Jason Dillon]

http://svn.collab.net/repos/svn/trunk/contrib/client-side/svn_apply_autoprops.py

--jason


On Jun 12, 2008, at 7:58 PM, Kevan Miller wrote:

Hi Lin,

Thanks for reverting and recommitting the change. This problem wasn't your fault. It was the fault of whoever created these files in svn.

See http://cwiki.apache.org/GMOxDEV/subversion-client-configuration.html for information about svn client configuration for our project.

As specified in this file, .java files should have the following properties:

*.java = svn:mime-type=text/plain;svn:eol- style=native;svn:keywords=Date Revision

Only AJP13ConnectorGBean.java has these properties. The other files have no properties at all. To prevent these problems in the future, we should set these properties on all of the files.

I recall a script file which could be used to scan a code tree and look for non-conforming files, but don't recall what/where it is. Perhaps someone else can chime in...

--kevan


On Jun 11, 2008, at 4:01 PM, [EMAIL PROTECTED] wrote:

Author: linsun
Date: Wed Jun 11 13:01:37 2008
New Revision: 666816

URL: http://svn.apache.org/viewvc?rev=666816&view=rev
Log:

GERONIMO-4114 - newly created APR HTTPS connector failed to start - hopefully i got the svn property right this time!

Modified:

geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/ java/org/apache/geronimo/tomcat/connector/ Http11APRConnectorGBean.java geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/ java/org/apache/geronimo/tomcat/connector/Http11APRProtocol.java

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

URL: 
http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/connector/Http11APRConnectorGBean.java?rev=666816&r1=666815&r2=666816&view=diff

= = = = = = = = = ===================================================================== --- geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/ java/org/apache/geronimo/tomcat/connector/ Http11APRConnectorGBean.java (original) +++ geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/ java/org/apache/geronimo/tomcat/connector/ Http11APRConnectorGBean.java Wed Jun 11 13:01:37 2008

@@ -114,6 +114,10 @@
        Object value = connector.getAttribute("useSendfile");

return value == null ? true : new Boolean(value.toString()).booleanValue();

    }
+
+    public String getSslPassword() {
+        return (String) connector.getAttribute("SSLPassword");
+    }

    public void setPollTime(int pollTime) {
        connector.setAttribute("pollTime", pollTime);

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

URL: 
http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/java/org/apache/geronimo/tomcat/connector/Http11APRProtocol.java?rev=666816&r1=666815&r2=666816&view=diff

= = = = = = = = = ===================================================================== --- geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/ java/org/apache/geronimo/tomcat/connector/Http11APRProtocol.java (original) +++ geronimo/server/trunk/plugins/tomcat/geronimo-tomcat6/src/main/ java/org/apache/geronimo/tomcat/connector/Http11APRProtocol.java Wed Jun 11 13:01:37 2008

@@ -39,6 +39,7 @@
    public void setSslCertificateFile(String sslCertificateFile);
    public String getSslCertificateKeyFile();

public void setSslCertificateKeyFile(String sslCertificateKeyFile);

+    public String getSslPassword();
    public void setSslPassword(String sslPassword);
    public String getSslVerifyClient();
    public void setSslVerifyClient(String sslVerifyClient);