Revert changes with unclear motivation

Signed-off-by: Mitch Gaffigan <mitch.gaffigan@comcast.net>

Author: mgaffigan

client/ant-build.xml

@@ -361,12 +361,6 @@
 				<jvmarg value="-Xmx2048m" />
 				<!-- https://stackoverflow.com/questions/54205486 -->
 				<jvmarg value="-Xshare:off" />
-				<jvmarg value="--add-opens=java.base/jdk.internal.misc=ALL-UNNAMED"/>
-				<jvmarg value="--add-opens=java.sql.rowset/com.sun.rowset=ALL-UNNAMED"/>
-				<jvmarg value="--add-opens=java.sql.rowset/com.sun.rowset.internal=ALL-UNNAMED"/>
-				<jvmarg value="--add-opens=java.sql.rowset/com.sun.rowset.providers=ALL-UNNAMED"/>
-				<jvmarg value="--add-opens=java.sql.rowset/javax.sql.rowset=ALL-UNNAMED"/>
-				<jvmarg value="--add-opens=java.sql/java.sql=ALL-UNNAMED"/>
 				<classpath>
 					<path refid="testclasspath" />
 					<dirset dir="${test_classes}"/>

command/build.xml

@@ -100,12 +100,6 @@
 				<jvmarg value="-Xmx2048m" />
 				<!-- https://stackoverflow.com/questions/54205486 -->
 				<jvmarg value="-Xshare:off" />
-				<jvmarg value="--add-opens=java.base/jdk.internal.misc=ALL-UNNAMED"/>
-				<jvmarg value="--add-opens=java.sql.rowset/com.sun.rowset=ALL-UNNAMED"/>
-				<jvmarg value="--add-opens=java.sql.rowset/com.sun.rowset.internal=ALL-UNNAMED"/>
-				<jvmarg value="--add-opens=java.sql.rowset/com.sun.rowset.providers=ALL-UNNAMED"/>
-				<jvmarg value="--add-opens=java.sql.rowset/javax.sql.rowset=ALL-UNNAMED"/>
-				<jvmarg value="--add-opens=java.sql/java.sql=ALL-UNNAMED"/>
 				<classpath>
 					<path refid="testclasspath" />
 					<dirset dir="${test_classes}"/>

donkey/build.xml

@@ -99,12 +99,6 @@
 				<jvmarg value="-Xmx2048m" />
 				<!-- https://stackoverflow.com/questions/54205486 -->
 				<jvmarg value="-Xshare:off" />
-				<jvmarg value="--add-opens=java.base/jdk.internal.misc=ALL-UNNAMED"/>
-				<jvmarg value="--add-opens=java.sql.rowset/com.sun.rowset=ALL-UNNAMED"/>
-				<jvmarg value="--add-opens=java.sql.rowset/com.sun.rowset.internal=ALL-UNNAMED"/>
-				<jvmarg value="--add-opens=java.sql.rowset/com.sun.rowset.providers=ALL-UNNAMED"/>
-				<jvmarg value="--add-opens=java.sql.rowset/javax.sql.rowset=ALL-UNNAMED"/>
-				<jvmarg value="--add-opens=java.sql/java.sql=ALL-UNNAMED"/>
 				<classpath>
 					<path refid="testclasspath" />
 					<dirset dir="${test_classes}"/>

server/build.xml

@@ -1103,10 +1103,8 @@
 
 	<target name="create-derby-db" depends="compile">
 		<!-- re-create the embedded database -->
-		<delete dir="appdata/mirthdb" />
+		<delete dir="mirthdb" />
 		<java classname="com.mirth.connect.server.tools.ScriptRunner" fork="true" dir="${basedir}" failonerror="true">
-			<!-- Set Derby home so it creates mirthdb inside appdata -->
-			<jvmarg value="-Dderby.system.home=appdata" />
 			<classpath>
 				<pathelement location="${setup.server.lib}/${server.jar}" />
 				<pathelement location="classes" />

server/test/com/mirth/connect/model/PublicServerSettingsTest.java

@@ -57,7 +57,7 @@ public void defaultMetaDataColumnsTest() {
 
     @Test
     public void queueBufferSizeTest() {
-        com.mirth.connect.model.PublicServerSettings publicServerSettings = new com.mirth.connect.model.PublicServerSettings(serverSettings);
+        PublicServerSettings publicServerSettings = new PublicServerSettings(serverSettings);
         assertTrue(1000 == publicServerSettings.getQueueBufferSize());
     }
 

server/test/com/mirth/connect/server/controllers/TestUtils.java

@@ -552,19 +552,6 @@ public static void fixMessageIdSequence(String channelId) throws Exception {
             try {
                 connection = getConnection();
                 statement = connection.createStatement();
-                // Check if D_MESSAGE_SEQUENCES table exists
-                result = statement.executeQuery(
-                        "SELECT COUNT(*) FROM SYS.SYSTABLES WHERE UPPER(TABLENAME) = 'D_MESSAGE_SEQUENCES'"
-                );
-                result.next();
-                int tableExists = result.getInt(1);
-                close(result);
-
-                // Create the table if it doesn't exist
-                if (tableExists == 0) {
-                    statement.execute("CREATE TABLE D_MESSAGE_SEQUENCES (LOCAL_CHANNEL_ID BIGINT NOT NULL PRIMARY KEY)");
-                }
-
                 result = statement.executeQuery("SELECT MAX(id) FROM d_m" + localChannelId);
                 result.next();
                 maxId = result.getLong(1) + 1;