NTLM: remove CIFS dependency

git-svn-id: https://svn.code.sf.net/p/davmail/code/trunk@3572 3d1905a2-6b24-0410-a738-b14d5a86fcbd
mguessan · May 28, 2024 · 659e70e · 659e70e
1 parent ae9b444
commit 659e70e
Show file tree

Hide file tree

Showing 15 changed files with 38 additions and 161 deletions.
diff --git a/davmail-setup.nsi b/davmail-setup.nsi
@@ -109,7 +109,6 @@ Section "MainSection" SEC01
   File "dist\lib\htmlcleaner-2.29.jar"
   File "dist\lib\jackrabbit-webdav-2.20.15.jar"
   File "dist\lib\jcharset-2.0.jar"
-  File "dist\lib\jcifs-1.3.19.jar"
   File "dist\lib\jdom-1.0.jar"
   File "dist\lib\jettison-1.5.4.jar"
   File "dist\lib\log4j-1.2.17.jar"
@@ -181,7 +180,6 @@ no_quest:
   Delete "$INSTDIR\lib\htmlcleaner-2.29.jar"
   Delete "$INSTDIR\lib\jackrabbit-webdav-2.20.15.jar"
   Delete "$INSTDIR\lib\jcharset-2.0.jar"
-  Delete "$INSTDIR\lib\jcifs-1.3.19.jar"
   Delete "$INSTDIR\lib\jdom-1.0.jar"
   Delete "$INSTDIR\lib\jettison-1.5.4.jar"
   Delete "$INSTDIR\lib\log4j-1.2.17.jar"

diff --git a/davmail-setup64.nsi b/davmail-setup64.nsi
@@ -106,7 +106,6 @@ Section "MainSection" SEC01
   File "dist\lib\htmlcleaner-2.29.jar"
   File "dist\lib\jackrabbit-webdav-2.20.15.jar"
   File "dist\lib\jcharset-2.0.jar"
-  File "dist\lib\jcifs-1.3.19.jar"
   File "dist\lib\jdom-1.0.jar"
   File "dist\lib\jettison-1.5.4.jar"
   File "dist\lib\log4j-1.2.17.jar"
@@ -178,7 +177,6 @@ no_quest:
   Delete "$INSTDIR\lib\htmlcleaner-2.29.jar"
   Delete "$INSTDIR\lib\jackrabbit-webdav-2.20.15.jar"
   Delete "$INSTDIR\lib\jcharset-2.0.jar"
-  Delete "$INSTDIR\lib\jcifs-1.3.19.jar"
   Delete "$INSTDIR\lib\jdom-1.0.jar"
   Delete "$INSTDIR\lib\jettison-1.5.4.jar"
   Delete "$INSTDIR\lib\log4j-1.2.17.jar"

diff --git a/lib/jcifs-1.3.19.jar b/lib/jcifs-1.3.19.jar
diff --git a/pom.xml b/pom.xml
@@ -265,13 +265,6 @@
             <artifactId>woodstox-core</artifactId>
             <version>6.4.0</version>
         </dependency>
-        <dependency>
-            <groupId>org.samba.jcifs</groupId>
-            <artifactId>jcifs</artifactId>
-            <version>1.3.19</version>
-            <scope>system</scope>
-            <systemPath>${project.basedir}/lib/jcifs-1.3.19.jar</systemPath>
-        </dependency>
         <dependency>
             <groupId>net.freeutils</groupId>
             <artifactId>jcharset</artifactId>

diff --git a/src/java/davmail/http/JCIFSEngine.java b/src/java/davmail/http/JCIFSEngine.java
diff --git a/src/java/davmail/http/JCIFSNTLMSchemeFactory.java b/src/java/davmail/http/JCIFSNTLMSchemeFactory.java
diff --git a/src/winrun4j/davmail.exe b/src/winrun4j/davmail.exe
diff --git a/src/winrun4j/davmail.ini b/src/winrun4j/davmail.ini
@@ -14,16 +14,15 @@ classpath.8=lib/httpcore-4.4.16.jar
 classpath.9=lib/jackrabbit-webdav-2.20.15.jar
 classpath.10=lib/javax.mail-1.5.6.jar
 classpath.11=lib/jcharset-2.0.jar
