Skip to content

Commit 4717c5f

Browse files
roginrogin
authored
Merge branch 'main' into fix-policy-link-issue
Signed-off-by: Richard Ogin <[email protected]>
2 parents fc6af2f + 371f041 commit 4717c5f

File tree

156 files changed

+3546
-5066
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

156 files changed

+3546
-5066
lines changed

‎.gitignore‎

Lines changed: 104 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,108 @@
1-
1+
##############################
2+
## Java
3+
##############################
4+
.mtj.tmp/
5+
*.class
6+
# Re-enable after move to MVN or Gradle
7+
#*.jar
8+
*.war
9+
*.ear
10+
*.nar
11+
hs_err_pid*
12+
replay_pid*
13+
14+
##############################
15+
## Maven
16+
##############################
17+
target/
18+
pom.xml.tag
19+
pom.xml.releaseBackup
20+
pom.xml.versionsBackup
21+
pom.xml.next
22+
pom.xml.bak
23+
release.properties
24+
dependency-reduced-pom.xml
25+
buildNumber.properties
26+
.mvn/timing.properties
27+
.mvn/wrapper/maven-wrapper.jar
28+
29+
##############################
30+
## Gradle
31+
##############################
32+
bin/
33+
build/
34+
.gradle
35+
.gradletasknamecache
36+
gradle-app.setting
37+
!gradle-wrapper.jar
38+
39+
##############################
40+
## IntelliJ
41+
##############################
42+
out/
43+
.idea/
44+
.idea_modules/
45+
*.iml
46+
*.ipr
47+
*.iws
48+
49+
##############################
50+
## Eclipse
51+
##############################
52+
.settings/
53+
bin/
54+
tmp/
55+
.metadata
56+
.classpath
57+
.project
58+
*.tmp
59+
*.bak
60+
*.swp
61+
*~.nib
62+
local.properties
63+
.loadpath
64+
.factorypath
65+
66+
##############################
67+
## NetBeans
68+
##############################
69+
nbproject/private/
70+
build/
71+
nbbuild/
72+
dist/
73+
nbdist/
74+
nbactions.xml
75+
nb-configuration.xml
76+
77+
##############################
78+
## Visual Studio Code
79+
##############################
80+
.vs/
81+
.vscode/
82+
.code-workspace
83+
84+
##############################
85+
## OS X
86+
##############################
87+
.DS_Store
88+
89+
##############################
90+
## Windows
91+
##############################
92+
Thumbs.db
93+
ehthumbs.db
94+
Desktop.ini
95+
96+
##############################
97+
## Miscellaneous
98+
##############################
99+
*.log
100+
101+
##############################
102+
## Project Specific
103+
##############################
2104
# /
3-
4-
.idea
105+
.java-version
5106
**/*.iml
6107
donkey/donkey-src
7108
donkey/donkey-test
@@ -64,7 +165,6 @@ donkey/donkey-test
64165
# /client/src/com/mirth/connect/client/ui/extensionmanager/
65166

66167
# /client/src/com/mirth/connect/client/ui/images/
67-
/client/src/com/mirth/connect/client/ui/images/Thumbs.db
68168

69169
# /client/src/com/mirth/connect/client/ui/panels/
70170

@@ -413,7 +513,6 @@ donkey/donkey-test
413513
# /server/lib/jetty/jsp/
414514

415515
# /server/public_html/
416-
/server/public_html/Thumbs.db
417516

418517
# /server/public_html/css/
419518

‎LICENSE‎

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,3 @@
1-
Copyright (c) NextGen Healthcare. All rights reserved.
2-
3-
https://www.nextgen.com/products-and-services/integration-engine
4-
5-
The software in this package is published under the terms of the MPL license a copy of which has been included below:
6-
71
Mozilla Public License Version 2.0
82
==================================
93

@@ -41,7 +35,7 @@ Mozilla Public License Version 2.0
4135
means any form of the work other than Source Code Form.
4236

4337
1.7. "Larger Work"
44-
means a work that combines Covered Software with other material, in
38+
means a work that combines Covered Software with other material, in
4539
a separate file or files, that is not Covered Software.
4640

4741
1.8. "License"
@@ -376,4 +370,4 @@ Exhibit B - "Incompatible With Secondary Licenses" Notice
376370
---------------------------------------------------------
377371

378372
This Source Code Form is "Incompatible With Secondary Licenses", as
379-
defined by the Mozilla Public License, v. 2.0.
373+
defined by the Mozilla Public License, v. 2.0.

‎client/.classpath‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -213,5 +213,6 @@
213213
<classpathentry kind="lib" path="lib/libphonenumber-8.12.50.jar"/>
214214
<classpathentry kind="lib" path="lib/commons-pool2-2.3.jar"/>
215215
<classpathentry kind="lib" path="lib/xml-apis-1.4.01.jar"/>
216+
<classpathentry kind="lib" path="lib/java-semver-0.10.2.jar"/>
216217
<classpathentry kind="output" path="bin"/>
217218
</classpath>

‎client/ant-build.xml‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,6 @@
4646
<property name="plugins.dashboardstatus" value="${extensions}/dashboardstatus" />
4747
<property name="plugins.destinationsetfilter" value="${extensions}/destinationsetfilter" />
4848
<property name="plugins.dicomviewer" value="${extensions}/dicomviewer" />
49-
<property name="plugins.extensionmanager" value="${extensions}/extensionmanager" />
5049
<property name="plugins.httpauth" value="${extensions}/httpauth" />
5150
<property name="plugins.imageviewer" value="${extensions}/imageviewer" />
5251
<property name="plugins.javascriptrule" value="${extensions}/javascriptrule" />
@@ -234,11 +233,6 @@
234233
<include name="com/mirth/connect/plugins/dicomviewer/**" />
235234
</jar>
236235

237-
<mkdir dir="${plugins.extensionmanager}" />
238-
<jar destfile="${plugins.extensionmanager}/extensionmanager-client.jar" basedir="${classes}">
239-
<include name="com/mirth/connect/plugins/extensionmanager/**" />
240-
</jar>
241-
242236
<mkdir dir="${plugins.globalmapviewer}" />
243237
<jar destfile="${plugins.globalmapviewer}/globalmapviewer-client.jar" basedir="${classes}">
244238
<include name="com/mirth/connect/plugins/globalmapviewer/**" />
@@ -372,4 +366,4 @@
372366
<delete dir="${classes}" />
373367
<delete dir="${test_classes}" />
374368
</target>
375-
</project>
369+
</project>

‎client/lib/java-semver-0.10.2.jar‎

50.8 KB
Binary file not shown.

‎client/src/com/mirth/connect/client/ui/AboutMirth.java‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111

1212
import java.awt.Dimension;
1313
import java.awt.Point;
14-
import java.util.Calendar;
1514

1615
import com.mirth.connect.client.ui.util.DisplayUtil;
1716

@@ -55,21 +54,22 @@ public void loadContent() {
5554
StringBuilder content = new StringBuilder();
5655

5756
if (PlatformUI.SERVER_VERSION != null) {
58-
content.append("Mirth Connect Server " + PlatformUI.SERVER_VERSION + "\n\n");
57+
content.append(String.format("%s Server %s\n\n", BrandingConstants.PRODUCT_NAME, PlatformUI.SERVER_VERSION));
5958
}
6059

6160
if (PlatformUI.BUILD_DATE != null) {
62-
content.append("Built on " + PlatformUI.BUILD_DATE + "\n\n");
61+
content.append("Built on ").append(PlatformUI.BUILD_DATE).append("\n\n");
6362
}
6463

6564
if (PlatformUI.SERVER_ID != null) {
66-
content.append("Server ID: " + PlatformUI.SERVER_ID + "\n\n");
65+
content.append("Server ID: ").append(PlatformUI.SERVER_ID).append("\n\n");
6766
}
6867

69-
content.append("Java version: " + System.getProperty("java.version") + "\n\n");
68+
content.append("Java version: ").append(System.getProperty("java.version")).append("\n\n");
7069

71-
content.append("(c) 2005-2024 NextGen Healthcare. All rights reserved. Visit http://www.nextgen.com\n\n");
72-
content.append("The following is a list of acknowledgements for third-party software that is included with Mirth Connect:\n\n");
70+
content.append("(c) 2025 Open Integration Engine contributors. Visit https://openintegrationengine.org\n\n");
71+
content.append("(c) 2005-2024 NextGen Healthcare.\n\n");
72+
content.append("The following is a list of acknowledgements for third-party software that is included with ").append(BrandingConstants.PRODUCT_NAME).append(":\n\n");
7373
content.append("This product includes software developed by the Apache Software Foundation (http://www.apache.org/).\n\n");
7474
content.append("This product includes all or a portion of the HL7 Vocabulary database, or is derived from the HL7 Vocabulary database, subject to a license from Health Level Seven, Inc.\n\n");
7575
content.append("This product includes a portion of images from http://www.famfamfam.com/lab/icons/silk/.\n\n");
@@ -116,7 +116,7 @@ private void initComponents() {
116116

117117
jLabel2.setFont(new java.awt.Font("Tahoma", 1, 18)); // NOI18N
118118
jLabel2.setForeground(new java.awt.Color(255, 255, 255));
119-
jLabel2.setText("About Mirth Connect");
119+
jLabel2.setText(String.format("About %s", BrandingConstants.PRODUCT_NAME));
120120

121121
javax.swing.GroupLayout mirthHeadingPanel1Layout = new javax.swing.GroupLayout(mirthHeadingPanel1);
122122
mirthHeadingPanel1.setLayout(mirthHeadingPanel1Layout);

‎client/src/com/mirth/connect/client/ui/BrandingConstants.java‎

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
package com.mirth.connect.client.ui;
2+
3+
import javax.swing.ImageIcon;
4+
5+
public class BrandingConstants {
6+
7+
public static final String PRODUCT_NAME = "Open Integration Engine";
8+
public static final String COMPANY_NAME = "Open Integration Engine";
9+
10+
/*
11+
Sets the title of the Administrator window
12+
*/
13+
public static final String WINDOW_TITLE = "Open Integration Engine Administrator";
14+
15+
public static final String ISSUE_TRACKER_LOCATION = "https://github.com/openintegrationengine/engine/issues";
16+
17+
18+
// The URL that is opened when clicking the bottom image in Login window
19+
// The one where you're asked for server URL, username, and password
20+
public static final String COMPANY_URL = "https://openintegrationengine.org";
21+
public static final String COMPANY_TOOLTIP = "Open Integration Engine";
22+
23+
24+
// The URL that is opened when clicking the image in the Top right corner of the main administrator window
25+
// The URL that is opened when clicking "Visit + PRODUCT_NAME" button in Administrator
26+
public static final String PRODUCT_URL = "https://github.com/openintegrationengine/engine";
27+
public static final String PRODUCT_TOOLTIP = "Open Integration Engine";
28+
29+
30+
// The URL that is opened when clicking "Help" button in Administrator
31+
public static String HELP_URL_LOCATION = "https://github.com/OpenIntegrationEngine/engine/discussions";
32+
33+
// The "More info" in Server settings "Provide usage statistics"
34+
public static final String PRIVACY_URL = "https://github.com/openintegrationengine";
35+
public static final String PRIVACY_TOOLTIP = "Privacy Information";
36+
37+
// Icons
38+
// Favicon must be at 32px x 32px scale
39+
public static final ImageIcon FAVICON = new ImageIcon(com.mirth.connect.client.ui.Frame.class.getResource("images/branding/oie_logo_only_white_background_32x32.png"));
40+
// These images must be at 215px x 30px scale
41+
public static final ImageIcon LOGO = new ImageIcon(com.mirth.connect.client.ui.Frame.class.getResource("images/branding/oie_logo_banner_text_215x30.png"));
42+
public static final ImageIcon LOGO_GRAY = new ImageIcon(com.mirth.connect.client.ui.Frame.class.getResource("images/branding/oie_white_logo_banner_text_215x30.png"));
43+
}

