[Bedework-commit] caldav r520 - in trunk: server/src/org/bedework/caldav/server server/src/org/bedework/caldav/server/soap server/src/org/bedework/caldav/server/soap/calws server/src/org/bedework/caldav/server/soap/exsynch util/src/org/bedework/caldav/util

[svnadmin at bedework.org]

Author: douglm
Date: 2011-03-15 23:33:50 -0400 (Tue, 15 Mar 2011)
New Revision: 520

Modified:
   trunk/server/src/org/bedework/caldav/server/PostMethod.java
   trunk/server/src/org/bedework/caldav/server/soap/SoapHandler.java
   trunk/server/src/org/bedework/caldav/server/soap/calws/CalwsHandler.java
   trunk/server/src/org/bedework/caldav/server/soap/exsynch/ExsynchwsHandler.java
   trunk/util/src/org/bedework/caldav/util/CalDAVConfig.java
Log:
Fixes to CalWs SOAP and minor fix to Exsynch

Modified: trunk/server/src/org/bedework/caldav/server/PostMethod.java
===================================================================
--- trunk/server/src/org/bedework/caldav/server/PostMethod.java	2011-03-12 05:06:36 UTC (rev 519)
+++ trunk/server/src/org/bedework/caldav/server/PostMethod.java	2011-03-16 03:33:50 UTC (rev 520)
@@ -113,6 +113,8 @@
     /** true if this is a calws soap web service request */
     public boolean calwsSoap;
 
+    public boolean getTheReader = true;
+
     /**
      * @param req
      * @param intf
@@ -143,10 +145,16 @@
       if (!iSchedule) {
         if (conf.getFburlServiceURI() != null) {
           freeBusy = conf.getFburlServiceURI().equals(resourceUri);
+          if (freeBusy) {
+            getTheReader = false;
+          }
         }
 
         if (conf.getWebcalServiceURI() != null) {
           webcal = conf.getWebcalServiceURI().equals(resourceUri);
+          if (webcal) {
+            getTheReader = false;
+          }
         }
 
         if (!freeBusy && !webcal) {
@@ -157,8 +165,14 @@
             }
           } else if (conf.getExsynchWsURI() != null) {
             exsynchws = conf.getExsynchWsURI().equals(resourceUri);
+            if (exsynchws) {
+              getTheReader = false;
+            }
           } else if (conf.getCalSoapWsURI() != null) {
             calwsSoap = conf.getCalSoapWsURI().equals(resourceUri);
+            if (calwsSoap) {
+              getTheReader = false;
+            }
           }
         }
       } else {
@@ -180,7 +194,7 @@
         }
       }
 
-      if (!freeBusy && !webcal && !entityCreate && !exsynchws) {
+      if (getTheReader) {
         try {
           reqRdr = req.getReader();
         } catch (Throwable t) {

Modified: trunk/server/src/org/bedework/caldav/server/soap/SoapHandler.java
===================================================================
--- trunk/server/src/org/bedework/caldav/server/soap/SoapHandler.java	2011-03-12 05:06:36 UTC (rev 519)
+++ trunk/server/src/org/bedework/caldav/server/soap/SoapHandler.java	2011-03-16 03:33:50 UTC (rev 520)
@@ -20,7 +20,6 @@
 
 import org.bedework.caldav.server.CaldavBWIntf;
 import org.bedework.caldav.server.sysinterface.SysIntf;
-import org.bedework.exsynch.wsmessages.ObjectFactory;
 
 import edu.rpi.cct.webdav.servlet.common.MethodBase;
 import edu.rpi.cct.webdav.servlet.shared.WebdavException;
@@ -53,8 +52,6 @@
 
   protected static volatile Object monitor = new Object();
 
-  protected ObjectFactory of = new ObjectFactory();
-
   /**
    * @param intf
    * @throws WebdavException
@@ -85,6 +82,13 @@
   public void init() {
   }
 
+  protected void initResponse(final HttpServletResponse resp)
+        throws WebdavException {
+    resp.setCharacterEncoding("UTF-8");
+    resp.setStatus(HttpServletResponse.SC_OK);
+    resp.setContentType("text/xml; charset=UTF-8");
+  }
+
   @Override
   public void doMethod(final HttpServletRequest req,
                        final HttpServletResponse resp)

Modified: trunk/server/src/org/bedework/caldav/server/soap/calws/CalwsHandler.java
===================================================================
--- trunk/server/src/org/bedework/caldav/server/soap/calws/CalwsHandler.java	2011-03-12 05:06:36 UTC (rev 519)
+++ trunk/server/src/org/bedework/caldav/server/soap/calws/CalwsHandler.java	2011-03-16 03:33:50 UTC (rev 520)
@@ -99,7 +99,7 @@
 
   @Override
   protected String getJaxbContextPath() {
-    return "org.bedework.exsynch.wsmessages";
+    return "org.oasis_open.docs.ns.wscal.calws_soap";
   }
 
   /**
@@ -113,6 +113,8 @@
                           final RequestPars pars) throws WebdavException {
 
     try {
+      initResponse(resp);
+
       Object o = unmarshal(req);
       if (o instanceof JAXBElement) {
         o = ((JAXBElement)o).getValue();

Modified: trunk/server/src/org/bedework/caldav/server/soap/exsynch/ExsynchwsHandler.java
===================================================================
--- trunk/server/src/org/bedework/caldav/server/soap/exsynch/ExsynchwsHandler.java	2011-03-12 05:06:36 UTC (rev 519)
+++ trunk/server/src/org/bedework/caldav/server/soap/exsynch/ExsynchwsHandler.java	2011-03-16 03:33:50 UTC (rev 520)
@@ -39,6 +39,7 @@
 import org.bedework.exsynch.wsmessages.GetSycnchInfo;
 import org.bedework.exsynch.wsmessages.NamespaceType;
 import org.bedework.exsynch.wsmessages.NewValueType;
+import org.bedework.exsynch.wsmessages.ObjectFactory;
 import org.bedework.exsynch.wsmessages.RemoveType;
 import org.bedework.exsynch.wsmessages.StartServiceNotification;
 import org.bedework.exsynch.wsmessages.StartServiceResponse;
@@ -97,6 +98,8 @@
 
   static ActiveConnectionInfo activeConnection;
 
+  private ObjectFactory of = new ObjectFactory();
+
   /**
    * @param intf
    * @throws WebdavException

Modified: trunk/util/src/org/bedework/caldav/util/CalDAVConfig.java
===================================================================
--- trunk/util/src/org/bedework/caldav/util/CalDAVConfig.java	2011-03-12 05:06:36 UTC (rev 519)
+++ trunk/util/src/org/bedework/caldav/util/CalDAVConfig.java	2011-03-16 03:33:50 UTC (rev 520)
@@ -50,6 +50,9 @@
   /* CalWS SOAP web service uri - null for no service */
   private String calSoapWsURI;
 
+  /* CalWS SOAP web service WSDL uri - null for no service */
+  private String calSoapWsWSDLURI;
+
   /* Set at server init */
   private boolean calWS;
 
@@ -195,6 +198,22 @@
     return calSoapWsURI;
   }
 
+  /** Set the calws soap web service WSDL uri - null for no service
+   *
+   * @param val    String
+   */
+  public void setCalSoapWsWSDLURI(final String val) {
+    calSoapWsWSDLURI = val;
+  }
+
+  /** Get the calws soap web service WSDL uri - null for no service
+   *
+   * @return String
+   */
+  public String getCalSoapWsWSDLURI() {
+    return calSoapWsWSDLURI;
+  }
+
   /** True for a web service - set by server..
    *
    * @param val