Pull request #826: Reverting a change that prevented the server from …

…starting properly. Merge in MC/connect from feature/ROCKSOLID-12645-modify-connect-plugin-results3-to-use-the-new-process to development * commit 'f1978d5dd14c1aca562fe8e72a84c8f1574f9e9f': Reverting a change that prevented the server from starting properly. Removes unnecessary lines from the server's build file.
nextgenhealthcare · May 23, 2024 · fa1c143 · fa1c143
2 parents 5bfa7cf + f1978d5
commit fa1c143
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 7 deletions.
diff --git a/core-server-plugins/src/com/mirth/connect/server/extprops/ExtensionStatuses.java b/core-server-plugins/src/com/mirth/connect/server/extprops/ExtensionStatuses.java
@@ -18,8 +18,6 @@
 
 import org.apache.commons.io.IOUtils;
 
-import com.mirth.connect.server.tools.ClassPathResource;
-
 public class ExtensionStatuses implements ExtensionStatusInterface {
 
     public static Class<?> DEFAULT_EXTENSION_STATUS_PROVIDER;
@@ -53,7 +51,7 @@ private ExtensionStatuses() {
         }
 
         try {
-            InputStream is = new FileInputStream(new File(ClassPathResource.getResourceURI("mirth.properties")));
+        	InputStream is = new FileInputStream(new File("./conf/mirth.properties"));
             try {
                 mirthProperties.load(is);
             } finally {

diff --git a/server/build.xml b/server/build.xml
@@ -206,16 +206,12 @@
 		<jar destfile="${connectors.http}/http-shared.jar" basedir="${classes}">
 			<include name="com/mirth/connect/connectors/http/HttpReceiverProperties.class" />
 			<include name="com/mirth/connect/connectors/http/HttpDispatcherProperties.class" />
-			<include name="com/mirth/connect/connectors/http/HttpStaticResource.class" />
-			<include name="com/mirth/connect/connectors/http/HttpStaticResource$ResourceType.class" />
 		</jar>
 		<jar destfile="${connectors.http}/http-server.jar">
 			<fileset dir="${classes}">
 				<include name="com/mirth/connect/connectors/http/**" />
 				<exclude name="com/mirth/connect/connectors/http/HttpReceiverProperties.class" />
 				<exclude name="com/mirth/connect/connectors/http/HttpDispatcherProperties.class" />
-				<exclude name="com/mirth/connect/connectors/http/HttpStaticResource.class" />
-				<exclude name="com/mirth/connect/connectors/http/HttpStaticResource$ResourceType.class" />
 			</fileset>
 		</jar>