You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by ha...@apache.org on 2015/08/13 05:32:12 UTC
[5/8] incubator-brooklyn git commit: [BROOKLYN-162] Rename
./api/event; use the no split package convention
[BROOKLYN-162] Rename ./api/event; use the no split package convention
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/ee12c779
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/ee12c779
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/ee12c779
Branch: refs/heads/master
Commit: ee12c779464536a3deeb7312397549d8817aabf3
Parents: a76dac4
Author: Hadrian Zbarcea <ha...@apache.org>
Authored: Wed Aug 12 22:51:35 2015 -0400
Committer: Hadrian Zbarcea <ha...@apache.org>
Committed: Wed Aug 12 22:51:35 2015 -0400
----------------------------------------------------------------------
.../java/brooklyn/event/AttributeSensor.java | 52 -------------
api/src/main/java/brooklyn/event/Sensor.java | 77 --------------------
.../main/java/brooklyn/event/SensorEvent.java | 47 ------------
.../brooklyn/event/SensorEventListener.java | 37 ----------
.../org/apache/brooklyn/api/entity/Entity.java | 2 +-
.../apache/brooklyn/api/entity/EntityType.java | 2 +-
.../brooklyn/api/entity/basic/EntityLocal.java | 8 +-
.../brooklyn/api/event/AttributeSensor.java | 52 +++++++++++++
.../org/apache/brooklyn/api/event/Sensor.java | 77 ++++++++++++++++++++
.../apache/brooklyn/api/event/SensorEvent.java | 47 ++++++++++++
.../brooklyn/api/event/SensorEventListener.java | 37 ++++++++++
.../management/SubscriptionContext.java | 7 +-
.../management/SubscriptionManager.java | 7 +-
.../apache/brooklyn/mementos/EntityMemento.java | 2 +-
.../main/java/brooklyn/basic/BrooklynTypes.java | 2 +-
.../brooklyn/config/render/RendererHints.java | 2 +-
.../enricher/CustomAggregatingEnricher.java | 4 +-
.../main/java/brooklyn/enricher/Enrichers.java | 6 +-
.../basic/AbstractAggregatingEnricher.java | 6 +-
.../enricher/basic/AbstractAggregator.java | 6 +-
.../enricher/basic/AbstractEnricher.java | 4 +-
.../basic/AbstractMultipleSensorAggregator.java | 8 +-
.../enricher/basic/AbstractTransformer.java | 8 +-
.../basic/AbstractTransformingEnricher.java | 3 +-
.../basic/AbstractTypeTransformingEnricher.java | 6 +-
.../brooklyn/enricher/basic/AddingEnricher.java | 8 +-
.../brooklyn/enricher/basic/Aggregator.java | 8 +-
.../java/brooklyn/enricher/basic/Combiner.java | 8 +-
.../java/brooklyn/enricher/basic/Joiner.java | 8 +-
.../brooklyn/enricher/basic/Propagator.java | 8 +-
.../basic/SensorPropagatingEnricher.java | 8 +-
.../basic/SensorTransformingEnricher.java | 6 +-
.../brooklyn/enricher/basic/Transformer.java | 2 +-
.../brooklyn/enricher/basic/UpdatingMap.java | 8 +-
.../YamlRollingTimeWindowMeanEnricher.java | 5 +-
.../basic/YamlTimeWeightedDeltaEnricher.java | 2 +-
.../brooklyn/entity/basic/AbstractEntity.java | 8 +-
.../brooklyn/entity/basic/AbstractGroup.java | 2 +-
.../java/brooklyn/entity/basic/Attributes.java | 4 +-
.../java/brooklyn/entity/basic/DataEntity.java | 2 +-
.../brooklyn/entity/basic/DataEntityImpl.java | 3 +-
.../brooklyn/entity/basic/DelegateEntity.java | 2 +-
.../brooklyn/entity/basic/DynamicGroup.java | 6 +-
.../brooklyn/entity/basic/DynamicGroupImpl.java | 6 +-
.../java/brooklyn/entity/basic/Entities.java | 4 +-
.../entity/basic/EntityAndAttribute.java | 3 +-
.../entity/basic/EntityDynamicType.java | 2 +-
.../brooklyn/entity/basic/EntityFunctions.java | 2 +-
.../brooklyn/entity/basic/EntityInternal.java | 2 +-
.../brooklyn/entity/basic/EntityPredicates.java | 2 +-
.../java/brooklyn/entity/basic/EntityTasks.java | 2 +-
.../basic/EntityTransientCopyInternal.java | 2 +-
.../entity/basic/EntityTypeSnapshot.java | 2 +-
.../entity/basic/ServiceStateLogic.java | 8 +-
.../brooklyn/entity/effector/AddSensor.java | 2 +-
.../group/AbstractMembershipTrackingPolicy.java | 6 +-
.../brooklyn/entity/group/DynamicCluster.java | 2 +-
.../brooklyn/entity/group/DynamicFabric.java | 2 +-
.../entity/group/DynamicMultiGroup.java | 6 +-
.../entity/group/DynamicMultiGroupImpl.java | 2 +-
.../entity/rebind/BasicEntityRebindSupport.java | 2 +-
.../entity/rebind/dto/BasicEntityMemento.java | 4 +-
.../entity/rebind/dto/MementosGenerators.java | 4 +-
.../java/brooklyn/entity/trait/Changeable.java | 2 +-
.../java/brooklyn/entity/trait/Startable.java | 2 +-
.../java/brooklyn/event/basic/AttributeMap.java | 2 +-
.../basic/AttributeSensorAndConfigKey.java | 2 +-
.../event/basic/BasicAttributeSensor.java | 4 +-
.../basic/BasicAttributeSensorAndConfigKey.java | 2 +-
.../event/basic/BasicNotificationSensor.java | 2 +-
.../java/brooklyn/event/basic/BasicSensor.java | 4 +-
.../brooklyn/event/basic/BasicSensorEvent.java | 5 +-
.../event/basic/DependentConfiguration.java | 6 +-
.../basic/PortAttributeSensorAndConfigKey.java | 2 +-
.../main/java/brooklyn/event/basic/Sensors.java | 5 +-
.../event/feed/AttributePollHandler.java | 2 +-
.../brooklyn/event/feed/ConfigToAttributes.java | 2 +-
.../java/brooklyn/event/feed/FeedConfig.java | 4 +-
.../java/brooklyn/event/feed/PollConfig.java | 3 +-
.../event/feed/function/FunctionPollConfig.java | 3 +-
.../java/brooklyn/event/feed/http/HttpFeed.java | 2 +-
.../event/feed/http/HttpPollConfig.java | 3 +-
.../event/feed/shell/ShellPollConfig.java | 3 +-
.../brooklyn/event/feed/ssh/SshPollConfig.java | 3 +-
.../windows/WindowsPerformanceCounterFeed.java | 2 +-
.../WindowsPerformanceCounterPollConfig.java | 3 +-
.../access/PortForwardManagerClient.java | 2 +-
.../location/dynamic/LocationOwner.java | 2 +-
.../internal/AbstractSubscriptionManager.java | 7 +-
.../internal/BasicSubscriptionContext.java | 7 +-
.../internal/EntityChangeListener.java | 2 +-
.../internal/EntityManagementSupport.java | 2 +-
.../internal/LocalSubscriptionManager.java | 6 +-
.../internal/QueueingSubscriptionManager.java | 5 +-
.../management/internal/Subscription.java | 6 +-
.../internal/SubscriptionTracker.java | 5 +-
.../policy/basic/AbstractEntityAdjunct.java | 6 +-
.../java/brooklyn/policy/basic/Policies.java | 6 +-
.../java/brooklyn/util/flags/TypeCoercions.java | 4 +-
.../brooklyn/util/text/TemplateProcessor.java | 2 +-
...stomAggregatingEnricherDeprecatedTest.groovy | 2 +-
.../enricher/CustomAggregatingEnricherTest.java | 2 +-
.../java/brooklyn/enricher/EnrichersTest.java | 4 +-
...SensorPropagatingEnricherDeprecatedTest.java | 6 +-
.../enricher/SensorPropagatingEnricherTest.java | 6 +-
.../TransformingEnricherDeprecatedTest.groovy | 2 +-
.../enricher/TransformingEnricherTest.java | 2 +-
.../YamlRollingTimeWindowMeanEnricherTest.java | 2 +-
.../YamlTimeWeightedDeltaEnricherTest.java | 2 +-
.../entity/EntityPreManagementTest.java | 4 +-
.../brooklyn/entity/basic/AttributeMapTest.java | 2 +-
.../brooklyn/entity/basic/AttributeTest.java | 2 +-
.../brooklyn/entity/basic/DataEntityTest.java | 2 +-
.../brooklyn/entity/basic/DynamicGroupTest.java | 8 +-
.../entity/basic/EntityLocationsTest.java | 2 +-
.../entity/basic/EntityRegistrationTest.java | 4 +-
.../brooklyn/entity/basic/EntityTypeTest.java | 4 +-
.../entity/basic/PolicyRegistrationTest.java | 4 +-
.../entity/basic/ServiceStateLogicTest.java | 2 +-
.../entity/group/DynamicClusterTest.java | 2 +-
.../entity/group/DynamicMultiGroupTest.java | 6 +-
.../entity/group/GroupPickUpEntitiesTest.java | 4 +-
.../group/MembershipTrackingPolicyTest.java | 2 +-
.../java/brooklyn/entity/hello/HelloEntity.java | 4 +-
.../entity/hello/LocalEntitiesTest.java | 4 +-
.../entity/rebind/RebindCatalogEntityTest.java | 7 +-
.../entity/rebind/RebindEnricherTest.java | 2 +-
.../entity/rebind/RebindEntityTest.java | 8 +-
.../entity/rebind/RebindFailuresTest.java | 2 +-
.../brooklyn/entity/rebind/RebindFeedTest.java | 2 +-
.../entity/rebind/RebindFeedWithHaTest.java | 2 +-
.../event/feed/function/FunctionFeedTest.java | 6 +-
.../feed/http/HttpFeedIntegrationTest.java | 2 +-
.../brooklyn/event/feed/http/HttpFeedTest.java | 2 +-
.../feed/shell/ShellFeedIntegrationTest.java | 2 +-
.../event/feed/ssh/SshFeedIntegrationTest.java | 2 +-
.../WindowsPerformanceCounterFeedLiveTest.java | 2 +-
.../WindowsPerformanceCounterFeedTest.java | 2 +-
.../access/PortForwardManagerRebindTest.java | 2 +-
.../internal/LocalSubscriptionManagerTest.java | 4 +-
.../EntityCleanupLongevityTestFixture.java | 4 +-
.../qa/performance/EntityPerformanceTest.java | 4 +-
.../SubscriptionPerformanceTest.java | 4 +-
.../java/brooklyn/test/policy/TestEnricher.java | 2 +-
.../java/brooklyn/test/policy/TestPolicy.java | 3 +-
.../basic/RecordingSensorEventListener.java | 6 +-
.../brooklyn/test/entity/TestApplication.java | 2 +-
.../test/entity/TestApplicationImpl.java | 4 +-
.../apache/brooklyn/test/entity/TestEntity.java | 2 +-
.../brooklyn/demo/CumulusRDFApplication.java | 4 +-
.../brooklyn/demo/ResilientMongoDbApp.java | 4 +-
.../demo/WebClusterDatabaseExample.java | 2 +-
.../demo/WebClusterDatabaseExampleApp.java | 2 +-
.../policy/os/AdvertiseWinrmLoginPolicy.java | 6 +-
.../brooklyn/policy/os/CreateUserPolicy.java | 6 +-
.../java/brooklyn/enricher/DeltaEnricher.java | 6 +-
.../brooklyn/enricher/HttpLatencyDetector.java | 6 +-
.../brooklyn/enricher/RollingMeanEnricher.java | 4 +-
.../enricher/RollingTimeWindowMeanEnricher.java | 6 +-
.../enricher/TimeFractionDeltaEnricher.java | 6 +-
.../enricher/TimeWeightedDeltaEnricher.java | 6 +-
.../entity/brooklyn/BrooklynMetrics.java | 2 +-
.../policy/autoscaling/AutoScalerPolicy.java | 8 +-
.../policy/followthesun/FollowTheSunPolicy.java | 8 +-
.../followthesun/FollowTheSunPoolImpl.java | 6 +-
.../policy/ha/AbstractFailureDetector.java | 2 +-
.../policy/ha/ConditionalSuspendPolicy.java | 6 +-
.../policy/ha/ConnectionFailureDetector.java | 3 +-
.../policy/ha/ServiceFailureDetector.java | 2 +-
.../brooklyn/policy/ha/ServiceReplacer.java | 6 +-
.../brooklyn/policy/ha/ServiceRestarter.java | 6 +-
.../BalanceableWorkerPoolImpl.java | 6 +-
.../ItemsInContainersGroupImpl.java | 6 +-
.../loadbalancing/LoadBalancingPolicy.java | 8 +-
.../enricher/DeltaEnrichersTests.groovy | 2 +-
.../enricher/HttpLatencyDetectorTest.java | 2 +-
.../brooklyn/enricher/RebindEnricherTest.java | 2 +-
.../enricher/RollingMeanEnricherTest.groovy | 2 +-
.../RollingTimeWindowMeanEnricherTest.groovy | 2 +-
.../enricher/TimeFractionDeltaEnricherTest.java | 4 +-
.../entity/brooklyn/BrooklynMetricsTest.java | 4 +-
.../autoscaling/AutoScalerPolicyMetricTest.java | 6 +-
.../autoscaling/AutoScalerPolicyRebindTest.java | 2 +-
.../AutoScalerPolicyReconfigurationTest.java | 2 +-
.../followthesun/FollowTheSunPolicyTest.java | 4 +-
.../ha/ConnectionFailureDetectorTest.java | 6 +-
.../brooklyn/policy/ha/HaPolicyRebindTest.java | 6 +-
...ServiceFailureDetectorStabilizationTest.java | 6 +-
.../policy/ha/ServiceFailureDetectorTest.java | 6 +-
.../brooklyn/policy/ha/ServiceReplacerTest.java | 4 +-
.../policy/ha/ServiceRestarterTest.java | 4 +-
.../AbstractLoadBalancingPolicyTest.java | 2 +-
.../loadbalancing/MockContainerEntityImpl.java | 2 +-
.../policy/loadbalancing/MockItemEntity.java | 2 +-
.../loadbalancing/MockItemEntityImpl.java | 2 +-
.../AbstractSoftwareProcessWinRmDriver.java | 2 +-
.../brooklyn/entity/basic/SameServerEntity.java | 2 +-
.../brooklyn/entity/basic/SoftwareProcess.java | 2 +-
.../entity/basic/SoftwareProcessImpl.java | 4 +-
.../entity/basic/VanillaWindowsProcess.java | 2 +-
.../entity/brooklynnode/BrooklynCluster.java | 2 +-
.../brooklynnode/BrooklynEntityMirror.java | 2 +-
.../entity/brooklynnode/BrooklynNode.java | 2 +-
.../brooklynnode/EntityHttpClientImpl.java | 2 +-
.../brooklyn/entity/chef/ChefAttributeFeed.java | 2 +-
.../entity/chef/ChefAttributePollConfig.java | 3 +-
.../brooklyn/entity/java/UsesJavaMXBeans.java | 3 +-
.../main/java/brooklyn/entity/java/UsesJmx.java | 2 +-
.../brooklyn/entity/java/VanillaJavaApp.java | 2 +-
.../entity/machine/MachineAttributes.java | 3 +-
.../brooklyn/entity/machine/MachineEntity.java | 2 +-
.../java/brooklyn/entity/pool/ServerPool.java | 2 +-
.../brooklyn/entity/pool/ServerPoolImpl.java | 2 +-
.../entity/service/EntityLaunchListener.java | 4 +-
.../event/feed/jmx/JmxAttributePollConfig.java | 3 +-
.../jmx/JmxNotificationSubscriptionConfig.java | 3 +-
.../event/feed/jmx/JmxOperationPollConfig.java | 3 +-
.../entity/brooklynnode/MockBrooklynNode.java | 3 +-
.../entity/java/VanillaJavaAppRebindTest.java | 2 +-
.../entity/java/VanillaJavaAppTest.java | 4 +-
.../MachineLifecycleEffectorTasksTest.java | 2 +-
.../software/http/HttpRequestSensorTest.java | 2 +-
.../software/ssh/SshCommandIntegrationTest.java | 2 +-
.../brooklyn/event/feed/jmx/JmxFeedTest.java | 6 +-
.../event/feed/jmx/RebindJmxFeedTest.java | 2 +-
.../brooklyn/entity/database/DatabaseNode.java | 2 +-
.../entity/database/DatastoreMixins.java | 2 +-
.../entity/database/crate/CrateNode.java | 2 +-
.../entity/database/mariadb/MariaDbNode.java | 2 +-
.../entity/database/mysql/MySqlCluster.java | 2 +-
.../entity/database/mysql/MySqlClusterImpl.java | 6 +-
.../entity/database/mysql/MySqlNode.java | 2 +-
.../entity/database/rubyrep/RubyRepNode.java | 2 +-
.../entity/messaging/MessageBroker.java | 2 +-
.../java/brooklyn/entity/messaging/Queue.java | 3 +-
.../entity/messaging/amqp/AmqpExchange.java | 3 +-
.../entity/messaging/kafka/KafkaBroker.java | 2 +-
.../entity/messaging/kafka/KafkaCluster.java | 2 +-
.../entity/messaging/rabbit/RabbitBroker.java | 2 +-
.../brooklyn/entity/messaging/storm/Storm.java | 2 +-
.../entity/zookeeper/ZooKeeperEnsemble.java | 2 +-
.../entity/zookeeper/ZooKeeperNode.java | 2 +-
.../entity/monitoring/monit/MonitNode.java | 2 +-
.../entity/network/bind/BindDnsServer.java | 2 +-
.../entity/network/bind/BindDnsServerImpl.java | 2 +-
.../network/bind/PrefixAndIdEnricher.java | 6 +-
.../nosql/cassandra/CassandraDatacenter.java | 2 +-
.../cassandra/CassandraDatacenterImpl.java | 6 +-
.../entity/nosql/cassandra/CassandraFabric.java | 2 +-
.../nosql/cassandra/CassandraFabricImpl.java | 4 +-
.../entity/nosql/cassandra/CassandraNode.java | 2 +-
.../nosql/cassandra/CassandraNodeImpl.java | 2 +-
.../nosql/couchbase/CouchbaseCluster.java | 2 +-
.../nosql/couchbase/CouchbaseClusterImpl.java | 2 +-
.../entity/nosql/couchbase/CouchbaseNode.java | 2 +-
.../nosql/couchbase/CouchbaseNodeImpl.java | 6 +-
.../nosql/couchbase/CouchbaseSyncGateway.java | 2 +-
.../entity/nosql/couchdb/CouchDBCluster.java | 2 +-
.../nosql/elasticsearch/ElasticSearchNode.java | 2 +-
.../elasticsearch/ElasticSearchNodeImpl.java | 4 +-
.../entity/nosql/mongodb/MongoDBReplicaSet.java | 2 +-
.../nosql/mongodb/MongoDBReplicaSetImpl.java | 6 +-
.../entity/nosql/mongodb/MongoDBServer.java | 4 +-
.../entity/nosql/mongodb/MongoDBServerImpl.java | 4 +-
.../sharding/CoLocatedMongoDBRouter.java | 2 +-
.../sharding/MongoDBConfigServerCluster.java | 2 +-
.../nosql/mongodb/sharding/MongoDBRouter.java | 2 +-
.../mongodb/sharding/MongoDBRouterCluster.java | 2 +-
.../sharding/MongoDBRouterClusterImpl.java | 4 +-
.../sharding/MongoDBShardClusterImpl.java | 4 +-
.../sharding/MongoDBShardedDeployment.java | 2 +-
.../entity/nosql/redis/RedisClusterImpl.java | 2 +-
.../brooklyn/entity/nosql/redis/RedisStore.java | 2 +-
.../brooklyn/entity/nosql/riak/RiakCluster.java | 2 +-
.../entity/nosql/riak/RiakClusterImpl.java | 2 +-
.../brooklyn/entity/nosql/riak/RiakNode.java | 2 +-
.../entity/nosql/riak/RiakNodeImpl.java | 2 +-
.../entity/osgi/karaf/KarafContainerImpl.java | 4 +-
.../entity/dns/AbstractGeoDnsService.java | 2 +-
.../dns/geoscaling/GeoscalingDnsService.java | 2 +-
.../entity/proxy/AbstractController.java | 2 +-
.../entity/proxy/AbstractControllerImpl.java | 2 +-
.../AbstractNonProvisionedControllerImpl.java | 2 +-
.../brooklyn/entity/proxy/LoadBalancer.java | 2 +-
.../entity/proxy/nginx/NginxController.java | 2 +-
.../entity/proxy/nginx/NginxControllerImpl.java | 4 +-
.../brooklyn/entity/proxy/nginx/UrlMapping.java | 2 +-
.../entity/proxy/nginx/UrlMappingImpl.java | 4 +-
.../webapp/ControlledDynamicWebAppCluster.java | 2 +-
.../ControlledDynamicWebAppClusterImpl.java | 4 +-
.../entity/webapp/DynamicWebAppCluster.java | 2 +-
.../entity/webapp/DynamicWebAppClusterImpl.java | 2 +-
.../entity/webapp/DynamicWebAppFabric.java | 2 +-
.../entity/webapp/DynamicWebAppFabricImpl.java | 3 +-
.../entity/webapp/JavaWebAppService.java | 2 +-
.../entity/webapp/WebAppServiceConstants.java | 3 +-
.../entity/webapp/WebAppServiceMetrics.java | 3 +-
.../entity/webapp/jboss/JBoss7Server.java | 2 +-
.../entity/webapp/jetty/Jetty6Server.java | 2 +-
.../entity/webapp/tomcat/TomcatServer.java | 2 +-
.../entity/proxy/AbstractControllerTest.java | 2 +-
.../brooklyn/entity/proxy/StubAppServer.java | 2 +-
.../AbstractWebAppFixtureIntegrationTest.java | 4 +-
.../app/ClusterWebServerDatabaseSample.java | 2 +-
.../spi/dsl/methods/BrooklynDslCommon.java | 2 +-
.../brooklyn/spi/dsl/methods/DslComponent.java | 4 +-
.../camp/brooklyn/DslAndRebindYamlTest.java | 2 +-
.../camp/brooklyn/EntitiesYamlTest.java | 2 +-
.../TestSensorAndEffectorInitializer.java | 2 +-
.../brooklyn/VanillaBashNetcatYamlTest.java | 2 +-
.../brooklyn/cli/lister/ItemDescriptors.java | 2 +-
.../qa/load/SimulatedNginxControllerImpl.java | 4 +-
.../webcluster/SinusoidalLoadGenerator.java | 2 +-
.../qa/longevity/webcluster/WebClusterApp.java | 2 +-
.../rest/resources/ApplicationResource.java | 4 +-
.../brooklyn/rest/resources/SensorResource.java | 4 +-
.../rest/transform/CatalogTransformer.java | 2 +-
.../rest/transform/SensorTransformer.java | 4 +-
.../brooklyn/rest/domain/SensorSummaryTest.java | 4 +-
.../rest/resources/SensorResourceTest.java | 4 +-
.../testing/mocks/RestMockSimpleEntity.java | 2 +-
.../apache/brooklyn/test/EntityTestUtils.java | 6 +-
.../org/apache/brooklyn/test/TestUtils.groovy | 2 +-
323 files changed, 762 insertions(+), 739 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/ee12c779/api/src/main/java/brooklyn/event/AttributeSensor.java
----------------------------------------------------------------------
diff --git a/api/src/main/java/brooklyn/event/AttributeSensor.java b/api/src/main/java/brooklyn/event/AttributeSensor.java
deleted file mode 100644
index 58e7480..0000000
--- a/api/src/main/java/brooklyn/event/AttributeSensor.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package brooklyn.event;
-
-import com.google.common.annotations.Beta;
-
-/**
- * The interface implemented by attribute sensors.
- */
-public interface AttributeSensor<T> extends Sensor<T> {
-
- /**
- * @since 0.7.0
- */
- @Beta
- public enum SensorPersistenceMode {
- /**
- * Indicates that this sensor should be persisted, and its value should be read from
- * persisted state on rebind.
- */
- REQUIRED,
-
- /**
- * Indicates that this sensor should not be persisted; therefore its value for any entity
- * will be null immediately after rebind.
- */
- NONE;
- }
-
- /**
- * The persistence mode of this sensor, to determine its behaviour for rebind.
- *
- * @since 0.7.0
- */
- SensorPersistenceMode getPersistenceMode();
-}
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/ee12c779/api/src/main/java/brooklyn/event/Sensor.java
----------------------------------------------------------------------
diff --git a/api/src/main/java/brooklyn/event/Sensor.java b/api/src/main/java/brooklyn/event/Sensor.java
deleted file mode 100644
index f58f064..0000000
--- a/api/src/main/java/brooklyn/event/Sensor.java
+++ /dev/null
@@ -1,77 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package brooklyn.event;
-
-import java.io.Serializable;
-import java.util.List;
-
-import org.apache.brooklyn.api.entity.Entity;
-
-import com.google.common.reflect.TypeToken;
-
-/**
- * The interface implemented by concrete sensors.
- *
- * A sensor is a container for a piece of data of a particular type, and exists in a hierarchical namespace.
- * The name of the sensor is described as a set of tokens separated by dots.
- *
- * @see SensorEvent
- */
-public interface Sensor<T> extends Serializable {
- /**
- * Returns the Java {@link Class} for the sensor data.
- * <p>
- * This returns a "super" of T only in the case where T is generified,
- * and in such cases it returns the Class instance for the unadorned T ---
- * i.e. for List<String> this returns Class<List> ---
- * this is of course because there is no actual Class<List<String>> instance.
- */
- Class<? super T> getType();
-
- /**
- * Returns the Guava TypeToken (including generics info)
- */
- TypeToken<T> getTypeToken();
-
- /**
- * Returns the type of the sensor data, as a {@link String} representation of the class name.
- * (Useful for contexts where Type is not accessible.)
- */
- String getTypeName();
-
- /**
- * Returns the name of the sensor, in a dot-separated namespace.
- */
- String getName();
-
- /**
- * Returns the constituent parts of the sensor name as a {@link List}.
- */
- List<String> getNameParts();
-
- /**
- * Returns the description of the sensor, for display.
- */
- String getDescription();
-
- /**
- * Create a new {@link SensorEvent} object for a specific {@link Entity} and data point.
- */
- SensorEvent<T> newEvent(Entity entity, T value);
-}
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/ee12c779/api/src/main/java/brooklyn/event/SensorEvent.java
----------------------------------------------------------------------
diff --git a/api/src/main/java/brooklyn/event/SensorEvent.java b/api/src/main/java/brooklyn/event/SensorEvent.java
deleted file mode 100644
index 14c5ea4..0000000
--- a/api/src/main/java/brooklyn/event/SensorEvent.java
+++ /dev/null
@@ -1,47 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package brooklyn.event;
-
-import org.apache.brooklyn.api.entity.Entity;
-
-/**
- * A tuple representing a piece of data from a {@link Sensor} on an {@link Entity}.
- */
-public interface SensorEvent<T> {
- /**
- * The {@link Entity} where the data originated.
- */
- Entity getSource();
-
- /**
- * The {@link Sensor} describing the data.
- */
- Sensor<T> getSensor();
-
- /**
- * The value for the {@link Sensor} data.
- */
- T getValue();
-
- /**
- * The time this data was published, as a UTC time in milliseconds (e.g. as returned
- * by {@link System#currentTimeMillis()}.
- */
- long getTimestamp();
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/ee12c779/api/src/main/java/brooklyn/event/SensorEventListener.java
----------------------------------------------------------------------
diff --git a/api/src/main/java/brooklyn/event/SensorEventListener.java b/api/src/main/java/brooklyn/event/SensorEventListener.java
deleted file mode 100644
index ea4d528..0000000
--- a/api/src/main/java/brooklyn/event/SensorEventListener.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
- */
-package brooklyn.event;
-
-import org.apache.brooklyn.api.entity.Entity;
-
-/**
- * A listener for {@link SensorEvent}s on an {@link Entity}.
- */
-public interface SensorEventListener<T> {
-
- public static final SensorEventListener<Object> NOOP = new SensorEventListener<Object>() {
- @Override public void onEvent(SensorEvent<Object> event) {
- }
- };
-
- /**
- * The {@link SensorEvent} handler method.
- */
- void onEvent(SensorEvent<T> event);
-}
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/ee12c779/api/src/main/java/org/apache/brooklyn/api/entity/Entity.java
----------------------------------------------------------------------
diff --git a/api/src/main/java/org/apache/brooklyn/api/entity/Entity.java b/api/src/main/java/org/apache/brooklyn/api/entity/Entity.java
index 6279121..29a69f1 100644
--- a/api/src/main/java/org/apache/brooklyn/api/entity/Entity.java
+++ b/api/src/main/java/org/apache/brooklyn/api/entity/Entity.java
@@ -25,6 +25,7 @@ import javax.annotation.Nullable;
import org.apache.brooklyn.api.basic.BrooklynObject;
import org.apache.brooklyn.api.entity.proxying.EntitySpec;
+import org.apache.brooklyn.api.event.AttributeSensor;
import org.apache.brooklyn.management.Task;
import org.apache.brooklyn.policy.Enricher;
import org.apache.brooklyn.policy.EnricherSpec;
@@ -33,7 +34,6 @@ import org.apache.brooklyn.policy.PolicySpec;
import brooklyn.config.ConfigKey;
import brooklyn.config.ConfigKey.HasConfigKey;
-import brooklyn.event.AttributeSensor;
import brooklyn.location.Location;
import brooklyn.util.guava.Maybe;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/ee12c779/api/src/main/java/org/apache/brooklyn/api/entity/EntityType.java
----------------------------------------------------------------------
diff --git a/api/src/main/java/org/apache/brooklyn/api/entity/EntityType.java b/api/src/main/java/org/apache/brooklyn/api/entity/EntityType.java
index 98d6258..42548a2 100644
--- a/api/src/main/java/org/apache/brooklyn/api/entity/EntityType.java
+++ b/api/src/main/java/org/apache/brooklyn/api/entity/EntityType.java
@@ -22,8 +22,8 @@ import java.util.NoSuchElementException;
import java.util.Set;
import org.apache.brooklyn.api.basic.BrooklynType;
+import org.apache.brooklyn.api.event.Sensor;
-import brooklyn.event.Sensor;
import brooklyn.util.guava.Maybe;
/**
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/ee12c779/api/src/main/java/org/apache/brooklyn/api/entity/basic/EntityLocal.java
----------------------------------------------------------------------
diff --git a/api/src/main/java/org/apache/brooklyn/api/entity/basic/EntityLocal.java b/api/src/main/java/org/apache/brooklyn/api/entity/basic/EntityLocal.java
index 0860814..db0c813 100644
--- a/api/src/main/java/org/apache/brooklyn/api/entity/basic/EntityLocal.java
+++ b/api/src/main/java/org/apache/brooklyn/api/entity/basic/EntityLocal.java
@@ -23,6 +23,10 @@ import java.util.Map;
import org.apache.brooklyn.api.entity.Entity;
import org.apache.brooklyn.api.entity.Group;
import org.apache.brooklyn.api.entity.trait.Configurable;
+import org.apache.brooklyn.api.event.AttributeSensor;
+import org.apache.brooklyn.api.event.Sensor;
+import org.apache.brooklyn.api.event.SensorEvent;
+import org.apache.brooklyn.api.event.SensorEventListener;
import org.apache.brooklyn.management.SubscriptionContext;
import org.apache.brooklyn.management.SubscriptionHandle;
import org.apache.brooklyn.management.SubscriptionManager;
@@ -30,10 +34,6 @@ import org.apache.brooklyn.management.Task;
import brooklyn.config.ConfigKey;
import brooklyn.config.ConfigKey.HasConfigKey;
-import brooklyn.event.AttributeSensor;
-import brooklyn.event.Sensor;
-import brooklyn.event.SensorEvent;
-import brooklyn.event.SensorEventListener;
import brooklyn.util.guava.Maybe;
import com.google.common.annotations.Beta;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/ee12c779/api/src/main/java/org/apache/brooklyn/api/event/AttributeSensor.java
----------------------------------------------------------------------
diff --git a/api/src/main/java/org/apache/brooklyn/api/event/AttributeSensor.java b/api/src/main/java/org/apache/brooklyn/api/event/AttributeSensor.java
new file mode 100644
index 0000000..348b751
--- /dev/null
+++ b/api/src/main/java/org/apache/brooklyn/api/event/AttributeSensor.java
@@ -0,0 +1,52 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.brooklyn.api.event;
+
+import com.google.common.annotations.Beta;
+
+/**
+ * The interface implemented by attribute sensors.
+ */
+public interface AttributeSensor<T> extends Sensor<T> {
+
+ /**
+ * @since 0.7.0
+ */
+ @Beta
+ public enum SensorPersistenceMode {
+ /**
+ * Indicates that this sensor should be persisted, and its value should be read from
+ * persisted state on rebind.
+ */
+ REQUIRED,
+
+ /**
+ * Indicates that this sensor should not be persisted; therefore its value for any entity
+ * will be null immediately after rebind.
+ */
+ NONE;
+ }
+
+ /**
+ * The persistence mode of this sensor, to determine its behaviour for rebind.
+ *
+ * @since 0.7.0
+ */
+ SensorPersistenceMode getPersistenceMode();
+}
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/ee12c779/api/src/main/java/org/apache/brooklyn/api/event/Sensor.java
----------------------------------------------------------------------
diff --git a/api/src/main/java/org/apache/brooklyn/api/event/Sensor.java b/api/src/main/java/org/apache/brooklyn/api/event/Sensor.java
new file mode 100644
index 0000000..5d40c57
--- /dev/null
+++ b/api/src/main/java/org/apache/brooklyn/api/event/Sensor.java
@@ -0,0 +1,77 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.brooklyn.api.event;
+
+import java.io.Serializable;
+import java.util.List;
+
+import org.apache.brooklyn.api.entity.Entity;
+
+import com.google.common.reflect.TypeToken;
+
+/**
+ * The interface implemented by concrete sensors.
+ *
+ * A sensor is a container for a piece of data of a particular type, and exists in a hierarchical namespace.
+ * The name of the sensor is described as a set of tokens separated by dots.
+ *
+ * @see SensorEvent
+ */
+public interface Sensor<T> extends Serializable {
+ /**
+ * Returns the Java {@link Class} for the sensor data.
+ * <p>
+ * This returns a "super" of T only in the case where T is generified,
+ * and in such cases it returns the Class instance for the unadorned T ---
+ * i.e. for List<String> this returns Class<List> ---
+ * this is of course because there is no actual Class<List<String>> instance.
+ */
+ Class<? super T> getType();
+
+ /**
+ * Returns the Guava TypeToken (including generics info)
+ */
+ TypeToken<T> getTypeToken();
+
+ /**
+ * Returns the type of the sensor data, as a {@link String} representation of the class name.
+ * (Useful for contexts where Type is not accessible.)
+ */
+ String getTypeName();
+
+ /**
+ * Returns the name of the sensor, in a dot-separated namespace.
+ */
+ String getName();
+
+ /**
+ * Returns the constituent parts of the sensor name as a {@link List}.
+ */
+ List<String> getNameParts();
+
+ /**
+ * Returns the description of the sensor, for display.
+ */
+ String getDescription();
+
+ /**
+ * Create a new {@link SensorEvent} object for a specific {@link Entity} and data point.
+ */
+ SensorEvent<T> newEvent(Entity entity, T value);
+}
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/ee12c779/api/src/main/java/org/apache/brooklyn/api/event/SensorEvent.java
----------------------------------------------------------------------
diff --git a/api/src/main/java/org/apache/brooklyn/api/event/SensorEvent.java b/api/src/main/java/org/apache/brooklyn/api/event/SensorEvent.java
new file mode 100644
index 0000000..edb7a23
--- /dev/null
+++ b/api/src/main/java/org/apache/brooklyn/api/event/SensorEvent.java
@@ -0,0 +1,47 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.brooklyn.api.event;
+
+import org.apache.brooklyn.api.entity.Entity;
+
+/**
+ * A tuple representing a piece of data from a {@link Sensor} on an {@link Entity}.
+ */
+public interface SensorEvent<T> {
+ /**
+ * The {@link Entity} where the data originated.
+ */
+ Entity getSource();
+
+ /**
+ * The {@link Sensor} describing the data.
+ */
+ Sensor<T> getSensor();
+
+ /**
+ * The value for the {@link Sensor} data.
+ */
+ T getValue();
+
+ /**
+ * The time this data was published, as a UTC time in milliseconds (e.g. as returned
+ * by {@link System#currentTimeMillis()}.
+ */
+ long getTimestamp();
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/ee12c779/api/src/main/java/org/apache/brooklyn/api/event/SensorEventListener.java
----------------------------------------------------------------------
diff --git a/api/src/main/java/org/apache/brooklyn/api/event/SensorEventListener.java b/api/src/main/java/org/apache/brooklyn/api/event/SensorEventListener.java
new file mode 100644
index 0000000..bbeb46f
--- /dev/null
+++ b/api/src/main/java/org/apache/brooklyn/api/event/SensorEventListener.java
@@ -0,0 +1,37 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.brooklyn.api.event;
+
+import org.apache.brooklyn.api.entity.Entity;
+
+/**
+ * A listener for {@link SensorEvent}s on an {@link Entity}.
+ */
+public interface SensorEventListener<T> {
+
+ public static final SensorEventListener<Object> NOOP = new SensorEventListener<Object>() {
+ @Override public void onEvent(SensorEvent<Object> event) {
+ }
+ };
+
+ /**
+ * The {@link SensorEvent} handler method.
+ */
+ void onEvent(SensorEvent<T> event);
+}
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/ee12c779/api/src/main/java/org/apache/brooklyn/management/SubscriptionContext.java
----------------------------------------------------------------------
diff --git a/api/src/main/java/org/apache/brooklyn/management/SubscriptionContext.java b/api/src/main/java/org/apache/brooklyn/management/SubscriptionContext.java
index 240823a..2260c2c 100644
--- a/api/src/main/java/org/apache/brooklyn/management/SubscriptionContext.java
+++ b/api/src/main/java/org/apache/brooklyn/management/SubscriptionContext.java
@@ -23,10 +23,9 @@ import java.util.Set;
import org.apache.brooklyn.api.entity.Entity;
import org.apache.brooklyn.api.entity.Group;
-
-import brooklyn.event.Sensor;
-import brooklyn.event.SensorEvent;
-import brooklyn.event.SensorEventListener;
+import org.apache.brooklyn.api.event.Sensor;
+import org.apache.brooklyn.api.event.SensorEvent;
+import org.apache.brooklyn.api.event.SensorEventListener;
/**
* This is the context through which an {@link Entity} can manage its subscriptions.
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/ee12c779/api/src/main/java/org/apache/brooklyn/management/SubscriptionManager.java
----------------------------------------------------------------------
diff --git a/api/src/main/java/org/apache/brooklyn/management/SubscriptionManager.java b/api/src/main/java/org/apache/brooklyn/management/SubscriptionManager.java
index 22f5f12..d6fe4c5 100644
--- a/api/src/main/java/org/apache/brooklyn/management/SubscriptionManager.java
+++ b/api/src/main/java/org/apache/brooklyn/management/SubscriptionManager.java
@@ -23,10 +23,9 @@ import java.util.Set;
import org.apache.brooklyn.api.entity.Entity;
import org.apache.brooklyn.api.entity.Group;
-
-import brooklyn.event.Sensor;
-import brooklyn.event.SensorEvent;
-import brooklyn.event.SensorEventListener;
+import org.apache.brooklyn.api.event.Sensor;
+import org.apache.brooklyn.api.event.SensorEvent;
+import org.apache.brooklyn.api.event.SensorEventListener;
/**
* The management interface for subscriptions.
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/ee12c779/api/src/main/java/org/apache/brooklyn/mementos/EntityMemento.java
----------------------------------------------------------------------
diff --git a/api/src/main/java/org/apache/brooklyn/mementos/EntityMemento.java b/api/src/main/java/org/apache/brooklyn/mementos/EntityMemento.java
index 2747ff6..2b1fb14 100644
--- a/api/src/main/java/org/apache/brooklyn/mementos/EntityMemento.java
+++ b/api/src/main/java/org/apache/brooklyn/mementos/EntityMemento.java
@@ -24,9 +24,9 @@ import java.util.Map;
import org.apache.brooklyn.api.entity.Effector;
import org.apache.brooklyn.api.entity.rebind.RebindSupport;
+import org.apache.brooklyn.api.event.AttributeSensor;
import brooklyn.config.ConfigKey;
-import brooklyn.event.AttributeSensor;
/**
* Represents the state of an entity, so that it can be reconstructed (e.g. after restarting brooklyn).
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/ee12c779/core/src/main/java/brooklyn/basic/BrooklynTypes.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/brooklyn/basic/BrooklynTypes.java b/core/src/main/java/brooklyn/basic/BrooklynTypes.java
index 781787e..8db853d 100644
--- a/core/src/main/java/brooklyn/basic/BrooklynTypes.java
+++ b/core/src/main/java/brooklyn/basic/BrooklynTypes.java
@@ -22,13 +22,13 @@ import java.util.Map;
import org.apache.brooklyn.api.basic.BrooklynObject;
import org.apache.brooklyn.api.entity.Entity;
+import org.apache.brooklyn.api.event.Sensor;
import org.apache.brooklyn.policy.Enricher;
import org.apache.brooklyn.policy.Policy;
import brooklyn.config.ConfigKey;
import brooklyn.enricher.basic.EnricherDynamicType;
import brooklyn.entity.basic.EntityDynamicType;
-import brooklyn.event.Sensor;
import brooklyn.location.Location;
import brooklyn.policy.basic.PolicyDynamicType;
import brooklyn.util.exceptions.Exceptions;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/ee12c779/core/src/main/java/brooklyn/config/render/RendererHints.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/brooklyn/config/render/RendererHints.java b/core/src/main/java/brooklyn/config/render/RendererHints.java
index f53f02f..bc04eea 100644
--- a/core/src/main/java/brooklyn/config/render/RendererHints.java
+++ b/core/src/main/java/brooklyn/config/render/RendererHints.java
@@ -23,11 +23,11 @@ import groovy.lang.Closure;
import java.util.Set;
import org.apache.brooklyn.api.entity.Entity;
+import org.apache.brooklyn.api.event.AttributeSensor;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import brooklyn.config.ConfigKey;
-import brooklyn.event.AttributeSensor;
import brooklyn.util.GroovyJavaMethods;
import com.google.common.annotations.Beta;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/ee12c779/core/src/main/java/brooklyn/enricher/CustomAggregatingEnricher.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/brooklyn/enricher/CustomAggregatingEnricher.java b/core/src/main/java/brooklyn/enricher/CustomAggregatingEnricher.java
index 8b6aecc..1089ae4 100644
--- a/core/src/main/java/brooklyn/enricher/CustomAggregatingEnricher.java
+++ b/core/src/main/java/brooklyn/enricher/CustomAggregatingEnricher.java
@@ -24,12 +24,12 @@ import java.util.Collection;
import java.util.Collections;
import java.util.Map;
+import org.apache.brooklyn.api.event.AttributeSensor;
+import org.apache.brooklyn.api.event.SensorEventListener;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import brooklyn.enricher.basic.AbstractAggregatingEnricher;
-import brooklyn.event.AttributeSensor;
-import brooklyn.event.SensorEventListener;
import brooklyn.util.GroovyJavaMethods;
import brooklyn.util.flags.TypeCoercions;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/ee12c779/core/src/main/java/brooklyn/enricher/Enrichers.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/brooklyn/enricher/Enrichers.java b/core/src/main/java/brooklyn/enricher/Enrichers.java
index 3aed8de..146d928 100644
--- a/core/src/main/java/brooklyn/enricher/Enrichers.java
+++ b/core/src/main/java/brooklyn/enricher/Enrichers.java
@@ -27,6 +27,9 @@ import java.util.Map;
import java.util.Set;
import org.apache.brooklyn.api.entity.Entity;
+import org.apache.brooklyn.api.event.AttributeSensor;
+import org.apache.brooklyn.api.event.Sensor;
+import org.apache.brooklyn.api.event.SensorEvent;
import org.apache.brooklyn.policy.Enricher;
import org.apache.brooklyn.policy.EnricherSpec;
@@ -37,9 +40,6 @@ import brooklyn.enricher.basic.Joiner;
import brooklyn.enricher.basic.Propagator;
import brooklyn.enricher.basic.Transformer;
import brooklyn.enricher.basic.UpdatingMap;
-import brooklyn.event.AttributeSensor;
-import brooklyn.event.Sensor;
-import brooklyn.event.SensorEvent;
import brooklyn.util.collections.MutableList;
import brooklyn.util.collections.MutableMap;
import brooklyn.util.collections.MutableSet;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/ee12c779/core/src/main/java/brooklyn/enricher/basic/AbstractAggregatingEnricher.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/brooklyn/enricher/basic/AbstractAggregatingEnricher.java b/core/src/main/java/brooklyn/enricher/basic/AbstractAggregatingEnricher.java
index 21cc238..47481bf 100644
--- a/core/src/main/java/brooklyn/enricher/basic/AbstractAggregatingEnricher.java
+++ b/core/src/main/java/brooklyn/enricher/basic/AbstractAggregatingEnricher.java
@@ -27,13 +27,13 @@ import java.util.Set;
import org.apache.brooklyn.api.entity.Entity;
import org.apache.brooklyn.api.entity.Group;
import org.apache.brooklyn.api.entity.basic.EntityLocal;
+import org.apache.brooklyn.api.event.AttributeSensor;
+import org.apache.brooklyn.api.event.SensorEvent;
+import org.apache.brooklyn.api.event.SensorEventListener;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import brooklyn.entity.trait.Changeable;
-import brooklyn.event.AttributeSensor;
-import brooklyn.event.SensorEvent;
-import brooklyn.event.SensorEventListener;
import brooklyn.util.GroovyJavaMethods;
import com.google.common.base.Predicate;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/ee12c779/core/src/main/java/brooklyn/enricher/basic/AbstractAggregator.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/brooklyn/enricher/basic/AbstractAggregator.java b/core/src/main/java/brooklyn/enricher/basic/AbstractAggregator.java
index 0711579..15202ae 100644
--- a/core/src/main/java/brooklyn/enricher/basic/AbstractAggregator.java
+++ b/core/src/main/java/brooklyn/enricher/basic/AbstractAggregator.java
@@ -25,6 +25,9 @@ import java.util.Set;
import org.apache.brooklyn.api.entity.Entity;
import org.apache.brooklyn.api.entity.Group;
import org.apache.brooklyn.api.entity.basic.EntityLocal;
+import org.apache.brooklyn.api.event.Sensor;
+import org.apache.brooklyn.api.event.SensorEvent;
+import org.apache.brooklyn.api.event.SensorEventListener;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -32,9 +35,6 @@ import brooklyn.config.ConfigKey;
import brooklyn.entity.basic.AbstractEntity;
import brooklyn.entity.basic.ConfigKeys;
import brooklyn.entity.trait.Changeable;
-import brooklyn.event.Sensor;
-import brooklyn.event.SensorEvent;
-import brooklyn.event.SensorEventListener;
import brooklyn.util.exceptions.Exceptions;
import brooklyn.util.guava.Maybe;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/ee12c779/core/src/main/java/brooklyn/enricher/basic/AbstractEnricher.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/brooklyn/enricher/basic/AbstractEnricher.java b/core/src/main/java/brooklyn/enricher/basic/AbstractEnricher.java
index a2dfcd1..0ed4452 100644
--- a/core/src/main/java/brooklyn/enricher/basic/AbstractEnricher.java
+++ b/core/src/main/java/brooklyn/enricher/basic/AbstractEnricher.java
@@ -24,6 +24,8 @@ import java.util.Map;
import org.apache.brooklyn.api.entity.basic.EntityLocal;
import org.apache.brooklyn.api.entity.rebind.RebindSupport;
+import org.apache.brooklyn.api.event.AttributeSensor;
+import org.apache.brooklyn.api.event.Sensor;
import org.apache.brooklyn.mementos.EnricherMemento;
import org.apache.brooklyn.policy.Enricher;
import org.apache.brooklyn.policy.EnricherType;
@@ -33,8 +35,6 @@ import brooklyn.entity.basic.ConfigKeys;
import brooklyn.entity.basic.Entities;
import brooklyn.entity.basic.EntityInternal;
import brooklyn.entity.rebind.BasicEnricherRebindSupport;
-import brooklyn.event.AttributeSensor;
-import brooklyn.event.Sensor;
import brooklyn.policy.basic.AbstractEntityAdjunct;
import brooklyn.util.flags.TypeCoercions;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/ee12c779/core/src/main/java/brooklyn/enricher/basic/AbstractMultipleSensorAggregator.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/brooklyn/enricher/basic/AbstractMultipleSensorAggregator.java b/core/src/main/java/brooklyn/enricher/basic/AbstractMultipleSensorAggregator.java
index 9593546..af47c59 100644
--- a/core/src/main/java/brooklyn/enricher/basic/AbstractMultipleSensorAggregator.java
+++ b/core/src/main/java/brooklyn/enricher/basic/AbstractMultipleSensorAggregator.java
@@ -26,14 +26,14 @@ import java.util.Map;
import java.util.Map.Entry;
import org.apache.brooklyn.api.entity.Entity;
+import org.apache.brooklyn.api.event.AttributeSensor;
+import org.apache.brooklyn.api.event.Sensor;
+import org.apache.brooklyn.api.event.SensorEvent;
+import org.apache.brooklyn.api.event.SensorEventListener;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import brooklyn.config.BrooklynLogging;
-import brooklyn.event.AttributeSensor;
-import brooklyn.event.Sensor;
-import brooklyn.event.SensorEvent;
-import brooklyn.event.SensorEventListener;
import brooklyn.util.collections.MutableMap;
import brooklyn.util.flags.TypeCoercions;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/ee12c779/core/src/main/java/brooklyn/enricher/basic/AbstractTransformer.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/brooklyn/enricher/basic/AbstractTransformer.java b/core/src/main/java/brooklyn/enricher/basic/AbstractTransformer.java
index 2b284de..6635445 100644
--- a/core/src/main/java/brooklyn/enricher/basic/AbstractTransformer.java
+++ b/core/src/main/java/brooklyn/enricher/basic/AbstractTransformer.java
@@ -20,15 +20,15 @@ package brooklyn.enricher.basic;
import org.apache.brooklyn.api.entity.Entity;
import org.apache.brooklyn.api.entity.basic.EntityLocal;
+import org.apache.brooklyn.api.event.AttributeSensor;
+import org.apache.brooklyn.api.event.Sensor;
+import org.apache.brooklyn.api.event.SensorEvent;
+import org.apache.brooklyn.api.event.SensorEventListener;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import brooklyn.config.ConfigKey;
import brooklyn.entity.basic.ConfigKeys;
-import brooklyn.event.AttributeSensor;
-import brooklyn.event.Sensor;
-import brooklyn.event.SensorEvent;
-import brooklyn.event.SensorEventListener;
import brooklyn.event.basic.BasicSensorEvent;
import com.google.common.base.Function;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/ee12c779/core/src/main/java/brooklyn/enricher/basic/AbstractTransformingEnricher.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/brooklyn/enricher/basic/AbstractTransformingEnricher.java b/core/src/main/java/brooklyn/enricher/basic/AbstractTransformingEnricher.java
index e211ce5..520f89b 100644
--- a/core/src/main/java/brooklyn/enricher/basic/AbstractTransformingEnricher.java
+++ b/core/src/main/java/brooklyn/enricher/basic/AbstractTransformingEnricher.java
@@ -19,8 +19,7 @@
package brooklyn.enricher.basic;
import org.apache.brooklyn.api.entity.Entity;
-
-import brooklyn.event.Sensor;
+import org.apache.brooklyn.api.event.Sensor;
/**
* Convenience base for transforming a single sensor into a single new sensor of the same type
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/ee12c779/core/src/main/java/brooklyn/enricher/basic/AbstractTypeTransformingEnricher.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/brooklyn/enricher/basic/AbstractTypeTransformingEnricher.java b/core/src/main/java/brooklyn/enricher/basic/AbstractTypeTransformingEnricher.java
index bab952b..7bf0ef6 100644
--- a/core/src/main/java/brooklyn/enricher/basic/AbstractTypeTransformingEnricher.java
+++ b/core/src/main/java/brooklyn/enricher/basic/AbstractTypeTransformingEnricher.java
@@ -20,10 +20,10 @@ package brooklyn.enricher.basic;
import org.apache.brooklyn.api.entity.Entity;
import org.apache.brooklyn.api.entity.basic.EntityLocal;
+import org.apache.brooklyn.api.event.AttributeSensor;
+import org.apache.brooklyn.api.event.Sensor;
+import org.apache.brooklyn.api.event.SensorEventListener;
-import brooklyn.event.AttributeSensor;
-import brooklyn.event.Sensor;
-import brooklyn.event.SensorEventListener;
import brooklyn.event.basic.BasicSensorEvent;
import brooklyn.util.flags.SetFromFlag;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/ee12c779/core/src/main/java/brooklyn/enricher/basic/AddingEnricher.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/brooklyn/enricher/basic/AddingEnricher.java b/core/src/main/java/brooklyn/enricher/basic/AddingEnricher.java
index 2688d64..edbf95f 100644
--- a/core/src/main/java/brooklyn/enricher/basic/AddingEnricher.java
+++ b/core/src/main/java/brooklyn/enricher/basic/AddingEnricher.java
@@ -19,11 +19,11 @@
package brooklyn.enricher.basic;
import org.apache.brooklyn.api.entity.basic.EntityLocal;
+import org.apache.brooklyn.api.event.AttributeSensor;
+import org.apache.brooklyn.api.event.Sensor;
+import org.apache.brooklyn.api.event.SensorEvent;
+import org.apache.brooklyn.api.event.SensorEventListener;
-import brooklyn.event.AttributeSensor;
-import brooklyn.event.Sensor;
-import brooklyn.event.SensorEvent;
-import brooklyn.event.SensorEventListener;
import brooklyn.event.basic.BasicSensorEvent;
/**
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/ee12c779/core/src/main/java/brooklyn/enricher/basic/Aggregator.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/brooklyn/enricher/basic/Aggregator.java b/core/src/main/java/brooklyn/enricher/basic/Aggregator.java
index 1391c4e..c14487b 100644
--- a/core/src/main/java/brooklyn/enricher/basic/Aggregator.java
+++ b/core/src/main/java/brooklyn/enricher/basic/Aggregator.java
@@ -26,6 +26,10 @@ import java.util.Map;
import java.util.Objects;
import org.apache.brooklyn.api.entity.Entity;
+import org.apache.brooklyn.api.event.AttributeSensor;
+import org.apache.brooklyn.api.event.Sensor;
+import org.apache.brooklyn.api.event.SensorEvent;
+import org.apache.brooklyn.api.event.SensorEventListener;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -33,10 +37,6 @@ import brooklyn.config.BrooklynLogging;
import brooklyn.config.ConfigKey;
import brooklyn.enricher.Enrichers;
import brooklyn.entity.basic.ConfigKeys;
-import brooklyn.event.AttributeSensor;
-import brooklyn.event.Sensor;
-import brooklyn.event.SensorEvent;
-import brooklyn.event.SensorEventListener;
import brooklyn.util.collections.MutableList;
import brooklyn.util.collections.MutableMap;
import brooklyn.util.exceptions.Exceptions;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/ee12c779/core/src/main/java/brooklyn/enricher/basic/Combiner.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/brooklyn/enricher/basic/Combiner.java b/core/src/main/java/brooklyn/enricher/basic/Combiner.java
index 440c75b..2d647ec 100644
--- a/core/src/main/java/brooklyn/enricher/basic/Combiner.java
+++ b/core/src/main/java/brooklyn/enricher/basic/Combiner.java
@@ -29,15 +29,15 @@ import java.util.Set;
import org.apache.brooklyn.api.entity.Entity;
import org.apache.brooklyn.api.entity.basic.EntityLocal;
+import org.apache.brooklyn.api.event.AttributeSensor;
+import org.apache.brooklyn.api.event.Sensor;
+import org.apache.brooklyn.api.event.SensorEvent;
+import org.apache.brooklyn.api.event.SensorEventListener;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import brooklyn.config.ConfigKey;
import brooklyn.entity.basic.ConfigKeys;
-import brooklyn.event.AttributeSensor;
-import brooklyn.event.Sensor;
-import brooklyn.event.SensorEvent;
-import brooklyn.event.SensorEventListener;
import brooklyn.event.basic.BasicSensorEvent;
import brooklyn.util.collections.MutableList;
import brooklyn.util.exceptions.Exceptions;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/ee12c779/core/src/main/java/brooklyn/enricher/basic/Joiner.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/brooklyn/enricher/basic/Joiner.java b/core/src/main/java/brooklyn/enricher/basic/Joiner.java
index 3a66327..8c65681 100644
--- a/core/src/main/java/brooklyn/enricher/basic/Joiner.java
+++ b/core/src/main/java/brooklyn/enricher/basic/Joiner.java
@@ -22,15 +22,15 @@ import java.util.Map;
import org.apache.brooklyn.api.entity.Entity;
import org.apache.brooklyn.api.entity.basic.EntityLocal;
+import org.apache.brooklyn.api.event.AttributeSensor;
+import org.apache.brooklyn.api.event.Sensor;
+import org.apache.brooklyn.api.event.SensorEvent;
+import org.apache.brooklyn.api.event.SensorEventListener;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import brooklyn.config.ConfigKey;
import brooklyn.entity.basic.ConfigKeys;
-import brooklyn.event.AttributeSensor;
-import brooklyn.event.Sensor;
-import brooklyn.event.SensorEvent;
-import brooklyn.event.SensorEventListener;
import brooklyn.event.basic.BasicSensorEvent;
import brooklyn.util.collections.MutableList;
import brooklyn.util.flags.SetFromFlag;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/ee12c779/core/src/main/java/brooklyn/enricher/basic/Propagator.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/brooklyn/enricher/basic/Propagator.java b/core/src/main/java/brooklyn/enricher/basic/Propagator.java
index 413c53a..187ad8d 100644
--- a/core/src/main/java/brooklyn/enricher/basic/Propagator.java
+++ b/core/src/main/java/brooklyn/enricher/basic/Propagator.java
@@ -24,16 +24,16 @@ import java.util.Set;
import org.apache.brooklyn.api.entity.Entity;
import org.apache.brooklyn.api.entity.basic.EntityLocal;
+import org.apache.brooklyn.api.event.AttributeSensor;
+import org.apache.brooklyn.api.event.Sensor;
+import org.apache.brooklyn.api.event.SensorEvent;
+import org.apache.brooklyn.api.event.SensorEventListener;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import brooklyn.config.ConfigKey;
import brooklyn.entity.basic.Attributes;
import brooklyn.entity.basic.ConfigKeys;
-import brooklyn.event.AttributeSensor;
-import brooklyn.event.Sensor;
-import brooklyn.event.SensorEvent;
-import brooklyn.event.SensorEventListener;
import brooklyn.util.collections.MutableMap;
import brooklyn.util.flags.SetFromFlag;
import brooklyn.util.task.Tasks;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/ee12c779/core/src/main/java/brooklyn/enricher/basic/SensorPropagatingEnricher.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/brooklyn/enricher/basic/SensorPropagatingEnricher.java b/core/src/main/java/brooklyn/enricher/basic/SensorPropagatingEnricher.java
index 615b29e..133d667 100644
--- a/core/src/main/java/brooklyn/enricher/basic/SensorPropagatingEnricher.java
+++ b/core/src/main/java/brooklyn/enricher/basic/SensorPropagatingEnricher.java
@@ -24,14 +24,14 @@ import java.util.Set;
import org.apache.brooklyn.api.entity.Entity;
import org.apache.brooklyn.api.entity.basic.EntityLocal;
+import org.apache.brooklyn.api.event.AttributeSensor;
+import org.apache.brooklyn.api.event.Sensor;
+import org.apache.brooklyn.api.event.SensorEvent;
+import org.apache.brooklyn.api.event.SensorEventListener;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import brooklyn.enricher.Enrichers;
-import brooklyn.event.AttributeSensor;
-import brooklyn.event.Sensor;
-import brooklyn.event.SensorEvent;
-import brooklyn.event.SensorEventListener;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/ee12c779/core/src/main/java/brooklyn/enricher/basic/SensorTransformingEnricher.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/brooklyn/enricher/basic/SensorTransformingEnricher.java b/core/src/main/java/brooklyn/enricher/basic/SensorTransformingEnricher.java
index b188289..952aed3 100644
--- a/core/src/main/java/brooklyn/enricher/basic/SensorTransformingEnricher.java
+++ b/core/src/main/java/brooklyn/enricher/basic/SensorTransformingEnricher.java
@@ -19,11 +19,11 @@
package brooklyn.enricher.basic;
import org.apache.brooklyn.api.entity.Entity;
+import org.apache.brooklyn.api.event.AttributeSensor;
+import org.apache.brooklyn.api.event.Sensor;
+import org.apache.brooklyn.api.event.SensorEvent;
import groovy.lang.Closure;
-import brooklyn.event.AttributeSensor;
-import brooklyn.event.Sensor;
-import brooklyn.event.SensorEvent;
import brooklyn.util.GroovyJavaMethods;
import brooklyn.util.javalang.JavaClassNames;
import brooklyn.util.time.Duration;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/ee12c779/core/src/main/java/brooklyn/enricher/basic/Transformer.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/brooklyn/enricher/basic/Transformer.java b/core/src/main/java/brooklyn/enricher/basic/Transformer.java
index 6b2f7a8..7e331ba 100644
--- a/core/src/main/java/brooklyn/enricher/basic/Transformer.java
+++ b/core/src/main/java/brooklyn/enricher/basic/Transformer.java
@@ -20,12 +20,12 @@ package brooklyn.enricher.basic;
import static com.google.common.base.Preconditions.checkArgument;
+import org.apache.brooklyn.api.event.SensorEvent;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import brooklyn.config.ConfigKey;
import brooklyn.entity.basic.ConfigKeys;
-import brooklyn.event.SensorEvent;
import brooklyn.util.collections.MutableSet;
import brooklyn.util.task.Tasks;
import brooklyn.util.task.ValueResolver;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/ee12c779/core/src/main/java/brooklyn/enricher/basic/UpdatingMap.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/brooklyn/enricher/basic/UpdatingMap.java b/core/src/main/java/brooklyn/enricher/basic/UpdatingMap.java
index 63fc07d..a973774 100644
--- a/core/src/main/java/brooklyn/enricher/basic/UpdatingMap.java
+++ b/core/src/main/java/brooklyn/enricher/basic/UpdatingMap.java
@@ -21,16 +21,16 @@ package brooklyn.enricher.basic;
import java.util.Map;
import org.apache.brooklyn.api.entity.basic.EntityLocal;
+import org.apache.brooklyn.api.event.AttributeSensor;
+import org.apache.brooklyn.api.event.Sensor;
+import org.apache.brooklyn.api.event.SensorEvent;
+import org.apache.brooklyn.api.event.SensorEventListener;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import brooklyn.config.ConfigKey;
import brooklyn.entity.basic.ConfigKeys;
import brooklyn.entity.basic.Entities;
-import brooklyn.event.AttributeSensor;
-import brooklyn.event.Sensor;
-import brooklyn.event.SensorEvent;
-import brooklyn.event.SensorEventListener;
import brooklyn.util.collections.MutableMap;
import brooklyn.util.exceptions.Exceptions;
import brooklyn.util.flags.SetFromFlag;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/ee12c779/core/src/main/java/brooklyn/enricher/basic/YamlRollingTimeWindowMeanEnricher.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/brooklyn/enricher/basic/YamlRollingTimeWindowMeanEnricher.java b/core/src/main/java/brooklyn/enricher/basic/YamlRollingTimeWindowMeanEnricher.java
index 64333d4..ec0f3ed 100644
--- a/core/src/main/java/brooklyn/enricher/basic/YamlRollingTimeWindowMeanEnricher.java
+++ b/core/src/main/java/brooklyn/enricher/basic/YamlRollingTimeWindowMeanEnricher.java
@@ -21,10 +21,11 @@ package brooklyn.enricher.basic;
import java.util.Iterator;
import java.util.LinkedList;
+import org.apache.brooklyn.api.event.Sensor;
+import org.apache.brooklyn.api.event.SensorEvent;
+
import brooklyn.config.ConfigKey;
import brooklyn.entity.basic.ConfigKeys;
-import brooklyn.event.Sensor;
-import brooklyn.event.SensorEvent;
import brooklyn.util.time.Duration;
import com.google.common.base.Function;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/ee12c779/core/src/main/java/brooklyn/enricher/basic/YamlTimeWeightedDeltaEnricher.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/brooklyn/enricher/basic/YamlTimeWeightedDeltaEnricher.java b/core/src/main/java/brooklyn/enricher/basic/YamlTimeWeightedDeltaEnricher.java
index 5a384e0..65df607 100644
--- a/core/src/main/java/brooklyn/enricher/basic/YamlTimeWeightedDeltaEnricher.java
+++ b/core/src/main/java/brooklyn/enricher/basic/YamlTimeWeightedDeltaEnricher.java
@@ -18,13 +18,13 @@
*/
package brooklyn.enricher.basic;
+import org.apache.brooklyn.api.event.SensorEvent;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import brooklyn.config.ConfigKey;
import brooklyn.enricher.basic.AbstractTransformer;
import brooklyn.entity.basic.ConfigKeys;
-import brooklyn.event.SensorEvent;
import brooklyn.util.flags.TypeCoercions;
import brooklyn.util.time.Duration;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/ee12c779/core/src/main/java/brooklyn/entity/basic/AbstractEntity.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/brooklyn/entity/basic/AbstractEntity.java b/core/src/main/java/brooklyn/entity/basic/AbstractEntity.java
index c91e80c..0b6589c 100644
--- a/core/src/main/java/brooklyn/entity/basic/AbstractEntity.java
+++ b/core/src/main/java/brooklyn/entity/basic/AbstractEntity.java
@@ -36,6 +36,10 @@ import org.apache.brooklyn.api.entity.Group;
import org.apache.brooklyn.api.entity.basic.EntityLocal;
import org.apache.brooklyn.api.entity.proxying.EntitySpec;
import org.apache.brooklyn.api.entity.rebind.RebindSupport;
+import org.apache.brooklyn.api.event.AttributeSensor;
+import org.apache.brooklyn.api.event.Sensor;
+import org.apache.brooklyn.api.event.SensorEvent;
+import org.apache.brooklyn.api.event.SensorEventListener;
import org.apache.brooklyn.management.EntityManager;
import org.apache.brooklyn.management.ExecutionContext;
import org.apache.brooklyn.management.ManagementContext;
@@ -61,10 +65,6 @@ import brooklyn.config.render.RendererHints;
import brooklyn.enricher.basic.AbstractEnricher;
import brooklyn.entity.basic.ServiceStateLogic.ServiceNotUpLogic;
import brooklyn.entity.rebind.BasicEntityRebindSupport;
-import brooklyn.event.AttributeSensor;
-import brooklyn.event.Sensor;
-import brooklyn.event.SensorEvent;
-import brooklyn.event.SensorEventListener;
import brooklyn.event.basic.AttributeMap;
import brooklyn.event.basic.AttributeSensorAndConfigKey;
import brooklyn.event.basic.BasicNotificationSensor;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/ee12c779/core/src/main/java/brooklyn/entity/basic/AbstractGroup.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/brooklyn/entity/basic/AbstractGroup.java b/core/src/main/java/brooklyn/entity/basic/AbstractGroup.java
index 932e5ef..2f505e2 100644
--- a/core/src/main/java/brooklyn/entity/basic/AbstractGroup.java
+++ b/core/src/main/java/brooklyn/entity/basic/AbstractGroup.java
@@ -22,11 +22,11 @@ import java.util.Collection;
import org.apache.brooklyn.api.entity.Entity;
import org.apache.brooklyn.api.entity.Group;
+import org.apache.brooklyn.api.event.AttributeSensor;
import brooklyn.config.ConfigKey;
import brooklyn.entity.basic.ServiceStateLogic.ComputeServiceIndicatorsFromChildrenAndMembers;
import brooklyn.entity.trait.Changeable;
-import brooklyn.event.AttributeSensor;
import brooklyn.event.basic.Sensors;
import brooklyn.util.collections.QuorumCheck;
import brooklyn.util.collections.QuorumCheck.QuorumChecks;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/ee12c779/core/src/main/java/brooklyn/entity/basic/Attributes.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/brooklyn/entity/basic/Attributes.java b/core/src/main/java/brooklyn/entity/basic/Attributes.java
index e818873..25fc7f0 100644
--- a/core/src/main/java/brooklyn/entity/basic/Attributes.java
+++ b/core/src/main/java/brooklyn/entity/basic/Attributes.java
@@ -22,11 +22,11 @@ import java.net.URI;
import java.util.List;
import java.util.Map;
+import org.apache.brooklyn.api.event.AttributeSensor;
+import org.apache.brooklyn.api.event.Sensor;
import org.apache.brooklyn.management.ManagementContext;
import brooklyn.config.render.RendererHints;
-import brooklyn.event.AttributeSensor;
-import brooklyn.event.Sensor;
import brooklyn.event.basic.BasicAttributeSensor;
import brooklyn.event.basic.BasicAttributeSensorAndConfigKey;
import brooklyn.event.basic.BasicNotificationSensor;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/ee12c779/core/src/main/java/brooklyn/entity/basic/DataEntity.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/brooklyn/entity/basic/DataEntity.java b/core/src/main/java/brooklyn/entity/basic/DataEntity.java
index fe2269b..27f1c33 100644
--- a/core/src/main/java/brooklyn/entity/basic/DataEntity.java
+++ b/core/src/main/java/brooklyn/entity/basic/DataEntity.java
@@ -22,10 +22,10 @@ import java.util.Map;
import org.apache.brooklyn.api.entity.Entity;
import org.apache.brooklyn.api.entity.proxying.ImplementedBy;
+import org.apache.brooklyn.api.event.AttributeSensor;
import brooklyn.config.ConfigKey;
import brooklyn.entity.trait.Startable;
-import brooklyn.event.AttributeSensor;
import brooklyn.util.flags.SetFromFlag;
import com.google.common.base.Supplier;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/ee12c779/core/src/main/java/brooklyn/entity/basic/DataEntityImpl.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/brooklyn/entity/basic/DataEntityImpl.java b/core/src/main/java/brooklyn/entity/basic/DataEntityImpl.java
index 140e488..d6a465c 100644
--- a/core/src/main/java/brooklyn/entity/basic/DataEntityImpl.java
+++ b/core/src/main/java/brooklyn/entity/basic/DataEntityImpl.java
@@ -21,7 +21,8 @@ package brooklyn.entity.basic;
import java.util.Collection;
import java.util.Map;
-import brooklyn.event.AttributeSensor;
+import org.apache.brooklyn.api.event.AttributeSensor;
+
import brooklyn.event.feed.function.FunctionFeed;
import brooklyn.event.feed.function.FunctionPollConfig;
import brooklyn.location.Location;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/ee12c779/core/src/main/java/brooklyn/entity/basic/DelegateEntity.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/brooklyn/entity/basic/DelegateEntity.java b/core/src/main/java/brooklyn/entity/basic/DelegateEntity.java
index 81b558b..4731620 100644
--- a/core/src/main/java/brooklyn/entity/basic/DelegateEntity.java
+++ b/core/src/main/java/brooklyn/entity/basic/DelegateEntity.java
@@ -23,9 +23,9 @@ import java.util.concurrent.atomic.AtomicBoolean;
import org.apache.brooklyn.api.entity.Entity;
import org.apache.brooklyn.api.entity.Group;
import org.apache.brooklyn.api.entity.proxying.ImplementedBy;
+import org.apache.brooklyn.api.event.AttributeSensor;
import brooklyn.config.render.RendererHints;
-import brooklyn.event.AttributeSensor;
import brooklyn.event.basic.AttributeSensorAndConfigKey;
import brooklyn.event.basic.Sensors;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/ee12c779/core/src/main/java/brooklyn/entity/basic/DynamicGroup.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/brooklyn/entity/basic/DynamicGroup.java b/core/src/main/java/brooklyn/entity/basic/DynamicGroup.java
index 7baaa95..078fc88 100644
--- a/core/src/main/java/brooklyn/entity/basic/DynamicGroup.java
+++ b/core/src/main/java/brooklyn/entity/basic/DynamicGroup.java
@@ -20,6 +20,9 @@ package brooklyn.entity.basic;
import org.apache.brooklyn.api.entity.Entity;
import org.apache.brooklyn.api.entity.proxying.ImplementedBy;
+import org.apache.brooklyn.api.event.AttributeSensor;
+import org.apache.brooklyn.api.event.Sensor;
+import org.apache.brooklyn.api.event.SensorEvent;
import com.google.common.base.Predicate;
import com.google.common.reflect.TypeToken;
@@ -27,9 +30,6 @@ import com.google.common.reflect.TypeToken;
import brooklyn.config.ConfigKey;
import brooklyn.entity.annotation.Effector;
import brooklyn.entity.trait.Startable;
-import brooklyn.event.AttributeSensor;
-import brooklyn.event.Sensor;
-import brooklyn.event.SensorEvent;
import brooklyn.event.basic.Sensors;
import brooklyn.util.flags.SetFromFlag;
import groovy.lang.Closure;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/ee12c779/core/src/main/java/brooklyn/entity/basic/DynamicGroupImpl.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/brooklyn/entity/basic/DynamicGroupImpl.java b/core/src/main/java/brooklyn/entity/basic/DynamicGroupImpl.java
index 37ebcc6..a621053 100644
--- a/core/src/main/java/brooklyn/entity/basic/DynamicGroupImpl.java
+++ b/core/src/main/java/brooklyn/entity/basic/DynamicGroupImpl.java
@@ -24,15 +24,15 @@ import java.util.Collection;
import java.util.Map;
import org.apache.brooklyn.api.entity.Entity;
+import org.apache.brooklyn.api.event.Sensor;
+import org.apache.brooklyn.api.event.SensorEvent;
+import org.apache.brooklyn.api.event.SensorEventListener;
import org.apache.brooklyn.management.Task;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import brooklyn.config.BrooklynLogging;
import brooklyn.config.BrooklynLogging.LoggingLevel;
-import brooklyn.event.Sensor;
-import brooklyn.event.SensorEvent;
-import brooklyn.event.SensorEventListener;
import brooklyn.management.internal.CollectionChangeListener;
import brooklyn.management.internal.ManagementContextInternal;
import brooklyn.util.GroovyJavaMethods;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/ee12c779/core/src/main/java/brooklyn/entity/basic/Entities.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/brooklyn/entity/basic/Entities.java b/core/src/main/java/brooklyn/entity/basic/Entities.java
index c87fecb..65131aa 100644
--- a/core/src/main/java/brooklyn/entity/basic/Entities.java
+++ b/core/src/main/java/brooklyn/entity/basic/Entities.java
@@ -47,6 +47,8 @@ import org.apache.brooklyn.api.entity.basic.EntityLocal;
import org.apache.brooklyn.api.entity.drivers.EntityDriver;
import org.apache.brooklyn.api.entity.drivers.downloads.DownloadResolver;
import org.apache.brooklyn.api.entity.proxying.EntitySpec;
+import org.apache.brooklyn.api.event.AttributeSensor;
+import org.apache.brooklyn.api.event.Sensor;
import org.apache.brooklyn.management.ExecutionContext;
import org.apache.brooklyn.management.LocationManager;
import org.apache.brooklyn.management.ManagementContext;
@@ -66,8 +68,6 @@ import brooklyn.entity.effector.Effectors;
import brooklyn.entity.proxying.EntityProxyImpl;
import brooklyn.entity.trait.Startable;
import brooklyn.entity.trait.StartableMethods;
-import brooklyn.event.AttributeSensor;
-import brooklyn.event.Sensor;
import brooklyn.event.basic.DependentConfiguration;
import brooklyn.location.Location;
import brooklyn.location.LocationSpec;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/ee12c779/core/src/main/java/brooklyn/entity/basic/EntityAndAttribute.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/brooklyn/entity/basic/EntityAndAttribute.java b/core/src/main/java/brooklyn/entity/basic/EntityAndAttribute.java
index 5c1b0af..17e5444 100644
--- a/core/src/main/java/brooklyn/entity/basic/EntityAndAttribute.java
+++ b/core/src/main/java/brooklyn/entity/basic/EntityAndAttribute.java
@@ -22,8 +22,7 @@ import static com.google.common.base.Preconditions.checkNotNull;
import org.apache.brooklyn.api.entity.Entity;
import org.apache.brooklyn.api.entity.basic.EntityLocal;
-
-import brooklyn.event.AttributeSensor;
+import org.apache.brooklyn.api.event.AttributeSensor;
import com.google.common.base.Objects;
import com.google.common.base.Supplier;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/ee12c779/core/src/main/java/brooklyn/entity/basic/EntityDynamicType.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/brooklyn/entity/basic/EntityDynamicType.java b/core/src/main/java/brooklyn/entity/basic/EntityDynamicType.java
index 3c33c16..6477485 100644
--- a/core/src/main/java/brooklyn/entity/basic/EntityDynamicType.java
+++ b/core/src/main/java/brooklyn/entity/basic/EntityDynamicType.java
@@ -29,6 +29,7 @@ import java.util.concurrent.ConcurrentMap;
import org.apache.brooklyn.api.entity.Effector;
import org.apache.brooklyn.api.entity.Entity;
import org.apache.brooklyn.api.entity.EntityType;
+import org.apache.brooklyn.api.event.Sensor;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -40,7 +41,6 @@ import brooklyn.entity.effector.EffectorTasks.EffectorBodyTaskFactory;
import brooklyn.entity.effector.EffectorTasks.EffectorTaskFactory;
import brooklyn.entity.effector.EffectorWithBody;
import brooklyn.entity.effector.Effectors;
-import brooklyn.event.Sensor;
import brooklyn.util.javalang.Reflections;
import com.google.common.annotations.Beta;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/ee12c779/core/src/main/java/brooklyn/entity/basic/EntityFunctions.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/brooklyn/entity/basic/EntityFunctions.java b/core/src/main/java/brooklyn/entity/basic/EntityFunctions.java
index cfa5286..b80fdaa 100644
--- a/core/src/main/java/brooklyn/entity/basic/EntityFunctions.java
+++ b/core/src/main/java/brooklyn/entity/basic/EntityFunctions.java
@@ -27,10 +27,10 @@ import org.apache.brooklyn.api.entity.Application;
import org.apache.brooklyn.api.entity.Entity;
import org.apache.brooklyn.api.entity.basic.EntityLocal;
import org.apache.brooklyn.api.entity.trait.Identifiable;
+import org.apache.brooklyn.api.event.AttributeSensor;
import org.apache.brooklyn.management.ManagementContext;
import brooklyn.config.ConfigKey;
-import brooklyn.event.AttributeSensor;
import brooklyn.location.Location;
import brooklyn.util.flags.TypeCoercions;
import brooklyn.util.guava.Functionals;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/ee12c779/core/src/main/java/brooklyn/entity/basic/EntityInternal.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/brooklyn/entity/basic/EntityInternal.java b/core/src/main/java/brooklyn/entity/basic/EntityInternal.java
index 277cfd9..60c0bc6 100644
--- a/core/src/main/java/brooklyn/entity/basic/EntityInternal.java
+++ b/core/src/main/java/brooklyn/entity/basic/EntityInternal.java
@@ -26,6 +26,7 @@ import org.apache.brooklyn.api.entity.Feed;
import org.apache.brooklyn.api.entity.basic.EntityLocal;
import org.apache.brooklyn.api.entity.rebind.RebindSupport;
import org.apache.brooklyn.api.entity.rebind.Rebindable;
+import org.apache.brooklyn.api.event.AttributeSensor;
import org.apache.brooklyn.management.ExecutionContext;
import org.apache.brooklyn.management.ManagementContext;
import org.apache.brooklyn.management.SubscriptionContext;
@@ -33,7 +34,6 @@ import org.apache.brooklyn.mementos.EntityMemento;
import brooklyn.basic.BrooklynObjectInternal;
import brooklyn.config.ConfigKey;
-import brooklyn.event.AttributeSensor;
import brooklyn.location.Location;
import brooklyn.management.internal.EntityManagementSupport;
import brooklyn.util.config.ConfigBag;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/ee12c779/core/src/main/java/brooklyn/entity/basic/EntityPredicates.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/brooklyn/entity/basic/EntityPredicates.java b/core/src/main/java/brooklyn/entity/basic/EntityPredicates.java
index fa4f264..ac5adbf 100644
--- a/core/src/main/java/brooklyn/entity/basic/EntityPredicates.java
+++ b/core/src/main/java/brooklyn/entity/basic/EntityPredicates.java
@@ -25,10 +25,10 @@ import javax.annotation.Nullable;
import org.apache.brooklyn.api.entity.Entity;
import org.apache.brooklyn.api.entity.Group;
+import org.apache.brooklyn.api.event.AttributeSensor;
import brooklyn.config.ConfigKey;
import brooklyn.config.ConfigKey.HasConfigKey;
-import brooklyn.event.AttributeSensor;
import brooklyn.location.Location;
import brooklyn.util.collections.CollectionFunctionals;
import brooklyn.util.guava.SerializablePredicate;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/ee12c779/core/src/main/java/brooklyn/entity/basic/EntityTasks.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/brooklyn/entity/basic/EntityTasks.java b/core/src/main/java/brooklyn/entity/basic/EntityTasks.java
index 5c13868..d93c2ab 100644
--- a/core/src/main/java/brooklyn/entity/basic/EntityTasks.java
+++ b/core/src/main/java/brooklyn/entity/basic/EntityTasks.java
@@ -19,9 +19,9 @@
package brooklyn.entity.basic;
import org.apache.brooklyn.api.entity.Entity;
+import org.apache.brooklyn.api.event.AttributeSensor;
import org.apache.brooklyn.management.Task;
-import brooklyn.event.AttributeSensor;
import brooklyn.event.basic.DependentConfiguration;
import brooklyn.util.collections.CollectionFunctionals;
import brooklyn.util.time.Duration;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/ee12c779/core/src/main/java/brooklyn/entity/basic/EntityTransientCopyInternal.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/brooklyn/entity/basic/EntityTransientCopyInternal.java b/core/src/main/java/brooklyn/entity/basic/EntityTransientCopyInternal.java
index bc96cdf..8289a56 100644
--- a/core/src/main/java/brooklyn/entity/basic/EntityTransientCopyInternal.java
+++ b/core/src/main/java/brooklyn/entity/basic/EntityTransientCopyInternal.java
@@ -32,6 +32,7 @@ import org.apache.brooklyn.api.entity.Entity;
import org.apache.brooklyn.api.entity.EntityType;
import org.apache.brooklyn.api.entity.Group;
import org.apache.brooklyn.api.entity.rebind.RebindSupport;
+import org.apache.brooklyn.api.event.AttributeSensor;
import org.apache.brooklyn.management.ExecutionContext;
import org.apache.brooklyn.management.ManagementContext;
import org.apache.brooklyn.mementos.EntityMemento;
@@ -42,7 +43,6 @@ import brooklyn.config.ConfigKey;
import brooklyn.config.ConfigKey.HasConfigKey;
import brooklyn.entity.basic.EntityInternal.FeedSupport;
import brooklyn.entity.proxying.EntityProxyImpl;
-import brooklyn.event.AttributeSensor;
import brooklyn.location.Location;
import brooklyn.management.internal.EntityManagementSupport;
import brooklyn.util.config.ConfigBag;
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/ee12c779/core/src/main/java/brooklyn/entity/basic/EntityTypeSnapshot.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/brooklyn/entity/basic/EntityTypeSnapshot.java b/core/src/main/java/brooklyn/entity/basic/EntityTypeSnapshot.java
index e935b65..ab6b239 100644
--- a/core/src/main/java/brooklyn/entity/basic/EntityTypeSnapshot.java
+++ b/core/src/main/java/brooklyn/entity/basic/EntityTypeSnapshot.java
@@ -27,10 +27,10 @@ import java.util.Set;
import org.apache.brooklyn.api.entity.Effector;
import org.apache.brooklyn.api.entity.EntityType;
import org.apache.brooklyn.api.entity.ParameterType;
+import org.apache.brooklyn.api.event.Sensor;
import brooklyn.basic.BrooklynTypeSnapshot;
import brooklyn.config.ConfigKey;
-import brooklyn.event.Sensor;
import brooklyn.util.guava.Maybe;
import com.google.common.base.Joiner;