Clone
 

seth leger <seth@opennms.org> in opennms

NMS-9278: Added distPoller alias to EventRestService.

NMS-9278: Added SQL restriction for category id and name to work around a problem with aliases in Hibernate.

Merge pull request #1554 from OpenNMS/jira/HZN-1082

NMS-9278: Added ability to use the CXF SearchBean instead of the entity object as the query capture bean. Added a CriteriaBehavior object that can map query terms to new names, conversions, and actions. Added a common set of aliases and behaviors that can be reused in different endpoints when you are joining the same aliases.

  1. … 11 more files in changeset.

NMS-9278: Added ability to use the CXF SearchBean instead of the entity object as the query capture bean. Added a CriteriaBehavior object that can map query terms to new names, conversions, and actions. Added a common set of aliases and behaviors that can be reused in different endpoints when you are joining the same aliases.

  1. … 11 more files in changeset.

HZN-1094: Upgrade to Camel 2.19.1.

Merge pull request #1545 from OpenNMS/feature-upgrade-to-spring-4.2

Merge pull request #1547 from OpenNMS/feature-upgrade-to-activemq-5.14

Revert fix for NMS-8714 since the ConnectionPool in ActiveMQ 5.14 implements the reconnectOnException option.

Revert fix for NMS-8714 since the ConnectionPool in ActiveMQ 5.14 implements the reconnectOnException option.

Merge pull request #1471 from OpenNMS/feature-upgrade-to-karaf-4

NMS-9278: Cleaned up alias JOINs and added assetRecord aliases.

NMS-9278: Cleaned up alias JOINs and added assetRecord aliases.

NMS-9278: Updated join conditions with root aliases.

NMS-9278: Updated join conditions with root aliases.

Expanded Criteria API to support Restrictions.eqProperty() and to support setting a root alias on the Criteria.

Expanded Criteria API to support Restrictions.eqProperty() and to support setting a root alias on the Criteria.

NMS-9278: Added orderBy tests for alarm and event services.

NMS-9278: Added orderBy tests for alarm and event services.

NMS-9278: Added orderBy tests for alarm and event services.

NMS-9278: Fixed NodeRestServiceIT.

NMS-9278: Fixed NodeRestServiceIT.

NMS-9278: Fixed NodeRestServiceIT.

NMS-9278: Removed most distinct() Criteria directives and added TODOs for places that we need join conditions.

NMS-9278: Removed most distinct() Criteria directives and added TODOs for places that we need join conditions.

NMS-9278: Removed most distinct() Criteria directives and added TODOs for places that we need join conditions.

NMS-9278: Minor cleanup in RESTv2 classes.

NMS-9278: Minor cleanup in RESTv2 classes.

NMS-9278: Minor cleanup in RESTv2 classes.

HZN-1087: Added dependency management for Jackson2 artifacts.