modules/common/ant-bundle/src/main/assembly/bin/rhq-ant.bat
| 462
+++++-----
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/LinkManager.java
| 11
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/roles/RolesView.java
| 4
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/users/UsersView.java
| 2
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/AlertDataSource.java
| 9
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/AlertHistoryView.java
| 7
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/AbstractAlertDefinitionsView.java
| 1
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/selector/AbstractSelector.java
| 36
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/table/TableSection.java
| 44
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/alerts/RecentAlertsPortlet.java
| 30
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/AbstractMeasurementDataTraitListView.java
| 8
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/detail/operation/history/AbstractOperationHistoryListView.java
| 39
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/detail/operation/schedule/AbstractOperationScheduleListView.java
| 14
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/event/EventCompositeHistoryView.java
| 2
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/definitions/GroupDefinitionListView.java
| 2
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/traits/TraitsView.java
| 6
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/configuration/ConfigurationHistoryView.java
| 4
modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/traits/TraitsView.java
| 4
18 files changed, 380 insertions(+), 305 deletions(-)
New commits:
commit df006f0719e01d7b6a762a74a7864c9ab6370ddc
Author: Jay Shaughnessy <jshaughn(a)redhat.com>
Date: Mon Feb 14 17:57:58 2011 -0500
git forcing a line terminator fix
diff --git a/modules/common/ant-bundle/src/main/assembly/bin/rhq-ant.bat
b/modules/common/ant-bundle/src/main/assembly/bin/rhq-ant.bat
index da43fe8..2531584 100644
--- a/modules/common/ant-bundle/src/main/assembly/bin/rhq-ant.bat
+++ b/modules/common/ant-bundle/src/main/assembly/bin/rhq-ant.bat
@@ -1,231 +1,231 @@
-@echo off
-
-REM Licensed to the Apache Software Foundation (ASF) under one or more
-REM contributor license agreements. See the NOTICE file distributed with
-REM this work for additional information regarding copyright ownership.
-REM The ASF licenses this file to You under the Apache License, Version 2.0
-REM (the "License"); you may not use this file except in compliance with
-REM the License. You may obtain a copy of the License at
-REM
-REM
http://www.apache.org/licenses/LICENSE-2.0
-REM
-REM Unless required by applicable law or agreed to in writing, software
-REM distributed under the License is distributed on an "AS IS" BASIS,
-REM WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-REM See the License for the specific language governing permissions and
-REM limitations under the License.
-
-REM This is an inordinately troublesome piece of code, particularly because it
-REM tries to work on both Win9x and WinNT-based systems. If we could abandon '9x
-REM support, things would be much easier, but sadly, it is not yet time.
-REM Be cautious about editing this, and only add WinNT specific stuff in code that
-REM only runs on WinNT.
-
-REM -----RHQ CHANGES START-----
-REM THIS FILE WAS ORIGINALLY ANT.BAT VERSION 1.8.0
-REM IT HAS BEEN ALTERED IN THE FOLLOWING WAYS:
-REM 1. -main ARGUMENT WAS ADDED TO THE ANT START COMMAND
-REM 2. ANT_HOME HAS BEEN RENAMED TO RHQ_ANT_HOME
-REM 3. antrc_pre/post.bat HAVE BEEN RENAMED TO rhq-antrc_pre/post.bat
-REM -----RHQ CHANGES STOP-----
-
-if "%HOME%"=="" goto homeDrivePathPre
-if exist "%HOME%\rhq-antrc_pre.bat" call "%HOME%\rhq-antrc_pre.bat"
-
-:homeDrivePathPre
-if "%HOMEDRIVE%%HOMEPATH%"=="" goto userProfilePre
-if "%HOMEDRIVE%%HOMEPATH%"=="%HOME%" goto userProfilePre
-if exist "%HOMEDRIVE%%HOMEPATH%\rhq-antrc_pre.bat" call
"%HOMEDRIVE%%HOMEPATH%\rhq-antrc_pre.bat"
-
-:userProfilePre
-if "%USERPROFILE%"=="" goto alpha
-if "%USERPROFILE%"=="%HOME%" goto alpha
-if "%USERPROFILE%"=="%HOMEDRIVE%%HOMEPATH%" goto alpha
-if exist "%USERPROFILE%\rhq-antrc_pre.bat" call
"%USERPROFILE%\rhq-antrc_pre.bat"
-
-:alpha
-
-if "%OS%"=="Windows_NT" @setlocal
-if "%OS%"=="WINNT" @setlocal
-
-if "%RHQ_ANT_HOME%"=="" goto setDefaultAntHome
-
-:stripAntHome
-if not _%RHQ_ANT_HOME:~-1%==_\ goto checkClasspath
-set RHQ_ANT_HOME=%RHQ_ANT_HOME:~0,-1%
-goto stripAntHome
-
-:setDefaultAntHome
-rem %~dp0 is expanded pathname of the current script under NT
-set RHQ_ANT_HOME=%~dp0..
-
-:checkClasspath
-set _USE_CLASSPATH=yes
-rem CLASSPATH must not be used if it is equal to ""
-if "%CLASSPATH%"=="""" set _USE_CLASSPATH=no
-if "%CLASSPATH%"=="" set _USE_CLASSPATH=no
-
-rem Slurp the command line arguments. This loop allows for an unlimited number
-rem of arguments (up to the command line limit, anyway).
-:setupArgs
-if ""%1""=="""" goto doneStart
-if ""%1""==""-noclasspath"" goto clearclasspath
-set ANT_CMD_LINE_ARGS=%ANT_CMD_LINE_ARGS% %1
-shift
-goto setupArgs
-
-rem here is there is a -noclasspath in the options
-:clearclasspath
-set _USE_CLASSPATH=no
-shift
-goto setupArgs
-
-rem This label provides a place for the argument list loop to break out
-rem and for NT handling to skip to.
-
-:doneStart
-
-if "%_USE_CLASSPATH%"=="no" goto findAntHome
-
-:stripClasspath
-if not _%CLASSPATH:~-1%==_\ goto findAntHome
-set CLASSPATH=%CLASSPATH:~0,-1%
-goto stripClasspath
-
-:findAntHome
-rem find RHQ_ANT_HOME if it does not exist due to either an invalid value passed
-rem by the user or the %0 problem on Windows 9x
-if exist "%RHQ_ANT_HOME%\lib\ant.jar" goto checkJava
-
-rem check for ant in Program Files
-if not exist "%ProgramFiles%\ant" goto checkSystemDrive
-set RHQ_ANT_HOME=%ProgramFiles%\ant
-goto checkJava
-
-:checkSystemDrive
-rem check for ant in root directory of system drive
-if not exist %SystemDrive%\ant\lib\ant.jar goto checkCDrive
-set RHQ_ANT_HOME=%SystemDrive%\ant
-goto checkJava
-
-:checkCDrive
-rem check for ant in C:\ant for Win9X users
-if not exist C:\ant\lib\ant.jar goto noAntHome
-set RHQ_ANT_HOME=C:\ant
-goto checkJava
-
-:noAntHome
-echo RHQ_ANT_HOME is set incorrectly or ant could not be located. Please set
RHQ_ANT_HOME.
-goto end
-
-:checkJava
-set _JAVACMD=%JAVACMD%
-
-if "%JAVA_HOME%" == "" goto noJavaHome
-if not exist "%JAVA_HOME%\bin\java.exe" goto noJavaHome
-if "%_JAVACMD%" == "" set _JAVACMD=%JAVA_HOME%\bin\java.exe
-goto checkJikes
-
-:noJavaHome
-if "%_JAVACMD%" == "" set _JAVACMD=java.exe
-
-:checkJikes
-if not "%JIKESPATH%"=="" goto runAntWithJikes
-
-:runAnt
-if "%_USE_CLASSPATH%"=="no" goto runAntNoClasspath
-:runAntWithClasspath
-"%_JAVACMD%" %ANT_OPTS% -classpath
"%RHQ_ANT_HOME%\lib\ant-launcher.jar" "-Dant.home=%RHQ_ANT_HOME%"
org.apache.tools.ant.launch.Launcher %ANT_ARGS% -cp "%CLASSPATH%" -main
org.rhq.bundle.ant.AntMain %ANT_CMD_LINE_ARGS%
-rem Check the error code of the Ant build
-if not "%OS%"=="Windows_NT" goto onError
-set ANT_ERROR=%ERRORLEVEL%
-goto end
-
-:runAntNoClasspath
-"%_JAVACMD%" %ANT_OPTS% -classpath
"%RHQ_ANT_HOME%\lib\ant-launcher.jar" "-Dant.home=%RHQ_ANT_HOME%"
org.apache.tools.ant.launch.Launcher %ANT_ARGS% -main org.rhq.bundle.ant.AntMain
%ANT_CMD_LINE_ARGS%
-rem Check the error code of the Ant build
-if not "%OS%"=="Windows_NT" goto onError
-set ANT_ERROR=%ERRORLEVEL%
-goto end
-
-:runAntWithJikes
-
-if not _%JIKESPATH:~-1%==_\ goto checkJikesAndClasspath
-set JIKESPATH=%JIKESPATH:~0,-1%
-goto runAntWithJikes
-
-:checkJikesAndClasspath
-
-if "%_USE_CLASSPATH%"=="no" goto runAntWithJikesNoClasspath
-
-:runAntWithJikesAndClasspath
-"%_JAVACMD%" %ANT_OPTS% -classpath
"%RHQ_ANT_HOME%\lib\ant-launcher.jar" "-Dant.home=%RHQ_ANT_HOME%"
"-Djikes.class.path=%JIKESPATH%" org.apache.tools.ant.launch.Launcher %ANT_ARGS%
-cp "%CLASSPATH%" -main org.rhq.bundle.ant.AntMain %ANT_CMD_LINE_ARGS%
-rem Check the error code of the Ant build
-if not "%OS%"=="Windows_NT" goto onError
-set ANT_ERROR=%ERRORLEVEL%
-goto end
-
-:runAntWithJikesNoClasspath
-"%_JAVACMD%" %ANT_OPTS% -classpath
"%RHQ_ANT_HOME%\lib\ant-launcher.jar" "-Dant.home=%RHQ_ANT_HOME%"
"-Djikes.class.path=%JIKESPATH%" org.apache.tools.ant.launch.Launcher %ANT_ARGS%
-main org.rhq.bundle.ant.AntMain %ANT_CMD_LINE_ARGS%
-rem Check the error code of the Ant build
-if not "%OS%"=="Windows_NT" goto onError
-set ANT_ERROR=%ERRORLEVEL%
-goto end
-
-:onError
-rem Windows 9x way of checking the error code. It matches via brute force.
-for %%i in (1 10 100) do set err%%i=
-for %%i in (0 1 2) do if errorlevel %%i00 set err100=%%i
-if %err100%==2 goto onError200
-if %err100%==0 set err100=
-for %%i in (0 1 2 3 4 5 6 7 8 9) do if errorlevel %err100%%%i0 set err10=%%i
-if "%err100%"=="" if %err10%==0 set err10=
-:onError1
-for %%i in (0 1 2 3 4 5 6 7 8 9) do if errorlevel %err100%%err10%%%i set err1=%%i
-goto onErrorEnd
-:onError200
-for %%i in (0 1 2 3 4 5) do if errorlevel 2%%i0 set err10=%%i
-if err10==5 for %%i in (0 1 2 3 4 5) do if errorlevel 25%%i set err1=%%i
-if not err10==5 goto onError1
-:onErrorEnd
-set ANT_ERROR=%err100%%err10%%err1%
-for %%i in (1 10 100) do set err%%i=
-
-:end
-rem bug ID 32069: resetting an undefined env variable changes the errorlevel.
-if not "%_JAVACMD%"=="" set _JAVACMD=
-if not "%_ANT_CMD_LINE_ARGS%"=="" set ANT_CMD_LINE_ARGS=
-
-if "%ANT_ERROR%"=="0" goto mainEnd
-
-rem Set the return code if we are not in NT. We can only set
-rem a value of 1, but it's better than nothing.
-if not "%OS%"=="Windows_NT" echo 1 > nul | choice /n /c:1
-
-rem Set the ERRORLEVEL if we are running NT.
-if "%OS%"=="Windows_NT" color 00
-
-goto omega
-
-:mainEnd
-
-rem If there were no errors, we run the post script.
-if "%OS%"=="Windows_NT" @endlocal
-if "%OS%"=="WINNT" @endlocal
-
-if "%HOME%"=="" goto homeDrivePathPost
-if exist "%HOME%\rhq-antrc_post.bat" call
"%HOME%\rhq-antrc_post.bat"
-
-:homeDrivePathPost
-if "%HOMEDRIVE%%HOMEPATH%"=="" goto userProfilePost
-if "%HOMEDRIVE%%HOMEPATH%"=="%HOME%" goto userProfilePost
-if exist "%HOMEDRIVE%%HOMEPATH%\rhq-antrc_post.bat" call
"%HOMEDRIVE%%HOMEPATH%\rhq-antrc_post.bat"
-
-:userProfilePost
-if "%USERPROFILE%"=="" goto omega
-if "%USERPROFILE%"=="%HOME%" goto omega
-if "%USERPROFILE%"=="%HOMEDRIVE%%HOMEPATH%" goto omega
-if exist "%USERPROFILE%\rhq-antrc_post.bat" call
"%USERPROFILE%\rhq-antrc_post.bat"
-
-:omega
-
+@echo off
+
+REM Licensed to the Apache Software Foundation (ASF) under one or more
+REM contributor license agreements. See the NOTICE file distributed with
+REM this work for additional information regarding copyright ownership.
+REM The ASF licenses this file to You under the Apache License, Version 2.0
+REM (the "License"); you may not use this file except in compliance with
+REM the License. You may obtain a copy of the License at
+REM
+REM
http://www.apache.org/licenses/LICENSE-2.0
+REM
+REM Unless required by applicable law or agreed to in writing, software
+REM distributed under the License is distributed on an "AS IS" BASIS,
+REM WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+REM See the License for the specific language governing permissions and
+REM limitations under the License.
+
+REM This is an inordinately troublesome piece of code, particularly because it
+REM tries to work on both Win9x and WinNT-based systems. If we could abandon '9x
+REM support, things would be much easier, but sadly, it is not yet time.
+REM Be cautious about editing this, and only add WinNT specific stuff in code that
+REM only runs on WinNT.
+
+REM -----RHQ CHANGES START-----
+REM THIS FILE WAS ORIGINALLY ANT.BAT VERSION 1.8.0
+REM IT HAS BEEN ALTERED IN THE FOLLOWING WAYS:
+REM 1. -main ARGUMENT WAS ADDED TO THE ANT START COMMAND
+REM 2. ANT_HOME HAS BEEN RENAMED TO RHQ_ANT_HOME
+REM 3. antrc_pre/post.bat HAVE BEEN RENAMED TO rhq-antrc_pre/post.bat
+REM -----RHQ CHANGES STOP-----
+
+if "%HOME%"=="" goto homeDrivePathPre
+if exist "%HOME%\rhq-antrc_pre.bat" call "%HOME%\rhq-antrc_pre.bat"
+
+:homeDrivePathPre
+if "%HOMEDRIVE%%HOMEPATH%"=="" goto userProfilePre
+if "%HOMEDRIVE%%HOMEPATH%"=="%HOME%" goto userProfilePre
+if exist "%HOMEDRIVE%%HOMEPATH%\rhq-antrc_pre.bat" call
"%HOMEDRIVE%%HOMEPATH%\rhq-antrc_pre.bat"
+
+:userProfilePre
+if "%USERPROFILE%"=="" goto alpha
+if "%USERPROFILE%"=="%HOME%" goto alpha
+if "%USERPROFILE%"=="%HOMEDRIVE%%HOMEPATH%" goto alpha
+if exist "%USERPROFILE%\rhq-antrc_pre.bat" call
"%USERPROFILE%\rhq-antrc_pre.bat"
+
+:alpha
+
+if "%OS%"=="Windows_NT" @setlocal
+if "%OS%"=="WINNT" @setlocal
+
+if "%RHQ_ANT_HOME%"=="" goto setDefaultAntHome
+
+:stripAntHome
+if not _%RHQ_ANT_HOME:~-1%==_\ goto checkClasspath
+set RHQ_ANT_HOME=%RHQ_ANT_HOME:~0,-1%
+goto stripAntHome
+
+:setDefaultAntHome
+rem %~dp0 is expanded pathname of the current script under NT
+set RHQ_ANT_HOME=%~dp0..
+
+:checkClasspath
+set _USE_CLASSPATH=yes
+rem CLASSPATH must not be used if it is equal to ""
+if "%CLASSPATH%"=="""" set _USE_CLASSPATH=no
+if "%CLASSPATH%"=="" set _USE_CLASSPATH=no
+
+rem Slurp the command line arguments. This loop allows for an unlimited number
+rem of arguments (up to the command line limit, anyway).
+:setupArgs
+if ""%1""=="""" goto doneStart
+if ""%1""==""-noclasspath"" goto clearclasspath
+set ANT_CMD_LINE_ARGS=%ANT_CMD_LINE_ARGS% %1
+shift
+goto setupArgs
+
+rem here is there is a -noclasspath in the options
+:clearclasspath
+set _USE_CLASSPATH=no
+shift
+goto setupArgs
+
+rem This label provides a place for the argument list loop to break out
+rem and for NT handling to skip to.
+
+:doneStart
+
+if "%_USE_CLASSPATH%"=="no" goto findAntHome
+
+:stripClasspath
+if not _%CLASSPATH:~-1%==_\ goto findAntHome
+set CLASSPATH=%CLASSPATH:~0,-1%
+goto stripClasspath
+
+:findAntHome
+rem find RHQ_ANT_HOME if it does not exist due to either an invalid value passed
+rem by the user or the %0 problem on Windows 9x
+if exist "%RHQ_ANT_HOME%\lib\ant.jar" goto checkJava
+
+rem check for ant in Program Files
+if not exist "%ProgramFiles%\ant" goto checkSystemDrive
+set RHQ_ANT_HOME=%ProgramFiles%\ant
+goto checkJava
+
+:checkSystemDrive
+rem check for ant in root directory of system drive
+if not exist %SystemDrive%\ant\lib\ant.jar goto checkCDrive
+set RHQ_ANT_HOME=%SystemDrive%\ant
+goto checkJava
+
+:checkCDrive
+rem check for ant in C:\ant for Win9X users
+if not exist C:\ant\lib\ant.jar goto noAntHome
+set RHQ_ANT_HOME=C:\ant
+goto checkJava
+
+:noAntHome
+echo RHQ_ANT_HOME is set incorrectly or ant could not be located. Please set
RHQ_ANT_HOME.
+goto end
+
+:checkJava
+set _JAVACMD=%JAVACMD%
+
+if "%JAVA_HOME%" == "" goto noJavaHome
+if not exist "%JAVA_HOME%\bin\java.exe" goto noJavaHome
+if "%_JAVACMD%" == "" set _JAVACMD=%JAVA_HOME%\bin\java.exe
+goto checkJikes
+
+:noJavaHome
+if "%_JAVACMD%" == "" set _JAVACMD=java.exe
+
+:checkJikes
+if not "%JIKESPATH%"=="" goto runAntWithJikes
+
+:runAnt
+if "%_USE_CLASSPATH%"=="no" goto runAntNoClasspath
+:runAntWithClasspath
+"%_JAVACMD%" %ANT_OPTS% -classpath
"%RHQ_ANT_HOME%\lib\ant-launcher.jar" "-Dant.home=%RHQ_ANT_HOME%"
org.apache.tools.ant.launch.Launcher %ANT_ARGS% -cp "%CLASSPATH%" -main
org.rhq.bundle.ant.AntMain %ANT_CMD_LINE_ARGS%
+rem Check the error code of the Ant build
+if not "%OS%"=="Windows_NT" goto onError
+set ANT_ERROR=%ERRORLEVEL%
+goto end
+
+:runAntNoClasspath
+"%_JAVACMD%" %ANT_OPTS% -classpath
"%RHQ_ANT_HOME%\lib\ant-launcher.jar" "-Dant.home=%RHQ_ANT_HOME%"
org.apache.tools.ant.launch.Launcher %ANT_ARGS% -main org.rhq.bundle.ant.AntMain
%ANT_CMD_LINE_ARGS%
+rem Check the error code of the Ant build
+if not "%OS%"=="Windows_NT" goto onError
+set ANT_ERROR=%ERRORLEVEL%
+goto end
+
+:runAntWithJikes
+
+if not _%JIKESPATH:~-1%==_\ goto checkJikesAndClasspath
+set JIKESPATH=%JIKESPATH:~0,-1%
+goto runAntWithJikes
+
+:checkJikesAndClasspath
+
+if "%_USE_CLASSPATH%"=="no" goto runAntWithJikesNoClasspath
+
+:runAntWithJikesAndClasspath
+"%_JAVACMD%" %ANT_OPTS% -classpath
"%RHQ_ANT_HOME%\lib\ant-launcher.jar" "-Dant.home=%RHQ_ANT_HOME%"
"-Djikes.class.path=%JIKESPATH%" org.apache.tools.ant.launch.Launcher %ANT_ARGS%
-cp "%CLASSPATH%" -main org.rhq.bundle.ant.AntMain %ANT_CMD_LINE_ARGS%
+rem Check the error code of the Ant build
+if not "%OS%"=="Windows_NT" goto onError
+set ANT_ERROR=%ERRORLEVEL%
+goto end
+
+:runAntWithJikesNoClasspath
+"%_JAVACMD%" %ANT_OPTS% -classpath
"%RHQ_ANT_HOME%\lib\ant-launcher.jar" "-Dant.home=%RHQ_ANT_HOME%"
"-Djikes.class.path=%JIKESPATH%" org.apache.tools.ant.launch.Launcher %ANT_ARGS%
-main org.rhq.bundle.ant.AntMain %ANT_CMD_LINE_ARGS%
+rem Check the error code of the Ant build
+if not "%OS%"=="Windows_NT" goto onError
+set ANT_ERROR=%ERRORLEVEL%
+goto end
+
+:onError
+rem Windows 9x way of checking the error code. It matches via brute force.
+for %%i in (1 10 100) do set err%%i=
+for %%i in (0 1 2) do if errorlevel %%i00 set err100=%%i
+if %err100%==2 goto onError200
+if %err100%==0 set err100=
+for %%i in (0 1 2 3 4 5 6 7 8 9) do if errorlevel %err100%%%i0 set err10=%%i
+if "%err100%"=="" if %err10%==0 set err10=
+:onError1
+for %%i in (0 1 2 3 4 5 6 7 8 9) do if errorlevel %err100%%err10%%%i set err1=%%i
+goto onErrorEnd
+:onError200
+for %%i in (0 1 2 3 4 5) do if errorlevel 2%%i0 set err10=%%i
+if err10==5 for %%i in (0 1 2 3 4 5) do if errorlevel 25%%i set err1=%%i
+if not err10==5 goto onError1
+:onErrorEnd
+set ANT_ERROR=%err100%%err10%%err1%
+for %%i in (1 10 100) do set err%%i=
+
+:end
+rem bug ID 32069: resetting an undefined env variable changes the errorlevel.
+if not "%_JAVACMD%"=="" set _JAVACMD=
+if not "%_ANT_CMD_LINE_ARGS%"=="" set ANT_CMD_LINE_ARGS=
+
+if "%ANT_ERROR%"=="0" goto mainEnd
+
+rem Set the return code if we are not in NT. We can only set
+rem a value of 1, but it's better than nothing.
+if not "%OS%"=="Windows_NT" echo 1 > nul | choice /n /c:1
+
+rem Set the ERRORLEVEL if we are running NT.
+if "%OS%"=="Windows_NT" color 00
+
+goto omega
+
+:mainEnd
+
+rem If there were no errors, we run the post script.
+if "%OS%"=="Windows_NT" @endlocal
+if "%OS%"=="WINNT" @endlocal
+
+if "%HOME%"=="" goto homeDrivePathPost
+if exist "%HOME%\rhq-antrc_post.bat" call
"%HOME%\rhq-antrc_post.bat"
+
+:homeDrivePathPost
+if "%HOMEDRIVE%%HOMEPATH%"=="" goto userProfilePost
+if "%HOMEDRIVE%%HOMEPATH%"=="%HOME%" goto userProfilePost
+if exist "%HOMEDRIVE%%HOMEPATH%\rhq-antrc_post.bat" call
"%HOMEDRIVE%%HOMEPATH%\rhq-antrc_post.bat"
+
+:userProfilePost
+if "%USERPROFILE%"=="" goto omega
+if "%USERPROFILE%"=="%HOME%" goto omega
+if "%USERPROFILE%"=="%HOMEDRIVE%%HOMEPATH%" goto omega
+if exist "%USERPROFILE%\rhq-antrc_post.bat" call
"%USERPROFILE%\rhq-antrc_post.bat"
+
+:omega
+
commit 35dd7b6cb4ced5583ece7a84c1a09fc13be20cc1
Author: Jay Shaughnessy <jshaughn(a)redhat.com>
Date: Mon Feb 14 17:57:12 2011 -0500
Added null protection to widget destroy login in AbstractSelector
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/selector/AbstractSelector.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/selector/AbstractSelector.java
index 83ba909..ba6dcf6 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/selector/AbstractSelector.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/selector/AbstractSelector.java
@@ -214,18 +214,30 @@ public abstract class AbstractSelector<T> extends
LocatableVLayout {
// For reasons unknown, possibly issues in smartgwt's cleanup of VStack and
SectionStack, these
// widgets did not always get destroyed (for example, if something was moved to
assigned, but nothing
// was moved to available - go figure), so destroy them manually when the other
cleanup is already done.
- availableGrid.removeFromParent();
- availableGrid.destroy();
- assignedGrid.removeFromParent();
- assignedGrid.destroy();
- addButton.removeFromParent();
- addButton.destroy();
- addAllButton.removeFromParent();
- addAllButton.destroy();
- removeButton.removeFromParent();
- removeButton.destroy();
- removeAllButton.removeFromParent();
- removeAllButton.destroy();
+ if (null != availableGrid) {
+ availableGrid.removeFromParent();
+ availableGrid.destroy();
+ }
+ if (null != assignedGrid) {
+ assignedGrid.removeFromParent();
+ assignedGrid.destroy();
+ }
+ if (null != addButton) {
+ addButton.removeFromParent();
+ addButton.destroy();
+ }
+ if (null != addAllButton) {
+ addAllButton.removeFromParent();
+ addAllButton.destroy();
+ }
+ if (null != removeButton) {
+ removeButton.removeFromParent();
+ removeButton.destroy();
+ }
+ if (null != removeAllButton) {
+ removeAllButton.removeFromParent();
+ removeAllButton.destroy();
+ }
}
private SectionStack buildAvailableItemsStack() {
commit 43699364714860b1eee85adae4f102305d12a97c
Author: Jay Shaughnessy <jshaughn(a)redhat.com>
Date: Mon Feb 14 17:56:44 2011 -0500
Work for more consistent handling of Table row links and dbl click support.
- TableSection now has a default impl of configureTable(), and sublasses
need to take it into consideration.
- BZ-535147 fix as part of this (recent alerts portlet work)
- Add AlertDefLink to Linkmanager
- Fixed link issue for trait list
- Fixed link issue for config history list
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/LinkManager.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/LinkManager.java
index 1dc2dcf..640ba32 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/LinkManager.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/LinkManager.java
@@ -146,8 +146,15 @@ public class LinkManager {
return link;
}
- public static String getSubsystemAlertDefsLink() {
- return "/rhq/subsystem/alertDefinitions.xhtml";
+ public static String getSubsystemAlertDefinitionLink(int resourceId, int
alertDefinitionId) {
+ String link;
+ if (GWT) {
+ link = "#Resource/" + resourceId + "/Alerts/Definitions/"
+ alertDefinitionId;
+ } else {
+ link = "/rhq/subsystem/alertDefinitions.xhtml";
+ }
+
+ return link;
}
public static String getAutodiscoveryQueueLink() {
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/roles/RolesView.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/roles/RolesView.java
index 190045a..bd6b812 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/roles/RolesView.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/roles/RolesView.java
@@ -60,8 +60,6 @@ public class RolesView extends TableSection<RolesDataSource>
implements Bookmark
@Override
protected void configureTable() {
- super.configureTable();
-
ListGridField nameField = new ListGridField(RolesDataSource.Field.NAME, 150);
ListGridField descriptionField = new
ListGridField(RolesDataSource.Field.DESCRIPTION);
@@ -102,6 +100,8 @@ public class RolesView extends TableSection<RolesDataSource>
implements Bookmark
});
fetchManageSecurityPermissionAsync();
+
+ super.configureTable();
}
private void fetchManageSecurityPermissionAsync() {
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/users/UsersView.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/users/UsersView.java
index 4249101..e57bafa 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/users/UsersView.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/admin/users/UsersView.java
@@ -72,6 +72,8 @@ public class UsersView extends TableSection<UsersDataSource> {
addTableAction(extendLocatorId("New"), MSG.common_button_new(),
createNewAction());
fetchManageSecurityPermissionAsync();
+
+ super.configureTable();
}
private void fetchManageSecurityPermissionAsync() {
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/AlertDataSource.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/AlertDataSource.java
index 65fb439..02c76a2 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/AlertDataSource.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/AlertDataSource.java
@@ -107,6 +107,14 @@ public class AlertDataSource extends RPCDataSource<Alert> {
fields.add(ctimeField);
ListGridField nameField = new ListGridField("name",
MSG.view_alerts_field_name());
+ nameField.setCellFormatter(new CellFormatter() {
+ public String format(Object o, ListGridRecord listGridRecord, int i, int i1)
{
+ Integer resourceId =
listGridRecord.getAttributeAsInt("resourceId");
+ Integer defId =
listGridRecord.getAttributeAsInt("definitionId");
+ String url = LinkManager.getSubsystemAlertDefinitionLink(resourceId,
defId);
+ return SeleniumUtility.getLocatableHref(url, o.toString(), null);
+ }
+ });
fields.add(nameField);
ListGridField conditionField = new ListGridField("conditionText",
MSG.view_alerts_field_condition_text());
@@ -231,6 +239,7 @@ public class AlertDataSource extends RPCDataSource<Alert> {
}
record.setAttribute("acknowledgingSubject",
from.getAcknowledgingSubject());
+ record.setAttribute("definitionId",
from.getAlertDefinition().getId());
record.setAttribute("resourceId",
from.getAlertDefinition().getResource().getId());
record.setAttribute("resourceName",
from.getAlertDefinition().getResource().getName());
record.setAttribute("name", from.getAlertDefinition().getName());
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/AlertHistoryView.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/AlertHistoryView.java
index 4d3c2bc..98e4b34 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/AlertHistoryView.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/AlertHistoryView.java
@@ -109,6 +109,13 @@ public class AlertHistoryView extends
TableSection<AlertDataSource> {
ArrayList<ListGridField> dataSourceFields =
getDataSource().getListGridFields();
getListGrid().setFields(dataSourceFields.toArray(new
ListGridField[dataSourceFields.size()]));
setupTableInteractions(this.hasWriteAccess);
+
+ super.configureTable();
+ }
+
+ @Override
+ protected String getDetailsLinkColumnName() {
+ return AlertCriteria.SORT_FIELD_CTIME;
}
protected void setupTableInteractions(final boolean hasWriteAccess) {
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/AbstractAlertDefinitionsView.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/AbstractAlertDefinitionsView.java
index a1c48f6..376d659 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/AbstractAlertDefinitionsView.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/alert/definitions/AbstractAlertDefinitionsView.java
@@ -99,6 +99,7 @@ public abstract class AbstractAlertDefinitionsView extends
TableSection<Abstract
}
});
+ super.configureTable();
}
@Override
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/table/TableSection.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/table/TableSection.java
index 682b3d8..0da09aa 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/table/TableSection.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/components/table/TableSection.java
@@ -30,12 +30,12 @@ import com.smartgwt.client.types.AnimationEffect;
import com.smartgwt.client.types.VerticalAlignment;
import com.smartgwt.client.widgets.AnimationCallback;
import com.smartgwt.client.widgets.Canvas;
+import com.smartgwt.client.widgets.events.DoubleClickEvent;
+import com.smartgwt.client.widgets.events.DoubleClickHandler;
import com.smartgwt.client.widgets.grid.CellFormatter;
import com.smartgwt.client.widgets.grid.ListGrid;
import com.smartgwt.client.widgets.grid.ListGridField;
import com.smartgwt.client.widgets.grid.ListGridRecord;
-import com.smartgwt.client.widgets.grid.events.CellDoubleClickEvent;
-import com.smartgwt.client.widgets.grid.events.CellDoubleClickHandler;
import com.smartgwt.client.widgets.layout.VLayout;
import org.rhq.enterprise.gui.coregui.client.BookmarkableView;
@@ -107,9 +107,18 @@ public abstract class TableSection<DS extends RPCDataSource>
extends Table<DS> i
}
}
+ /*
+ * The default implementation wraps the @{link getDetailsLinkColumnCellFormatter()}
column with the
+ * @{link getDetailsLinkColumnCellFormatter()}. This is typically the 'name'
column linking to the detail
+ * view, given the 'id'. Also, establishes a double click handler for the row
which invokes
+ * @{link showDetails()}</br>
+ * </br>
+ * In general, in overrides, call super.configureTable *after* manipulating the
ListGrid fields.
+ *
+ * @see
org.rhq.enterprise.gui.coregui.client.components.table.Table#configureTable()
+ */
@Override
- protected void onDraw() {
- super.onDraw();
+ protected void configureTable() {
// Make the value of some specific field a link to the details view for the
corresponding record
ListGrid grid = getListGrid();
@@ -118,16 +127,27 @@ public abstract class TableSection<DS extends RPCDataSource>
extends Table<DS> i
field.setCellFormatter(getDetailsLinkColumnCellFormatter());
}
- // Make double-clicking the row an alternate means to go to the details view.
- getListGrid().addCellDoubleClickHandler(new CellDoubleClickHandler() {
+ setListGridDoubleClickHandler(new DoubleClickHandler() {
@Override
- public void onCellDoubleClick(CellDoubleClickEvent event) {
- showDetails(event.getRecord());
+ public void onDoubleClick(DoubleClickEvent event) {
+ ListGrid listGrid = (ListGrid) event.getSource();
+ ListGridRecord[] selectedRows = listGrid.getSelection();
+ if (selectedRows != null && selectedRows.length == 1) {
+ showDetails(selectedRows[0]);
+ }
}
});
}
/**
+ * Override if you don't want FIELD_NAME to be wrapped ina link.
+ * @return the name of the field to be wrapped, or null if no field should be
wrapped.
+ */
+ protected String getDetailsLinkColumnName() {
+ return FIELD_NAME;
+ }
+
+ /**
* Override if you don't want the detailsLinkColumn to have the default link
wrapper.
* @return the desired CellFormatter.
*/
@@ -142,14 +162,6 @@ public abstract class TableSection<DS extends RPCDataSource>
extends Table<DS> i
}
/**
- * Override if you don't want FIELD_NAME to be wrapped ina link.
- * @return the name of the field to be wrapped, or null if no field should be
wrapped.
- */
- protected String getDetailsLinkColumnName() {
- return FIELD_NAME;
- }
-
- /**
* Shows the details view for the given record of the table.
*
* The default implementation of this method assumes there is an
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/alerts/RecentAlertsPortlet.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/alerts/RecentAlertsPortlet.java
index bcc79be..f8b7239 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/alerts/RecentAlertsPortlet.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/dashboard/portlets/recent/alerts/RecentAlertsPortlet.java
@@ -24,6 +24,8 @@ import com.google.gwt.user.client.Timer;
import com.smartgwt.client.types.Overflow;
import com.smartgwt.client.widgets.Canvas;
import com.smartgwt.client.widgets.HTMLFlow;
+import com.smartgwt.client.widgets.events.DoubleClickEvent;
+import com.smartgwt.client.widgets.events.DoubleClickHandler;
import com.smartgwt.client.widgets.form.DynamicForm;
import com.smartgwt.client.widgets.form.events.SubmitValuesEvent;
import com.smartgwt.client.widgets.form.events.SubmitValuesHandler;
@@ -32,6 +34,7 @@ import com.smartgwt.client.widgets.form.fields.SpacerItem;
import com.smartgwt.client.widgets.form.fields.events.ChangeEvent;
import com.smartgwt.client.widgets.form.fields.events.ChangeHandler;
import com.smartgwt.client.widgets.grid.CellFormatter;
+import com.smartgwt.client.widgets.grid.ListGrid;
import com.smartgwt.client.widgets.grid.ListGridRecord;
import com.smartgwt.client.widgets.layout.VLayout;
@@ -128,13 +131,6 @@ public class RecentAlertsPortlet extends AlertHistoryView implements
CustomSetti
setOverflow(Overflow.VISIBLE);
}
- @Override
- public void showDetails(int id) {
- // the way our superclass AlertDetailsView is impl'ed, we can't view
details from portlet
- // so disallow showing details
- return;
- }
-
public void configure(PortletWindow portletWindow, DashboardPortlet storedPortlet) {
if (null == this.portletWindow && null != portletWindow) {
@@ -627,6 +623,26 @@ public class RecentAlertsPortlet extends AlertHistoryView implements
CustomSetti
}
};
}
+
+ @Override
+ protected void configureTable() {
+ // TODO Auto-generated method stub
+ super.configureTable();
+
+ setListGridDoubleClickHandler(new DoubleClickHandler() {
+ @Override
+ public void onDoubleClick(DoubleClickEvent event) {
+ ListGrid listGrid = (ListGrid) event.getSource();
+ ListGridRecord[] selectedRows = listGrid.getSelection();
+ if (selectedRows != null && selectedRows.length == 1) {
+ Integer recordId = getId(selectedRows[0]);
+ Integer resourceId =
selectedRows[0].getAttributeAsInt("resourceId");
+ CoreGUI.goToView(LinkManager.getSubsystemAlertHistoryLink(resourceId,
recordId));
+ }
+ }
+ });
+ }
+
}
/** Bundles a ResourceSelector instance with labelling in Canvas for display.
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/AbstractMeasurementDataTraitListView.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/AbstractMeasurementDataTraitListView.java
index c5cc4e2..a4911f8 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/AbstractMeasurementDataTraitListView.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/AbstractMeasurementDataTraitListView.java
@@ -65,5 +65,13 @@ public abstract class AbstractMeasurementDataTraitListView extends
TableSection
ListGridField timestampField =
listGrid.getField(MeasurementDataTraitCriteria.SORT_FIELD_TIMESTAMP);
timestampField.setWidth("20%");
timestampField.setCellFormatter(new TimestampCellFormatter());
+
+ super.configureTable();
}
+
+ @Override
+ protected String getDetailsLinkColumnName() {
+ return MeasurementDataTraitCriteria.SORT_FIELD_DISPLAY_NAME;
+ }
+
}
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/detail/operation/history/AbstractOperationHistoryListView.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/detail/operation/history/AbstractOperationHistoryListView.java
index 9d296ce..bb48230 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/detail/operation/history/AbstractOperationHistoryListView.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/detail/operation/history/AbstractOperationHistoryListView.java
@@ -52,7 +52,8 @@ import
org.rhq.enterprise.gui.coregui.client.util.selenium.LocatableWindow;
* @author John Mazzitelli
* @author Ian Springer
*/
-public abstract class AbstractOperationHistoryListView<T extends
AbstractOperationHistoryDataSource> extends TableSection<T > {
+public abstract class AbstractOperationHistoryListView<T extends
AbstractOperationHistoryDataSource> extends
+ TableSection<T> {
private static final String HEADER_ICON =
"subsystems/control/Operation_24.png";
@@ -62,8 +63,7 @@ public abstract class AbstractOperationHistoryListView<T extends
AbstractOperati
setHeaderIcon(HEADER_ICON);
}
- public AbstractOperationHistoryListView(String locatorId, T dataSource, String
title,
- Criteria criteria) {
+ public AbstractOperationHistoryListView(String locatorId, T dataSource, String title,
Criteria criteria) {
super(locatorId, title, criteria);
setDataSource(dataSource);
}
@@ -72,8 +72,6 @@ public abstract class AbstractOperationHistoryListView<T extends
AbstractOperati
@Override
protected void configureTable() {
- super.configureTable();
-
List<ListGridField> fields = createFields();
setListGridFields(fields.toArray(new ListGridField[fields.size()]));
@@ -90,19 +88,20 @@ public abstract class AbstractOperationHistoryListView<T extends
AbstractOperati
});
// TODO: i18n
- addTableAction(extendLocatorId("ForceDelete"), "Force
Delete", getDeleteConfirmMessage(),
- new TableAction() {
- public boolean isEnabled(ListGridRecord[] selection) {
- int count = selection.length;
- return (count >= 1 && hasControlPermission());
- }
+ addTableAction(extendLocatorId("ForceDelete"), "Force
Delete", getDeleteConfirmMessage(), new TableAction() {
+ public boolean isEnabled(ListGridRecord[] selection) {
+ int count = selection.length;
+ return (count >= 1 && hasControlPermission());
+ }
- public void executeAction(ListGridRecord[] selection, Object actionValue)
{
- DSRequest requestProperties = new DSRequest();
- requestProperties.setAttribute("force", true);
- deleteSelectedRecords(requestProperties);
- }
- });
+ public void executeAction(ListGridRecord[] selection, Object actionValue) {
+ DSRequest requestProperties = new DSRequest();
+ requestProperties.setAttribute("force", true);
+ deleteSelectedRecords(requestProperties);
+ }
+ });
+
+ super.configureTable();
}
protected List<ListGridField> createFields() {
@@ -231,8 +230,8 @@ public abstract class AbstractOperationHistoryListView<T extends
AbstractOperati
}
protected ListGridField createResourceField() {
- ListGridField resourceField = new
ListGridField(ResourceOperationHistoryDataSource.Field.RESOURCE,
- MSG.common_title_resource());
+ ListGridField resourceField = new
ListGridField(ResourceOperationHistoryDataSource.Field.RESOURCE, MSG
+ .common_title_resource());
resourceField.setAlign(Alignment.LEFT);
resourceField.setCellAlign(Alignment.LEFT);
//resourceField.setSuppressValueIcon(true);
@@ -252,6 +251,4 @@ public abstract class AbstractOperationHistoryListView<T extends
AbstractOperati
return AbstractOperationHistoryDataSource.Field.OPERATION_NAME;
}
-
-
}
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/detail/operation/schedule/AbstractOperationScheduleListView.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/detail/operation/schedule/AbstractOperationScheduleListView.java
index 152260f..8d9e354 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/detail/operation/schedule/AbstractOperationScheduleListView.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/detail/operation/schedule/AbstractOperationScheduleListView.java
@@ -31,7 +31,8 @@ import
org.rhq.enterprise.gui.coregui.client.components.table.TableSection;
*/
public abstract class AbstractOperationScheduleListView extends
TableSection<AbstractOperationScheduleDataSource> {
- public AbstractOperationScheduleListView(String locatorId,
AbstractOperationScheduleDataSource dataSource, String title) {
+ public AbstractOperationScheduleListView(String locatorId,
AbstractOperationScheduleDataSource dataSource,
+ String title) {
super(locatorId, title);
setDataSource(dataSource);
@@ -41,11 +42,10 @@ public abstract class AbstractOperationScheduleListView extends
TableSection<Abs
@Override
protected void configureTable() {
- super.configureTable();
-
ListGridField idField = new
ListGridField(AbstractOperationScheduleDataSource.Field.ID, 70);
- ListGridField operationField = new
ListGridField(AbstractOperationScheduleDataSource.Field.OPERATION_DISPLAY_NAME, 180);
+ ListGridField operationField = new ListGridField(
+ AbstractOperationScheduleDataSource.Field.OPERATION_DISPLAY_NAME, 180);
ListGridField subjectField = new
ListGridField(AbstractOperationScheduleDataSource.Field.SUBJECT, 110);
subjectField.setCellFormatter(new SubjectRecordCellFormatter());
@@ -53,7 +53,7 @@ public abstract class AbstractOperationScheduleListView extends
TableSection<Abs
//ListGridField jobTriggerField = new
ListGridField(OperationScheduleDataSource.Field.JOB_TRIGGER, 300);
ListGridField nextFireTimeField = new
ListGridField(AbstractOperationScheduleDataSource.Field.NEXT_FIRE_TIME,
- "Next Scheduled Execution", 190);
+ "Next Scheduled Execution", 190);
ListGridField descriptionField = new
ListGridField(AbstractOperationScheduleDataSource.Field.DESCRIPTION);
@@ -79,7 +79,9 @@ public abstract class AbstractOperationScheduleListView extends
TableSection<Abs
public void executeAction(ListGridRecord[] selection, Object actionValue)
{
deleteSelectedRecords();
}
- });
+ });
+
+ super.configureTable();
}
@Override
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/event/EventCompositeHistoryView.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/event/EventCompositeHistoryView.java
index 3434179..7209c17 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/event/EventCompositeHistoryView.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/common/event/EventCompositeHistoryView.java
@@ -121,7 +121,7 @@ public class EventCompositeHistoryView extends TableSection {
setupTableInteractions();
-
+ super.configureTable();
}
private void setupTableInteractions() {
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/definitions/GroupDefinitionListView.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/definitions/GroupDefinitionListView.java
index b73b43b..2f5f76e 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/definitions/GroupDefinitionListView.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/definitions/GroupDefinitionListView.java
@@ -144,6 +144,8 @@ public class GroupDefinitionListView extends TableSection {
});
}
});
+
+ super.configureTable();
}
@Override
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/traits/TraitsView.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/traits/TraitsView.java
index f11c678..152c918 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/traits/TraitsView.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/groups/detail/monitoring/traits/TraitsView.java
@@ -22,8 +22,8 @@ import com.smartgwt.client.data.Criteria;
import com.smartgwt.client.types.GroupStartOpen;
import com.smartgwt.client.widgets.Canvas;
import com.smartgwt.client.widgets.grid.ListGrid;
-
import com.smartgwt.client.widgets.grid.ListGridField;
+
import org.rhq.core.domain.criteria.MeasurementDataTraitCriteria;
import
org.rhq.enterprise.gui.coregui.client.inventory.common.AbstractMeasurementDataTraitListView;
@@ -42,8 +42,6 @@ public class TraitsView extends AbstractMeasurementDataTraitListView {
@Override
protected void configureTable() {
- super.configureTable();
-
ListGrid listGrid = getListGrid();
listGrid.setShowAllRecords(true);
@@ -55,7 +53,7 @@ public class TraitsView extends AbstractMeasurementDataTraitListView {
resourceNameField.setWidth("20%");
resourceNameField.setCanGroupBy(true);
-
+ super.configureTable();
}
@Override
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/configuration/ConfigurationHistoryView.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/configuration/ConfigurationHistoryView.java
index 9e3db2d..df13c8f 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/configuration/ConfigurationHistoryView.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/configuration/ConfigurationHistoryView.java
@@ -38,6 +38,7 @@ import
org.rhq.enterprise.gui.coregui.client.components.table.AbstractTableActio
import org.rhq.enterprise.gui.coregui.client.components.table.TableActionEnablement;
import org.rhq.enterprise.gui.coregui.client.components.table.TableSection;
import org.rhq.enterprise.gui.coregui.client.components.view.ViewName;
+import
org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.configuration.ConfigurationHistoryDataSource.Field;
import org.rhq.enterprise.gui.coregui.client.util.selenium.SeleniumUtility;
/**
@@ -146,11 +147,12 @@ public class ConfigurationHistoryView extends TableSection {
}
});
+ super.configureTable();
}
@Override
protected String getDetailsLinkColumnName() {
- return FIELD_ID;
+ return Field.CREATED_TIME;
}
@Override
diff --git
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/traits/TraitsView.java
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/traits/TraitsView.java
index 513fee8..55a6f99 100644
---
a/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/traits/TraitsView.java
+++
b/modules/enterprise/gui/coregui/src/main/java/org/rhq/enterprise/gui/coregui/client/inventory/resource/detail/monitoring/traits/TraitsView.java
@@ -19,8 +19,8 @@
package
org.rhq.enterprise.gui.coregui.client.inventory.resource.detail.monitoring.traits;
import com.smartgwt.client.data.Criteria;
-
import com.smartgwt.client.widgets.Canvas;
+
import org.rhq.core.domain.criteria.MeasurementDataTraitCriteria;
import
org.rhq.enterprise.gui.coregui.client.inventory.common.AbstractMeasurementDataTraitListView;
@@ -44,7 +44,7 @@ public class TraitsView extends AbstractMeasurementDataTraitListView {
@Override
protected void configureTable() {
-
+ super.configureTable();
}
private static Criteria createCriteria(int resourceId) {