[Bedework-commit] r483 - in trunk/calendar3: access/src/edu/rpi/cct/uwcal/access caldavClientApi/src/org/bedework/caldav/client/api deployment/webuser/webapp/resources/demoskins/default/default

[svnadmin at bedework.org]

Author: douglm
Date: 2006-05-16 09:07:36 -0400 (Tue, 16 May 2006)
New Revision: 483

Modified:
   trunk/calendar3/access/src/edu/rpi/cct/uwcal/access/PrivilegeDefs.java
   trunk/calendar3/caldavClientApi/src/org/bedework/caldav/client/api/CaldavClientIo.java
   trunk/calendar3/deployment/webuser/webapp/resources/demoskins/default/default/default.xsl
Log:
Fix bug in access routines - missed privNone flag out of defs.
Fix stylesheet to use correct freebusy flag F not f

Modified: trunk/calendar3/access/src/edu/rpi/cct/uwcal/access/PrivilegeDefs.java
===================================================================
--- trunk/calendar3/access/src/edu/rpi/cct/uwcal/access/PrivilegeDefs.java	2006-05-15 20:51:14 UTC (rev 482)
+++ trunk/calendar3/access/src/edu/rpi/cct/uwcal/access/PrivilegeDefs.java	2006-05-16 13:07:36 UTC (rev 483)
@@ -180,6 +180,8 @@
     'u',     // privUnbind
 
     'U',     // privUnlock
+
+    'N',     // privNone
   };
 
   /** Default privs for an owner

Modified: trunk/calendar3/caldavClientApi/src/org/bedework/caldav/client/api/CaldavClientIo.java
===================================================================
--- trunk/calendar3/caldavClientApi/src/org/bedework/caldav/client/api/CaldavClientIo.java	2006-05-15 20:51:14 UTC (rev 482)
+++ trunk/calendar3/caldavClientApi/src/org/bedework/caldav/client/api/CaldavClientIo.java	2006-05-16 13:07:36 UTC (rev 483)
@@ -63,6 +63,10 @@
 import org.apache.commons.httpclient.Header;
 import org.apache.commons.httpclient.HostConfiguration;
 import org.apache.commons.httpclient.HttpMethod;
+import org.apache.commons.httpclient.URI;
+import org.apache.commons.httpclient.protocol.Protocol;
+import org.apache.commons.httpclient.protocol.ProtocolSocketFactory;
+import org.apache.commons.httpclient.protocol.SSLProtocolSocketFactory;
 
 import sun.misc.BASE64Encoder;
 
@@ -86,13 +90,41 @@
    * @throws Throwable
    */
   public CaldavClientIo(String host, int port, boolean debug) throws Throwable {
+    this(host, port, false, debug);
+  }
+
+    /**
+     * @param host
+     * @param port
+     * @param secure
+     * @param debug
+     * @throws Throwable
+     */
+  public CaldavClientIo(String host, int port, boolean secure,
+                        boolean debug) throws Throwable {
     if (httpManager == null) {
       httpManager = new HttpManager("org.bedework.http.client.caldav.CaldavClient");
     }
 
     HostConfiguration config = new HostConfiguration();
 
-    config.setHost(host, port);
+    if (secure) {
+      ProtocolSocketFactory pfact = new SSLProtocolSocketFactory();
+      Protocol pr = new Protocol("https", pfact, port);
+      Protocol.registerProtocol( "https", pr);
+
+      config.setHost(host, port, pr);
+    } else {
+      config.setHost(host, port);
+    }
+    /*
+    if (secure) {
+      config.setHost(new URI("https://" + host + ":" + port, false));
+    } else {
+      config.setHost(new URI("http://" + host + ":" + port, false));
+    }
+    */
+
     client = (CaldavClient)httpManager.getClient(config);
 
     this.debug = debug;
@@ -135,11 +167,11 @@
     if (content != null) {
       sz = content.length;
     }
-    
+
     System.out.println("About to send request: method=" + method +
                        " contentLen=" + contentLen +
                        " content.length=" + sz);
-    
+
     client.setMethodName(method, url);
 
     HttpMethod meth = client.getMethod();

Modified: trunk/calendar3/deployment/webuser/webapp/resources/demoskins/default/default/default.xsl
===================================================================
--- trunk/calendar3/deployment/webuser/webapp/resources/demoskins/default/default/default.xsl	2006-05-15 20:51:14 UTC (rev 482)
+++ trunk/calendar3/deployment/webuser/webapp/resources/demoskins/default/default/default.xsl	2006-05-16 13:07:36 UTC (rev 483)
@@ -2244,7 +2244,7 @@
         </p>
         <p>
           Access rights:<br/>
-          <input type="radio" value="f" name="how" checked="checked"/> view my free/busy<br/>
+          <input type="radio" value="F" name="how" checked="checked"/> view my free/busy<br/>
           <input type="radio" value="d" name="how"/> default (reset access)
         </p>
         <input type="submit" name="submit" value="Submit"/>