Changeset 741

Timestamp:

07/11/06 13:17:15

Author:

douglm

Message:

Enable ssl connections from httpclient. Currently accepts any certificate.

Files:

• trunk/calendar3/bldfiles/buildwar.xml (modified) (1 diff)
• trunk/calendar3/bldfiles/defjars.properties (modified) (1 diff)
• trunk/calendar3/caldavClientApi/build.xml (modified) (1 diff)
• trunk/calendar3/caldavClientApi/src/org/bedework/caldav/client/api/CaldavClientIo.java (modified) (4 diffs)
• trunk/calendar3/lib/commons/commons-ssl.jar (added)

trunk/calendar3/bldfiles/buildwar.xml

@@ -301 +301 @@
-    <copy todir="${app.dest.lib}" file="${commons-collections.jar}"/>
-    <copy todir="${app.dest.lib}" file="${commons-httclient.jar}"/>
+    <copy todir="${app.dest.lib}" file="${commons-ssl.jar}"/>
-
-    <!-- add the jdbcdriver if defined -->

trunk/calendar3/bldfiles/defjars.properties

@@ -85 +85 @@
-commons-logging.jar=${commons.dir}/commons-logging.jar
-
+#      commons-ssl.jar    Used by httpclient for https
+commons-ssl.jar=${commons.dir}/commons-ssl.jar
+
-#      commons-validator.jar    Used for struts.
-commons-validator.jar=${commons.dir}/commons-validator-1.3.0.jar

trunk/calendar3/caldavClientApi/build.xml

@@ -40 +40 @@
-
-    <path id="compile.classpath">
+      <pathelement location="${commons-ssl.jar}"/>
-      <pathelement location="${httpclient.jar}"/>
-      <pathelement location="${ical4j.jar}"/>

trunk/calendar3/caldavClientApi/src/org/bedework/caldav/client/api/CaldavClientIo.java

@@ -65 +65 @@
-import org.apache.commons.httpclient.HostConfiguration;
-import org.apache.commons.httpclient.HttpMethod;
+import org.apache.commons.httpclient.contrib.ssl.BaseProtocolSocketFactory;
-import org.apache.commons.httpclient.protocol.Protocol;
-
-
+
+
+
-import org.apache.log4j.Logger;
-
@@ -116 +118 @@
-
-    if (secure) {
+      /*
-      ProtocolSocketFactory pfact = new SSLProtocolSocketFactory();
-      Protocol pr = new Protocol("https", pfact, port);
-      Protocol.registerProtocol( "https", pr);
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    } else {
-      config.setHost(host, port);
@@ -131 +148 @@
-    }
-    */
+    if (debug) {
+      debugMsg("uri set to " + config.getHostURL());
+    }
-
-    httpManager.getParams().setConnectionTimeout(timeOut);
@@ -296 +316 @@
-  }
-
+  protected void warn(String msg) {
+    getLogger().warn(msg);
+  }
+
-  protected void logIt(String msg) {
-    getLogger().info(msg);