------------------------------------------------------------
revno: 16983
committer: Lars Helge Overland <larshe...@gmail.com>
branch nick: dhis2
timestamp: Tue 2014-10-07 15:56:16 +0200
message:
Added java home to system info
modified:
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/system/DefaultSystemService.java
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/system/SystemInfo.java
dhis-2/dhis-services/dhis-service-core/src/main/resources/i18n_global.properties
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/about/about.vm
--
lp:dhis2
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk
Your team DHIS 2 developers is subscribed to branch lp:dhis2.
To unsubscribe from this branch go to
https://code.launchpad.net/~dhis2-devs-core/dhis2/trunk/+edit-subscription
=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/system/DefaultSystemService.java'
--- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/system/DefaultSystemService.java 2014-05-23 11:11:47 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/system/DefaultSystemService.java 2014-10-07 13:56:16 +0000
@@ -164,6 +164,7 @@
Properties props = System.getProperties();
+ systemInfo.setJavaHome( props.getProperty( "java.home" ) );
systemInfo.setJavaIoTmpDir( props.getProperty( "java.io.tmpdir" ) );
systemInfo.setJavaVersion( props.getProperty( "java.version" ) );
systemInfo.setJavaVendor( props.getProperty( "java.vendor" ) );
=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/system/SystemInfo.java'
--- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/system/SystemInfo.java 2014-05-23 11:11:47 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/system/SystemInfo.java 2014-10-07 13:56:16 +0000
@@ -64,6 +64,8 @@
private String javaVendor;
+ private String javaHome;
+
private String javaIoTmpDir;
private String javaOpts;
@@ -93,6 +95,7 @@
this.revision = null;
this.javaVersion = null;
this.javaVendor = null;
+ this.javaHome = null;
this.javaIoTmpDir = null;
this.javaOpts = null;
this.osName = null;
@@ -243,6 +246,18 @@
@JsonProperty
@JacksonXmlProperty( namespace = DxfNamespaces.DXF_2_0 )
+ public String getJavaHome()
+ {
+ return javaHome;
+ }
+
+ public void setJavaHome( String javaHome )
+ {
+ this.javaHome = javaHome;
+ }
+
+ @JsonProperty
+ @JacksonXmlProperty( namespace = DxfNamespaces.DXF_2_0 )
public String getJavaIoTmpDir()
{
return javaIoTmpDir;
=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/resources/i18n_global.properties'
--- dhis-2/dhis-services/dhis-service-core/src/main/resources/i18n_global.properties 2014-10-06 13:02:52 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/resources/i18n_global.properties 2014-10-07 13:56:16 +0000
@@ -398,7 +398,8 @@
user_account=User account
last_name=Last name
unknown=Unknown
-java_opts=Java Opts
+java_opts=Java opts
+java_home=Java home
java_tmp_dir=Java temporary directory
java_version=Java version
java_vendor=Java vendor
=== modified file 'dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/about/about.vm'
--- dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/about/about.vm 2013-10-22 18:10:32 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/about/about.vm 2014-10-07 13:56:16 +0000
@@ -15,6 +15,7 @@
<dt>$i18n.getString( "database_name" ):</dt><dd>$!info.databaseInfo.name</dd>
<dt>$i18n.getString( "database_user" ):</dt><dd>$!info.databaseInfo.user</dd>
<dt>$i18n.getString( "java_opts" ):</dt><dd>$!info.javaOpts</dd>
+ <dt>$i18n.getString( "java_home" ):</dt><dd>$!info.javaHome</dd>
<dt>$i18n.getString( "java_tmp_dir" ):</dt><dd>$!info.javaIoTmpDir</dd>
<dt>$i18n.getString( "java_version" ):</dt><dd>$!info.javaVersion</dd>
<dt>$i18n.getString( "java_vendor" ):</dt><dd>$!info.javaVendor</dd>
_______________________________________________
Mailing list: https://launchpad.net/~dhis2-devs
Post to : dhis2-devs@lists.launchpad.net
Unsubscribe : https://launchpad.net/~dhis2-devs
More help : https://help.launchpad.net/ListHelp
