Refactoring

xebialabs · Aug 22, 2016 · 5e57970 · 5e57970
1 parent 371716c
commit 5e57970
Show file tree

Hide file tree

Showing 45 changed files with 84 additions and 76 deletions.
diff --git a/libs/smbj-0.0.4-dev.jar b/libs/smbj-0.0.4-dev.jar
diff --git a/src/main/java/com/xebialabs/overthere/cifs/CifsConnectionBuilder.java b/src/main/java/com/xebialabs/overthere/cifs/CifsConnectionBuilder.java
@@ -22,14 +22,12 @@
  */
 package com.xebialabs.overthere.cifs;
 
-import java.util.Collections;
-import java.util.Map;
-
 import com.xebialabs.overthere.ConnectionOptions;
 import com.xebialabs.overthere.OverthereConnection;
 import com.xebialabs.overthere.cifs.telnet.CifsTelnetConnection;
 import com.xebialabs.overthere.cifs.winrm.CifsWinRmConnection;
 import com.xebialabs.overthere.cifs.winrs.CifsWinrsConnection;
+import com.xebialabs.overthere.smb.ConnectionBuilder;
 import com.xebialabs.overthere.spi.AddressPortMapper;
 import com.xebialabs.overthere.spi.OverthereConnectionBuilder;
 import com.xebialabs.overthere.spi.Protocol;

diff --git a/src/main/java/com/xebialabs/overthere/cifs/PathEncoder.java b/src/main/java/com/xebialabs/overthere/cifs/PathEncoder.java
@@ -29,6 +29,7 @@
 import java.util.regex.Pattern;
 
 import com.xebialabs.overthere.RuntimeIOException;
+import com.xebialabs.overthere.smb.PathMapper;
 
 import static com.xebialabs.overthere.cifs.CifsConnectionBuilder.CIFS_PORT_DEFAULT;
 import static java.lang.String.format;

diff --git a/src/main/java/com/xebialabs/overthere/cifs/telnet/CifsTelnetConnection.java b/src/main/java/com/xebialabs/overthere/cifs/telnet/CifsTelnetConnection.java
@@ -24,7 +24,8 @@
 
 import com.xebialabs.overthere.*;
 import com.xebialabs.overthere.cifs.CifsConnection;
-import com.xebialabs.overthere.cifs.ConnectionValidator;
+import com.xebialabs.overthere.smb.ConnectionValidator;
+import com.xebialabs.overthere.smb.telnet.TelnetConnection;
 import com.xebialabs.overthere.spi.AddressPortMapper;
 
 import static com.xebialabs.overthere.cifs.CifsConnectionBuilder.CIFS_PROTOCOL;

diff --git a/src/main/java/com/xebialabs/overthere/cifs/winrm/CifsWinRmConnection.java b/src/main/java/com/xebialabs/overthere/cifs/winrm/CifsWinRmConnection.java
@@ -27,7 +27,8 @@
 import com.xebialabs.overthere.Overthere;
 import com.xebialabs.overthere.OverthereProcess;
 import com.xebialabs.overthere.cifs.CifsConnection;
-import com.xebialabs.overthere.cifs.ConnectionValidator;
+import com.xebialabs.overthere.smb.ConnectionValidator;
+import com.xebialabs.overthere.smb.winrm.WinRmConnection;
 import com.xebialabs.overthere.spi.AddressPortMapper;
 
 import static com.xebialabs.overthere.cifs.CifsConnectionBuilder.CIFS_PROTOCOL;

diff --git a/src/main/java/com/xebialabs/overthere/cifs/winrs/CifsWinrsConnection.java b/src/main/java/com/xebialabs/overthere/cifs/winrs/CifsWinrsConnection.java
@@ -24,7 +24,8 @@
 
 import com.xebialabs.overthere.*;
 import com.xebialabs.overthere.cifs.CifsConnection;
-import com.xebialabs.overthere.cifs.ConnectionValidator;
+import com.xebialabs.overthere.smb.ConnectionValidator;
+import com.xebialabs.overthere.smb.winrs.WinrsConnection;
 import com.xebialabs.overthere.spi.AddressPortMapper;
 
 import static com.xebialabs.overthere.OperatingSystemFamily.WINDOWS;

diff --git a/...abs/overthere/cifs/ConnectionBuilder.java → ...labs/overthere/smb/ConnectionBuilder.java b/...abs/overthere/cifs/ConnectionBuilder.java → ...labs/overthere/smb/ConnectionBuilder.java
@@ -20,13 +20,11 @@
  * program; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth
  * Floor, Boston, MA 02110-1301  USA
  */