-classpath.12=lib/jcifs-1.3.19.jar
-classpath.13=lib/jdom-1.0.jar
-classpath.14=lib/jettison-1.5.4.jar
-classpath.15=lib/log4j-1.2.17.jar
-classpath.16=lib/slf4j-api-1.7.25.jar
-classpath.17=lib/slf4j-log4j12-1.7.25.jar
-classpath.18=lib/stax-api-1.0.1.jar
-classpath.19=lib/stax2-api-3.1.1.jar
-classpath.20=lib/winrun4j-0.4.5.jar
-classpath.21=lib/woodstox-core-6.4.0.jar
+classpath.12=lib/jdom-1.0.jar
+classpath.13=lib/jettison-1.5.4.jar
+classpath.14=lib/log4j-1.2.17.jar
+classpath.15=lib/slf4j-api-1.7.25.jar
+classpath.16=lib/slf4j-log4j12-1.7.25.jar
+classpath.17=lib/stax-api-1.0.1.jar
+classpath.18=lib/stax2-api-3.1.1.jar
+classpath.19=lib/winrun4j-0.4.5.jar
+classpath.20=lib/woodstox-core-6.4.0.jar
 
 vm.version.min=1.8
 vmarg.1=-Dsun.net.inetaddr.ttl=60

diff --git a/src/winrun4j/davmail64.exe b/src/winrun4j/davmail64.exe
diff --git a/src/winrun4j/davmail64.ini b/src/winrun4j/davmail64.ini
@@ -14,16 +14,15 @@ classpath.8=lib/httpcore-4.4.16.jar
 classpath.9=lib/jackrabbit-webdav-2.20.15.jar
 classpath.10=lib/javax.mail-1.5.6.jar
 classpath.11=lib/jcharset-2.0.jar
-classpath.12=lib/jcifs-1.3.19.jar
-classpath.13=lib/jdom-1.0.jar
-classpath.14=lib/jettison-1.5.4.jar
-classpath.15=lib/log4j-1.2.17.jar
-classpath.16=lib/slf4j-api-1.7.25.jar
-classpath.17=lib/slf4j-log4j12-1.7.25.jar
-classpath.18=lib/stax-api-1.0.1.jar
-classpath.19=lib/stax2-api-3.1.1.jar
-classpath.20=lib/winrun4j-0.4.5.jar
-classpath.21=lib/woodstox-core-6.4.0.jar
+classpath.12=lib/jdom-1.0.jar
+classpath.13=lib/jettison-1.5.4.jar
+classpath.14=lib/log4j-1.2.17.jar
+classpath.15=lib/slf4j-api-1.7.25.jar
+classpath.16=lib/slf4j-log4j12-1.7.25.jar
+classpath.17=lib/stax-api-1.0.1.jar
+classpath.18=lib/stax2-api-3.1.1.jar
+classpath.19=lib/winrun4j-0.4.5.jar
+classpath.20=lib/woodstox-core-6.4.0.jar
 
 vm.version.min=1.8
 vmarg.1=-Dsun.net.inetaddr.ttl=60

diff --git a/src/winrun4j/davmailconsole.exe b/src/winrun4j/davmailconsole.exe
diff --git a/src/winrun4j/davmailservice.exe b/src/winrun4j/davmailservice.exe
diff --git a/src/winrun4j/davmailservice.ini b/src/winrun4j/davmailservice.ini
@@ -8,6 +8,7 @@ service.id=DavMail
 service.name=DavMail Gateway
 service.description=DavMail POP/IMAP/SMTP/Caldav/Carddav/LDAP Exchange Gateway
 
