Branch: refs/heads/feature/bz1069606-rebase-eap-63 Home: https://github.com/rhq-project/rhq Commit: 5cbbd1cac8ee864d4bc7080a543a7a3be6a0229c https://github.com/rhq-project/rhq/commit/5cbbd1cac8ee864d4bc7080a543a7a3be6... Author: Stefan Negrea snegrea@redhat.com Date: 2014-03-25 (Tue, 25 Mar 2014)
Changed paths: M pom.xml
Log Message: ----------- [BZ 1075575] Update Cassandra to a version specially crafted to not print the superfluous warning about OpenJDK.
Commit: df3f406aeb122317db12b0cd8787f046846052a8 https://github.com/rhq-project/rhq/commit/df3f406aeb122317db12b0cd8787f04684... Author: John Mazzitelli mazz@redhat.com Date: 2014-03-25 (Tue, 25 Mar 2014)
Changed paths: M modules/enterprise/agentupdate/src/main/resources/rhq-agent-update-build.xml
Log Message: ----------- BZ 823965 Maintain existing agent-configuration.xml and log4j.xml files after agent auto-update. The new configuration will be kept in agent-configuration.xml.new and log4j.xml.new so that we at least provide the user with the updated defaults in case they want to manually merge them.
Commit: fc0737027e46c7298c591122d5cd42dd7883dfad https://github.com/rhq-project/rhq/commit/fc0737027e46c7298c591122d5cd42dd78... Author: Heiko W. Rupp hwr@redhat.com Date: 2014-03-26 (Wed, 26 Mar 2014)
Changed paths: M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/util/CriteriaQueryGenerator.java
Log Message: ----------- BZ_1080171 - defer adding of "WHERE" keyword until we know that it is needed.
Commit: ce4e2505c0907544d83cd2d27df8cc9dfeda8af3 https://github.com/rhq-project/rhq/commit/ce4e2505c0907544d83cd2d27df8cc9dfe... Author: Jirka Kremser jkremser@redhat.com Date: 2014-03-26 (Wed, 26 Mar 2014)
Changed paths: M modules/core/domain/src/main/java/org/rhq/core/domain/criteria/EventCriteria.java M modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/LinkManager.java M modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/dashboard/PortletFactory.java M modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/dashboard/portlets/PortletConfigurationEditorComponent.java M modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/dashboard/portlets/groups/GroupAlertsPortlet.java M modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/dashboard/portlets/groups/GroupEventsPortlet.java M modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/dashboard/portlets/recent/alerts/AbstractRecentAlertsPortlet.java A modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/dashboard/portlets/recent/events/AbstractRecentEventsPortlet.java A modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/dashboard/portlets/recent/events/RecentEventsPortlet.java M modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/dashboard/portlets/resource/ResourceEventsPortlet.java M modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/inventory/common/detail/summary/AbstractActivityView.java M modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/inventory/common/event/EventCompositeDatasource.java M modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/inventory/common/event/EventCompositeHistoryView.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/jar/src/main/java/org/rhq/enterprise/server/event/EventManagerBean.java
Log Message: ----------- [BZ 1070243] - (JON3-31) Add "Recent Events" portlet into JON Dashboard
To make the filtering (based on resource name) working, I had to add also the new method to the EventCriteria class.
To sum it up, it is possible to filter by: * time ("from, to" or "last n mins/hours/days") * resource name - only for global Recent Alerts portlet; it accepts also a substring of a name * event source path - it accepts also a substring of a path * severity (almost the same as alert priority filtering) * result counts (5 is default)
Having that said, the performance shouldn't be an issue, because the filters may be set to fetch only a few records.
Commit: 42471d8cbb8cc92da2c55fb06347f465b8a4d239 https://github.com/rhq-project/rhq/commit/42471d8cbb8cc92da2c55fb06347f465b8... Author: Heiko W. Rupp hwr@redhat.com Date: 2014-03-28 (Fri, 28 Mar 2014)
Changed paths: M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/util/CriteriaQueryGenerator.java
Log Message: ----------- Updated checks after comments from @metlos.
Commit: e2eac63b80ed7f7fe2051c50dfc48f4df834718f https://github.com/rhq-project/rhq/commit/e2eac63b80ed7f7fe2051c50dfc48f4df8... Author: Lukas Krejci metlos@users.noreply.github.com Date: 2014-03-28 (Fri, 28 Mar 2014)
Changed paths: M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/util/CriteriaQueryGenerator.java
Log Message: ----------- Merge pull request #17 from pilhuhn/bz1080171
BZ_1080171 - defer adding of "WHERE" keyword until we know that it is needed.
Commit: c8386827c162bcb723be533b32e5c07310e5cd4d https://github.com/rhq-project/rhq/commit/c8386827c162bcb723be533b32e5c07310... Author: John Mazzitelli mazz@redhat.com Date: 2014-03-28 (Fri, 28 Mar 2014)
Changed paths: M modules/core/domain/src/main/java/org/rhq/core/domain/criteria/EventCriteria.java M modules/enterprise/agentupdate/src/main/resources/rhq-agent-update-build.xml M modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/LinkManager.java M modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/dashboard/PortletFactory.java M modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/dashboard/portlets/PortletConfigurationEditorComponent.java M modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/dashboard/portlets/groups/GroupAlertsPortlet.java M modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/dashboard/portlets/groups/GroupEventsPortlet.java M modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/dashboard/portlets/recent/alerts/AbstractRecentAlertsPortlet.java A modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/dashboard/portlets/recent/events/AbstractRecentEventsPortlet.java A modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/dashboard/portlets/recent/events/RecentEventsPortlet.java M modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/dashboard/portlets/resource/ResourceEventsPortlet.java M modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/inventory/common/detail/summary/AbstractActivityView.java M modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/inventory/common/event/EventCompositeDatasource.java M modules/enterprise/gui/coregui/src/main/java/org/rhq/coregui/client/inventory/common/event/EventCompositeHistoryView.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/jar/src/main/java/org/rhq/enterprise/server/event/EventManagerBean.java M modules/enterprise/server/jar/src/main/java/org/rhq/enterprise/server/util/CriteriaQueryGenerator.java M pom.xml
Log Message: ----------- Merge remote-tracking branch 'origin/master' into feature/bz1069606-rebase-eap-63
Compare: https://github.com/rhq-project/rhq/compare/f2b7ea32d76e...c8386827c162