-package com.xebialabs.overthere.cifs;
+package com.xebialabs.overthere.smb;
 
 import java.util.Collections;
 import java.util.Map;
 
-import static com.xebialabs.overthere.cifs.WinrmHttpsCertificateTrustStrategy.STRICT;
-import static com.xebialabs.overthere.cifs.WinrmHttpsHostnameVerificationStrategy.BROWSER_COMPATIBLE;
 import static com.xebialabs.overthere.local.LocalConnection.LOCAL_PROTOCOL;
 
 public abstract class ConnectionBuilder {
@@ -89,7 +87,7 @@ public abstract class ConnectionBuilder {
     /**
      * See <a href="https://github.com/xebialabs/overthere/blob/master/README.md#cifs_winrmHttpsCertificateTrustStrategy">the online documentation</a>
      */
-    public static final WinrmHttpsCertificateTrustStrategy WINRM_HTTPS_CERTIFICATE_TRUST_STRATEGY_DEFAULT = STRICT;
+    public static final WinrmHttpsCertificateTrustStrategy WINRM_HTTPS_CERTIFICATE_TRUST_STRATEGY_DEFAULT = WinrmHttpsCertificateTrustStrategy.STRICT;
 
     /**
      * See <a href="https://github.com/xebialabs/overthere/blob/master/README.md#cifs_winrmHttpsHostnameVerificationStrategy">the online documentation</a>
@@ -99,7 +97,7 @@ public abstract class ConnectionBuilder {
     /**
      * See <a href="https://github.com/xebialabs/overthere/blob/master/README.md#cifs_winrmHttpsHostnameVerificationStrategy">the online documentation</a>
      */
-    public static final WinrmHttpsHostnameVerificationStrategy WINRM_HTTPS_HOSTNAME_VERIFICATION_STRATEGY_DEFAULT = BROWSER_COMPATIBLE;
+    public static final WinrmHttpsHostnameVerificationStrategy WINRM_HTTPS_HOSTNAME_VERIFICATION_STRATEGY_DEFAULT = WinrmHttpsHostnameVerificationStrategy.BROWSER_COMPATIBLE;
 
     /**
      * See <a href="https://github.com/xebialabs/overthere/blob/master/README.md#cifs_winrmKerberosDebug">the online documentation</a>

diff --git a/...s/overthere/cifs/ConnectionValidator.java → ...bs/overthere/smb/ConnectionValidator.java b/...s/overthere/cifs/ConnectionValidator.java → ...bs/overthere/smb/ConnectionValidator.java
@@ -20,9 +20,10 @@
  * program; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth
  * Floor, Boston, MA 02110-1301  USA
  */
-package com.xebialabs.overthere.cifs;
+package com.xebialabs.overthere.smb;
 
 import com.xebialabs.overthere.OperatingSystemFamily;
+import com.xebialabs.overthere.cifs.CifsConnectionType;
 import com.xebialabs.overthere.spi.AddressPortMapper;
 import com.xebialabs.overthere.util.DefaultAddressPortMapper;
 

diff --git a/.../xebialabs/overthere/cifs/PathMapper.java → ...m/xebialabs/overthere/smb/PathMapper.java b/.../xebialabs/overthere/cifs/PathMapper.java → ...m/xebialabs/overthere/smb/PathMapper.java
@@ -20,7 +20,7 @@
  * program; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth
  * Floor, Boston, MA 02110-1301  USA
  */
-package com.xebialabs.overthere.cifs;
+package com.xebialabs.overthere.smb;
 
 import java.util.*;
 import java.util.Map.Entry;

diff --git a/...s/WinrmHttpsCertificateTrustStrategy.java → ...b/WinrmHttpsCertificateTrustStrategy.java b/...s/WinrmHttpsCertificateTrustStrategy.java → ...b/WinrmHttpsCertificateTrustStrategy.java
@@ -20,7 +20,7 @@
  * program; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth
  * Floor, Boston, MA 02110-1301  USA
  */
-package com.xebialabs.overthere.cifs;
+package com.xebialabs.overthere.smb;
 
 import java.security.cert.CertificateException;
 import java.security.cert.X509Certificate;

diff --git a/...nrmHttpsHostnameVerificationStrategy.java → ...nrmHttpsHostnameVerificationStrategy.java b/...nrmHttpsHostnameVerificationStrategy.java → ...nrmHttpsHostnameVerificationStrategy.java
@@ -20,7 +20,7 @@
  * program; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth
  * Floor, Boston, MA 02110-1301  USA
  */
-package com.xebialabs.overthere.cifs;
+package com.xebialabs.overthere.smb;
 
 import org.apache.http.conn.ssl.DefaultHostnameVerifier;
 import org.apache.http.conn.ssl.NoopHostnameVerifier;

diff --git a/...erthere/cifs/telnet/TelnetConnection.java → ...verthere/smb/telnet/TelnetConnection.java b/...erthere/cifs/telnet/TelnetConnection.java → ...verthere/smb/telnet/TelnetConnection.java
@@ -20,7 +20,7 @@
  * program; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth
  * Floor, Boston, MA 02110-1301  USA
  */
-package com.xebialabs.overthere.cifs.telnet;
+package com.xebialabs.overthere.smb.telnet;
 
 import com.xebialabs.overthere.*;
 import com.xebialabs.overthere.cifs.CifsConnectionType;

diff --git a/...labs/overthere/cifs/winrm/JavaVendor.java → ...alabs/overthere/smb/winrm/JavaVendor.java b/...labs/overthere/cifs/winrm/JavaVendor.java → ...alabs/overthere/smb/winrm/JavaVendor.java
@@ -20,7 +20,7 @@
  * program; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth
  * Floor, Boston, MA 02110-1301  USA
  */
-package com.xebialabs.overthere.cifs.winrm;
+package com.xebialabs.overthere.smb.winrm;
 
 import java.util.HashMap;
 import javax.security.auth.login.AppConfigurationEntry;

diff --git a/...cifs/winrm/KerberosJaasConfiguration.java → .../smb/winrm/KerberosJaasConfiguration.java b/...cifs/winrm/KerberosJaasConfiguration.java → .../smb/winrm/KerberosJaasConfiguration.java
@@ -20,7 +20,7 @@
  * program; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth
  * Floor, Boston, MA 02110-1301  USA
  */
-package com.xebialabs.overthere.cifs.winrm;
+package com.xebialabs.overthere.smb.winrm;
 
 import java.util.HashMap;
 import javax.security.auth.login.AppConfigurationEntry;

diff --git a/...labs/overthere/cifs/winrm/Namespaces.java → ...alabs/overthere/smb/winrm/Namespaces.java b/...labs/overthere/cifs/winrm/Namespaces.java → ...alabs/overthere/smb/winrm/Namespaces.java
@@ -20,7 +20,7 @@
  * program; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth
  * Floor, Boston, MA 02110-1301  USA
  */
-package com.xebialabs.overthere.cifs.winrm;
+package com.xebialabs.overthere.smb.winrm;
 
 import org.dom4j.Namespace;
 

diff --git a/...here/cifs/winrm/ProvidedAuthCallback.java → ...there/smb/winrm/ProvidedAuthCallback.java b/...here/cifs/winrm/ProvidedAuthCallback.java → ...there/smb/winrm/ProvidedAuthCallback.java
@@ -20,7 +20,7 @@
  * program; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth
  * Floor, Boston, MA 02110-1301  USA
  */
-package com.xebialabs.overthere.cifs.winrm;
+package com.xebialabs.overthere.smb.winrm;
 
 import java.io.IOException;
 import javax.security.auth.callback.Callback;

diff --git a/...erthere/cifs/winrm/ResponseExtractor.java → ...verthere/smb/winrm/ResponseExtractor.java b/...erthere/cifs/winrm/ResponseExtractor.java → ...verthere/smb/winrm/ResponseExtractor.java
@@ -20,7 +20,7 @@
  * program; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth
  * Floor, Boston, MA 02110-1301  USA
  */
-package com.xebialabs.overthere.cifs.winrm;
+package com.xebialabs.overthere.smb.winrm;
 
 import org.dom4j.DocumentHelper;
 import org.dom4j.Namespace;

diff --git a/...abs/overthere/cifs/winrm/WinRmClient.java → ...labs/overthere/smb/winrm/WinRmClient.java b/...abs/overthere/cifs/winrm/WinRmClient.java → ...labs/overthere/smb/winrm/WinRmClient.java
@@ -20,11 +20,11 @@
  * program; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth
  * Floor, Boston, MA 02110-1301  USA
  */
-package com.xebialabs.overthere.cifs.winrm;
+package com.xebialabs.overthere.smb.winrm;
 
-import com.xebialabs.overthere.cifs.WinrmHttpsCertificateTrustStrategy;
-import com.xebialabs.overthere.cifs.WinrmHttpsHostnameVerificationStrategy;
-import com.xebialabs.overthere.cifs.winrm.soap.*;
+import com.xebialabs.overthere.smb.WinrmHttpsCertificateTrustStrategy;
+import com.xebialabs.overthere.smb.WinrmHttpsHostnameVerificationStrategy;
+import com.xebialabs.overthere.smb.winrm.soap.*;
 import org.apache.commons.codec.binary.Base64;
 import org.apache.http.Header;
 import org.apache.http.HttpEntity;

diff --git a/...overthere/cifs/winrm/WinRmConnection.java → .../overthere/smb/winrm/WinRmConnection.java b/...overthere/cifs/winrm/WinRmConnection.java → .../overthere/smb/winrm/WinRmConnection.java
@@ -20,12 +20,13 @@
  * program; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth
  * Floor, Boston, MA 02110-1301  USA
  */
-package com.xebialabs.overthere.cifs.winrm;
+package com.xebialabs.overthere.smb.winrm;
 
 import com.xebialabs.overthere.*;
 import com.xebialabs.overthere.cifs.CifsConnectionType;
-import com.xebialabs.overthere.cifs.WinrmHttpsCertificateTrustStrategy;
-import com.xebialabs.overthere.cifs.WinrmHttpsHostnameVerificationStrategy;
+import com.xebialabs.overthere.cifs.winrm.CifsWinRmConnection;
+import com.xebialabs.overthere.smb.WinrmHttpsCertificateTrustStrategy;
+import com.xebialabs.overthere.smb.WinrmHttpsHostnameVerificationStrategy;
 import com.xebialabs.overthere.spi.AddressPortMapper;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

diff --git a/...e/cifs/winrm/WinRmRuntimeIOException.java → ...re/smb/winrm/WinRmRuntimeIOException.java b/...e/cifs/winrm/WinRmRuntimeIOException.java → ...re/smb/winrm/WinRmRuntimeIOException.java
@@ -20,7 +20,7 @@
  * program; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth
  * Floor, Boston, MA 02110-1301  USA
  */
-package com.xebialabs.overthere.cifs.winrm;
+package com.xebialabs.overthere.smb.winrm;
 
 import java.io.IOException;
 import java.io.StringWriter;

diff --git a/...there/cifs/winrm/WsmanKerberosScheme.java → ...rthere/smb/winrm/WsmanKerberosScheme.java b/...there/cifs/winrm/WsmanKerberosScheme.java → ...rthere/smb/winrm/WsmanKerberosScheme.java
@@ -20,7 +20,7 @@
  * program; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth
  * Floor, Boston, MA 02110-1301  USA
  */
-package com.xebialabs.overthere.cifs.winrm;
+package com.xebialabs.overthere.smb.winrm;
 
 import org.apache.http.auth.Credentials;
 import org.apache.http.auth.KerberosCredentials;

diff --git a/...ifs/winrm/WsmanKerberosSchemeFactory.java → ...smb/winrm/WsmanKerberosSchemeFactory.java b/...ifs/winrm/WsmanKerberosSchemeFactory.java → ...smb/winrm/WsmanKerberosSchemeFactory.java
@@ -20,7 +20,7 @@
  * program; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth
  * Floor, Boston, MA 02110-1301  USA
  */
-package com.xebialabs.overthere.cifs.winrm;
+package com.xebialabs.overthere.smb.winrm;
 
 import org.apache.http.auth.AuthScheme;
 import org.apache.http.impl.auth.KerberosSchemeFactory;

diff --git a/...erthere/cifs/winrm/WsmanSPNegoScheme.java → ...verthere/smb/winrm/WsmanSPNegoScheme.java b/...erthere/cifs/winrm/WsmanSPNegoScheme.java → ...verthere/smb/winrm/WsmanSPNegoScheme.java
@@ -20,7 +20,7 @@
  * program; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth
  * Floor, Boston, MA 02110-1301  USA
  */
-package com.xebialabs.overthere.cifs.winrm;
+package com.xebialabs.overthere.smb.winrm;
 
 import org.apache.http.auth.Credentials;
 import org.apache.http.auth.KerberosCredentials;

diff --git a/.../cifs/winrm/WsmanSPNegoSchemeFactory.java → ...e/smb/winrm/WsmanSPNegoSchemeFactory.java b/.../cifs/winrm/WsmanSPNegoSchemeFactory.java → ...e/smb/winrm/WsmanSPNegoSchemeFactory.java
@@ -20,7 +20,7 @@
  * program; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth
  * Floor, Boston, MA 02110-1301  USA
  */
-package com.xebialabs.overthere.cifs.winrm;
+package com.xebialabs.overthere.smb.winrm;
 
 import org.apache.http.auth.AuthScheme;
 import org.apache.http.impl.auth.SPNegoSchemeFactory;

diff --git a/...abs/overthere/cifs/winrm/soap/Action.java → ...labs/overthere/smb/winrm/soap/Action.java b/...abs/overthere/cifs/winrm/soap/Action.java → ...labs/overthere/smb/winrm/soap/Action.java
@@ -20,7 +20,7 @@
  * program; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth
  * Floor, Boston, MA 02110-1301  USA
  */
-package com.xebialabs.overthere.cifs.winrm.soap;
+package com.xebialabs.overthere.smb.winrm.soap;
 
 import java.net.URI;
 

diff --git a/...verthere/cifs/winrm/soap/BodyBuilder.java → ...overthere/smb/winrm/soap/BodyBuilder.java b/...verthere/cifs/winrm/soap/BodyBuilder.java → ...overthere/smb/winrm/soap/BodyBuilder.java
@@ -20,7 +20,7 @@
  * program; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth
  * Floor, Boston, MA 02110-1301  USA
  */
-package com.xebialabs.overthere.cifs.winrm.soap;
+package com.xebialabs.overthere.smb.winrm.soap;
 
 import org.dom4j.Element;
 

diff --git a/...rthere/cifs/winrm/soap/HeaderBuilder.java → ...erthere/smb/winrm/soap/HeaderBuilder.java b/...rthere/cifs/winrm/soap/HeaderBuilder.java → ...erthere/smb/winrm/soap/HeaderBuilder.java
@@ -20,18 +20,16 @@
  * program; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth
  * Floor, Boston, MA 02110-1301  USA
  */
-package com.xebialabs.overthere.cifs.winrm.soap;
+package com.xebialabs.overthere.smb.winrm.soap;
 
 import java.net.URI;
 import java.util.List;
 import org.dom4j.Element;
 import org.dom4j.QName;
 
-import static com.xebialabs.overthere.cifs.winrm.Namespaces.NS_ADDRESSING;
-import static com.xebialabs.overthere.cifs.winrm.Namespaces.NS_WSMAN_DMTF;
-import static com.xebialabs.overthere.cifs.winrm.Namespaces.NS_WSMAN_MSFT;
-import static com.xebialabs.overthere.cifs.winrm.soap.Soapy.mustUnderstand;
-import static com.xebialabs.overthere.cifs.winrm.soap.Soapy.needNotUnderstand;
+import static com.xebialabs.overthere.smb.winrm.Namespaces.NS_ADDRESSING;
+import static com.xebialabs.overthere.smb.winrm.Namespaces.NS_WSMAN_DMTF;
+import static com.xebialabs.overthere.smb.winrm.Namespaces.NS_WSMAN_MSFT;
 
 public class HeaderBuilder {
     private Element header;
@@ -47,12 +45,12 @@ public HeaderBuilder to(URI address) {
 
     public HeaderBuilder replyTo(URI address) {
         final Element replyTo = header.addElement(QName.get("ReplyTo", NS_ADDRESSING));
-        mustUnderstand(replyTo.addElement(QName.get("Address", NS_ADDRESSING))).addText(address.toString());
+        Soapy.mustUnderstand(replyTo.addElement(QName.get("Address", NS_ADDRESSING))).addText(address.toString());
         return this;
     }
 
     public HeaderBuilder maxEnvelopeSize(int size) {
-        mustUnderstand(header.addElement(QName.get("MaxEnvelopeSize", NS_WSMAN_DMTF))).addText("" + size);
+        Soapy.mustUnderstand(header.addElement(QName.get("MaxEnvelopeSize", NS_WSMAN_DMTF))).addText("" + size);
         return this;
     }
 
@@ -62,8 +60,8 @@ public HeaderBuilder withId(String id) {
     }
 
     public HeaderBuilder withLocale(String locale) {
-        needNotUnderstand(header.addElement(QName.get("Locale", NS_WSMAN_DMTF))).addAttribute("xml:lang", locale);
-        needNotUnderstand(header.addElement(QName.get("DataLocale", NS_WSMAN_MSFT))).addAttribute("xml:lang", locale);
+        Soapy.needNotUnderstand(header.addElement(QName.get("Locale", NS_WSMAN_DMTF))).addAttribute("xml:lang", locale);
+        Soapy.needNotUnderstand(header.addElement(QName.get("DataLocale", NS_WSMAN_MSFT))).addAttribute("xml:lang", locale);
         return this;
     }
 
@@ -73,7 +71,7 @@ public HeaderBuilder withTimeout(String timeout) {
     }
 
     public HeaderBuilder withAction(URI uri) {
-        mustUnderstand(header.addElement(QName.get("Action", NS_ADDRESSING))).addText(uri.toString());
+        Soapy.mustUnderstand(header.addElement(QName.get("Action", NS_ADDRESSING))).addText(uri.toString());
         return this;
     }
 
@@ -85,7 +83,7 @@ public HeaderBuilder withShellId(String shellId) {
     }
 
     public HeaderBuilder withResourceURI(URI uri) {
-        mustUnderstand(header.addElement(QName.get("ResourceURI", NS_WSMAN_DMTF))).addText(uri.toString());
+        Soapy.mustUnderstand(header.addElement(QName.get("ResourceURI", NS_WSMAN_DMTF))).addText(uri.toString());
         return this;
     }
 

diff --git a/...erthere/cifs/winrm/soap/KeyValuePair.java → ...verthere/smb/winrm/soap/KeyValuePair.java b/...erthere/cifs/winrm/soap/KeyValuePair.java → ...verthere/smb/winrm/soap/KeyValuePair.java
@@ -20,7 +20,7 @@
  * program; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth
  * Floor, Boston, MA 02110-1301  USA
  */
-package com.xebialabs.overthere.cifs.winrm.soap;
+package com.xebialabs.overthere.smb.winrm.soap;
 
 public class KeyValuePair {
 

diff --git a/.../overthere/cifs/winrm/soap/OptionSet.java → ...s/overthere/smb/winrm/soap/OptionSet.java b/.../overthere/cifs/winrm/soap/OptionSet.java → ...s/overthere/smb/winrm/soap/OptionSet.java
@@ -20,7 +20,7 @@
  * program; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth
  * Floor, Boston, MA 02110-1301  USA
  */
-package com.xebialabs.overthere.cifs.winrm.soap;
+package com.xebialabs.overthere.smb.winrm.soap;
 
 import java.util.ArrayList;
 import java.util.List;

diff --git a/...verthere/cifs/winrm/soap/ResourceURI.java → ...overthere/smb/winrm/soap/ResourceURI.java b/...verthere/cifs/winrm/soap/ResourceURI.java → ...overthere/smb/winrm/soap/ResourceURI.java
@@ -20,7 +20,7 @@
  * program; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth
  * Floor, Boston, MA 02110-1301  USA
  */
-package com.xebialabs.overthere.cifs.winrm.soap;
+package com.xebialabs.overthere.smb.winrm.soap;
 
 import java.net.URI;
 import java.net.URISyntaxException;

diff --git a/...overthere/cifs/winrm/soap/SoapAction.java → .../overthere/smb/winrm/soap/SoapAction.java b/...overthere/cifs/winrm/soap/SoapAction.java → .../overthere/smb/winrm/soap/SoapAction.java
@@ -20,7 +20,7 @@
  * program; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth
  * Floor, Boston, MA 02110-1301  USA
  */
-package com.xebialabs.overthere.cifs.winrm.soap;
+package com.xebialabs.overthere.smb.winrm.soap;
 
 public enum SoapAction {
 

diff --git a/...e/cifs/winrm/soap/SoapMessageBuilder.java → ...re/smb/winrm/soap/SoapMessageBuilder.java b/...e/cifs/winrm/soap/SoapMessageBuilder.java → ...re/smb/winrm/soap/SoapMessageBuilder.java
@@ -20,14 +20,14 @@
  * program; if not, write to the Free Software Foundation, Inc., 51 Franklin St, Fifth
  * Floor, Boston, MA 02110-1301  USA
  */
-package com.xebialabs.overthere.cifs.winrm.soap;
+package com.xebialabs.overthere.smb.winrm.soap;
 
 import org.dom4j.Document;
 import org.dom4j.DocumentHelper;
 import org.dom4j.Element;
 import org.dom4j.QName;
 
-import static com.xebialabs.overthere.cifs.winrm.Namespaces.NS_SOAP_ENV;
+import static com.xebialabs.overthere.smb.winrm.Namespaces.NS_SOAP_ENV;
 
 public class SoapMessageBuilder {