Create common/metaserver for the metaserver API.

build.xml

@@ -183,7 +183,7 @@
              basedir="${freecol.build.dir}"
              manifest="${basedir}/src/MANIFEST.MF"
              includes="net/**, splash.jpg"
-             excludes="**/metaserver/MetaServer.java"/>
+             excludes="net/sf/freecol/metaserver/**"/>
     </target>
 
     <!-- Compiles the metaserver and creates a JAR-file. -->
@@ -191,7 +191,9 @@
         <jar jarfile="${freecol.metaserver.jar.file}"
              basedir="${freecol.build.dir}"
              manifest="${basedir}/src/MANIFEST.MF"
-             includes="net/**, org/**"/>
+             includes="net/sf/freecol/metaserver/**,
+                       net/sf/freecol/common/**,
+                       org/**"/>
     </target>
 
     <target name="mydist" depends="mydistWindows,mydistMac,mydistJava"

src/net/sf/freecol/client/gui/Canvas.java

@@ -146,6 +146,7 @@ import net.sf.freecol.client.gui.dialog.VictoryDialog;
 import net.sf.freecol.client.gui.dialog.WarehouseDialog;
 import net.sf.freecol.client.gui.panel.WorkProductionPanel;
 import net.sf.freecol.common.i18n.Messages;
+import net.sf.freecol.common.metaserver.ServerInfo;
 import net.sf.freecol.common.model.Colony;
 import net.sf.freecol.common.model.DiplomaticTrade;
 import net.sf.freecol.common.model.Direction;
@@ -176,7 +177,6 @@ import net.sf.freecol.common.option.OptionGroup;
 import net.sf.freecol.common.resources.ResourceManager;
 import static net.sf.freecol.common.util.CollectionUtils.*;
 import net.sf.freecol.common.util.Utils;
-import net.sf.freecol.metaserver.ServerInfo;
 
 
 /**

src/net/sf/freecol/client/gui/SwingGUI.java

@@ -70,6 +70,7 @@ import net.sf.freecol.client.gui.video.VideoComponent;
 import net.sf.freecol.client.gui.video.VideoListener;
 import net.sf.freecol.common.FreeColException;
 import net.sf.freecol.common.i18n.Messages;
+import net.sf.freecol.common.metaserver.ServerInfo;
 import net.sf.freecol.common.model.Colony;
 import net.sf.freecol.common.model.DiplomaticTrade;
 import net.sf.freecol.common.model.Europe;
@@ -103,7 +104,6 @@ import net.sf.freecol.common.option.Option;
 import net.sf.freecol.common.option.OptionGroup;
 import net.sf.freecol.common.resources.ResourceManager;
 import net.sf.freecol.common.resources.Video;
-import net.sf.freecol.metaserver.ServerInfo;
 
 import static net.sf.freecol.common.util.StringUtils.lastPart;
 

src/net/sf/freecol/client/gui/panel/NewPanel.java

@@ -47,11 +47,11 @@ import net.sf.freecol.client.gui.SwingGUI;
 import net.sf.freecol.client.gui.plaf.FreeColComboBoxRenderer;
 import net.sf.freecol.common.i18n.Messages;
 import net.sf.freecol.common.io.FreeColTcFile;
+import net.sf.freecol.common.metaserver.MetaServerUtils;
+import net.sf.freecol.common.metaserver.ServerInfo;
 import net.sf.freecol.common.model.NationOptions.Advantages;
 import net.sf.freecol.common.model.Specification;
 import net.sf.freecol.common.option.OptionGroup;
-import net.sf.freecol.metaserver.MetaServerUtils;
-import net.sf.freecol.metaserver.ServerInfo;
 
 
 /**

src/net/sf/freecol/client/gui/panel/ServerListPanel.java

@@ -35,8 +35,8 @@ import net.miginfocom.swing.MigLayout;
 import net.sf.freecol.FreeCol;
 import net.sf.freecol.client.FreeColClient;
 import net.sf.freecol.client.control.ConnectController;
+import net.sf.freecol.common.metaserver.ServerInfo;
 import static net.sf.freecol.common.util.CollectionUtils.*;
-import net.sf.freecol.metaserver.ServerInfo;
 
 
 

src/net/sf/freecol/client/gui/panel/ServerListTableModel.java

@@ -20,7 +20,7 @@
 package net.sf.freecol.client.gui.panel;
 
 import net.sf.freecol.common.i18n.Messages;
-import net.sf.freecol.metaserver.ServerInfo;
+import net.sf.freecol.common.metaserver.ServerInfo;
 
 import javax.swing.table.AbstractTableModel;
 import java.util.List;

src/net/sf/freecol/common/metaserver/MetaServerUtils.java

@@ -17,7 +17,7 @@
  *  along with FreeCol.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package net.sf.freecol.metaserver;
+package net.sf.freecol.common.metaserver;
 
 import java.io.IOException;
 import java.util.function.Consumer;

src/net/sf/freecol/common/metaserver/ServerInfo.java

@@ -17,7 +17,7 @@
  *  along with FreeCol.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-package net.sf.freecol.metaserver;
+package net.sf.freecol.common.metaserver;
 
 
 /**

src/net/sf/freecol/common/metaserver/package-info.java

@@ -0,0 +1,4 @@
+/**
+ * Contains the common networking classes.
+ */
+package net.sf.freecol.common.metaserver;

