Skip to content

Commit fd2fd9d

Browse files
mgaffiganmgaffigan
committed
Reverted extra changes, added gitignore for junit-html
Signed-off-by: Mitch Gaffigan <[email protected]>
1 parent cf06b23 commit fd2fd9d

File tree

4 files changed

+106
-89
lines changed

4 files changed

+106
-89
lines changed

‎.gitignore‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -108,6 +108,7 @@ donkey/donkey-src
108108
donkey/donkey-test
109109
.sonar
110110
**/junit-reports
111+
**/junit-html
111112
**/code-coverage-reports
112113

113114
# /client/

‎server/build.xml‎

Lines changed: 104 additions & 85 deletions
Original file line numberDiff line numberDiff line change
@@ -1002,6 +1002,11 @@
10021002
<fileset dir="${docs}" />
10031003
</copy>
10041004

1005+
<!-- copy basedir files -->
1006+
<copy todir="${setup}">
1007+
<fileset dir="${basedir_includes}" />
1008+
</copy>
1009+
10051010
<!-- create the server jar -->
10061011
<jar destfile="${setup.server.lib}/${server.jar}" basedir="${classes}">
10071012
<include name="com/mirth/connect/server/**" />
@@ -1046,38 +1051,96 @@
10461051

10471052
<taskdef resource="net/sf/antcontrib/antlib.xml" classpathref="classpath" />
10481053

1049-
<!-- modify jar manifests -->
1050-
<!-- don't modify bcprov, since it already has the manifest changes and is signed by BC -->
1051-
<echo message="[Thread Count: ${manifest_thread_count}] Modifying jar manifests to add Permissions: all-permissions; Codebase: *; Application-Name: Mirth Connect" />
1052-
<for param="jarFile" parallel="true" threadCount="${manifest_thread_count}">
1053-
<fileset dir="${setup.client.lib}" includes="**/*.jar" excludes="bcp*.jar,bcutil*.jar"/>
1054-
<fileset dir="${setup.extensions}" includes="**/*.jar" />
1055-
<sequential>
1056-
<apply executable="jar">
1057-
<arg value="umf" />
1058-
<arg line="custom_manifest.mf" />
1059-
<srcfile />
1060-
<fileset file="@{jarFile}"/>
1061-
</apply>
1062-
</sequential>
1063-
</for>
1064-
<!-- sign jars for webstart -->
1065-
<echo message="[Thread Count: ${signjar_thread_count}] Signing jars for Java Web Start" />
1066-
<property file="${keystore_property_file}" />
1067-
1068-
<for param="jarFile" parallel="true" threadCount="${signjar_thread_count}">
1069-
<fileset dir="${setup.client.lib}" includes="**/*.jar" />
1070-
<fileset dir="${setup.extensions}" includes="**/*.jar" />
1071-
<sequential>
1072-
<retry retrycount="5" retrydelay="1000">
1073-
<signjar jar="@{jarFile}" alias="${key.alias}" keystore="${key.keystore}" storepass="${key.storepass}" keypass="${key.keypass}" storetype="${key.storetype}" tsaurl="http://timestamp.digicert.com" digestalg="SHA-256">
1074-
<!-- http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=7127374 -->
1075-
<sysproperty key="jsse.enableSNIExtension" value="false" />
1076-
<sysproperty key="https.protocols" value="TLSv1.2,TLSv1.1" />
1077-
</signjar>
1078-
</retry>
1079-
</sequential>
1080-
</for>
1054+
1055+
<if>
1056+
<equals arg1="${disableSigning}" arg2="true" />
1057+
1058+
<then>
1059+
<echo message="Signing jars for Java Web Start is disabled" />
1060+
</then>
1061+
1062+
<else>
1063+
<!-- modify jar manifests -->
1064+
<!-- don't modify bcprov, since it already has the manifest changes and is signed by BC -->
1065+
<echo message="[Thread Count: ${manifest_thread_count}] Modifying jar manifests to add Permissions: all-permissions; Codebase: *; Application-Name: Mirth Connect" />
1066+
<for param="jarFile" parallel="true" threadCount="${manifest_thread_count}">
1067+
<fileset dir="${setup.client.lib}" includes="**/*.jar" excludes="bcp*.jar,bcutil*.jar"/>
1068+
<fileset dir="${setup.extensions}" includes="**/*.jar" />
1069+
<sequential>
1070+
<apply executable="jar">
1071+
<arg value="umf" />
1072+
<arg line="custom_manifest.mf" />
1073+
<srcfile />
1074+
<fileset file="@{jarFile}"/>
1075+
</apply>
1076+
</sequential>
1077+
</for>
1078+
1079+
<property file="${keystore_property_file}" />
1080+
<property name="signingTsa" value="http://timestamp.digicert.com" />
1081+
1082+
<echo message="[Thread Count: ${signjar_thread_count}] Signing jars for Java Web Start" />
1083+
1084+
<if>
1085+
<equals arg1="${cert}" arg2="ca" />
1086+
1087+
<!-- Sign jars with valid CA certificate -->
1088+
<then>
1089+
<echo message="Signing with CA certificate" />
1090+
1091+
<for param="jarFile" parallel="true" threadCount="${signjar_thread_count}">
1092+
<fileset dir="${setup.client.lib}" includes="**/*.jar" />
1093+
<fileset dir="${setup.extensions}" includes="**/*.jar" />
1094+
<sequential>
1095+
<retry retrycount="5" retrydelay="1000">
1096+
<signjar
1097+
jar="@{jarFile}"
1098+
alias="${key.alias}"
1099+
storepass="${key.storepass}"
1100+
storetype="${key.storetype}"
1101+
providerclass="${key.providerclass}"
1102+
providerarg="${key.providerarg}"
1103+
tsaurl="${signingTsa}"
1104+
>
1105+
<!-- http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=7127374 -->
1106+
<sysproperty key="jsse.enableSNIExtension" value="false" />
1107+
<sysproperty key="https.protocols" value="TLSv1.2,TLSv1.1" />
1108+
</signjar>
1109+
</retry>
1110+
</sequential>
1111+
</for>
1112+
</then>
1113+
1114+
<!-- Sign jars with self-signed certificate -->
1115+
<else>
1116+
<echo message="Signing with self-signed certificate" />
1117+
1118+
<for param="jarFile" parallel="true" threadCount="${signjar_thread_count}">
1119+
<fileset dir="${setup.client.lib}" includes="**/*.jar" />
1120+
<fileset dir="${setup.extensions}" includes="**/*.jar" />
1121+
<sequential>
1122+
<retry retrycount="5" retrydelay="1000">
1123+
<signjar
1124+
jar="@{jarFile}"
1125+
alias="${key.alias}"
1126+
keystore="${key.keystore}"
1127+
storepass="${key.storepass}"
1128+
keypass="${key.keypass}"
1129+
storetype="${key.storetype}"
1130+
tsaurl="${signingTsa}"
1131+
digestalg="SHA-256"
1132+
>
1133+
<!-- http://bugs.sun.com/bugdatabase/view_bug.do?bug_id=7127374 -->
1134+
<sysproperty key="jsse.enableSNIExtension" value="false" />
1135+
<sysproperty key="https.protocols" value="TLSv1.2,TLSv1.1" />
1136+
</signjar>
1137+
</retry>
1138+
</sequential>
1139+
</for>
1140+
</else>
1141+
</if>
1142+
</else>
1143+
</if>
10811144
</target>
10821145

