Upgrade jackrabbit-webdav to 2.4.3

git-svn-id: http://svn.code.sf.net/p/davmail/code/trunk@2048 3d1905a2-6b24-0410-a738-b14d5a86fcbd

davmail-setup.nsi

@@ -93,7 +93,7 @@ Section "MainSection" SEC01
   File "dist\lib\commons-httpclient-3.1.jar"
   File "dist\lib\commons-logging-1.0.4.jar"
   File "dist\lib\htmlcleaner-2.2.jar"
-  File "dist\lib\jackrabbit-webdav-1.4.jar"
+  File "dist\lib\jackrabbit-webdav-2.4.3.jar"
   File "dist\lib\jcharset-1.3.jar"
   File "dist\lib\jcifs-1.3.14.jar"
   File "dist\lib\jdom-1.0.jar"
@@ -168,7 +168,7 @@ no_quest:
   Delete "$INSTDIR\lib\commons-httpclient-3.1.jar"
   Delete "$INSTDIR\lib\commons-logging-1.0.4.jar"
   Delete "$INSTDIR\lib\htmlcleaner-2.2.jar"
-  Delete "$INSTDIR\lib\jackrabbit-webdav-1.4.jar"
+  Delete "$INSTDIR\lib\jackrabbit-webdav-2.4.3.jar"
   Delete "$INSTDIR\lib\jcharset-1.3.jar"
   Delete "$INSTDIR\lib\jcifs-1.3.14.jar"
   Delete "$INSTDIR\lib\jdom-1.0.jar"

davmail.jsmooth

@@ -14,7 +14,7 @@
 <classPath>dist/lib/commons-httpclient-3.1.jar</classPath>
 <classPath>dist/lib/commons-logging-1.0.4.jar</classPath>
 <classPath>dist/lib/htmlcleaner-2.2.jar</classPath>
-<classPath>dist/lib/jackrabbit-webdav-1.4.jar</classPath>
+<classPath>dist/lib/jackrabbit-webdav-2.4.3.jar</classPath>
 <classPath>dist/lib/jcharset-1.3.jar</classPath>
 <classPath>dist/lib/jcifs-1.3.14.jar</classPath>
 <classPath>dist/lib/jdom-1.0.jar</classPath>

davmail64.jsmooth

@@ -14,7 +14,7 @@
 <classPath>dist\lib\commons-httpclient-3.1.jar</classPath>
 <classPath>dist\lib\commons-logging-1.0.4.jar</classPath>
 <classPath>dist\lib\htmlcleaner-2.2.jar</classPath>
-<classPath>dist\lib\jackrabbit-webdav-1.4.jar</classPath>
+<classPath>dist\lib\jackrabbit-webdav-2.4.3.jar</classPath>
 <classPath>dist\lib\jcharset-1.3.jar</classPath>
 <classPath>dist\lib\jcifs-1.3.14.jar</classPath>
 <classPath>dist\lib\jdom-1.0.jar</classPath>

davmailconsole.jsmooth

@@ -14,7 +14,7 @@
 <classPath>dist/lib/commons-httpclient-3.1.jar</classPath>
 <classPath>dist/lib/commons-logging-1.0.4.jar</classPath>
 <classPath>dist/lib/htmlcleaner-2.2.jar</classPath>
-<classPath>dist/lib/jackrabbit-webdav-1.4.jar</classPath>
+<classPath>dist/lib/jackrabbit-webdav-2.4.3.jar</classPath>
 <classPath>dist/lib/jcharset-1.3.jar</classPath>
 <classPath>dist/lib/jcifs-1.3.14.jar</classPath>
 <classPath>dist/lib/jdom-1.0.jar</classPath>

davmailservice.jsmooth

@@ -14,7 +14,7 @@
 <classPath>dist/lib/commons-httpclient-3.1.jar</classPath>
 <classPath>dist/lib/commons-logging-1.0.4.jar</classPath>
 <classPath>dist/lib/htmlcleaner-2.2.jar</classPath>
-<classPath>dist/lib/jackrabbit-webdav-1.4.jar</classPath>
+<classPath>dist/lib/jackrabbit-webdav-2.4.3.jar</classPath>
 <classPath>dist/lib/jcharset-1.3.jar</classPath>
 <classPath>dist/lib/jcifs-1.3.14.jar</classPath>
 <classPath>dist/lib/jdom-1.0.jar</classPath>

