Branch: refs/heads/HWKMETRICS-326
Home:
https://github.com/hawkular/hawkular-metrics
Commit: a3e3a460a547c4be4994d4095aaa3644fde9a911
https://github.com/hawkular/hawkular-metrics/commit/a3e3a460a547c4be4994d...
Author: Stefan Negrea <snegrea(a)redhat.com>
Date: 2015-11-19 (Thu, 19 Nov 2015)
Changed paths:
M api/diff.txt
M api/metrics-api-common/pom.xml
M
api/metrics-api-common/src/main/java/org/hawkular/metrics/api/jaxrs/util/ApiUtils.java
M
api/metrics-api-jaxrs-1.1/src/main/java/org/hawkular/metrics/api/jaxrs/exception/mappers/ExceptionMapperUtils.java
M
api/metrics-api-jaxrs-1.1/src/main/java/org/hawkular/metrics/api/jaxrs/filter/MetricsServiceStateFilter.java
M
api/metrics-api-jaxrs-1.1/src/main/java/org/hawkular/metrics/api/jaxrs/filter/TenantFilter.java
M
api/metrics-api-jaxrs-1.1/src/main/java/org/hawkular/metrics/api/jaxrs/handler/AvailabilityHandler.java
M
api/metrics-api-jaxrs-1.1/src/main/java/org/hawkular/metrics/api/jaxrs/handler/CounterHandler.java
M
api/metrics-api-jaxrs-1.1/src/main/java/org/hawkular/metrics/api/jaxrs/handler/GaugeHandler.java
M
api/metrics-api-jaxrs-1.1/src/main/java/org/hawkular/metrics/api/jaxrs/handler/MetricHandler.java
M
api/metrics-api-jaxrs-1.1/src/main/java/org/hawkular/metrics/api/jaxrs/handler/TenantsHandler.java
M
api/metrics-api-jaxrs/src/main/java/org/hawkular/metrics/api/jaxrs/exception/mappers/ExceptionMapperUtils.java
M
api/metrics-api-jaxrs/src/main/java/org/hawkular/metrics/api/jaxrs/filter/MetricsServiceStateFilter.java
M
api/metrics-api-jaxrs/src/main/java/org/hawkular/metrics/api/jaxrs/filter/TenantFilter.java
M
api/metrics-api-jaxrs/src/main/java/org/hawkular/metrics/api/jaxrs/handler/AvailabilityHandler.java
M
api/metrics-api-jaxrs/src/main/java/org/hawkular/metrics/api/jaxrs/handler/CounterHandler.java
M
api/metrics-api-jaxrs/src/main/java/org/hawkular/metrics/api/jaxrs/handler/GaugeHandler.java
M
api/metrics-api-jaxrs/src/main/java/org/hawkular/metrics/api/jaxrs/handler/MetricHandler.java
M
api/metrics-api-jaxrs/src/main/java/org/hawkular/metrics/api/jaxrs/handler/TenantsHandler.java
M
api/metrics-api-jaxrs/src/main/java/org/hawkular/metrics/api/jaxrs/handler/observer/MetricCreatedObserver.java
M
api/metrics-api-jaxrs/src/main/java/org/hawkular/metrics/api/jaxrs/handler/observer/ResultSetObserver.java
M
api/metrics-api-jaxrs/src/main/java/org/hawkular/metrics/api/jaxrs/handler/observer/TenantCreatedObserver.java
R api/model/pom.xml
R
api/model/src/main/java/org/hawkular/metrics/api/jaxrs/codehaus/jackson/AvailabilityTypeSerializer.java
R
api/model/src/main/java/org/hawkular/metrics/api/jaxrs/codehaus/jackson/MetricTypeDeserializer.java
R
api/model/src/main/java/org/hawkular/metrics/api/jaxrs/codehaus/jackson/MetricTypeKeyDeserializer.java
R
api/model/src/main/java/org/hawkular/metrics/api/jaxrs/codehaus/jackson/MetricTypeKeySerializer.java
R
api/model/src/main/java/org/hawkular/metrics/api/jaxrs/codehaus/jackson/MetricTypeSerializer.java
R
api/model/src/main/java/org/hawkular/metrics/api/jaxrs/fasterxml/jackson/AvailabilityTypeSerializer.java
R
api/model/src/main/java/org/hawkular/metrics/api/jaxrs/fasterxml/jackson/MetricTypeDeserializer.java
R
api/model/src/main/java/org/hawkular/metrics/api/jaxrs/fasterxml/jackson/MetricTypeKeyDeserializer.java
R
api/model/src/main/java/org/hawkular/metrics/api/jaxrs/fasterxml/jackson/MetricTypeKeySerializer.java
R
api/model/src/main/java/org/hawkular/metrics/api/jaxrs/fasterxml/jackson/MetricTypeSerializer.java
R api/model/src/main/java/org/hawkular/metrics/api/jaxrs/model/ApiError.java
R
api/model/src/main/java/org/hawkular/metrics/api/jaxrs/model/AvailabilityDataPoint.java
R api/model/src/main/java/org/hawkular/metrics/api/jaxrs/model/CounterDataPoint.java
R api/model/src/main/java/org/hawkular/metrics/api/jaxrs/model/GaugeDataPoint.java
R api/model/src/main/java/org/hawkular/metrics/api/jaxrs/model/MetricDefinition.java
R api/model/src/main/java/org/hawkular/metrics/api/jaxrs/model/MetricRequest.java
R
api/model/src/main/java/org/hawkular/metrics/api/jaxrs/model/MixedMetricsRequest.java
R api/model/src/main/java/org/hawkular/metrics/api/jaxrs/model/TagRequest.java
R api/model/src/main/java/org/hawkular/metrics/api/jaxrs/model/TenantDefinition.java
M core/metrics-core-api/pom.xml
A core/metrics-core-api/src/main/java/org/hawkular/metrics/core/api/ApiError.java
A
core/metrics-core-api/src/main/java/org/hawkular/metrics/core/api/AvailabilityDataPoint.java
A
core/metrics-core-api/src/main/java/org/hawkular/metrics/core/api/CounterDataPoint.java
A
core/metrics-core-api/src/main/java/org/hawkular/metrics/core/api/GaugeDataPoint.java
A
core/metrics-core-api/src/main/java/org/hawkular/metrics/core/api/MetricDefinition.java
A
core/metrics-core-api/src/main/java/org/hawkular/metrics/core/api/MetricRequest.java
A
core/metrics-core-api/src/main/java/org/hawkular/metrics/core/api/MixedMetricsRequest.java
A core/metrics-core-api/src/main/java/org/hawkular/metrics/core/api/TagRequest.java
A
core/metrics-core-api/src/main/java/org/hawkular/metrics/core/api/TenantDefinition.java
A
core/metrics-core-api/src/main/java/org/hawkular/metrics/core/api/codehause/jackson/AvailabilityTypeSerializer.java
A
core/metrics-core-api/src/main/java/org/hawkular/metrics/core/api/codehause/jackson/MetricTypeDeserializer.java
A
core/metrics-core-api/src/main/java/org/hawkular/metrics/core/api/codehause/jackson/MetricTypeKeyDeserializer.java
A
core/metrics-core-api/src/main/java/org/hawkular/metrics/core/api/codehause/jackson/MetricTypeKeySerializer.java
A
core/metrics-core-api/src/main/java/org/hawkular/metrics/core/api/codehause/jackson/MetricTypeSerializer.java
A
core/metrics-core-api/src/main/java/org/hawkular/metrics/core/api/fasterxml/jackson/AvailabilityTypeSerializer.java
A
core/metrics-core-api/src/main/java/org/hawkular/metrics/core/api/fasterxml/jackson/MetricTypeDeserializer.java
A
core/metrics-core-api/src/main/java/org/hawkular/metrics/core/api/fasterxml/jackson/MetricTypeKeyDeserializer.java
A
core/metrics-core-api/src/main/java/org/hawkular/metrics/core/api/fasterxml/jackson/MetricTypeKeySerializer.java
A
core/metrics-core-api/src/main/java/org/hawkular/metrics/core/api/fasterxml/jackson/MetricTypeSerializer.java
M pom.xml
Log Message:
-----------
[HWKMETRICS-326] Merge the model classes back into the core api module.