10831146
<target name="create-extension-zips" depends="create-setup">
@@ -1134,11 +1197,9 @@
11341197

11351198
<javadoc sourcepath="${src}:${jdk_src_path}" destdir="${docs.javadocs.userapi}" packagenames="com.mirth.connect.server.userutil,com.mirth.connect.userutil,com.mirth.connect.plugins.httpauth.userutil" link="https://docs.oracle.com/javase/8/docs/api/">
11361199
<classpath refid="classpath" />
1137-
<!-- &lt;!&ndash; Uncomment the following and add additional dashes in front of the arguments to allow Java 9+-->
1138-
<arg line="-html5"/>
1139-
<arg line="-add-modules java.sql.rowset"/>
1140-
<arg line="-add-exports java.sql.rowset/com.sun.rowset=ALL-UNNAMED"/>
1141-
1200+
<arg line="-html5"/>
1201+
<arg line="--add-modules=java.sql.rowset"/>
1202+
<arg line="--add-exports=java.sql.rowset/com.sun.rowset=ALL-UNNAMED"/>
11421203
</javadoc>
11431204
</target>
11441205

@@ -1203,50 +1264,16 @@
12031264
<javac srcdir="${test}" destdir="${test_classes}" debug="on" includeAntRuntime="false">
12041265
<classpath refid="testclasspath" />
12051266
<!-- Uncomment the following and add additional dashes in front of the arguments to allow Java 9+-->
1206-
<compilerarg value="--add-modules" />
1207-
<compilerarg value="java.sql.rowset" />
1208-
<compilerarg value="--add-exports" />
1209-
<compilerarg value="java.sql.rowset/com.sun.rowset=ALL-UNNAMED" />
1210-
<compilerarg value="--add-exports" />
1211-
<compilerarg value="java.base/com.sun.crypto.provider=ALL-UNNAMED" />
1212-
<compilerarg value="--add-exports" />
1213-
<compilerarg value="java.base/sun.security.provider=ALL-UNNAMED" />
1214-
<compilerarg value="--add-opens" />
1215-
<compilerarg value="java.base/java.lang=ALL-UNNAMED" />
1216-
<compilerarg value="--add-opens" />
1217-
<compilerarg value="java.base/java.lang.reflect=ALL-UNNAMED" />
1218-
<compilerarg value="--add-opens" />
1219-
<compilerarg value="java.base/java.math=ALL-UNNAMED" />
1220-
<compilerarg value="--add-opens" />
1221-
<compilerarg value="java.base/java.net=ALL-UNNAMED" />
1222-
<compilerarg value="--add-opens" />
1223-
<compilerarg value="java.base/java.security=ALL-UNNAMED" />
1224-
<compilerarg value="--add-opens" />
1225-
<compilerarg value="java.base/java.security.cert=ALL-UNNAMED" />
1226-
<compilerarg value="--add-opens" />
1227-
<compilerarg value="java.base/java.text=ALL-UNNAMED" />
1228-
<compilerarg value="--add-opens" />
1229-
<compilerarg value="java.base/java.util=ALL-UNNAMED" />
1230-
<compilerarg value="--add-opens" />
1231-
<compilerarg value="java.base/sun.security.pkcs=ALL-UNNAMED" />
1232-
<compilerarg value="--add-opens" />
1233-
<compilerarg value="java.base/sun.security.rsa=ALL-UNNAMED" />
1234-
<compilerarg value="--add-opens" />
1235-
<compilerarg value="java.base/sun.security.x509=ALL-UNNAMED" />
1236-
<compilerarg value="--add-opens" />
1237-
<compilerarg value="java.desktop/java.awt=ALL-UNNAMED" />
1238-
<compilerarg value="--add-opens" />
1239-
<compilerarg value="java.desktop/java.awt.color=ALL-UNNAMED" />
1240-
<compilerarg value="--add-opens" />
1241-
<compilerarg value="java.desktop/java.awt.font=ALL-UNNAMED" />
1242-
<compilerarg value="--add-opens" />
1243-
<compilerarg value="java.xml/com.sun.org.apache.xalan.internal.xsltc.trax=ALL-UNNAMED" />
1244-
1267+
<compilerarg value="--add-modules=java.sql.rowset" />
1268+
<compilerarg value="--add-exports=java.sql.rowset/com.sun.rowset=ALL-UNNAMED" />
1269+
<compilerarg value="--add-exports=java.base/com.sun.crypto.provider=ALL-UNNAMED" />
1270+
<compilerarg value="--add-exports=java.base/sun.security.provider=ALL-UNNAMED" />
12451271
</javac>
12461272