pom.xml

@@ -173,7 +173,7 @@
         <dependency>
             <groupId>org.apache.jackrabbit</groupId>
             <artifactId>jackrabbit-webdav</artifactId>
-            <version>1.4</version>
+            <version>2.4.3</version>
             <exclusions>
                 <exclusion>
                     <groupId>org.apache.jackrabbit</groupId>

src/java/davmail/exchange/dav/DavExchangeSession.java

@@ -30,7 +30,6 @@ import org.apache.commons.codec.binary.Base64;
 import org.apache.commons.httpclient.*;
 import org.apache.commons.httpclient.methods.*;
 import org.apache.commons.httpclient.util.URIUtil;
-import org.apache.jackrabbit.webdav.DavConstants;
 import org.apache.jackrabbit.webdav.DavException;
 import org.apache.jackrabbit.webdav.MultiStatus;
 import org.apache.jackrabbit.webdav.MultiStatusResponse;
@@ -41,6 +40,7 @@ import org.apache.jackrabbit.webdav.client.methods.PropPatchMethod;
 import org.apache.jackrabbit.webdav.property.DavProperty;
 import org.apache.jackrabbit.webdav.property.DavPropertyNameSet;
 import org.apache.jackrabbit.webdav.property.DavPropertySet;
+import org.apache.jackrabbit.webdav.property.PropEntry;
 import org.w3c.dom.Node;
 
 import javax.mail.MessagingException;
