Branch: refs/heads/feature/bz1069606-rebase-eap-63 Home: https://github.com/rhq-project/rhq Commit: cda6c7eecd804af3047f7816f15e1608b954ab04 https://github.com/rhq-project/rhq/commit/cda6c7eecd804af3047f7816f15e1608b9... Author: Jirka Kremser jkremser@redhat.com Date: 2013-07-16 (Tue, 16 Jul 2013)
Changed paths: M etc/rhq-ircBot/src/main/java/org/rhq/etc/ircbot/RhqIrcBotListener.java
Log Message: ----------- irc-bot: commit link now points to the GitHub
Commit: bb6f4c87b018811f4ea8175172c8f9a3d7d3b353 https://github.com/rhq-project/rhq/commit/bb6f4c87b018811f4ea8175172c8f9a3d7... Author: Jirka Kremser jkremser@redhat.com Date: 2014-03-18 (Tue, 18 Mar 2014)
Changed paths: M modules/enterprise/server/server-control/src/main/java/org/rhq/server/control/ControlCommand.java M modules/enterprise/server/server-control/src/main/java/org/rhq/server/control/RHQControl.java
Log Message: ----------- [BZ 1073096] - 'rhqctl -h install' tries to install the components instead of showing a help - Finding out whether user wants to just print a help. If it is the case, no warning ('An agent RPM installation was found...') with consequent 30s waiting is displayed.
Commit: 705dca8bfe08e1492684bd9f7ad47a4392e7c1a1 https://github.com/rhq-project/rhq/commit/705dca8bfe08e1492684bd9f7ad47a4392... Author: Jirka Kremser jkremser@redhat.com Date: 2014-03-18 (Tue, 18 Mar 2014)
Changed paths: M modules/enterprise/server/server-control/src/main/java/org/rhq/server/control/ControlCommand.java A modules/enterprise/server/server-control/src/main/java/org/rhq/server/control/RHQPosixParser.java M modules/enterprise/server/server-control/src/main/java/org/rhq/server/control/command/AbstractInstall.java
Log Message: ----------- [BZ 1073096] - Adding the check for any unrecognized arguments.
Commit: 589b486d6431e4074660c202d70aa67ec0c9627e https://github.com/rhq-project/rhq/commit/589b486d6431e4074660c202d70aa67ec0... Author: Jirka Kremser jkremser@redhat.com Date: 2014-03-18 (Tue, 18 Mar 2014)
Changed paths: M modules/enterprise/server/server-control/src/main/java/org/rhq/server/control/RHQControl.java
Log Message: ----------- [BZ 1073096] - Simplifying the code: fail fast is --help option is present.
Commit: 491fb0481a77a7584c15b068c879a567ec10e3dc https://github.com/rhq-project/rhq/commit/491fb0481a77a7584c15b068c879a567ec... Author: Jirka Kremser jkremser@redhat.com Date: 2014-03-18 (Tue, 18 Mar 2014)
Changed paths: M modules/enterprise/server/server-control/src/main/java/org/rhq/server/control/command/Install.java M modules/enterprise/server/server-control/src/main/java/org/rhq/server/control/command/Upgrade.java
Log Message: ----------- [BZ 1073096] - The name of the command should not be part of the command's arguments. It worked in the previous implementation, because it ignored unrecognized options. But not now.
Commit: 5367acfe1258a491ad8056905cd27cca26d2f21e https://github.com/rhq-project/rhq/commit/5367acfe1258a491ad8056905cd27cca26... Author: Jirka Kremser jkremser@redhat.com Date: 2014-03-18 (Tue, 18 Mar 2014)
Changed paths: M modules/enterprise/server/server-control/src/main/java/org/rhq/server/control/ControlCommand.java
Log Message: ----------- [BZ 1073096] - When debugging the rhqctl code I came across to ConcurrentModificationException. Altought it is unlikely to happen in the production code without debuging, it is still posible -> making the copy of undoTasks, because other thread can modify it simultaneously.
Commit: 9458df431b56d769ca037e3f67a1a26a329a24da https://github.com/rhq-project/rhq/commit/9458df431b56d769ca037e3f67a1a26a32... Author: Jirka Kremser jkremser@redhat.com Date: 2014-03-18 (Tue, 18 Mar 2014)
Changed paths: M modules/enterprise/server/server-control/src/main/java/org/rhq/server/control/ControlCommand.java M modules/enterprise/server/server-control/src/main/java/org/rhq/server/control/RHQPosixParser.java
Log Message: ----------- [BZ 1073096] - Showing unrecognized args
Commit: 4921949e2e203015cf09f699b5d7a1352daab3a0 https://github.com/rhq-project/rhq/commit/4921949e2e203015cf09f699b5d7a1352d... Author: Jay Shaughnessy jshaughn@redhat.com Date: 2014-03-20 (Thu, 20 Mar 2014)
Changed paths: M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerBean.java M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerLocal.java M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/storage/StorageNodeOperationsHandlerBean.java M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/storage/StorageNodeOperationsHandlerLocal.java
Log Message: ----------- [1079027] Storage Node (un)deployment can cause deadlock in rhq_storage_node table Initial commit that attempts to remove umbrella transactions starting at many entry points, such that scheduling operations happens in their own trans context. Needs review and testing...
Commit: b6e70d104756db633df7b4ff642c29e3fad81d2b https://github.com/rhq-project/rhq/commit/b6e70d104756db633df7b4ff642c29e3fa... Author: Jay Shaughnessy jshaughn@redhat.com Date: 2014-03-21 (Fri, 21 Mar 2014)
Changed paths: M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerBean.java M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/discovery/DiscoveryBossBean.java M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/discovery/DiscoveryBossLocal.java
Log Message: ----------- Transaction delimiters have been updatedin StorageNode beans to try and prevent db-locking issues. This caused a problem for storage node deployment during mergeInventory, because it relied on an umbrella transaction providing a persisted (but not yet committed) Resource.
Added a general mechanism for performing post-commit actions on newly merged resources and leveraged it to perform linking a StorageNode to a Resource.
Commit: 710c93131f44dc32ab7397dafdec23c086dc2758 https://github.com/rhq-project/rhq/commit/710c93131f44dc32ab7397dafdec23c086... Author: Jay Shaughnessy jshaughn@redhat.com Date: 2014-03-21 (Fri, 21 Mar 2014)
Changed paths: M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerBean.java
Log Message: ----------- Make sure StorageNode is committed before we try and deploy it.
Commit: b8523c3bc2bc09eb7a9ce09005ded4a4a9cd364a https://github.com/rhq-project/rhq/commit/b8523c3bc2bc09eb7a9ce09005ded4a4a9... Author: Jay Shaughnessy jshaughn@redhat.com Date: 2014-03-21 (Fri, 21 Mar 2014)
Changed paths: M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerBean.java
Log Message: ----------- More changes to LinkStorageNode to try and get the transactioning right.
Commit: e2a5830dd84643b65ad324fe6275b5161a755b38 https://github.com/rhq-project/rhq/commit/e2a5830dd84643b65ad324fe6275b5161a... Author: Jay Shaughnessy jshaughn@redhat.com Date: 2014-03-28 (Fri, 28 Mar 2014)
Changed paths: M modules/core/domain/pom.xml M modules/enterprise/server/itests-2/pom.xml
Log Message: ----------- Since the Hibernate4 standard dialect resolver does not recognize Oracle 12, we need to ensure the hibernate.dialect system property is set when running the i-tests.
Commit: 191e6c7ced414bd7b5d2a138227ee4ae8d87d021 https://github.com/rhq-project/rhq/commit/191e6c7ced414bd7b5d2a138227ee4ae8d... Author: Jirka Kremser jkremser@redhat.com Date: 2014-03-28 (Fri, 28 Mar 2014)
Changed paths: M modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/inventory/resource/detail/monitoring/table/MetricsViewDataSource.java M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/MeasurementDataManagerBean.java
Log Message: ----------- [BZ 1081554] - Cannot load metrics error on a resource with no enabled metrics - Not performing the problematic DB query, when no metric on the resource is enabled. Also saving 2 (client-server)) round trips if the enabled metrics # equals to zero.
Commit: 44de78d0d3344d5e982049a299275013c3e3f30a https://github.com/rhq-project/rhq/commit/44de78d0d3344d5e982049a299275013c3... Author: Jay Shaughnessy jshaughn@redhat.com Date: 2014-03-28 (Fri, 28 Mar 2014)
Changed paths: M pom.xml
Log Message: ----------- To support oracle 12c, updating the default driver version. It should be backward compatible to our earlier, supported releases.
Commit: 6b6edc533cdce35a66c8c654806dfe33a80e985b https://github.com/rhq-project/rhq/commit/6b6edc533cdce35a66c8c654806dfe33a8... Author: Heiko W. Rupp hwr@pilhuhn.de Date: 2014-03-31 (Mon, 31 Mar 2014)
Changed paths: M modules/core/client-api/src/main/java/org/rhq/core/clientapi/agent/inventory/CreateResourceRequest.java
Log Message: ----------- Add a missing colon in toString that was confusing
Commit: 78cceb5dfea790ffcec9a9d2d0012b2f56a1fffb https://github.com/rhq-project/rhq/commit/78cceb5dfea790ffcec9a9d2d0012b2f56... Author: Libor Zoubek lzoubek@redhat.com Date: 2014-03-31 (Mon, 31 Mar 2014)
Changed paths: M modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/inventory/groups/detail/ResourceGroupTreeView.java
Log Message: ----------- [BZ 1082767] Group view does not display proper content when user reaches AutoGroup via URL
Fixed ResourceGroupTreeView to optionaly select target group after tree is loaded
Commit: ca99ddfb1ccfc8ccc94482d4c0ef93bf22fcb980 https://github.com/rhq-project/rhq/commit/ca99ddfb1ccfc8ccc94482d4c0ef93bf22... Author: Libor Zoubek lzoubek@redhat.com Date: 2014-03-31 (Mon, 31 Mar 2014)
Changed paths: M modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/alert/definitions/ResourceAlertDefinitionsDataSource.java
Log Message: ----------- [BZ 1076605] The link to Autocluster group alert definition is wrong
Commit: 919604ca697644ecf9fc8109395ecac9d21d781c https://github.com/rhq-project/rhq/commit/919604ca697644ecf9fc8109395ecac9d2... Author: Jay Shaughnessy jshaughn@redhat.com Date: 2014-03-31 (Mon, 31 Mar 2014)
Changed paths: M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerBean.java M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerLocal.java
Log Message: ----------- [1079027] Storage Node (un)deployment can cause deadlock in rhq_storage_node table Fix issue with new transactioning that left some entity changes uncommitted.
Commit: a8ba17c7e52518a3086d1e94a099e281c799eeca https://github.com/rhq-project/rhq/commit/a8ba17c7e52518a3086d1e94a099e281c7... Author: Jay Shaughnessy jshaughn@redhat.com Date: 2014-03-31 (Mon, 31 Mar 2014)
Changed paths: M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerBean.java M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerLocal.java M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/discovery/DiscoveryBossBean.java M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/discovery/DiscoveryBossLocal.java M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/storage/StorageNodeOperationsHandlerBean.java M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/storage/StorageNodeOperationsHandlerLocal.java
Log Message: ----------- Merge branch 'jshaughn/storage'
Conflicts: modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerBean.java
Commit: 5601d865f99b9ffee2b5a2aa94043895449a5d6f https://github.com/rhq-project/rhq/commit/5601d865f99b9ffee2b5a2aa9404389544... Author: Thomas Heute theute@gmail.com Date: 2014-04-01 (Tue, 01 Apr 2014)
Changed paths: M modules/core/dbutils/src/main/java/org/rhq/core/db/Oracle12DatabaseType.java
Log Message: ----------- Very useful typo correction
Commit: 6426862d52dceb7d79e79bdeb24cf945ebe57297 https://github.com/rhq-project/rhq/commit/6426862d52dceb7d79e79bdeb24cf945eb... Author: Jay Shaughnessy jshaughn@redhat.com Date: 2014-04-03 (Thu, 03 Apr 2014)
Changed paths: M modules/enterprise/agent/ant-run.xml M modules/enterprise/agent/src/etc/java-service-wrapper/rhq-agent-wrapper.conf M modules/enterprise/agent/src/etc/java-service-wrapper/windows-x86_32/wrapper.dll M modules/enterprise/agent/src/etc/java-service-wrapper/windows-x86_32/wrapper.exe M modules/enterprise/agent/src/etc/java-service-wrapper/windows-x86_32/wrapper.jar A modules/enterprise/agent/src/etc/java-service-wrapper/windows-x86_64/wrapper.dll A modules/enterprise/agent/src/etc/java-service-wrapper/windows-x86_64/wrapper.exe A modules/enterprise/agent/src/etc/java-service-wrapper/windows-x86_64/wrapper.jar M modules/enterprise/agent/src/etc/rhq-agent-wrapper.bat M modules/enterprise/server/appserver/src/main/bin-resources/bin/internal/rhq-server.bat M modules/enterprise/server/appserver/src/main/bin-resources/bin/internal/rhq-storage.bat M modules/enterprise/server/appserver/src/main/bin-resources/bin/wrapper/rhq-server-wrapper.conf M modules/enterprise/server/appserver/src/main/bin-resources/bin/wrapper/rhq-server-wrapper.inc M modules/enterprise/server/appserver/src/main/bin-resources/bin/wrapper/rhq-storage-wrapper.conf M modules/enterprise/server/appserver/src/main/bin-resources/bin/wrapper/windows-x86_32/wrapper.dll M modules/enterprise/server/appserver/src/main/bin-resources/bin/wrapper/windows-x86_32/wrapper.exe M modules/enterprise/server/appserver/src/main/bin-resources/bin/wrapper/windows-x86_32/wrapper.jar A modules/enterprise/server/appserver/src/main/bin-resources/bin/wrapper/windows-x86_64/wrapper.dll A modules/enterprise/server/appserver/src/main/bin-resources/bin/wrapper/windows-x86_64/wrapper.exe A modules/enterprise/server/appserver/src/main/bin-resources/bin/wrapper/windows-x86_64/wrapper.jar M modules/enterprise/server/appserver/src/main/dev-resources/bin/wrapper/rhq-server-wrapper.inc
Log Message: ----------- [668870] Replace Tanuki Java Service Wrapper with EAP native components to support 32-bit and 64-bit base architecture types - Update JSW with version 3.4.1 and add the 64-bit community version for distribution. - Update scripts to use the proper JSW version based on Win OS architecture and JVM architecture. - Update wrapper .conf and .inc files as needed. - add new server .conf java.additional prop required to prevent logger initialization problem between JSW and EAP. - update logfile loglevel to STATUS for all wrapper logging, this provides more useful logging for server and storage wrapper logs, and trims excessive logging in the agent wrapper log. - fixed numbering issue in dev-container server-wrapper.inc
Commit: 78cf9729cb74923a37d98c0d2b51063b23871243 https://github.com/rhq-project/rhq/commit/78cf9729cb74923a37d98c0d2b51063b23... Author: Thomas Segismont tsegismo@redhat.com Date: 2014-04-04 (Fri, 04 Apr 2014)
Changed paths: M modules/plugins/postgres/src/main/java/org/rhq/plugins/postgres/PostgresServerComponent.java M modules/plugins/postgres/src/main/resources/META-INF/rhq-plugin.xml
Log Message: ----------- Bug 1079361 - Postgres Plugin - Scheduling A New List Process Statistics Operation Fails
The execution of this operation involves a query on the pg_stat_activity view, which format has changes in 9.2 (see http://wiki.postgresql.org/wiki/What%27s_new_in_PostgreSQL_9.2#pg_stat_activ...)
Now the server plugin component adapts the query depending on the Postgres server version
Commit: 5134ff579af71dacc34bbb598a52412e8c0fca14 https://github.com/rhq-project/rhq/commit/5134ff579af71dacc34bbb598a52412e8c... Author: jshaughn jshaughn@redhat.com Date: 2014-04-04 (Fri, 04 Apr 2014)
Changed paths: M modules/enterprise/server/server-control/src/main/java/org/rhq/server/control/ControlCommand.java M modules/enterprise/server/server-control/src/main/java/org/rhq/server/control/RHQControl.java A modules/enterprise/server/server-control/src/main/java/org/rhq/server/control/RHQPosixParser.java M modules/enterprise/server/server-control/src/main/java/org/rhq/server/control/command/AbstractInstall.java M modules/enterprise/server/server-control/src/main/java/org/rhq/server/control/command/Install.java M modules/enterprise/server/server-control/src/main/java/org/rhq/server/control/command/Upgrade.java
Log Message: ----------- Merge pull request #12 from Jiri-Kremser/bug1073096
Bug 1073096 - 'rhqctl -h install' tries to install the components instead of showing a help
Commit: f882515fa88b93a553f3c78e6250c4916ae1a585 https://github.com/rhq-project/rhq/commit/f882515fa88b93a553f3c78e6250c4916a... Author: Jay Shaughnessy jshaughn@redhat.com Date: 2014-04-04 (Fri, 04 Apr 2014)
Changed paths: M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/configuration/ConfigurationManagerRemote.java
Log Message: ----------- [1065461] readOnly configuration is editable via CLI Update some jdoc to reflect that this is the expected behavior when calling from the CLI. read-only and other validation is applied only via the GUI's ConfigurationEditor.
Commit: 2324ad07f5356195b2345bf68cc781f8918f417f https://github.com/rhq-project/rhq/commit/2324ad07f5356195b2345bf68cc781f891... Author: Jay Shaughnessy jshaughn@redhat.com Date: 2014-04-07 (Mon, 07 Apr 2014)
Changed paths: M modules/enterprise/server/appserver/src/main/scripts/rhq-container.build.xml M modules/enterprise/server/installer/src/main/java/org/rhq/enterprise/server/installer/ServerProperties.java M modules/enterprise/server/server-control/src/main/java/org/rhq/server/control/RHQControl.java
Log Message: ----------- [1060353] Non required or unused properties in rhq-server.properties are being required by rhqctl Make the unused oracle props optional and remove them from the supplied rhq-server.properties file.
Commit: b942688114fb6982058edb2222c40ef5a18f183c https://github.com/rhq-project/rhq/commit/b942688114fb6982058edb2222c40ef5a1... Author: Jirka Kremser jkremser@redhat.com Date: 2014-04-07 (Mon, 07 Apr 2014)
Changed paths: M modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/CoreGUI.java M modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/LoginView.java M modules/enterprise/gui/coregui/src/main/webapp/CoreGUI.html M modules/enterprise/gui/coregui/src/main/webapp/css/patternfly.css M modules/enterprise/gui/coregui/src/main/webapp/css/patternfly.min.css A modules/enterprise/gui/coregui/src/main/webapp/js/bootstrap.min.js
Log Message: ----------- [BZ 1069667] - (JON3-17) Make JON login look like other Red Hat products - First prototype. Using the PatternFly default logo.
Commit: 8f3d81ddbfd4ab8d012668ad7f9dd2a77f221923 https://github.com/rhq-project/rhq/commit/8f3d81ddbfd4ab8d012668ad7f9dd2a77f... Author: Jirka Kremser jkremser@redhat.com Date: 2014-04-07 (Mon, 07 Apr 2014)
Changed paths: M modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/CoreGUI.java M modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/LoginView.java M modules/enterprise/gui/coregui/src/main/webapp/CoreGUI.html M modules/enterprise/gui/coregui/src/main/webapp/css/patternfly.min.css M modules/enterprise/gui/coregui/src/main/webapp/img/bg-login.jpg R modules/enterprise/gui/coregui/src/main/webapp/img/brand-lg.png R modules/enterprise/gui/coregui/src/main/webapp/img/brand.png R modules/enterprise/gui/coregui/src/main/webapp/img/brand.svg A modules/enterprise/gui/coregui/src/main/webapp/img/feedback-error-arrow-down.png A modules/enterprise/gui/coregui/src/main/webapp/img/feedback-error-sign.png M modules/enterprise/gui/coregui/src/main/webapp/img/logo.png M modules/enterprise/gui/coregui/src/main/webapp/img/logo.svg A modules/enterprise/gui/coregui/src/main/webapp/login
Log Message: ----------- [BZ 1069667] - (JON3-17) Make JON login look like other Red Hat products - RHQ branding & handling error cases during login process.
Commit: 54af334ddb67f8286a2da6a614be8392342bfde3 https://github.com/rhq-project/rhq/commit/54af334ddb67f8286a2da6a614be839234... Author: Jay Shaughnessy jshaughn@redhat.com Date: 2014-04-07 (Mon, 07 Apr 2014)
Changed paths: M modules/enterprise/server/appserver/src/main/bin-resources/bin/internal/rhq-installer.bat M modules/enterprise/server/appserver/src/main/bin-resources/bin/internal/rhq-server.bat M modules/enterprise/server/appserver/src/main/bin-resources/bin/internal/rhq-storage-installer.bat M modules/enterprise/server/appserver/src/main/bin-resources/bin/internal/rhq-storage.bat M modules/enterprise/server/appserver/src/main/bin-resources/bin/rhq-data-migration.bat A modules/enterprise/server/appserver/src/main/bin-resources/bin/rhq-server-env.bat M modules/enterprise/server/appserver/src/main/bin-resources/bin/rhqctl.bat
Log Message: ----------- [1061311] rhqctl contains user modifiable values that result in an unsupported rhqctl script Introduce rhq-server-env.bat. Analogous .sh file coming in subsequent commit.
Commit: 82416ed019173880186b11a81bc93df2677eed26 https://github.com/rhq-project/rhq/commit/82416ed019173880186b11a81bc93df267... Author: Jay Shaughnessy jshaughn@redhat.com Date: 2014-04-07 (Mon, 07 Apr 2014)
Changed paths: M modules/enterprise/server/installer/src/main/java/org/rhq/enterprise/server/installer/InstallerServiceImpl.java
Log Message: ----------- [1060353] Non required or unused properties in rhq-server.properties are being required by rhqctl Remove some related special-case installer code.
Commit: 60e45c64874989f4136134827399bfaa4f7e164b https://github.com/rhq-project/rhq/commit/60e45c64874989f4136134827399bfaa4f... Author: Jay Shaughnessy jshaughn@redhat.com Date: 2014-04-07 (Mon, 07 Apr 2014)
Changed paths: M modules/enterprise/server/appserver/src/main/bin-resources/bin/internal/rhq-installer.sh M modules/enterprise/server/appserver/src/main/bin-resources/bin/internal/rhq-server.sh M modules/enterprise/server/appserver/src/main/bin-resources/bin/internal/rhq-storage-installer.sh M modules/enterprise/server/appserver/src/main/bin-resources/bin/rhq-data-migration.sh A modules/enterprise/server/appserver/src/main/bin-resources/bin/rhq-server-env.sh M modules/enterprise/server/appserver/src/main/bin-resources/bin/rhqctl
Log Message: ----------- [1061311] rhqctl contains user modifiable values that result in an unsupported rhqctl script Introduce rhq-server-env.sh. Now environment variables are set outside of the actual scripts used for installation, etc.
Commit: 9bd875794b74749c0ee263f01599168e9579f88e https://github.com/rhq-project/rhq/commit/9bd875794b74749c0ee263f01599168e95... Author: Jirka Kremser jkremser@redhat.com Date: 2014-04-08 (Tue, 08 Apr 2014)
Changed paths: M modules/enterprise/server/server-control/src/main/java/org/rhq/server/control/ControlCommand.java M modules/enterprise/server/server-control/src/main/java/org/rhq/server/control/RHQControl.java
Log Message: ----------- [BZ 1073096] - Adding "-h" as a valid help option to isHelp() method.
Commit: 72f91658c25fbff3d5c229372129c2178f435b33 https://github.com/rhq-project/rhq/commit/72f91658c25fbff3d5c229372129c2178f... Author: Mike Thompson mithomps@redhat.com Date: 2014-04-07 (Mon, 07 Apr 2014)
Changed paths: M modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/inventory/common/graph/MetricGraphData.java
Log Message: ----------- BZ 1080472 - The unit in the new d3 charts is not refreshed correctly. Fix the bug that improperly calculates the units of measure on the Y-Axis and on Min Value of chart legend.
Commit: 835eca6a7b14bc92db5f98d336470f9b6ece145e https://github.com/rhq-project/rhq/commit/835eca6a7b14bc92db5f98d336470f9b6e... Author: Thomas Segismont tsegismo@redhat.com Date: 2014-04-08 (Tue, 08 Apr 2014)
Changed paths: M modules/plugins/postgres/src/main/java/org/rhq/plugins/postgres/PostgresTableComponent.java M modules/plugins/postgres/src/main/java/org/rhq/plugins/postgres/PostgresTableDiscoveryComponent.java M modules/plugins/postgres/src/main/resources/META-INF/rhq-plugin.xml
Log Message: ----------- Bug 579810 - Collection of Postgres table metrics fails when the tables are not in the public schema
Changed resource key format ("tablename"->"schemaname.tablename")
Implemented resource upgrade and updated resource component and discovery component
Also changed the availability check: new the resource component checks for table existence instead of looking at the parent database availability
Commit: 45ddd7c1a1c6b8deae6b94ac211929324fc8ed75 https://github.com/rhq-project/rhq/commit/45ddd7c1a1c6b8deae6b94ac211929324f... Author: Thomas Segismont tsegismo@redhat.com Date: 2014-04-08 (Tue, 08 Apr 2014)
Changed paths: M modules/plugins/postgres/src/main/java/org/rhq/plugins/postgres/PostgresTableComponent.java
Log Message: ----------- Bug 1079403 - Postgres Plugin - Table Vacuum Fails
Changed sql query to include the schema which the table is part of.
Also updated table component #invokeOperation method to use connection pooling support
Commit: dbeedced3664c0cda68f4a53b5bc789647cdd5f6 https://github.com/rhq-project/rhq/commit/dbeedced3664c0cda68f4a53b5bc789647... Author: Thomas Segismont tsegismo@redhat.com Date: 2014-04-08 (Tue, 08 Apr 2014)
Changed paths: M modules/plugins/postgres/src/main/java/org/rhq/plugins/postgres/PostgresServerComponent.java
Log Message: ----------- Bug 1082747 - Postgres Plugin - An Invalid Server Configuration Status Should Not Be Stack Trace
Throwing an Exception is the only way a plugin component can fail the process of starting of a resource. So without changing the agent plugin facet we can't rely avoid the stack trace shown on the server.
Still, the stack trace shown when a Postgres server resource is configured with invalid credentials was particularly long, so I changed the plugin component implentation to make the server show a stack trace with no cause and a condensed message ("Invalid password").
Commit: 7f4465405f70af01080aa6af8674f47fe7b14059 https://github.com/rhq-project/rhq/commit/7f4465405f70af01080aa6af8674f47fe7... Author: Jay Shaughnessy jshaughn@redhat.com Date: 2014-04-08 (Tue, 08 Apr 2014)
Changed paths: M modules/enterprise/server/server-control/src/main/java/org/rhq/server/control/command/Upgrade.java
Log Message: ----------- [1061311] rhqctl contains user modifiable values that result in an unsupported rhqctl script Add logic to 'rhqctl upgrade' command to copy rhq-server-env.sh|bat from the old to new server, if it exists. The old, potentially edited, version will be used and the new version will be backed up for reference in case it has new env variables and/or documentation. This behavior is analogous to what we currently do for rhq-agent-env.sh|bat during an agent update.
Also: fix an upgrade problem with server stop at the end of the upgrade.
Commit: 41364182a232879e3982f7c96bce449594ef75af https://github.com/rhq-project/rhq/commit/41364182a232879e3982f7c96bce449594... Author: Jirka Kremser jkremser@redhat.com Date: 2014-04-08 (Tue, 08 Apr 2014)
Changed paths: M modules/enterprise/gui/coregui/pom.xml A modules/enterprise/gui/coregui/src/main/webapp/img/caps.png M modules/enterprise/gui/coregui/src/main/webapp/login
Log Message: ----------- [BZ 1069667] - Adding CAPS LOCK detection and version is now taken during the build time using mvn filtering.
Commit: 175f76d8cbee561554ae52c0099de1e0c22e6c4b https://github.com/rhq-project/rhq/commit/175f76d8cbee561554ae52c0099de1e0c2... Author: Jirka Kremser jkremser@redhat.com Date: 2014-04-08 (Tue, 08 Apr 2014)
Changed paths: M modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/CoreGUI.java M modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/LoginView.java
Log Message: ----------- [BZ 1069667] - Handling the case with session expiration and the ability to redirect to the wanted page after successful login (#Bundles should open bundles view, not the default one which is #Dashboards)
Commit: 25689529635a2ac5d22aec867371b42e1f31cdb4 https://github.com/rhq-project/rhq/commit/25689529635a2ac5d22aec867371b42e1f... Author: Jirka Kremser jkremser@redhat.com Date: 2014-04-08 (Tue, 08 Apr 2014)
Changed paths: A modules/enterprise/gui/coregui/src/main/webapp/js/jquery.capslockstate.js M modules/enterprise/gui/coregui/src/main/webapp/login
Log Message: ----------- [BZ 1069667] - Better CAPS LOCK indication, the previous method didn't find out it the CAPS LOCK key was pressed during writing the password. It also didn't work when writing any numbers.
Commit: f6ee2a32de5d00212da39adfb586f4debf038e78 https://github.com/rhq-project/rhq/commit/f6ee2a32de5d00212da39adfb586f4debf... Author: Heiko W. Rupp hwr@redhat.com Date: 2014-04-09 (Wed, 09 Apr 2014)
Changed paths: M modules/integration-tests/pom.xml M modules/plugins/jmx/src/test/java/org/rhq/plugins/jmx/test/JMXPluginTest.java A modules/plugins/jmx/src/test/java/org/rhq/plugins/jmx/test/TestTarget.java A modules/plugins/jmx/src/test/java/org/rhq/plugins/jmx/test/TestTargetMBean.java A modules/plugins/jmx/src/test/resources/custom-test-plugin.xml M pom.xml
Log Message: ----------- Bump required ems-version to one that we have forked and changed. Also add more tests. The forked ems is located at https://github.com/rhq-project/ems
Commit: 67a748fd0edf6b216194bdd10280a3174ef8cc56 https://github.com/rhq-project/rhq/commit/67a748fd0edf6b216194bdd10280a3174e... Author: Jay Shaughnessy jshaughn@redhat.com Date: 2014-04-09 (Wed, 09 Apr 2014)
Changed paths: M modules/enterprise/server/appserver/src/main/bin-resources/bin/rhq-data-migration.sh M modules/enterprise/server/appserver/src/main/bin-resources/bin/rhqctl
Log Message: ----------- [1085270] Unable to install the RHQ server when calling rhqctl outside of bin directory Fallout from the changes made for 1061311. This updates the scripts in bin (notable rhqctl) to handle being executed from outside of bin, including as a symlink.
An equivalent Windows fix is pending.
Commit: 0ab317fa66a540a3321a521ee02902c6991d1034 https://github.com/rhq-project/rhq/commit/0ab317fa66a540a3321a521ee02902c699... Author: Jay Shaughnessy jshaughn@redhat.com Date: 2014-04-09 (Wed, 09 Apr 2014)
Changed paths: M modules/enterprise/server/appserver/src/main/bin-resources/bin/rhq-data-migration.sh M modules/enterprise/server/appserver/src/main/bin-resources/bin/rhqctl
Log Message: ----------- [1085270] Unable to install the RHQ server when calling rhqctl outside of bin directory Add back in the clipped '|| echo "$0"' segment of the directory-finding bit.
Commit: 190364784bb10d101c1ba6461c8a18337c9de891 https://github.com/rhq-project/rhq/commit/190364784bb10d101c1ba6461c8a18337c... Author: Jay Shaughnessy jshaughn@redhat.com Date: 2014-04-09 (Wed, 09 Apr 2014)
Changed paths: M modules/enterprise/server/appserver/src/main/bin-resources/bin/rhq-data-migration.bat M modules/enterprise/server/appserver/src/main/bin-resources/bin/rhqctl.bat
Log Message: ----------- [1085270] Unable to install the RHQ server when calling rhqctl outside of bin directory Fallout from the changes made for 1061311. This updates the windows scripts in bin (notably rhqctl.bat) to handle being executed from outside of bin.
Commit: 8eff7c11cae1d137b78467101f866c7d3bfca241 https://github.com/rhq-project/rhq/commit/8eff7c11cae1d137b78467101f866c7d3b... Author: Jay Shaughnessy jshaughn@redhat.com Date: 2014-04-09 (Wed, 09 Apr 2014)
Changed paths: M modules/core/domain/src/main/java/org/rhq/core/domain/configuration/ConfigurationUtility.java M modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/configuration/ConfigurationManagerBeanTest.java M modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/util/SessionTestHelper.java M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/configuration/ConfigurationManagerBean.java M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/configuration/ConfigurationManagerRemote.java
Log Message: ----------- [1065461] readOnly configuration is editable via CLI Add a new signature to ConfigurationUtility.validateConfiguration that takes both a newConfiguration and currentConfiguration and ensure the new config does not alter any non-empty readOnly property value.
Enhance ConfigurationManagerBean.update*Configuration() to perform the new validation. Added some tests and updated the Remote method jdoc.
Commit: 7b4a09b9b99fa930760025c45988a79e6e4b80d1 https://github.com/rhq-project/rhq/commit/7b4a09b9b99fa930760025c45988a79e6e... Author: Heiko W. Rupp hwr@redhat.com Date: 2014-04-10 (Thu, 10 Apr 2014)
Changed paths: M modules/integration-tests/pom.xml
Log Message: ----------- Remove the accidentally introduced sub-module reference.
Commit: 75d9dfc465f759b0a39977bea770b659533a1902 https://github.com/rhq-project/rhq/commit/75d9dfc465f759b0a39977bea770b65953... Author: Jay Shaughnessy jshaughn@redhat.com Date: 2014-04-10 (Thu, 10 Apr 2014)
Changed paths: M modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/configuration/ConfigurationManagerBeanUnitTest.java
Log Message: ----------- Fix test failures due to recent changes for bug [1065461].
Commit: cbbca6736b98bd15024131e9441407d48b9e9b0c https://github.com/rhq-project/rhq/commit/cbbca6736b98bd15024131e9441407d48b... Author: Jirka Kremser jkremser@redhat.com Date: 2014-04-10 (Thu, 10 Apr 2014)
Changed paths: M modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/LoginView.java M modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/UserSessionManager.java M modules/enterprise/gui/coregui/src/main/webapp/login M modules/enterprise/server/appserver/src/main/scripts/rhq-container.build.xml
Log Message: ----------- [BZ 1069667] - Fixing the login page for LDAP registration and LDAP login.
Commit: b9ce78527e71a7b558b6a1f3ed71fd7d8f9712d8 https://github.com/rhq-project/rhq/commit/b9ce78527e71a7b558b6a1f3ed71fd7d8f... Author: John Mazzitelli mazz@redhat.com Date: 2014-04-11 (Fri, 11 Apr 2014)
Changed paths: M modules/enterprise/agent/src/etc/rhq-agent-wrapper.sh
Log Message: ----------- fix script when rhq_agent_debug is on
Commit: 5e16dabce29a28d5ac7704483711865dd02e1f85 https://github.com/rhq-project/rhq/commit/5e16dabce29a28d5ac7704483711865dd0... Author: Lukas Krejci metlos@users.noreply.github.com Date: 2014-04-14 (Mon, 14 Apr 2014)
Changed paths: M modules/plugins/jmx/src/test/java/org/rhq/plugins/jmx/test/JMXPluginTest.java A modules/plugins/jmx/src/test/java/org/rhq/plugins/jmx/test/TestTarget.java A modules/plugins/jmx/src/test/java/org/rhq/plugins/jmx/test/TestTargetMBean.java A modules/plugins/jmx/src/test/resources/custom-test-plugin.xml M pom.xml
Log Message: ----------- Merge pull request #20 from pilhuhn/bz_1033553_new-ems-version
[BZ 1033553] Bump required ems-version to one that we have forked and changed.
Commit: 38b17119771a5788b0d0fa389770228cdefafbd8 https://github.com/rhq-project/rhq/commit/38b17119771a5788b0d0fa389770228cde... Author: John Mazzitelli mazz@redhat.com Date: 2014-04-14 (Mon, 14 Apr 2014)
Changed paths: M .classpath M .settings/org.eclipse.core.resources.prefs M modules/core/client-api/src/main/java/org/rhq/core/clientapi/server/core/AgentRegistrationRequest.java M modules/core/dbutils/pom.xml M modules/core/dbutils/src/main/scripts/dbsetup/cluster-schema.xml M modules/core/dbutils/src/main/scripts/dbupgrade/db-upgrade.xml M modules/core/domain/src/main/java/org/rhq/core/domain/common/composite/SystemSetting.java A modules/core/domain/src/main/java/org/rhq/core/domain/install/remote/AgentInstall.java M modules/core/domain/src/main/java/org/rhq/core/domain/install/remote/AgentInstallInfo.java A modules/core/domain/src/main/java/org/rhq/core/domain/install/remote/CustomAgentInstallData.java M modules/core/domain/src/main/java/org/rhq/core/domain/install/remote/RemoteAccessInfo.java M modules/core/domain/src/test/java/org/rhq/core/domain/test/QueryAllTest.java M modules/core/util/src/main/java/org/rhq/core/util/file/FileUtil.java M modules/core/util/src/main/java/org/rhq/core/util/obfuscation/Obfuscator.java M modules/core/util/src/test/java/org/rhq/core/util/file/FileUtilTest.java M modules/core/util/src/test/java/org/rhq/core/util/obfuscation/ObfuscatorTest.java M modules/enterprise/agent/src/etc/rhq-agent.sh M modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentMain.java M modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/admin/AdministrationView.java M modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/admin/SystemSettingsView.java M modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/admin/agent/install/RemoteAgentInstallView.java M modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/admin/topology/AgentTableView.java M modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/components/upload/FileUploadForm.java M modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/gwt/AgentGWTService.java M modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/gwt/RemoteInstallGWTService.java M modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/server/gwt/AgentGWTServiceImpl.java M modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/server/gwt/FileUploadServlet.java M modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/server/gwt/RemoteInstallGWTServiceImpl.java M modules/enterprise/gui/coregui/src/main/resources/org/rhq/coregui/client/Messages.properties M modules/enterprise/gui/coregui/src/main/resources/org/rhq/coregui/client/Messages_cs.properties M modules/enterprise/gui/coregui/src/main/resources/org/rhq/coregui/client/Messages_de.properties M modules/enterprise/gui/coregui/src/main/resources/org/rhq/coregui/client/Messages_ja.properties M modules/enterprise/gui/coregui/src/main/resources/org/rhq/coregui/client/Messages_ko.properties M modules/enterprise/gui/coregui/src/main/resources/org/rhq/coregui/client/Messages_pt.properties M modules/enterprise/gui/coregui/src/main/resources/org/rhq/coregui/client/Messages_ru.properties M modules/enterprise/gui/coregui/src/main/resources/org/rhq/coregui/client/Messages_zh.properties M modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/core/CoreServerServiceImplTest.java M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/AgentManagerBean.java M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/AgentManagerLocal.java M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/CoreServerServiceImpl.java M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/install/remote/RemoteInstallManagerBean.java M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/install/remote/RemoteInstallManagerRemote.java M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/install/remote/SSHFileSend.java M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/install/remote/SSHInstallUtility.java
Log Message: ----------- BZ 1070242 - installating, starting, stopping, uninstalling agents on remote machines via SSH
Commit: f24e990ede910c310f6554e8b1234123f5586d40 https://github.com/rhq-project/rhq/commit/f24e990ede910c310f6554e8b1234123f5... Author: John Mazzitelli mazz@redhat.com Date: 2014-04-14 (Mon, 14 Apr 2014)
Changed paths: M .classpath M .settings/org.eclipse.core.resources.prefs M etc/rhq-ircBot/src/main/java/org/rhq/etc/ircbot/RhqIrcBotListener.java M modules/core/client-api/src/main/java/org/rhq/core/clientapi/agent/inventory/CreateResourceRequest.java M modules/core/client-api/src/main/java/org/rhq/core/clientapi/server/core/AgentRegistrationRequest.java M modules/core/dbutils/pom.xml M modules/core/dbutils/src/main/java/org/rhq/core/db/Oracle12DatabaseType.java M modules/core/dbutils/src/main/scripts/dbsetup/cluster-schema.xml M modules/core/dbutils/src/main/scripts/dbupgrade/db-upgrade.xml M modules/core/domain/pom.xml M modules/core/domain/src/main/java/org/rhq/core/domain/common/composite/SystemSetting.java M modules/core/domain/src/main/java/org/rhq/core/domain/configuration/ConfigurationUtility.java A modules/core/domain/src/main/java/org/rhq/core/domain/install/remote/AgentInstall.java M modules/core/domain/src/main/java/org/rhq/core/domain/install/remote/AgentInstallInfo.java A modules/core/domain/src/main/java/org/rhq/core/domain/install/remote/CustomAgentInstallData.java M modules/core/domain/src/main/java/org/rhq/core/domain/install/remote/RemoteAccessInfo.java M modules/core/domain/src/test/java/org/rhq/core/domain/test/QueryAllTest.java M modules/core/util/src/main/java/org/rhq/core/util/file/FileUtil.java M modules/core/util/src/main/java/org/rhq/core/util/obfuscation/Obfuscator.java M modules/core/util/src/test/java/org/rhq/core/util/file/FileUtilTest.java M modules/core/util/src/test/java/org/rhq/core/util/obfuscation/ObfuscatorTest.java M modules/enterprise/agent/ant-run.xml M modules/enterprise/agent/src/etc/java-service-wrapper/rhq-agent-wrapper.conf M modules/enterprise/agent/src/etc/java-service-wrapper/windows-x86_32/wrapper.dll M modules/enterprise/agent/src/etc/java-service-wrapper/windows-x86_32/wrapper.exe M modules/enterprise/agent/src/etc/java-service-wrapper/windows-x86_32/wrapper.jar A modules/enterprise/agent/src/etc/java-service-wrapper/windows-x86_64/wrapper.dll A modules/enterprise/agent/src/etc/java-service-wrapper/windows-x86_64/wrapper.exe A modules/enterprise/agent/src/etc/java-service-wrapper/windows-x86_64/wrapper.jar M modules/enterprise/agent/src/etc/rhq-agent-wrapper.bat M modules/enterprise/agent/src/etc/rhq-agent-wrapper.sh M modules/enterprise/agent/src/etc/rhq-agent.sh M modules/enterprise/agent/src/main/java/org/rhq/enterprise/agent/AgentMain.java M modules/enterprise/gui/coregui/pom.xml M modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/CoreGUI.java M modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/LoginView.java M modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/UserSessionManager.java M modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/admin/AdministrationView.java M modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/admin/SystemSettingsView.java M modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/admin/agent/install/RemoteAgentInstallView.java M modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/admin/topology/AgentTableView.java M modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/alert/definitions/ResourceAlertDefinitionsDataSource.java M modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/components/upload/FileUploadForm.java M modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/gwt/AgentGWTService.java M modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/gwt/RemoteInstallGWTService.java M modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/inventory/common/graph/MetricGraphData.java M modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/inventory/groups/detail/ResourceGroupTreeView.java M modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/inventory/resource/detail/monitoring/table/MetricsViewDataSource.java M modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/server/gwt/AgentGWTServiceImpl.java M modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/server/gwt/FileUploadServlet.java M modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/server/gwt/RemoteInstallGWTServiceImpl.java M modules/enterprise/gui/coregui/src/main/resources/org/rhq/coregui/client/Messages.properties M modules/enterprise/gui/coregui/src/main/resources/org/rhq/coregui/client/Messages_cs.properties M modules/enterprise/gui/coregui/src/main/resources/org/rhq/coregui/client/Messages_de.properties M modules/enterprise/gui/coregui/src/main/resources/org/rhq/coregui/client/Messages_ja.properties M modules/enterprise/gui/coregui/src/main/resources/org/rhq/coregui/client/Messages_ko.properties M modules/enterprise/gui/coregui/src/main/resources/org/rhq/coregui/client/Messages_pt.properties M modules/enterprise/gui/coregui/src/main/resources/org/rhq/coregui/client/Messages_ru.properties M modules/enterprise/gui/coregui/src/main/resources/org/rhq/coregui/client/Messages_zh.properties M modules/enterprise/gui/coregui/src/main/webapp/CoreGUI.html M modules/enterprise/gui/coregui/src/main/webapp/css/patternfly.css M modules/enterprise/gui/coregui/src/main/webapp/css/patternfly.min.css M modules/enterprise/gui/coregui/src/main/webapp/img/bg-login.jpg R modules/enterprise/gui/coregui/src/main/webapp/img/brand-lg.png R modules/enterprise/gui/coregui/src/main/webapp/img/brand.png R modules/enterprise/gui/coregui/src/main/webapp/img/brand.svg A modules/enterprise/gui/coregui/src/main/webapp/img/caps.png A modules/enterprise/gui/coregui/src/main/webapp/img/feedback-error-arrow-down.png A modules/enterprise/gui/coregui/src/main/webapp/img/feedback-error-sign.png M modules/enterprise/gui/coregui/src/main/webapp/img/logo.png M modules/enterprise/gui/coregui/src/main/webapp/img/logo.svg A modules/enterprise/gui/coregui/src/main/webapp/js/bootstrap.min.js A modules/enterprise/gui/coregui/src/main/webapp/js/jquery.capslockstate.js A modules/enterprise/gui/coregui/src/main/webapp/login M modules/enterprise/server/appserver/src/main/bin-resources/bin/internal/rhq-installer.bat M modules/enterprise/server/appserver/src/main/bin-resources/bin/internal/rhq-installer.sh M modules/enterprise/server/appserver/src/main/bin-resources/bin/internal/rhq-server.bat M modules/enterprise/server/appserver/src/main/bin-resources/bin/internal/rhq-server.sh M modules/enterprise/server/appserver/src/main/bin-resources/bin/internal/rhq-storage-installer.bat M modules/enterprise/server/appserver/src/main/bin-resources/bin/internal/rhq-storage-installer.sh M modules/enterprise/server/appserver/src/main/bin-resources/bin/internal/rhq-storage.bat M modules/enterprise/server/appserver/src/main/bin-resources/bin/rhq-data-migration.bat M modules/enterprise/server/appserver/src/main/bin-resources/bin/rhq-data-migration.sh A modules/enterprise/server/appserver/src/main/bin-resources/bin/rhq-server-env.bat A modules/enterprise/server/appserver/src/main/bin-resources/bin/rhq-server-env.sh M modules/enterprise/server/appserver/src/main/bin-resources/bin/rhqctl M modules/enterprise/server/appserver/src/main/bin-resources/bin/rhqctl.bat M modules/enterprise/server/appserver/src/main/bin-resources/bin/wrapper/rhq-server-wrapper.conf M modules/enterprise/server/appserver/src/main/bin-resources/bin/wrapper/rhq-server-wrapper.inc M modules/enterprise/server/appserver/src/main/bin-resources/bin/wrapper/rhq-storage-wrapper.conf M modules/enterprise/server/appserver/src/main/bin-resources/bin/wrapper/windows-x86_32/wrapper.dll M modules/enterprise/server/appserver/src/main/bin-resources/bin/wrapper/windows-x86_32/wrapper.exe M modules/enterprise/server/appserver/src/main/bin-resources/bin/wrapper/windows-x86_32/wrapper.jar A modules/enterprise/server/appserver/src/main/bin-resources/bin/wrapper/windows-x86_64/wrapper.dll A modules/enterprise/server/appserver/src/main/bin-resources/bin/wrapper/windows-x86_64/wrapper.exe A modules/enterprise/server/appserver/src/main/bin-resources/bin/wrapper/windows-x86_64/wrapper.jar M modules/enterprise/server/appserver/src/main/dev-resources/bin/wrapper/rhq-server-wrapper.inc M modules/enterprise/server/appserver/src/main/scripts/rhq-container.build.xml M modules/enterprise/server/installer/src/main/java/org/rhq/enterprise/server/installer/InstallerServiceImpl.java M modules/enterprise/server/installer/src/main/java/org/rhq/enterprise/server/installer/ServerProperties.java M modules/enterprise/server/itests-2/pom.xml M modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/configuration/ConfigurationManagerBeanTest.java M modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/core/CoreServerServiceImplTest.java M modules/enterprise/server/itests-2/src/test/java/org/rhq/enterprise/server/util/SessionTestHelper.java M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerBean.java M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/cloud/StorageNodeManagerLocal.java M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/configuration/ConfigurationManagerBean.java M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/configuration/ConfigurationManagerRemote.java M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/AgentManagerBean.java M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/AgentManagerLocal.java M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/core/CoreServerServiceImpl.java M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/discovery/DiscoveryBossBean.java M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/discovery/DiscoveryBossLocal.java M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/install/remote/RemoteInstallManagerBean.java M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/install/remote/RemoteInstallManagerRemote.java M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/install/remote/SSHFileSend.java M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/install/remote/SSHInstallUtility.java M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/measurement/MeasurementDataManagerBean.java M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/storage/StorageNodeOperationsHandlerBean.java M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/storage/StorageNodeOperationsHandlerLocal.java M modules/enterprise/server/jar/src/test/java/org/rhq/enterprise/server/configuration/ConfigurationManagerBeanUnitTest.java M modules/enterprise/server/server-control/src/main/java/org/rhq/server/control/ControlCommand.java M modules/enterprise/server/server-control/src/main/java/org/rhq/server/control/RHQControl.java A modules/enterprise/server/server-control/src/main/java/org/rhq/server/control/RHQPosixParser.java M modules/enterprise/server/server-control/src/main/java/org/rhq/server/control/command/AbstractInstall.java M modules/enterprise/server/server-control/src/main/java/org/rhq/server/control/command/Install.java M modules/enterprise/server/server-control/src/main/java/org/rhq/server/control/command/Upgrade.java M modules/plugins/jmx/src/test/java/org/rhq/plugins/jmx/test/JMXPluginTest.java A modules/plugins/jmx/src/test/java/org/rhq/plugins/jmx/test/TestTarget.java A modules/plugins/jmx/src/test/java/org/rhq/plugins/jmx/test/TestTargetMBean.java A modules/plugins/jmx/src/test/resources/custom-test-plugin.xml M modules/plugins/postgres/src/main/java/org/rhq/plugins/postgres/PostgresServerComponent.java M modules/plugins/postgres/src/main/java/org/rhq/plugins/postgres/PostgresTableComponent.java M modules/plugins/postgres/src/main/java/org/rhq/plugins/postgres/PostgresTableDiscoveryComponent.java M modules/plugins/postgres/src/main/resources/META-INF/rhq-plugin.xml M pom.xml
Log Message: ----------- Merge remote-tracking branch 'origin/master' into feature/bz1069606-rebase-eap-63
Conflicts: modules/enterprise/server/appserver/src/main/bin-resources/bin/wrapper/rhq-server-wrapper.conf
Compare: https://github.com/rhq-project/rhq/compare/c8386827c162...f24e990ede91
rhq-commits@lists.fedorahosted.org