diff --git a/Mage.Client/pom.xml b/Mage.Client/pom.xml index 2303bdd913..d09e4245df 100644 --- a/Mage.Client/pom.xml +++ b/Mage.Client/pom.xml @@ -6,7 +6,7 @@ org.mage mage-root - 0.8.1 + 0.8.2 org.mage @@ -181,11 +181,11 @@ - 0.8.1.0 + 0.8.2.0 MAGE Client Mage Client (C) Mage Development Team - 0.8.1.0 + 0.8.2.0 MAGE Client MAGE Mage-Client diff --git a/Mage.Client/src/main/java/mage/client/MageFrame.java b/Mage.Client/src/main/java/mage/client/MageFrame.java index 34dc60d354..8e8636a36e 100644 --- a/Mage.Client/src/main/java/mage/client/MageFrame.java +++ b/Mage.Client/src/main/java/mage/client/MageFrame.java @@ -104,7 +104,7 @@ public class MageFrame extends javax.swing.JFrame implements MageClient { private static Preferences prefs = Preferences.userNodeForPackage(MageFrame.class); private JLabel title; private Rectangle titleRectangle; - private final static MageVersion version = new MageVersion(0, 8, 1, ""); + private final static MageVersion version = new MageVersion(0, 8, 2, ""); private UUID clientId; private static MagePane activeFrame; private static boolean liteMode = false; diff --git a/Mage.Common/pom.xml b/Mage.Common/pom.xml index 2245f2197a..b54b291129 100644 --- a/Mage.Common/pom.xml +++ b/Mage.Common/pom.xml @@ -7,7 +7,7 @@ org.mage mage-root - 0.8.1 + 0.8.2 mage-common diff --git a/Mage.Plugins/Mage.Counter.Plugin/pom.xml b/Mage.Plugins/Mage.Counter.Plugin/pom.xml index 3e157b55ec..6fab005ed1 100644 --- a/Mage.Plugins/Mage.Counter.Plugin/pom.xml +++ b/Mage.Plugins/Mage.Counter.Plugin/pom.xml @@ -7,7 +7,7 @@ org.mage mage-plugins - 0.8.1 + 0.8.2 mage-counter-plugin diff --git a/Mage.Plugins/Mage.Rating.Plugin/pom.xml b/Mage.Plugins/Mage.Rating.Plugin/pom.xml index 1b2fb19976..0f0ff3e858 100644 --- a/Mage.Plugins/Mage.Rating.Plugin/pom.xml +++ b/Mage.Plugins/Mage.Rating.Plugin/pom.xml @@ -6,7 +6,7 @@ org.mage mage-plugins - 0.8.1 + 0.8.2 org.mage diff --git a/Mage.Plugins/Mage.Theme.Plugin/pom.xml b/Mage.Plugins/Mage.Theme.Plugin/pom.xml index 4fb1898109..670d87db9f 100644 --- a/Mage.Plugins/Mage.Theme.Plugin/pom.xml +++ b/Mage.Plugins/Mage.Theme.Plugin/pom.xml @@ -6,7 +6,7 @@ org.mage mage-plugins - 0.8.1 + 0.8.2 mage-theme-plugin diff --git a/Mage.Plugins/pom.xml b/Mage.Plugins/pom.xml index 715193c5f9..fb8615e7a0 100644 --- a/Mage.Plugins/pom.xml +++ b/Mage.Plugins/pom.xml @@ -7,7 +7,7 @@ org.mage mage-root - 0.8.1 + 0.8.2 mage-plugins diff --git a/Mage.Server.Console/pom.xml b/Mage.Server.Console/pom.xml index 9012cce3bb..afd8d23210 100644 --- a/Mage.Server.Console/pom.xml +++ b/Mage.Server.Console/pom.xml @@ -6,7 +6,7 @@ org.mage mage-root - 0.8.1 + 0.8.2 org.mage diff --git a/Mage.Server.Console/src/main/java/mage/server/console/ConsoleFrame.java b/Mage.Server.Console/src/main/java/mage/server/console/ConsoleFrame.java index a8f67a0604..7b6afe5a27 100644 --- a/Mage.Server.Console/src/main/java/mage/server/console/ConsoleFrame.java +++ b/Mage.Server.Console/src/main/java/mage/server/console/ConsoleFrame.java @@ -58,7 +58,7 @@ public class ConsoleFrame extends javax.swing.JFrame implements MageClient { private static Session session; private ConnectDialog connectDialog; private static Preferences prefs = Preferences.userNodeForPackage(ConsoleFrame.class); - private final static MageVersion version = new MageVersion(0, 8, 1, ""); + private final static MageVersion version = new MageVersion(0, 8, 2, ""); /** * @return the session diff --git a/Mage.Server.Plugins/Mage.Deck.Constructed/pom.xml b/Mage.Server.Plugins/Mage.Deck.Constructed/pom.xml index 8556f7c03f..e27c31b488 100644 --- a/Mage.Server.Plugins/Mage.Deck.Constructed/pom.xml +++ b/Mage.Server.Plugins/Mage.Deck.Constructed/pom.xml @@ -7,7 +7,7 @@ org.mage mage-server-plugins - 0.8.1 + 0.8.2 mage-deck-constructed diff --git a/Mage.Server.Plugins/Mage.Deck.Limited/pom.xml b/Mage.Server.Plugins/Mage.Deck.Limited/pom.xml index d3c403510d..66e0d81660 100644 --- a/Mage.Server.Plugins/Mage.Deck.Limited/pom.xml +++ b/Mage.Server.Plugins/Mage.Deck.Limited/pom.xml @@ -7,7 +7,7 @@ org.mage mage-server-plugins - 0.8.1 + 0.8.2 mage-deck-limited diff --git a/Mage.Server.Plugins/Mage.Game.FreeForAll/pom.xml b/Mage.Server.Plugins/Mage.Game.FreeForAll/pom.xml index 54ec54087a..074acf64b3 100644 --- a/Mage.Server.Plugins/Mage.Game.FreeForAll/pom.xml +++ b/Mage.Server.Plugins/Mage.Game.FreeForAll/pom.xml @@ -7,7 +7,7 @@ org.mage mage-server-plugins - 0.8.1 + 0.8.2 mage-game-freeforall diff --git a/Mage.Server.Plugins/Mage.Game.TwoPlayerDuel/pom.xml b/Mage.Server.Plugins/Mage.Game.TwoPlayerDuel/pom.xml index c8bd2810b7..810c5845e7 100644 --- a/Mage.Server.Plugins/Mage.Game.TwoPlayerDuel/pom.xml +++ b/Mage.Server.Plugins/Mage.Game.TwoPlayerDuel/pom.xml @@ -7,7 +7,7 @@ org.mage mage-server-plugins - 0.8.1 + 0.8.2 mage-game-twoplayerduel diff --git a/Mage.Server.Plugins/Mage.Player.AI.MA/pom.xml b/Mage.Server.Plugins/Mage.Player.AI.MA/pom.xml index 8f3732c77d..82eb4ee237 100644 --- a/Mage.Server.Plugins/Mage.Player.AI.MA/pom.xml +++ b/Mage.Server.Plugins/Mage.Player.AI.MA/pom.xml @@ -7,7 +7,7 @@ org.mage mage-server-plugins - 0.8.1 + 0.8.2 mage-player-ai-ma diff --git a/Mage.Server.Plugins/Mage.Player.AI/pom.xml b/Mage.Server.Plugins/Mage.Player.AI/pom.xml index 6ec8eefd39..89640d5dba 100644 --- a/Mage.Server.Plugins/Mage.Player.AI/pom.xml +++ b/Mage.Server.Plugins/Mage.Player.AI/pom.xml @@ -7,7 +7,7 @@ org.mage mage-server-plugins - 0.8.1 + 0.8.2 mage-player-ai diff --git a/Mage.Server.Plugins/Mage.Player.AIMCTS/mage-player-ai-mcts.iml b/Mage.Server.Plugins/Mage.Player.AIMCTS/mage-player-ai-mcts.iml index 83f721ac82..9fb94dbb75 100644 --- a/Mage.Server.Plugins/Mage.Player.AIMCTS/mage-player-ai-mcts.iml +++ b/Mage.Server.Plugins/Mage.Player.AIMCTS/mage-player-ai-mcts.iml @@ -3,7 +3,6 @@ - diff --git a/Mage.Server.Plugins/Mage.Player.AIMCTS/pom.xml b/Mage.Server.Plugins/Mage.Player.AIMCTS/pom.xml index 203ee6abf8..71da647658 100644 --- a/Mage.Server.Plugins/Mage.Player.AIMCTS/pom.xml +++ b/Mage.Server.Plugins/Mage.Player.AIMCTS/pom.xml @@ -7,7 +7,7 @@ org.mage mage-server-plugins - 0.8.1 + 0.8.2 mage-player-ai-mcts diff --git a/Mage.Server.Plugins/Mage.Player.AIMinimax/pom.xml b/Mage.Server.Plugins/Mage.Player.AIMinimax/pom.xml index 167f582c8e..5c99b300be 100644 --- a/Mage.Server.Plugins/Mage.Player.AIMinimax/pom.xml +++ b/Mage.Server.Plugins/Mage.Player.AIMinimax/pom.xml @@ -7,7 +7,7 @@ org.mage mage-server-plugins - 0.8.1 + 0.8.2 mage-player-aiminimax diff --git a/Mage.Server.Plugins/Mage.Player.Human/pom.xml b/Mage.Server.Plugins/Mage.Player.Human/pom.xml index 8c60e6288a..d3fa771f34 100644 --- a/Mage.Server.Plugins/Mage.Player.Human/pom.xml +++ b/Mage.Server.Plugins/Mage.Player.Human/pom.xml @@ -7,7 +7,7 @@ org.mage mage-server-plugins - 0.8.1 + 0.8.2 mage-player-human diff --git a/Mage.Server.Plugins/Mage.Tournament.BoosterDraft/pom.xml b/Mage.Server.Plugins/Mage.Tournament.BoosterDraft/pom.xml index 4f98f7dfd1..17293a8b38 100644 --- a/Mage.Server.Plugins/Mage.Tournament.BoosterDraft/pom.xml +++ b/Mage.Server.Plugins/Mage.Tournament.BoosterDraft/pom.xml @@ -7,7 +7,7 @@ org.mage mage-server-plugins - 0.8.1 + 0.8.2 mage-tournament-boosterdraft diff --git a/Mage.Server.Plugins/Mage.Tournament.Sealed/pom.xml b/Mage.Server.Plugins/Mage.Tournament.Sealed/pom.xml index 572d3d63b1..413345ec71 100644 --- a/Mage.Server.Plugins/Mage.Tournament.Sealed/pom.xml +++ b/Mage.Server.Plugins/Mage.Tournament.Sealed/pom.xml @@ -7,7 +7,7 @@ org.mage mage-server-plugins - 0.8.1 + 0.8.2 mage-tournament-sealed diff --git a/Mage.Server.Plugins/pom.xml b/Mage.Server.Plugins/pom.xml index bfebc63055..8ceb5971bc 100644 --- a/Mage.Server.Plugins/pom.xml +++ b/Mage.Server.Plugins/pom.xml @@ -6,7 +6,7 @@ org.mage mage-root - 0.8.1 + 0.8.2 mage-server-plugins diff --git a/Mage.Server/pom.xml b/Mage.Server/pom.xml index af5d099edf..830f66eed4 100644 --- a/Mage.Server/pom.xml +++ b/Mage.Server/pom.xml @@ -6,7 +6,7 @@ org.mage mage-root - 0.8.1 + 0.8.2 mage-server @@ -200,11 +200,11 @@ - 0.8.1.0 + 0.8.2.0 MAGE Server Mage Server (C) Mage Development Team - 0.8.1.0 + 0.8.2.0 MAGE Server MAGE Mage-Server diff --git a/Mage.Server/src/main/java/mage/server/Main.java b/Mage.Server/src/main/java/mage/server/Main.java index d7d35f3014..214d09c636 100644 --- a/Mage.Server/src/main/java/mage/server/Main.java +++ b/Mage.Server/src/main/java/mage/server/Main.java @@ -28,13 +28,6 @@ package mage.server; -import java.io.File; -import java.io.FilenameFilter; -import java.io.IOException; -import java.net.InetAddress; -import java.util.HashMap; -import java.util.Map; -import javax.management.MBeanServer; import mage.game.match.MatchType; import mage.game.tournament.TournamentType; import mage.interfaces.MageServer; @@ -43,21 +36,14 @@ import mage.server.game.DeckValidatorFactory; import mage.server.game.GameFactory; import mage.server.game.PlayerFactory; import mage.server.tournament.TournamentFactory; -import mage.server.util.PluginClassLoader; import mage.server.util.ConfigSettings; +import mage.server.util.PluginClassLoader; import mage.server.util.ServerMessagesUtil; -import mage.server.util.config.Plugin; import mage.server.util.config.GamePlugin; +import mage.server.util.config.Plugin; import mage.utils.MageVersion; import org.apache.log4j.Logger; -import org.jboss.remoting.Client; -import org.jboss.remoting.ClientDisconnectedException; -import org.jboss.remoting.ConnectionListener; -import org.jboss.remoting.InvocationRequest; -import org.jboss.remoting.InvokerLocator; -import org.jboss.remoting.Remoting; -import org.jboss.remoting.ServerInvocationHandler; -import org.jboss.remoting.ServerInvoker; +import org.jboss.remoting.*; import org.jboss.remoting.callback.InvokerCallbackHandler; import org.jboss.remoting.callback.ServerInvokerCallbackHandler; import org.jboss.remoting.transport.Connector; @@ -66,6 +52,14 @@ import org.jboss.remoting.transporter.TransporterClient; import org.jboss.remoting.transporter.TransporterServer; import org.w3c.dom.Element; +import javax.management.MBeanServer; +import java.io.File; +import java.io.FilenameFilter; +import java.io.IOException; +import java.net.InetAddress; +import java.util.HashMap; +import java.util.Map; + /** * * @author BetaSteward_at_googlemail.com @@ -77,7 +71,7 @@ public class Main { private final static String testModeArg = "-testMode="; private final static String adminPasswordArg = "-adminPassword="; private final static String pluginFolder = "plugins"; - private static MageVersion version = new MageVersion(0, 8, 1, ""); + private static MageVersion version = new MageVersion(0, 8, 2, ""); public static PluginClassLoader classLoader = new PluginClassLoader(); public static TransporterServer server; diff --git a/Mage.Sets/pom.xml b/Mage.Sets/pom.xml index 05c3807cb7..39a8eb8379 100644 --- a/Mage.Sets/pom.xml +++ b/Mage.Sets/pom.xml @@ -7,7 +7,7 @@ org.mage mage-root - 0.8.1 + 0.8.2 org.mage diff --git a/Mage.Tests/pom.xml b/Mage.Tests/pom.xml index 75b4c4639d..52dd38116e 100644 --- a/Mage.Tests/pom.xml +++ b/Mage.Tests/pom.xml @@ -6,7 +6,7 @@ org.mage mage-root - 0.8.1 + 0.8.2 Mage-Tests diff --git a/Mage/pom.xml b/Mage/pom.xml index 1d04f019fa..ccc02734b1 100644 --- a/Mage/pom.xml +++ b/Mage/pom.xml @@ -7,7 +7,7 @@ org.mage mage-root - 0.8.1 + 0.8.2 mage diff --git a/pom.xml b/pom.xml index d5ed624820..ed43700a5b 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ org.mage mage-root - 0.8.1 + 0.8.2 pom Mage Root Mage Root POM @@ -90,6 +90,6 @@ - 0.8.1 + 0.8.2