------------------------------------------------------------
revno: 1294
committer: Lars Helge Oeverland <larshe...@gmail.com>
branch nick: trunk
timestamp: Mon 2010-01-04 13:33:03 +0100
message:
Added java_opts value to about page.
modified:
dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataset/DefaultDataSetService.java
dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/about/about.vm
dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/about/action/AboutAction.java
dhis-2/dhis-web/dhis-web-commons/src/main/resources/i18n_global.properties
dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/java/org/hisp/dhis/dataadmin/action/lock/LockSelectedOrganisationUnitAction.java
--
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/dataset/DefaultDataSetService.java'
--- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataset/DefaultDataSetService.java 2009-12-24 10:42:32 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataset/DefaultDataSetService.java 2010-01-04 12:33:03 +0000
@@ -36,7 +36,6 @@
import java.util.Set;
import org.hisp.dhis.dataelement.DataElement;
-import org.hisp.dhis.datalock.DataSetLock;
import org.hisp.dhis.i18n.I18nService;
import org.hisp.dhis.period.PeriodType;
import org.hisp.dhis.source.Source;
=== 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 2009-03-03 16:46:36 +0000
+++ dhis-2/dhis-web/dhis-web-commons-resources/src/main/webapp/dhis-web-commons/about/about.vm 2010-01-04 12:33:03 +0000
@@ -10,4 +10,5 @@
<dt>$i18n.getString( "database_type" ):</dt><dd>$!info.type</dd>
<dt>$i18n.getString( "database_name" ):</dt><dd>$!info.name</dd>
<dt>$i18n.getString( "database_user" ):</dt><dd>$!info.user</dd>
+ <dt>$i18n.getString( "java_opts" ):</dt><dd>$!javaOpts</dd>
</dl>
=== modified file 'dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/about/action/AboutAction.java'
--- dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/about/action/AboutAction.java 2009-08-20 08:17:49 +0000
+++ dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/about/action/AboutAction.java 2010-01-04 12:33:03 +0000
@@ -123,6 +123,13 @@
return info;
}
+ private String javaOpts;
+
+ public String getJavaOpts()
+ {
+ return javaOpts;
+ }
+
// -------------------------------------------------------------------------
// Action implementation
// -------------------------------------------------------------------------
@@ -185,7 +192,16 @@
// ---------------------------------------------------------------------
info = provider.getDatabaseInfo();
-
+
+ try
+ {
+ javaOpts = System.getenv( "JAVA_OPTS" );
+ }
+ catch ( SecurityException ex )
+ {
+ javaOpts = i18n.getString( "unknown" );
+ }
+
return SUCCESS;
}
}
=== modified file 'dhis-2/dhis-web/dhis-web-commons/src/main/resources/i18n_global.properties'
--- dhis-2/dhis-web/dhis-web-commons/src/main/resources/i18n_global.properties 2009-12-21 05:32:40 +0000
+++ dhis-2/dhis-web/dhis-web-commons/src/main/resources/i18n_global.properties 2010-01-04 12:33:03 +0000
@@ -213,6 +213,8 @@
help_contents = Help Contents
about_dhis2 = About DHIS 2
user_account = User account
+unknown = Unknown
+java_opts = Java Opts
#-- Change Log------------------------------------------------------------------#
=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/java/org/hisp/dhis/dataadmin/action/lock/LockSelectedOrganisationUnitAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/java/org/hisp/dhis/dataadmin/action/lock/LockSelectedOrganisationUnitAction.java 2009-12-24 10:42:32 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-dataadmin/src/main/java/org/hisp/dhis/dataadmin/action/lock/LockSelectedOrganisationUnitAction.java 2010-01-04 12:33:03 +0000
@@ -27,7 +27,6 @@
package org.hisp.dhis.dataadmin.action.lock;
import java.util.Collection;
-import java.util.HashSet;
import java.util.Set;
import org.apache.commons.logging.Log;
_______________________________________________
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