@@ -1691,7 +1691,7 @@ public class DavExchangeSession extends ExchangeSession {
                 // trigger activeSync push event, only if davmail.forceActiveSyncUpdate setting is true
                 if ((status == HttpStatus.SC_OK || status == HttpStatus.SC_CREATED) &&
                         (Settings.getBooleanProperty("davmail.forceActiveSyncUpdate"))) {
-                    ArrayList<DavConstants> propertyList = new ArrayList<DavConstants>();
+                    ArrayList<PropEntry> propertyList = new ArrayList<PropEntry>();
                     // Set contentclass to make ActiveSync happy
                     propertyList.add(Field.createDavProperty("contentclass", contentClass));
                     // ... but also set PR_INTERNET_CONTENT to preserve custom properties
@@ -2336,7 +2336,7 @@ public class DavExchangeSession extends ExchangeSession {
     public void processItem(String folderPath, String itemName) throws IOException {
         String eventPath = URIUtil.encodePath(getFolderPath(folderPath) + '/' + convertItemNameToEML(itemName));
         // do not delete calendar messages, mark read and processed
-        ArrayList<DavConstants> list = new ArrayList<DavConstants>();
+        ArrayList<PropEntry> list = new ArrayList<PropEntry>();
         list.add(Field.createDavProperty("processed", "true"));
         list.add(Field.createDavProperty("read", "1"));
         PropPatchMethod patchMethod = new PropPatchMethod(eventPath, list);
@@ -2378,7 +2378,7 @@ public class DavExchangeSession extends ExchangeSession {
             }
             // failover for Exchange 2007, use PROPPATCH with forced timezone
             if (fakeEventUrl == null) {
-                ArrayList<DavConstants> propertyList = new ArrayList<DavConstants>();
+                ArrayList<PropEntry> propertyList = new ArrayList<PropEntry>();
                 propertyList.add(Field.createDavProperty("contentclass", "urn:content-classes:appointment"));
                 propertyList.add(Field.createDavProperty("outlookmessageclass", "IPM.Appointment"));
                 propertyList.add(Field.createDavProperty("instancetype", "0"));
@@ -2479,8 +2479,8 @@ public class DavExchangeSession extends ExchangeSession {
         return new Contact(getFolderPath(folderPath), itemName, properties, etag, noneMatch).createOrUpdate();
     }
 
-    protected List<DavConstants> buildProperties(Map<String, String> properties) {
+    protected List<PropEntry> buildProperties(Map<String, String> properties) {
-        ArrayList<DavConstants> list = new ArrayList<DavConstants>();
+        ArrayList<PropEntry> list = new ArrayList<PropEntry>();
         if (properties != null) {
             for (Map.Entry<String, String> entry : properties.entrySet()) {
                 if ("read".equals(entry.getKey())) {
@@ -2527,7 +2527,7 @@ public class DavExchangeSession extends ExchangeSession {
     public void createMessage(String folderPath, String messageName, HashMap<String, String> properties, MimeMessage mimeMessage) throws IOException {
         String messageUrl = URIUtil.encodePathQuery(getFolderPath(folderPath) + '/' + messageName);
         PropPatchMethod patchMethod;
-        List<DavConstants> davProperties = buildProperties(properties);
+        List<PropEntry> davProperties = buildProperties(properties);
 
         if (properties != null && properties.containsKey("draft")) {
             // note: draft is readonly after create, create the message first with requested messageFlags
@@ -2570,7 +2570,7 @@ public class DavExchangeSession extends ExchangeSession {
             if (code == HttpStatus.SC_NOT_ACCEPTABLE) {
                 LOGGER.warn("Draft message creation failed, failover to property update. Note: attachments are lost");
 
-                ArrayList<DavConstants> propertyList = new ArrayList<DavConstants>();
+                ArrayList<PropEntry> propertyList = new ArrayList<PropEntry>();
                 propertyList.add(Field.createDavProperty("to", mimeMessage.getHeader("to", ",")));
                 propertyList.add(Field.createDavProperty("cc", mimeMessage.getHeader("cc", ",")));
                 propertyList.add(Field.createDavProperty("message-id", mimeMessage.getHeader("message-id", ",")));
@@ -2634,7 +2634,7 @@ public class DavExchangeSession extends ExchangeSession {
         try {
             // need to update bcc after put
             if (mimeMessage.getHeader("Bcc") != null) {
-                davProperties = new ArrayList<DavConstants>();
+                davProperties = new ArrayList<PropEntry>();
                 davProperties.add(Field.createDavProperty("bcc", mimeMessage.getHeader("Bcc", ",")));
                 patchMethod = new PropPatchMethod(messageUrl, davProperties);
                 try {

src/java/davmail/exchange/dav/Field.java

@@ -19,9 +19,9 @@
 package davmail.exchange.dav;
 
 import davmail.util.StringUtil;
-import org.apache.jackrabbit.webdav.DavConstants;
 import org.apache.jackrabbit.webdav.property.DavPropertyName;
 import org.apache.jackrabbit.webdav.property.DefaultDavProperty;
+import org.apache.jackrabbit.webdav.property.PropEntry;
 import org.apache.jackrabbit.webdav.xml.DomUtil;
 import org.apache.jackrabbit.webdav.xml.Namespace;
 import org.apache.jackrabbit.webdav.xml.XmlSerializable;
@@ -530,7 +530,7 @@ public class Field {
      * @param value field value
      * @return DavProperty with value or DavPropertyName for null values
      */
-    public static DavConstants createDavProperty(String alias, String value) {
+    public static PropEntry createDavProperty(String alias, String value) {
         Field field = Field.get(alias);
         if (value == null) {
             // return DavPropertyName to remove property

src/winrun4j/davmail.ini

@@ -6,7 +6,7 @@ classpath.4=lib/commons-collections-3.1.jar
 classpath.5=lib/commons-httpclient-3.1.jar
 classpath.6=lib/commons-logging-1.0.4.jar
 classpath.7=lib/htmlcleaner-2.2.jar
-classpath.8=lib/jackrabbit-webdav-1.4.jar
+classpath.8=lib/jackrabbit-webdav-2.4.3.jar
 classpath.9=lib/jcharset-1.3.jar
 classpath.10=lib/jcifs-1.3.14.jar
 classpath.11=lib/jdom-1.0.jar

src/winrun4j/davmail64.ini

@@ -6,7 +6,7 @@ classpath.4=lib/commons-collections-3.1.jar
 classpath.5=lib/commons-httpclient-3.1.jar
 classpath.6=lib/commons-logging-1.0.4.jar
 classpath.7=lib/htmlcleaner-2.2.jar
-classpath.8=lib/jackrabbit-webdav-1.4.jar
+classpath.8=lib/jackrabbit-webdav-2.4.3.jar
 classpath.9=lib/jcharset-1.3.jar
 classpath.10=lib/jcifs-1.3.14.jar
 classpath.11=lib/jdom-1.0.jar