‎client/src/com/mirth/connect/client/ui/ChannelPanel.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -217,7 +217,7 @@ public ChannelPanel() {
217217
parent.addTask(TaskConstants.CHANNEL_DEPLOY_DEBUG, "Debug Channel", "Deploys the currently selected channel in debug mode.", "", new ImageIcon(com.mirth.connect.client.ui.Frame.class.getResource("images/bug_go.png")), channelTasks, channelPopupMenu, this);
218218
parent.addTask(TaskConstants.CHANNEL_DEPLOY, "Deploy Channel", "Deploys the currently selected channel.", "", new ImageIcon(com.mirth.connect.client.ui.Frame.class.getResource("images/arrow_redo.png")), channelTasks, channelPopupMenu, this);
219219
parent.addTask(TaskConstants.CHANNEL_EDIT_GLOBAL_SCRIPTS, "Edit Global Scripts", "Edit scripts that are not channel specific.", "G", new ImageIcon(com.mirth.connect.client.ui.Frame.class.getResource("images/script_edit.png")), channelTasks, channelPopupMenu, this);
220-
parent.addTask(TaskConstants.CHANNEL_EDIT_CODE_TEMPLATES, "Edit Code Templates", "Create and manage templates to be used in JavaScript throughout Mirth Connect.", "", new ImageIcon(com.mirth.connect.client.ui.Frame.class.getResource("images/page_edit.png")), channelTasks, channelPopupMenu, this);
220+
parent.addTask(TaskConstants.CHANNEL_EDIT_CODE_TEMPLATES, "Edit Code Templates", String.format("Create and manage templates to be used in JavaScript throughout %s.", BrandingConstants.PRODUCT_NAME), "", new ImageIcon(com.mirth.connect.client.ui.Frame.class.getResource("images/page_edit.png")), channelTasks, channelPopupMenu, this);
221221
parent.addTask(TaskConstants.CHANNEL_NEW_CHANNEL, "New Channel", "Create a new channel.", "N", new ImageIcon(com.mirth.connect.client.ui.Frame.class.getResource("images/application_form_add.png")), channelTasks, channelPopupMenu, this);
222222
parent.addTask(TaskConstants.CHANNEL_IMPORT_CHANNEL, "Import Channel", "Import a channel from an XML file.", "", new ImageIcon(com.mirth.connect.client.ui.Frame.class.getResource("images/report_go.png")), channelTasks, channelPopupMenu, this);
223223
parent.addTask(TaskConstants.CHANNEL_EXPORT_ALL_CHANNELS, "Export All Channels", "Export all of the channels to XML files.", "", new ImageIcon(com.mirth.connect.client.ui.Frame.class.getResource("images/report_disk.png")), channelTasks, channelPopupMenu, this);
@@ -2659,7 +2659,7 @@ private String getMissingExtensions(InvalidChannel channel) {
26592659
StringBuilder builder = new StringBuilder();
26602660

26612661
if (!missingConnectors.isEmpty()) {
2662-
builder.append("\n\nYour Mirth Connect installation is missing required connectors for this channel:\n ");
2662+
builder.append(String.format("\n\nYour %s installation is missing required connectors for this channel:\n ", BrandingConstants.PRODUCT_NAME));
26632663
builder.append(StringUtils.join(missingConnectors.toArray(), "\n "));
26642664
builder.append("\n\n");
26652665
}
@@ -2668,7 +2668,7 @@ private String getMissingExtensions(InvalidChannel channel) {
26682668
if (missingConnectors.isEmpty()) {
26692669
builder.append("\n\n");
26702670
}
2671-
builder.append("Your Mirth Connect installation is missing required data types for this channel:\n ");
2671+
builder.append(String.format("Your %s installation is missing required data types for this channel:\n ", BrandingConstants.PRODUCT_NAME));
26722672
builder.append(StringUtils.join(missingDataTypes.toArray(), "\n "));
26732673
builder.append("\n\n");
26742674
}

‎client/src/com/mirth/connect/client/ui/ChannelSetup.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -780,7 +780,7 @@ private void loadChannelInfo() {
780780
encryptAttachmentsCheckBox.setSelected(properties.isEncryptAttachments());
781781
encryptCustomMetaDataCheckBox.setSelected(properties.isEncryptCustomMetaData());
782782

783-
// Fix dataTypes and properties not set by previous versions of Mirth Connect
783+
// Fix dataTypes and properties not set by previous versions
784784
fixNullDataTypesAndProperties();
785785

786786
// load message storage settings

‎client/src/com/mirth/connect/client/ui/CustomBannerPanelDialog.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818

1919
import javax.swing.AbstractButton;
2020
import javax.swing.BorderFactory;
21-
import javax.swing.ImageIcon;
2221
import javax.swing.JButton;
2322
import javax.swing.JDialog;
2423
import javax.swing.JFrame;
@@ -58,7 +57,7 @@ public CustomBannerPanelDialog(JFrame parent, String title, String text) {
5857
private void initComponents() {
5958
setLayout(new MigLayout("insets 12")); // layout sets 12 pixel border
6059
setTitle(title);
61-
setIconImage(UIConstants.MIRTH_FAVICON.getImage());
60+
setIconImage(BrandingConstants.FAVICON.getImage());
6261
getContentPane().setBackground(UIConstants.BACKGROUND_COLOR); // set dialog box to background color
6362
setBackground(UIConstants.BACKGROUND_COLOR); // get all other backgrounds for each piece
6463

0 commit comments

Comments
 (0)