+main.class=davmail.DavGateway
 classpath.1=davmail.jar
 classpath.2=lib/activation-1.1.1.jar
 classpath.3=lib/commons-codec-1.15.jar
@@ -19,16 +20,15 @@ classpath.8=lib/httpcore-4.4.16.jar
 classpath.9=lib/jackrabbit-webdav-2.20.15.jar
 classpath.10=lib/javax.mail-1.5.6.jar
 classpath.11=lib/jcharset-2.0.jar
-classpath.12=lib/jcifs-1.3.19.jar
-classpath.13=lib/jdom-1.0.jar
-classpath.14=lib/jettison-1.5.4.jar
-classpath.15=lib/log4j-1.2.17.jar
-classpath.16=lib/slf4j-api-1.7.25.jar
-classpath.17=lib/slf4j-log4j12-1.7.25.jar
-classpath.18=lib/stax-api-1.0.1.jar
-classpath.19=lib/stax2-api-3.1.1.jar
-classpath.20=lib/winrun4j-0.4.5.jar
-classpath.21=lib/woodstox-core-6.4.0.jar
+classpath.12=lib/jdom-1.0.jar
+classpath.13=lib/jettison-1.5.4.jar
+classpath.14=lib/log4j-1.2.17.jar
+classpath.15=lib/slf4j-api-1.7.25.jar
+classpath.16=lib/slf4j-log4j12-1.7.25.jar
+classpath.17=lib/stax-api-1.0.1.jar
+classpath.18=lib/stax2-api-3.1.1.jar
+classpath.19=lib/winrun4j-0.4.5.jar
+classpath.20=lib/woodstox-core-6.4.0.jar
 
 vm.version.min=1.8
 vmarg.1=-Dsun.net.inetaddr.ttl=60

diff --git a/src/winrun4j/davmailservice64.exe b/src/winrun4j/davmailservice64.exe
diff --git a/src/winrun4j/davmailservice64.ini b/src/winrun4j/davmailservice64.ini
@@ -8,6 +8,7 @@ service.id=DavMail
 service.name=DavMail Gateway
 service.description=DavMail POP/IMAP/SMTP/Caldav/Carddav/LDAP Exchange Gateway
 
+main.class=davmail.DavGateway
 classpath.1=davmail.jar
 classpath.2=lib/activation-1.1.1.jar
 classpath.3=lib/commons-codec-1.15.jar
@@ -19,16 +20,15 @@ classpath.8=lib/httpcore-4.4.16.jar
 classpath.9=lib/jackrabbit-webdav-2.20.15.jar
 classpath.10=lib/javax.mail-1.5.6.jar
 classpath.11=lib/jcharset-2.0.jar
-classpath.12=lib/jcifs-1.3.19.jar
-classpath.13=lib/jdom-1.0.jar
-classpath.14=lib/jettison-1.5.4.jar
-classpath.15=lib/log4j-1.2.17.jar
-classpath.16=lib/slf4j-api-1.7.25.jar
-classpath.17=lib/slf4j-log4j12-1.7.25.jar
-classpath.18=lib/stax-api-1.0.1.jar
-classpath.19=lib/stax2-api-3.1.1.jar
-classpath.20=lib/winrun4j-0.4.5.jar
-classpath.21=lib/woodstox-core-6.4.0.jar
+classpath.12=lib/jdom-1.0.jar
+classpath.13=lib/jettison-1.5.4.jar
+classpath.14=lib/log4j-1.2.17.jar
+classpath.15=lib/slf4j-api-1.7.25.jar
+classpath.16=lib/slf4j-log4j12-1.7.25.jar
+classpath.17=lib/stax-api-1.0.1.jar
+classpath.18=lib/stax2-api-3.1.1.jar
+classpath.19=lib/winrun4j-0.4.5.jar
+classpath.20=lib/woodstox-core-6.4.0.jar
 
 vm.version.min=1.8
 vmarg.1=-Dsun.net.inetaddr.ttl=60