12471273
<copy todir="${test_classes}">
12481274
<fileset dir="${test}">
12491275
<include name="**/*.xml" />
1276+
<include name="**/*.json" />
12501277
</fileset>
12511278
</copy>
12521279

@@ -1284,10 +1311,9 @@
12841311
<mkdir dir="${junit-html}" />
12851312

12861313
<jacoco:coverage destfile="${code-coverage-reports}/jacoco.exec" xmlns:jacoco="antlib:org.jacoco.ant" exclclassloader="sun.reflect.DelegatingClassLoader:javassist.Loader" >
1287-
<junit haltonfailure="false" fork="true" forkmode="perTest">
1314+
<junit haltonfailure="false" fork="true" forkmode="once">
12881315
<jvmarg value="-Xms128m" />
12891316
<jvmarg value="-Xmx2048m" />
1290-
<!-- &lt;!&ndash;Uncomment the following and add additional dashes in front of the arguments to allow Java 9+-->
12911317
<jvmarg value="--add-opens=java.base/java.util=ALL-UNNAMED" />
12921318
<jvmarg value="--add-opens=java.base/java.lang=ALL-UNNAMED" />
12931319
<jvmarg value="--add-opens=java.base/java.lang.reflect=ALL-UNNAMED" />
@@ -1303,13 +1329,6 @@
13031329
<jvmarg value="--add-opens=java.sql.rowset/com.sun.rowset.providers=ALL-UNNAMED"/>
13041330
<jvmarg value="--add-opens=java.sql.rowset/javax.sql.rowset=ALL-UNNAMED"/>
13051331
<jvmarg value="--add-opens=java.sql/java.sql=ALL-UNNAMED"/>
1306-
1307-
1308-
1309-
1310-
1311-
1312-
13131332
<classpath>
13141333
<path refid="testclasspath" />
13151334
<dirset dir="${test_classes}"/>

‎server/src/com/mirth/connect/model/util/DefaultMetaData.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,5 +40,4 @@ public class DefaultMetaData {
4040
DEFAULT_COLUMNS.add(SOURCE_COLUMN);
4141
DEFAULT_COLUMNS.add(TYPE_COLUMN);
4242
}
43-
44-
}
43+
}

‎server/test/com/mirth/connect/connectors/tcp/TcpDispatcherTest.java‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,6 @@ private TcpDispatcherProperties createTcpDispatcherProperties() throws IOExcepti
139139
}
140140

141141
private TcpDispatcher createTcpDispatcher(TcpDispatcherProperties dispatcherProps) {
142-
143142
TcpDispatcher dispatcher = new TestTcpDispatcher(TEST_CHANNEL_ID, TEST_SERVER_ID, 1, dispatcherProps);
144143
dispatcher.setChannelId(TEST_CHANNEL_ID);
145144

@@ -177,7 +176,6 @@ public void testMessageSent() throws Exception {
177176

178177
assertEquals(TEST_MESSAGE_TEMPLATE, socketResult.get("result" + socketListenerId));
179178
}
180-
181179

182180
/*
183181
* testMLLPMessageSent()

0 commit comments

Comments
 (0)