src/net/sf/freecol/common/networking/RegisterServerMessage.java

@@ -19,8 +19,8 @@
 
 package net.sf.freecol.common.networking;
 
+import net.sf.freecol.common.metaserver.ServerInfo;
 import net.sf.freecol.common.model.Game;
-import net.sf.freecol.metaserver.ServerInfo;
 
 import org.w3c.dom.Element;
 

src/net/sf/freecol/common/networking/RemoveServerMessage.java

@@ -19,9 +19,9 @@
 
 package net.sf.freecol.common.networking;
 
+import net.sf.freecol.common.metaserver.ServerInfo;
 import net.sf.freecol.common.model.Game;
 import net.sf.freecol.common.networking.Connection;
-import net.sf.freecol.metaserver.ServerInfo;
 
 import org.w3c.dom.Element;
 

src/net/sf/freecol/common/networking/ServerInfoMessage.java

@@ -19,10 +19,10 @@
 
 package net.sf.freecol.common.networking;
 
+import net.sf.freecol.common.metaserver.ServerInfo;
 import net.sf.freecol.common.model.Game;
 import net.sf.freecol.common.networking.DOMMessage;
 import net.sf.freecol.common.networking.AttributeMessage;
-import net.sf.freecol.metaserver.ServerInfo;
 
 import org.w3c.dom.Element;
 

src/net/sf/freecol/common/networking/ServerListMessage.java

@@ -22,11 +22,11 @@ package net.sf.freecol.common.networking;
 import java.util.ArrayList;
 import java.util.List;
 
+import net.sf.freecol.common.metaserver.ServerInfo;
 import static net.sf.freecol.common.util.CollectionUtils.*;
-import net.sf.freecol.metaserver.ServerInfo;
+import net.sf.freecol.common.util.DOMUtils;
 import net.sf.freecol.server.FreeColServer;
 
-import net.sf.freecol.common.util.DOMUtils;
 import org.w3c.dom.Element;
 
 

src/net/sf/freecol/common/networking/UpdateServerMessage.java

@@ -19,8 +19,8 @@
 
 package net.sf.freecol.common.networking;
 
+import net.sf.freecol.common.metaserver.ServerInfo;
 import net.sf.freecol.common.model.Game;
-import net.sf.freecol.metaserver.ServerInfo;
 
 import org.w3c.dom.Element;
 

src/net/sf/freecol/common/networking/package-info.java

@@ -1,4 +1,4 @@
 /**
  * Contains the common networking classes.
  */
-package net.sf.freecol.common.networking;
+package net.sf.freecol.common.networking;

src/net/sf/freecol/metaserver/MetaRegister.java

@@ -28,6 +28,7 @@ import java.util.logging.Level;
 import java.util.logging.Logger;
 
 import net.sf.freecol.FreeCol;
+import net.sf.freecol.common.metaserver.ServerInfo;
 import net.sf.freecol.common.networking.Connection;
 
 

src/net/sf/freecol/metaserver/MetaServer.java

@@ -28,6 +28,7 @@ import java.util.logging.Level;
 import java.util.logging.Logger;
 
 import net.sf.freecol.FreeCol;
+import net.sf.freecol.common.metaserver.ServerInfo;
 import net.sf.freecol.common.networking.Connection;
 
 

src/net/sf/freecol/metaserver/NetworkHandler.java

@@ -22,6 +22,7 @@ package net.sf.freecol.metaserver;
 import java.io.IOException;
 import java.util.logging.Logger;
 
+import net.sf.freecol.common.metaserver.ServerInfo;
 import net.sf.freecol.common.networking.Connection;
 import net.sf.freecol.common.networking.DOMMessage;
 import net.sf.freecol.common.networking.DOMMessageHandler;

src/net/sf/freecol/server/FreeColServer.java

@@ -47,6 +47,8 @@ import net.sf.freecol.common.io.FreeColDirectories;
 import net.sf.freecol.common.io.FreeColSavegameFile;
 import net.sf.freecol.common.io.FreeColXMLReader;
 import net.sf.freecol.common.io.FreeColXMLWriter;
+import net.sf.freecol.common.metaserver.MetaServerUtils;
+import net.sf.freecol.common.metaserver.ServerInfo;
 import net.sf.freecol.common.model.FreeColObject;
 import net.sf.freecol.common.model.Game;
 import net.sf.freecol.common.model.Game.LogoutReason;
@@ -75,8 +77,6 @@ import net.sf.freecol.common.option.OptionGroup;
 import static net.sf.freecol.common.util.CollectionUtils.*;
 import net.sf.freecol.common.util.LogBuilder;
 import net.sf.freecol.common.util.Utils;
-import net.sf.freecol.metaserver.MetaServerUtils;
-import net.sf.freecol.metaserver.ServerInfo;
 import net.sf.freecol.server.ai.AIInGameInputHandler;
 import net.sf.freecol.server.ai.AIMain;
 import net.sf.freecol.server.ai.AIPlayer;