STAND-122: Display OpenMRS Platform Version in Standalone App Window (#79)

Muta-Jonathan · web-flow · commit 06a02f36b7dc · 2025-07-23T22:11:10.000+03:00
* move Demo and CIEL Database Packaging from Build-Time to Runtime

* fixing test failures

* adding support for mysqldump via MySQL on CI

* removing the wildcard*

* addressing linux and win install mysql

* finding mysqldump on ci

* revert to mysqldump

* adding ci linux mysqldump checks

* adding arg column-statistics=0 to pass the linux build

* cleanup and updating README.md

* adding cleaning step for linux

* using bin/mariadb-dump instead of mysqldump

* using bin/mariadb-dump instead of mysqldump

* using scripts to solve mysqldump for windows

* using java DatabaseDumper to solve mysqldump for windows

* adding skip-extended-insert

* added rebuild the search index on database

* fixing windows ci failure

* fixing windows ci failure

* addressing the mvn package failure

* re-correcting the update search index

* STAND-122: Display OpenMRS Platform Version in Standalone App Window

* STAND-122: Display OpenMRS Platform Version in Standalone App Window

* Improving to the industrial branding standard

* Remove .DS_Store files and add to .gitignore
diff --git a/.gitignore b/.gitignore
@@ -36,6 +36,7 @@ local.properties
 
 # Locally stored "Eclipse launch configurations"
 *.launch
+.DS_Store
 
 # CDT-specific
 .cproject
diff --git a/pom.xml b/pom.xml
@@ -109,6 +109,17 @@
 
   <build>
     <finalName>openmrs-standalone-${openmrs.version}</finalName>
+    <resources>
+      <resource>
+        <directory>src/main/resources</directory>
+        <filtering>false</filtering>
+      </resource>
+      <resource>
+        <directory>src/main/resources-filtered</directory>
+        <filtering>true</filtering>
+      </resource>
+    </resources>
+
     <plugins>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
diff --git a/src/main/java/org/openmrs/standalone/ApplicationController.java b/src/main/java/org/openmrs/standalone/ApplicationController.java
@@ -76,6 +76,8 @@ public static void main(String[] args) throws Exception {
 		if (properties != null) {
 			tomcatPort = properties.getProperty("tomcatport");
 		}
+
+		OpenmrsUtil.PLATFORM_VERSION = StandaloneUtil.getPlatformVersion();
 		
 		//Some users may prefer command line to having the GUI, by providing the -commandline switch.
 		//Command line args can always override the values in the runtime properties file.
diff --git a/src/main/java/org/openmrs/standalone/MainFrame.java b/src/main/java/org/openmrs/standalone/MainFrame.java
@@ -542,7 +542,7 @@ public void run() {
 	 * @see org.openmrs.standalone.UserInterface#showInitialConfig()
 	 */
 	public void showInitialConfig() {
-		final JDialog configDialog = new JDialog(this, "Configure your OpenMRS Installation", true);
+		final JDialog configDialog = new JDialog(this, "Configure your OpenMRS Platform "+ OpenmrsUtil.PLATFORM_VERSION +" Installation", true);
 		JPanel content = new JPanel();
 		content.setBorder(BorderFactory.createEmptyBorder(15, 15, 15, 15));
 		content.setLayout(new BorderLayout(10, 10)); //10,10 = hgap, vgap
@@ -563,7 +563,7 @@ public void showInitialConfig() {
 		colorHelper(emptyDatabase, new Color(255, 243, 136));
 		
 		final JButton expertMode = new JButton(
-		        "<html><h3>Expert Mode</h3>Go through the initial setup wizard yourself. You will add all content, including dictionary concepts, to the system after it is running.</html>",
+		        "<html><h3>Expert Mode</h3>Go through the initial setup wizard yourself. You will add all content, including dictionary concepts, to the system of Openmrs after it is running.</html>",
 		        new ImageIcon(getClass().getResource("expert.png")));
 		colorHelper(expertMode, new Color(255, 138, 138));
 		
@@ -597,7 +597,7 @@ public void actionPerformed(ActionEvent e) {
 		}
 		
 		JLabel instructions = new JLabel(
-		        "<html><b>Welcome to OpenMRS! OpenMRS can be configured in one of " + buttonList.size() + " ways, depending on your needs. Please click on the configuration that best meets your needs.</b><br/>(You will not see this next time you run OpenMRS)</html>");
+		        "<html><b>Welcome to OpenMRS Platform "+ OpenmrsUtil.PLATFORM_VERSION +"! OpenMRS can be configured in one of " + buttonList.size() + " ways, depending on your needs. Please click on the configuration that best meets your needs.</b><br/>(You will not see this next time you run OpenMRS)</html>");
 		instructions.setFont(font);
 		
 		JButton exitButton = new JButton("Exit");
diff --git a/src/main/java/org/openmrs/standalone/OpenmrsUtil.java b/src/main/java/org/openmrs/standalone/OpenmrsUtil.java
@@ -31,6 +31,8 @@
 import java.util.Properties;
 
 public class OpenmrsUtil {
+
+	public static String PLATFORM_VERSION;
 	
 	private static final String OPERATING_SYSTEM_KEY = "os.name";
 	
@@ -252,4 +254,8 @@ public static String findDumpExecutable(String baseDir, String dbDir) {
 		}
 	}
 
+	public static String getTitle() {
+		return "OpenMRS Platform " + PLATFORM_VERSION + " Standalone";
+	}
+
 }
diff --git a/src/main/java/org/openmrs/standalone/StandaloneUtil.java b/src/main/java/org/openmrs/standalone/StandaloneUtil.java
@@ -531,4 +531,14 @@ public static String setRuntimePropertiesFileMysqlAndTomcatPorts(String mariaDBP
 		
 		return mariaDBPort;
 	}
+
+	public static String getPlatformVersion() {
+		Properties properties = new Properties();
+		try (InputStream inputStream = StandaloneUtil.class.getResourceAsStream("/org/openmrs/standalone/standalone.properties")){
+			properties.load(inputStream);
+		} catch (IOException e) {
+			throw new RuntimeException(e);
+		}
+		return (String) properties.get("openmrs.version");
+	}
 }
diff --git a/src/main/java/org/openmrs/standalone/UserInterface.java b/src/main/java/org/openmrs/standalone/UserInterface.java
@@ -19,7 +19,7 @@
  */
 public interface UserInterface {
 	
-	public static final String TITLE = "OpenMRS Standalone";
+	public static final String TITLE = "OpenMRS Platform "+ OpenmrsUtil.PLATFORM_VERSION +" Standalone";
 	
 	public static final int DEFAULT_TOMCAT_PORT = 8088;
 	
diff --git a/src/main/resources-filtered/org/openmrs/standalone/standalone.properties b/src/main/resources-filtered/org/openmrs/standalone/standalone.properties
@@ -0,0 +1 @@
+openmrs.version=${openmrs.version}

Original file line number	Diff line number	Diff line change
`@@ -76,6 +76,8 @@ public static void main(String[] args) throws Exception {`
`76`	`76`	`if (properties != null) {`
`77`	`77`	`tomcatPort = properties.getProperty("tomcatport");`
`78`	`78`	`}`
	`79`	`+`
	`80`	`+ OpenmrsUtil.PLATFORM_VERSION = StandaloneUtil.getPlatformVersion();`
`79`	`81`
`80`	`82`	`//Some users may prefer command line to having the GUI, by providing the -commandline switch.`
`81`	`83`	`//Command line args can always override the values in the runtime properties file.`
Original file line number	Diff line number	Diff line change
`@@ -31,6 +31,8 @@`
`31`	`31`	`import java.util.Properties;`
`32`	`32`
`33`	`33`	`public class OpenmrsUtil {`
	`34`	`+`
	`35`	`+ public static String PLATFORM_VERSION;`
`34`	`36`
`35`	`37`	`private static final String OPERATING_SYSTEM_KEY = "os.name";`
`36`	`38`
`@@ -252,4 +254,8 @@ public static String findDumpExecutable(String baseDir, String dbDir) {`
`252`	`254`	`}`
`253`	`255`	`}`
`254`	`256`
	`257`	`+ public static String getTitle() {`
	`258`	`+ return "OpenMRS Platform " + PLATFORM_VERSION + " Standalone";`
	`259`	`+ }`
	`260`	`+`
`255`	`261`	`}`
Original file line number	Diff line number	Diff line change
`@@ -531,4 +531,14 @@ public static String setRuntimePropertiesFileMysqlAndTomcatPorts(String mariaDBP`
`531`	`531`
`532`	`532`	`return mariaDBPort;`
`533`	`533`	`}`
	`534`	`+`
	`535`	`+ public static String getPlatformVersion() {`
	`536`	`+ Properties properties = new Properties();`
	`537`	`+ try (InputStream inputStream = StandaloneUtil.class.getResourceAsStream("/org/openmrs/standalone/standalone.properties")){`
	`538`	`+ properties.load(inputStream);`
	`539`	`+ } catch (IOException e) {`
	`540`	`+ throw new RuntimeException(e);`
	`541`	`+ }`
	`542`	`+ return (String) properties.get("openmrs.version");`
	`543`	`+ }`
`534`	`544`	`}`