From 0007099eb3bb8ddc204ada6c9fc3b1d01763c134 Mon Sep 17 00:00:00 2001
From: betasteward <betasteward@gmail.com>
Date: Tue, 29 Sep 2015 08:13:27 -0400
Subject: [PATCH] disabled SSL - not necessary - nice to have but makes
 debugging more difficult

---
 Mage.Client/src/main/java/mage/client/MageFrame.java            | 2 +-
 Mage.Client/src/main/java/mage/client/dialog/ConnectDialog.java | 2 +-
 .../src/test/java/org/mage/server/test/TestClient.java          | 2 +-
 Mage.Server/config/config.xml                                   | 2 +-
 Mage.Server/release/config/config.xml                           | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/Mage.Client/src/main/java/mage/client/MageFrame.java b/Mage.Client/src/main/java/mage/client/MageFrame.java
index 059af0566e1..dc32f1589da 100644
--- a/Mage.Client/src/main/java/mage/client/MageFrame.java
+++ b/Mage.Client/src/main/java/mage/client/MageFrame.java
@@ -831,7 +831,7 @@ public class MageFrame extends javax.swing.JFrame implements MageClient {
             connection.setUsername(userName);
             connection.setHost(server);
             connection.setPort(port);
-            connection.setSSL(true);
+            connection.setSSL(false);
             connection.setProxyType(proxyType);
             connection.setProxyHost(proxyServer);
             connection.setProxyPort(proxyPort);
diff --git a/Mage.Client/src/main/java/mage/client/dialog/ConnectDialog.java b/Mage.Client/src/main/java/mage/client/dialog/ConnectDialog.java
index 0866497c431..7cea7921e4f 100644
--- a/Mage.Client/src/main/java/mage/client/dialog/ConnectDialog.java
+++ b/Mage.Client/src/main/java/mage/client/dialog/ConnectDialog.java
@@ -327,7 +327,7 @@ public class ConnectDialog extends MageDialog {
             connection = new Connection();
             connection.setHost(this.txtServer.getText().trim());
             connection.setPort(Integer.valueOf(this.txtPort.getText().trim()));
-            connection.setSSL(true);
+            connection.setSSL(false);
             connection.setUsername(this.txtUserName.getText().trim());
             connection.setForceDBComparison(this.chkForceUpdateDB.isSelected());
             MageFrame.getPreferences().put(KEY_CONNECT_FLAG, ((CountryItemEditor)cbFlag.getEditor()).getImageItem());    
diff --git a/Mage.Server.Tests/src/test/java/org/mage/server/test/TestClient.java b/Mage.Server.Tests/src/test/java/org/mage/server/test/TestClient.java
index 81f4aecae66..6d2da42793c 100644
--- a/Mage.Server.Tests/src/test/java/org/mage/server/test/TestClient.java
+++ b/Mage.Server.Tests/src/test/java/org/mage/server/test/TestClient.java
@@ -53,7 +53,7 @@ public class TestClient implements MageClient {
         Connection connection = new Connection();
         connection.setHost("localhost");
         connection.setPort(17171);
-        connection.setSSL(true);
+        connection.setSSL(false);
         connection.setUsername(userName);
         connection.setForceDBComparison(false);
         connection.setUserData(new UserData(UserGroup.PLAYER, 10, false, false, false, new UserSkipPrioritySteps(), "world", false, false, false, false, false, false));
diff --git a/Mage.Server/config/config.xml b/Mage.Server/config/config.xml
index 62722edea44..a8f4e043327 100644
--- a/Mage.Server/config/config.xml
+++ b/Mage.Server/config/config.xml
@@ -22,7 +22,7 @@
             userNamePattern="[^a-z0-9_]"
             maxAiOpponents="15"
             saveGameActivated="false"
-            useSSL="true"
+            useSSL="false"
     />
     <playerTypes>
         <playerType name="Human" jar="mage-player-human.jar" className="mage.player.human.HumanPlayer"/>
diff --git a/Mage.Server/release/config/config.xml b/Mage.Server/release/config/config.xml
index 39b7f8c6456..51140deea3a 100644
--- a/Mage.Server/release/config/config.xml
+++ b/Mage.Server/release/config/config.xml
@@ -10,7 +10,7 @@
             userNamePattern="[^a-z0-9_]"
             maxAiOpponents="15"
             saveGameActivated="false"
-            useSSL="true"
+            useSSL="false"
     />
     <playerTypes>
         <playerType name="Human" jar="mage-player-human-${project.version}.jar" className="mage.player.human.HumanPlayer"/>