diff options
| -rw-r--r-- | config/PropertyNames.xml | 1 | ||||
| -rw-r--r-- | cpp/src/Ice/PropertyNames.cpp | 3 | ||||
| -rw-r--r-- | cpp/src/Ice/PropertyNames.h | 2 | ||||
| -rw-r--r-- | cs/src/Ice/PropertyNames.cs | 3 | ||||
| -rw-r--r-- | java/src/IceGridGUI/LiveDeployment/MetricsViewEditor.java | 29 | ||||
| -rw-r--r-- | java/src/IceInternal/PropertyNames.java | 3 | ||||
| -rw-r--r-- | slice/Ice/Metrics.ice | 1 |
7 files changed, 36 insertions, 6 deletions
diff --git a/config/PropertyNames.xml b/config/PropertyNames.xml index 21636875741..db8fc6f06d3 100644 --- a/config/PropertyNames.xml +++ b/config/PropertyNames.xml @@ -406,6 +406,7 @@ generated from the section label. <section name="IceGridAdmin"> <property name="AuthenticateUsingSSL" /> + <property name="MetricsConfigs" /> <property name="Username" /> <property name="Password" /> <property name="Replica" /> diff --git a/cpp/src/Ice/PropertyNames.cpp b/cpp/src/Ice/PropertyNames.cpp index 2bc22807c11..9408c91975f 100644 --- a/cpp/src/Ice/PropertyNames.cpp +++ b/cpp/src/Ice/PropertyNames.cpp @@ -8,7 +8,7 @@ // ********************************************************************** // -// Generated by makeprops.py from file ./config/PropertyNames.xml, Tue Mar 19 08:07:05 2013 +// Generated by makeprops.py from file ./config/PropertyNames.xml, Fri Jul 26 17:20:59 2013 // IMPORTANT: Do not edit this file -- any edits made here will be lost! @@ -236,6 +236,7 @@ const IceInternal::PropertyArray const IceInternal::Property IceGridAdminPropsData[] = { IceInternal::Property("IceGridAdmin.AuthenticateUsingSSL", false, 0), + IceInternal::Property("IceGridAdmin.MetricsConfigs", false, 0), IceInternal::Property("IceGridAdmin.Username", false, 0), IceInternal::Property("IceGridAdmin.Password", false, 0), IceInternal::Property("IceGridAdmin.Replica", false, 0), diff --git a/cpp/src/Ice/PropertyNames.h b/cpp/src/Ice/PropertyNames.h index d25341799bf..261749016e2 100644 --- a/cpp/src/Ice/PropertyNames.h +++ b/cpp/src/Ice/PropertyNames.h @@ -8,7 +8,7 @@ // ********************************************************************** // -// Generated by makeprops.py from file ./config/PropertyNames.xml, Tue Mar 19 08:07:05 2013 +// Generated by makeprops.py from file ./config/PropertyNames.xml, Fri Jul 26 17:20:59 2013 // IMPORTANT: Do not edit this file -- any edits made here will be lost! diff --git a/cs/src/Ice/PropertyNames.cs b/cs/src/Ice/PropertyNames.cs index 2fd3c36e9d1..5a2130f144b 100644 --- a/cs/src/Ice/PropertyNames.cs +++ b/cs/src/Ice/PropertyNames.cs @@ -8,7 +8,7 @@ // ********************************************************************** // -// Generated by makeprops.py from file ./config/PropertyNames.xml, Tue Mar 19 08:07:05 2013 +// Generated by makeprops.py from file ./config/PropertyNames.xml, Fri Jul 26 17:20:59 2013 // IMPORTANT: Do not edit this file -- any edits made here will be lost! @@ -226,6 +226,7 @@ namespace IceInternal public static Property[] IceGridAdminProps = { new Property(@"^IceGridAdmin\.AuthenticateUsingSSL$", false, null), + new Property(@"^IceGridAdmin\.MetricsConfigs$", false, null), new Property(@"^IceGridAdmin\.Username$", false, null), new Property(@"^IceGridAdmin\.Password$", false, null), new Property(@"^IceGridAdmin\.Replica$", false, null), diff --git a/java/src/IceGridGUI/LiveDeployment/MetricsViewEditor.java b/java/src/IceGridGUI/LiveDeployment/MetricsViewEditor.java index 6f5283d43d5..8f29f38974e 100644 --- a/java/src/IceGridGUI/LiveDeployment/MetricsViewEditor.java +++ b/java/src/IceGridGUI/LiveDeployment/MetricsViewEditor.java @@ -31,6 +31,8 @@ import java.util.List; import java.util.ArrayList; import java.util.Map; import java.util.HashMap; +import java.util.Set; +import java.util.LinkedHashSet; import java.text.DecimalFormat; @@ -250,10 +252,31 @@ public class MetricsViewEditor extends Editor implements MetricsFieldContext JTree tree = root.getTree(); tree.addTreeSelectionListener(new SelectionListener()); + Set<String> sectionSort = new LinkedHashSet<String>(); _properties = Ice.Util.createProperties(); + _properties.load("metrics.cfg"); - _sectionSort = _properties.getPropertyAsList("IceGridGUI.Metrics"); - for(String name : _sectionSort) + sectionSort.addAll(java.util.Arrays.asList(_properties.getPropertyAsList("IceGridGUI.Metrics"))); + + Coordinator coord = root.getCoordinator(); + String metricsDefs = coord.getProperties().getProperty("IceGridAdmin.MetricsConfigs"); + if(!metricsDefs.isEmpty()) + { + for(String s : IceUtilInternal.StringUtil.splitString(metricsDefs, ", \t\r\n")) + { + try + { + _properties.load(s); + } + catch(Ice.FileException ex) + { + coord.getCommunicator().getLogger().warning("unable to load `" + ex.path + "'"); + } + sectionSort.addAll(java.util.Arrays.asList(_properties.getPropertyAsList("IceGridGUI.Metrics"))); + } + } + + for(String name : sectionSort) { String displayName = _properties.getPropertyWithDefault("IceGridGUI.Metrics." + name, ""); if(!displayName.equals("")) @@ -261,6 +284,8 @@ public class MetricsViewEditor extends Editor implements MetricsFieldContext _sectionNames.put(name, displayName); } } + + _sectionSort = sectionSort.toArray(new String[sectionSort.size()]); } } diff --git a/java/src/IceInternal/PropertyNames.java b/java/src/IceInternal/PropertyNames.java index 5d6d767cfd0..9f768f8e66b 100644 --- a/java/src/IceInternal/PropertyNames.java +++ b/java/src/IceInternal/PropertyNames.java @@ -8,7 +8,7 @@ // ********************************************************************** // -// Generated by makeprops.py from file ./config/PropertyNames.xml, Tue Mar 19 08:07:05 2013 +// Generated by makeprops.py from file ./config/PropertyNames.xml, Fri Jul 26 17:20:59 2013 // IMPORTANT: Do not edit this file -- any edits made here will be lost! @@ -226,6 +226,7 @@ public final class PropertyNames public static final Property IceGridAdminProps[] = { new Property("IceGridAdmin\\.AuthenticateUsingSSL", false, null), + new Property("IceGridAdmin\\.MetricsConfigs", false, null), new Property("IceGridAdmin\\.Username", false, null), new Property("IceGridAdmin\\.Password", false, null), new Property("IceGridAdmin\\.Replica", false, null), diff --git a/slice/Ice/Metrics.ice b/slice/Ice/Metrics.ice index 81d30902527..f8900bbabc2 100644 --- a/slice/Ice/Metrics.ice +++ b/slice/Ice/Metrics.ice @@ -137,6 +137,7 @@ exception UnknownMetricsView * metrics views. * **/ +["format:sliced"] interface MetricsAdmin { /** |