channelStatuses = client.getAllChannelStatuses();
@@ -2100,4 +2101,4 @@ private void removeInvalidItems(List list, Class expectedClass) {
}
}
}
-}
\ No newline at end of file
+}
diff --git a/donkey/src/main/java/com/mirth/connect/donkey/util/migration/Migratable.java b/donkey/src/main/java/com/mirth/connect/donkey/util/migration/Migratable.java
index 67b6c1d32e..de7d26cd3e 100644
--- a/donkey/src/main/java/com/mirth/connect/donkey/util/migration/Migratable.java
+++ b/donkey/src/main/java/com/mirth/connect/donkey/util/migration/Migratable.java
@@ -14,13 +14,13 @@
/**
*
* Classes that implement this interface have the ability to migrate serialized object instances
- * from an earlier version of Mirth Connect to a later version. A custom converter is registered
+ * from an earlier version of OIE to a later version. A custom converter is registered
* with XStream that automatically detects objects that implement this interface and runs the
* appropriate interface methods.
*
*
*
- * When adding this interface to a class in a given version of Mirth Connect, the migrate methods
+ * When adding this interface to a class in a given version of OIE, the migrate methods
* prior to that version must be left blank. This is because serialized instances of the class will
* not contain version information. Without version information, the migration code in
* MigratableConverter will assume that the object could have originated from a pre-3.0.0 version
diff --git a/manager/src/com/mirth/connect/manager/BrandingConstants.java b/manager/src/com/mirth/connect/manager/BrandingConstants.java
new file mode 100644
index 0000000000..4ea97f0983
--- /dev/null
+++ b/manager/src/com/mirth/connect/manager/BrandingConstants.java
@@ -0,0 +1,9 @@
+package com.mirth.connect.manager;
+
+public class BrandingConstants {
+
+ public static final String PRODUCT_NAME = "Open Integration Engine";
+ public static final String COMPANY_NAME = "Open Integration Engine";
+
+ public static final String CONTACT_URL = "https://openintegrationengine.org/contact/";
+}
diff --git a/manager/src/com/mirth/connect/manager/ManagerController.java b/manager/src/com/mirth/connect/manager/ManagerController.java
index d424d7ac4a..de6c57db19 100644
--- a/manager/src/com/mirth/connect/manager/ManagerController.java
+++ b/manager/src/com/mirth/connect/manager/ManagerController.java
@@ -173,7 +173,7 @@ public Void doInBackground() {
public void done() {
if (errorMessage == null) {
- PlatformUI.MANAGER_TRAY.alertInfo("The Mirth Connect Service was started successfully.");
+ PlatformUI.MANAGER_TRAY.alertInfo(String.format("The %s Service was started successfully.", BrandingConstants.PRODUCT_NAME));
} else {
PlatformUI.MANAGER_TRAY.alertError(errorMessage);
}
@@ -215,7 +215,7 @@ private String startMirth() {
updating = true;
if (!serviceController.startService()) {
- errorMessage = "The Mirth Connect Service could not be started. Please verify that it is installed and not already started.";
+ errorMessage = String.format("The %s Service could not be started. Please verify that it is installed and not already started.", BrandingConstants.PRODUCT_NAME);
} else {
String contextPath = getContextPath();
@@ -240,13 +240,13 @@ private String startMirth() {
}
if (!started) {
- errorMessage = "The Mirth Connect Service could not be started.";
+ errorMessage = String.format("The %s Service could not be started.", BrandingConstants.PRODUCT_NAME);
}
}
} catch (Throwable t) { // Need to catch Throwable in case Client fails
// internally
t.printStackTrace();
- errorMessage = "The Mirth Connect Service could not be started.";
+ errorMessage = String.format("The %s Service could not be started.", BrandingConstants.PRODUCT_NAME);
} finally {
if (client != null) {
client.close();
@@ -271,7 +271,7 @@ public Void doInBackground() {
public void done() {
if (errorMessage == null) {
- PlatformUI.MANAGER_TRAY.alertInfo("The Mirth Connect Service was stopped successfully.");
+ PlatformUI.MANAGER_TRAY.alertInfo(String.format("The %s Service was stopped successfully.", BrandingConstants.PRODUCT_NAME));
} else {
PlatformUI.MANAGER_TRAY.alertError(errorMessage);
}
@@ -289,11 +289,11 @@ private String stopMirth() {
try {
updating = true;
if (!serviceController.stopService()) {
- errorMessage = "The Mirth Connect Service could not be stopped. Please verify that it is installed and started.";
+ errorMessage = String.format("The %s Service could not be stopped. Please verify that it is installed and started.", BrandingConstants.PRODUCT_NAME);
}
} catch (Exception e) {
e.printStackTrace();
- errorMessage = "The Mirth Connect Service could not be stopped. Please verify that it is installed and started.";
+ errorMessage = String.format("The %s Service could not be stopped. Please verify that it is installed and started.", BrandingConstants.PRODUCT_NAME);
}
updating = false;
@@ -314,7 +314,7 @@ public Void doInBackground() {
public void done() {
if (errorMessage == null) {
- PlatformUI.MANAGER_TRAY.alertInfo("The Mirth Connect Service was restarted successfully.");
+ PlatformUI.MANAGER_TRAY.alertInfo(String.format("The %s Service was restarted successfully.", BrandingConstants.PRODUCT_NAME));
} else {
PlatformUI.MANAGER_TRAY.alertError(errorMessage);
}
@@ -377,7 +377,7 @@ public void launchAdministrator(String maxHeapSize) {
}
if (!success) {
- PlatformUI.MANAGER_TRAY.alertError("The Mirth Connect Administator could not be launched.");
+ PlatformUI.MANAGER_TRAY.alertError(String.format("The %s Administator could not be launched.", BrandingConstants.PRODUCT_NAME));
}
}
diff --git a/manager/src/com/mirth/connect/manager/ManagerDialog.java b/manager/src/com/mirth/connect/manager/ManagerDialog.java
index 56b6e232b7..122afd95e0 100644
--- a/manager/src/com/mirth/connect/manager/ManagerDialog.java
+++ b/manager/src/com/mirth/connect/manager/ManagerDialog.java
@@ -70,7 +70,7 @@ public ManagerDialog() {
LookAndFeelAddons.setAddon(WindowsLookAndFeelAddons.class);
getContentPane().setBackground(Color.WHITE);
- setTitle("Mirth Connect Server Manager");
+ setTitle(String.format("%s Server Manager", BrandingConstants.PRODUCT_NAME));
setIconImage(new ImageIcon(this.getClass().getResource("images/NG_MC-ServerManager_Icon_F_32x32.png")).getImage());
DisplayUtil.setResizable(this, false);
@@ -162,7 +162,7 @@ public void actionPerformed(ActionEvent evt) {
startButtonActionPerformed(evt);
}
});
- startLabel = new JLabel("Starts the Mirth Connect service");
+ startLabel = new JLabel(String.format("Starts the %s service", BrandingConstants.PRODUCT_NAME));
restartButton = new JButton("Restart");
restartButton.addActionListener(new ActionListener() {
@@ -170,7 +170,7 @@ public void actionPerformed(ActionEvent evt) {
restartButtonActionPerformed(evt);
}
});
- restartLabel = new JLabel("Restarts the Mirth Connect service");
+ restartLabel = new JLabel(String.format("Restarts the %s service", BrandingConstants.PRODUCT_NAME));
stopButton = new JButton("Stop");
stopButton.addActionListener(new ActionListener() {
@@ -178,7 +178,7 @@ public void actionPerformed(ActionEvent evt) {
stopButtonActionPerformed(evt);
}
});
- stopLabel = new JLabel("Stops the Mirth Connect service");
+ stopLabel = new JLabel(String.format("Stops the %s service", BrandingConstants.PRODUCT_NAME));
refreshButton = new JButton("Refresh");
refreshButton.addActionListener(new ActionListener() {
@@ -186,9 +186,9 @@ public void actionPerformed(ActionEvent evt) {
refreshButtonActionPerformed(evt);
}
});
- refreshLabel = new JLabel("Refreshes the Mirth Connect service status");
+ refreshLabel = new JLabel(String.format("Refreshes the %s service status", BrandingConstants.PRODUCT_NAME));
- startup = new JCheckBox("Start Mirth Connect Server Manager on system startup");
+ startup = new JCheckBox(String.format("Start %s Server Manager on system startup", BrandingConstants.PRODUCT_NAME));
startup.setFocusable(false);
startup.setToolTipText("Starts this application when logging into the operating system. Currently only enabled for Windows.");
startup.setBackground(new Color(255, 255, 255));
@@ -305,9 +305,9 @@ private void initInfoPanel() {
javaVersionLabel = new JLabel("Java Version:");
javaVersionField = new JLabel("javaVersion");
- contactPrefixLabel = new JLabel("Need Help? Contact");
- mirthSupportLink = new JLabel("NextGen Healthcare");
- mirthSupportLink.setToolTipText("Visit NextGen Healthcare's website.");
+ contactPrefixLabel = new JLabel("Need Help? Contact");
+ mirthSupportLink = new JLabel(String.format("%s", BrandingConstants.COMPANY_NAME));
+ mirthSupportLink.setToolTipText(String.format("Visit %s's website.", BrandingConstants.COMPANY_NAME));
mirthSupportLink.setCursor(new Cursor(Cursor.HAND_CURSOR));
mirthSupportLink.addMouseListener(new MouseAdapter() {
public void mouseClicked(MouseEvent evt) {
@@ -437,7 +437,7 @@ private void initLayout() {
}
private void mirthSupportLinkMouseClicked(MouseEvent evt) {
- BareBonesBrowserLaunch.openURL("https://www.nextgen.com/contact-us");
+ BareBonesBrowserLaunch.openURL(BrandingConstants.CONTACT_URL);
}
private void startupActionPerformed(ActionEvent evt) {
diff --git a/manager/src/com/mirth/connect/manager/ManagerTray.java b/manager/src/com/mirth/connect/manager/ManagerTray.java
index 5497d7bb9e..93557cceca 100644
--- a/manager/src/com/mirth/connect/manager/ManagerTray.java
+++ b/manager/src/com/mirth/connect/manager/ManagerTray.java
@@ -36,7 +36,7 @@ public class ManagerTray {
public ManagerTray() {}
public void setupTray() {
- menu = new PopupMenu("Mirth Connect Server Manager");
+ menu = new PopupMenu(String.format("%s Server Manager", BrandingConstants.PRODUCT_NAME));
viewItem = new MenuItem("Show Manager");
// viewItem.setIcon(new ImageIcon(this.getClass().getResource("images/start.png")));
@@ -59,7 +59,7 @@ public void actionPerformed(ActionEvent e) {
});
menu.add(administratorItem);
- startItem = new MenuItem("Start Mirth Connect");
+ startItem = new MenuItem(String.format("Start %s", BrandingConstants.PRODUCT_NAME));
// startItem.setIcon(new ImageIcon(this.getClass().getResource("images/start.png")));
startItem.addActionListener(new ActionListener() {
@@ -69,7 +69,7 @@ public void actionPerformed(ActionEvent e) {
});
menu.add(startItem);
- stopItem = new MenuItem("Stop Mirth Connect");
+ stopItem = new MenuItem(String.format("Stop %s", BrandingConstants.PRODUCT_NAME));
// stopItem.setIcon(new ImageIcon(this.getClass().getResource("images/stop.png")));
stopItem.addActionListener(new ActionListener() {
@@ -79,7 +79,7 @@ public void actionPerformed(ActionEvent e) {
});
menu.add(stopItem);
- restartItem = new MenuItem("Restart Mirth Connect");
+ restartItem = new MenuItem(String.format("Restart %s", BrandingConstants.PRODUCT_NAME));
// restartItem.setIcon(new ImageIcon(this.getClass().getResource("images/restart.png")));
restartItem.addActionListener(new ActionListener() {
@@ -102,7 +102,7 @@ public void actionPerformed(ActionEvent evt) {
menu.add(quitItem);
ImageIcon icon = new ImageIcon(this.getClass().getResource("images/NG_MC_Icon_Grey_32x32.png"));
- mirthTrayIcon = new TrayIcon(icon.getImage(), "Mirth Connect Server Manager", menu);
+ mirthTrayIcon = new TrayIcon(icon.getImage(), String.format("%s Server Manager", BrandingConstants.PRODUCT_NAME), menu);
mirthTrayIcon.setImageAutoSize(true);
// Action listener for left click.
diff --git a/manager/src/com/mirth/connect/manager/MirthHeadingPanel.java b/manager/src/com/mirth/connect/manager/MirthHeadingPanel.java
index c00fc10920..116c91ab60 100644
--- a/manager/src/com/mirth/connect/manager/MirthHeadingPanel.java
+++ b/manager/src/com/mirth/connect/manager/MirthHeadingPanel.java
@@ -42,7 +42,7 @@ private void setupPanel() {
JLabel headingLabel = new JLabel();
headingLabel.setFont(new Font("Tahoma", 1, 18)); // NOI18N
headingLabel.setForeground(new Color(255, 255, 255));
- headingLabel.setText("Mirth Connect Server Manager");
+ headingLabel.setText(String.format("%s Server Manager", BrandingConstants.PRODUCT_NAME));
add(headingLabel);
}
diff --git a/manager/src/com/mirth/connect/manager/WindowsServiceController.java b/manager/src/com/mirth/connect/manager/WindowsServiceController.java
index 258acabf59..556a2a59d9 100644
--- a/manager/src/com/mirth/connect/manager/WindowsServiceController.java
+++ b/manager/src/com/mirth/connect/manager/WindowsServiceController.java
@@ -16,7 +16,7 @@
public class WindowsServiceController implements ServiceController {
private final String WINDOWS_PATH_SERVER_MANAGER_EXE = "mcmanager.exe";
- private final String WINDOWS_SERVICE_NAME = "Mirth Connect Service";
+ private final String WINDOWS_SERVICE_NAME = String.format("%s Service", BrandingConstants.PRODUCT_NAME);
private final String WINDOWS_CMD_START = "net start \"";
private final String WINDOWS_CMD_STOP = "net stop \"";
private final String WINDOWS_CMD_STATUS = "net continue \"";
@@ -24,9 +24,9 @@ public class WindowsServiceController implements ServiceController {
private final int WINDOWS_STATUS_STOPPED = 2184;
private final String WINDOWS_STATUS_CHANGING = "2189";
private final String WINDOWS_CMD_QUERY_REGEX = "NET HELPMSG ([0-9]{4})";
- private final String WINDOWS_CMD_REG_QUERY = "REG QUERY HKLM\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Run /v \"Mirth Connect Server Manager\"";
- private final String WINDOWS_CMD_REG_DELETE = "REG DELETE HKLM\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Run /f /v \"Mirth Connect Server Manager\"";
- private final String WINDOWS_CMD_REG_ADD = "REG ADD HKLM\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Run /f /v \"Mirth Connect Server Manager\" /d ";
+ private final String WINDOWS_CMD_REG_QUERY = String.format("REG QUERY HKLM\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Run /v \"%s Server Manager\"", BrandingConstants.PRODUCT_NAME);
+ private final String WINDOWS_CMD_REG_DELETE = String.format("REG DELETE HKLM\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Run /f /v \"%s Server Manager\"", BrandingConstants.PRODUCT_NAME);
+ private final String WINDOWS_CMD_REG_ADD = String.format("REG ADD HKLM\\SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Run /f /v \"%s Server Manager\" /d ", BrandingConstants.PRODUCT_NAME);
@Override
public int checkService() {
diff --git a/server/src/com/mirth/connect/client/core/BrandingConstants.java b/server/src/com/mirth/connect/client/core/BrandingConstants.java
new file mode 100644
index 0000000000..b9d5cfe50f
--- /dev/null
+++ b/server/src/com/mirth/connect/client/core/BrandingConstants.java
@@ -0,0 +1,12 @@
+package com.mirth.connect.client.core;
+
+public class BrandingConstants {
+
+ public static final String PRODUCT_NAME = "Open Integration Engine";
+ public static final String COMPANY_NAME = "Open Integration Engine";
+ public static final String COMPANY_URL = "https://openintegrationengine.org";
+
+ public static final String CLIENT_CONNECTION_HEADER = "openintegrationengine-client";
+
+ public static final String SERVER_CERTIFICATE_CN = "oie-engine";
+}
diff --git a/server/src/com/mirth/connect/client/core/Client.java b/server/src/com/mirth/connect/client/core/Client.java
index fb2bde0012..a0ba3f57bb 100644
--- a/server/src/com/mirth/connect/client/core/Client.java
+++ b/server/src/com/mirth/connect/client/core/Client.java
@@ -329,7 +329,7 @@ public boolean isClosed() {
****************/
/**
- * Logs in to the Mirth Connect server using the specified name and password.
+ * Logs in to the server using the specified name and password.
*
* @see UserServletInterface#login
*/
@@ -535,7 +535,7 @@ public String getServerId() throws ClientException {
}
/**
- * Returns the version of the Mirth Connect server.
+ * Returns the version of the server.
*
* @see ConfigurationServletInterface#getVersion
*/
@@ -545,7 +545,7 @@ public String getVersion() throws ClientException {
}
/**
- * Returns the build date of the Mirth Connect server.
+ * Returns the build date of the server.
*
* @see ConfigurationServletInterface#getBuildDate
*/
@@ -555,7 +555,7 @@ public String getBuildDate() throws ClientException {
}
/**
- * Returns the status of the Mirth Connect server.
+ * Returns the status of the server.
*
* @see ConfigurationServletInterface#getStatus
*/
@@ -585,7 +585,7 @@ public Calendar getServerTime() throws ClientException {
}
/**
- * Returns the name of the JVM running Mirth Connect.
+ * Returns the name of the JVM running the server.
*
* @see ConfigurationServletInterface#getJVMName
*/
@@ -595,7 +595,7 @@ public String getJVMName() throws ClientException {
}
/**
- * Returns a map of common information about the Mirth Connect server.
+ * Returns a map of common information about the server.
*
* @see ConfigurationServletInterface#getAbout
*/
@@ -605,8 +605,8 @@ public Map getAbout() throws ClientException {
}
/**
- * Returns a ServerConfiguration object which contains all of the channels, users, alerts and
- * properties stored on the Mirth Connect server.
+ * Returns a ServerConfiguration object which contains all the channels, users, alerts and
+ * properties stored on the server.
*
* @see ConfigurationServletInterface#getServerConfiguration
*/
@@ -615,8 +615,8 @@ public ServerConfiguration getServerConfiguration() throws ClientException {
}
/**
- * Returns a ServerConfiguration object which contains all of the channels, users, alerts and
- * properties stored on the Mirth Connect server.
+ * Returns a ServerConfiguration object which contains all the channels, users, alerts and
+ * properties stored on the server.
*
* @see ConfigurationServletInterface#getServerConfiguration
*/
@@ -626,7 +626,7 @@ public ServerConfiguration getServerConfiguration(DeployedState initialState, bo
}
/**
- * Updates all of the channels, alerts and properties stored on the Mirth Connect server.
+ * Updates all the channels, alerts and properties stored on the server.
*
* @see ConfigurationServletInterface#setServerConfiguration
*/
diff --git a/server/src/com/mirth/connect/client/core/ServerConnection.java b/server/src/com/mirth/connect/client/core/ServerConnection.java
index 17aeaaadb8..2b50501805 100644
--- a/server/src/com/mirth/connect/client/core/ServerConnection.java
+++ b/server/src/com/mirth/connect/client/core/ServerConnection.java
@@ -424,7 +424,7 @@ private HttpRequestBase setupRequestBase(ClientRequest request, Map> entry : request.getStringHeaders().entrySet()) {
for (String value : entry.getValue()) {
diff --git a/server/src/com/mirth/connect/client/core/Version.java b/server/src/com/mirth/connect/client/core/Version.java
index 0405ee2c72..c3f97dc816 100644
--- a/server/src/com/mirth/connect/client/core/Version.java
+++ b/server/src/com/mirth/connect/client/core/Version.java
@@ -16,7 +16,7 @@ public enum Version {
// @formatter:off
/*
- * When a new version of Mirth Connect is released, do the following:
+ * When a new version of OIE is released, do the following:
* 1) Add the new version to the end of the list below (the list must be kept in historical order)
* 2) Specify a Migrator class for the new version in the ServerMigrator class
* 3) Add migration code/classes for any plugins that need to be migrated (don't forget the MigratableConverter class)
diff --git a/server/src/com/mirth/connect/client/core/api/servlets/ConfigurationServletInterface.java b/server/src/com/mirth/connect/client/core/api/servlets/ConfigurationServletInterface.java
index fceec1ca15..9f8d391bfe 100644
--- a/server/src/com/mirth/connect/client/core/api/servlets/ConfigurationServletInterface.java
+++ b/server/src/com/mirth/connect/client/core/api/servlets/ConfigurationServletInterface.java
@@ -73,20 +73,20 @@ public interface ConfigurationServletInterface extends BaseServletInterface {
@GET
@Path("/version")
@Produces(MediaType.TEXT_PLAIN)
- @Operation(summary = "Returns the version of the Mirth Connect server.")
+ @Operation(summary = "Returns the version of the server.")
@MirthOperation(name = "getVersion", display = "Get version", auditable = false)
public String getVersion() throws ClientException;
@GET
@Path("/buildDate")
@Produces(MediaType.TEXT_PLAIN)
- @Operation(summary = "Returns the build date of the Mirth Connect server.")
+ @Operation(summary = "Returns the build date of the server.")
@MirthOperation(name = "getBuildDate", display = "Get build date", auditable = false)
public String getBuildDate() throws ClientException;
@GET
@Path("/status")
- @Operation(summary = "Returns the status of the Mirth Connect server.")
+ @Operation(summary = "Returns the status of the server.")
@ApiResponse(content = {
@Content(mediaType = MediaType.APPLICATION_XML, examples = {
@ExampleObject(name = "status", ref = "../apiexamples/integer_xml") }),
@@ -116,13 +116,13 @@ public interface ConfigurationServletInterface extends BaseServletInterface {
@GET
@Path("/jvm")
@Produces(MediaType.TEXT_PLAIN)
- @Operation(summary = "Returns the name of the JVM running Mirth Connect.")
+ @Operation(summary = "Returns the name of the JVM running the server.")
@MirthOperation(name = "getJVMName", display = "Get JVM name", auditable = false)
public String getJVMName() throws ClientException;
@GET
@Path("/about")
- @Operation(summary = "Returns a map of common information about the Mirth Connect server.")
+ @Operation(summary = "Returns a map of common information about the server.")
@ApiResponse(content = {
@Content(mediaType = MediaType.APPLICATION_XML, examples = {
@ExampleObject(name = "aboutMap", ref = "../apiexamples/generic_map_xml") }),
@@ -133,7 +133,7 @@ public interface ConfigurationServletInterface extends BaseServletInterface {
@GET
@Path("/configuration")
- @Operation(summary = "Returns a ServerConfiguration object which contains all of the channels, alerts, configuration map, and properties stored on the Mirth Connect server.")
+ @Operation(summary = "Returns a ServerConfiguration object which contains all of the channels, alerts, configuration map, and properties stored on the server.")
@ApiResponse(content = { @Content(mediaType = MediaType.APPLICATION_XML, examples = {
@ExampleObject(name = "serverConfiguration", ref = "../apiexamples/server_configuration_xml") }),
@Content(mediaType = MediaType.APPLICATION_JSON, examples = {
@@ -147,7 +147,7 @@ public ServerConfiguration getServerConfiguration(// @formatter:off
@PUT
@Path("/configuration")
- @Operation(summary = "Updates all of the channels, alerts and properties stored on the Mirth Connect server.")
+ @Operation(summary = "Updates all of the channels, alerts and properties stored on the server.")
@MirthOperation(name = "setServerConfiguration", display = "Set server configuration", permission = Permissions.SERVER_CONFIGURATION_RESTORE, type = ExecuteType.ASYNC)
public void setServerConfiguration(// @formatter:off
@Param("serverConfiguration") @RequestBody(description = "The ServerConfiguration object containing all channels, users, alerts, and properties to update.", required = true, content = {
diff --git a/server/src/com/mirth/connect/client/core/api/servlets/UserServletInterface.java b/server/src/com/mirth/connect/client/core/api/servlets/UserServletInterface.java
index 119bf13ce5..906c9f4647 100644
--- a/server/src/com/mirth/connect/client/core/api/servlets/UserServletInterface.java
+++ b/server/src/com/mirth/connect/client/core/api/servlets/UserServletInterface.java
@@ -55,7 +55,7 @@ public interface UserServletInterface extends BaseServletInterface {
@POST
@Path("/_login")
@Consumes(MediaType.APPLICATION_FORM_URLENCODED)
- @Operation(summary = "Logs in to the Mirth Connect server using the specified name and password.")
+ @Operation(summary = "Logs in to the server using the specified name and password.")
@ApiResponse(content = { @Content(mediaType = MediaType.APPLICATION_XML, examples = {
@ExampleObject(name = "loginStatus", ref = "../apiexamples/login_status_xml") }),
@Content(mediaType = MediaType.APPLICATION_JSON, examples = {
diff --git a/server/src/com/mirth/connect/connectors/http/HttpDispatcher.java b/server/src/com/mirth/connect/connectors/http/HttpDispatcher.java
index 6360c35511..8bd8657000 100644
--- a/server/src/com/mirth/connect/connectors/http/HttpDispatcher.java
+++ b/server/src/com/mirth/connect/connectors/http/HttpDispatcher.java
@@ -26,6 +26,7 @@
import javax.mail.internet.MimeMultipart;
import javax.mail.util.ByteArrayDataSource;
+import com.mirth.connect.client.core.BrandingConstants;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.collections4.map.CaseInsensitiveMap;
import org.apache.commons.fileupload.FileUploadBase;
@@ -583,7 +584,7 @@ private HttpRequestBase buildHttpRequest(URI hostURI, HttpDispatcherProperties h
}
}
if (!userAgentFound) {
- httpMethod.addHeader("user-agent", "Mirth Connect");
+ httpMethod.addHeader("user-agent", BrandingConstants.PRODUCT_NAME);
}
// Only set the Content-Type for entity-enclosing methods, but not if multipart is used
diff --git a/server/src/com/mirth/connect/model/ServerConfiguration.java b/server/src/com/mirth/connect/model/ServerConfiguration.java
index 86e18f262f..a9b634dd65 100644
--- a/server/src/com/mirth/connect/model/ServerConfiguration.java
+++ b/server/src/com/mirth/connect/model/ServerConfiguration.java
@@ -24,6 +24,7 @@
import javax.swing.text.DateFormatter;
+import com.mirth.connect.client.core.BrandingConstants;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.commons.lang3.tuple.ImmutablePair;
@@ -216,7 +217,7 @@ public void migrate3_2_0(DonkeyElement element) {
DirectoryResourceProperties defaultResource = new DirectoryResourceProperties();
defaultResource.setId(ResourceProperties.DEFAULT_RESOURCE_ID);
defaultResource.setName(ResourceProperties.DEFAULT_RESOURCE_NAME);
- defaultResource.setDescription("Loads libraries from the custom-lib folder in the Mirth Connect home directory.");
+ defaultResource.setDescription(String.format("Loads libraries from the custom-lib folder in the %s home directory.", BrandingConstants.PRODUCT_NAME));
defaultResource.setIncludeWithGlobalScripts(true);
defaultResource.setDirectory("custom-lib");
list.getList().add(defaultResource);
@@ -423,4 +424,4 @@ public void migrate3_11_1(DonkeyElement element) {}
@Override
public void migrate3_12_0(DonkeyElement element) {}
-}
\ No newline at end of file
+}
diff --git a/server/src/com/mirth/connect/plugins/datatypes/hl7v2/HL7v2ResponseGenerationProperties.java b/server/src/com/mirth/connect/plugins/datatypes/hl7v2/HL7v2ResponseGenerationProperties.java
index 2a2b4c6a68..c5c1cb77c5 100644
--- a/server/src/com/mirth/connect/plugins/datatypes/hl7v2/HL7v2ResponseGenerationProperties.java
+++ b/server/src/com/mirth/connect/plugins/datatypes/hl7v2/HL7v2ResponseGenerationProperties.java
@@ -15,6 +15,7 @@
import java.util.LinkedHashMap;
import java.util.Map;
+import com.mirth.connect.client.core.BrandingConstants;
import org.apache.commons.lang3.StringUtils;
import com.mirth.connect.donkey.util.DonkeyElement;
@@ -60,7 +61,7 @@ public Map getPropertyDescriptors() {
properties.put("errorACKMessage", new DataTypePropertyDescriptor(errorACKMessage, "Error ACK Message", "The ACK message to respond with when an error occurs during message processing. This option has no effect unless an \"Auto-generate\" item has been selected in the response settings.", PropertyEditorType.STRING));
properties.put("rejectedACKCode", new DataTypePropertyDescriptor(rejectedACKCode, "Rejected ACK Code", "The ACK code to respond with when the message is filtered. This option has no effect unless an \"Auto-generate\" item has been selected in the response settings.", PropertyEditorType.STRING));
properties.put("rejectedACKMessage", new DataTypePropertyDescriptor(rejectedACKMessage, "Rejected ACK Message", "The ACK message to respond with when the message is filtered. This option has no effect unless an \"Auto-generate\" item has been selected in the response settings.", PropertyEditorType.STRING));
- properties.put("msh15ACKAccept", new DataTypePropertyDescriptor(msh15ACKAccept, "MSH-15 ACK Accept", "This setting determines if Mirth Connect should check the MSH-15 field of an incoming message to control the acknowledgment conditions. The MSH-15 field specifies if a message should be always acknowledged, never acknowledged, or only acknowledged on error. This option has no effect unless an \"Auto-generate\" item has been selected in the response settings.", PropertyEditorType.BOOLEAN));
+ properties.put("msh15ACKAccept", new DataTypePropertyDescriptor(msh15ACKAccept, "MSH-15 ACK Accept", String.format("This setting determines if %s should check the MSH-15 field of an incoming message to control the acknowledgment conditions. The MSH-15 field specifies if a message should be always acknowledged, never acknowledged, or only acknowledged on error. This option has no effect unless an \"Auto-generate\" item has been selected in the response settings.", BrandingConstants.PRODUCT_NAME), PropertyEditorType.BOOLEAN));
properties.put("dateFormat", new DataTypePropertyDescriptor(dateFormat, "Date Format", "This setting determines the date format used for the timestamp in the generated ACK. The default value is \"yyyyMMddHHmmss.SSS\".", PropertyEditorType.STRING));
return properties;
diff --git a/server/src/com/mirth/connect/server/ExtensionLoader.java b/server/src/com/mirth/connect/server/ExtensionLoader.java
index 8868eb74c9..9af71f74d7 100644
--- a/server/src/com/mirth/connect/server/ExtensionLoader.java
+++ b/server/src/com/mirth/connect/server/ExtensionLoader.java
@@ -17,6 +17,7 @@
import java.util.List;
import java.util.Map;
+import com.mirth.connect.client.core.BrandingConstants;
import org.apache.commons.configuration2.PropertiesConfiguration;
import org.apache.commons.configuration2.ex.ConfigurationException;
import org.apache.commons.io.FileUtils;
@@ -205,11 +206,11 @@ private synchronized void loadExtensions() {
pluginMetaDataMap.put(metaData.getName(), (PluginMetaData) metaData);
}
} else {
- logger.error("Extension \"" + metaData.getName() + "\" is not compatible with this version of Mirth Connect and was not loaded. Please install a compatible version.");
+ logger.error("Extension \"{}\" is not compatible with this version of {} and was not loaded. Please install a compatible version.", metaData.getName(), BrandingConstants.PRODUCT_NAME);
invalidMetaDataMap.put(metaData.getName(), metaData);
}
} catch (Exception e) {
- logger.error("Error reading or parsing extension metadata file: " + extensionFile.getName(), e);
+ logger.error("Error reading or parsing extension metadata file: {}", extensionFile.getName(), e);
}
}
} catch (Exception e) {
diff --git a/server/src/com/mirth/connect/server/Mirth.java b/server/src/com/mirth/connect/server/Mirth.java
index 62671690a0..24c64874a7 100644
--- a/server/src/com/mirth/connect/server/Mirth.java
+++ b/server/src/com/mirth/connect/server/Mirth.java
@@ -24,6 +24,7 @@
import java.util.Timer;
import java.util.TimerTask;
+import com.mirth.connect.client.core.BrandingConstants;
import org.apache.commons.configuration2.PropertiesConfiguration;
import org.apache.commons.io.IOUtils;
import org.apache.commons.lang3.StringUtils;
@@ -130,7 +131,7 @@ public void run() {
initializeLogging();
if (initResources()) {
- logger.debug("starting Mirth Connect server...");
+ logger.debug("starting {} server...", BrandingConstants.PRODUCT_NAME);
// Initialize TLS system properties as early as possible, because otherwise they will be cached
if (System.getProperty("jdk.tls.ephemeralDHKeySize") == null) {
@@ -539,9 +540,24 @@ public void run() {
* system console.
*/
private void printSplashScreen() {
- logger.info("Mirth Connect " + versionProperties.getString("mirth.version") + " (Built on " + versionProperties.getString("mirth.date") + ") server successfully started.");
+ logger.info(
+ "{} {} (Built on {}) server successfully started.",
+ BrandingConstants.PRODUCT_NAME,
+ versionProperties.getString("mirth.version"),
+ versionProperties.getString("mirth.date")
+ );
logger.info("This product was developed by NextGen Healthcare (https://www.nextgen.com) and its contributors (c)2005-2024.");
- logger.info("Running " + System.getProperty("java.vm.name") + " " + System.getProperty("java.version") + " on " + System.getProperty("os.name") + " (" + System.getProperty("os.version") + ", " + System.getProperty("os.arch") + "), " + configurationController.getDatabaseType() + ", with charset " + Charset.defaultCharset() + ".");
+ logger.info("Open Integration Engine contributors (c)2025.");
+ logger.info(
+ "Running {} {} on {} ({}, {}), {}, with charset {}.",
+ System.getProperty("java.vm.name"),
+ System.getProperty("java.version"),
+ System.getProperty("os.name"),
+ System.getProperty("os.version"),
+ System.getProperty("os.arch"),
+ configurationController.getDatabaseType(),
+ Charset.defaultCharset()
+ );
if (webServer != null) {
String httpUrl = null;
diff --git a/server/src/com/mirth/connect/server/alert/AlertWorker.java b/server/src/com/mirth/connect/server/alert/AlertWorker.java
index f5e376387a..4de7603b73 100644
--- a/server/src/com/mirth/connect/server/alert/AlertWorker.java
+++ b/server/src/com/mirth/connect/server/alert/AlertWorker.java
@@ -23,6 +23,7 @@
import java.util.concurrent.ThreadPoolExecutor;
import java.util.concurrent.TimeUnit;
+import com.mirth.connect.client.core.BrandingConstants;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.logging.log4j.LogManager;
@@ -44,7 +45,7 @@
import com.mirth.connect.server.util.TemplateValueReplacer;
public abstract class AlertWorker extends EventListener implements AlertActionAcceptor {
- private static final String DEFAULT_SUBJECT = "Mirth Connect Alert";
+ private static final String DEFAULT_SUBJECT = String.format("%s Alert", BrandingConstants.PRODUCT_NAME);
protected Logger logger = LogManager.getLogger(this.getClass());
protected ExecutorService actionExecutor = new ThreadPoolExecutor(0, 1, 60L, TimeUnit.SECONDS, new LinkedBlockingQueue());
diff --git a/server/src/com/mirth/connect/server/api/servlets/SystemServlet.java b/server/src/com/mirth/connect/server/api/servlets/SystemServlet.java
index 40f363c23f..29d5930012 100644
--- a/server/src/com/mirth/connect/server/api/servlets/SystemServlet.java
+++ b/server/src/com/mirth/connect/server/api/servlets/SystemServlet.java
@@ -18,6 +18,7 @@
import javax.ws.rs.core.Context;
import javax.ws.rs.core.SecurityContext;
+import com.mirth.connect.client.core.BrandingConstants;
import org.apache.commons.lang3.ArrayUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.logging.log4j.LogManager;
@@ -85,7 +86,7 @@ public SystemStats getStats() throws ClientException {
// Windows systems have multiple roots, like "A:" and "C:".
if (StringUtils.containsIgnoreCase(System.getProperty("os.name"), "Windows")) {
try {
- // Attempt to get the correct root from the Mirth Connect base directory
+ // Attempt to get the correct root from the OIE base directory
File baseDir = new File(configurationController.getBaseDir());
// Split on the file separator
String[] path = StringUtils.split(baseDir.getCanonicalPath(), File.separatorChar);
@@ -111,7 +112,7 @@ public SystemStats getStats() throws ClientException {
root = pathRoot;
} catch (Exception e) {
- logger.warn("Unable to infer filesystem root from Mirth Connect base directory, defaulting to: " + root, e);
+ logger.warn("Unable to infer filesystem root from {} base directory, defaulting to: {}", BrandingConstants.PRODUCT_NAME, root, e);
}
}
diff --git a/server/src/com/mirth/connect/server/controllers/DefaultConfigurationController.java b/server/src/com/mirth/connect/server/controllers/DefaultConfigurationController.java
index 2b9751f483..49e113d23e 100644
--- a/server/src/com/mirth/connect/server/controllers/DefaultConfigurationController.java
+++ b/server/src/com/mirth/connect/server/controllers/DefaultConfigurationController.java
@@ -53,6 +53,7 @@
import javax.net.ssl.SSLSocketFactory;
import javax.xml.parsers.DocumentBuilderFactory;
+import com.mirth.connect.client.core.BrandingConstants;
import org.apache.commons.codec.binary.Base64;
import org.apache.commons.collections4.CollectionUtils;
import org.apache.commons.collections4.MapUtils;
@@ -1110,7 +1111,7 @@ public String getResources() {
DirectoryResourceProperties defaultResource = new DirectoryResourceProperties();
defaultResource.setId(ResourceProperties.DEFAULT_RESOURCE_ID);
defaultResource.setName(ResourceProperties.DEFAULT_RESOURCE_NAME);
- defaultResource.setDescription("Loads libraries from the custom-lib folder in the Mirth Connect home directory.");
+ defaultResource.setDescription(String.format("Loads libraries from the custom-lib folder in the %s home directory.", BrandingConstants.PRODUCT_NAME));
defaultResource.setIncludeWithGlobalScripts(true);
defaultResource.setDirectory("custom-lib");
@@ -1500,10 +1501,12 @@ private void configureEncryption(Provider provider, KeyStore keyStore, char[] ke
if (StringUtils.equalsAnyIgnoreCase(encryptionConfig.getEncryptionAlgorithm(), "AES", "DES", "DESede")) {
// @formatter:off
- logger.error("Encryption algorithm is currently set to: \"" + encryptionConfig.getEncryptionAlgorithm() + "\"\n"
- + "You should update the \"encryption.algorithm\" in mirth.properties to a more secure option, such as \"" + encryptionConfig.getEncryptionAlgorithm() + "/CBC/PKCS5Padding\".\n"
- + "Support for the currently set algorithm will be REMOVED in a future version, so if you do not update it, Mirth Connect will fail to start.\n"
- + "Please see the Security Best Practices -> Encryption Settings section of the User Guide for more information.");
+ logger.error(
+ "Encryption algorithm is currently set to: \"{}\"\nYou should update the \"encryption.algorithm\" in mirth.properties to a more secure option, such as \"{}/CBC/PKCS5Padding\".\nSupport for the currently set algorithm will be REMOVED in a future version, so if you do not update it, {} will fail to start.\nPlease see the Security Best Practices -> Encryption Settings section of the User Guide for more information.",
+ encryptionConfig.getEncryptionAlgorithm(),
+ encryptionConfig.getEncryptionAlgorithm(),
+ BrandingConstants.PRODUCT_NAME
+ );
// @formatter:on
}
}
@@ -1527,7 +1530,7 @@ private void generateDefaultCertificate(Provider provider, KeyStore keyStore, ch
logger.debug("generated new key pair for CA cert using provider: " + provider.getName());
// Generate CA cert
- X500Name caSubjectName = new X500Name("CN=Mirth Connect Certificate Authority");
+ X500Name caSubjectName = new X500Name(String.format("CN=%s Certificate Authority", BrandingConstants.PRODUCT_NAME));
SubjectPublicKeyInfo caSubjectKey = SubjectPublicKeyInfo.getInstance(caKeyPair.getPublic().getEncoded());
X509v3CertificateBuilder certBuilder = new X509v3CertificateBuilder(caSubjectName, BigInteger.ONE, startDate, expiryDate, caSubjectName, caSubjectKey);
certBuilder.addExtension(org.bouncycastle.asn1.x509.Extension.basicConstraints, true, new BasicConstraints(0));
@@ -1538,7 +1541,7 @@ private void generateDefaultCertificate(Provider provider, KeyStore keyStore, ch
KeyPair sslKeyPair = keyPairGenerator.generateKeyPair();
logger.debug("generated new key pair for SSL cert using provider: " + provider.getName());
- X500Name sslSubjectName = new X500Name("CN=mirth-connect");
+ X500Name sslSubjectName = new X500Name(String.format("CN=%s", BrandingConstants.SERVER_CERTIFICATE_CN));
SubjectPublicKeyInfo sslSubjectKey = SubjectPublicKeyInfo.getInstance(sslKeyPair.getPublic().getEncoded());
X509v3CertificateBuilder sslCertBuilder = new X509v3CertificateBuilder(caSubjectName, new BigInteger(50, new SecureRandom()), startDate, expiryDate, sslSubjectName, sslSubjectKey);
sslCertBuilder.addExtension(org.bouncycastle.asn1.x509.Extension.authorityKeyIdentifier, false, new AuthorityKeyIdentifier(caCert.getEncoded()));
@@ -1680,7 +1683,7 @@ public ConnectionTestResponse sendTestEmail(Properties properties) throws Except
}
}
- email.setSubject("Mirth Connect Test Email");
+ email.setSubject(String.format("%s Test Email", BrandingConstants.PRODUCT_NAME));
try {
for (String toAddress : StringUtils.split(to, ",")) {
@@ -1688,10 +1691,15 @@ public ConnectionTestResponse sendTestEmail(Properties properties) throws Except
}
email.setFrom(from);
- email.setMsg("Receipt of this email confirms that mail originating from this Mirth Connect Server is capable of reaching its intended destination.\n\nSMTP Configuration:\n- Host: " + host + "\n- Port: " + port);
+ email.setMsg(String.format(
+ "Receipt of this email confirms that mail originating from this %s Server is capable of reaching its intended destination.\n\nSMTP Configuration:\n- Host: %s\n- Port: %d",
+ BrandingConstants.PRODUCT_NAME,
+ host,
+ port
+ ));
email.send();
- return new ConnectionTestResponse(ConnectionTestResponse.Type.SUCCESS, "Sucessfully sent test email to: " + to);
+ return new ConnectionTestResponse(ConnectionTestResponse.Type.SUCCESS, "Successfully sent test email to: " + to);
} catch (EmailException e) {
return new ConnectionTestResponse(ConnectionTestResponse.Type.FAILURE, e.getMessage());
}
diff --git a/server/src/com/mirth/connect/server/controllers/DefaultExtensionController.java b/server/src/com/mirth/connect/server/controllers/DefaultExtensionController.java
index 30b7bfa6ad..b4bd85e893 100644
--- a/server/src/com/mirth/connect/server/controllers/DefaultExtensionController.java
+++ b/server/src/com/mirth/connect/server/controllers/DefaultExtensionController.java
@@ -36,6 +36,7 @@
import javax.xml.parsers.DocumentBuilderFactory;
+import com.mirth.connect.client.core.BrandingConstants;
import org.apache.commons.io.FileUtils;
import org.apache.commons.io.FilenameUtils;
import org.apache.commons.io.IOUtils;
@@ -444,7 +445,7 @@ public InstallationResult extractExtension(InputStream inputStream) {
if (!extensionLoader.isExtensionCompatible(extensionMetaData)) {
if (cause == null) {
- cause = new VersionMismatchException("Extension \"" + entry.getName() + "\" is not compatible with this version of Mirth Connect.");
+ cause = new VersionMismatchException(String.format("Extension \"%s\" is not compatible with this version of %s.", entry.getName(), BrandingConstants.PRODUCT_NAME));
}
}
}
diff --git a/server/src/com/mirth/connect/server/servlets/SwaggerServlet.java b/server/src/com/mirth/connect/server/servlets/SwaggerServlet.java
index faf264334c..5ac2d11866 100644
--- a/server/src/com/mirth/connect/server/servlets/SwaggerServlet.java
+++ b/server/src/com/mirth/connect/server/servlets/SwaggerServlet.java
@@ -9,6 +9,7 @@
package com.mirth.connect.server.servlets;
+import com.mirth.connect.client.core.BrandingConstants;
import io.swagger.v3.jaxrs2.integration.ServletOpenApiContextBuilder;
import io.swagger.v3.oas.integration.OpenApiConfigurationException;
import io.swagger.v3.oas.integration.SwaggerConfiguration;
@@ -60,8 +61,8 @@ public void init(ServletConfig config) throws ServletException {
servers.add(new Server().url(basePath));
oas.servers(servers);
- Info info = new Info().title("NextGen Connect Client API")
- .description("Swagger documentation for the NextGen Connect Client API.")
+ Info info = new Info().title(String.format("%s Client API", BrandingConstants.PRODUCT_NAME))
+ .description(String.format("Swagger documentation for the %s Client API.", BrandingConstants.PRODUCT_NAME))
.version(apiVersion.toString());
oas.info(info);
diff --git a/server/src/com/mirth/connect/server/servlets/WebStartServlet.java b/server/src/com/mirth/connect/server/servlets/WebStartServlet.java
index 16d5c2f9ed..ecc077b7ab 100644
--- a/server/src/com/mirth/connect/server/servlets/WebStartServlet.java
+++ b/server/src/com/mirth/connect/server/servlets/WebStartServlet.java
@@ -30,6 +30,7 @@
import javax.servlet.http.HttpServletResponse;
import javax.xml.parsers.DocumentBuilderFactory;
+import com.mirth.connect.client.core.BrandingConstants;
import org.apache.commons.configuration2.PropertiesConfiguration;
import org.apache.commons.configuration2.ex.ConfigurationException;
import org.apache.commons.lang3.StringUtils;
@@ -145,7 +146,7 @@ protected Document getAdministratorJnlp(HttpServletRequest request) throws Excep
Element jnlpElement = document.getDocumentElement();
- // Change the title to include the version of Mirth Connect
+ // Change the title to include the version
PropertiesConfiguration versionProperties = PropertiesConfigurationUtil.create();
InputStream versionPropsIs = null;
@@ -349,7 +350,7 @@ protected Document getExtensionJnlp(String extensionPath) throws Exception {
informationElement.appendChild(titleElement);
Element vendorElement = document.createElement("vendor");
- vendorElement.setTextContent("NextGen Healthcare");
+ vendorElement.setTextContent(BrandingConstants.COMPANY_NAME);
informationElement.appendChild(vendorElement);
jnlpElement.appendChild(informationElement);