From be5490dce734b90abcf62850c541c2746764d29f Mon Sep 17 00:00:00 2001
From: Michael Bayne <mdb@samskivert.com>
Date: Tue, 4 Sep 2018 16:06:37 -0700
Subject: [PATCH] Merged the tools module into core.

It wasn't actually providing any value. Neither tools nor core have any special
dependencies. The code in tools operates on the same files, formats and data
structures that core/runtime code operates on. It is simpler to have them in
the same module.
---
 ant/pom.xml                                   |  2 +-
 .../com/threerings/getdown/tools/Differ.java  |  0
 .../threerings/getdown/tools/Digester.java    |  0
 .../com/threerings/getdown/tools/JarDiff.java |  0
 .../getdown/tools/JarDiffCodes.java           |  0
 .../getdown/tools/JarDiffPatcher.java         |  0
 .../com/threerings/getdown/tools/Patcher.java |  0
 launcher/pom.xml                              |  9 ------
 pom.xml                                       |  1 -
 tools/pom.xml                                 | 29 -----------------
 .../threerings/getdown/tools/JarDiffTest.java | 32 -------------------
 11 files changed, 1 insertion(+), 72 deletions(-)
 rename {tools => core}/src/main/java/com/threerings/getdown/tools/Differ.java (100%)
 rename {tools => core}/src/main/java/com/threerings/getdown/tools/Digester.java (100%)
 rename {tools => core}/src/main/java/com/threerings/getdown/tools/JarDiff.java (100%)
 rename {tools => core}/src/main/java/com/threerings/getdown/tools/JarDiffCodes.java (100%)
 rename {tools => core}/src/main/java/com/threerings/getdown/tools/JarDiffPatcher.java (100%)
 rename {tools => core}/src/main/java/com/threerings/getdown/tools/Patcher.java (100%)
 delete mode 100644 tools/pom.xml
 delete mode 100644 tools/src/test/java/com/threerings/getdown/tools/JarDiffTest.java

diff --git a/ant/pom.xml b/ant/pom.xml
index f588b4e..80f7c75 100644
--- a/ant/pom.xml
+++ b/ant/pom.xml
@@ -15,7 +15,7 @@
   <dependencies>
     <dependency>
       <groupId>com.threerings.getdown</groupId>
-      <artifactId>getdown-tools</artifactId>
+      <artifactId>getdown-core</artifactId>
       <version>${project.version}</version>
     </dependency>
     <dependency>
diff --git a/tools/src/main/java/com/threerings/getdown/tools/Differ.java b/core/src/main/java/com/threerings/getdown/tools/Differ.java
similarity index 100%
rename from tools/src/main/java/com/threerings/getdown/tools/Differ.java
rename to core/src/main/java/com/threerings/getdown/tools/Differ.java
diff --git a/tools/src/main/java/com/threerings/getdown/tools/Digester.java b/core/src/main/java/com/threerings/getdown/tools/Digester.java
similarity index 100%
rename from tools/src/main/java/com/threerings/getdown/tools/Digester.java
rename to core/src/main/java/com/threerings/getdown/tools/Digester.java
diff --git a/tools/src/main/java/com/threerings/getdown/tools/JarDiff.java b/core/src/main/java/com/threerings/getdown/tools/JarDiff.java
similarity index 100%
rename from tools/src/main/java/com/threerings/getdown/tools/JarDiff.java
rename to core/src/main/java/com/threerings/getdown/tools/JarDiff.java
diff --git a/tools/src/main/java/com/threerings/getdown/tools/JarDiffCodes.java b/core/src/main/java/com/threerings/getdown/tools/JarDiffCodes.java
similarity index 100%
rename from tools/src/main/java/com/threerings/getdown/tools/JarDiffCodes.java
rename to core/src/main/java/com/threerings/getdown/tools/JarDiffCodes.java
diff --git a/tools/src/main/java/com/threerings/getdown/tools/JarDiffPatcher.java b/core/src/main/java/com/threerings/getdown/tools/JarDiffPatcher.java
similarity index 100%
rename from tools/src/main/java/com/threerings/getdown/tools/JarDiffPatcher.java
rename to core/src/main/java/com/threerings/getdown/tools/JarDiffPatcher.java
diff --git a/tools/src/main/java/com/threerings/getdown/tools/Patcher.java b/core/src/main/java/com/threerings/getdown/tools/Patcher.java
similarity index 100%
rename from tools/src/main/java/com/threerings/getdown/tools/Patcher.java
rename to core/src/main/java/com/threerings/getdown/tools/Patcher.java
diff --git a/launcher/pom.xml b/launcher/pom.xml
index daf561d..9ea8e99 100644
--- a/launcher/pom.xml
+++ b/launcher/pom.xml
@@ -25,11 +25,6 @@
       <artifactId>getdown-core</artifactId>
       <version>${project.version}</version>
     </dependency>
