rhq-commits September 2013

rhq-commits@lists.fedorahosted.org

12 participants
198 discussions

Start a nNew thread

[rhq] Branch 'mtho11/selectItem-toolstrip' - 0 commits -
by mike thompson 18 Sep '13

18 Sep '13

Rebased ref, commits from common ancestor:

1 0

[rhq] Branch 'nightly/rhq.jon' - modules/common
by Simeon Pinder 18 Sep '13

18 Sep '13

modules/common/cassandra-ccm/cassandra-ccm-core/src/main/java/org/rhq/cassandra/DeploymentOptionsFactory.java | 16 -- modules/common/cassandra-ccm/cassandra-ccm-core/src/main/resources/cassandra.properties | 2 modules/common/cassandra-ccm/cassandra-ccm-core/src/test/resources/expected.cassandra-jvm.properties | 2 modules/common/cassandra-installer/src/test/java/org/rhq/storage/installer/StorageInstallerTest.java | 69 ++++++++++ 4 files changed, 74 insertions(+), 15 deletions(-) New commits: commit fc543e0ba84f7b65cde863c227dae721131fc3a5 Author: Simeon Pinder <spinder(a)redhat.com> Date: Wed Sep 18 09:20:17 2013 -0400 [BZ 1008090] Set default thread stack size to 256k across the board Conflicts: modules/common/cassandra-installer/src/test/java/org/rhq/storage/installer/StorageInstallerTest.java diff --git a/modules/common/cassandra-ccm/cassandra-ccm-core/src/main/java/org/rhq/cassandra/DeploymentOptionsFactory.java b/modules/common/cassandra-ccm/cassandra-ccm-core/src/main/java/org/rhq/cassandra/DeploymentOptionsFactory.java index 4c79543..7a3f207 100644 --- a/modules/common/cassandra-ccm/cassandra-ccm-core/src/main/java/org/rhq/cassandra/DeploymentOptionsFactory.java +++ b/modules/common/cassandra-ccm/cassandra-ccm-core/src/main/java/org/rhq/cassandra/DeploymentOptionsFactory.java @@ -35,21 +35,11 @@ public class DeploymentOptionsFactory { /** * @return A new {@link DeploymentOptions}. This method checks the platform arch * (32 bit vs 64 bit) and the JRE being used to determine if any particular defaults - * need to be set. For example, on 32 bit arches running on OpenJDK 6, Cassandra - * cannot use its default thread stack stack of 180k. It causes the JVM to segfault on - * start up. When this runtime environment is detected, the factory will set the - * appropriate system property so that a default thread stack of 240k is used. That - * can be overridden by calling {@link DeploymentOptions#setStackSize(String)}. + * need to be set. */ public DeploymentOptions newDeploymentOptions() { - String arch = System.getProperty("os.arch"); - String javaVMName = System.getProperty("java.vm.name"); - String javaVersion = System.getProperty("java.version"); - - if ((arch.equals("i386") || arch.equals("amd64") || arch.equals("i686")) && javaVMName.startsWith("OpenJDK")) { - System.setProperty("rhq.cassandra.stack.size", "240k"); - } - + // Make sure we have a high enough stack size. See https://bugzilla.redhat.com/show_bug.cgi?id=1008090 + System.setProperty("rhq.cassandra.stack.size", "256k"); return new DeploymentOptions(); } diff --git a/modules/common/cassandra-ccm/cassandra-ccm-core/src/main/resources/cassandra.properties b/modules/common/cassandra-ccm/cassandra-ccm-core/src/main/resources/cassandra.properties index ebadc27..f9bdc30 100644 --- a/modules/common/cassandra-ccm/cassandra-ccm-core/src/main/resources/cassandra.properties +++ b/modules/common/cassandra-ccm/cassandra-ccm-core/src/main/resources/cassandra.properties @@ -85,7 +85,7 @@ rhq.cassandra.max.heap.size=\${MAX_HEAP_SIZE} rhq.cassandra.heap.new.size=\${HEAP_NEWSIZE} # The JVM stack size for Cassandra. This value is passed directly to the -Xss option. -rhq.cassandra.stack.size=180k +rhq.cassandra.stack.size=256k # The log4j logging level to use. rhq.cassandra.logging.level=DEBUG diff --git a/modules/common/cassandra-ccm/cassandra-ccm-core/src/test/resources/expected.cassandra-jvm.properties b/modules/common/cassandra-ccm/cassandra-ccm-core/src/test/resources/expected.cassandra-jvm.properties index 2951eaa..5dacf36 100644 --- a/modules/common/cassandra-ccm/cassandra-ccm-core/src/test/resources/expected.cassandra-jvm.properties +++ b/modules/common/cassandra-ccm/cassandra-ccm-core/src/test/resources/expected.cassandra-jvm.properties @@ -15,7 +15,7 @@ heap_dump_on_OOMError="-XX:+HeapDumpOnOutOfMemoryError" heap_dump_dir= -thread_stack_size=-Xss180k +thread_stack_size=-Xss256k # Enable jamm when running on Java 6 patch version 23 or higher. #java_agent="-javaagent:$CASSANDRA_HOME/lib/jamm-0.2.5.jar" diff --git a/modules/common/cassandra-installer/src/test/java/org/rhq/storage/installer/StorageInstallerTest.java b/modules/common/cassandra-installer/src/test/java/org/rhq/storage/installer/StorageInstallerTest.java index 28992cb..a39feb0 100644 --- a/modules/common/cassandra-installer/src/test/java/org/rhq/storage/installer/StorageInstallerTest.java +++ b/modules/common/cassandra-installer/src/test/java/org/rhq/storage/installer/StorageInstallerTest.java @@ -11,6 +11,7 @@ import java.io.FileInputStream; import java.io.FileOutputStream; import java.io.IOException; import java.lang.reflect.Method; +import java.net.InetAddress; import java.util.Properties; import org.apache.commons.cli.CommandLine; @@ -73,6 +74,74 @@ public class StorageInstallerTest { } @Test + public void performDefaultInstall() throws Exception { + CommandLineParser parser = new PosixParser(); + CommandLine cmdLine = parser.parse(installer.getOptions(), new String[] {}); + + int status = installer.run(cmdLine); + + String address = InetAddress.getLocalHost().getHostAddress(); + + assertEquals(status, 0, "Expected to get back a status code of 0 for a successful default install"); + assertNodeIsRunning(); + assertRhqServerPropsUpdated(address); + + File binDir = new File(storageDir, "bin"); + assertTrue(binDir.exists(), "Expected to find bin directory at " + binDir); + + File confDir = new File(storageDir, "conf"); + assertTrue(confDir.exists(), "Expected to find conf directory at " + confDir); + + File libDir = new File(storageDir, "lib"); + assertTrue(libDir.exists(), "Expected to find lib directory at " + libDir); + + File baseDataDir = new File(basedir, "rhq-data"); + + File commitLogDir = new File(baseDataDir, "commit_log"); + assertTrue(commitLogDir.exists(), "Expected to find commit_log directory at " + commitLogDir); + + File dataDir = new File(baseDataDir, "data"); + assertTrue(dataDir.exists(), "Expected to find data directory at " + dataDir); + + File savedCachesDir = new File(baseDataDir, "saved_caches"); + assertTrue(savedCachesDir.exists(), "Expected to find saved_caches directory at " + savedCachesDir); + + File log4jFile = new File(confDir, "log4j-server.properties"); + assertTrue(log4jFile.exists(), log4jFile + " does not exist"); + + File logsDir = new File(serverDir, "logs"); + File logFile = new File(logsDir, "rhq-storage.log"); + + Properties log4jProps = new Properties(); + log4jProps.load(new FileInputStream(log4jFile)); + assertEquals(log4jProps.getProperty("log4j.appender.R.File"), logFile.getAbsolutePath(), + "The log file is wrong"); + + File yamlFile = new File(confDir, "cassandra.yaml"); + ConfigEditor yamlEditor = new ConfigEditor(yamlFile); + yamlEditor.load(); + + assertEquals(yamlEditor.getInternodeAuthenticator(), "org.rhq.cassandra.auth.RhqInternodeAuthenticator", + "Failed to set the internode_authenticator property in " + yamlFile); + assertEquals(yamlEditor.getAuthenticator(), "org.apache.cassandra.auth.PasswordAuthenticator", + "The authenticator property is wrong"); + assertEquals(yamlEditor.getListenAddress(), address, "The listen_address property is wrong"); + assertEquals(yamlEditor.getNativeTransportPort(), (Integer) 9142, "The native_transport_port property is wrong"); + assertEquals(yamlEditor.getRpcAddress(), address, "The rpc_address property is wrong"); + assertEquals(yamlEditor.getStoragePort(), (Integer) 7100, "The storage_port property is wrong"); + + File cassandraJvmPropsFile = new File(confDir, "cassandra-jvm.properties"); + Properties properties = new Properties(); + properties.load(new FileInputStream(cassandraJvmPropsFile)); + + assertEquals(properties.getProperty("jmx_port"), "7299", "The jmx_port property is wrong"); + assertEquals(properties.getProperty("heap_min"), "-Xms512M", "The heap_min property is wrong"); + assertEquals(properties.getProperty("heap_max"), "-Xmx512M", "The heap_max property is wrong"); + assertEquals(properties.getProperty("heap_new"), "-Xmn128M", "The heap_new property is wrong"); + assertEquals(properties.getProperty("thread_stack_size"), "-Xss256k", "The thread_stack_size property is wrong"); + } + + @Test public void performValidInstall() throws Exception { CommandLineParser parser = new PosixParser();

1 0

[rhq] 2 commits - modules/enterprise modules/plugins
by lkrejci 18 Sep '13

18 Sep '13

modules/enterprise/server/ear/src/main/application/META-INF/jboss-deployment-structure.xml | 3 modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/Ejb3BeanRuntimeComponent.java | 206 ++++++++++ modules/plugins/jboss-as-7/src/main/resources/META-INF/rhq-plugin.xml | 37 + 3 files changed, 240 insertions(+), 6 deletions(-) New commits: commit 728e7969ba2afcec80d3e0196528d8bcaf3a24e7 Author: Lukas Krejci <lkrejci(a)redhat.com> Date: Wed Sep 18 12:53:50 2013 +0200 [BZ 1009042] - make sure rss4j can access Xerces classes in the server. diff --git a/modules/enterprise/server/ear/src/main/application/META-INF/jboss-deployment-structure.xml b/modules/enterprise/server/ear/src/main/application/META-INF/jboss-deployment-structure.xml index 80a648f..a6f5d90 100644 --- a/modules/enterprise/server/ear/src/main/application/META-INF/jboss-deployment-structure.xml +++ b/modules/enterprise/server/ear/src/main/application/META-INF/jboss-deployment-structure.xml @@ -50,6 +50,9 @@ <module name="org.codehaus.jackson.jackson-core-asl" export="true"/> <module name="org.codehaus.jackson.jackson-jaxrs" export="true"/> <module name="org.codehaus.jackson.jackson-mapper-asl" export="true"/> + +  + <module name="org.apache.xerces" export="true"/> </dependencies> </sub-deployment> commit 7fa1c742509e1aa365abd62f272a17e9edef7cbf Author: Lukas Krejci <lkrejci(a)redhat.com> Date: Thu Sep 12 13:06:14 2013 +0200 [BZ 998645] - Collect method invocation stats on AS7 EJBs. diff --git a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/Ejb3BeanRuntimeComponent.java b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/Ejb3BeanRuntimeComponent.java new file mode 100644 index 0000000..c1fdf42 --- /dev/null +++ b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/Ejb3BeanRuntimeComponent.java @@ -0,0 +1,206 @@ +/* + * RHQ Management Platform + * Copyright (C) 2013 Red Hat, Inc. + * All rights reserved. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation version 2 of the License. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + */ + +package org.rhq.modules.plugins.jbossas7; + +import java.io.File; +import java.io.FileInputStream; +import java.io.FileNotFoundException; +import java.io.FileOutputStream; +import java.io.IOException; +import java.io.ObjectInputStream; +import java.io.ObjectOutputStream; +import java.io.Serializable; +import java.util.Date; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Map; +import java.util.Set; + +import org.rhq.core.domain.measurement.DataType; +import org.rhq.core.domain.measurement.MeasurementReport; +import org.rhq.core.domain.measurement.MeasurementScheduleRequest; +import org.rhq.core.domain.measurement.calltime.CallTimeData; +import org.rhq.core.domain.measurement.calltime.CallTimeDataValue; +import org.rhq.core.pluginapi.inventory.ResourceComponent; +import org.rhq.core.util.stream.StreamUtil; +import org.rhq.modules.plugins.jbossas7.json.ReadAttribute; +import org.rhq.modules.plugins.jbossas7.json.Result; + +/** + * A specialization of the AS component for EJB3 runtime beans. This kind of beans can collect method invocation + * statistics which is what this class handles. + * + * @author Lukas Krejci + * @since 4.9 + */ +public class Ejb3BeanRuntimeComponent extends BaseComponent<ResourceComponent<?>> { + + private static final String METHODS_ATTRIBUTE = "methods"; + private static final int CALLTIME_METRIC_NAME_PREFIX_LENGTH = "__calltime:".length(); + + private static class StatsRecord implements Serializable { + private static final long serialVersionUID = 1L; + + long invocations; + long total; + } + + private static class Stats implements Serializable { + private static final long serialVersionUID = 1L; + + long collectionTime; + Map<String, StatsRecord> data; + + static Stats fromMap(Map<String, Map<String, Number>> map, String collectedMetric, long collectionTime) { + Stats ret = new Stats(); + ret.collectionTime = collectionTime; + ret.data = new HashMap<String, StatsRecord>(map.size()); + + for(Map.Entry<String, Map<String, Number>> entry : map.entrySet()) { + StatsRecord rec = new StatsRecord(); + String methodName = entry.getKey(); + + rec.invocations = entry.getValue().get("invocations").longValue(); + rec.total = entry.getValue().get(collectedMetric).longValue(); + + ret.data.put(methodName, rec); + } + + return ret; + } + } + + @Override + public void getValues(MeasurementReport report, Set<MeasurementScheduleRequest> metrics) throws Exception { + //we'll handling the rest of the metrics using the super method, but we may leave out some of the requests + //if we handle them here. Right now, just use the obtained set. We only create a copy of the (unmodifiable) set + //of requests if necessary. + Set<MeasurementScheduleRequest> metricsToPassDown = metrics; + + for(MeasurementScheduleRequest request : metrics) { + if (request.getDataType() == DataType.CALLTIME) { + //make a copy to pass down to super class if necessary + if (metricsToPassDown == metrics) { + metricsToPassDown = new HashSet<MeasurementScheduleRequest>(metrics); + } + + metricsToPassDown.remove(request); + + //handle this ourselves + //the name of the metric is actually the name of the stat collected for each method. we then provide + //the calltime data for each method. + + Result result = getASConnection().execute(new ReadAttribute(address, METHODS_ATTRIBUTE)); + Object value = result.getResult(); + if (value instanceof Map) { + String requestedMetric = request.getName().substring(CALLTIME_METRIC_NAME_PREFIX_LENGTH); + + @SuppressWarnings("unchecked") + Map<String, Map<String, Number>> allMethodStats = (Map<String, Map<String, Number>>) value; + + Stats lastCollection = getLastCallTimeCollection(requestedMetric, allMethodStats); + Stats thisCollection = Stats.fromMap(allMethodStats, requestedMetric, System.currentTimeMillis()); + + CallTimeData callTime = new CallTimeData(request); + + fillCallTimeData(callTime, requestedMetric, thisCollection, lastCollection); + + saveCallTimeCollection(requestedMetric, thisCollection); + + report.addData(callTime); + } else { + log.error("Unexpected type of results when querying method stats"); + } + } + } + + super.getValues(report, metricsToPassDown); + } + + private Stats getLastCallTimeCollection(String requestName, Map<String, Map<String, Number>> fallbackValues) throws IOException { + File dataFile = new File(context.getResourceDataDirectory(), requestName); + if (!dataFile.exists()) { + return Stats.fromMap(fallbackValues, requestName, System.currentTimeMillis()); + } else { + ObjectInputStream in = null; + try { + in = new ObjectInputStream(new FileInputStream(dataFile)); + + return (Stats) in.readObject(); + } catch (IOException e) { + throw new IOException("Couldn't read the stored calltime data from file " + dataFile + ".", e); + } catch (ClassNotFoundException e) { + throw new IllegalStateException("Couldn't find plugin API classes. This is serious!", e); + } finally { + StreamUtil.safeClose(in); + } + } + } + + private void saveCallTimeCollection(String requestName, Stats stats) throws IOException { + File dataFile = new File(context.getResourceDataDirectory(), requestName); + + ObjectOutputStream out = null; + try { + out = new ObjectOutputStream(new FileOutputStream(dataFile)); + out.writeObject(stats); + } catch (IOException e) { + throw new IOException("Couldn't write the last collected calltime data to file " + dataFile + ".", e); + } finally { + StreamUtil.safeClose(out); + } + } + + /** + * Given the current and previous stats collected from the AS, this fills in the provided calltime data record with + * the differential values from the last time to this time. + * + * @param callTimeData the calltime record to fill in + * @param requestName the name of the metric being collected + * @param stats the current stats collected from the AS + * @param previousStats the previously collected stats + */ + private void fillCallTimeData(CallTimeData callTimeData, String requestName, Stats stats, Stats previousStats) { + Date startDate = new Date(previousStats.collectionTime); + Date endDate = new Date(stats.collectionTime); + + for(Map.Entry<String, StatsRecord> entry : stats.data.entrySet()) { + String methodName = entry.getKey(); + StatsRecord thisStatsRecord = entry.getValue(); + + StatsRecord previousStatsRecord = previousStats.data.get(methodName); + + long invocations = thisStatsRecord.invocations - previousStatsRecord.invocations; + if (invocations == 0) { + continue; + } + + long total = thisStatsRecord.total - previousStatsRecord.total; + + //AS doesn't really give us this info... + double min = (double) total / invocations; + double max = (double) total / invocations; + + callTimeData.addAggregatedCallData(methodName, startDate, endDate, min, max, total, + invocations); + } + + } +} diff --git a/modules/plugins/jboss-as-7/src/main/resources/META-INF/rhq-plugin.xml b/modules/plugins/jboss-as-7/src/main/resources/META-INF/rhq-plugin.xml index 3960407..af8474b 100644 --- a/modules/plugins/jboss-as-7/src/main/resources/META-INF/rhq-plugin.xml +++ b/modules/plugins/jboss-as-7/src/main/resources/META-INF/rhq-plugin.xml @@ -903,6 +903,22 @@ </resource-configuration> '> + <!ENTITY ejb3BeanStats ' + <metric property="peak-concurrent-invocations" category="performance" dataType="measurement" displayType="summary" + measurementType="dynamic" description="Peak concurrent invocations." + displayName="Peak concurrent invocations"/> + <metric property="invocations" category="performance" dataType="measurement" displayType="summary" + measurementType="trendsup" description="Number of invocations processed." displayName="Invocations"/> + <metric property="wait-time" category="performance" dataType="measurement" displayType="summary" + measurementType="dynamic" description="Time spent waiting to obtain an instance." displayName="Wait Time" + units="milliseconds"/> + <metric property="execution-time" category="performance" dataType="measurement" displayType="summary" + measurementType="trendsup" description="Time spent within a bean method" displayName="Execution Time" + units="milliseconds"/> + <metric property="__calltime:execution-time" category="performance" dataType="calltime" displayType="summary" + description="The execution times of individual methods on a bean" displayName="Method Execution Time" + units="milliseconds" destinationType="Method Name"/> +'> ]> <plugin name="&pluginName;" displayName="JBoss Application Server 7.x" @@ -972,7 +988,6 @@ </results> </operation> - <metric property="_internal:mgmtRequests" category="performance" dataType="measurement" defaultInterval="120000" displayType="summary" measurementType="trendsup" description="Number of requests sent to the controller" displayName="Number of management requests"/> @@ -2969,6 +2984,7 @@ <c:simple-property name="default-slsb-instance-pool" required="false" type="string" readOnly="true" description="Name of the default stateless bean instance pool, which will be applicable to all stateless EJBs, unless overridden at the deployment or bean level"/> <c:simple-property name="default-stateful-bean-access-timeout:expr" displayName="Default Stateful Bean Access Timeout" required="false" type="string" readOnly="true" defaultValue="5000" description="The default access timeout for stateful beans. The default value is 5000."/> <c:simple-property name="in-vm-remote-interface-invocation-pass-by-value" required="false" type="boolean" readOnly="true" defaultValue="true" description="If set to false, the parameters to invocations on remote interface of an EJB, will be passed by reference. Else, the parameters will be passed by value. The default value is true."/> + <c:simple-property name="enable-statistics" required="false" type="boolean" readOnly="true" defaultValue="false" description="If set to true, enable the collection of invocation statistics."/> </resource-configuration> <service name="EJB3 Thread Pool (Managed Server)" @@ -5803,6 +5819,7 @@ <c:simple-property name="default-slsb-instance-pool" required="false" type="string" readOnly="false" description="Name of the default stateless bean instance pool, which will be applicable to all stateless EJBs, unless overridden at the deployment or bean level"/> <c:simple-property name="default-stateful-bean-access-timeout:expr" displayName="Default Stateful Bean Access Timeout" required="false" type="string" readOnly="false" defaultValue="5000" description="The default access timeout for stateful beans. The default value is 5000."/> <c:simple-property name="in-vm-remote-interface-invocation-pass-by-value" required="false" type="boolean" readOnly="false" defaultValue="true" description="If set to false, the parameters to invocations on remote interface of an EJB, will be passed by reference. Else, the parameters will be passed by value. The default value is true."/> + <c:simple-property name="enable-statistics" required="false" type="boolean" readOnly="false" defaultValue="false" description="If set to true, enable the collection of invocation statistics."/> </resource-configuration> <service name="EJB3 Thread Pool (Profile)" @@ -9798,7 +9815,7 @@ </plugin-configuration> <service name="Message Driven Bean Runtime" - class="BaseComponent" + class="Ejb3BeanRuntimeComponent" discovery="SubsystemDiscovery" description="Bean component included in the deployment."> @@ -9811,6 +9828,7 @@ <metric property="pool-current-size" description="The current size of the pool."/> <metric property="pool-max-size" description="The maximum size of the pool."/> <metric property="pool-remove-count" description="The number of bean instances that have been removed."/> + &ejb3BeanStats; <resource-configuration> <c:simple-property name="component-class-name" required="false" type="string" readOnly="true" description="The component's class name."/> @@ -9843,7 +9861,7 @@ </service> <service name="Singleton Bean Runtime" - class="BaseComponent" + class="Ejb3BeanRuntimeComponent" discovery="SubsystemDiscovery" description="Singleton bean component included in the deployment."> @@ -9851,6 +9869,8 @@ <c:simple-property name="path" default="singleton-bean" readOnly="true"/> </plugin-configuration> + &ejb3BeanStats; + <resource-configuration> <c:simple-property name="component-class-name" required="false" type="string" readOnly="true" description="The component's class name."/> <c:list-property name="declared-roles" description="The roles declared (via @DeclareRoles) on this EJB component."> @@ -9882,7 +9902,7 @@ </service> <service name="Stateless Session Bean Runtime" - class="BaseComponent" + class="Ejb3BeanRuntimeComponent" discovery="SubsystemDiscovery" description="Stateless session bean component included in the deployment."> @@ -9895,6 +9915,7 @@ <metric property="pool-current-size" description="The current size of the pool."/> <metric property="pool-max-size" description="The maximum size of the pool."/> <metric property="pool-remove-count" description="The number of bean instances that have been removed."/> + &ejb3BeanStats; <resource-configuration> <c:simple-property name="component-class-name" required="false" type="string" readOnly="true" description="The component's class name."/> @@ -9927,7 +9948,7 @@ </service> <service name="Entity Bean Runtime" - class="BaseComponent" + class="Ejb3BeanRuntimeComponent" discovery="SubsystemDiscovery" description="Entity bean component included in the deployment."> @@ -9940,6 +9961,7 @@ <metric property="pool-current-size" description="The current size of the pool."/> <metric property="pool-max-size" description="The maximum size of the pool."/> <metric property="pool-remove-count" description="The number of bean instances that have been removed."/> + &ejb3BeanStats; <resource-configuration> <c:simple-property name="component-class-name" required="false" type="string" readOnly="true" description="The component's class name."/> @@ -9952,7 +9974,7 @@ </service> <service name="Stateful Session Bean Runtime" - class="BaseComponent" + class="Ejb3BeanRuntimeComponent" discovery="SubsystemDiscovery" description="Stateful session bean component included in the deployment."> @@ -9960,6 +9982,8 @@ <c:simple-property name="path" default="stateful-session-bean" readOnly="true"/> </plugin-configuration> + &ejb3BeanStats; + <resource-configuration> <c:simple-property name="component-class-name" required="false" type="string" readOnly="true" description="The component's class name."/> <c:list-property name="declared-roles" description="The roles declared (via @DeclareRoles) on this EJB component."> @@ -11005,6 +11029,7 @@ <c:simple-property name="default-slsb-instance-pool" required="false" type="string" readOnly="false" description="Name of the default stateless bean instance pool, which will be applicable to all stateless EJBs, unless overridden at the deployment or bean level"/> <c:simple-property name="default-stateful-bean-access-timeout:expr" displayName="Default Stateful Bean Access Timeout" required="false" type="string" readOnly="false" defaultValue="5000" description="The default access timeout for stateful beans. The default value is 5000."/> <c:simple-property name="in-vm-remote-interface-invocation-pass-by-value" required="false" type="boolean" readOnly="false" defaultValue="true" description="If set to false, the parameters to invocations on remote interface of an EJB, will be passed by reference. Else, the parameters will be passed by value. The default value is true."/> + <c:simple-property name="enable-statistics" required="false" type="boolean" readOnly="false" defaultValue="false" description="If set to true, enable the collection of invocation statistics."/> </resource-configuration> <service name="EJB3 Thread Pool"

1 0

[rhq] modules/enterprise
by mike thompson 18 Sep '13

18 Sep '13

modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceDetailView.java | 349 ++++------ modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/table/MetricsResourceView.java | 70 +- modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/table/MetricsTableView.java | 53 - modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/preferences/MeasurementUserPreferences.java | 79 -- 4 files changed, 244 insertions(+), 307 deletions(-) New commits: commit 1e23623a8ce39893ce04f0ce507e9137f211e65a Author: Mike Thompson <mithomps(a)redhat.com> Date: Tue Sep 17 16:02:45 2013 -0700 [BZ 1009089] - Metrics list from previous resource cached when navigating Monitor Sub Tabs. Move the stateful momento containing open chart rows out to the ResourceDetailView instead of at the MetricsTableView which can then be created and destroyed like the other stateless views and state momento passed into the View to restore previous (opened rows) state. diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceDetailView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceDetailView.java index 11c7328..328d471 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceDetailView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/ResourceDetailView.java @@ -89,106 +89,13 @@ public class ResourceDetailView extends AbstractTwoLevelTabSetView<ResourceComposite, ResourceTitleBar, D3GraphListView> { private static final String BASE_VIEW_PATH = "Resource"; - - public static class Tab { - public static class Summary { - public static final String NAME = "Summary"; - - public static class SubTab { - public static final String ACTIVITY = "Activity"; - public static final String TIMELINE = "Timeline"; - } - } - - public static class Inventory { - public static final String NAME = "Inventory"; - - public static class SubTab { - public static final String CHILDREN = "Children"; - public static final String CHILD_HISTORY = "ChildHistory"; - public static final String CONNECTION_SETTINGS = "ConnectionSettings"; - public static final String CONNECTION_SETTINGS_HISTORY = PluginConfigurationHistoryListView.VIEW_ID.getName(); - public static final String GROUPS = "Groups"; - public static final String AGENT = "Agent"; - } - } - - public static class Alerts { - public static final String NAME = "Alerts"; - - public static class SubTab { - public static final String HISTORY = "History"; - public static final String DEFINITIONS = "Definitions"; - } - } - - public static class Monitoring { - public static final String NAME = "Monitoring"; - - public static class SubTab { - public static final String METRICS = "Metrics"; - public static final String TRAITS = "Traits"; - public static final String SCHEDULES = "Schedules"; - public static final String CALL_TIME = "CallTime"; - } - } - - public static class Events { - public static final String NAME = "Events"; - - public static class SubTab { - public static final String HISTORY = "History"; - } - } - - public static class Operations { - public static final String NAME = "Operations"; - - public static class SubTab { - public static final String SCHEDULES = "Schedules"; - public static final String HISTORY = "History"; - } - } - - public static class Configuration { - public static final String NAME = "Configuration"; - - public static class SubTab { - public static final String CURRENT = "Current"; - public static final String HISTORY = "History"; - } - } - - public static class Drift { - public static final String NAME = "Drift"; - - public static class SubTab { - public static final String DEFINITIONS = "Definitions"; - } - } - - public static class Content { - public static final String NAME = "Content"; - - public static class SubTab { - public static final String DEPLOYED = "Deployed"; - public static final String NEW = "New"; - public static final String SUBSCRIPTIONS = "Subscriptions"; - public static final String HISTORY = "History"; - } - } - } - private Integer resourceId; private Integer lastSelectedResourceId = 0; - private ResourceComposite resourceComposite; - private MetricsResourceView metricsResourceView; - - //private List<ResourceSelectListener> selectListeners = new ArrayList<ResourceSelectListener>(); - + private Set<Integer> metricsExpandedRowsMomento; private TwoLevelTab summaryTab; + private TwoLevelTab monitoringTab; private TwoLevelTab inventoryTab; private TwoLevelTab operationsTab; @@ -275,100 +182,96 @@ public class ResourceDetailView extends private static TwoLevelTab[] createTabs() { List<TwoLevelTab> tabs = new ArrayList<TwoLevelTab>(); - TwoLevelTab summaryTab = new TwoLevelTab(new ViewName(Tab.Summary.NAME, MSG.common_title_summary()), ImageManager.getResourceIcon( - ResourceCategory.SERVICE, AvailabilityType.UP)); - SubTab summaryActivity = new SubTab(summaryTab, new ViewName(Tab.Summary.SubTab.ACTIVITY, MSG.view_tabs_common_activity()), null); - SubTab summaryTimeline = new SubTab(summaryTab, new ViewName(Tab.Summary.SubTab.TIMELINE, MSG.view_tabs_common_timeline()), null); + TwoLevelTab summaryTab = new TwoLevelTab(new ViewName(Tab.Summary.NAME, MSG.common_title_summary()), + ImageManager.getResourceIcon(ResourceCategory.SERVICE, AvailabilityType.UP)); + SubTab summaryActivity = new SubTab(summaryTab, new ViewName(Tab.Summary.SubTab.ACTIVITY, + MSG.view_tabs_common_activity()), null); + SubTab summaryTimeline = new SubTab(summaryTab, new ViewName(Tab.Summary.SubTab.TIMELINE, + MSG.view_tabs_common_timeline()), null); summaryTab.registerSubTabs(summaryActivity, summaryTimeline); tabs.add(summaryTab); TwoLevelTab inventoryTab = new TwoLevelTab(new ViewName(Tab.Inventory.NAME, MSG.view_tabs_common_inventory()), IconEnum.INVENTORY_SUMMARY); - SubTab inventoryChildren = new SubTab(inventoryTab, new ViewName( - Tab.Inventory.SubTab.CHILDREN, MSG.view_tabs_common_child_resources()), - null); - SubTab inventoryChildHistory = new SubTab(inventoryTab, new ViewName( - Tab.Inventory.SubTab.CHILD_HISTORY, + SubTab inventoryChildren = new SubTab(inventoryTab, new ViewName(Tab.Inventory.SubTab.CHILDREN, + MSG.view_tabs_common_child_resources()), null); + SubTab inventoryChildHistory = new SubTab(inventoryTab, new ViewName(Tab.Inventory.SubTab.CHILD_HISTORY, MSG.view_tabs_common_child_history()), null); - SubTab inventoryConn = new SubTab(inventoryTab, new ViewName( - Tab.Inventory.SubTab.CONNECTION_SETTINGS, + SubTab inventoryConn = new SubTab(inventoryTab, new ViewName(Tab.Inventory.SubTab.CONNECTION_SETTINGS, MSG.view_tabs_common_connectionSettings()), null); SubTab inventoryConnHistory = new SubTab(inventoryTab, PluginConfigurationHistoryListView.VIEW_ID, null); - SubTab inventoryGroups = new SubTab(inventoryTab, new ViewName( - Tab.Inventory.SubTab.GROUPS, MSG.view_tabs_common_groups()), null); - SubTab inventoryAgent = new SubTab(inventoryTab, new ViewName( - Tab.Inventory.SubTab.AGENT, MSG.view_tabs_common_agent()), null); - inventoryTab.registerSubTabs(inventoryChildren, inventoryChildHistory, inventoryConn, - inventoryConnHistory, inventoryGroups, inventoryAgent); + SubTab inventoryGroups = new SubTab(inventoryTab, new ViewName(Tab.Inventory.SubTab.GROUPS, + MSG.view_tabs_common_groups()), null); + SubTab inventoryAgent = new SubTab(inventoryTab, new ViewName(Tab.Inventory.SubTab.AGENT, + MSG.view_tabs_common_agent()), null); + inventoryTab.registerSubTabs(inventoryChildren, inventoryChildHistory, inventoryConn, inventoryConnHistory, + inventoryGroups, inventoryAgent); tabs.add(inventoryTab); - TwoLevelTab alertsTab = new TwoLevelTab(new ViewName(Tab.Alerts.NAME, MSG.common_title_alerts()), IconEnum.ALERT_DEFINITIONS); - SubTab alertHistory = new SubTab(alertsTab, new ViewName( - Tab.Alerts.SubTab.HISTORY, MSG.view_tabs_common_history()), null); - SubTab alertDef = new SubTab(alertsTab, new ViewName( - Tab.Alerts.SubTab.DEFINITIONS, MSG.common_title_definitions()), null); + TwoLevelTab alertsTab = new TwoLevelTab(new ViewName(Tab.Alerts.NAME, MSG.common_title_alerts()), + IconEnum.ALERT_DEFINITIONS); + SubTab alertHistory = new SubTab(alertsTab, new ViewName(Tab.Alerts.SubTab.HISTORY, + MSG.view_tabs_common_history()), null); + SubTab alertDef = new SubTab(alertsTab, new ViewName(Tab.Alerts.SubTab.DEFINITIONS, + MSG.common_title_definitions()), null); alertsTab.registerSubTabs(alertHistory, alertDef); tabs.add(alertsTab); - TwoLevelTab monitoringTab = new TwoLevelTab(new ViewName(Tab.Monitoring.NAME, MSG.view_tabs_common_monitoring()), - IconEnum.SUSPECT_METRICS); - - SubTab monitorMetrics = new SubTab(monitoringTab, new ViewName( - Tab.Monitoring.SubTab.METRICS, MSG.view_tabs_common_metrics()), null); - SubTab monitorTraits = new SubTab(monitoringTab, new ViewName( - Tab.Monitoring.SubTab.TRAITS, MSG.view_tabs_common_traits()), null); - SubTab monitorSched = new SubTab(monitoringTab, new ViewName( - Tab.Monitoring.SubTab.SCHEDULES, MSG.view_tabs_common_schedules()), null); - SubTab monitorCallTime = new SubTab(monitoringTab, new ViewName( - Tab.Monitoring.SubTab.CALL_TIME, MSG.view_tabs_common_calltime()), null); - monitoringTab.registerSubTabs( monitorMetrics, monitorTraits, monitorSched, monitorCallTime); + TwoLevelTab monitoringTab = new TwoLevelTab( + new ViewName(Tab.Monitoring.NAME, MSG.view_tabs_common_monitoring()), IconEnum.SUSPECT_METRICS); + + SubTab monitorMetrics = new SubTab(monitoringTab, new ViewName(Tab.Monitoring.SubTab.METRICS, + MSG.view_tabs_common_metrics()), null); + SubTab monitorTraits = new SubTab(monitoringTab, new ViewName(Tab.Monitoring.SubTab.TRAITS, + MSG.view_tabs_common_traits()), null); + SubTab monitorSched = new SubTab(monitoringTab, new ViewName(Tab.Monitoring.SubTab.SCHEDULES, + MSG.view_tabs_common_schedules()), null); + SubTab monitorCallTime = new SubTab(monitoringTab, new ViewName(Tab.Monitoring.SubTab.CALL_TIME, + MSG.view_tabs_common_calltime()), null); + monitoringTab.registerSubTabs(monitorMetrics, monitorTraits, monitorSched, monitorCallTime); tabs.add(monitoringTab); - TwoLevelTab eventsTab = new TwoLevelTab(new ViewName(Tab.Events.NAME, MSG.view_tabs_common_events()), IconEnum.EVENTS); - SubTab eventHistory = new SubTab(eventsTab, new ViewName( - Tab.Events.SubTab.HISTORY, MSG.view_tabs_common_history()), null); + TwoLevelTab eventsTab = new TwoLevelTab(new ViewName(Tab.Events.NAME, MSG.view_tabs_common_events()), + IconEnum.EVENTS); + SubTab eventHistory = new SubTab(eventsTab, new ViewName(Tab.Events.SubTab.HISTORY, + MSG.view_tabs_common_history()), null); eventsTab.registerSubTabs(eventHistory); tabs.add(eventsTab); TwoLevelTab operationsTab = new TwoLevelTab(new ViewName(Tab.Operations.NAME, MSG.common_title_operations()), IconEnum.RECENT_OPERATIONS); - SubTab operationsSchedules = new SubTab(operationsTab, new ViewName( - Tab.Operations.SubTab.SCHEDULES, + SubTab operationsSchedules = new SubTab(operationsTab, new ViewName(Tab.Operations.SubTab.SCHEDULES, MSG.view_tabs_common_schedules()), null); - SubTab operationsHistory = new SubTab(operationsTab, new ViewName( - Tab.Operations.SubTab.HISTORY, + SubTab operationsHistory = new SubTab(operationsTab, new ViewName(Tab.Operations.SubTab.HISTORY, MSG.view_tabs_common_history()), null); operationsTab.registerSubTabs(operationsSchedules, operationsHistory); tabs.add(operationsTab); - TwoLevelTab configurationTab = new TwoLevelTab(new ViewName(Tab.Configuration.NAME, MSG.common_title_configuration()), - IconEnum.CONFIGURATION_HISTORY); - SubTab configCurrent = new SubTab(configurationTab, new ViewName( - Tab.Configuration.SubTab.CURRENT, + TwoLevelTab configurationTab = new TwoLevelTab(new ViewName(Tab.Configuration.NAME, + MSG.common_title_configuration()), IconEnum.CONFIGURATION_HISTORY); + SubTab configCurrent = new SubTab(configurationTab, new ViewName(Tab.Configuration.SubTab.CURRENT, MSG.view_tabs_common_current()), null); - SubTab configHistory = new SubTab(configurationTab, new ViewName( - Tab.Configuration.SubTab.HISTORY, + SubTab configHistory = new SubTab(configurationTab, new ViewName(Tab.Configuration.SubTab.HISTORY, MSG.view_tabs_common_history()), null); configurationTab.registerSubTabs(configCurrent, configHistory); tabs.add(configurationTab); - TwoLevelTab driftTab = new TwoLevelTab(new ViewName(Tab.Drift.NAME, MSG.view_tabs_common_drift()), IconEnum.DRIFT_COMPLIANCE); - SubTab driftDefinitions = new SubTab(driftTab, new ViewName( - Tab.Drift.SubTab.DEFINITIONS, + TwoLevelTab driftTab = new TwoLevelTab(new ViewName(Tab.Drift.NAME, MSG.view_tabs_common_drift()), + IconEnum.DRIFT_COMPLIANCE); + SubTab driftDefinitions = new SubTab(driftTab, new ViewName(Tab.Drift.SubTab.DEFINITIONS, MSG.common_title_definitions()), null); driftTab.registerSubTabs(driftDefinitions); tabs.add(driftTab); - TwoLevelTab contentTab = new TwoLevelTab(new ViewName(Tab.Content.NAME, MSG.view_tabs_common_content()), IconEnum.CONTENT); - SubTab contentDeployed = new SubTab(contentTab, new ViewName( - Tab.Content.SubTab.DEPLOYED, MSG.view_tabs_common_deployed()), null); - SubTab contentNew = new SubTab(contentTab, new ViewName( - Tab.Content.SubTab.NEW, MSG.common_button_new()), null); - SubTab contentSubscrip = new SubTab(contentTab, new ViewName( - Tab.Content.SubTab.SUBSCRIPTIONS, + TwoLevelTab contentTab = new TwoLevelTab(new ViewName(Tab.Content.NAME, MSG.view_tabs_common_content()), + IconEnum.CONTENT); + SubTab contentDeployed = new SubTab(contentTab, new ViewName(Tab.Content.SubTab.DEPLOYED, + MSG.view_tabs_common_deployed()), null); + SubTab contentNew = new SubTab(contentTab, new ViewName(Tab.Content.SubTab.NEW, MSG.common_button_new()), null); + SubTab contentSubscrip = new SubTab(contentTab, new ViewName(Tab.Content.SubTab.SUBSCRIPTIONS, MSG.view_tabs_common_subscriptions()), null); - SubTab contentHistory = new SubTab(contentTab, new ViewName( - Tab.Content.SubTab.HISTORY, MSG.view_tabs_common_history()), null); + SubTab contentHistory = new SubTab(contentTab, new ViewName(Tab.Content.SubTab.HISTORY, + MSG.view_tabs_common_history()), null); contentTab.registerSubTabs(contentDeployed, contentNew, contentSubscrip, contentHistory); tabs.add(contentTab); @@ -379,23 +282,29 @@ public class ResourceDetailView extends return new ResourceTitleBar(platformTree); } + private static boolean hasMetricsOfType(ResourceComposite resourceComposite, DataType dataType) { + ResourceType type = resourceComposite.getResource().getResourceType(); + Set<MeasurementDefinition> metricDefs = type.getMetricDefinitions(); + for (MeasurementDefinition metricDef : metricDefs) { + if (dataType == null || metricDef.getDataType() == dataType) { + return true; + } + } + return false; + } + @Override protected D3GraphListView createD3GraphListView() { graphListView = D3GraphListView.createSummaryMultipleGraphs(resourceComposite.getResource(), true); return graphListView; } - - @Override protected void updateTabContent(ResourceComposite resourceComposite, boolean isRefresh) { super.updateTabContent(resourceComposite, isRefresh); try { this.resourceComposite = resourceComposite; - // for (ResourceSelectListener selectListener : this.selectListeners) { - // selectListener.onResourceSelected(this.resourceComposite); - // } Resource resource = this.resourceComposite.getResource(); getTitleBar().setResource(this.resourceComposite, isRefresh); @@ -516,7 +425,7 @@ public class ResourceDetailView extends private void updateMonitoringTabContent(final Resource resource, Set<ResourceTypeFacet> facets) { boolean visible = hasMetricsOfType(this.resourceComposite, DataType.MEASUREMENT) - || hasMetricsOfType(this.resourceComposite, DataType.AVAILABILITY); + || hasMetricsOfType(this.resourceComposite, DataType.AVAILABILITY); ViewFactory viewFactory; boolean visibleToIE8 = !BrowserUtility.isBrowserPreIE9(); @@ -525,11 +434,21 @@ public class ResourceDetailView extends viewFactory = (!visible) ? null : new ViewFactory() { @Override public Canvas createView() { - if(null == metricsResourceView || resource.getId() != lastSelectedResourceId){ - metricsResourceView = new MetricsResourceView(resource); - addViewRenderedListener(metricsResourceView); + // metricsResourceView contains state of opened graphs (unlike other stateless views) + //so we don't need to preserve that state here + boolean isNewView = null == metricsResourceView; + boolean hasResourceChanged = resourceComposite.getResource().getId() != lastSelectedResourceId; + if (isNewView || hasResourceChanged) { + if(null != metricsExpandedRowsMomento){ + metricsExpandedRowsMomento.clear(); + } } - return metricsResourceView; + metricsResourceView = new MetricsResourceView(resourceComposite.getResource(), metricsExpandedRowsMomento); + + // this listener handles the subtab navigation + addViewRenderedListener(metricsResourceView); + + return metricsResourceView; } }; updateSubTab(this.monitoringTab, this.monitorMetrics, visible, visibleToIE8, viewFactory); @@ -695,8 +614,8 @@ public class ResourceDetailView extends //noinspection ThrowableInstanceNeverThrown onFailure(new Exception("Resource with id [" + resourceId + "] does not exist.")); } else { - final ResourceComposite resourceComposite = result.get(0); - loadResourceType(resourceComposite, viewPath); + resourceComposite = result.get(0); + loadResourceType(viewPath); // add this resouce to the user's recently visited list UserSessionManager.getUserPreferences().addRecentResource(resourceId, @@ -718,10 +637,9 @@ public class ResourceDetailView extends }); } - private void loadResourceType(final ResourceComposite resourceComposite, final ViewPath viewPath) { - final Resource resource = resourceComposite.getResource(); + private void loadResourceType(final ViewPath viewPath) { ResourceTypeRepository.Cache.getInstance().getResourceTypes( - resource.getResourceType().getId(), + resourceComposite.getResource().getResourceType().getId(), EnumSet.of(ResourceTypeRepository.MetadataType.children, ResourceTypeRepository.MetadataType.content, ResourceTypeRepository.MetadataType.operations, ResourceTypeRepository.MetadataType.measurements, ResourceTypeRepository.MetadataType.events, @@ -743,14 +661,93 @@ public class ResourceDetailView extends }); } - private static boolean hasMetricsOfType(ResourceComposite resourceComposite, DataType dataType) { - ResourceType type = resourceComposite.getResource().getResourceType(); - Set<MeasurementDefinition> metricDefs = type.getMetricDefinitions(); - for (MeasurementDefinition metricDef : metricDefs) { - if (dataType == null || metricDef.getDataType() == dataType) { - return true; + public static class Tab { + public static class Summary { + public static final String NAME = "Summary"; + + public static class SubTab { + public static final String ACTIVITY = "Activity"; + public static final String TIMELINE = "Timeline"; + } + } + + public static class Inventory { + public static final String NAME = "Inventory"; + + public static class SubTab { + public static final String CHILDREN = "Children"; + public static final String CHILD_HISTORY = "ChildHistory"; + public static final String CONNECTION_SETTINGS = "ConnectionSettings"; + public static final String CONNECTION_SETTINGS_HISTORY = PluginConfigurationHistoryListView.VIEW_ID + .getName(); + public static final String GROUPS = "Groups"; + public static final String AGENT = "Agent"; + } + } + + public static class Alerts { + public static final String NAME = "Alerts"; + + public static class SubTab { + public static final String HISTORY = "History"; + public static final String DEFINITIONS = "Definitions"; + } + } + + public static class Monitoring { + public static final String NAME = "Monitoring"; + + public static class SubTab { + public static final String METRICS = "Metrics"; + public static final String TRAITS = "Traits"; + public static final String SCHEDULES = "Schedules"; + public static final String CALL_TIME = "CallTime"; + } + } + + public static class Events { + public static final String NAME = "Events"; + + public static class SubTab { + public static final String HISTORY = "History"; + } + } + + public static class Operations { + public static final String NAME = "Operations"; + + public static class SubTab { + public static final String SCHEDULES = "Schedules"; + public static final String HISTORY = "History"; + } + } + + public static class Configuration { + public static final String NAME = "Configuration"; + + public static class SubTab { + public static final String CURRENT = "Current"; + public static final String HISTORY = "History"; + } + } + + public static class Drift { + public static final String NAME = "Drift"; + + public static class SubTab { + public static final String DEFINITIONS = "Definitions"; + } + } + + public static class Content { + public static final String NAME = "Content"; + + public static class SubTab { + public static final String DEPLOYED = "Deployed"; + public static final String NEW = "New"; + public static final String SUBSCRIPTIONS = "Subscriptions"; + public static final String HISTORY = "History"; } } - return false; } } diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/table/MetricsResourceView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/table/MetricsResourceView.java index c4b90a1..7e20007 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/table/MetricsResourceView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/table/MetricsResourceView.java @@ -19,6 +19,7 @@ package org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.monitoring.table; import java.util.List; +import java.util.Set; import com.google.gwt.user.client.Timer; import com.google.gwt.user.client.rpc.AsyncCallback; @@ -56,13 +57,16 @@ public class MetricsResourceView extends AbstractD3GraphListView implements private final Resource resource; private EnhancedHLayout expandCollapseHLayout; + private MetricsTableView metricsTableView; + private Set<Integer> expandedRows; - public MetricsResourceView(Resource resource) { + public MetricsResourceView(Resource resource, Set<Integer> expandedRows) { super(); setOverflow(Overflow.AUTO); setWidth100(); setHeight100(); this.resource = resource; + this.expandedRows = expandedRows; } @Override @@ -72,7 +76,7 @@ public class MetricsResourceView extends AbstractD3GraphListView implements final ResourceMetricAvailabilityView availabilityDetails = new ResourceMetricAvailabilityView(resource); availabilityDetails.hide(); - final MetricsTableView metricsTableView = new MetricsTableView(resource, this); + metricsTableView = new MetricsTableView(resource, this, expandedRows); metricsTableView.setHeight100(); availabilityGraph = new AvailabilityD3GraphView<AvailabilityOverUnderGraphType>( @@ -99,7 +103,7 @@ public class MetricsResourceView extends AbstractD3GraphListView implements availabilityDetails.show(); } - refreshGraphs(); + drawGraphs(); } }); expandCollapseHLayout.addMember(expandCollapseArrow); @@ -116,7 +120,10 @@ public class MetricsResourceView extends AbstractD3GraphListView implements public void refreshData() { Log.debug("MetricResourceView.refreshData() for: " + resource.getName() + " id: " + resource.getId()); + addAvailabilityGraph(); + } + private void addAvailabilityGraph() { expandCollapseHLayout.removeMember(availabilityGraph); availabilityGraph.destroy(); @@ -129,15 +136,6 @@ public class MetricsResourceView extends AbstractD3GraphListView implements buttonBarDateTimeRangeEditor.getEndTime(), null); } - public void refreshGraphs() { - new Timer() { - @Override - public void run() { - availabilityGraph.drawJsniChart(); - BrowserUtility.graphSparkLines(); - } - }.schedule(150); - } @Override protected void queryAvailability(final EntityContext context, Long startTime, Long endTime, CountDownLatch notUsed) { @@ -146,32 +144,42 @@ public class MetricsResourceView extends AbstractD3GraphListView implements // now return the availability GWTServiceLookup.getAvailabilityService().getAvailabilitiesForResource(context.getResourceId(), startTime, - endTime, new AsyncCallback<List<Availability>>() { - @Override - public void onFailure(Throwable caught) { - CoreGUI.getErrorHandler().handleError(MSG.view_resource_monitor_availability_loadFailed(), caught); - } + endTime, new AsyncCallback<List<Availability>>() { + @Override + public void onFailure(Throwable caught) { + CoreGUI.getErrorHandler().handleError(MSG.view_resource_monitor_availability_loadFailed(), caught); + } - @Override - public void onSuccess(List<Availability> availList) { - Log.debug("\nSuccessfully queried availability in: " + (System.currentTimeMillis() - timerStart) + @Override + public void onSuccess(List<Availability> availList) { + Log.debug("\nSuccessfully queried availability in: " + (System.currentTimeMillis() - timerStart) + " ms."); - availabilityGraph.setAvailabilityList(availList); - new Timer() { - @Override - public void run() { - availabilityGraph.drawJsniChart(); - - } - }.schedule(150); - } - }); + availabilityGraph.setAvailabilityList(availList); + new Timer() { + @Override + public void run() { + availabilityGraph.drawJsniChart(); + + } + }.schedule(150); + } + }); + } + + private void drawGraphs() { + new Timer() { + @Override + public void run() { + availabilityGraph.drawJsniChart(); + BrowserUtility.graphSparkLines(); + } + }.schedule(150); } @Override public void onViewRendered() { // refresh the graphs on subtab nav because we are a cached view not new - refreshGraphs(); + drawGraphs(); } } diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/table/MetricsTableView.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/table/MetricsTableView.java index 9fc2949..436bdd9 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/table/MetricsTableView.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/table/MetricsTableView.java @@ -70,22 +70,25 @@ import org.rhq.enterprise.gui.coregui.client.util.preferences.MeasurementUserPre public class MetricsTableView extends Table<MetricsViewDataSource> implements Refreshable { private final Resource resource; - private boolean rendered = false; private final AbstractD3GraphListView abstractD3GraphListView; - private final MeasurementUserPreferences measurementUserPrefs; private final AddToDashboardComponent addToDashboardComponent; + Set<Integer> expandedRows; + private boolean rendered = false; private MetricsTableListGrid metricsTableListGrid; - Set<Integer> expandedRows = new HashSet<Integer>(); - - public MetricsTableView(Resource resource, AbstractD3GraphListView abstractD3GraphListView) { + public MetricsTableView(Resource resource, AbstractD3GraphListView abstractD3GraphListView, Set<Integer> expandedRows) { super(); this.resource = resource; this.abstractD3GraphListView = abstractD3GraphListView; measurementUserPrefs = new MeasurementUserPreferences(UserSessionManager.getUserPreferences()); setDataSource(new MetricsViewDataSource(resource)); addToDashboardComponent = new AddToDashboardComponent(resource); + if(null == expandedRows){ + this.expandedRows = new HashSet<Integer>(); + }else { + this.expandedRows = expandedRows; + } } /** @@ -105,11 +108,10 @@ public class MetricsTableView extends Table<MetricsViewDataSource> implements Re ArrayList<ListGridField> fields = getDataSource().getListGridFields(); setListGridFields(fields.toArray(new ListGridField[0])); - if(!rendered){ + if (!rendered) { addTableAction(MSG.view_measureTable_getLive(), new TableAction() { @Override public boolean isEnabled(ListGridRecord[] selection) { - //return selection != null && selection.length != 0; return true; } @@ -135,7 +137,6 @@ public class MetricsTableView extends Table<MetricsViewDataSource> implements Re } } - @Override /** * Redraw Graphs in this context means to refresh the table and redraw open graphs. @@ -152,13 +153,12 @@ public class MetricsTableView extends Table<MetricsViewDataSource> implements Re } - public class MetricsTableListGrid extends ListGrid { private static final int TREEVIEW_DETAIL_CHART_HEIGHT = 205; private static final int NUM_METRIC_POINTS = 60; - private Resource resource; final MetricsTableView metricsTableView; + private Resource resource; public MetricsTableListGrid(final MetricsTableView metricsTableView, final Resource resource) { super(); @@ -198,28 +198,34 @@ public class MetricsTableView extends Table<MetricsViewDataSource> implements Re refreshData(); } }); + addDataArrivedHandler(new DataArrivedHandler() { @Override public void onDataArrived(DataArrivedEvent dataArrivedEvent) { - int startRow = dataArrivedEvent.getStartRow(); - int endRow = dataArrivedEvent.getEndRow(); - - for (int i = startRow; i < endRow; i++) { - ListGridRecord listGridRecord = getRecord(i); - if (null != listGridRecord) { - int metricDefinitionId = listGridRecord - .getAttributeAsInt(MetricsViewDataSource.FIELD_METRIC_DEF_ID); - if (null != metricsTableView && metricsTableView.expandedRows.contains(metricDefinitionId)) { - expandRecord(listGridRecord); - } - } - } + expandOpenedRows(dataArrivedEvent.getStartRow(), dataArrivedEvent.getEndRow(), metricsTableView); } }); } + private void expandOpenedRows(int startRow, int endRow, MetricsTableView metricsTableView) { + + for (int i = startRow; i < endRow; i++) { + ListGridRecord listGridRecord = getRecord(i); + if (null != listGridRecord) { + int metricDefinitionId = listGridRecord + .getAttributeAsInt(MetricsViewDataSource.FIELD_METRIC_DEF_ID); + if (null != metricsTableView && null != metricsTableView.expandedRows && metricsTableView.expandedRows.contains(metricDefinitionId)) { + expandRecord(listGridRecord); + } + } + } + } + @Override + /** + * If you expand a grid row then create a graph. + */ protected Canvas getExpansionComponent(final ListGridRecord record) { final Integer definitionId = record.getAttributeAsInt(MetricsViewDataSource.FIELD_METRIC_DEF_ID); final Integer resourceId = record.getAttributeAsInt(MetricsViewDataSource.FIELD_RESOURCE_ID); @@ -270,7 +276,6 @@ public class MetricsTableView extends Table<MetricsViewDataSource> implements Re public void run() { graphView.drawJsniChart(); BrowserUtility.graphSparkLines(); - } }.schedule(150); diff --git a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/preferences/MeasurementUserPreferences.java b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/preferences/MeasurementUserPreferences.java index 75a5429..50d5400 100644 --- a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/preferences/MeasurementUserPreferences.java +++ b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/util/preferences/MeasurementUserPreferences.java @@ -45,8 +45,8 @@ public class MeasurementUserPreferences { public static final String PREF_MEASUREMENT_INDICATOR_VIEW_DEFAULT_NAME = "Default"; public static final String DEFAULT_VALUE_RANGE_RO = Boolean.FALSE.toString(); - public static final Integer DEFAULT_VALUE_RANGE_LASTN = Integer.valueOf(8); - public static final Integer DEFAULT_VALUE_RANGE_UNIT = Integer.valueOf(3); + public static final Integer DEFAULT_VALUE_RANGE_LASTN = 8; + public static final Integer DEFAULT_VALUE_RANGE_UNIT = 3; private UserPreferences userPrefs; @@ -79,7 +79,6 @@ public class MeasurementUserPreferences { if (rangeString != null && rangeString.trim().length() > 0) { if (rangeString.contains(",")) { // legacy support: old prefs used to use commas rangeString = rangeString.replace(",", UserPreferences.PREF_LIST_DELIM); - //userPrefs.setPreference(PREF_METRIC_RANGE, rangeString); // TODO set only if we don't support JSF anymore } String[] beginEnd = rangeString.split(UserPreferences.PREF_LIST_DELIM_REGEX); prefs.begin = Long.parseLong(beginEnd[0]); @@ -112,50 +111,23 @@ public class MeasurementUserPreferences { if (prefs.explicitBeginEnd) { // persist advanced mode userPrefs.setPreference(PREF_METRIC_RANGE, Arrays.asList(prefs.begin, prefs.end), allowRefresh); - //unsetPreference(PREF_METRIC_RANGE_LASTN); - //unsetPreference(PREF_METRIC_RANGE_UNIT); } else { userPrefs.setPreference(PREF_METRIC_RANGE_LASTN, String.valueOf(prefs.lastN), allowRefresh); userPrefs.setPreference(PREF_METRIC_RANGE_UNIT, String.valueOf(prefs.unit), allowRefresh); - //unsetPreference(PREF_METRIC_RANGE); } } - /* - * I believe these are now no longer used - these were probably for the old struts pages - * - public Integer getMetricThresholdPreference() throws IllegalArgumentException { - return new Integer(userPrefs.getPreference(PREF_METRIC_THRESHOLD)); - } - public void setMetricThresholdPreference(Integer value) throws IllegalArgumentException { - userPrefs.setPreference(PREF_METRIC_THRESHOLD, String.valueOf(value)); - } - */ public MetricViewsPreferences getMetricViews(String key) { MetricViewsPreferences prefs = new MetricViewsPreferences(); - //TODO: jmarques - externalize default view name - // instead of PREF_MEASUREMENT_INDICATOR_VIEW_DEFAULT_NAME - // lookup PREF_MEASUREMENT_INDICATOR_VIEW_DEFAULT from the bundle String value = userPrefs.getPreference(PREF_MEASUREMENT_INDICATOR_VIEW_PREFIX + key, PREF_MEASUREMENT_INDICATOR_VIEW_DEFAULT_NAME); prefs.views = StringUtility.explode(value, UserPreferences.PREF_LIST_DELIM); return prefs; } - // public void setMetricViews(MetricViewsPreferences prefs, String key) { - // StringBuilder builder = new StringBuilder(); - // int index = 0; - // for (String viewName : prefs.views) { - // if (index != 0) { - // builder.append(UserPreferences.PREF_LIST_DELIM); - // } - // builder.append(viewName); - // index++; - // } - // userPrefs.setPreference(PREF_MEASUREMENT_INDICATOR_VIEW_PREFIX + key, builder.toString()); - // } + public String getSelectedView(String key) { String value = userPrefs.getPreference(PREF_MEASUREMENT_INDICATOR_VIEW_PREFIX + "selected." + key, @@ -163,49 +135,4 @@ public class MeasurementUserPreferences { return value; } - // public void setSelectedView(String key, String viewName) { - // userPrefs.setPreference(PREF_MEASUREMENT_INDICATOR_VIEW_PREFIX + "selected." + key, viewName); - // } - // - // public static class MetricViewData { - // public List<String> charts; - // } - - // public MetricViewData getMetricViewData(String context, String viewName) { - // //TODO: jmarques - externalize default view name - // // instead of PREF_MEASUREMENT_INDICATOR_VIEW_DEFAULT_NAME - // // lookup PREF_MEASUREMENT_INDICATOR_VIEW_DEFAULT from the bundle - // if (viewName == null || "".equals(viewName)) { - // viewName = PREF_MEASUREMENT_INDICATOR_VIEW_DEFAULT_NAME; - // } - // MetricViewData chartPreferences = new MetricViewData(); - // // important to let IllegalArgumentException bubble out of here, so the caller can persist the default set - // String data = userPrefs.getPreference(PREF_MEASUREMENT_INDICATOR_VIEW_PREFIX + context + "." + viewName); - // chartPreferences.charts = StringUtility.explode(data, UserPreferences.PREF_LIST_DELIM); - // return chartPreferences; - // } - // - // public void setMetricViewData(String context, String viewName, MetricViewData prefs) { - // //TODO: jmarques - externalize default view name - // // instead of PREF_MEASUREMENT_INDICATOR_VIEW_DEFAULT_NAME - // // lookup PREF_MEASUREMENT_INDICATOR_VIEW_DEFAULT from the bundle - // if (viewName == null || "".equals(viewName)) { - // viewName = PREF_MEASUREMENT_INDICATOR_VIEW_DEFAULT_NAME; - // } - // StringBuilder builder = new StringBuilder(); - // int index = 0; - // for (String chart : prefs.charts) { - // if (index != 0) { - // builder.append(UserPreferences.PREF_LIST_DELIM); - // } - // builder.append(chart); - // index++; - // } - // userPrefs.setPreference(PREF_MEASUREMENT_INDICATOR_VIEW_PREFIX + context + "." + viewName, builder.toString()); - // } - // - // public void deleteMetricViewData(String context, String viewName) { - // userPrefs.unsetPreference(PREF_MEASUREMENT_INDICATOR_VIEW_PREFIX + context + "." + viewName); - // } - }

1 0

[rhq] Branch 'nightly/rhq.jon' - modules/common
by Simeon Pinder 17 Sep '13

17 Sep '13

modules/common/cassandra-ccm/cassandra-ccm-core/pom.xml | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) New commits: commit 85199c15d3f69600c3690750dfbfbdaf06fd7b71 Author: John Sanda <jsanda(a)redhat.com> Date: Tue Sep 17 12:20:49 2013 -0400 download cassandra tarball as maven dependency instead using wget diff --git a/modules/common/cassandra-ccm/cassandra-ccm-core/pom.xml b/modules/common/cassandra-ccm/cassandra-ccm-core/pom.xml index db9a59a..b84d36c 100644 --- a/modules/common/cassandra-ccm/cassandra-ccm-core/pom.xml +++ b/modules/common/cassandra-ccm/cassandra-ccm-core/pom.xml @@ -106,6 +106,13 @@ <artifactId>netty</artifactId> <version>3.6.6.Final</version> </dependency> + <dependency> + <groupId>org.apache.cassandra</groupId> + <artifactId>apache-cassandra</artifactId> + <version>${cassandra.version}</version> + <type>tar.gz</type> + <classifier>bin</classifier> + </dependency> </dependencies> <executions> <execution> @@ -128,10 +135,6 @@ value="${project.build.directory}/cassandra-download"/> <mkdir dir="${cassandra.download.dir}"/> <mkdir dir="${settings.localRepository}/org/apache/cassandra/apache-cassandra/${cassandra.version}"/> - <get src="http://repo1.maven.org/maven2/org/apache/cassandra/apache-cassandra/${cassa…" - dest="${settings.localRepository}/org/apache/cassandra/apache-cassandra/${cassandra.version}/apache-cassandra-${cassandra.version}-bin.tar.gz" - skipexisting="true" - verbose="true"/> <gunzip src="${settings.localRepository}/org/apache/cassandra/apache-cassandra/${cassandra.version}/apache-cassandra-${cassandra.version}-bin.tar.gz" dest="${cassandra.download.dir}"/> <untar src="${cassandra.download.dir}/apache-cassandra-${cassandra.version}-bin.tar"

1 0

[rhq] modules/core modules/enterprise modules/plugins
by Jay Shaughnessy 17 Sep '13

17 Sep '13

modules/core/util/src/main/java/org/rhq/core/util/obfuscation/Obfuscator.java | 13 modules/enterprise/server/appserver/src/main/scripts/rhq-container.build.xml | 27 - modules/enterprise/server/installer/src/main/java/org/rhq/enterprise/server/installer/Installer.java | 36 +- modules/enterprise/server/installer/src/main/java/org/rhq/enterprise/server/installer/InstallerServiceImpl.java | 23 + modules/enterprise/server/installer/src/main/java/org/rhq/enterprise/server/installer/ServerInstallUtil.java | 34 +- modules/enterprise/server/installer/src/main/java/org/rhq/enterprise/server/installer/ServerProperties.java | 3 modules/enterprise/server/server-control/src/main/java/org/rhq/server/control/command/AbstractInstall.java | 10 modules/enterprise/server/server-control/src/main/java/org/rhq/server/control/command/Upgrade.java | 7 modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/StandaloneASDiscovery.java | 29 -- modules/plugins/rhq-server/src/main/java/org/rhq/plugins/server/AlertsCacheResourceComponent.java | 4 modules/plugins/rhq-server/src/main/java/org/rhq/plugins/server/CommunicationsResourceComponent.java | 4 modules/plugins/rhq-server/src/main/java/org/rhq/plugins/server/DiscoveryCallbackImpl.java | 137 ++++++++++ modules/plugins/rhq-server/src/main/java/org/rhq/plugins/server/GroupDefinitionResourceComponent.java | 4 modules/plugins/rhq-server/src/main/java/org/rhq/plugins/server/JBossAS7JMXComponent.java | 22 + modules/plugins/rhq-server/src/main/java/org/rhq/plugins/server/JBossAS7JMXDiscoveryComponent.java | 22 + modules/plugins/rhq-server/src/main/java/org/rhq/plugins/server/RemoteAPIResourceComponent.java | 5 modules/plugins/rhq-server/src/main/resources/META-INF/rhq-plugin.xml | 4 17 files changed, 273 insertions(+), 111 deletions(-) New commits: commit fa6a4d98c14146068c5f19f5e1ced73d42588a05 Author: Jay Shaughnessy <jshaughn(a)redhat.com> Date: Tue Sep 17 15:53:03 2013 -0400 Bug 1006419 - Improve handling of obfuscated passwords for installation Changes such that the user doe snot have to worry about the management user password for the RHQ Server resource. By using a generated password the user no longer has to set the property value manually in rhq-server.properties. Secured rhq-installer.sh|bat --encodepassword option such that it prompts for the plain text password as opposed to taking at as a command line parameter, thus keeping the value out of command history. Also: - add a string generator to the Obfuscator class - update rhq-server.properties such that the rhq.server.management.user property is no longer mentioned for explicit setting, is moved out of the server settings section. and is not pre-set for dev installs. - remove the deprecated --dbpassword installer option - remove the special case RHQ Server handling code from the AS7 standalone server discovery code. Now relies on the new discovery callback mechanism to override the resource name (along with the new password handling). - fix/add some license headers in the rhq server plugin classes diff --git a/modules/core/util/src/main/java/org/rhq/core/util/obfuscation/Obfuscator.java b/modules/core/util/src/main/java/org/rhq/core/util/obfuscation/Obfuscator.java index 3112a55..4743548 100644 --- a/modules/core/util/src/main/java/org/rhq/core/util/obfuscation/Obfuscator.java +++ b/modules/core/util/src/main/java/org/rhq/core/util/obfuscation/Obfuscator.java @@ -22,6 +22,7 @@ package org.rhq.core.util.obfuscation; import java.math.BigInteger; import java.security.InvalidKeyException; import java.security.NoSuchAlgorithmException; +import java.util.Random; import javax.crypto.BadPaddingException; import javax.crypto.Cipher; @@ -118,4 +119,16 @@ public final class Obfuscator { return new String(decode); } + // adapted from http://stackoverflow.com/questions/2863852/how-to-generate-a-random-string-… + public static String generateString(Random random, String validCharacters, int length) { + validCharacters = (null == validCharacters || validCharacters.isEmpty()) ? "1234567890abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ#$" + : validCharacters; + length = (length < 1) ? 10 : length; + + char[] text = new char[length]; + for (int i = 0; i < length; i++) { + text[i] = validCharacters.charAt(random.nextInt(validCharacters.length())); + } + return new String(text); + } } diff --git a/modules/enterprise/server/appserver/src/main/scripts/rhq-container.build.xml b/modules/enterprise/server/appserver/src/main/scripts/rhq-container.build.xml index 25fc6ee..c76ba7b 100644 --- a/modules/enterprise/server/appserver/src/main/scripts/rhq-container.build.xml +++ b/modules/enterprise/server/appserver/src/main/scripts/rhq-container.build.xml @@ -23,8 +23,6 @@ <property name="default.jboss.bind.address" value=""/> - <property name="default.rhq.server.management.password" value=""/> - <target name="set-predeploy-prop"> <condition property="predeploy" value="true"> <or> @@ -48,9 +46,8 @@ <property name="rhq.server.quartz.selectWithLockSQL" value="${rhq.dev.quartz.selectWithLockSQL}" /> <property name="rhq.server.quartz.lockHandlerClass" value="${rhq.dev.quartz.lockHandlerClass}" /> <property name="rhq.server.drift.store-binary-content" value="${default.rhq.server.drift.binary.content}"/> -  +  <property name="jboss.bind.address" value="0.0.0.0"/> - <property name="rhq.server.management.password" value="35c160c1f841a889d4cda53f0bfc94b6"/> </target> <target name="set-default-server-props" unless="predeploy"> @@ -67,9 +64,8 @@ <property name="rhq.server.quartz.selectWithLockSQL" value="${default.rhq.server.quartz.selectWithLockSQL}" /> <property name="rhq.server.quartz.lockHandlerClass" value="${default.rhq.server.quartz.lockHandlerClass}" /> <property name="rhq.server.drift.store-binary-content" value="${default.rhq.server.drift.binary.content}"/> -  +  <property name="jboss.bind.address" value="${default.jboss.bind.address}"/> - <property name="rhq.server.management.password" value="${default.rhq.server.management.password}"/> </target> <target name="initialize" depends="set-predeploy-prop, set-dev-server-props, set-default-server-props"> @@ -475,8 +471,8 @@ rhq.server.quartz.driverDelegateClass=${rhq.server.quartz.driverDelegateClass} ############################################################################# # Server Settings # --------------- -# INSTALLATION ACTION REQUIRED! The following property must be explicitly set: -# rhq.server.management.password +# UPGRADE ACTION REQUIRED! The following property must be explicitly set: +# rhq.server.high-availability.name # # These are miscellaneous settings that the server will use to customize itself # to the environment in which it is running. These are settings you usually @@ -491,16 +487,6 @@ rhq.server.quartz.driverDelegateClass=${rhq.server.quartz.driverDelegateClass} # as the server being upgraded. rhq.server.high-availability.name= -# The installer will create a default EAP management user named 'rhqadmin'. -# The password is obfuscated and specified here. If set to the commented -# value the RHQ Agent will be able to monitor the RHQ Server resource -# automatically. If set to a different value the same password value will -# need to be supplied in the connection properties for the RHQ Server -# resource. See the installation documentation for more information on how -# to generate an obfuscated password value. -# rhq.server.management.password=35c160c1f841a889d4cda53f0bfc94b6 -rhq.server.management.password=${rhq.server.management.password} - # Email settings used to connect to an SMTP server to send alert emails. rhq.server.email.smtp-host=localhost rhq.server.email.smtp-port=25 @@ -700,6 +686,11 @@ rhq.sync.endpoint-address=false # files that are not known binary types. #rhq.server.drift.store-binary-content=${rhq.server.drift.store-binary-content} +# The installer will create a default EAP management user named 'rhqadmin'. +# The password is generated and obfuscated and specified here. This should +# not be edited. +rhq.server.management.password= + ############################################# # Cassandra cluster configuration settings ############################################# diff --git a/modules/enterprise/server/installer/src/main/java/org/rhq/enterprise/server/installer/Installer.java b/modules/enterprise/server/installer/src/main/java/org/rhq/enterprise/server/installer/Installer.java index d9d0509..7d3d4e0 100644 --- a/modules/enterprise/server/installer/src/main/java/org/rhq/enterprise/server/installer/Installer.java +++ b/modules/enterprise/server/installer/src/main/java/org/rhq/enterprise/server/installer/Installer.java @@ -21,14 +21,13 @@ package org.rhq.enterprise.server.installer; import gnu.getopt.Getopt; import gnu.getopt.LongOpt; +import java.io.Console; import java.util.ArrayList; import java.util.HashMap; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; -import org.jboss.sasl.util.UsernamePasswordHashUtil; - import org.rhq.core.util.exception.ThrowableUtil; import org.rhq.enterprise.server.installer.InstallerService.AlreadyInstalledException; import org.rhq.enterprise.server.installer.InstallerService.AutoInstallDisabledException; @@ -147,19 +146,17 @@ public class Installer { usage.append("\t--force, -f: force the installer to try to install everything").append("\n"); usage.append("\t--listservers, -l: show list of known installed servers (install not performed)").append("\n"); usage.append("\t--setupdb, -b: only perform database schema creation or update").append("\n"); - usage.append("\t--dbpassword, -d: (deprecated, use --encodepassword)").append("\n"); - usage.append("\t--encodepassword, -e: encodes a password for rhq-server.properties (edit file manually)"); + usage.append("\t--encodepassword, -e: prompts for password to encode for editing rhq-server.properties"); usage.append("\n"); LOG.info(usage); } private WhatToDo[] processArguments(String[] args) throws Exception { - String sopts = "-:HD:h:p:d:bflt"; + String sopts = "-:HD:h:p:e:bflt"; LongOpt[] lopts = { new LongOpt("help", LongOpt.NO_ARGUMENT, null, 'H'), new LongOpt("host", LongOpt.REQUIRED_ARGUMENT, null, 'h'), new LongOpt("port", LongOpt.REQUIRED_ARGUMENT, null, 'p'), - new LongOpt("dbpassword", LongOpt.REQUIRED_ARGUMENT, null, 'd'), - new LongOpt("encodepassword", LongOpt.REQUIRED_ARGUMENT, null, 'e'), + new LongOpt("encodepassword", LongOpt.NO_ARGUMENT, null, 'e'), new LongOpt("setupdb", LongOpt.NO_ARGUMENT, null, 'b'), new LongOpt("listservers", LongOpt.NO_ARGUMENT, null, 'l'), new LongOpt("force", LongOpt.NO_ARGUMENT, null, 'f'), new LongOpt("test", LongOpt.NO_ARGUMENT, null, 't') }; @@ -230,19 +227,16 @@ public class Installer { break; } - case 'd': { - passwordToEncode = getopt.getOptarg(); - if (passwordToEncode == null) { - throw new IllegalArgumentException("Missing password"); - } - break; - } - case 'e': { - passwordToEncode = getopt.getOptarg(); - if (passwordToEncode == null) { - throw new IllegalArgumentException("Missing password"); + // prompt for the password. we don't use a command line option because then the plain test password + // could get captured in command history. + Console console = System.console(); + if (null != console) { + passwordToEncode = String.valueOf(console.readLine("%s", "Password: ")); + } else { + LOG.error("NO CONSOLE!"); } + break; } @@ -270,14 +264,12 @@ public class Installer { // if a password was asked to be obfuscated, that's all we do on the execution if (passwordToEncode != null) { - String obfuscatedPassword = new InstallerServiceImpl(installerConfig).obfuscatePassword(passwordToEncode); + String obfuscatedPassword = new InstallerServiceImpl(installerConfig).obfuscatePassword(String + .valueOf(passwordToEncode)); LOG.info("*** Encoded password properties for rhq-server.properties:"); LOG.info("*** rhq.server.database.password=" + obfuscatedPassword); LOG.info("*** rhq.storage.password=" + obfuscatedPassword); - obfuscatedPassword = new UsernamePasswordHashUtil().generateHashedHexURP("rhqadmin", "ManagementRealm", - passwordToEncode.toCharArray()); - LOG.info("*** rhq.server.management.password=" + obfuscatedPassword); return new WhatToDo[] { WhatToDo.DO_NOTHING }; } diff --git a/modules/enterprise/server/installer/src/main/java/org/rhq/enterprise/server/installer/InstallerServiceImpl.java b/modules/enterprise/server/installer/src/main/java/org/rhq/enterprise/server/installer/InstallerServiceImpl.java index 38de6cc..906e4ea 100644 --- a/modules/enterprise/server/installer/src/main/java/org/rhq/enterprise/server/installer/InstallerServiceImpl.java +++ b/modules/enterprise/server/installer/src/main/java/org/rhq/enterprise/server/installer/InstallerServiceImpl.java @@ -26,6 +26,7 @@ import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.Properties; +import java.util.Random; import java.util.regex.Matcher; import java.util.regex.Pattern; @@ -43,6 +44,7 @@ import org.rhq.core.db.DatabaseTypeFactory; import org.rhq.core.domain.cloud.StorageNode; import org.rhq.core.util.PropertiesFileUpdate; import org.rhq.core.util.exception.ThrowableUtil; +import org.rhq.core.util.obfuscation.Obfuscator; import org.rhq.core.util.obfuscation.PicketBoxObfuscator; import org.rhq.enterprise.server.installer.ServerInstallUtil.ExistingSchemaOption; import org.rhq.enterprise.server.installer.ServerInstallUtil.SupportedDatabaseType; @@ -258,15 +260,22 @@ public class InstallerServiceImpl implements InstallerService { } } - prepareDatabase(serverProperties, serverDetails, existingSchemaOption); - String appServerConfigDir = getAppServerConfigDir(); // create an rhqadmin management user so when discovered, the AS7 plugin can immediately - // connect to the RHQ Server. Note that if the installer sets rhq.server.management.user to - // anything other than our recommended default, the connection properties will need to be updated - // before the plugin can connect, because the default creds in the plugin will be wrong. - ServerInstallUtil.createDefaultManagementUser(serverProperties, serverDetails, appServerConfigDir); + // connect to the RHQ Server. The password is generated as we try to make the RHQ server manageable by + // the plugin without the user having to get involved. + String managementPassword = Obfuscator.generateString(new Random(), null, 8); + ServerInstallUtil.createDefaultManagementUser(managementPassword, serverDetails, appServerConfigDir); + + // Doing this prior to prepareDatabase sets the property before they are validated and saved. + // The generated password is encoded and then saved as rhq.server.management.password. This value can then + // be picked up agent-side by the discovery component, decoded, and set in the connection properties. If all + // works well no dolphins will be harmed, the rhq server will be protected, and the user sleeps through it. + String encodedManagementPassword = Obfuscator.encode(managementPassword); + serverProperties.put(ServerProperties.PROP_MGMT_USER_PASSWORD, encodedManagementPassword); + + prepareDatabase(serverProperties, serverDetails, existingSchemaOption); // perform stuff that has to get done via the JBossAS management client ModelControllerClient mcc = null; @@ -421,7 +430,7 @@ public class InstallerServiceImpl implements InstallerService { } // test the connection to make sure everything is OK - note that if we are in auto-install mode, - // the password will have been obfuscated, so we need to de-obfucate it in order to use it. + // the password will have been obfuscated, so we need to de-obfuscate it in order to use it. // make sure the server properties map itself has an obfuscated password final String dbUrl = serverProperties.get(ServerProperties.PROP_DATABASE_CONNECTION_URL); final String dbUsername = serverProperties.get(ServerProperties.PROP_DATABASE_USERNAME); diff --git a/modules/enterprise/server/installer/src/main/java/org/rhq/enterprise/server/installer/ServerInstallUtil.java b/modules/enterprise/server/installer/src/main/java/org/rhq/enterprise/server/installer/ServerInstallUtil.java index d40b97e..8b9ce6f 100644 --- a/modules/enterprise/server/installer/src/main/java/org/rhq/enterprise/server/installer/ServerInstallUtil.java +++ b/modules/enterprise/server/installer/src/main/java/org/rhq/enterprise/server/installer/ServerInstallUtil.java @@ -46,6 +46,7 @@ import org.apache.tools.ant.helper.ProjectHelper2; import org.jboss.as.controller.client.ModelControllerClient; import org.jboss.dmr.ModelNode; +import org.jboss.sasl.util.UsernamePasswordHashUtil; import org.rhq.common.jbossas.client.controller.Address; import org.rhq.common.jbossas.client.controller.CoreJBossASClient; @@ -937,10 +938,9 @@ public class ServerInstallUtil { try { LOG.info("Persisting to database new storage nodes for values specified in server configuration property [rhq.storage.nodes]"); - insertStorageNode = connection.prepareStatement( - "INSERT INTO rhq_storage_node (id, address, cql_port, operation_mode, ctime, mtime, maintenance_pending) " + - "VALUES (?, ?, ?, ?, ?, ?, ?)" - ); + insertStorageNode = connection + .prepareStatement("INSERT INTO rhq_storage_node (id, address, cql_port, operation_mode, ctime, mtime, maintenance_pending) " + + "VALUES (?, ?, ?, ?, ?, ?, ?)"); int id = 1001; for (StorageNode storageNode : storageNodes) { @@ -958,8 +958,8 @@ public class ServerInstallUtil { connection.commit(); } catch (SQLException e) { - LOG.error("Failed to persist to database the storage nodes specified by server configuration " + - "property [rhq.storage.nodes]. Transaction will be rolled back.", e); + LOG.error("Failed to persist to database the storage nodes specified by server configuration " + + "property [rhq.storage.nodes]. Transaction will be rolled back.", e); connection.rollback(); throw e; } @@ -996,10 +996,9 @@ public class ServerInstallUtil { connection = getDatabaseConnection(dbUrl, userName, password); connection.setAutoCommit(false); - updateClusterSetting = connection.prepareStatement( - "UPDATE rhq_system_config " + - "SET property_value = ?, default_property_value = ? " + - "WHERE property_key = ? AND property_value IS NULL AND default_property_value IS NULL"); + updateClusterSetting = connection.prepareStatement("UPDATE rhq_system_config " + + "SET property_value = ?, default_property_value = ? " + + "WHERE property_key = ? AND property_value IS NULL AND default_property_value IS NULL"); updateClusterSetting.setString(1, serverProperties.get("rhq.storage.cql-port")); updateClusterSetting.setString(2, serverProperties.get("rhq.storage.cql-port")); @@ -1561,19 +1560,17 @@ public class ServerInstallUtil { * the password, if not set to the default then the AS7 plugin will fail to connect, and the * RHQ Server resource connection properties will need to be updated after discovery and import. * - * @param serverProperties the server properties + * @param password the management password * @param serverDetails details of the server being installed * @param configDirStr location of a configuration directory where the mgmt-users.properties file lives */ - public static void createDefaultManagementUser(HashMap<String, String> serverProperties, - ServerDetails serverDetails, String configDirStr) { + public static void createDefaultManagementUser(String password, ServerDetails serverDetails, String configDirStr) { File confDir = new File(configDirStr); File mgmtUsers = new File(confDir, "mgmt-users.properties"); - String password = serverProperties.get(RHQ_MGMT_USER_PASSWORD); if (ServerInstallUtil.isEmpty(password)) { - LOG.warn("Could not create default management user in file: [" + mgmtUsers + "] : " - + RHQ_MGMT_USER_PASSWORD + " is not set in rhq-server.properties."); + LOG.warn("Could not create default management user in file: [" + mgmtUsers + "] : invalid password [" + + password + "]."); return; } @@ -1593,8 +1590,11 @@ public class ServerInstallUtil { FileOutputStream fos = null; try { + String encodedPassword = new UsernamePasswordHashUtil().generateHashedHexURP(RHQ_MGMT_USER, + "ManagementRealm", password.toCharArray()); + fos = new FileOutputStream(mgmtUsers, true); - fos.write(("\n" + RHQ_MGMT_USER + "=" + password + "\n").getBytes()); + fos.write(("\n" + RHQ_MGMT_USER + "=" + encodedPassword + "\n").getBytes()); } catch (Exception e) { LOG.warn("Could not create default management user in file: [" + mgmtUsers + "] : ", e); diff --git a/modules/enterprise/server/installer/src/main/java/org/rhq/enterprise/server/installer/ServerProperties.java b/modules/enterprise/server/installer/src/main/java/org/rhq/enterprise/server/installer/ServerProperties.java index 2d35030..6177830 100644 --- a/modules/enterprise/server/installer/src/main/java/org/rhq/enterprise/server/installer/ServerProperties.java +++ b/modules/enterprise/server/installer/src/main/java/org/rhq/enterprise/server/installer/ServerProperties.java @@ -27,6 +27,8 @@ import java.util.Set; * @author John Mazzitelli */ public class ServerProperties { + public static final String PROP_FILENAME = "rhq-server.properties"; + public static final String PROP_DATABASE_TYPE = "rhq.server.database.type-mapping"; public static final String PROP_DATABASE_CONNECTION_URL = "rhq.server.database.connection-url"; public static final String PROP_DATABASE_USERNAME = "rhq.server.database.user-name"; @@ -152,7 +154,6 @@ public class ServerProperties { static { STRING_PROPERTIES = new HashSet<String>(); STRING_PROPERTIES.add(PROP_JBOSS_BIND_ADDRESS); - STRING_PROPERTIES.add(PROP_MGMT_USER_PASSWORD); } public static final Set<String> CLIENT_AUTH_MODES; diff --git a/modules/enterprise/server/server-control/src/main/java/org/rhq/server/control/command/AbstractInstall.java b/modules/enterprise/server/server-control/src/main/java/org/rhq/server/control/command/AbstractInstall.java index a14553b..5579af8 100644 --- a/modules/enterprise/server/server-control/src/main/java/org/rhq/server/control/command/AbstractInstall.java +++ b/modules/enterprise/server/server-control/src/main/java/org/rhq/server/control/command/AbstractInstall.java @@ -517,7 +517,15 @@ public abstract class AbstractInstall extends ControlCommand { private Properties loadStorageProperties(String path) throws IOException { Properties properties = new Properties(); - properties.load(new FileInputStream(new File(path))); + FileInputStream fis = null; + try { + fis = new FileInputStream(new File(path)); + properties.load(fis); + } finally { + if (null != fis) { + fis.close(); + } + } return properties; } diff --git a/modules/enterprise/server/server-control/src/main/java/org/rhq/server/control/command/Upgrade.java b/modules/enterprise/server/server-control/src/main/java/org/rhq/server/control/command/Upgrade.java index 0d0c5ad..3363291 100644 --- a/modules/enterprise/server/server-control/src/main/java/org/rhq/server/control/command/Upgrade.java +++ b/modules/enterprise/server/server-control/src/main/java/org/rhq/server/control/command/Upgrade.java @@ -480,13 +480,6 @@ public class Upgrade extends AbstractInstall { copyReferredFile(commandLine, oldServerProps, "rhq.server.client.security.keystore.file"); copyReferredFile(commandLine, oldServerProps, "rhq.server.client.security.truststore.file"); - // In 4.8 the AS management user was always rhqadmin/obfuscated(rhqadmin); so, if not already in the - // old properties, insert the new property with the obfuscated value. - String managementPassword = oldServerProps.getProperty("rhq.server.management.password"); - if (null == managementPassword) { - oldServerProps.setProperty("rhq.server.management.password", "35c160c1f841a889d4cda53f0bfc94b6"); - } - // now merge the old settings in with the default properties from the new server install String newServerPropsFilePath = new File(getBinDir(), "rhq-server.properties").getAbsolutePath(); PropertiesFileUpdate newServerPropsFile = new PropertiesFileUpdate(newServerPropsFilePath); diff --git a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/StandaloneASDiscovery.java b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/StandaloneASDiscovery.java index 34cd79b..2978343 100644 --- a/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/StandaloneASDiscovery.java +++ b/modules/plugins/jboss-as-7/src/main/java/org/rhq/modules/plugins/jbossas7/StandaloneASDiscovery.java @@ -18,9 +18,6 @@ */ package org.rhq.modules.plugins.jbossas7; -import java.io.File; -import java.util.Arrays; - import org.rhq.core.pluginapi.inventory.DiscoveredResourceDetails; import org.rhq.core.pluginapi.inventory.ResourceDiscoveryContext; import org.rhq.core.system.ProcessInfo; @@ -84,12 +81,6 @@ public class StandaloneASDiscovery extends BaseProcessDiscovery { DiscoveredResourceDetails resourceDetails = super.buildResourceDetails(discoveryContext, process, commandLine); - // Do RHQ Server specific work - if (isRhqServer(process)) { - String name = resourceDetails.getResourceName(); - resourceDetails.setResourceName(name + " RHQ Server"); - } - return resourceDetails; } @@ -99,24 +90,4 @@ public class StandaloneASDiscovery extends BaseProcessDiscovery { return process.getParentProcess(); } - private boolean isRhqServer(ProcessInfo process) { - - // LINUX - if (File.separatorChar == '/') { - String prop = process.getEnvironmentVariable("JAVA_OPTS"); - return (null != prop && prop.contains("-Dapp.name=rhq-server")); - } - - // Windows - ProcessInfo parentProcess = process.getParentProcess(); - if (null != parentProcess) { - String commandLine = Arrays.toString(parentProcess.getCommandLine()); - if (null != commandLine && commandLine.contains("rhq-server-wrapper.conf")) { - return true; - } - } - - return false; - } - } diff --git a/modules/plugins/rhq-server/src/main/java/org/rhq/plugins/server/AlertsCacheResourceComponent.java b/modules/plugins/rhq-server/src/main/java/org/rhq/plugins/server/AlertsCacheResourceComponent.java index f4c7aef..2eafa44 100644 --- a/modules/plugins/rhq-server/src/main/java/org/rhq/plugins/server/AlertsCacheResourceComponent.java +++ b/modules/plugins/rhq-server/src/main/java/org/rhq/plugins/server/AlertsCacheResourceComponent.java @@ -1,6 +1,6 @@ /* - * Jopr Management Platform - * Copyright (C) 2005-2008 Red Hat, Inc. + * RHQ Management Platform + * Copyright (C) 2005-2013 Red Hat, Inc. * All rights reserved. * * This program is free software; you can redistribute it and/or modify diff --git a/modules/plugins/rhq-server/src/main/java/org/rhq/plugins/server/CommunicationsResourceComponent.java b/modules/plugins/rhq-server/src/main/java/org/rhq/plugins/server/CommunicationsResourceComponent.java index b80ab50..6f879fa 100644 --- a/modules/plugins/rhq-server/src/main/java/org/rhq/plugins/server/CommunicationsResourceComponent.java +++ b/modules/plugins/rhq-server/src/main/java/org/rhq/plugins/server/CommunicationsResourceComponent.java @@ -1,6 +1,6 @@ /* - * Jopr Management Platform - * Copyright (C) 2005-2008 Red Hat, Inc. + * RHQ Management Platform + * Copyright (C) 2005-2013 Red Hat, Inc. * All rights reserved. * * This program is free software; you can redistribute it and/or modify diff --git a/modules/plugins/rhq-server/src/main/java/org/rhq/plugins/server/DiscoveryCallbackImpl.java b/modules/plugins/rhq-server/src/main/java/org/rhq/plugins/server/DiscoveryCallbackImpl.java new file mode 100644 index 0000000..23bab25 --- /dev/null +++ b/modules/plugins/rhq-server/src/main/java/org/rhq/plugins/server/DiscoveryCallbackImpl.java @@ -0,0 +1,137 @@ +/* + * RHQ Management Platform + * Copyright (C) 2005-2013 Red Hat, Inc. + * All rights reserved. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License, version 2, as + * published by the Free Software Foundation, and/or the GNU Lesser + * General Public License, version 2.1, also as published by the Free + * Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License and the GNU Lesser General Public License + * for more details. + * + * You should have received a copy of the GNU General Public License + * and the GNU Lesser General Public License along with this program; + * if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ +package org.rhq.plugins.server; + +import java.io.File; +import java.io.FileInputStream; +import java.util.Arrays; +import java.util.Properties; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; + +import org.rhq.core.domain.configuration.Configuration; +import org.rhq.core.domain.configuration.PropertySimple; +import org.rhq.core.pluginapi.inventory.DiscoveredResourceDetails; +import org.rhq.core.pluginapi.inventory.ResourceDiscoveryCallback; +import org.rhq.core.system.ProcessInfo; +import org.rhq.core.util.obfuscation.Obfuscator; + +public class DiscoveryCallbackImpl implements ResourceDiscoveryCallback { + + private static final String PLUGIN_CONFIG_HOME_DIR = "homeDir"; + private static final String PLUGIN_CONFIG_PASSWORD = "password"; + private static final String PROP_SERVER_PROP_FILE = "../bin/rhq-server.properties"; + private static final String PROP_SERVER_MGMT_USER_PASSWORD = "rhq.server.management.password"; + + private Log log = LogFactory.getLog(DiscoveryCallbackImpl.class); + + @Override + public DiscoveryCallbackResults discoveredResources(DiscoveredResourceDetails discoveredDetails) throws Exception { + + ProcessInfo processInfo = discoveredDetails.getProcessInfo(); + DiscoveryCallbackResults result = DiscoveryCallbackResults.UNPROCESSED; + + // Do RHQ Server specific work + if (!isRhqServer(processInfo)) { + return result; + } + + result = DiscoveryCallbackResults.PROCESSED; + + // Make the name reflect the fact that this is the RHQ Server resource + String name = discoveredDetails.getResourceName(); + discoveredDetails.setResourceName(name + " RHQ Server"); + + // Update the plugin config and set the proper management user password + String homeDirStr = discoveredDetails.getPluginConfiguration().getSimpleValue(PLUGIN_CONFIG_HOME_DIR); + + if (null == homeDirStr || homeDirStr.isEmpty()) { + log.warn("The configuration property [" + PLUGIN_CONFIG_HOME_DIR + + "] is not set - will not be able to connect to the RHQ Server instance"); + return result; + } + + File homeDirFile = new File(homeDirStr); + File serverPropertiesFile = new File(homeDirFile, PROP_SERVER_PROP_FILE); + if (!serverPropertiesFile.exists()) { + log.warn("The server properties file [" + serverPropertiesFile.getAbsolutePath() + + "] does not exist - will not be able to connect to the RHQ Server instance"); + return result; + } + + try { + Properties props = new Properties(); + FileInputStream fis = null; + try { + fis = new FileInputStream(serverPropertiesFile); + props.load(fis); + } finally { + if (null != fis) { + fis.close(); + } + } + + String encodedPassword = props.getProperty(PROP_SERVER_MGMT_USER_PASSWORD); + + if (null == encodedPassword || encodedPassword.isEmpty()) { + log.warn("The server property [" + PROP_SERVER_MGMT_USER_PASSWORD + + "] is not set - will not be able to connect to the RHQ Server instance"); + return result; + } + + String password = Obfuscator.decode(encodedPassword); + Configuration pluginConfig = discoveredDetails.getPluginConfiguration(); + pluginConfig.put(new PropertySimple(PLUGIN_CONFIG_PASSWORD, password)); + discoveredDetails.setPluginConfiguration(pluginConfig); + + } catch (Throwable t) { + log.warn( + "Problem setting RHQ Server management password - will not be able to connect to the RHQ Server instance", + t); + } + + return result; + } + + private boolean isRhqServer(ProcessInfo process) { + + // LINUX + if (File.separatorChar == '/') { + String prop = process.getEnvironmentVariable("JAVA_OPTS"); + return (null != prop && prop.contains("-Dapp.name=rhq-server")); + } + + // Windows + ProcessInfo parentProcess = process.getParentProcess(); + if (null != parentProcess) { + String commandLine = Arrays.toString(parentProcess.getCommandLine()); + if (null != commandLine && commandLine.contains("rhq-server-wrapper.conf")) { + return true; + } + } + + return false; + } + +} diff --git a/modules/plugins/rhq-server/src/main/java/org/rhq/plugins/server/GroupDefinitionResourceComponent.java b/modules/plugins/rhq-server/src/main/java/org/rhq/plugins/server/GroupDefinitionResourceComponent.java index 252bd22..e6a4106 100644 --- a/modules/plugins/rhq-server/src/main/java/org/rhq/plugins/server/GroupDefinitionResourceComponent.java +++ b/modules/plugins/rhq-server/src/main/java/org/rhq/plugins/server/GroupDefinitionResourceComponent.java @@ -1,6 +1,6 @@ /* - * Jopr Management Platform - * Copyright (C) 2005-2008 Red Hat, Inc. + * RHQ Management Platform + * Copyright (C) 2005-2013 Red Hat, Inc. * All rights reserved. * * This program is free software; you can redistribute it and/or modify diff --git a/modules/plugins/rhq-server/src/main/java/org/rhq/plugins/server/JBossAS7JMXComponent.java b/modules/plugins/rhq-server/src/main/java/org/rhq/plugins/server/JBossAS7JMXComponent.java index 4011716..67b917c 100644 --- a/modules/plugins/rhq-server/src/main/java/org/rhq/plugins/server/JBossAS7JMXComponent.java +++ b/modules/plugins/rhq-server/src/main/java/org/rhq/plugins/server/JBossAS7JMXComponent.java @@ -1,3 +1,25 @@ +/* + * RHQ Management Platform + * Copyright (C) 2005-2013 Red Hat, Inc. + * All rights reserved. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License, version 2, as + * published by the Free Software Foundation, and/or the GNU Lesser + * General Public License, version 2.1, also as published by the Free + * Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License and the GNU Lesser General Public License + * for more details. + * + * You should have received a copy of the GNU General Public License + * and the GNU Lesser General Public License along with this program; + * if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ package org.rhq.plugins.server; import java.util.Properties; diff --git a/modules/plugins/rhq-server/src/main/java/org/rhq/plugins/server/JBossAS7JMXDiscoveryComponent.java b/modules/plugins/rhq-server/src/main/java/org/rhq/plugins/server/JBossAS7JMXDiscoveryComponent.java index 154735f..378dd1d 100644 --- a/modules/plugins/rhq-server/src/main/java/org/rhq/plugins/server/JBossAS7JMXDiscoveryComponent.java +++ b/modules/plugins/rhq-server/src/main/java/org/rhq/plugins/server/JBossAS7JMXDiscoveryComponent.java @@ -1,3 +1,25 @@ +/* + * RHQ Management Platform + * Copyright (C) 2005-2013 Red Hat, Inc. + * All rights reserved. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License, version 2, as + * published by the Free Software Foundation, and/or the GNU Lesser + * General Public License, version 2.1, also as published by the Free + * Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License and the GNU Lesser General Public License + * for more details. + * + * You should have received a copy of the GNU General Public License + * and the GNU Lesser General Public License along with this program; + * if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + */ package org.rhq.plugins.server; import java.io.File; diff --git a/modules/plugins/rhq-server/src/main/java/org/rhq/plugins/server/RemoteAPIResourceComponent.java b/modules/plugins/rhq-server/src/main/java/org/rhq/plugins/server/RemoteAPIResourceComponent.java index 46c4193..e7edc7b 100644 --- a/modules/plugins/rhq-server/src/main/java/org/rhq/plugins/server/RemoteAPIResourceComponent.java +++ b/modules/plugins/rhq-server/src/main/java/org/rhq/plugins/server/RemoteAPIResourceComponent.java @@ -1,6 +1,6 @@ /* - * Jopr Management Platform - * Copyright (C) 2005-2008 Red Hat, Inc. + * RHQ Management Platform + * Copyright (C) 2005-2013 Red Hat, Inc. * All rights reserved. * * This program is free software; you can redistribute it and/or modify @@ -29,7 +29,6 @@ import org.rhq.core.domain.configuration.PropertyList; import org.rhq.core.domain.configuration.PropertyMap; import org.rhq.core.domain.configuration.PropertySimple; import org.rhq.core.pluginapi.operation.OperationResult; -import org.rhq.enterprise.communications.command.server.CommandProcessorMetrics.Calltime; import org.rhq.plugins.jmx.MBeanResourceComponent; /** diff --git a/modules/plugins/rhq-server/src/main/resources/META-INF/rhq-plugin.xml b/modules/plugins/rhq-server/src/main/resources/META-INF/rhq-plugin.xml index ee3fbd1..af0f2a2 100644 --- a/modules/plugins/rhq-server/src/main/resources/META-INF/rhq-plugin.xml +++ b/modules/plugins/rhq-server/src/main/resources/META-INF/rhq-plugin.xml @@ -10,6 +10,10 @@ plugin="JBossAS7" useClasses="true" />  + <discovery-callbacks> + <type-callback plugin="JBossAS7" type="JBossAS7 Standalone Server" callbackClass="DiscoveryCallbackImpl" /> + </discovery-callbacks> + <service name="RHQ Server Subsystem Services" discovery="JBossAS7JMXDiscoveryComponent"

1 0

[rhq] Changes to 'spinder/brew-build'
by Simeon Pinder 17 Sep '13

17 Sep '13

New branch 'spinder/brew-build' available with the following commits: commit 6499b8244156f8d0a5a9b076e6b0811f95842b0a Author: John Sanda <jsanda(a)redhat.com> Date: Tue Sep 17 12:20:49 2013 -0400 download cassandra tarball as maven dependency instead using wget

1 0

[rhq] modules/common
by John Sanda 17 Sep '13

17 Sep '13

modules/common/cassandra-ccm/cassandra-ccm-core/pom.xml | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) New commits: commit d055252dc1e4b3f28bb16e8003fb4eae725c1621 Author: John Sanda <jsanda(a)redhat.com> Date: Tue Sep 17 12:20:49 2013 -0400 download cassandra tarball as maven dependency instead using wget diff --git a/modules/common/cassandra-ccm/cassandra-ccm-core/pom.xml b/modules/common/cassandra-ccm/cassandra-ccm-core/pom.xml index 975c94e..7cdd274 100644 --- a/modules/common/cassandra-ccm/cassandra-ccm-core/pom.xml +++ b/modules/common/cassandra-ccm/cassandra-ccm-core/pom.xml @@ -106,6 +106,13 @@ <artifactId>netty</artifactId> <version>3.6.6.Final</version> </dependency> + <dependency> + <groupId>org.apache.cassandra</groupId> + <artifactId>apache-cassandra</artifactId> + <version>${cassandra.version}</version> + <type>tar.gz</type> + <classifier>bin</classifier> + </dependency> </dependencies> <executions> <execution> @@ -128,10 +135,6 @@ value="${project.build.directory}/cassandra-download"/> <mkdir dir="${cassandra.download.dir}"/> <mkdir dir="${settings.localRepository}/org/apache/cassandra/apache-cassandra/${cassandra.version}"/> - <get src="http://repo1.maven.org/maven2/org/apache/cassandra/apache-cassandra/${cassa…" - dest="${settings.localRepository}/org/apache/cassandra/apache-cassandra/${cassandra.version}/apache-cassandra-${cassandra.version}-bin.tar.gz" - skipexisting="true" - verbose="true"/> <gunzip src="${settings.localRepository}/org/apache/cassandra/apache-cassandra/${cassandra.version}/apache-cassandra-${cassandra.version}-bin.tar.gz" dest="${cassandra.download.dir}"/> <untar src="${cassandra.download.dir}/apache-cassandra-${cassandra.version}-bin.tar"

1 0

[rhq] modules/enterprise
by mike thompson 17 Sep '13

17 Sep '13

modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/CoreGUI.gwt.xml | 4 modules/enterprise/gui/coregui/src/main/webapp/CoreGUI-4.9.0.css | 405 ++ modules/enterprise/gui/coregui/src/main/webapp/CoreGUI.css | 405 -- modules/enterprise/gui/coregui/src/main/webapp/CoreGUI.html | 4 modules/enterprise/gui/coregui/src/main/webapp/css/charts-4.9.0.css | 252 + modules/enterprise/gui/coregui/src/main/webapp/css/charts.css | 252 - modules/enterprise/gui/coregui/src/main/webapp/js/moment-2.0.0.js | 1400 ++++++++++ modules/enterprise/gui/coregui/src/main/webapp/js/moment-2.0.0.min.js | 6 modules/enterprise/gui/coregui/src/main/webapp/js/moment.js | 1400 ---------- modules/enterprise/gui/coregui/src/main/webapp/js/moment.min.js | 6 modules/enterprise/gui/coregui/src/main/webapp/js/rhq-4.9.0.js | 183 + modules/enterprise/gui/coregui/src/main/webapp/js/rhq.js | 183 - 12 files changed, 2250 insertions(+), 2250 deletions(-) New commits: commit a7747a6389c5bade4ad7aa6cac9966544b1e93a1 Author: Mike Thompson <mithomps(a)redhat.com> Date: Tue Sep 17 07:34:31 2013 -0700 [BZ 1007538] - Add versioning to *.js and *.css files to prevent browser caching. Fixed current versioning issues with upgrading from RHQ 4.8.0 with manual versioning of css and js assets. diff --git a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/CoreGUI.gwt.xml b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/CoreGUI.gwt.xml index a71b26e..e6be67e 100644 --- a/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/CoreGUI.gwt.xml +++ b/modules/enterprise/gui/coregui/src/main/resources/org/rhq/enterprise/gui/coregui/CoreGUI.gwt.xml @@ -50,8 +50,8 @@ <when-type-assignable class="com.google.gwt.user.client.rpc.RemoteService"/> </generate-with> - <script src="/coregui/js/moment.min.js"/> - <script src="/coregui/js/rhq.js"/> + <script src="/coregui/js/moment-2.0.0.min.js"/> + <script src="/coregui/js/rhq-4.9.0.js"/>   diff --git a/modules/enterprise/gui/coregui/src/main/webapp/CoreGUI-4.9.0.css b/modules/enterprise/gui/coregui/src/main/webapp/CoreGUI-4.9.0.css new file mode 100644 index 0000000..dac51cc --- /dev/null +++ b/modules/enterprise/gui/coregui/src/main/webapp/CoreGUI-4.9.0.css @@ -0,0 +1,405 @@ +body { + color: #010101; +} + +body, p, td, th, option, input, textarea, select { + font-family: tahoma, verdana, sans-serif !important; + font-size: 11px !important; +} + +img { + border-style: none; +} + +hr { + background-color: #AAAAAA; + border: 0 none; + color: #AAAAAA; + height: 1px; + margin-left: 0; + margin-right: 0; + text-align: center; + width: 100%; +} + +a, a:link, a:visited, a:hover { + color: #4A5D75 !important; + font-weight: bold !important; +} + +a, a:link, a:visited { + text-decoration: none !important; +} + +a:hover { + text-decoration: underline !important; +} + +a.menuBar, a.menuBar:link, a.menuBar:visited, a.menuBar:hover { + color: inherit !important; +} + + +.backLink { + color: #4A5D75; + font-weight: bold; + text-decoration: none; +} + + +.HeaderLabel { + height: 35px; + font-size: 11pt; + font-weight: bold; + color: #444444; +} + + +.OddRow { + background-color: #ffffff; + border-right: 1px solid rgb(217, 224, 227); + border-bottom: 1px solid rgb(230, 234, 239); +} + +.OddRowDisabled { + background-color: #ffffff; + border-right: 1px solid rgb(217, 224, 227); + border-bottom: 1px solid rgb(230, 234, 239); +} + +.EvenRow { + background-color: rgb(246, 246, 246); + border-right: 1px solid rgb(217, 224, 227); + border-bottom: 1px solid rgb(230, 234, 239); +} + +.EvenRowDisabled { + background-color: rgb(246, 246, 246); + border-right: 1px solid rgb(217, 224, 227); + border-bottom: 1px solid rgb(230, 234, 239); +} + +.inheritColor { + color: inherit !important; +} + +.TopSectionLink, .TopSectionLinkSelected { + font-size: 12px !important; +} + +.TopSectionLink { + color: #4A5D75 !important; +} + +.TopSectionLinkSelected { + color: white !important; +} + +.TopSectionLinkDiv { +} + +.TopSectionLinkDivSelected { + background-image: url('images/header/header_bg_selected.png'); +} + +.BreadCrumb { + font-size: 10pt; + font-weight: bold; + text-decoration: none; + color: #363636; + height: 28px; +} + +.SectionHeader { + font-size: 16pt; + font-weight: bold; +} + +.textItemDisabled { + background: rgb(214, 213, 217); +} + +.formTitle, .formTitleFocused { + font-weight: bold; +} + +.subtitle { + color: #D6D6D6; + font-variant: small-caps; + font-weight: bold; + font-size: 12pt; +} + + +/* Availability Bar */ +.availBarLeftCap { + background-image: url("images/availBar/leftCap.png"); + width: 8px; + height: 28px; +} +.availBarRightCap { + background-image: url("images/availBar/rightCap.png"); + width: 8px; + height: 28px; +} + +.availBarUp { + background-image: url("images/availBar/up.png"); + background-repeat: repeat-x; + height: 28px; +} + +.availBarDown { + background: url("images/availBar/down.png") repeat-x; + height: 28px; +} + + + +.GraphTooltip { + background-color:#B5D5FF; + font-weight:bold; + padding:5px; +} + + +/* About Modal Window */ +.DisplayContent,.DisplayLabel { + font-size: 11px; +} + +.DisplayLabel { + font-weight: bold; +} + +.DisplaySubhead { + font-weight: bolder; + font-size: 16px; + color: #DE652D; +} + + +.SubTabButton, +.SubTabButtonOver, +.SubTabButtonFocused, +.SubTabButtonFocusedOver, +.SubTabButtonDown, +.SubTabButtonFocusedDown, +.SubTabButtonSelected, +.SubTabButtonSelectedFocused, +.SubTabButtonSelectedDown, +.SubTabButtonSelectedFocusedDown, +.SubTabButtonSelectedOver, +.SubTabButtonSelectedFocusedOver, +.SubTabButtonDisabled, +.SubTabButtonSelectedDisabled { + font-family: tahoma, verdona, sans-serif; + font-size: 11px; + padding: 2px; + } + +.SubTabButtonDisabled { + +} + +.SubTabButtonDisabled, +.SubTabButtonSelectedDisabled { + font-weight: normal; + color: #AAAAAA; +} + +.SubTabButtonFocused, +.SubTabButtonFocusedOver, +.SubTabButtonSelectedFocused, +.SubTabButtonSelectedFocusedOver, +.SubTabButtonSelectedFocusedDown { + +} + +.SubTabButtonOver, +.SubTabButtonFocusedOver, +.SubTabButtonSelectedFocused, +.SubTabButtonSelectedFocusedOver { + font-weight: bold; +} + +.SubTabButtonDown, +.SubTabButtonFocusedDown, +.SubTabButtonSelectedDown, +.SubTabButtonSelectedFocusedDown { + font-weight: bold; + font-size: 12px; +} + +.SubTabButtonSelected, +.SubTabButtonSelectedFocused, +.SubTabButtonSelectedOver, +.SubTabButtonSelectedFocusedOver, +.SubTabButtonSelectedDisabled { + font-weight: bold; +} + + + +.SimpleButton, +.SimpleButtonOver, +.SimpleButtonFocused, +.SimpleButtonFocusedOver, +.SimpleButtonDown, +.SimpleButtonFocusedDown, +.SimpleButtonSelected, +.SimpleButtonSelectedFocused, +.SimpleButtonSelectedDown, +.SimpleButtonSelectedFocusedDown, +.SimpleButtonSelectedOver, +.SimpleButtonSelectedFocusedOver, +.SimpleButtonDisabled, +.SimpleButtonSelectedDisabled, +.SimpleButtonDisabled, +.SimpleButtonDisabled, +.SimpleButtonSelectedDisabled, +.SimpleButtonFocused, +.SimpleButtonFocusedOver, +.SimpleButtonSelectedFocused, +.SimpleButtonSelectedFocusedOver, +.SimpleButtonSelectedFocusedDown , +.SimpleButtonOver, +.SimpleButtonFocusedOver, +.SimpleButtonSelectedFocused, +.SimpleButtonSelectedFocusedOver , +.SimpleButtonDown, +.SimpleButtonFocusedDown, +.SimpleButtonSelectedDown, +.SimpleButtonSelectedFocusedDown , +.SimpleButtonSelected, +.SimpleButtonSelectedFocused, +.SimpleButtonSelectedOver, +.SimpleButtonSelectedFocusedOver, +.SimpleButtonSelectedDisabled{ + font-family: tahoma, verdana, sans-serif; + font-size: 11px; + padding: 2px; + font-weight: bold; +} + + +.topMenuBar { + background: url('/coregui/org.rhq.enterprise.gui.coregui.CoreGUI/sc/skins/Enterprise/images/cssButton/button_stretch.png') repeat-x scroll 0 0 #DDDDDD; +} + +.menuButton, .menuButtonOver, .menuButtonDown, .menuButtonDisabled, .menuButtonSelected, .menuButtonSelectedDown, .menuButtonSelectedOver, .menuButtonSelectedDisabled { + border: none !important; + font-weight: bold !important; +} + + + +/** Not used right now **/ +.gwtMenuBar { + background: url('images/header/header_bg.png') repeat-x; + /*background-image: url("http://localhost:7080/coregui/org.rhq.enterprise.gui.coregui.CoreGUI/sc/ski…");*/ + padding: 0px; + -moz-box-sizing: border-box; + overflow: hidden; + cursor: auto; +} + +.gwtMenu, .gwt-MenuBarPopup, .gwt-MenuPopup { + background-color: white; +} + +.gwt-MenuItem { + padding: 0 10px; + font-weight: bold; + color: #666666; + font-size: 9pt; +} + +.gwt-MenuItemSeparator { + background-color: #666666; +} + +.gwt-MenuItem-Selected { + background-color: #999999; +} + +.selectedTag { + background-color: lightblue; + padding: 5px; + border: 1px solid darkblue; +} + + +/* This sets table mouse-over highlights to have an alpha component on browsers that support it. + It particularly helps with tables that have bar charts as a background component. + (e.g. problem metrics or call time) +*/ +.tallCellOver, .tallCellOverDark { + background-color: rgb(230,230,230) !important; /* for browsers that don't like alpha */ + background-color: rgba(230,230,230,0.6) !important; +} + +.editableText { + color: #070; +} + +.InfoBlock,.ConfirmationBlock,.WarnBlock,.ErrorBlock,.FatalBlock { + border: 1px solid; + color: #000000; +} + +.InfoBlock,.ConfirmationBlock { + background-color: #BFF1B5; /* light green */ + border-color: #00AC3D; /* medium green */ +} + +.WarnBlock { + background-color: #FFFD99; /* light yellow */ + border-color: #FF9C15; /* medium orange */ +} + +.ErrorBlock { + background-color: #FF9999; /* light red */ + border-color: #EE4444; /* medium red */ +} + +.FatalBlock { + background-color: #FF6666; /* slightly darker light red */ + border-color: #EE1111; /* slightly darker medium red */ +} + +.InlineNote { + color: #C22; +} + +.InlineInfo { + color: #00AC3D; /* medium green */ +} + +.InlineError { + color: #EE4444; /* medium red */ +} + +.log-panel { + z-index: 9999999 !important; +} + +.requiredFieldMarker { + font-weight: bolder; + color: #B77 /* medium red */ +} + +.configurationEditorHeaderCell { + border: 1px solid; + background-color: #EEE; /* light gray */ + font-weight: bolder; +} + +.menuButton, .menuButtonOver, .menuButtonDown, .menuButtonDisabled, .menuButtonSelected, .menuButtonSelectedDown, .menuButtonSelectedOver, .menuButtonSelectedDisabled { + border: none; + font-weight: bold; +} + +.noOutline { + outline:0; +} \ No newline at end of file diff --git a/modules/enterprise/gui/coregui/src/main/webapp/CoreGUI.css b/modules/enterprise/gui/coregui/src/main/webapp/CoreGUI.css deleted file mode 100644 index dac51cc..0000000 --- a/modules/enterprise/gui/coregui/src/main/webapp/CoreGUI.css +++ /dev/null @@ -1,405 +0,0 @@ -body { - color: #010101; -} - -body, p, td, th, option, input, textarea, select { - font-family: tahoma, verdana, sans-serif !important; - font-size: 11px !important; -} - -img { - border-style: none; -} - -hr { - background-color: #AAAAAA; - border: 0 none; - color: #AAAAAA; - height: 1px; - margin-left: 0; - margin-right: 0; - text-align: center; - width: 100%; -} - -a, a:link, a:visited, a:hover { - color: #4A5D75 !important; - font-weight: bold !important; -} - -a, a:link, a:visited { - text-decoration: none !important; -} - -a:hover { - text-decoration: underline !important; -} - -a.menuBar, a.menuBar:link, a.menuBar:visited, a.menuBar:hover { - color: inherit !important; -} - - -.backLink { - color: #4A5D75; - font-weight: bold; - text-decoration: none; -} - - -.HeaderLabel { - height: 35px; - font-size: 11pt; - font-weight: bold; - color: #444444; -} - - -.OddRow { - background-color: #ffffff; - border-right: 1px solid rgb(217, 224, 227); - border-bottom: 1px solid rgb(230, 234, 239); -} - -.OddRowDisabled { - background-color: #ffffff; - border-right: 1px solid rgb(217, 224, 227); - border-bottom: 1px solid rgb(230, 234, 239); -} - -.EvenRow { - background-color: rgb(246, 246, 246); - border-right: 1px solid rgb(217, 224, 227); - border-bottom: 1px solid rgb(230, 234, 239); -} - -.EvenRowDisabled { - background-color: rgb(246, 246, 246); - border-right: 1px solid rgb(217, 224, 227); - border-bottom: 1px solid rgb(230, 234, 239); -} - -.inheritColor { - color: inherit !important; -} - -.TopSectionLink, .TopSectionLinkSelected { - font-size: 12px !important; -} - -.TopSectionLink { - color: #4A5D75 !important; -} - -.TopSectionLinkSelected { - color: white !important; -} - -.TopSectionLinkDiv { -} - -.TopSectionLinkDivSelected { - background-image: url('images/header/header_bg_selected.png'); -} - -.BreadCrumb { - font-size: 10pt; - font-weight: bold; - text-decoration: none; - color: #363636; - height: 28px; -} - -.SectionHeader { - font-size: 16pt; - font-weight: bold; -} - -.textItemDisabled { - background: rgb(214, 213, 217); -} - -.formTitle, .formTitleFocused { - font-weight: bold; -} - -.subtitle { - color: #D6D6D6; - font-variant: small-caps; - font-weight: bold; - font-size: 12pt; -} - - -/* Availability Bar */ -.availBarLeftCap { - background-image: url("images/availBar/leftCap.png"); - width: 8px; - height: 28px; -} -.availBarRightCap { - background-image: url("images/availBar/rightCap.png"); - width: 8px; - height: 28px; -} - -.availBarUp { - background-image: url("images/availBar/up.png"); - background-repeat: repeat-x; - height: 28px; -} - -.availBarDown { - background: url("images/availBar/down.png") repeat-x; - height: 28px; -} - - - -.GraphTooltip { - background-color:#B5D5FF; - font-weight:bold; - padding:5px; -} - - -/* About Modal Window */ -.DisplayContent,.DisplayLabel { - font-size: 11px; -} - -.DisplayLabel { - font-weight: bold; -} - -.DisplaySubhead { - font-weight: bolder; - font-size: 16px; - color: #DE652D; -} - - -.SubTabButton, -.SubTabButtonOver, -.SubTabButtonFocused, -.SubTabButtonFocusedOver, -.SubTabButtonDown, -.SubTabButtonFocusedDown, -.SubTabButtonSelected, -.SubTabButtonSelectedFocused, -.SubTabButtonSelectedDown, -.SubTabButtonSelectedFocusedDown, -.SubTabButtonSelectedOver, -.SubTabButtonSelectedFocusedOver, -.SubTabButtonDisabled, -.SubTabButtonSelectedDisabled { - font-family: tahoma, verdona, sans-serif; - font-size: 11px; - padding: 2px; - } - -.SubTabButtonDisabled { - -} - -.SubTabButtonDisabled, -.SubTabButtonSelectedDisabled { - font-weight: normal; - color: #AAAAAA; -} - -.SubTabButtonFocused, -.SubTabButtonFocusedOver, -.SubTabButtonSelectedFocused, -.SubTabButtonSelectedFocusedOver, -.SubTabButtonSelectedFocusedDown { - -} - -.SubTabButtonOver, -.SubTabButtonFocusedOver, -.SubTabButtonSelectedFocused, -.SubTabButtonSelectedFocusedOver { - font-weight: bold; -} - -.SubTabButtonDown, -.SubTabButtonFocusedDown, -.SubTabButtonSelectedDown, -.SubTabButtonSelectedFocusedDown { - font-weight: bold; - font-size: 12px; -} - -.SubTabButtonSelected, -.SubTabButtonSelectedFocused, -.SubTabButtonSelectedOver, -.SubTabButtonSelectedFocusedOver, -.SubTabButtonSelectedDisabled { - font-weight: bold; -} - - - -.SimpleButton, -.SimpleButtonOver, -.SimpleButtonFocused, -.SimpleButtonFocusedOver, -.SimpleButtonDown, -.SimpleButtonFocusedDown, -.SimpleButtonSelected, -.SimpleButtonSelectedFocused, -.SimpleButtonSelectedDown, -.SimpleButtonSelectedFocusedDown, -.SimpleButtonSelectedOver, -.SimpleButtonSelectedFocusedOver, -.SimpleButtonDisabled, -.SimpleButtonSelectedDisabled, -.SimpleButtonDisabled, -.SimpleButtonDisabled, -.SimpleButtonSelectedDisabled, -.SimpleButtonFocused, -.SimpleButtonFocusedOver, -.SimpleButtonSelectedFocused, -.SimpleButtonSelectedFocusedOver, -.SimpleButtonSelectedFocusedDown , -.SimpleButtonOver, -.SimpleButtonFocusedOver, -.SimpleButtonSelectedFocused, -.SimpleButtonSelectedFocusedOver , -.SimpleButtonDown, -.SimpleButtonFocusedDown, -.SimpleButtonSelectedDown, -.SimpleButtonSelectedFocusedDown , -.SimpleButtonSelected, -.SimpleButtonSelectedFocused, -.SimpleButtonSelectedOver, -.SimpleButtonSelectedFocusedOver, -.SimpleButtonSelectedDisabled{ - font-family: tahoma, verdana, sans-serif; - font-size: 11px; - padding: 2px; - font-weight: bold; -} - - -.topMenuBar { - background: url('/coregui/org.rhq.enterprise.gui.coregui.CoreGUI/sc/skins/Enterprise/images/cssButton/button_stretch.png') repeat-x scroll 0 0 #DDDDDD; -} - -.menuButton, .menuButtonOver, .menuButtonDown, .menuButtonDisabled, .menuButtonSelected, .menuButtonSelectedDown, .menuButtonSelectedOver, .menuButtonSelectedDisabled { - border: none !important; - font-weight: bold !important; -} - - - -/** Not used right now **/ -.gwtMenuBar { - background: url('images/header/header_bg.png') repeat-x; - /*background-image: url("http://localhost:7080/coregui/org.rhq.enterprise.gui.coregui.CoreGUI/sc/ski…");*/ - padding: 0px; - -moz-box-sizing: border-box; - overflow: hidden; - cursor: auto; -} - -.gwtMenu, .gwt-MenuBarPopup, .gwt-MenuPopup { - background-color: white; -} - -.gwt-MenuItem { - padding: 0 10px; - font-weight: bold; - color: #666666; - font-size: 9pt; -} - -.gwt-MenuItemSeparator { - background-color: #666666; -} - -.gwt-MenuItem-Selected { - background-color: #999999; -} - -.selectedTag { - background-color: lightblue; - padding: 5px; - border: 1px solid darkblue; -} - - -/* This sets table mouse-over highlights to have an alpha component on browsers that support it. - It particularly helps with tables that have bar charts as a background component. - (e.g. problem metrics or call time) -*/ -.tallCellOver, .tallCellOverDark { - background-color: rgb(230,230,230) !important; /* for browsers that don't like alpha */ - background-color: rgba(230,230,230,0.6) !important; -} - -.editableText { - color: #070; -} - -.InfoBlock,.ConfirmationBlock,.WarnBlock,.ErrorBlock,.FatalBlock { - border: 1px solid; - color: #000000; -} - -.InfoBlock,.ConfirmationBlock { - background-color: #BFF1B5; /* light green */ - border-color: #00AC3D; /* medium green */ -} - -.WarnBlock { - background-color: #FFFD99; /* light yellow */ - border-color: #FF9C15; /* medium orange */ -} - -.ErrorBlock { - background-color: #FF9999; /* light red */ - border-color: #EE4444; /* medium red */ -} - -.FatalBlock { - background-color: #FF6666; /* slightly darker light red */ - border-color: #EE1111; /* slightly darker medium red */ -} - -.InlineNote { - color: #C22; -} - -.InlineInfo { - color: #00AC3D; /* medium green */ -} - -.InlineError { - color: #EE4444; /* medium red */ -} - -.log-panel { - z-index: 9999999 !important; -} - -.requiredFieldMarker { - font-weight: bolder; - color: #B77 /* medium red */ -} - -.configurationEditorHeaderCell { - border: 1px solid; - background-color: #EEE; /* light gray */ - font-weight: bolder; -} - -.menuButton, .menuButtonOver, .menuButtonDown, .menuButtonDisabled, .menuButtonSelected, .menuButtonSelectedDown, .menuButtonSelectedOver, .menuButtonSelectedDisabled { - border: none; - font-weight: bold; -} - -.noOutline { - outline:0; -} \ No newline at end of file diff --git a/modules/enterprise/gui/coregui/src/main/webapp/CoreGUI.html b/modules/enterprise/gui/coregui/src/main/webapp/CoreGUI.html index 2567253..6499483 100644 --- a/modules/enterprise/gui/coregui/src/main/webapp/CoreGUI.html +++ b/modules/enterprise/gui/coregui/src/main/webapp/CoreGUI.html @@ -10,9 +10,9 @@  <meta http-equiv="Content-Type" content="text/html;charset=UTF-8" /> - <link rel="stylesheet" href="CoreGUI.css"> + <link rel="stylesheet" href="CoreGUI-4.9.0.css">  - <link rel="stylesheet" href="css/charts.css"> + <link rel="stylesheet" href="css/charts-4.9.0.css"> <script type="text/javascript"> var search = location.search; diff --git a/modules/enterprise/gui/coregui/src/main/webapp/css/charts-4.9.0.css b/modules/enterprise/gui/coregui/src/main/webapp/css/charts-4.9.0.css new file mode 100644 index 0000000..0d123b2 --- /dev/null +++ b/modules/enterprise/gui/coregui/src/main/webapp/css/charts-4.9.0.css @@ -0,0 +1,252 @@ +/*** + * CSS for the d3 SVG charts. This is SVG css not HTML css so some elements + * may look different from standard CSS. + * NOTE: the SVG <defs> section that contains gradients etc. is in the + * java class : /org/rhq/enterprise/gui/coregui/client/inventory/common/ResourceMetricD3Graph.java + * + */ + +svg { + -webkit-touch-callout: none; + -webkit-user-select: none; + -khtml-user-select: none; + -moz-user-select: none; + -ms-user-select: none; + user-select: none; + /* Trying to get SVG to act like a greedy block in all browsers */ + display: block; + width:100%; + height:100%; +} + + + +.axis path, .axis line { + fill: none; + stroke: #000; + shape-rendering: crispEdges; +} + +/* Horizontal gridlines */ + +.grid .tick { + stroke: #f7f7f7; +} + +.y.axis .tick.minor { + stroke: #a7a7ac; +} + +.x.axis .tick.minor { + stroke: #a7a7ac; +} + +.y.axis text, .x.axis text { + font-family: Arial, Helvetica, sans-serif; + font-size: 10px; + font-weight: normal; + font-style: normal; + fill: #50505a; + text-rendering: optimize-legibility; + +} + +.x.axis path { + stroke: #50505a; +} + +.y.axis path { + stroke: #50505a; +} + /* Brush related css rules */ +.brush rect.extent { + fill: #0757ff; + fill-opacity: .15; + shape-rendering: crispEdges; +} + +.brush .resize path { + fill: #666; + fill-opacity: .8; + stroke: #000; + stroke-width: 1.5px; +} + +.minLabel, .avgLabel, .highLabel { + font-family: Arial, Verdana, sans-serif; + font-size: 12px; + font-weight: bold; + text-anchor: start; + fill: #003168; + text-rendering: optimize-legibility; +} + +.minText, .avgText, .highText { + font-family: Arial, Verdana, sans-serif; + font-size: 12px; + text-anchor: start; + fill: #003168; + text-rendering: optimize-legibility; +} + +.chartTitleName { + font-family: Arial, Verdana, sans-serif; + font-size: 12px; + font-weight: bold; + fill: #003168; +} +.chartTitleBox { + fill:none; + +} + +rect.high { + fill: #1794bc; +} + +rect.low { + fill: #70c4e2; +} + + + +/* CSS for new Chart Hovers*/ + +#availTooltip { + z-index: 990000; + position: absolute; + width: 150px; + height: auto; + padding: 5px; + background-color: #000; + opacity: 0.8; + -webkit-border-radius: 5px; + -moz-border-radius: 5px; + border-radius: 5px; + -webkit-box-shadow: 4px 4px 5px rgba(0, 0, 0, 0.4); + -moz-box-shadow: 4px 4px 5px rgba(0, 0, 0, 0.4); + box-shadow: 4px 4px 5px rgba(0, 0, 0, 0.4); + pointer-events: none; +} + +#availTooltip.hidden { + display: none; +} + +#availTooltip div { + margin: 0; + font-family: Arial, Verdana, sans-serif; + font-size: 9px; + color: #d3d3d6; +} + +.availTooltipLabel { + width: 40px; + font-weight: bold; + color: #d3d3d6; +} + +/* CSS for metric graph tooltips */ +#metricGraphTooltip { + z-index: 990000; + position: absolute; + width: 100px; + height: auto; + padding: 5px; + background-color: #000; + opacity: 0.80; + -webkit-border-radius: 5px; + -moz-border-radius: 5px; + border-radius: 5px; + -webkit-box-shadow: 4px 4px 5px rgba(0, 0, 0, 0.4); + -moz-box-shadow: 4px 4px 5px rgba(0, 0, 0, 0.4); + box-shadow: 4px 4px 5px rgba(0, 0, 0, 0.4); + pointer-events: none; +} + +#metricGraphTooltip.hidden { + display: none; +} + +#metricGraphTooltip div { + margin: 0; + font-family: Arial, Verdana, sans-serif; + font-size: 10px; + color: #d3d3d6; +} + +#metricGraphTooltipLabel { + width: 40px; + font-weight: bold; + color: #d3d3d6; +} + +#metricGraphTooltipMaxLabel { + color: #1794BC; +} + +#metricGraphTooltipAvgLabel { + color: #2e376a; +} + +#metricGraphTooltipMinLabel { + color: #70c4e2; +} + +#noDataTooltip { + z-index: 990000; + position: absolute; + width: 100px; + height: auto; + padding: 5px; + background-color: #000; + opacity: 0.80; + -webkit-border-radius: 5px; + -moz-border-radius: 5px; + border-radius: 5px; + -webkit-box-shadow: 4px 4px 5px rgba(0, 0, 0, 0.4); + -moz-box-shadow: 4px 4px 5px rgba(0, 0, 0, 0.4); + box-shadow: 4px 4px 5px rgba(0, 0, 0, 0.4); + pointer-events: none; +} + +#noDataTooltip.hidden { + display: none; +} + +#noDataTooltip div { + margin: 0; + font-family: Arial, Verdana, sans-serif; + font-size: 10px; + color: #d3d3d6; +} + + +#singleValueTooltip { + z-index: 990000; + position: absolute; + width: 100px; + height: auto; + padding: 5px; + background-color: #000; + opacity: 0.80; + -webkit-border-radius: 5px; + -moz-border-radius: 5px; + border-radius: 5px; + -webkit-box-shadow: 4px 4px 5px rgba(0, 0, 0, 0.4); + -moz-box-shadow: 4px 4px 5px rgba(0, 0, 0, 0.4); + box-shadow: 4px 4px 5px rgba(0, 0, 0, 0.4); + pointer-events: none; +} + +#singleValueTooltip.hidden { + display: none; +} + +#singleValueTooltip div { + margin: 0; + font-family: Arial, Verdana, sans-serif; + font-size: 10px; + color: #d3d3d6; +} + diff --git a/modules/enterprise/gui/coregui/src/main/webapp/css/charts.css b/modules/enterprise/gui/coregui/src/main/webapp/css/charts.css deleted file mode 100644 index 0d123b2..0000000 --- a/modules/enterprise/gui/coregui/src/main/webapp/css/charts.css +++ /dev/null @@ -1,252 +0,0 @@ -/*** - * CSS for the d3 SVG charts. This is SVG css not HTML css so some elements - * may look different from standard CSS. - * NOTE: the SVG <defs> section that contains gradients etc. is in the - * java class : /org/rhq/enterprise/gui/coregui/client/inventory/common/ResourceMetricD3Graph.java - * - */ - -svg { - -webkit-touch-callout: none; - -webkit-user-select: none; - -khtml-user-select: none; - -moz-user-select: none; - -ms-user-select: none; - user-select: none; - /* Trying to get SVG to act like a greedy block in all browsers */ - display: block; - width:100%; - height:100%; -} - - - -.axis path, .axis line { - fill: none; - stroke: #000; - shape-rendering: crispEdges; -} - -/* Horizontal gridlines */ - -.grid .tick { - stroke: #f7f7f7; -} - -.y.axis .tick.minor { - stroke: #a7a7ac; -} - -.x.axis .tick.minor { - stroke: #a7a7ac; -} - -.y.axis text, .x.axis text { - font-family: Arial, Helvetica, sans-serif; - font-size: 10px; - font-weight: normal; - font-style: normal; - fill: #50505a; - text-rendering: optimize-legibility; - -} - -.x.axis path { - stroke: #50505a; -} - -.y.axis path { - stroke: #50505a; -} - /* Brush related css rules */ -.brush rect.extent { - fill: #0757ff; - fill-opacity: .15; - shape-rendering: crispEdges; -} - -.brush .resize path { - fill: #666; - fill-opacity: .8; - stroke: #000; - stroke-width: 1.5px; -} - -.minLabel, .avgLabel, .highLabel { - font-family: Arial, Verdana, sans-serif; - font-size: 12px; - font-weight: bold; - text-anchor: start; - fill: #003168; - text-rendering: optimize-legibility; -} - -.minText, .avgText, .highText { - font-family: Arial, Verdana, sans-serif; - font-size: 12px; - text-anchor: start; - fill: #003168; - text-rendering: optimize-legibility; -} - -.chartTitleName { - font-family: Arial, Verdana, sans-serif; - font-size: 12px; - font-weight: bold; - fill: #003168; -} -.chartTitleBox { - fill:none; - -} - -rect.high { - fill: #1794bc; -} - -rect.low { - fill: #70c4e2; -} - - - -/* CSS for new Chart Hovers*/ - -#availTooltip { - z-index: 990000; - position: absolute; - width: 150px; - height: auto; - padding: 5px; - background-color: #000; - opacity: 0.8; - -webkit-border-radius: 5px; - -moz-border-radius: 5px; - border-radius: 5px; - -webkit-box-shadow: 4px 4px 5px rgba(0, 0, 0, 0.4); - -moz-box-shadow: 4px 4px 5px rgba(0, 0, 0, 0.4); - box-shadow: 4px 4px 5px rgba(0, 0, 0, 0.4); - pointer-events: none; -} - -#availTooltip.hidden { - display: none; -} - -#availTooltip div { - margin: 0; - font-family: Arial, Verdana, sans-serif; - font-size: 9px; - color: #d3d3d6; -} - -.availTooltipLabel { - width: 40px; - font-weight: bold; - color: #d3d3d6; -} - -/* CSS for metric graph tooltips */ -#metricGraphTooltip { - z-index: 990000; - position: absolute; - width: 100px; - height: auto; - padding: 5px; - background-color: #000; - opacity: 0.80; - -webkit-border-radius: 5px; - -moz-border-radius: 5px; - border-radius: 5px; - -webkit-box-shadow: 4px 4px 5px rgba(0, 0, 0, 0.4); - -moz-box-shadow: 4px 4px 5px rgba(0, 0, 0, 0.4); - box-shadow: 4px 4px 5px rgba(0, 0, 0, 0.4); - pointer-events: none; -} - -#metricGraphTooltip.hidden { - display: none; -} - -#metricGraphTooltip div { - margin: 0; - font-family: Arial, Verdana, sans-serif; - font-size: 10px; - color: #d3d3d6; -} - -#metricGraphTooltipLabel { - width: 40px; - font-weight: bold; - color: #d3d3d6; -} - -#metricGraphTooltipMaxLabel { - color: #1794BC; -} - -#metricGraphTooltipAvgLabel { - color: #2e376a; -} - -#metricGraphTooltipMinLabel { - color: #70c4e2; -} - -#noDataTooltip { - z-index: 990000; - position: absolute; - width: 100px; - height: auto; - padding: 5px; - background-color: #000; - opacity: 0.80; - -webkit-border-radius: 5px; - -moz-border-radius: 5px; - border-radius: 5px; - -webkit-box-shadow: 4px 4px 5px rgba(0, 0, 0, 0.4); - -moz-box-shadow: 4px 4px 5px rgba(0, 0, 0, 0.4); - box-shadow: 4px 4px 5px rgba(0, 0, 0, 0.4); - pointer-events: none; -} - -#noDataTooltip.hidden { - display: none; -} - -#noDataTooltip div { - margin: 0; - font-family: Arial, Verdana, sans-serif; - font-size: 10px; - color: #d3d3d6; -} - - -#singleValueTooltip { - z-index: 990000; - position: absolute; - width: 100px; - height: auto; - padding: 5px; - background-color: #000; - opacity: 0.80; - -webkit-border-radius: 5px; - -moz-border-radius: 5px; - border-radius: 5px; - -webkit-box-shadow: 4px 4px 5px rgba(0, 0, 0, 0.4); - -moz-box-shadow: 4px 4px 5px rgba(0, 0, 0, 0.4); - box-shadow: 4px 4px 5px rgba(0, 0, 0, 0.4); - pointer-events: none; -} - -#singleValueTooltip.hidden { - display: none; -} - -#singleValueTooltip div { - margin: 0; - font-family: Arial, Verdana, sans-serif; - font-size: 10px; - color: #d3d3d6; -} - diff --git a/modules/enterprise/gui/coregui/src/main/webapp/js/moment-2.0.0.js b/modules/enterprise/gui/coregui/src/main/webapp/js/moment-2.0.0.js new file mode 100644 index 0000000..30a0a6c --- /dev/null +++ b/modules/enterprise/gui/coregui/src/main/webapp/js/moment-2.0.0.js @@ -0,0 +1,1400 @@ +// moment.js +// version : 2.0.0 +// author : Tim Wood +// license : MIT +// momentjs.com + +(function (undefined) { + + /************************************ + Constants + ************************************/ + + var moment, + VERSION = "2.0.0", + round = Math.round, i, + // internal storage for language config files + languages = {}, + + // check for nodeJS + hasModule = (typeof module !== 'undefined' && module.exports), + + // ASP.NET json date format regex + aspNetJsonRegex = /^\/?Date$(\-?\d+)/i, + + // format tokens + formattingTokens = /(\[[^\[]*\])|(\$?(Mo|MM?M?M?|Do|DDDo|DD?D?D?|ddd?d?|do?|w[o|w]?|W[o|W]?|YYYYY|YYYY|YY|a|A|hh?|HH?|mm?|ss?|SS?S?|X|zz?|ZZ?|.)/g, + localFormattingTokens = /(\[[^\[]*\])|(\\)?(LT|LL?L?L?|l{1,4})/g, + + // parsing tokens + parseMultipleFormatChunker = /([0-9a-zA-Z\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF]+)/gi, + + // parsing token regexes + parseTokenOneOrTwoDigits = /\d\d?/, // 0 - 99 + parseTokenOneToThreeDigits = /\d{1,3}/, // 0 - 999 + parseTokenThreeDigits = /\d{3}/, // 000 - 999 + parseTokenFourDigits = /\d{1,4}/, // 0 - 9999 + parseTokenSixDigits = /[+\-]?\d{1,6}/, // -999,999 - 999,999 + parseTokenWord = /[0-9]*[a-z\u00A0-\u05FF\u0700-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF]+|[\u0600-\u06FF]+\s*?[\u0600-\u06FF]+/i, // any word (or two) characters or numbers including two word month in arabic. + parseTokenTimezone = /Z|[\+\-]\d\d:?\d\d/i, // +00:00 -00:00 +0000 -0000 or Z + parseTokenT = /T/i, // T (ISO seperator) + parseTokenTimestampMs = /[\+\-]?\d+(\.\d{1,3})?/, // 123456789 123456789.123 + + // preliminary iso regex + // 0000-00-00 + T + 00 or 00:00 or 00:00:00 or 00:00:00.000 + +00:00 or +0000 + isoRegex = /^\s*\d{4}-\d\d-\d\d((T| )(\d\d(:\d\d(:\d\d(\.\d\d?\d?)?)?)?)?([\+\-]\d\d:?\d\d)?)?/, + isoFormat = 'YYYY-MM-DDTHH:mm:ssZ', + + // iso time formats and regexes + isoTimes = [ + ['HH:mm:ss.S', /(T| )\d\d:\d\d:\d\d\.\d{1,3}/], + ['HH:mm:ss', /(T| )\d\d:\d\d:\d\d/], + ['HH:mm', /(T| )\d\d:\d\d/], + ['HH', /(T| )\d\d/] + ], + + // timezone chunker "+10:00" > ["10", "00"] or "-1530" > ["-15", "30"] + parseTimezoneChunker = /([\+\-]|\d\d)/gi, + + // getter and setter names + proxyGettersAndSetters = 'Month|Date|Hours|Minutes|Seconds|Milliseconds'.split('|'), + unitMillisecondFactors = { + 'Milliseconds' : 1, + 'Seconds' : 1e3, + 'Minutes' : 6e4, + 'Hours' : 36e5, + 'Days' : 864e5, + 'Months' : 2592e6, + 'Years' : 31536e6 + }, + + // format function strings + formatFunctions = {}, + + // tokens to ordinalize and pad + ordinalizeTokens = 'DDD w W M D d'.split(' '), + paddedTokens = 'M D H h m s w W'.split(' '), + + formatTokenFunctions = { + M : function () { + return this.month() + 1; + }, + MMM : function (format) { + return this.lang().monthsShort(this, format); + }, + MMMM : function (format) { + return this.lang().months(this, format); + }, + D : function () { + return this.date(); + }, + DDD : function () { + return this.dayOfYear(); + }, + d : function () { + return this.day(); + }, + dd : function (format) { + return this.lang().weekdaysMin(this, format); + }, + ddd : function (format) { + return this.lang().weekdaysShort(this, format); + }, + dddd : function (format) { + return this.lang().weekdays(this, format); + }, + w : function () { + return this.week(); + }, + W : function () { + return this.isoWeek(); + }, + YY : function () { + return leftZeroFill(this.year() % 100, 2); + }, + YYYY : function () { + return leftZeroFill(this.year(), 4); + }, + YYYYY : function () { + return leftZeroFill(this.year(), 5); + }, + a : function () { + return this.lang().meridiem(this.hours(), this.minutes(), true); + }, + A : function () { + return this.lang().meridiem(this.hours(), this.minutes(), false); + }, + H : function () { + return this.hours(); + }, + h : function () { + return this.hours() % 12 || 12; + }, + m : function () { + return this.minutes(); + }, + s : function () { + return this.seconds(); + }, + S : function () { + return ~~(this.milliseconds() / 100); + }, + SS : function () { + return leftZeroFill(~~(this.milliseconds() / 10), 2); + }, + SSS : function () { + return leftZeroFill(this.milliseconds(), 3); + }, + Z : function () { + var a = -this.zone(), + b = "+"; + if (a < 0) { + a = -a; + b = "-"; + } + return b + leftZeroFill(~~(a / 60), 2) + ":" + leftZeroFill(~~a % 60, 2); + }, + ZZ : function () { + var a = -this.zone(), + b = "+"; + if (a < 0) { + a = -a; + b = "-"; + } + return b + leftZeroFill(~~(10 * a / 6), 4); + }, + X : function () { + return this.unix(); + } + }; + + function padToken(func, count) { + return function (a) { + return leftZeroFill(func.call(this, a), count); + }; + } + function ordinalizeToken(func) { + return function (a) { + return this.lang().ordinal(func.call(this, a)); + }; + } + + while (ordinalizeTokens.length) { + i = ordinalizeTokens.pop(); + formatTokenFunctions[i + 'o'] = ordinalizeToken(formatTokenFunctions[i]); + } + while (paddedTokens.length) { + i = paddedTokens.pop(); + formatTokenFunctions[i + i] = padToken(formatTokenFunctions[i], 2); + } + formatTokenFunctions.DDDD = padToken(formatTokenFunctions.DDD, 3); + + + /************************************ + Constructors + ************************************/ + + function Language() { + + } + + // Moment prototype object + function Moment(config) { + extend(this, config); + } + + // Duration Constructor + function Duration(duration) { + var data = this._data = {}, + years = duration.years || duration.year || duration.y || 0, + months = duration.months || duration.month || duration.M || 0, + weeks = duration.weeks || duration.week || duration.w || 0, + days = duration.days || duration.day || duration.d || 0, + hours = duration.hours || duration.hour || duration.h || 0, + minutes = duration.minutes || duration.minute || duration.m || 0, + seconds = duration.seconds || duration.second || duration.s || 0, + milliseconds = duration.milliseconds || duration.millisecond || duration.ms || 0; + + // representation for dateAddRemove + this._milliseconds = milliseconds + + seconds * 1e3 + // 1000 + minutes * 6e4 + // 1000 * 60 + hours * 36e5; // 1000 * 60 * 60 + // Because of dateAddRemove treats 24 hours as different from a + // day when working around DST, we need to store them separately + this._days = days + + weeks * 7; + // It is impossible translate months into days without knowing + // which months you are are talking about, so we have to store + // it separately. + this._months = months + + years * 12; + + // The following code bubbles up values, see the tests for + // examples of what that means. + data.milliseconds = milliseconds % 1000; + seconds += absRound(milliseconds / 1000); + + data.seconds = seconds % 60; + minutes += absRound(seconds / 60); + + data.minutes = minutes % 60; + hours += absRound(minutes / 60); + + data.hours = hours % 24; + days += absRound(hours / 24); + + days += weeks * 7; + data.days = days % 30; + + months += absRound(days / 30); + + data.months = months % 12; + years += absRound(months / 12); + + data.years = years; + } + + + /************************************ + Helpers + ************************************/ + + + function extend(a, b) { + for (var i in b) { + if (b.hasOwnProperty(i)) { + a[i] = b[i]; + } + } + return a; + } + + function absRound(number) { + if (number < 0) { + return Math.ceil(number); + } else { + return Math.floor(number); + } + } + + // left zero fill a number + // see http://jsperf.com/left-zero-filling for performance comparison + function leftZeroFill(number, targetLength) { + var output = number + ''; + while (output.length < targetLength) { + output = '0' + output; + } + return output; + } + + // helper function for _.addTime and _.subtractTime + function addOrSubtractDurationFromMoment(mom, duration, isAdding) { + var ms = duration._milliseconds, + d = duration._days, + M = duration._months, + currentDate; + + if (ms) { + mom._d.setTime(+mom + ms * isAdding); + } + if (d) { + mom.date(mom.date() + d * isAdding); + } + if (M) { + currentDate = mom.date(); + mom.date(1) + .month(mom.month() + M * isAdding) + .date(Math.min(currentDate, mom.daysInMonth())); + } + } + + // check if is an array + function isArray(input) { + return Object.prototype.toString.call(input) === '[object Array]'; + } + + // compare two arrays, return the number of differences + function compareArrays(array1, array2) { + var len = Math.min(array1.length, array2.length), + lengthDiff = Math.abs(array1.length - array2.length), + diffs = 0, + i; + for (i = 0; i < len; i++) { + if (~~array1[i] !== ~~array2[i]) { + diffs++; + } + } + return diffs + lengthDiff; + } + + + /************************************ + Languages + ************************************/ + + + Language.prototype = { + set : function (config) { + var prop, i; + for (i in config) { + prop = config[i]; + if (typeof prop === 'function') { + this[i] = prop; + } else { + this['_' + i] = prop; + } + } + }, + + _months : "January_February_March_April_May_June_July_August_September_October_November_December".split("_"), + months : function (m) { + return this._months[m.month()]; + }, + + _monthsShort : "Jan_Feb_Mar_Apr_May_Jun_Jul_Aug_Sep_Oct_Nov_Dec".split("_"), + monthsShort : function (m) { + return this._monthsShort[m.month()]; + }, + + monthsParse : function (monthName) { + var i, mom, regex, output; + + if (!this._monthsParse) { + this._monthsParse = []; + } + + for (i = 0; i < 12; i++) { + // make the regex if we don't have it already + if (!this._monthsParse[i]) { + mom = moment([2000, i]); + regex = '^' + this.months(mom, '') + '|^' + this.monthsShort(mom, ''); + this._monthsParse[i] = new RegExp(regex.replace('.', ''), 'i'); + } + // test the regex + if (this._monthsParse[i].test(monthName)) { + return i; + } + } + }, + + _weekdays : "Sunday_Monday_Tuesday_Wednesday_Thursday_Friday_Saturday".split("_"), + weekdays : function (m) { + return this._weekdays[m.day()]; + }, + + _weekdaysShort : "Sun_Mon_Tue_Wed_Thu_Fri_Sat".split("_"), + weekdaysShort : function (m) { + return this._weekdaysShort[m.day()]; + }, + + _weekdaysMin : "Su_Mo_Tu_We_Th_Fr_Sa".split("_"), + weekdaysMin : function (m) { + return this._weekdaysMin[m.day()]; + }, + + _longDateFormat : { + LT : "h:mm A", + L : "MM/DD/YYYY", + LL : "MMMM D YYYY", + LLL : "MMMM D YYYY LT", + LLLL : "dddd, MMMM D YYYY LT" + }, + longDateFormat : function (key) { + var output = this._longDateFormat[key]; + if (!output && this._longDateFormat[key.toUpperCase()]) { + output = this._longDateFormat[key.toUpperCase()].replace(/MMMM|MM|DD|dddd/g, function (val) { + return val.slice(1); + }); + this._longDateFormat[key] = output; + } + return output; + }, + + meridiem : function (hours, minutes, isLower) { + if (hours > 11) { + return isLower ? 'pm' : 'PM'; + } else { + return isLower ? 'am' : 'AM'; + } + }, + + _calendar : { + sameDay : '[Today at] LT', + nextDay : '[Tomorrow at] LT', + nextWeek : 'dddd [at] LT', + lastDay : '[Yesterday at] LT', + lastWeek : '[last] dddd [at] LT', + sameElse : 'L' + }, + calendar : function (key, mom) { + var output = this._calendar[key]; + return typeof output === 'function' ? output.apply(mom) : output; + }, + + _relativeTime : { + future : "in %s", + past : "%s ago", + s : "a few seconds", + m : "a minute", + mm : "%d minutes", + h : "an hour", + hh : "%d hours", + d : "a day", + dd : "%d days", + M : "a month", + MM : "%d months", + y : "a year", + yy : "%d years" + }, + relativeTime : function (number, withoutSuffix, string, isFuture) { + var output = this._relativeTime[string]; + return (typeof output === 'function') ? + output(number, withoutSuffix, string, isFuture) : + output.replace(/%d/i, number); + }, + pastFuture : function (diff, output) { + var format = this._relativeTime[diff > 0 ? 'future' : 'past']; + return typeof format === 'function' ? format(output) : format.replace(/%s/i, output); + }, + + ordinal : function (number) { + return this._ordinal.replace("%d", number); + }, + _ordinal : "%d", + + preparse : function (string) { + return string; + }, + + postformat : function (string) { + return string; + }, + + week : function (mom) { + return weekOfYear(mom, this._week.dow, this._week.doy); + }, + _week : { + dow : 0, // Sunday is the first day of the week. + doy : 6 // The week that contains Jan 1st is the first week of the year. + } + }; + + // Loads a language definition into the `languages` cache. The function + // takes a key and optionally values. If not in the browser and no values + // are provided, it will load the language file module. As a convenience, + // this function also returns the language values. + function loadLang(key, values) { + values.abbr = key; + if (!languages[key]) { + languages[key] = new Language(); + } + languages[key].set(values); + return languages[key]; + } + + // Determines which language definition to use and returns it. + // + // With no parameters, it will return the global language. If you + // pass in a language key, such as 'en', it will return the + // definition for 'en', so long as 'en' has already been loaded using + // moment.lang. + function getLangDefinition(key) { + if (!key) { + return moment.fn._lang; + } + if (!languages[key] && hasModule) { + require('./lang/' + key); + } + return languages[key]; + } + + + /************************************ + Formatting + ************************************/ + + + function removeFormattingTokens(input) { + if (input.match(/\[.*\]/)) { + return input.replace(/^\[|\]$/g, ""); + } + return input.replace(/\\/g, ""); + } + + function makeFormatFunction(format) { + var array = format.match(formattingTokens), i, length; + + for (i = 0, length = array.length; i < length; i++) { + if (formatTokenFunctions[array[i]]) { + array[i] = formatTokenFunctions[array[i]]; + } else { + array[i] = removeFormattingTokens(array[i]); + } + } + + return function (mom) { + var output = ""; + for (i = 0; i < length; i++) { + output += typeof array[i].call === 'function' ? array[i].call(mom, format) : array[i]; + } + return output; + }; + } + + // format date using native date object + function formatMoment(m, format) { + var i = 5; + + function replaceLongDateFormatTokens(input) { + return m.lang().longDateFormat(input) || input; + } + + while (i-- && localFormattingTokens.test(format)) { + format = format.replace(localFormattingTokens, replaceLongDateFormatTokens); + } + + if (!formatFunctions[format]) { + formatFunctions[format] = makeFormatFunction(format); + } + + return formatFunctions[format](m); + } + + + /************************************ + Parsing + ************************************/ + + + // get the regex to find the next token + function getParseRegexForToken(token) { + switch (token) { + case 'DDDD': + return parseTokenThreeDigits; + case 'YYYY': + return parseTokenFourDigits; + case 'YYYYY': + return parseTokenSixDigits; + case 'S': + case 'SS': + case 'SSS': + case 'DDD': + return parseTokenOneToThreeDigits; + case 'MMM': + case 'MMMM': + case 'dd': + case 'ddd': + case 'dddd': + case 'a': + case 'A': + return parseTokenWord; + case 'X': + return parseTokenTimestampMs; + case 'Z': + case 'ZZ': + return parseTokenTimezone; + case 'T': + return parseTokenT; + case 'MM': + case 'DD': + case 'YY': + case 'HH': + case 'hh': + case 'mm': + case 'ss': + case 'M': + case 'D': + case 'd': + case 'H': + case 'h': + case 'm': + case 's': + return parseTokenOneOrTwoDigits; + default : + return new RegExp(token.replace('\\', '')); + } + } + + // function to convert string input to date + function addTimeToArrayFromToken(token, input, config) { + var a, b, + datePartArray = config._a; + + switch (token) { + // MONTH + case 'M' : // fall through to MM + case 'MM' : + datePartArray[1] = (input == null) ? 0 : ~~input - 1; + break; + case 'MMM' : // fall through to MMMM + case 'MMMM' : + a = getLangDefinition(config._l).monthsParse(input); + // if we didn't find a month name, mark the date as invalid. + if (a != null) { + datePartArray[1] = a; + } else { + config._isValid = false; + } + break; + // DAY OF MONTH + case 'D' : // fall through to DDDD + case 'DD' : // fall through to DDDD + case 'DDD' : // fall through to DDDD + case 'DDDD' : + if (input != null) { + datePartArray[2] = ~~input; + } + break; + // YEAR + case 'YY' : + datePartArray[0] = ~~input + (~~input > 68 ? 1900 : 2000); + break; + case 'YYYY' : + case 'YYYYY' : + datePartArray[0] = ~~input; + break; + // AM / PM + case 'a' : // fall through to A + case 'A' : + config._isPm = ((input + '').toLowerCase() === 'pm'); + break; + // 24 HOUR + case 'H' : // fall through to hh + case 'HH' : // fall through to hh + case 'h' : // fall through to hh + case 'hh' : + datePartArray[3] = ~~input; + break; + // MINUTE + case 'm' : // fall through to mm + case 'mm' : + datePartArray[4] = ~~input; + break; + // SECOND + case 's' : // fall through to ss + case 'ss' : + datePartArray[5] = ~~input; + break; + // MILLISECOND + case 'S' : + case 'SS' : + case 'SSS' : + datePartArray[6] = ~~ (('0.' + input) * 1000); + break; + // UNIX TIMESTAMP WITH MS + case 'X': + config._d = new Date(parseFloat(input) * 1000); + break; + // TIMEZONE + case 'Z' : // fall through to ZZ + case 'ZZ' : + config._useUTC = true; + a = (input + '').match(parseTimezoneChunker); + if (a && a[1]) { + config._tzh = ~~a[1]; + } + if (a && a[2]) { + config._tzm = ~~a[2]; + } + // reverse offsets + if (a && a[0] === '+') { + config._tzh = -config._tzh; + config._tzm = -config._tzm; + } + break; + } + + // if the input is null, the date is not valid + if (input == null) { + config._isValid = false; + } + } + + // convert an array to a date. + // the array should mirror the parameters below + // note: all values past the year are optional and will default to the lowest possible value. + // [year, month, day , hour, minute, second, millisecond] + function dateFromArray(config) { + var i, date, input = []; + + if (config._d) { + return; + } + + for (i = 0; i < 7; i++) { + config._a[i] = input[i] = (config._a[i] == null) ? (i === 2 ? 1 : 0) : config._a[i]; + } + + // add the offsets to the time to be parsed so that we can have a clean array for checking isValid + input[3] += config._tzh || 0; + input[4] += config._tzm || 0; + + date = new Date(0); + + if (config._useUTC) { + date.setUTCFullYear(input[0], input[1], input[2]); + date.setUTCHours(input[3], input[4], input[5], input[6]); + } else { + date.setFullYear(input[0], input[1], input[2]); + date.setHours(input[3], input[4], input[5], input[6]); + } + + config._d = date; + } + + // date from string and format string + function makeDateFromStringAndFormat(config) { + // This array is used to make a Date, either with `new Date` or `Date.UTC` + var tokens = config._f.match(formattingTokens), + string = config._i, + i, parsedInput; + + config._a = []; + + for (i = 0; i < tokens.length; i++) { + parsedInput = (getParseRegexForToken(tokens[i]).exec(string) || [])[0]; + if (parsedInput) { + string = string.slice(string.indexOf(parsedInput) + parsedInput.length); + } + // don't parse if its not a known token + if (formatTokenFunctions[tokens[i]]) { + addTimeToArrayFromToken(tokens[i], parsedInput, config); + } + } + // handle am pm + if (config._isPm && config._a[3] < 12) { + config._a[3] += 12; + } + // if is 12 am, change hours to 0 + if (config._isPm === false && config._a[3] === 12) { + config._a[3] = 0; + } + // return + dateFromArray(config); + } + + // date from string and array of format strings + function makeDateFromStringAndArray(config) { + var tempConfig, + tempMoment, + bestMoment, + + scoreToBeat = 99, + i, + currentDate, + currentScore; + + while (config._f.length) { + tempConfig = extend({}, config); + tempConfig._f = config._f.pop(); + makeDateFromStringAndFormat(tempConfig); + tempMoment = new Moment(tempConfig); + + if (tempMoment.isValid()) { + bestMoment = tempMoment; + break; + } + + currentScore = compareArrays(tempConfig._a, tempMoment.toArray()); + + if (currentScore < scoreToBeat) { + scoreToBeat = currentScore; + bestMoment = tempMoment; + } + } + + extend(config, bestMoment); + } + + // date from iso format + function makeDateFromString(config) { + var i, + string = config._i; + if (isoRegex.exec(string)) { + config._f = 'YYYY-MM-DDT'; + for (i = 0; i < 4; i++) { + if (isoTimes[i][1].exec(string)) { + config._f += isoTimes[i][0]; + break; + } + } + if (parseTokenTimezone.exec(string)) { + config._f += " Z"; + } + makeDateFromStringAndFormat(config); + } else { + config._d = new Date(string); + } + } + + function makeDateFromInput(config) { + var input = config._i, + matched = aspNetJsonRegex.exec(input); + + if (input === undefined) { + config._d = new Date(); + } else if (matched) { + config._d = new Date(+matched[1]); + } else if (typeof input === 'string') { + makeDateFromString(config); + } else if (isArray(input)) { + config._a = input.slice(0); + dateFromArray(config); + } else { + config._d = input instanceof Date ? new Date(+input) : new Date(input); + } + } + + + /************************************ + Relative Time + ************************************/ + + + // helper function for moment.fn.from, moment.fn.fromNow, and moment.duration.fn.humanize + function substituteTimeAgo(string, number, withoutSuffix, isFuture, lang) { + return lang.relativeTime(number || 1, !!withoutSuffix, string, isFuture); + } + + function relativeTime(milliseconds, withoutSuffix, lang) { + var seconds = round(Math.abs(milliseconds) / 1000), + minutes = round(seconds / 60), + hours = round(minutes / 60), + days = round(hours / 24), + years = round(days / 365), + args = seconds < 45 && ['s', seconds] || + minutes === 1 && ['m'] || + minutes < 45 && ['mm', minutes] || + hours === 1 && ['h'] || + hours < 22 && ['hh', hours] || + days === 1 && ['d'] || + days <= 25 && ['dd', days] || + days <= 45 && ['M'] || + days < 345 && ['MM', round(days / 30)] || + years === 1 && ['y'] || ['yy', years]; + args[2] = withoutSuffix; + args[3] = milliseconds > 0; + args[4] = lang; + return substituteTimeAgo.apply({}, args); + } + + + /************************************ + Week of Year + ************************************/ + + + // firstDayOfWeek 0 = sun, 6 = sat + // the day of the week that starts the week + // (usually sunday or monday) + // firstDayOfWeekOfYear 0 = sun, 6 = sat + // the first week is the week that contains the first + // of this day of the week + // (eg. ISO weeks use thursday (4)) + function weekOfYear(mom, firstDayOfWeek, firstDayOfWeekOfYear) { + var end = firstDayOfWeekOfYear - firstDayOfWeek, + daysToDayOfWeek = firstDayOfWeekOfYear - mom.day(); + + + if (daysToDayOfWeek > end) { + daysToDayOfWeek -= 7; + } + + if (daysToDayOfWeek < end - 7) { + daysToDayOfWeek += 7; + } + + return Math.ceil(moment(mom).add('d', daysToDayOfWeek).dayOfYear() / 7); + } + + + /************************************ + Top Level Functions + ************************************/ + + function makeMoment(config) { + var input = config._i, + format = config._f; + + if (input === null || input === '') { + return null; + } + + if (typeof input === 'string') { + config._i = input = getLangDefinition().preparse(input); + } + + if (moment.isMoment(input)) { + config = extend({}, input); + config._d = new Date(+input._d); + } else if (format) { + if (isArray(format)) { + makeDateFromStringAndArray(config); + } else { + makeDateFromStringAndFormat(config); + } + } else { + makeDateFromInput(config); + } + + return new Moment(config); + } + + moment = function (input, format, lang) { + return makeMoment({ + _i : input, + _f : format, + _l : lang, + _isUTC : false + }); + }; + + // creating with utc + moment.utc = function (input, format, lang) { + return makeMoment({ + _useUTC : true, + _isUTC : true, + _l : lang, + _i : input, + _f : format + }); + }; + + // creating with unix timestamp (in seconds) + moment.unix = function (input) { + return moment(input * 1000); + }; + + // duration + moment.duration = function (input, key) { + var isDuration = moment.isDuration(input), + isNumber = (typeof input === 'number'), + duration = (isDuration ? input._data : (isNumber ? {} : input)), + ret; + + if (isNumber) { + if (key) { + duration[key] = input; + } else { + duration.milliseconds = input; + } + } + + ret = new Duration(duration); + + if (isDuration && input.hasOwnProperty('_lang')) { + ret._lang = input._lang; + } + + return ret; + }; + + // version number + moment.version = VERSION; + + // default format + moment.defaultFormat = isoFormat; + + // This function will load languages and then set the global language. If + // no arguments are passed in, it will simply return the current global + // language key. + moment.lang = function (key, values) { + var i; + + if (!key) { + return moment.fn._lang._abbr; + } + if (values) { + loadLang(key, values); + } else if (!languages[key]) { + getLangDefinition(key); + } + moment.duration.fn._lang = moment.fn._lang = getLangDefinition(key); + }; + + // returns language data + moment.langData = function (key) { + if (key && key._lang && key._lang._abbr) { + key = key._lang._abbr; + } + return getLangDefinition(key); + }; + + // compare moment object + moment.isMoment = function (obj) { + return obj instanceof Moment; + }; + + // for typechecking Duration objects + moment.isDuration = function (obj) { + return obj instanceof Duration; + }; + + + /************************************ + Moment Prototype + ************************************/ + + + moment.fn = Moment.prototype = { + + clone : function () { + return moment(this); + }, + + valueOf : function () { + return +this._d; + }, + + unix : function () { + return Math.floor(+this._d / 1000); + }, + + toString : function () { + return this.format("ddd MMM DD YYYY HH:mm:ss [GMT]ZZ"); + }, + + toDate : function () { + return this._d; + }, + + toJSON : function () { + return moment.utc(this).format('YYYY-MM-DD[T]HH:mm:ss.SSS[Z]'); + }, + + toArray : function () { + var m = this; + return [ + m.year(), + m.month(), + m.date(), + m.hours(), + m.minutes(), + m.seconds(), + m.milliseconds() + ]; + }, + + isValid : function () { + if (this._isValid == null) { + if (this._a) { + this._isValid = !compareArrays(this._a, (this._isUTC ? moment.utc(this._a) : moment(this._a)).toArray()); + } else { + this._isValid = !isNaN(this._d.getTime()); + } + } + return !!this._isValid; + }, + + utc : function () { + this._isUTC = true; + return this; + }, + + local : function () { + this._isUTC = false; + return this; + }, + + format : function (inputString) { + var output = formatMoment(this, inputString || moment.defaultFormat); + return this.lang().postformat(output); + }, + + add : function (input, val) { + var dur; + // switch args to support add('s', 1) and add(1, 's') + if (typeof input === 'string') { + dur = moment.duration(+val, input); + } else { + dur = moment.duration(input, val); + } + addOrSubtractDurationFromMoment(this, dur, 1); + return this; + }, + + subtract : function (input, val) { + var dur; + // switch args to support subtract('s', 1) and subtract(1, 's') + if (typeof input === 'string') { + dur = moment.duration(+val, input); + } else { + dur = moment.duration(input, val); + } + addOrSubtractDurationFromMoment(this, dur, -1); + return this; + }, + + diff : function (input, units, asFloat) { + var that = this._isUTC ? moment(input).utc() : moment(input).local(), + zoneDiff = (this.zone() - that.zone()) * 6e4, + diff, output; + + if (units) { + // standardize on singular form + units = units.replace(/s$/, ''); + } + + if (units === 'year' || units === 'month') { + diff = (this.daysInMonth() + that.daysInMonth()) * 432e5; // 24 * 60 * 60 * 1000 / 2 + output = ((this.year() - that.year()) * 12) + (this.month() - that.month()); + output += ((this - moment(this).startOf('month')) - (that - moment(that).startOf('month'))) / diff; + if (units === 'year') { + output = output / 12; + } + } else { + diff = (this - that) - zoneDiff; + output = units === 'second' ? diff / 1e3 : // 1000 + units === 'minute' ? diff / 6e4 : // 1000 * 60 + units === 'hour' ? diff / 36e5 : // 1000 * 60 * 60 + units === 'day' ? diff / 864e5 : // 1000 * 60 * 60 * 24 + units === 'week' ? diff / 6048e5 : // 1000 * 60 * 60 * 24 * 7 + diff; + } + return asFloat ? output : absRound(output); + }, + + from : function (time, withoutSuffix) { + return moment.duration(this.diff(time)).lang(this.lang()._abbr).humanize(!withoutSuffix); + }, + + fromNow : function (withoutSuffix) { + return this.from(moment(), withoutSuffix); + }, + + calendar : function () { + var diff = this.diff(moment().startOf('day'), 'days', true), + format = diff < -6 ? 'sameElse' : + diff < -1 ? 'lastWeek' : + diff < 0 ? 'lastDay' : + diff < 1 ? 'sameDay' : + diff < 2 ? 'nextDay' : + diff < 7 ? 'nextWeek' : 'sameElse'; + return this.format(this.lang().calendar(format, this)); + }, + + isLeapYear : function () { + var year = this.year(); + return (year % 4 === 0 && year % 100 !== 0) || year % 400 === 0; + }, + + isDST : function () { + return (this.zone() < moment([this.year()]).zone() || + this.zone() < moment([this.year(), 5]).zone()); + }, + + day : function (input) { + var day = this._isUTC ? this._d.getUTCDay() : this._d.getDay(); + return input == null ? day : + this.add({ d : input - day }); + }, + + startOf: function (units) { + units = units.replace(/s$/, ''); + // the following switch intentionally omits break keywords + // to utilize falling through the cases. + switch (units) { + case 'year': + this.month(0); + /* falls through */ + case 'month': + this.date(1); + /* falls through */ + case 'week': + case 'day': + this.hours(0); + /* falls through */ + case 'hour': + this.minutes(0); + /* falls through */ + case 'minute': + this.seconds(0); + /* falls through */ + case 'second': + this.milliseconds(0); + /* falls through */ + } + + // weeks are a special case + if (units === 'week') { + this.day(0); + } + + return this; + }, + + endOf: function (units) { + return this.startOf(units).add(units.replace(/s?$/, 's'), 1).subtract('ms', 1); + }, + + isAfter: function (input, units) { + units = typeof units !== 'undefined' ? units : 'millisecond'; + return +this.clone().startOf(units) > +moment(input).startOf(units); + }, + + isBefore: function (input, units) { + units = typeof units !== 'undefined' ? units : 'millisecond'; + return +this.clone().startOf(units) < +moment(input).startOf(units); + }, + + isSame: function (input, units) { + units = typeof units !== 'undefined' ? units : 'millisecond'; + return +this.clone().startOf(units) === +moment(input).startOf(units); + }, + + zone : function () { + return this._isUTC ? 0 : this._d.getTimezoneOffset(); + }, + + daysInMonth : function () { + return moment.utc([this.year(), this.month() + 1, 0]).date(); + }, + + dayOfYear : function (input) { + var dayOfYear = round((moment(this).startOf('day') - moment(this).startOf('year')) / 864e5) + 1; + return input == null ? dayOfYear : this.add("d", (input - dayOfYear)); + }, + + isoWeek : function (input) { + var week = weekOfYear(this, 1, 4); + return input == null ? week : this.add("d", (input - week) * 7); + }, + + week : function (input) { + var week = this.lang().week(this); + return input == null ? week : this.add("d", (input - week) * 7); + }, + + // If passed a language key, it will set the language for this + // instance. Otherwise, it will return the language configuration + // variables for this instance. + lang : function (key) { + if (key === undefined) { + return this._lang; + } else { + this._lang = getLangDefinition(key); + return this; + } + } + }; + + // helper for adding shortcuts + function makeGetterAndSetter(name, key) { + moment.fn[name] = moment.fn[name + 's'] = function (input) { + var utc = this._isUTC ? 'UTC' : ''; + if (input != null) { + this._d['set' + utc + key](input); + return this; + } else { + return this._d['get' + utc + key](); + } + }; + } + + // loop through and add shortcuts (Month, Date, Hours, Minutes, Seconds, Milliseconds) + for (i = 0; i < proxyGettersAndSetters.length; i ++) { + makeGetterAndSetter(proxyGettersAndSetters[i].toLowerCase().replace(/s$/, ''), proxyGettersAndSetters[i]); + } + + // add shortcut for year (uses different syntax than the getter/setter 'year' == 'FullYear') + makeGetterAndSetter('year', 'FullYear'); + + // add plural methods + moment.fn.days = moment.fn.day; + moment.fn.weeks = moment.fn.week; + moment.fn.isoWeeks = moment.fn.isoWeek; + + /************************************ + Duration Prototype + ************************************/ + + + moment.duration.fn = Duration.prototype = { + weeks : function () { + return absRound(this.days() / 7); + }, + + valueOf : function () { + return this._milliseconds + + this._days * 864e5 + + this._months * 2592e6; + }, + + humanize : function (withSuffix) { + var difference = +this, + output = relativeTime(difference, !withSuffix, this.lang()); + + if (withSuffix) { + output = this.lang().pastFuture(difference, output); + } + + return this.lang().postformat(output); + }, + + lang : moment.fn.lang + }; + + function makeDurationGetter(name) { + moment.duration.fn[name] = function () { + return this._data[name]; + }; + } + + function makeDurationAsGetter(name, factor) { + moment.duration.fn['as' + name] = function () { + return +this / factor; + }; + } + + for (i in unitMillisecondFactors) { + if (unitMillisecondFactors.hasOwnProperty(i)) { + makeDurationAsGetter(i, unitMillisecondFactors[i]); + makeDurationGetter(i.toLowerCase()); + } + } + + makeDurationAsGetter('Weeks', 6048e5); + + + /************************************ + Default Lang + ************************************/ + + + // Set default language, other languages will inherit from English. + moment.lang('en', { + ordinal : function (number) { + var b = number % 10, + output = (~~ (number % 100 / 10) === 1) ? 'th' : + (b === 1) ? 'st' : + (b === 2) ? 'nd' : + (b === 3) ? 'rd' : 'th'; + return number + output; + } + }); + + + /************************************ + Exposing Moment + ************************************/ + + + // CommonJS module is defined + if (hasModule) { + module.exports = moment; + } + /*global ender:false */ + if (typeof ender === 'undefined') { + // here, `this` means `window` in the browser, or `global` on the server + // add `moment` as a global object via a string identifier, + // for Closure Compiler "advanced" mode + this['moment'] = moment; + } + /*global define:false */ + if (typeof define === "function" && define.amd) { + define("moment", [], function () { + return moment; + }); + } +}).call(this); \ No newline at end of file diff --git a/modules/enterprise/gui/coregui/src/main/webapp/js/moment-2.0.0.min.js b/modules/enterprise/gui/coregui/src/main/webapp/js/moment-2.0.0.min.js new file mode 100644 index 0000000..4e8497a --- /dev/null +++ b/modules/enterprise/gui/coregui/src/main/webapp/js/moment-2.0.0.min.js @@ -0,0 +1,6 @@ +// moment.js +// version : 2.0.0 +// author : Tim Wood +// license : MIT +// momentjs.com +(function(e){function O(e,t){return function(n){return j(e.call(this,n),t)}}function M(e){return function(t){return this.lang().ordinal(e.call(this,t))}}function _(){}function D(e){H(this,e)}function P(e){var t=this._data={},n=e.years||e.year||e.y||0,r=e.months||e.month||e.M||0,i=e.weeks||e.week||e.w||0,s=e.days||e.day||e.d||0,o=e.hours||e.hour||e.h||0,u=e.minutes||e.minute||e.m||0,a=e.seconds||e.second||e.s||0,f=e.milliseconds||e.millisecond||e.ms||0;this._milliseconds=f+a*1e3+u*6e4+o*36e5,this._days=s+i*7,this._months=r+n*12,t.milliseconds=f%1e3,a+=B(f/1e3),t.seconds=a%60,u+=B(a/60),t.minutes=u%60,o+=B(u/60),t.hours=o%24,s+=B(o/24),s+=i*7,t.days=s%30,r+=B(s/30),t.months=r%12,n+=B(r/12),t.years=n}function H(e,t){for(var n in t)t.hasOwnProperty(n)&&(e[n]=t[n]);return e}function B(e){return e<0?Math.ceil(e):Math.floor(e)}function j(e,t){var n=e+"";while(n.length<t)n="0"+n;return n}function F(e,t,n){var r=t._milliseconds,i=t._days,s=t._months,o;r&&e._d.setTime(+e+r*n),i&&e.dat e(e.date()+i*n),s&&(o=e.date(),e.date(1).month(e.month()+s*n).date(Math.min(o,e.daysInMonth())))}function I(e){return Object.prototype.toString.call(e)==="[object Array]"}function q(e,t){var n=Math.min(e.length,t.length),r=Math.abs(e.length-t.length),i=0,s;for(s=0;s<n;s++)~~e[s]!==~~t[s]&&i++;return i+r}function R(e,t){return t.abbr=e,s[e]||(s[e]=new _),s[e].set(t),s[e]}function U(e){return e?(!s[e]&&o&&require("./lang/"+e),s[e]):t.fn._lang}function z(e){return e.match(/\[.*\]/)?e.replace(/^\[|\]$/g,""):e.replace(/\\/g,"")}function W(e){var t=e.match(a),n,r;for(n=0,r=t.length;n<r;n++)A[t[n]]?t[n]=A[t[n]]:t[n]=z(t[n]);return function(i){var s="";for(n=0;n<r;n++)s+=typeof t[n].call=="function"?t[n].call(i,e):t[n];return s}}function X(e,t){function r(t){return e.lang().longDateFormat(t)||t}var n=5;while(n--&&f.test(t))t=t.replace(f,r);return C[t]||(C[t]=W(t)),C[t](e)}function V(e){switch(e){case"DDDD":return p;case"YYYY":return d;case"YYYYY":return v;case"S":case"SS":case"SSS": case"DDD":return h;case"MMM":case"MMMM":case"dd":case"ddd":case"dddd":case"a":case"A":return m;case"X":return b;case"Z":case"ZZ":return g;case"T":return y;case"MM":case"DD":case"YY":case"HH":case"hh":case"mm":case"ss":case"M":case"D":case"d":case"H":case"h":case"m":case"s":return c;default:return new RegExp(e.replace("\\",""))}}function $(e,t,n){var r,i,s=n._a;switch(e){case"M":case"MM":s[1]=t==null?0:~~t-1;break;case"MMM":case"MMMM":r=U(n._l).monthsParse(t),r!=null?s[1]=r:n._isValid=!1;break;case"D":case"DD":case"DDD":case"DDDD":t!=null&&(s[2]=~~t);break;case"YY":s[0]=~~t+(~~t>68?1900:2e3);break;case"YYYY":case"YYYYY":s[0]=~~t;break;case"a":case"A":n._isPm=(t+"").toLowerCase()==="pm";break;case"H":case"HH":case"h":case"hh":s[3]=~~t;break;case"m":case"mm":s[4]=~~t;break;case"s":case"ss":s[5]=~~t;break;case"S":case"SS":case"SSS":s[6]=~~(("0."+t)*1e3);break;case"X":n._d=new Date(parseFloat(t)*1e3);break;case"Z":case"ZZ":n._useUTC=!0,r=(t+"").match(x),r&&r[1]&&(n._tzh=~~r[1]),r &&r[2]&&(n._tzm=~~r[2]),r&&r[0]==="+"&&(n._tzh=-n._tzh,n._tzm=-n._tzm)}t==null&&(n._isValid=!1)}function J(e){var t,n,r=[];if(e._d)return;for(t=0;t<7;t++)e._a[t]=r[t]=e._a[t]==null?t===2?1:0:e._a[t];r[3]+=e._tzh||0,r[4]+=e._tzm||0,n=new Date(0),e._useUTC?(n.setUTCFullYear(r[0],r[1],r[2]),n.setUTCHours(r[3],r[4],r[5],r[6])):(n.setFullYear(r[0],r[1],r[2]),n.setHours(r[3],r[4],r[5],r[6])),e._d=n}function K(e){var t=e._f.match(a),n=e._i,r,i;e._a=[];for(r=0;r<t.length;r++)i=(V(t[r]).exec(n)||[])[0],i&&(n=n.slice(n.indexOf(i)+i.length)),A[t[r]]&&$(t[r],i,e);e._isPm&&e._a[3]<12&&(e._a[3]+=12),e._isPm===!1&&e._a[3]===12&&(e._a[3]=0),J(e)}function Q(e){var t,n,r,i=99,s,o,u;while(e._f.length){t=H({},e),t._f=e._f.pop(),K(t),n=new D(t);if(n.isValid()){r=n;break}u=q(t._a,n.toArray()),u<i&&(i=u,r=n)}H(e,r)}function G(e){var t,n=e._i;if(w.exec(n)){e._f="YYYY-MM-DDT";for(t=0;t<4;t++)if(S[t][1].exec(n)){e._f+=S[t][0];break}g.exec(n)&&(e._f+=" Z"),K(e)}else e._d=new Date(n)}function Y(t){var n=t._i,r=u.exec(n);n===e?t._d=new Date:r?t._d=new Date(+r[1]):typeof n=="string"?G(t):I(n)?(t._a=n.slice(0),J(t)):t._d=n instanceof Date?new Date(+n):new Date(n)}function Z(e,t,n,r,i){return i.relativeTime(t||1,!!n,e,r)}function et(e,t,n){var i=r(Math.abs(e)/1e3),s=r(i/60),o=r(s/60),u=r(o/24),a=r(u/365),f=i<45&&["s",i]||s===1&&["m"]||s<45&&["mm",s]||o===1&&["h"]||o<22&&["hh",o]||u===1&&["d"]||u<=25&&["dd",u]||u<=45&&["M"]||u<345&&["MM",r(u/30)]||a===1&&["y"]||["yy",a];return f[2]=t,f[3]=e>0,f[4]=n,Z.apply({},f)}function tt(e,n,r){var i=r-n,s=r-e.day();return s>i&&(s-=7),s<i-7&&(s+=7),Math.ceil(t(e).add("d",s).dayOfYear()/7)}function nt(e){var n=e._i,r=e._f;return n===null||n===""?null:(typeof n=="string"&&(e._i=n=U().preparse(n)),t.isMoment(n)?(e=H({},n),e._d=new Date(+n._d)):r?I(r)?Q(e):K(e):Y(e),new D(e))}function rt(e,n){t.fn[e]=t.fn[e+"s"]=function(e){var t=this._isUTC?"UTC":"";return e!=null?(this._d["set"+t+n](e),this):this._d["get"+t+n]()}}function it(e){t.duration.fn [e]=function(){return this._data[e]}}function st(e,n){t.duration.fn["as"+e]=function(){return+this/n}}var t,n="2.0.0",r=Math.round,i,s={},o=typeof module!="undefined"&&module.exports,u=/^\/?Date$(\-?\d+)/i,a=/(\[[^\[]*\])|(\$?(Mo|MM?M?M?|Do|DDDo|DD?D?D?|ddd?d?|do?|w[o|w]?|W[o|W]?|YYYYY|YYYY|YY|a|A|hh?|HH?|mm?|ss?|SS?S?|X|zz?|ZZ?|.)/g,f=/(\[[^\[]*\])|(\\)?(LT|LL?L?L?|l{1,4})/g,l=/([0-9a-zA-Z\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF]+)/gi,c=/\d\d?/,h=/\d{1,3}/,p=/\d{3}/,d=/\d{1,4}/,v=/[+\-]?\d{1,6}/,m=/[0-9]*[a-z\u00A0-\u05FF\u0700-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF]+|[\u0600-\u06FF]+\s*?[\u0600-\u06FF]+/i,g=/Z|[\+\-]\d\d:?\d\d/i,y=/T/i,b=/[\+\-]?\d+(\.\d{1,3})?/,w=/^\s*\d{4}-\d\d-\d\d((T| )(\d\d(:\d\d(:\d\d(\.\d\d?\d?)?)?)?)?([\+\-]\d\d:?\d\d)?)?/,E="YYYY-MM-DDTHH:mm:ssZ",S=[["HH:mm:ss.S",/(T| )\d\d:\d\d:\d\d\.\d{1,3}/],["HH:mm:ss",/(T| )\d\d:\d\d:\d\d/],["HH:mm",/(T| )\d\d:\d\d/],["HH",/(T| )\d\d/]],x=/([\+\-]|\d\d)/gi,T="Month|Date|Hours|Minutes|Seconds|Milliseconds".split("| "),N={Milliseconds:1,Seconds:1e3,Minutes:6e4,Hours:36e5,Days:864e5,Months:2592e6,Years:31536e6},C={},k="DDD w W M D d".split(" "),L="M D H h m s w W".split(" "),A={M:function(){return this.month()+1},MMM:function(e){return this.lang().monthsShort(this,e)},MMMM:function(e){return this.lang().months(this,e)},D:function(){return this.date()},DDD:function(){return this.dayOfYear()},d:function(){return this.day()},dd:function(e){return this.lang().weekdaysMin(this,e)},ddd:function(e){return this.lang().weekdaysShort(this,e)},dddd:function(e){return this.lang().weekdays(this,e)},w:function(){return this.week()},W:function(){return this.isoWeek()},YY:function(){return j(this.year()%100,2)},YYYY:function(){return j(this.year(),4)},YYYYY:function(){return j(this.year(),5)},a:function(){return this.lang().meridiem(this.hours(),this.minutes(),!0)},A:function(){return this.lang().meridiem(this.hours(),this.minutes(),!1)},H:function(){return this.hours()},h:function(){return this.hours() %12||12},m:function(){return this.minutes()},s:function(){return this.seconds()},S:function(){return~~(this.milliseconds()/100)},SS:function(){return j(~~(this.milliseconds()/10),2)},SSS:function(){return j(this.milliseconds(),3)},Z:function(){var e=-this.zone(),t="+";return e<0&&(e=-e,t="-"),t+j(~~(e/60),2)+":"+j(~~e%60,2)},ZZ:function(){var e=-this.zone(),t="+";return e<0&&(e=-e,t="-"),t+j(~~(10*e/6),4)},X:function(){return this.unix()}};while(k.length)i=k.pop(),A[i+"o"]=M(A[i]);while(L.length)i=L.pop(),A[i+i]=O(A[i],2);A.DDDD=O(A.DDD,3),_.prototype={set:function(e){var t,n;for(n in e)t=e[n],typeof t=="function"?this[n]=t:this["_"+n]=t},_months:"January_February_March_April_May_June_July_August_September_October_November_December".split("_"),months:function(e){return this._months[e.month()]},_monthsShort:"Jan_Feb_Mar_Apr_May_Jun_Jul_Aug_Sep_Oct_Nov_Dec".split("_"),monthsShort:function(e){return this._monthsShort[e.month()]},monthsParse:function(e){var n,r,i,s;this._monthsP arse||(this._monthsParse=[]);for(n=0;n<12;n++){this._monthsParse[n]||(r=t([2e3,n]),i="^"+this.months(r,"")+"|^"+this.monthsShort(r,""),this._monthsParse[n]=new RegExp(i.replace(".",""),"i"));if(this._monthsParse[n].test(e))return n}},_weekdays:"Sunday_Monday_Tuesday_Wednesday_Thursday_Friday_Saturday".split("_"),weekdays:function(e){return this._weekdays[e.day()]},_weekdaysShort:"Sun_Mon_Tue_Wed_Thu_Fri_Sat".split("_"),weekdaysShort:function(e){return this._weekdaysShort[e.day()]},_weekdaysMin:"Su_Mo_Tu_We_Th_Fr_Sa".split("_"),weekdaysMin:function(e){return this._weekdaysMin[e.day()]},_longDateFormat:{LT:"h:mm A",L:"MM/DD/YYYY",LL:"MMMM D YYYY",LLL:"MMMM D YYYY LT",LLLL:"dddd, MMMM D YYYY LT"},longDateFormat:function(e){var t=this._longDateFormat[e];return!t&&this._longDateFormat[e.toUpperCase()]&&(t=this._longDateFormat[e.toUpperCase()].replace(/MMMM|MM|DD|dddd/g,function(e){return e.slice(1)}),this._longDateFormat[e]=t),t},meridiem:function(e,t,n){return e>11?n?"pm":"PM":n ?"am":"AM"},_calendar:{sameDay:"[Today at] LT",nextDay:"[Tomorrow at] LT",nextWeek:"dddd [at] LT",lastDay:"[Yesterday at] LT",lastWeek:"[last] dddd [at] LT",sameElse:"L"},calendar:function(e,t){var n=this._calendar[e];return typeof n=="function"?n.apply(t):n},_relativeTime:{future:"in %s",past:"%s ago",s:"a few seconds",m:"a minute",mm:"%d minutes",h:"an hour",hh:"%d hours",d:"a day",dd:"%d days",M:"a month",MM:"%d months",y:"a year",yy:"%d years"},relativeTime:function(e,t,n,r){var i=this._relativeTime[n];return typeof i=="function"?i(e,t,n,r):i.replace(/%d/i,e)},pastFuture:function(e,t){var n=this._relativeTime[e>0?"future":"past"];return typeof n=="function"?n(t):n.replace(/%s/i,t)},ordinal:function(e){return this._ordinal.replace("%d",e)},_ordinal:"%d",preparse:function(e){return e},postformat:function(e){return e},week:function(e){return tt(e,this._week.dow,this._week.doy)},_week:{dow:0,doy:6}},t=function(e,t,n){return nt({_i:e,_f:t,_l:n,_isUTC:!1})},t.utc=function(e,t, n){return nt({_useUTC:!0,_isUTC:!0,_l:n,_i:e,_f:t})},t.unix=function(e){return t(e*1e3)},t.duration=function(e,n){var r=t.isDuration(e),i=typeof e=="number",s=r?e._data:i?{}:e,o;return i&&(n?s[n]=e:s.milliseconds=e),o=new P(s),r&&e.hasOwnProperty("_lang")&&(o._lang=e._lang),o},t.version=n,t.defaultFormat=E,t.lang=function(e,n){var r;if(!e)return t.fn._lang._abbr;n?R(e,n):s[e]||U(e),t.duration.fn._lang=t.fn._lang=U(e)},t.langData=function(e){return e&&e._lang&&e._lang._abbr&&(e=e._lang._abbr),U(e)},t.isMoment=function(e){return e instanceof D},t.isDuration=function(e){return e instanceof P},t.fn=D.prototype={clone:function(){return t(this)},valueOf:function(){return+this._d},unix:function(){return Math.floor(+this._d/1e3)},toString:function(){return this.format("ddd MMM DD YYYY HH:mm:ss [GMT]ZZ")},toDate:function(){return this._d},toJSON:function(){return t.utc(this).format("YYYY-MM-DD[T]HH:mm:ss.SSS[Z]")},toArray:function(){var e=this;return[e.year(),e.month(),e.date(),e.hou rs(),e.minutes(),e.seconds(),e.milliseconds()]},isValid:function(){return this._isValid==null&&(this._a?this._isValid=!q(this._a,(this._isUTC?t.utc(this._a):t(this._a)).toArray()):this._isValid=!isNaN(this._d.getTime())),!!this._isValid},utc:function(){return this._isUTC=!0,this},local:function(){return this._isUTC=!1,this},format:function(e){var n=X(this,e||t.defaultFormat);return this.lang().postformat(n)},add:function(e,n){var r;return typeof e=="string"?r=t.duration(+n,e):r=t.duration(e,n),F(this,r,1),this},subtract:function(e,n){var r;return typeof e=="string"?r=t.duration(+n,e):r=t.duration(e,n),F(this,r,-1),this},diff:function(e,n,r){var i=this._isUTC?t(e).utc():t(e).local(),s=(this.zone()-i.zone())*6e4,o,u;return n&&(n=n.replace(/s$/,"")),n==="year"||n==="month"?(o=(this.daysInMonth()+i.daysInMonth())*432e5,u=(this.year()-i.year())*12+(this.month()-i.month()),u+=(this-t(this).startOf("month")-(i-t(i).startOf("month")))/o,n==="year"&&(u/=12)):(o=this-i-s,u=n==="second "?o/1e3:n==="minute"?o/6e4:n==="hour"?o/36e5:n==="day"?o/864e5:n==="week"?o/6048e5:o),r?u:B(u)},from:function(e,n){return t.duration(this.diff(e)).lang(this.lang()._abbr).humanize(!n)},fromNow:function(e){return this.from(t(),e)},calendar:function(){var e=this.diff(t().startOf("day"),"days",!0),n=e<-6?"sameElse":e<-1?"lastWeek":e<0?"lastDay":e<1?"sameDay":e<2?"nextDay":e<7?"nextWeek":"sameElse";return this.format(this.lang().calendar(n,this))},isLeapYear:function(){var e=this.year();return e%4===0&&e%100!==0||e%400===0},isDST:function(){return this.zone()<t([this.year()]).zone()||this.zone()<t([this.year(),5]).zone()},day:function(e){var t=this._isUTC?this._d.getUTCDay():this._d.getDay();return e==null?t:this.add({d:e-t})},startOf:function(e){e=e.replace(/s$/,"");switch(e){case"year":this.month(0);case"month":this.date(1);case"week":case"day":this.hours(0);case"hour":this.minutes(0);case"minute":this.seconds(0);case"second":this.milliseconds(0)}return e==="week"&&this.day(0) ,this},endOf:function(e){return this.startOf(e).add(e.replace(/s?$/,"s"),1).subtract("ms",1)},isAfter:function(e,n){return n=typeof n!="undefined"?n:"millisecond",+this.clone().startOf(n)>+t(e).startOf(n)},isBefore:function(e,n){return n=typeof n!="undefined"?n:"millisecond",+this.clone().startOf(n)<+t(e).startOf(n)},isSame:function(e,n){return n=typeof n!="undefined"?n:"millisecond",+this.clone().startOf(n)===+t(e).startOf(n)},zone:function(){return this._isUTC?0:this._d.getTimezoneOffset()},daysInMonth:function(){return t.utc([this.year(),this.month()+1,0]).date()},dayOfYear:function(e){var n=r((t(this).startOf("day")-t(this).startOf("year"))/864e5)+1;return e==null?n:this.add("d",e-n)},isoWeek:function(e){var t=tt(this,1,4);return e==null?t:this.add("d",(e-t)*7)},week:function(e){var t=this.lang().week(this);return e==null?t:this.add("d",(e-t)*7)},lang:function(t){return t===e?this._lang:(this._lang=U(t),this)}};for(i=0;i<T.length;i++)rt(T[i].toLowerCase().replace(/s$/,"" ),T[i]);rt("year","FullYear"),t.fn.days=t.fn.day,t.fn.weeks=t.fn.week,t.fn.isoWeeks=t.fn.isoWeek,t.duration.fn=P.prototype={weeks:function(){return B(this.days()/7)},valueOf:function(){return this._milliseconds+this._days*864e5+this._months*2592e6},humanize:function(e){var t=+this,n=et(t,!e,this.lang());return e&&(n=this.lang().pastFuture(t,n)),this.lang().postformat(n)},lang:t.fn.lang};for(i in N)N.hasOwnProperty(i)&&(st(i,N[i]),it(i.toLowerCase()));st("Weeks",6048e5),t.lang("en",{ordinal:function(e){var t=e%10,n=~~(e%100/10)===1?"th":t===1?"st":t===2?"nd":t===3?"rd":"th";return e+n}}),o&&(module.exports=t),typeof ender=="undefined"&&(this.moment=t),typeof define=="function"&&define.amd&&define("moment",[],function(){return t})}).call(this); \ No newline at end of file diff --git a/modules/enterprise/gui/coregui/src/main/webapp/js/moment.js b/modules/enterprise/gui/coregui/src/main/webapp/js/moment.js deleted file mode 100644 index 30a0a6c..0000000 --- a/modules/enterprise/gui/coregui/src/main/webapp/js/moment.js +++ /dev/null @@ -1,1400 +0,0 @@ -// moment.js -// version : 2.0.0 -// author : Tim Wood -// license : MIT -// momentjs.com - -(function (undefined) { - - /************************************ - Constants - ************************************/ - - var moment, - VERSION = "2.0.0", - round = Math.round, i, - // internal storage for language config files - languages = {}, - - // check for nodeJS - hasModule = (typeof module !== 'undefined' && module.exports), - - // ASP.NET json date format regex - aspNetJsonRegex = /^\/?Date$(\-?\d+)/i, - - // format tokens - formattingTokens = /(\[[^\[]*\])|(\$?(Mo|MM?M?M?|Do|DDDo|DD?D?D?|ddd?d?|do?|w[o|w]?|W[o|W]?|YYYYY|YYYY|YY|a|A|hh?|HH?|mm?|ss?|SS?S?|X|zz?|ZZ?|.)/g, - localFormattingTokens = /(\[[^\[]*\])|(\\)?(LT|LL?L?L?|l{1,4})/g, - - // parsing tokens - parseMultipleFormatChunker = /([0-9a-zA-Z\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF]+)/gi, - - // parsing token regexes - parseTokenOneOrTwoDigits = /\d\d?/, // 0 - 99 - parseTokenOneToThreeDigits = /\d{1,3}/, // 0 - 999 - parseTokenThreeDigits = /\d{3}/, // 000 - 999 - parseTokenFourDigits = /\d{1,4}/, // 0 - 9999 - parseTokenSixDigits = /[+\-]?\d{1,6}/, // -999,999 - 999,999 - parseTokenWord = /[0-9]*[a-z\u00A0-\u05FF\u0700-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF]+|[\u0600-\u06FF]+\s*?[\u0600-\u06FF]+/i, // any word (or two) characters or numbers including two word month in arabic. - parseTokenTimezone = /Z|[\+\-]\d\d:?\d\d/i, // +00:00 -00:00 +0000 -0000 or Z - parseTokenT = /T/i, // T (ISO seperator) - parseTokenTimestampMs = /[\+\-]?\d+(\.\d{1,3})?/, // 123456789 123456789.123 - - // preliminary iso regex - // 0000-00-00 + T + 00 or 00:00 or 00:00:00 or 00:00:00.000 + +00:00 or +0000 - isoRegex = /^\s*\d{4}-\d\d-\d\d((T| )(\d\d(:\d\d(:\d\d(\.\d\d?\d?)?)?)?)?([\+\-]\d\d:?\d\d)?)?/, - isoFormat = 'YYYY-MM-DDTHH:mm:ssZ', - - // iso time formats and regexes - isoTimes = [ - ['HH:mm:ss.S', /(T| )\d\d:\d\d:\d\d\.\d{1,3}/], - ['HH:mm:ss', /(T| )\d\d:\d\d:\d\d/], - ['HH:mm', /(T| )\d\d:\d\d/], - ['HH', /(T| )\d\d/] - ], - - // timezone chunker "+10:00" > ["10", "00"] or "-1530" > ["-15", "30"] - parseTimezoneChunker = /([\+\-]|\d\d)/gi, - - // getter and setter names - proxyGettersAndSetters = 'Month|Date|Hours|Minutes|Seconds|Milliseconds'.split('|'), - unitMillisecondFactors = { - 'Milliseconds' : 1, - 'Seconds' : 1e3, - 'Minutes' : 6e4, - 'Hours' : 36e5, - 'Days' : 864e5, - 'Months' : 2592e6, - 'Years' : 31536e6 - }, - - // format function strings - formatFunctions = {}, - - // tokens to ordinalize and pad - ordinalizeTokens = 'DDD w W M D d'.split(' '), - paddedTokens = 'M D H h m s w W'.split(' '), - - formatTokenFunctions = { - M : function () { - return this.month() + 1; - }, - MMM : function (format) { - return this.lang().monthsShort(this, format); - }, - MMMM : function (format) { - return this.lang().months(this, format); - }, - D : function () { - return this.date(); - }, - DDD : function () { - return this.dayOfYear(); - }, - d : function () { - return this.day(); - }, - dd : function (format) { - return this.lang().weekdaysMin(this, format); - }, - ddd : function (format) { - return this.lang().weekdaysShort(this, format); - }, - dddd : function (format) { - return this.lang().weekdays(this, format); - }, - w : function () { - return this.week(); - }, - W : function () { - return this.isoWeek(); - }, - YY : function () { - return leftZeroFill(this.year() % 100, 2); - }, - YYYY : function () { - return leftZeroFill(this.year(), 4); - }, - YYYYY : function () { - return leftZeroFill(this.year(), 5); - }, - a : function () { - return this.lang().meridiem(this.hours(), this.minutes(), true); - }, - A : function () { - return this.lang().meridiem(this.hours(), this.minutes(), false); - }, - H : function () { - return this.hours(); - }, - h : function () { - return this.hours() % 12 || 12; - }, - m : function () { - return this.minutes(); - }, - s : function () { - return this.seconds(); - }, - S : function () { - return ~~(this.milliseconds() / 100); - }, - SS : function () { - return leftZeroFill(~~(this.milliseconds() / 10), 2); - }, - SSS : function () { - return leftZeroFill(this.milliseconds(), 3); - }, - Z : function () { - var a = -this.zone(), - b = "+"; - if (a < 0) { - a = -a; - b = "-"; - } - return b + leftZeroFill(~~(a / 60), 2) + ":" + leftZeroFill(~~a % 60, 2); - }, - ZZ : function () { - var a = -this.zone(), - b = "+"; - if (a < 0) { - a = -a; - b = "-"; - } - return b + leftZeroFill(~~(10 * a / 6), 4); - }, - X : function () { - return this.unix(); - } - }; - - function padToken(func, count) { - return function (a) { - return leftZeroFill(func.call(this, a), count); - }; - } - function ordinalizeToken(func) { - return function (a) { - return this.lang().ordinal(func.call(this, a)); - }; - } - - while (ordinalizeTokens.length) { - i = ordinalizeTokens.pop(); - formatTokenFunctions[i + 'o'] = ordinalizeToken(formatTokenFunctions[i]); - } - while (paddedTokens.length) { - i = paddedTokens.pop(); - formatTokenFunctions[i + i] = padToken(formatTokenFunctions[i], 2); - } - formatTokenFunctions.DDDD = padToken(formatTokenFunctions.DDD, 3); - - - /************************************ - Constructors - ************************************/ - - function Language() { - - } - - // Moment prototype object - function Moment(config) { - extend(this, config); - } - - // Duration Constructor - function Duration(duration) { - var data = this._data = {}, - years = duration.years || duration.year || duration.y || 0, - months = duration.months || duration.month || duration.M || 0, - weeks = duration.weeks || duration.week || duration.w || 0, - days = duration.days || duration.day || duration.d || 0, - hours = duration.hours || duration.hour || duration.h || 0, - minutes = duration.minutes || duration.minute || duration.m || 0, - seconds = duration.seconds || duration.second || duration.s || 0, - milliseconds = duration.milliseconds || duration.millisecond || duration.ms || 0; - - // representation for dateAddRemove - this._milliseconds = milliseconds + - seconds * 1e3 + // 1000 - minutes * 6e4 + // 1000 * 60 - hours * 36e5; // 1000 * 60 * 60 - // Because of dateAddRemove treats 24 hours as different from a - // day when working around DST, we need to store them separately - this._days = days + - weeks * 7; - // It is impossible translate months into days without knowing - // which months you are are talking about, so we have to store - // it separately. - this._months = months + - years * 12; - - // The following code bubbles up values, see the tests for - // examples of what that means. - data.milliseconds = milliseconds % 1000; - seconds += absRound(milliseconds / 1000); - - data.seconds = seconds % 60; - minutes += absRound(seconds / 60); - - data.minutes = minutes % 60; - hours += absRound(minutes / 60); - - data.hours = hours % 24; - days += absRound(hours / 24); - - days += weeks * 7; - data.days = days % 30; - - months += absRound(days / 30); - - data.months = months % 12; - years += absRound(months / 12); - - data.years = years; - } - - - /************************************ - Helpers - ************************************/ - - - function extend(a, b) { - for (var i in b) { - if (b.hasOwnProperty(i)) { - a[i] = b[i]; - } - } - return a; - } - - function absRound(number) { - if (number < 0) { - return Math.ceil(number); - } else { - return Math.floor(number); - } - } - - // left zero fill a number - // see http://jsperf.com/left-zero-filling for performance comparison - function leftZeroFill(number, targetLength) { - var output = number + ''; - while (output.length < targetLength) { - output = '0' + output; - } - return output; - } - - // helper function for _.addTime and _.subtractTime - function addOrSubtractDurationFromMoment(mom, duration, isAdding) { - var ms = duration._milliseconds, - d = duration._days, - M = duration._months, - currentDate; - - if (ms) { - mom._d.setTime(+mom + ms * isAdding); - } - if (d) { - mom.date(mom.date() + d * isAdding); - } - if (M) { - currentDate = mom.date(); - mom.date(1) - .month(mom.month() + M * isAdding) - .date(Math.min(currentDate, mom.daysInMonth())); - } - } - - // check if is an array - function isArray(input) { - return Object.prototype.toString.call(input) === '[object Array]'; - } - - // compare two arrays, return the number of differences - function compareArrays(array1, array2) { - var len = Math.min(array1.length, array2.length), - lengthDiff = Math.abs(array1.length - array2.length), - diffs = 0, - i; - for (i = 0; i < len; i++) { - if (~~array1[i] !== ~~array2[i]) { - diffs++; - } - } - return diffs + lengthDiff; - } - - - /************************************ - Languages - ************************************/ - - - Language.prototype = { - set : function (config) { - var prop, i; - for (i in config) { - prop = config[i]; - if (typeof prop === 'function') { - this[i] = prop; - } else { - this['_' + i] = prop; - } - } - }, - - _months : "January_February_March_April_May_June_July_August_September_October_November_December".split("_"), - months : function (m) { - return this._months[m.month()]; - }, - - _monthsShort : "Jan_Feb_Mar_Apr_May_Jun_Jul_Aug_Sep_Oct_Nov_Dec".split("_"), - monthsShort : function (m) { - return this._monthsShort[m.month()]; - }, - - monthsParse : function (monthName) { - var i, mom, regex, output; - - if (!this._monthsParse) { - this._monthsParse = []; - } - - for (i = 0; i < 12; i++) { - // make the regex if we don't have it already - if (!this._monthsParse[i]) { - mom = moment([2000, i]); - regex = '^' + this.months(mom, '') + '|^' + this.monthsShort(mom, ''); - this._monthsParse[i] = new RegExp(regex.replace('.', ''), 'i'); - } - // test the regex - if (this._monthsParse[i].test(monthName)) { - return i; - } - } - }, - - _weekdays : "Sunday_Monday_Tuesday_Wednesday_Thursday_Friday_Saturday".split("_"), - weekdays : function (m) { - return this._weekdays[m.day()]; - }, - - _weekdaysShort : "Sun_Mon_Tue_Wed_Thu_Fri_Sat".split("_"), - weekdaysShort : function (m) { - return this._weekdaysShort[m.day()]; - }, - - _weekdaysMin : "Su_Mo_Tu_We_Th_Fr_Sa".split("_"), - weekdaysMin : function (m) { - return this._weekdaysMin[m.day()]; - }, - - _longDateFormat : { - LT : "h:mm A", - L : "MM/DD/YYYY", - LL : "MMMM D YYYY", - LLL : "MMMM D YYYY LT", - LLLL : "dddd, MMMM D YYYY LT" - }, - longDateFormat : function (key) { - var output = this._longDateFormat[key]; - if (!output && this._longDateFormat[key.toUpperCase()]) { - output = this._longDateFormat[key.toUpperCase()].replace(/MMMM|MM|DD|dddd/g, function (val) { - return val.slice(1); - }); - this._longDateFormat[key] = output; - } - return output; - }, - - meridiem : function (hours, minutes, isLower) { - if (hours > 11) { - return isLower ? 'pm' : 'PM'; - } else { - return isLower ? 'am' : 'AM'; - } - }, - - _calendar : { - sameDay : '[Today at] LT', - nextDay : '[Tomorrow at] LT', - nextWeek : 'dddd [at] LT', - lastDay : '[Yesterday at] LT', - lastWeek : '[last] dddd [at] LT', - sameElse : 'L' - }, - calendar : function (key, mom) { - var output = this._calendar[key]; - return typeof output === 'function' ? output.apply(mom) : output; - }, - - _relativeTime : { - future : "in %s", - past : "%s ago", - s : "a few seconds", - m : "a minute", - mm : "%d minutes", - h : "an hour", - hh : "%d hours", - d : "a day", - dd : "%d days", - M : "a month", - MM : "%d months", - y : "a year", - yy : "%d years" - }, - relativeTime : function (number, withoutSuffix, string, isFuture) { - var output = this._relativeTime[string]; - return (typeof output === 'function') ? - output(number, withoutSuffix, string, isFuture) : - output.replace(/%d/i, number); - }, - pastFuture : function (diff, output) { - var format = this._relativeTime[diff > 0 ? 'future' : 'past']; - return typeof format === 'function' ? format(output) : format.replace(/%s/i, output); - }, - - ordinal : function (number) { - return this._ordinal.replace("%d", number); - }, - _ordinal : "%d", - - preparse : function (string) { - return string; - }, - - postformat : function (string) { - return string; - }, - - week : function (mom) { - return weekOfYear(mom, this._week.dow, this._week.doy); - }, - _week : { - dow : 0, // Sunday is the first day of the week. - doy : 6 // The week that contains Jan 1st is the first week of the year. - } - }; - - // Loads a language definition into the `languages` cache. The function - // takes a key and optionally values. If not in the browser and no values - // are provided, it will load the language file module. As a convenience, - // this function also returns the language values. - function loadLang(key, values) { - values.abbr = key; - if (!languages[key]) { - languages[key] = new Language(); - } - languages[key].set(values); - return languages[key]; - } - - // Determines which language definition to use and returns it. - // - // With no parameters, it will return the global language. If you - // pass in a language key, such as 'en', it will return the - // definition for 'en', so long as 'en' has already been loaded using - // moment.lang. - function getLangDefinition(key) { - if (!key) { - return moment.fn._lang; - } - if (!languages[key] && hasModule) { - require('./lang/' + key); - } - return languages[key]; - } - - - /************************************ - Formatting - ************************************/ - - - function removeFormattingTokens(input) { - if (input.match(/\[.*\]/)) { - return input.replace(/^\[|\]$/g, ""); - } - return input.replace(/\\/g, ""); - } - - function makeFormatFunction(format) { - var array = format.match(formattingTokens), i, length; - - for (i = 0, length = array.length; i < length; i++) { - if (formatTokenFunctions[array[i]]) { - array[i] = formatTokenFunctions[array[i]]; - } else { - array[i] = removeFormattingTokens(array[i]); - } - } - - return function (mom) { - var output = ""; - for (i = 0; i < length; i++) { - output += typeof array[i].call === 'function' ? array[i].call(mom, format) : array[i]; - } - return output; - }; - } - - // format date using native date object - function formatMoment(m, format) { - var i = 5; - - function replaceLongDateFormatTokens(input) { - return m.lang().longDateFormat(input) || input; - } - - while (i-- && localFormattingTokens.test(format)) { - format = format.replace(localFormattingTokens, replaceLongDateFormatTokens); - } - - if (!formatFunctions[format]) { - formatFunctions[format] = makeFormatFunction(format); - } - - return formatFunctions[format](m); - } - - - /************************************ - Parsing - ************************************/ - - - // get the regex to find the next token - function getParseRegexForToken(token) { - switch (token) { - case 'DDDD': - return parseTokenThreeDigits; - case 'YYYY': - return parseTokenFourDigits; - case 'YYYYY': - return parseTokenSixDigits; - case 'S': - case 'SS': - case 'SSS': - case 'DDD': - return parseTokenOneToThreeDigits; - case 'MMM': - case 'MMMM': - case 'dd': - case 'ddd': - case 'dddd': - case 'a': - case 'A': - return parseTokenWord; - case 'X': - return parseTokenTimestampMs; - case 'Z': - case 'ZZ': - return parseTokenTimezone; - case 'T': - return parseTokenT; - case 'MM': - case 'DD': - case 'YY': - case 'HH': - case 'hh': - case 'mm': - case 'ss': - case 'M': - case 'D': - case 'd': - case 'H': - case 'h': - case 'm': - case 's': - return parseTokenOneOrTwoDigits; - default : - return new RegExp(token.replace('\\', '')); - } - } - - // function to convert string input to date - function addTimeToArrayFromToken(token, input, config) { - var a, b, - datePartArray = config._a; - - switch (token) { - // MONTH - case 'M' : // fall through to MM - case 'MM' : - datePartArray[1] = (input == null) ? 0 : ~~input - 1; - break; - case 'MMM' : // fall through to MMMM - case 'MMMM' : - a = getLangDefinition(config._l).monthsParse(input); - // if we didn't find a month name, mark the date as invalid. - if (a != null) { - datePartArray[1] = a; - } else { - config._isValid = false; - } - break; - // DAY OF MONTH - case 'D' : // fall through to DDDD - case 'DD' : // fall through to DDDD - case 'DDD' : // fall through to DDDD - case 'DDDD' : - if (input != null) { - datePartArray[2] = ~~input; - } - break; - // YEAR - case 'YY' : - datePartArray[0] = ~~input + (~~input > 68 ? 1900 : 2000); - break; - case 'YYYY' : - case 'YYYYY' : - datePartArray[0] = ~~input; - break; - // AM / PM - case 'a' : // fall through to A - case 'A' : - config._isPm = ((input + '').toLowerCase() === 'pm'); - break; - // 24 HOUR - case 'H' : // fall through to hh - case 'HH' : // fall through to hh - case 'h' : // fall through to hh - case 'hh' : - datePartArray[3] = ~~input; - break; - // MINUTE - case 'm' : // fall through to mm - case 'mm' : - datePartArray[4] = ~~input; - break; - // SECOND - case 's' : // fall through to ss - case 'ss' : - datePartArray[5] = ~~input; - break; - // MILLISECOND - case 'S' : - case 'SS' : - case 'SSS' : - datePartArray[6] = ~~ (('0.' + input) * 1000); - break; - // UNIX TIMESTAMP WITH MS - case 'X': - config._d = new Date(parseFloat(input) * 1000); - break; - // TIMEZONE - case 'Z' : // fall through to ZZ - case 'ZZ' : - config._useUTC = true; - a = (input + '').match(parseTimezoneChunker); - if (a && a[1]) { - config._tzh = ~~a[1]; - } - if (a && a[2]) { - config._tzm = ~~a[2]; - } - // reverse offsets - if (a && a[0] === '+') { - config._tzh = -config._tzh; - config._tzm = -config._tzm; - } - break; - } - - // if the input is null, the date is not valid - if (input == null) { - config._isValid = false; - } - } - - // convert an array to a date. - // the array should mirror the parameters below - // note: all values past the year are optional and will default to the lowest possible value. - // [year, month, day , hour, minute, second, millisecond] - function dateFromArray(config) { - var i, date, input = []; - - if (config._d) { - return; - } - - for (i = 0; i < 7; i++) { - config._a[i] = input[i] = (config._a[i] == null) ? (i === 2 ? 1 : 0) : config._a[i]; - } - - // add the offsets to the time to be parsed so that we can have a clean array for checking isValid - input[3] += config._tzh || 0; - input[4] += config._tzm || 0; - - date = new Date(0); - - if (config._useUTC) { - date.setUTCFullYear(input[0], input[1], input[2]); - date.setUTCHours(input[3], input[4], input[5], input[6]); - } else { - date.setFullYear(input[0], input[1], input[2]); - date.setHours(input[3], input[4], input[5], input[6]); - } - - config._d = date; - } - - // date from string and format string - function makeDateFromStringAndFormat(config) { - // This array is used to make a Date, either with `new Date` or `Date.UTC` - var tokens = config._f.match(formattingTokens), - string = config._i, - i, parsedInput; - - config._a = []; - - for (i = 0; i < tokens.length; i++) { - parsedInput = (getParseRegexForToken(tokens[i]).exec(string) || [])[0]; - if (parsedInput) { - string = string.slice(string.indexOf(parsedInput) + parsedInput.length); - } - // don't parse if its not a known token - if (formatTokenFunctions[tokens[i]]) { - addTimeToArrayFromToken(tokens[i], parsedInput, config); - } - } - // handle am pm - if (config._isPm && config._a[3] < 12) { - config._a[3] += 12; - } - // if is 12 am, change hours to 0 - if (config._isPm === false && config._a[3] === 12) { - config._a[3] = 0; - } - // return - dateFromArray(config); - } - - // date from string and array of format strings - function makeDateFromStringAndArray(config) { - var tempConfig, - tempMoment, - bestMoment, - - scoreToBeat = 99, - i, - currentDate, - currentScore; - - while (config._f.length) { - tempConfig = extend({}, config); - tempConfig._f = config._f.pop(); - makeDateFromStringAndFormat(tempConfig); - tempMoment = new Moment(tempConfig); - - if (tempMoment.isValid()) { - bestMoment = tempMoment; - break; - } - - currentScore = compareArrays(tempConfig._a, tempMoment.toArray()); - - if (currentScore < scoreToBeat) { - scoreToBeat = currentScore; - bestMoment = tempMoment; - } - } - - extend(config, bestMoment); - } - - // date from iso format - function makeDateFromString(config) { - var i, - string = config._i; - if (isoRegex.exec(string)) { - config._f = 'YYYY-MM-DDT'; - for (i = 0; i < 4; i++) { - if (isoTimes[i][1].exec(string)) { - config._f += isoTimes[i][0]; - break; - } - } - if (parseTokenTimezone.exec(string)) { - config._f += " Z"; - } - makeDateFromStringAndFormat(config); - } else { - config._d = new Date(string); - } - } - - function makeDateFromInput(config) { - var input = config._i, - matched = aspNetJsonRegex.exec(input); - - if (input === undefined) { - config._d = new Date(); - } else if (matched) { - config._d = new Date(+matched[1]); - } else if (typeof input === 'string') { - makeDateFromString(config); - } else if (isArray(input)) { - config._a = input.slice(0); - dateFromArray(config); - } else { - config._d = input instanceof Date ? new Date(+input) : new Date(input); - } - } - - - /************************************ - Relative Time - ************************************/ - - - // helper function for moment.fn.from, moment.fn.fromNow, and moment.duration.fn.humanize - function substituteTimeAgo(string, number, withoutSuffix, isFuture, lang) { - return lang.relativeTime(number || 1, !!withoutSuffix, string, isFuture); - } - - function relativeTime(milliseconds, withoutSuffix, lang) { - var seconds = round(Math.abs(milliseconds) / 1000), - minutes = round(seconds / 60), - hours = round(minutes / 60), - days = round(hours / 24), - years = round(days / 365), - args = seconds < 45 && ['s', seconds] || - minutes === 1 && ['m'] || - minutes < 45 && ['mm', minutes] || - hours === 1 && ['h'] || - hours < 22 && ['hh', hours] || - days === 1 && ['d'] || - days <= 25 && ['dd', days] || - days <= 45 && ['M'] || - days < 345 && ['MM', round(days / 30)] || - years === 1 && ['y'] || ['yy', years]; - args[2] = withoutSuffix; - args[3] = milliseconds > 0; - args[4] = lang; - return substituteTimeAgo.apply({}, args); - } - - - /************************************ - Week of Year - ************************************/ - - - // firstDayOfWeek 0 = sun, 6 = sat - // the day of the week that starts the week - // (usually sunday or monday) - // firstDayOfWeekOfYear 0 = sun, 6 = sat - // the first week is the week that contains the first - // of this day of the week - // (eg. ISO weeks use thursday (4)) - function weekOfYear(mom, firstDayOfWeek, firstDayOfWeekOfYear) { - var end = firstDayOfWeekOfYear - firstDayOfWeek, - daysToDayOfWeek = firstDayOfWeekOfYear - mom.day(); - - - if (daysToDayOfWeek > end) { - daysToDayOfWeek -= 7; - } - - if (daysToDayOfWeek < end - 7) { - daysToDayOfWeek += 7; - } - - return Math.ceil(moment(mom).add('d', daysToDayOfWeek).dayOfYear() / 7); - } - - - /************************************ - Top Level Functions - ************************************/ - - function makeMoment(config) { - var input = config._i, - format = config._f; - - if (input === null || input === '') { - return null; - } - - if (typeof input === 'string') { - config._i = input = getLangDefinition().preparse(input); - } - - if (moment.isMoment(input)) { - config = extend({}, input); - config._d = new Date(+input._d); - } else if (format) { - if (isArray(format)) { - makeDateFromStringAndArray(config); - } else { - makeDateFromStringAndFormat(config); - } - } else { - makeDateFromInput(config); - } - - return new Moment(config); - } - - moment = function (input, format, lang) { - return makeMoment({ - _i : input, - _f : format, - _l : lang, - _isUTC : false - }); - }; - - // creating with utc - moment.utc = function (input, format, lang) { - return makeMoment({ - _useUTC : true, - _isUTC : true, - _l : lang, - _i : input, - _f : format - }); - }; - - // creating with unix timestamp (in seconds) - moment.unix = function (input) { - return moment(input * 1000); - }; - - // duration - moment.duration = function (input, key) { - var isDuration = moment.isDuration(input), - isNumber = (typeof input === 'number'), - duration = (isDuration ? input._data : (isNumber ? {} : input)), - ret; - - if (isNumber) { - if (key) { - duration[key] = input; - } else { - duration.milliseconds = input; - } - } - - ret = new Duration(duration); - - if (isDuration && input.hasOwnProperty('_lang')) { - ret._lang = input._lang; - } - - return ret; - }; - - // version number - moment.version = VERSION; - - // default format - moment.defaultFormat = isoFormat; - - // This function will load languages and then set the global language. If - // no arguments are passed in, it will simply return the current global - // language key. - moment.lang = function (key, values) { - var i; - - if (!key) { - return moment.fn._lang._abbr; - } - if (values) { - loadLang(key, values); - } else if (!languages[key]) { - getLangDefinition(key); - } - moment.duration.fn._lang = moment.fn._lang = getLangDefinition(key); - }; - - // returns language data - moment.langData = function (key) { - if (key && key._lang && key._lang._abbr) { - key = key._lang._abbr; - } - return getLangDefinition(key); - }; - - // compare moment object - moment.isMoment = function (obj) { - return obj instanceof Moment; - }; - - // for typechecking Duration objects - moment.isDuration = function (obj) { - return obj instanceof Duration; - }; - - - /************************************ - Moment Prototype - ************************************/ - - - moment.fn = Moment.prototype = { - - clone : function () { - return moment(this); - }, - - valueOf : function () { - return +this._d; - }, - - unix : function () { - return Math.floor(+this._d / 1000); - }, - - toString : function () { - return this.format("ddd MMM DD YYYY HH:mm:ss [GMT]ZZ"); - }, - - toDate : function () { - return this._d; - }, - - toJSON : function () { - return moment.utc(this).format('YYYY-MM-DD[T]HH:mm:ss.SSS[Z]'); - }, - - toArray : function () { - var m = this; - return [ - m.year(), - m.month(), - m.date(), - m.hours(), - m.minutes(), - m.seconds(), - m.milliseconds() - ]; - }, - - isValid : function () { - if (this._isValid == null) { - if (this._a) { - this._isValid = !compareArrays(this._a, (this._isUTC ? moment.utc(this._a) : moment(this._a)).toArray()); - } else { - this._isValid = !isNaN(this._d.getTime()); - } - } - return !!this._isValid; - }, - - utc : function () { - this._isUTC = true; - return this; - }, - - local : function () { - this._isUTC = false; - return this; - }, - - format : function (inputString) { - var output = formatMoment(this, inputString || moment.defaultFormat); - return this.lang().postformat(output); - }, - - add : function (input, val) { - var dur; - // switch args to support add('s', 1) and add(1, 's') - if (typeof input === 'string') { - dur = moment.duration(+val, input); - } else { - dur = moment.duration(input, val); - } - addOrSubtractDurationFromMoment(this, dur, 1); - return this; - }, - - subtract : function (input, val) { - var dur; - // switch args to support subtract('s', 1) and subtract(1, 's') - if (typeof input === 'string') { - dur = moment.duration(+val, input); - } else { - dur = moment.duration(input, val); - } - addOrSubtractDurationFromMoment(this, dur, -1); - return this; - }, - - diff : function (input, units, asFloat) { - var that = this._isUTC ? moment(input).utc() : moment(input).local(), - zoneDiff = (this.zone() - that.zone()) * 6e4, - diff, output; - - if (units) { - // standardize on singular form - units = units.replace(/s$/, ''); - } - - if (units === 'year' || units === 'month') { - diff = (this.daysInMonth() + that.daysInMonth()) * 432e5; // 24 * 60 * 60 * 1000 / 2 - output = ((this.year() - that.year()) * 12) + (this.month() - that.month()); - output += ((this - moment(this).startOf('month')) - (that - moment(that).startOf('month'))) / diff; - if (units === 'year') { - output = output / 12; - } - } else { - diff = (this - that) - zoneDiff; - output = units === 'second' ? diff / 1e3 : // 1000 - units === 'minute' ? diff / 6e4 : // 1000 * 60 - units === 'hour' ? diff / 36e5 : // 1000 * 60 * 60 - units === 'day' ? diff / 864e5 : // 1000 * 60 * 60 * 24 - units === 'week' ? diff / 6048e5 : // 1000 * 60 * 60 * 24 * 7 - diff; - } - return asFloat ? output : absRound(output); - }, - - from : function (time, withoutSuffix) { - return moment.duration(this.diff(time)).lang(this.lang()._abbr).humanize(!withoutSuffix); - }, - - fromNow : function (withoutSuffix) { - return this.from(moment(), withoutSuffix); - }, - - calendar : function () { - var diff = this.diff(moment().startOf('day'), 'days', true), - format = diff < -6 ? 'sameElse' : - diff < -1 ? 'lastWeek' : - diff < 0 ? 'lastDay' : - diff < 1 ? 'sameDay' : - diff < 2 ? 'nextDay' : - diff < 7 ? 'nextWeek' : 'sameElse'; - return this.format(this.lang().calendar(format, this)); - }, - - isLeapYear : function () { - var year = this.year(); - return (year % 4 === 0 && year % 100 !== 0) || year % 400 === 0; - }, - - isDST : function () { - return (this.zone() < moment([this.year()]).zone() || - this.zone() < moment([this.year(), 5]).zone()); - }, - - day : function (input) { - var day = this._isUTC ? this._d.getUTCDay() : this._d.getDay(); - return input == null ? day : - this.add({ d : input - day }); - }, - - startOf: function (units) { - units = units.replace(/s$/, ''); - // the following switch intentionally omits break keywords - // to utilize falling through the cases. - switch (units) { - case 'year': - this.month(0); - /* falls through */ - case 'month': - this.date(1); - /* falls through */ - case 'week': - case 'day': - this.hours(0); - /* falls through */ - case 'hour': - this.minutes(0); - /* falls through */ - case 'minute': - this.seconds(0); - /* falls through */ - case 'second': - this.milliseconds(0); - /* falls through */ - } - - // weeks are a special case - if (units === 'week') { - this.day(0); - } - - return this; - }, - - endOf: function (units) { - return this.startOf(units).add(units.replace(/s?$/, 's'), 1).subtract('ms', 1); - }, - - isAfter: function (input, units) { - units = typeof units !== 'undefined' ? units : 'millisecond'; - return +this.clone().startOf(units) > +moment(input).startOf(units); - }, - - isBefore: function (input, units) { - units = typeof units !== 'undefined' ? units : 'millisecond'; - return +this.clone().startOf(units) < +moment(input).startOf(units); - }, - - isSame: function (input, units) { - units = typeof units !== 'undefined' ? units : 'millisecond'; - return +this.clone().startOf(units) === +moment(input).startOf(units); - }, - - zone : function () { - return this._isUTC ? 0 : this._d.getTimezoneOffset(); - }, - - daysInMonth : function () { - return moment.utc([this.year(), this.month() + 1, 0]).date(); - }, - - dayOfYear : function (input) { - var dayOfYear = round((moment(this).startOf('day') - moment(this).startOf('year')) / 864e5) + 1; - return input == null ? dayOfYear : this.add("d", (input - dayOfYear)); - }, - - isoWeek : function (input) { - var week = weekOfYear(this, 1, 4); - return input == null ? week : this.add("d", (input - week) * 7); - }, - - week : function (input) { - var week = this.lang().week(this); - return input == null ? week : this.add("d", (input - week) * 7); - }, - - // If passed a language key, it will set the language for this - // instance. Otherwise, it will return the language configuration - // variables for this instance. - lang : function (key) { - if (key === undefined) { - return this._lang; - } else { - this._lang = getLangDefinition(key); - return this; - } - } - }; - - // helper for adding shortcuts - function makeGetterAndSetter(name, key) { - moment.fn[name] = moment.fn[name + 's'] = function (input) { - var utc = this._isUTC ? 'UTC' : ''; - if (input != null) { - this._d['set' + utc + key](input); - return this; - } else { - return this._d['get' + utc + key](); - } - }; - } - - // loop through and add shortcuts (Month, Date, Hours, Minutes, Seconds, Milliseconds) - for (i = 0; i < proxyGettersAndSetters.length; i ++) { - makeGetterAndSetter(proxyGettersAndSetters[i].toLowerCase().replace(/s$/, ''), proxyGettersAndSetters[i]); - } - - // add shortcut for year (uses different syntax than the getter/setter 'year' == 'FullYear') - makeGetterAndSetter('year', 'FullYear'); - - // add plural methods - moment.fn.days = moment.fn.day; - moment.fn.weeks = moment.fn.week; - moment.fn.isoWeeks = moment.fn.isoWeek; - - /************************************ - Duration Prototype - ************************************/ - - - moment.duration.fn = Duration.prototype = { - weeks : function () { - return absRound(this.days() / 7); - }, - - valueOf : function () { - return this._milliseconds + - this._days * 864e5 + - this._months * 2592e6; - }, - - humanize : function (withSuffix) { - var difference = +this, - output = relativeTime(difference, !withSuffix, this.lang()); - - if (withSuffix) { - output = this.lang().pastFuture(difference, output); - } - - return this.lang().postformat(output); - }, - - lang : moment.fn.lang - }; - - function makeDurationGetter(name) { - moment.duration.fn[name] = function () { - return this._data[name]; - }; - } - - function makeDurationAsGetter(name, factor) { - moment.duration.fn['as' + name] = function () { - return +this / factor; - }; - } - - for (i in unitMillisecondFactors) { - if (unitMillisecondFactors.hasOwnProperty(i)) { - makeDurationAsGetter(i, unitMillisecondFactors[i]); - makeDurationGetter(i.toLowerCase()); - } - } - - makeDurationAsGetter('Weeks', 6048e5); - - - /************************************ - Default Lang - ************************************/ - - - // Set default language, other languages will inherit from English. - moment.lang('en', { - ordinal : function (number) { - var b = number % 10, - output = (~~ (number % 100 / 10) === 1) ? 'th' : - (b === 1) ? 'st' : - (b === 2) ? 'nd' : - (b === 3) ? 'rd' : 'th'; - return number + output; - } - }); - - - /************************************ - Exposing Moment - ************************************/ - - - // CommonJS module is defined - if (hasModule) { - module.exports = moment; - } - /*global ender:false */ - if (typeof ender === 'undefined') { - // here, `this` means `window` in the browser, or `global` on the server - // add `moment` as a global object via a string identifier, - // for Closure Compiler "advanced" mode - this['moment'] = moment; - } - /*global define:false */ - if (typeof define === "function" && define.amd) { - define("moment", [], function () { - return moment; - }); - } -}).call(this); \ No newline at end of file diff --git a/modules/enterprise/gui/coregui/src/main/webapp/js/moment.min.js b/modules/enterprise/gui/coregui/src/main/webapp/js/moment.min.js deleted file mode 100644 index 4e8497a..0000000 --- a/modules/enterprise/gui/coregui/src/main/webapp/js/moment.min.js +++ /dev/null @@ -1,6 +0,0 @@ -// moment.js -// version : 2.0.0 -// author : Tim Wood -// license : MIT -// momentjs.com -(function(e){function O(e,t){return function(n){return j(e.call(this,n),t)}}function M(e){return function(t){return this.lang().ordinal(e.call(this,t))}}function _(){}function D(e){H(this,e)}function P(e){var t=this._data={},n=e.years||e.year||e.y||0,r=e.months||e.month||e.M||0,i=e.weeks||e.week||e.w||0,s=e.days||e.day||e.d||0,o=e.hours||e.hour||e.h||0,u=e.minutes||e.minute||e.m||0,a=e.seconds||e.second||e.s||0,f=e.milliseconds||e.millisecond||e.ms||0;this._milliseconds=f+a*1e3+u*6e4+o*36e5,this._days=s+i*7,this._months=r+n*12,t.milliseconds=f%1e3,a+=B(f/1e3),t.seconds=a%60,u+=B(a/60),t.minutes=u%60,o+=B(u/60),t.hours=o%24,s+=B(o/24),s+=i*7,t.days=s%30,r+=B(s/30),t.months=r%12,n+=B(r/12),t.years=n}function H(e,t){for(var n in t)t.hasOwnProperty(n)&&(e[n]=t[n]);return e}function B(e){return e<0?Math.ceil(e):Math.floor(e)}function j(e,t){var n=e+"";while(n.length<t)n="0"+n;return n}function F(e,t,n){var r=t._milliseconds,i=t._days,s=t._months,o;r&&e._d.setTime(+e+r*n),i&&e.dat e(e.date()+i*n),s&&(o=e.date(),e.date(1).month(e.month()+s*n).date(Math.min(o,e.daysInMonth())))}function I(e){return Object.prototype.toString.call(e)==="[object Array]"}function q(e,t){var n=Math.min(e.length,t.length),r=Math.abs(e.length-t.length),i=0,s;for(s=0;s<n;s++)~~e[s]!==~~t[s]&&i++;return i+r}function R(e,t){return t.abbr=e,s[e]||(s[e]=new _),s[e].set(t),s[e]}function U(e){return e?(!s[e]&&o&&require("./lang/"+e),s[e]):t.fn._lang}function z(e){return e.match(/\[.*\]/)?e.replace(/^\[|\]$/g,""):e.replace(/\\/g,"")}function W(e){var t=e.match(a),n,r;for(n=0,r=t.length;n<r;n++)A[t[n]]?t[n]=A[t[n]]:t[n]=z(t[n]);return function(i){var s="";for(n=0;n<r;n++)s+=typeof t[n].call=="function"?t[n].call(i,e):t[n];return s}}function X(e,t){function r(t){return e.lang().longDateFormat(t)||t}var n=5;while(n--&&f.test(t))t=t.replace(f,r);return C[t]||(C[t]=W(t)),C[t](e)}function V(e){switch(e){case"DDDD":return p;case"YYYY":return d;case"YYYYY":return v;case"S":case"SS":case"SSS": case"DDD":return h;case"MMM":case"MMMM":case"dd":case"ddd":case"dddd":case"a":case"A":return m;case"X":return b;case"Z":case"ZZ":return g;case"T":return y;case"MM":case"DD":case"YY":case"HH":case"hh":case"mm":case"ss":case"M":case"D":case"d":case"H":case"h":case"m":case"s":return c;default:return new RegExp(e.replace("\\",""))}}function $(e,t,n){var r,i,s=n._a;switch(e){case"M":case"MM":s[1]=t==null?0:~~t-1;break;case"MMM":case"MMMM":r=U(n._l).monthsParse(t),r!=null?s[1]=r:n._isValid=!1;break;case"D":case"DD":case"DDD":case"DDDD":t!=null&&(s[2]=~~t);break;case"YY":s[0]=~~t+(~~t>68?1900:2e3);break;case"YYYY":case"YYYYY":s[0]=~~t;break;case"a":case"A":n._isPm=(t+"").toLowerCase()==="pm";break;case"H":case"HH":case"h":case"hh":s[3]=~~t;break;case"m":case"mm":s[4]=~~t;break;case"s":case"ss":s[5]=~~t;break;case"S":case"SS":case"SSS":s[6]=~~(("0."+t)*1e3);break;case"X":n._d=new Date(parseFloat(t)*1e3);break;case"Z":case"ZZ":n._useUTC=!0,r=(t+"").match(x),r&&r[1]&&(n._tzh=~~r[1]),r &&r[2]&&(n._tzm=~~r[2]),r&&r[0]==="+"&&(n._tzh=-n._tzh,n._tzm=-n._tzm)}t==null&&(n._isValid=!1)}function J(e){var t,n,r=[];if(e._d)return;for(t=0;t<7;t++)e._a[t]=r[t]=e._a[t]==null?t===2?1:0:e._a[t];r[3]+=e._tzh||0,r[4]+=e._tzm||0,n=new Date(0),e._useUTC?(n.setUTCFullYear(r[0],r[1],r[2]),n.setUTCHours(r[3],r[4],r[5],r[6])):(n.setFullYear(r[0],r[1],r[2]),n.setHours(r[3],r[4],r[5],r[6])),e._d=n}function K(e){var t=e._f.match(a),n=e._i,r,i;e._a=[];for(r=0;r<t.length;r++)i=(V(t[r]).exec(n)||[])[0],i&&(n=n.slice(n.indexOf(i)+i.length)),A[t[r]]&&$(t[r],i,e);e._isPm&&e._a[3]<12&&(e._a[3]+=12),e._isPm===!1&&e._a[3]===12&&(e._a[3]=0),J(e)}function Q(e){var t,n,r,i=99,s,o,u;while(e._f.length){t=H({},e),t._f=e._f.pop(),K(t),n=new D(t);if(n.isValid()){r=n;break}u=q(t._a,n.toArray()),u<i&&(i=u,r=n)}H(e,r)}function G(e){var t,n=e._i;if(w.exec(n)){e._f="YYYY-MM-DDT";for(t=0;t<4;t++)if(S[t][1].exec(n)){e._f+=S[t][0];break}g.exec(n)&&(e._f+=" Z"),K(e)}else e._d=new Date(n)}function Y(t){var n=t._i,r=u.exec(n);n===e?t._d=new Date:r?t._d=new Date(+r[1]):typeof n=="string"?G(t):I(n)?(t._a=n.slice(0),J(t)):t._d=n instanceof Date?new Date(+n):new Date(n)}function Z(e,t,n,r,i){return i.relativeTime(t||1,!!n,e,r)}function et(e,t,n){var i=r(Math.abs(e)/1e3),s=r(i/60),o=r(s/60),u=r(o/24),a=r(u/365),f=i<45&&["s",i]||s===1&&["m"]||s<45&&["mm",s]||o===1&&["h"]||o<22&&["hh",o]||u===1&&["d"]||u<=25&&["dd",u]||u<=45&&["M"]||u<345&&["MM",r(u/30)]||a===1&&["y"]||["yy",a];return f[2]=t,f[3]=e>0,f[4]=n,Z.apply({},f)}function tt(e,n,r){var i=r-n,s=r-e.day();return s>i&&(s-=7),s<i-7&&(s+=7),Math.ceil(t(e).add("d",s).dayOfYear()/7)}function nt(e){var n=e._i,r=e._f;return n===null||n===""?null:(typeof n=="string"&&(e._i=n=U().preparse(n)),t.isMoment(n)?(e=H({},n),e._d=new Date(+n._d)):r?I(r)?Q(e):K(e):Y(e),new D(e))}function rt(e,n){t.fn[e]=t.fn[e+"s"]=function(e){var t=this._isUTC?"UTC":"";return e!=null?(this._d["set"+t+n](e),this):this._d["get"+t+n]()}}function it(e){t.duration.fn [e]=function(){return this._data[e]}}function st(e,n){t.duration.fn["as"+e]=function(){return+this/n}}var t,n="2.0.0",r=Math.round,i,s={},o=typeof module!="undefined"&&module.exports,u=/^\/?Date$(\-?\d+)/i,a=/(\[[^\[]*\])|(\$?(Mo|MM?M?M?|Do|DDDo|DD?D?D?|ddd?d?|do?|w[o|w]?|W[o|W]?|YYYYY|YYYY|YY|a|A|hh?|HH?|mm?|ss?|SS?S?|X|zz?|ZZ?|.)/g,f=/(\[[^\[]*\])|(\\)?(LT|LL?L?L?|l{1,4})/g,l=/([0-9a-zA-Z\u00A0-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF]+)/gi,c=/\d\d?/,h=/\d{1,3}/,p=/\d{3}/,d=/\d{1,4}/,v=/[+\-]?\d{1,6}/,m=/[0-9]*[a-z\u00A0-\u05FF\u0700-\uD7FF\uF900-\uFDCF\uFDF0-\uFFEF]+|[\u0600-\u06FF]+\s*?[\u0600-\u06FF]+/i,g=/Z|[\+\-]\d\d:?\d\d/i,y=/T/i,b=/[\+\-]?\d+(\.\d{1,3})?/,w=/^\s*\d{4}-\d\d-\d\d((T| )(\d\d(:\d\d(:\d\d(\.\d\d?\d?)?)?)?)?([\+\-]\d\d:?\d\d)?)?/,E="YYYY-MM-DDTHH:mm:ssZ",S=[["HH:mm:ss.S",/(T| )\d\d:\d\d:\d\d\.\d{1,3}/],["HH:mm:ss",/(T| )\d\d:\d\d:\d\d/],["HH:mm",/(T| )\d\d:\d\d/],["HH",/(T| )\d\d/]],x=/([\+\-]|\d\d)/gi,T="Month|Date|Hours|Minutes|Seconds|Milliseconds".split("| "),N={Milliseconds:1,Seconds:1e3,Minutes:6e4,Hours:36e5,Days:864e5,Months:2592e6,Years:31536e6},C={},k="DDD w W M D d".split(" "),L="M D H h m s w W".split(" "),A={M:function(){return this.month()+1},MMM:function(e){return this.lang().monthsShort(this,e)},MMMM:function(e){return this.lang().months(this,e)},D:function(){return this.date()},DDD:function(){return this.dayOfYear()},d:function(){return this.day()},dd:function(e){return this.lang().weekdaysMin(this,e)},ddd:function(e){return this.lang().weekdaysShort(this,e)},dddd:function(e){return this.lang().weekdays(this,e)},w:function(){return this.week()},W:function(){return this.isoWeek()},YY:function(){return j(this.year()%100,2)},YYYY:function(){return j(this.year(),4)},YYYYY:function(){return j(this.year(),5)},a:function(){return this.lang().meridiem(this.hours(),this.minutes(),!0)},A:function(){return this.lang().meridiem(this.hours(),this.minutes(),!1)},H:function(){return this.hours()},h:function(){return this.hours() %12||12},m:function(){return this.minutes()},s:function(){return this.seconds()},S:function(){return~~(this.milliseconds()/100)},SS:function(){return j(~~(this.milliseconds()/10),2)},SSS:function(){return j(this.milliseconds(),3)},Z:function(){var e=-this.zone(),t="+";return e<0&&(e=-e,t="-"),t+j(~~(e/60),2)+":"+j(~~e%60,2)},ZZ:function(){var e=-this.zone(),t="+";return e<0&&(e=-e,t="-"),t+j(~~(10*e/6),4)},X:function(){return this.unix()}};while(k.length)i=k.pop(),A[i+"o"]=M(A[i]);while(L.length)i=L.pop(),A[i+i]=O(A[i],2);A.DDDD=O(A.DDD,3),_.prototype={set:function(e){var t,n;for(n in e)t=e[n],typeof t=="function"?this[n]=t:this["_"+n]=t},_months:"January_February_March_April_May_June_July_August_September_October_November_December".split("_"),months:function(e){return this._months[e.month()]},_monthsShort:"Jan_Feb_Mar_Apr_May_Jun_Jul_Aug_Sep_Oct_Nov_Dec".split("_"),monthsShort:function(e){return this._monthsShort[e.month()]},monthsParse:function(e){var n,r,i,s;this._monthsP arse||(this._monthsParse=[]);for(n=0;n<12;n++){this._monthsParse[n]||(r=t([2e3,n]),i="^"+this.months(r,"")+"|^"+this.monthsShort(r,""),this._monthsParse[n]=new RegExp(i.replace(".",""),"i"));if(this._monthsParse[n].test(e))return n}},_weekdays:"Sunday_Monday_Tuesday_Wednesday_Thursday_Friday_Saturday".split("_"),weekdays:function(e){return this._weekdays[e.day()]},_weekdaysShort:"Sun_Mon_Tue_Wed_Thu_Fri_Sat".split("_"),weekdaysShort:function(e){return this._weekdaysShort[e.day()]},_weekdaysMin:"Su_Mo_Tu_We_Th_Fr_Sa".split("_"),weekdaysMin:function(e){return this._weekdaysMin[e.day()]},_longDateFormat:{LT:"h:mm A",L:"MM/DD/YYYY",LL:"MMMM D YYYY",LLL:"MMMM D YYYY LT",LLLL:"dddd, MMMM D YYYY LT"},longDateFormat:function(e){var t=this._longDateFormat[e];return!t&&this._longDateFormat[e.toUpperCase()]&&(t=this._longDateFormat[e.toUpperCase()].replace(/MMMM|MM|DD|dddd/g,function(e){return e.slice(1)}),this._longDateFormat[e]=t),t},meridiem:function(e,t,n){return e>11?n?"pm":"PM":n ?"am":"AM"},_calendar:{sameDay:"[Today at] LT",nextDay:"[Tomorrow at] LT",nextWeek:"dddd [at] LT",lastDay:"[Yesterday at] LT",lastWeek:"[last] dddd [at] LT",sameElse:"L"},calendar:function(e,t){var n=this._calendar[e];return typeof n=="function"?n.apply(t):n},_relativeTime:{future:"in %s",past:"%s ago",s:"a few seconds",m:"a minute",mm:"%d minutes",h:"an hour",hh:"%d hours",d:"a day",dd:"%d days",M:"a month",MM:"%d months",y:"a year",yy:"%d years"},relativeTime:function(e,t,n,r){var i=this._relativeTime[n];return typeof i=="function"?i(e,t,n,r):i.replace(/%d/i,e)},pastFuture:function(e,t){var n=this._relativeTime[e>0?"future":"past"];return typeof n=="function"?n(t):n.replace(/%s/i,t)},ordinal:function(e){return this._ordinal.replace("%d",e)},_ordinal:"%d",preparse:function(e){return e},postformat:function(e){return e},week:function(e){return tt(e,this._week.dow,this._week.doy)},_week:{dow:0,doy:6}},t=function(e,t,n){return nt({_i:e,_f:t,_l:n,_isUTC:!1})},t.utc=function(e,t, n){return nt({_useUTC:!0,_isUTC:!0,_l:n,_i:e,_f:t})},t.unix=function(e){return t(e*1e3)},t.duration=function(e,n){var r=t.isDuration(e),i=typeof e=="number",s=r?e._data:i?{}:e,o;return i&&(n?s[n]=e:s.milliseconds=e),o=new P(s),r&&e.hasOwnProperty("_lang")&&(o._lang=e._lang),o},t.version=n,t.defaultFormat=E,t.lang=function(e,n){var r;if(!e)return t.fn._lang._abbr;n?R(e,n):s[e]||U(e),t.duration.fn._lang=t.fn._lang=U(e)},t.langData=function(e){return e&&e._lang&&e._lang._abbr&&(e=e._lang._abbr),U(e)},t.isMoment=function(e){return e instanceof D},t.isDuration=function(e){return e instanceof P},t.fn=D.prototype={clone:function(){return t(this)},valueOf:function(){return+this._d},unix:function(){return Math.floor(+this._d/1e3)},toString:function(){return this.format("ddd MMM DD YYYY HH:mm:ss [GMT]ZZ")},toDate:function(){return this._d},toJSON:function(){return t.utc(this).format("YYYY-MM-DD[T]HH:mm:ss.SSS[Z]")},toArray:function(){var e=this;return[e.year(),e.month(),e.date(),e.hou rs(),e.minutes(),e.seconds(),e.milliseconds()]},isValid:function(){return this._isValid==null&&(this._a?this._isValid=!q(this._a,(this._isUTC?t.utc(this._a):t(this._a)).toArray()):this._isValid=!isNaN(this._d.getTime())),!!this._isValid},utc:function(){return this._isUTC=!0,this},local:function(){return this._isUTC=!1,this},format:function(e){var n=X(this,e||t.defaultFormat);return this.lang().postformat(n)},add:function(e,n){var r;return typeof e=="string"?r=t.duration(+n,e):r=t.duration(e,n),F(this,r,1),this},subtract:function(e,n){var r;return typeof e=="string"?r=t.duration(+n,e):r=t.duration(e,n),F(this,r,-1),this},diff:function(e,n,r){var i=this._isUTC?t(e).utc():t(e).local(),s=(this.zone()-i.zone())*6e4,o,u;return n&&(n=n.replace(/s$/,"")),n==="year"||n==="month"?(o=(this.daysInMonth()+i.daysInMonth())*432e5,u=(this.year()-i.year())*12+(this.month()-i.month()),u+=(this-t(this).startOf("month")-(i-t(i).startOf("month")))/o,n==="year"&&(u/=12)):(o=this-i-s,u=n==="second "?o/1e3:n==="minute"?o/6e4:n==="hour"?o/36e5:n==="day"?o/864e5:n==="week"?o/6048e5:o),r?u:B(u)},from:function(e,n){return t.duration(this.diff(e)).lang(this.lang()._abbr).humanize(!n)},fromNow:function(e){return this.from(t(),e)},calendar:function(){var e=this.diff(t().startOf("day"),"days",!0),n=e<-6?"sameElse":e<-1?"lastWeek":e<0?"lastDay":e<1?"sameDay":e<2?"nextDay":e<7?"nextWeek":"sameElse";return this.format(this.lang().calendar(n,this))},isLeapYear:function(){var e=this.year();return e%4===0&&e%100!==0||e%400===0},isDST:function(){return this.zone()<t([this.year()]).zone()||this.zone()<t([this.year(),5]).zone()},day:function(e){var t=this._isUTC?this._d.getUTCDay():this._d.getDay();return e==null?t:this.add({d:e-t})},startOf:function(e){e=e.replace(/s$/,"");switch(e){case"year":this.month(0);case"month":this.date(1);case"week":case"day":this.hours(0);case"hour":this.minutes(0);case"minute":this.seconds(0);case"second":this.milliseconds(0)}return e==="week"&&this.day(0) ,this},endOf:function(e){return this.startOf(e).add(e.replace(/s?$/,"s"),1).subtract("ms",1)},isAfter:function(e,n){return n=typeof n!="undefined"?n:"millisecond",+this.clone().startOf(n)>+t(e).startOf(n)},isBefore:function(e,n){return n=typeof n!="undefined"?n:"millisecond",+this.clone().startOf(n)<+t(e).startOf(n)},isSame:function(e,n){return n=typeof n!="undefined"?n:"millisecond",+this.clone().startOf(n)===+t(e).startOf(n)},zone:function(){return this._isUTC?0:this._d.getTimezoneOffset()},daysInMonth:function(){return t.utc([this.year(),this.month()+1,0]).date()},dayOfYear:function(e){var n=r((t(this).startOf("day")-t(this).startOf("year"))/864e5)+1;return e==null?n:this.add("d",e-n)},isoWeek:function(e){var t=tt(this,1,4);return e==null?t:this.add("d",(e-t)*7)},week:function(e){var t=this.lang().week(this);return e==null?t:this.add("d",(e-t)*7)},lang:function(t){return t===e?this._lang:(this._lang=U(t),this)}};for(i=0;i<T.length;i++)rt(T[i].toLowerCase().replace(/s$/,"" ),T[i]);rt("year","FullYear"),t.fn.days=t.fn.day,t.fn.weeks=t.fn.week,t.fn.isoWeeks=t.fn.isoWeek,t.duration.fn=P.prototype={weeks:function(){return B(this.days()/7)},valueOf:function(){return this._milliseconds+this._days*864e5+this._months*2592e6},humanize:function(e){var t=+this,n=et(t,!e,this.lang());return e&&(n=this.lang().pastFuture(t,n)),this.lang().postformat(n)},lang:t.fn.lang};for(i in N)N.hasOwnProperty(i)&&(st(i,N[i]),it(i.toLowerCase()));st("Weeks",6048e5),t.lang("en",{ordinal:function(e){var t=e%10,n=~~(e%100/10)===1?"th":t===1?"st":t===2?"nd":t===3?"rd":"th";return e+n}}),o&&(module.exports=t),typeof ender=="undefined"&&(this.moment=t),typeof define=="function"&&define.amd&&define("moment",[],function(){return t})}).call(this); \ No newline at end of file diff --git a/modules/enterprise/gui/coregui/src/main/webapp/js/rhq-4.9.0.js b/modules/enterprise/gui/coregui/src/main/webapp/js/rhq-4.9.0.js new file mode 100644 index 0000000..7e89bb1 --- /dev/null +++ b/modules/enterprise/gui/coregui/src/main/webapp/js/rhq-4.9.0.js @@ -0,0 +1,183 @@ +/** + * RHQ Charting Javascript Functions. + */ + +/** + * ChartContext Constructor Object + * Contains all of the data required to render a chart. + * A ChartContext can be passed to multiple chart renders to display different chart types + * of that data. + * @param chartId + * @param chartHeight + * @param metricsData + * @param xAxisLabel + * @param chartTitle + * @param yAxisUnits + * @param minChartTitle + * @param avgChartTitle + * @param peakChartTitle + * @param dateLabel + * @param timeLabel + * @param downLabel + * @param unknownLabel + * @param noDataLabel + * @param hoverStartLabel + * @param hoverEndLabel + * @param hoverPeriodLabel + * @param hoverBarLabel + * @param chartHoverTimeFormat + * @param chartHoverDateFormat + * @param isPortalGraph + * @param portalId + * @param buttonBarDateTimeFormat + * @param singleValueLabel + * @param chartXaxisTimeFormatHours + * @param chartXaxisTimeFormatHoursMinutes + * @param hideLegend + * @constructor + */ +var ChartContext = function (chartId, chartHeight, metricsData, xAxisLabel, chartTitle, yAxisUnits, minChartTitle, avgChartTitle, peakChartTitle, dateLabel, timeLabel, downLabel, unknownLabel, noDataLabel, hoverStartLabel, hoverEndLabel, hoverPeriodLabel, hoverBarLabel, chartHoverTimeFormat, chartHoverDateFormat, isPortalGraph, portalId, buttonBarDateTimeFormat, singleValueLabel, chartXaxisTimeFormatHours, chartXaxisTimeFormatHoursMinutes, hideLegend) { + "use strict"; + if (!(this instanceof ChartContext)) { + throw new Error("ChartContext function cannot be called as a function."); + } + this.chartId = chartId; + this.chartHeight = chartHeight; + this.data = jQuery.parseJSON(metricsData); // make into json + this.xAxisLabel = xAxisLabel; + this.chartTitle = chartTitle; + this.yAxisUnits = yAxisUnits; + this.minChartTitle = minChartTitle; + this.avgChartTitle = avgChartTitle; + this.peakChartTitle = peakChartTitle; + this.dateLabel = dateLabel; + this.timeLabel = timeLabel; + this.downLabel = downLabel; + this.unknownLabel = unknownLabel; + this.singleValueLabel = singleValueLabel; + this.noDataLabel = noDataLabel; + this.hoverStartLabel = hoverStartLabel; + this.hoverEndLabel = hoverEndLabel; + this.hoverPeriodLabel = hoverPeriodLabel; + this.hoverBarLabel = hoverBarLabel; + this.chartHoverTimeFormat = chartHoverTimeFormat; + this.chartHoverDateFormat = chartHoverDateFormat; + this.isPortalGraph = isPortalGraph; + this.portalId = portalId; + if (isPortalGraph) { + this.chartHandle = "rChart-" + chartId + "-" + portalId; + } + else { + this.chartHandle = "rChart-" + chartId; + } + this.chartSelection = this.chartHandle + " svg"; + this.buttonBarDateTimeFormat = buttonBarDateTimeFormat; + this.chartXaxisTimeFormatHours = chartXaxisTimeFormatHours; + this.chartXaxisTimeFormatHoursMinutes = chartXaxisTimeFormatHoursMinutes; + this.hideLegend = hideLegend; + + }, + /** + * Availability Context object constructor + * @param chartId + * @param availData + * @param dateLabel + * @param timeLabel + * @param hoverStartLabel + * @param hoverBarLabel + * @param availabilityLabel + * @param chartHoverTimeFormat + * @param chartHoverDateFormat + * @param chartTitle + * @param chartUpLabel + * @param chartDownLabel + * @param chartXaxisTimeFormatHours + * @param chartXaxisTimeFormatHoursMinutes + * @constructor + */ + AvailChartContext = function (chartId, availData, dateLabel, timeLabel, hoverStartLabel, hoverBarLabel, availabilityLabel, chartHoverTimeFormat, chartHoverDateFormat, chartTitle, chartUpLabel, chartDownLabel, chartXaxisTimeFormatHours, chartXaxisTimeFormatHoursMinutes) { + "use strict"; + if (!(this instanceof AvailChartContext)) { + throw new Error("AvailChartContext function cannot be called as a function."); + } + this.chartId = chartId; + this.chartHandle = "#availChart-" + this.chartId; + this.chartSelection = this.chartHandle + " svg"; + this.data = jQuery.parseJSON(availData); // make into json + this.dateLabel = dateLabel; + this.timeLabel = timeLabel; + this.hoverStartLabel = hoverStartLabel; + this.hoverBarLabel = hoverBarLabel; + this.hoverBarAvailabilityLabel = availabilityLabel; + this.chartHoverTimeFormat = chartHoverTimeFormat; + this.chartHoverDateFormat = chartHoverDateFormat; + this.chartTitle = chartTitle; + this.chartDownLabel = chartDownLabel; + this.chartUpLabel = chartUpLabel; + this.chartXaxisTimeFormatHours = chartXaxisTimeFormatHours; + this.chartXaxisTimeFormatHoursMinutes = chartXaxisTimeFormatHoursMinutes; + + }, + + /** + * GraphDateContext object constructor. + * @param startDate moment object representing startDate range + * @param endDate moment object representing endDate range + * @constructor + */ + GraphDateContext = function (startDate, endDate) { + "use strict"; + if (!(this instanceof GraphDateContext)) { + throw new Error("GraphDateContext function cannot be called as a function."); + } + this.startDate = startDate; + this.endDate = endDate; + }, + rhqCommon = (function () { + "use strict"; + + + var timeFormat = function (formats) { + return function(date) { + var i = formats.length - 1, f = formats[i]; + while (!f[1](date)) f = formats[--i]; + return f[0](date); + }; + }; + + return { + getD3CustomTimeFormat: function (xAxisTimeFormatHours, xAxisTimeFormatHoursMinutes) { + return timeFormat([ + [d3.time.format("%Y"), function () { + return true; + }], + [d3.time.format("%B"), function (d) { + return d.getMonth(); + }], + [d3.time.format("%b %d"), function (d) { + return d.getDate() != 1; + }], + [d3.time.format("%a %d"), function (d) { + return d.getDay() && d.getDate() != 1; + }], + [d3.time.format(xAxisTimeFormatHours), function (d) { + return d.getHours(); + }], + [d3.time.format(xAxisTimeFormatHoursMinutes), function (d) { + return d.getMinutes(); + }], + [d3.time.format(":%S"), function (d) { + return d.getSeconds(); + }], + [d3.time.format(".%L"), function (d) { + return d.getMilliseconds(); + }] + ]); + } + + }; + })(); + + + + diff --git a/modules/enterprise/gui/coregui/src/main/webapp/js/rhq.js b/modules/enterprise/gui/coregui/src/main/webapp/js/rhq.js deleted file mode 100644 index 7e89bb1..0000000 --- a/modules/enterprise/gui/coregui/src/main/webapp/js/rhq.js +++ /dev/null @@ -1,183 +0,0 @@ -/** - * RHQ Charting Javascript Functions. - */ - -/** - * ChartContext Constructor Object - * Contains all of the data required to render a chart. - * A ChartContext can be passed to multiple chart renders to display different chart types - * of that data. - * @param chartId - * @param chartHeight - * @param metricsData - * @param xAxisLabel - * @param chartTitle - * @param yAxisUnits - * @param minChartTitle - * @param avgChartTitle - * @param peakChartTitle - * @param dateLabel - * @param timeLabel - * @param downLabel - * @param unknownLabel - * @param noDataLabel - * @param hoverStartLabel - * @param hoverEndLabel - * @param hoverPeriodLabel - * @param hoverBarLabel - * @param chartHoverTimeFormat - * @param chartHoverDateFormat - * @param isPortalGraph - * @param portalId - * @param buttonBarDateTimeFormat - * @param singleValueLabel - * @param chartXaxisTimeFormatHours - * @param chartXaxisTimeFormatHoursMinutes - * @param hideLegend - * @constructor - */ -var ChartContext = function (chartId, chartHeight, metricsData, xAxisLabel, chartTitle, yAxisUnits, minChartTitle, avgChartTitle, peakChartTitle, dateLabel, timeLabel, downLabel, unknownLabel, noDataLabel, hoverStartLabel, hoverEndLabel, hoverPeriodLabel, hoverBarLabel, chartHoverTimeFormat, chartHoverDateFormat, isPortalGraph, portalId, buttonBarDateTimeFormat, singleValueLabel, chartXaxisTimeFormatHours, chartXaxisTimeFormatHoursMinutes, hideLegend) { - "use strict"; - if (!(this instanceof ChartContext)) { - throw new Error("ChartContext function cannot be called as a function."); - } - this.chartId = chartId; - this.chartHeight = chartHeight; - this.data = jQuery.parseJSON(metricsData); // make into json - this.xAxisLabel = xAxisLabel; - this.chartTitle = chartTitle; - this.yAxisUnits = yAxisUnits; - this.minChartTitle = minChartTitle; - this.avgChartTitle = avgChartTitle; - this.peakChartTitle = peakChartTitle; - this.dateLabel = dateLabel; - this.timeLabel = timeLabel; - this.downLabel = downLabel; - this.unknownLabel = unknownLabel; - this.singleValueLabel = singleValueLabel; - this.noDataLabel = noDataLabel; - this.hoverStartLabel = hoverStartLabel; - this.hoverEndLabel = hoverEndLabel; - this.hoverPeriodLabel = hoverPeriodLabel; - this.hoverBarLabel = hoverBarLabel; - this.chartHoverTimeFormat = chartHoverTimeFormat; - this.chartHoverDateFormat = chartHoverDateFormat; - this.isPortalGraph = isPortalGraph; - this.portalId = portalId; - if (isPortalGraph) { - this.chartHandle = "rChart-" + chartId + "-" + portalId; - } - else { - this.chartHandle = "rChart-" + chartId; - } - this.chartSelection = this.chartHandle + " svg"; - this.buttonBarDateTimeFormat = buttonBarDateTimeFormat; - this.chartXaxisTimeFormatHours = chartXaxisTimeFormatHours; - this.chartXaxisTimeFormatHoursMinutes = chartXaxisTimeFormatHoursMinutes; - this.hideLegend = hideLegend; - - }, - /** - * Availability Context object constructor - * @param chartId - * @param availData - * @param dateLabel - * @param timeLabel - * @param hoverStartLabel - * @param hoverBarLabel - * @param availabilityLabel - * @param chartHoverTimeFormat - * @param chartHoverDateFormat - * @param chartTitle - * @param chartUpLabel - * @param chartDownLabel - * @param chartXaxisTimeFormatHours - * @param chartXaxisTimeFormatHoursMinutes - * @constructor - */ - AvailChartContext = function (chartId, availData, dateLabel, timeLabel, hoverStartLabel, hoverBarLabel, availabilityLabel, chartHoverTimeFormat, chartHoverDateFormat, chartTitle, chartUpLabel, chartDownLabel, chartXaxisTimeFormatHours, chartXaxisTimeFormatHoursMinutes) { - "use strict"; - if (!(this instanceof AvailChartContext)) { - throw new Error("AvailChartContext function cannot be called as a function."); - } - this.chartId = chartId; - this.chartHandle = "#availChart-" + this.chartId; - this.chartSelection = this.chartHandle + " svg"; - this.data = jQuery.parseJSON(availData); // make into json - this.dateLabel = dateLabel; - this.timeLabel = timeLabel; - this.hoverStartLabel = hoverStartLabel; - this.hoverBarLabel = hoverBarLabel; - this.hoverBarAvailabilityLabel = availabilityLabel; - this.chartHoverTimeFormat = chartHoverTimeFormat; - this.chartHoverDateFormat = chartHoverDateFormat; - this.chartTitle = chartTitle; - this.chartDownLabel = chartDownLabel; - this.chartUpLabel = chartUpLabel; - this.chartXaxisTimeFormatHours = chartXaxisTimeFormatHours; - this.chartXaxisTimeFormatHoursMinutes = chartXaxisTimeFormatHoursMinutes; - - }, - - /** - * GraphDateContext object constructor. - * @param startDate moment object representing startDate range - * @param endDate moment object representing endDate range - * @constructor - */ - GraphDateContext = function (startDate, endDate) { - "use strict"; - if (!(this instanceof GraphDateContext)) { - throw new Error("GraphDateContext function cannot be called as a function."); - } - this.startDate = startDate; - this.endDate = endDate; - }, - rhqCommon = (function () { - "use strict"; - - - var timeFormat = function (formats) { - return function(date) { - var i = formats.length - 1, f = formats[i]; - while (!f[1](date)) f = formats[--i]; - return f[0](date); - }; - }; - - return { - getD3CustomTimeFormat: function (xAxisTimeFormatHours, xAxisTimeFormatHoursMinutes) { - return timeFormat([ - [d3.time.format("%Y"), function () { - return true; - }], - [d3.time.format("%B"), function (d) { - return d.getMonth(); - }], - [d3.time.format("%b %d"), function (d) { - return d.getDate() != 1; - }], - [d3.time.format("%a %d"), function (d) { - return d.getDay() && d.getDate() != 1; - }], - [d3.time.format(xAxisTimeFormatHours), function (d) { - return d.getHours(); - }], - [d3.time.format(xAxisTimeFormatHoursMinutes), function (d) { - return d.getMinutes(); - }], - [d3.time.format(":%S"), function (d) { - return d.getSeconds(); - }], - [d3.time.format(".%L"), function (d) { - return d.getMilliseconds(); - }] - ]); - } - - }; - })(); - - - -

1 0

[rhq] modules/core
by Thomas Segismont 17 Sep '13

17 Sep '13

modules/core/native-system/src/main/java/org/rhq/core/system/SigarAccessHandler.java | 30 ++++++++-- 1 file changed, 26 insertions(+), 4 deletions(-) New commits: commit a9feadf7e8b1fbc5215dd7ba7e6cc4f1a4e78cc8 Author: Thomas Segismont <tsegismo(a)redhat.com> Date: Tue Sep 17 12:51:30 2013 +0200 Bug 1008570 - Agent shutdown hangs because one thread is still alive diff --git a/modules/core/native-system/src/main/java/org/rhq/core/system/SigarAccessHandler.java b/modules/core/native-system/src/main/java/org/rhq/core/system/SigarAccessHandler.java index a781641..a993178 100644 --- a/modules/core/native-system/src/main/java/org/rhq/core/system/SigarAccessHandler.java +++ b/modules/core/native-system/src/main/java/org/rhq/core/system/SigarAccessHandler.java @@ -29,6 +29,8 @@ import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; import java.util.concurrent.Executors; import java.util.concurrent.ScheduledExecutorService; +import java.util.concurrent.ThreadFactory; +import java.util.concurrent.atomic.AtomicInteger; import java.util.concurrent.locks.ReentrantLock; import org.apache.commons.logging.Log; @@ -76,6 +78,7 @@ class SigarAccessHandler implements InvocationHandler { private final ScheduledExecutorService scheduledExecutorService; private volatile int localSigarInstancesCount; private Sigar sharedSigar; + private volatile boolean closed; SigarAccessHandler() { this(new DefaultSigarFactory()); @@ -85,9 +88,24 @@ class SigarAccessHandler implements InvocationHandler { this.sigarFactory = sigarFactory; sharedSigarLock = new ReentrantLock(); localSigarLock = new ReentrantLock(); - scheduledExecutorService = Executors.newSingleThreadScheduledExecutor(); + scheduledExecutorService = Executors.newSingleThreadScheduledExecutor(new ThreadFactory() { + + private ThreadFactory defaultThreadFactory = Executors.defaultThreadFactory(); + + private AtomicInteger threadCounter = new AtomicInteger(0); + + @Override + public Thread newThread(Runnable runnable) { + Thread thread = defaultThreadFactory.newThread(runnable); + thread.setName("SigarAccessHandler-" + threadCounter.incrementAndGet()); + // With daemon threads, there is no need to call #shutdown on the executor to let the JVM go down + thread.setDaemon(true); + return thread; + } + }); scheduledExecutorService.scheduleWithFixedDelay(new ThresholdChecker(), 1, 5, MINUTES); localSigarInstancesCount = 0; + closed = false; } public Object invoke(Object proxy, Method method, Object[] args) throws Throwable { @@ -100,10 +118,13 @@ class SigarAccessHandler implements InvocationHandler { // Acquire lock for shared Sigar instance. Wait 'sharedSigarLockMaxWait' seconds at most boolean acquiredLock = sharedSigarLock.tryLock(SHARED_SIGAR_LOCK_MAX_WAIT, SECONDS); if (acquiredLock) { - if (sharedSigar == null) { - this.sharedSigar = sigarFactory.createSigarInstance(); - } try { + if (closed) { + throw new SystemInfoException("SigarAccess has been closed"); + } + if (sharedSigar == null) { + this.sharedSigar = sigarFactory.createSigarInstance(); + } return method.invoke(sharedSigar, args); } catch (InvocationTargetException e) { throw e.getTargetException(); @@ -150,6 +171,7 @@ class SigarAccessHandler implements InvocationHandler { if (sharedSigar != null) { sharedSigarLock.lock(); try { + closed = true; sharedSigar.close(); sharedSigar = null; } finally {

1 0

← Newer
1
...
8
9
10
11
12
13
14
...
20
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

rhq-commits September 2013