-    <dependency>
-      <groupId>com.threerings.getdown</groupId>
-      <artifactId>getdown-tools</artifactId>
-      <version>${project.version}</version>
-    </dependency>
     <dependency>
       <groupId>com.samskivert</groupId>
       <artifactId>samskivert</artifactId>
@@ -74,10 +69,6 @@
                 <groupId>com.threerings.getdown</groupId>
                 <artifactId>getdown-core</artifactId>
               </inclusion>
-              <inclusion>
-                <groupId>com.threerings.getdown</groupId>
-                <artifactId>getdown-tools</artifactId>
-              </inclusion>
               <inclusion>
                 <groupId>com.samskivert</groupId>
                 <artifactId>samskivert</artifactId>
diff --git a/pom.xml b/pom.xml
index 4208d9c..f22024d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -43,7 +43,6 @@
 
   <modules>
     <module>core</module>
-    <module>tools</module>
     <module>launcher</module>
     <module>ant</module>
   </modules>
diff --git a/tools/pom.xml b/tools/pom.xml
deleted file mode 100644
index 0548472..0000000
--- a/tools/pom.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-  <modelVersion>4.0.0</modelVersion>
-  <parent>
-    <groupId>com.threerings.getdown</groupId>
-    <artifactId>getdown</artifactId>
-    <version>1.8-SNAPSHOT</version>
-  </parent>
-
-  <artifactId>getdown-tools</artifactId>
-  <packaging>jar</packaging>
-  <name>Getdown App</name>
-  <description>Tools for creating digests and patch files</description>
-
-  <dependencies>
-    <dependency>
-      <groupId>com.threerings.getdown</groupId>
-      <artifactId>getdown-core</artifactId>
-      <version>${project.version}</version>
-    </dependency>
-    <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>4.8.1</version>
-      <scope>test</scope>
-    </dependency>
-  </dependencies>
-
-</project>
diff --git a/tools/src/test/java/com/threerings/getdown/tools/JarDiffTest.java b/tools/src/test/java/com/threerings/getdown/tools/JarDiffTest.java
deleted file mode 100644
index ae15ff3..0000000
--- a/tools/src/test/java/com/threerings/getdown/tools/JarDiffTest.java
+++ /dev/null
@@ -1,32 +0,0 @@
-//
-// Getdown - application installer, patcher and launcher
-// Copyright (C) 2004-2016 Getdown authors
-// https://github.com/threerings/getdown/blob/master/LICENSE
-
-package com.threerings.getdown.tools;
-
-import java.io.IOException;
-import java.io.StringWriter;
-
-import org.junit.Test;
-
-import static com.threerings.getdown.tools.JarDiff.writeEscapedString;
-import static org.junit.Assert.assertEquals;
-
-/**
- * Tests {@link JarDiff}.
- */
-public class JarDiffTest {
-
-    @Test
-    public void testWriteEscapedString () throws IOException
-    {
-        assertEquals("abc", writeEscapedString(new StringWriter(), "abc").toString());
-        assertEquals("abc\\ xyz", writeEscapedString(new StringWriter(), "abc xyz").toString());
-        assertEquals("\\ xyz", writeEscapedString(new StringWriter(), " xyz").toString());
-        assertEquals("abc\\ ", writeEscapedString(new StringWriter(), "abc ").toString());
-        assertEquals("\\ ", writeEscapedString(new StringWriter(), " ").toString());
-        assertEquals("", writeEscapedString(new StringWriter(), "").toString());
-    }
-
-}