brooklyn-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From drigod...@apache.org
Subject [1/5] brooklyn-library git commit: Add missing @Override annotations
Date Tue, 07 Feb 2017 12:51:15 GMT
Repository: brooklyn-library
Updated Branches:
  refs/heads/master f3cbc42e7 -> 3f21e5665


Add missing @Override annotations


Project: http://git-wip-us.apache.org/repos/asf/brooklyn-library/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-library/commit/a86b41c4
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-library/tree/a86b41c4
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-library/diff/a86b41c4

Branch: refs/heads/master
Commit: a86b41c48e7d08f72aca23edaf327d1f122b8d97
Parents: f3cbc42
Author: Svetoslav Neykov <svetoslav.neykov@cloudsoftcorp.com>
Authored: Fri Jan 20 12:45:52 2017 +0200
Committer: Svetoslav Neykov <svetoslav.neykov@cloudsoftcorp.com>
Committed: Tue Feb 7 14:32:30 2017 +0200

----------------------------------------------------------------------
 .../main/java/org/apache/brooklyn/qa/longevity/MonitorUtils.java | 1 +
 .../org/apache/brooklyn/entity/cm/ansible/AnsibleEntityImpl.java | 1 +
 .../brooklyn/entity/cm/salt/impl/SaltLifecycleEffectorTasks.java | 1 +
 .../org/apache/brooklyn/entity/cm/salt/SaltIntegrationTest.java  | 2 ++
 .../brooklyn/entity/database/mariadb/MariaDbSshDriver.java       | 1 +
 .../database/postgresql/PostgreSqlNodeChefImplFromScratch.java   | 2 ++
 .../entity/database/mariadb/MariaDbLiveRackspaceTest.java        | 1 +
 .../brooklyn/entity/database/mysql/MySqlLiveRackspaceTest.java   | 1 +
 .../postgresql/PostgreSqlInitializeDatabaseLiveTest.java         | 1 +
 .../entity/database/postgresql/PostgreSqlRackspaceLiveTest.java  | 1 +
 .../database/postgresql/PostgreSqlRestartIntegrationTest.java    | 1 +
 .../brooklyn/entity/database/postgresql/PostgreSqlTest.java      | 1 +
 .../entity/database/rubyrep/RubyRepRackspaceLiveTest.java        | 3 +++
 .../brooklyn/entity/messaging/activemq/ActiveMQBrokerImpl.java   | 1 +
 .../brooklyn/entity/messaging/activemq/ActiveMQQueueImpl.java    | 1 +
 .../brooklyn/entity/messaging/activemq/ActiveMQTopicImpl.java    | 2 ++
 .../apache/brooklyn/entity/messaging/jms/JMSDestinationImpl.java | 1 +
 .../apache/brooklyn/entity/messaging/qpid/QpidBrokerImpl.java    | 4 ++++
 .../brooklyn/entity/messaging/storm/LocalhostLiveTest.java       | 1 +
 .../brooklyn/entity/monitoring/monit/MonitIntegrationTest.java   | 1 +
 .../brooklyn/entity/network/bind/BindDnsServerEc2LiveTest.java   | 1 +
 .../entity/network/bind/BindDnsServerSoftlayerLiveTest.java      | 1 +
 .../brooklyn/entity/nosql/couchbase/CouchbaseClusterImpl.java    | 2 ++
 .../brooklyn/entity/nosql/couchbase/CouchbaseNodeImpl.java       | 3 +++
 .../org/apache/brooklyn/entity/nosql/riak/RiakClusterImpl.java   | 2 ++
 .../apache/brooklyn/entity/nosql/solr/SolrServerSshDriver.java   | 1 +
 .../cassandra/CassandraDatacenterRebindIntegrationTest.java      | 1 +
 .../brooklyn/entity/nosql/cassandra/CassandraFabricTest.java     | 1 +
 .../sharding/MongoDBShardedDeploymentIntegrationTest.java        | 1 +
 .../brooklyn/entity/nosql/riak/RiakNodeSoftlayerLiveTest.java    | 1 +
 .../apache/brooklyn/entity/osgi/karaf/KarafContainerTest.java    | 1 +
 .../brooklyn/entity/dns/geoscaling/GeoscalingDnsServiceImpl.java | 1 +
 .../brooklyn/entity/webapp/JavaWebAppSoftwareProcessImpl.java    | 1 +
 .../org/apache/brooklyn/entity/webapp/JavaWebAppSshDriver.java   | 1 +
 .../org/apache/brooklyn/entity/webapp/jboss/JBoss6SshDriver.java | 2 ++
 .../brooklyn/entity/webapp/nodejs/NodeJsWebAppSshDriver.java     | 1 +
 .../brooklyn/entity/dns/geoscaling/GeoscalingWebClientTest.java  | 1 +
 .../org/apache/brooklyn/entity/proxy/AbstractControllerTest.java | 2 +-
 .../brooklyn/entity/proxy/nginx/NginxRebindIntegrationTest.java  | 2 ++
 .../entity/proxy/nginx/NginxRebindWithHaIntegrationTest.java     | 2 ++
 .../webapp/ControlledDynamicWebAppClusterIntegrationTest.java    | 1 +
 .../entity/webapp/ControlledDynamicWebAppClusterTest.java        | 1 +
 .../brooklyn/entity/webapp/EffectorExceptionLoggedTest.java      | 2 ++
 .../webapp/jboss/JBoss6ServerNonInheritingIntegrationTest.java   | 1 +
 .../JBossServersMultiVersionWebAppFixtureIntegrationTest.java    | 3 +++
 .../entity/webapp/jetty/JettyWebAppFixtureIntegrationTest.java   | 2 ++
 .../webapp/tomcat/Tomcat8ServerWebAppFixtureIntegrationTest.java | 3 +++
 .../webapp/tomcat/TomcatServerWebAppFixtureIntegrationTest.java  | 3 +++
 48 files changed, 71 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/a86b41c4/qa/src/main/java/org/apache/brooklyn/qa/longevity/MonitorUtils.java
----------------------------------------------------------------------
diff --git a/qa/src/main/java/org/apache/brooklyn/qa/longevity/MonitorUtils.java b/qa/src/main/java/org/apache/brooklyn/qa/longevity/MonitorUtils.java
index c9ce875..39ef14a 100644
--- a/qa/src/main/java/org/apache/brooklyn/qa/longevity/MonitorUtils.java
+++ b/qa/src/main/java/org/apache/brooklyn/qa/longevity/MonitorUtils.java
@@ -207,6 +207,7 @@ public class MonitorUtils {
             this.instanceCounts = instanceCounts;
         }
 
+        @Override
         public String toString() {
             return Objects.toStringHelper(this)
                     .add("totalInstances", totalInstances)

http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/a86b41c4/software/cm/ansible/src/main/java/org/apache/brooklyn/entity/cm/ansible/AnsibleEntityImpl.java
----------------------------------------------------------------------
diff --git a/software/cm/ansible/src/main/java/org/apache/brooklyn/entity/cm/ansible/AnsibleEntityImpl.java b/software/cm/ansible/src/main/java/org/apache/brooklyn/entity/cm/ansible/AnsibleEntityImpl.java
index 43fcd72..65ae9b0 100644
--- a/software/cm/ansible/src/main/java/org/apache/brooklyn/entity/cm/ansible/AnsibleEntityImpl.java
+++ b/software/cm/ansible/src/main/java/org/apache/brooklyn/entity/cm/ansible/AnsibleEntityImpl.java
@@ -29,6 +29,7 @@ public class AnsibleEntityImpl extends EffectorStartableImpl implements AnsibleE
 
     private AnsibleLifecycleEffectorTasks lifecycleTasks;
 
+    @Override
     public void init() {
         checkNotNull(getConfig(SERVICE_NAME), "service name is missing. it has to be provided by the user");
         String playbookName = getConfig(ANSIBLE_PLAYBOOK);

http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/a86b41c4/software/cm/salt/src/main/java/org/apache/brooklyn/entity/cm/salt/impl/SaltLifecycleEffectorTasks.java
----------------------------------------------------------------------
diff --git a/software/cm/salt/src/main/java/org/apache/brooklyn/entity/cm/salt/impl/SaltLifecycleEffectorTasks.java b/software/cm/salt/src/main/java/org/apache/brooklyn/entity/cm/salt/impl/SaltLifecycleEffectorTasks.java
index 49fd336..4dc5cb6 100644
--- a/software/cm/salt/src/main/java/org/apache/brooklyn/entity/cm/salt/impl/SaltLifecycleEffectorTasks.java
+++ b/software/cm/salt/src/main/java/org/apache/brooklyn/entity/cm/salt/impl/SaltLifecycleEffectorTasks.java
@@ -204,6 +204,7 @@ public class SaltLifecycleEffectorTasks extends MachineLifecycleEffectorTasks im
         }
     }
 
+    @Override
     public void restart(ConfigBag parameters) {
         ServiceStateLogic.setExpectedState(entity(), Lifecycle.STOPPING);
 

http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/a86b41c4/software/cm/salt/src/test/java/org/apache/brooklyn/entity/cm/salt/SaltIntegrationTest.java
----------------------------------------------------------------------
diff --git a/software/cm/salt/src/test/java/org/apache/brooklyn/entity/cm/salt/SaltIntegrationTest.java b/software/cm/salt/src/test/java/org/apache/brooklyn/entity/cm/salt/SaltIntegrationTest.java
index 0886334..c6ebebc 100644
--- a/software/cm/salt/src/test/java/org/apache/brooklyn/entity/cm/salt/SaltIntegrationTest.java
+++ b/software/cm/salt/src/test/java/org/apache/brooklyn/entity/cm/salt/SaltIntegrationTest.java
@@ -54,6 +54,7 @@ public class SaltIntegrationTest extends BrooklynAppLiveTestSupport {
 
     private Location testLocation;
 
+    @Override
     @BeforeMethod(alwaysRun = true)
     public void setUp() throws Exception {
         super.setUp();
@@ -68,6 +69,7 @@ public class SaltIntegrationTest extends BrooklynAppLiveTestSupport {
         }
     }
 
+    @Override
     @AfterMethod(alwaysRun = true)
     public void tearDown() throws Exception {
         if (mgmt != null) {

http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/a86b41c4/software/database/src/main/java/org/apache/brooklyn/entity/database/mariadb/MariaDbSshDriver.java
----------------------------------------------------------------------
diff --git a/software/database/src/main/java/org/apache/brooklyn/entity/database/mariadb/MariaDbSshDriver.java b/software/database/src/main/java/org/apache/brooklyn/entity/database/mariadb/MariaDbSshDriver.java
index 9ef298c..9061634 100644
--- a/software/database/src/main/java/org/apache/brooklyn/entity/database/mariadb/MariaDbSshDriver.java
+++ b/software/database/src/main/java/org/apache/brooklyn/entity/database/mariadb/MariaDbSshDriver.java
@@ -138,6 +138,7 @@ public class MariaDbSshDriver extends AbstractSoftwareProcessSshDriver implement
         newScript(INSTALLING).body.append(commands).execute();
     }
 
+    @Override
     public MariaDbNodeImpl getEntity() { return (MariaDbNodeImpl) super.getEntity(); }
     public int getPort() { return getEntity().getPort(); }
     public String getSocketUid() { return getEntity().getSocketUid(); }

http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/a86b41c4/software/database/src/main/java/org/apache/brooklyn/entity/database/postgresql/PostgreSqlNodeChefImplFromScratch.java
----------------------------------------------------------------------
diff --git a/software/database/src/main/java/org/apache/brooklyn/entity/database/postgresql/PostgreSqlNodeChefImplFromScratch.java b/software/database/src/main/java/org/apache/brooklyn/entity/database/postgresql/PostgreSqlNodeChefImplFromScratch.java
index 0c52f20..ec9f08f 100644
--- a/software/database/src/main/java/org/apache/brooklyn/entity/database/postgresql/PostgreSqlNodeChefImplFromScratch.java
+++ b/software/database/src/main/java/org/apache/brooklyn/entity/database/postgresql/PostgreSqlNodeChefImplFromScratch.java
@@ -53,6 +53,7 @@ public class PostgreSqlNodeChefImplFromScratch extends EffectorStartableImpl imp
     
     private SshFeed feed;
 
+    @Override
     public void init() {
         super.init();
         new ChefPostgreSqlLifecycle().attachLifecycleEffectors(this);
@@ -126,6 +127,7 @@ public class PostgreSqlNodeChefImplFromScratch extends EffectorStartableImpl imp
     public static class ExecuteScriptEffectorBody extends EffectorBody<String> {
         public static final ConfigKey<String> SCRIPT = ConfigKeys.newStringConfigKey("script", "contents of script to run");
         
+        @Override
         public String call(ConfigBag parameters) {
             return DynamicTasks.queue(SshEffectorTasks.ssh(
                     BashCommands.pipeTextTo(

http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/a86b41c4/software/database/src/test/java/org/apache/brooklyn/entity/database/mariadb/MariaDbLiveRackspaceTest.java
----------------------------------------------------------------------
diff --git a/software/database/src/test/java/org/apache/brooklyn/entity/database/mariadb/MariaDbLiveRackspaceTest.java b/software/database/src/test/java/org/apache/brooklyn/entity/database/mariadb/MariaDbLiveRackspaceTest.java
index 85a6bb2..6881273 100644
--- a/software/database/src/test/java/org/apache/brooklyn/entity/database/mariadb/MariaDbLiveRackspaceTest.java
+++ b/software/database/src/test/java/org/apache/brooklyn/entity/database/mariadb/MariaDbLiveRackspaceTest.java
@@ -78,6 +78,7 @@ public class MariaDbLiveRackspaceTest extends MariaDbIntegrationTest {
         test("Red Hat Enterprise Linux 6");
     }
 
+    @Override
     @Test(groups = {"Live"})
     public void test_localhost() throws Exception {
         super.test_localhost();

http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/a86b41c4/software/database/src/test/java/org/apache/brooklyn/entity/database/mysql/MySqlLiveRackspaceTest.java
----------------------------------------------------------------------
diff --git a/software/database/src/test/java/org/apache/brooklyn/entity/database/mysql/MySqlLiveRackspaceTest.java b/software/database/src/test/java/org/apache/brooklyn/entity/database/mysql/MySqlLiveRackspaceTest.java
index e008cdd..9b80c3a 100644
--- a/software/database/src/test/java/org/apache/brooklyn/entity/database/mysql/MySqlLiveRackspaceTest.java
+++ b/software/database/src/test/java/org/apache/brooklyn/entity/database/mysql/MySqlLiveRackspaceTest.java
@@ -79,6 +79,7 @@ public class MySqlLiveRackspaceTest extends MySqlIntegrationTest {
         test("Red Hat Enterprise Linux 6");
     }
 
+    @Override
     @Test(enabled=false, groups = {"Live"}) // only run this in MySqlIntegrationTest
     public void test_localhost() throws Exception {
         super.test_localhost();

http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/a86b41c4/software/database/src/test/java/org/apache/brooklyn/entity/database/postgresql/PostgreSqlInitializeDatabaseLiveTest.java
----------------------------------------------------------------------
diff --git a/software/database/src/test/java/org/apache/brooklyn/entity/database/postgresql/PostgreSqlInitializeDatabaseLiveTest.java b/software/database/src/test/java/org/apache/brooklyn/entity/database/postgresql/PostgreSqlInitializeDatabaseLiveTest.java
index 67cc650..ad18279 100644
--- a/software/database/src/test/java/org/apache/brooklyn/entity/database/postgresql/PostgreSqlInitializeDatabaseLiveTest.java
+++ b/software/database/src/test/java/org/apache/brooklyn/entity/database/postgresql/PostgreSqlInitializeDatabaseLiveTest.java
@@ -38,6 +38,7 @@ public class PostgreSqlInitializeDatabaseLiveTest extends BrooklynAppLiveTestSup
     public static final Logger log = LoggerFactory.getLogger(PostgreSqlIntegrationTest.class);
     JcloudsLocation jcloudsLocation;
 
+    @Override
     @BeforeMethod(alwaysRun=true)
     public void setUp() throws Exception {
         super.setUp();

http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/a86b41c4/software/database/src/test/java/org/apache/brooklyn/entity/database/postgresql/PostgreSqlRackspaceLiveTest.java
----------------------------------------------------------------------
diff --git a/software/database/src/test/java/org/apache/brooklyn/entity/database/postgresql/PostgreSqlRackspaceLiveTest.java b/software/database/src/test/java/org/apache/brooklyn/entity/database/postgresql/PostgreSqlRackspaceLiveTest.java
index 502d1bd..ab94ed1 100644
--- a/software/database/src/test/java/org/apache/brooklyn/entity/database/postgresql/PostgreSqlRackspaceLiveTest.java
+++ b/software/database/src/test/java/org/apache/brooklyn/entity/database/postgresql/PostgreSqlRackspaceLiveTest.java
@@ -79,6 +79,7 @@ public class PostgreSqlRackspaceLiveTest extends PostgreSqlIntegrationTest {
         test("Red Hat Enterprise Linux 6");
     }
 
+    @Override
     @Test(groups = "Live")
     public void test_localhost() throws Exception {
         super.test_localhost();

http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/a86b41c4/software/database/src/test/java/org/apache/brooklyn/entity/database/postgresql/PostgreSqlRestartIntegrationTest.java
----------------------------------------------------------------------
diff --git a/software/database/src/test/java/org/apache/brooklyn/entity/database/postgresql/PostgreSqlRestartIntegrationTest.java b/software/database/src/test/java/org/apache/brooklyn/entity/database/postgresql/PostgreSqlRestartIntegrationTest.java
index 185fec3..604886e 100644
--- a/software/database/src/test/java/org/apache/brooklyn/entity/database/postgresql/PostgreSqlRestartIntegrationTest.java
+++ b/software/database/src/test/java/org/apache/brooklyn/entity/database/postgresql/PostgreSqlRestartIntegrationTest.java
@@ -42,6 +42,7 @@ public class PostgreSqlRestartIntegrationTest extends AbstractSoftwareProcessRes
     // TODO The second start() will fail because customize operations forbidden while there is existing data:
     //      "If you want to create a new database system, either remove or empty".
     // I haven't checked whether it damaged the data in the database though!
+    @Override
     @Test(enabled=false, groups={"Integration", "WIP"})
     public void testStopProcessAndStart() throws Exception {
         super.testStopProcessAndStart();

http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/a86b41c4/software/database/src/test/java/org/apache/brooklyn/entity/database/postgresql/PostgreSqlTest.java
----------------------------------------------------------------------
diff --git a/software/database/src/test/java/org/apache/brooklyn/entity/database/postgresql/PostgreSqlTest.java b/software/database/src/test/java/org/apache/brooklyn/entity/database/postgresql/PostgreSqlTest.java
index 9aa4ed1..2342072 100644
--- a/software/database/src/test/java/org/apache/brooklyn/entity/database/postgresql/PostgreSqlTest.java
+++ b/software/database/src/test/java/org/apache/brooklyn/entity/database/postgresql/PostgreSqlTest.java
@@ -54,6 +54,7 @@ public class PostgreSqlTest extends BrooklynAppUnitTestSupport {
     private SshMachineLocation stubbedMachine;
     
     public static class PostgreSqlNodeForTestingImpl extends PostgreSqlNodeImpl {
+        @Override
         public SoftwareProcessDriver doInitDriver(MachineLocation machine) {
             return super.doInitDriver(machine);
         }

http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/a86b41c4/software/database/src/test/java/org/apache/brooklyn/entity/database/rubyrep/RubyRepRackspaceLiveTest.java
----------------------------------------------------------------------
diff --git a/software/database/src/test/java/org/apache/brooklyn/entity/database/rubyrep/RubyRepRackspaceLiveTest.java b/software/database/src/test/java/org/apache/brooklyn/entity/database/rubyrep/RubyRepRackspaceLiveTest.java
index 640e4df..93e5cc3 100644
--- a/software/database/src/test/java/org/apache/brooklyn/entity/database/rubyrep/RubyRepRackspaceLiveTest.java
+++ b/software/database/src/test/java/org/apache/brooklyn/entity/database/rubyrep/RubyRepRackspaceLiveTest.java
@@ -108,18 +108,21 @@ public class RubyRepRackspaceLiveTest extends RubyRepIntegrationTest {
     }
     
     // disable inherited non-live tests
+    @Override
     @Test(enabled = false, groups = "Integration")
     public void test_localhost_mysql() throws Exception {
         super.test_localhost_mysql();
     }
 
     // disable inherited non-live tests
+    @Override
     @Test(enabled = false, groups = "Integration")
     public void test_localhost_postgres() throws Exception {
         super.test_localhost_postgres();
     }
 
     // disable inherited non-live tests
+    @Override
     @Test(enabled = false, groups = "Integration")
     public void test_localhost_postgres_mysql() throws Exception {
         super.test_localhost_postgres_mysql();

http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/a86b41c4/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/activemq/ActiveMQBrokerImpl.java
----------------------------------------------------------------------
diff --git a/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/activemq/ActiveMQBrokerImpl.java b/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/activemq/ActiveMQBrokerImpl.java
index 6954e81..828f567 100644
--- a/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/activemq/ActiveMQBrokerImpl.java
+++ b/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/activemq/ActiveMQBrokerImpl.java
@@ -51,6 +51,7 @@ public class ActiveMQBrokerImpl extends JMSBrokerImpl<ActiveMQQueue, ActiveMQTop
         Entities.getRequiredUrlConfig(this, TEMPLATE_CONFIGURATION_URL);
     }
     
+    @Override
     public void setBrokerUrl() {
         sensors().set(BROKER_URL, String.format("tcp://%s:%d", getAttribute(HOSTNAME), getAttribute(OPEN_WIRE_PORT)));
     }

http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/a86b41c4/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/activemq/ActiveMQQueueImpl.java
----------------------------------------------------------------------
diff --git a/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/activemq/ActiveMQQueueImpl.java b/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/activemq/ActiveMQQueueImpl.java
index f696c02..cb76280 100644
--- a/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/activemq/ActiveMQQueueImpl.java
+++ b/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/activemq/ActiveMQQueueImpl.java
@@ -47,6 +47,7 @@ public class ActiveMQQueueImpl extends ActiveMQDestinationImpl implements Active
         connectSensors();
     }
 
+    @Override
     public void delete() {
         jmxHelper.operation(brokerMBeanName, "removeQueue", getName());
         disconnectSensors();

http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/a86b41c4/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/activemq/ActiveMQTopicImpl.java
----------------------------------------------------------------------
diff --git a/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/activemq/ActiveMQTopicImpl.java b/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/activemq/ActiveMQTopicImpl.java
index 365b7b7..8d0cf04 100644
--- a/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/activemq/ActiveMQTopicImpl.java
+++ b/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/activemq/ActiveMQTopicImpl.java
@@ -35,11 +35,13 @@ public class ActiveMQTopicImpl extends ActiveMQDestinationImpl implements Active
         connectSensors();
     }
 
+    @Override
     public void delete() {
         jmxHelper.operation(brokerMBeanName, "removeTopic", getName());
         disconnectSensors();
     }
 
+    @Override
     public void connectSensors() {
         //TODO add sensors for topics
     }

http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/a86b41c4/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/jms/JMSDestinationImpl.java
----------------------------------------------------------------------
diff --git a/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/jms/JMSDestinationImpl.java b/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/jms/JMSDestinationImpl.java
index 7fc8ee6..284b6b3 100644
--- a/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/jms/JMSDestinationImpl.java
+++ b/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/jms/JMSDestinationImpl.java
@@ -43,6 +43,7 @@ public abstract class JMSDestinationImpl extends AbstractEntity implements JMSDe
 
     public abstract void delete();
 
+    @Override
     public void destroy() {
         disconnectSensors();
         delete();

http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/a86b41c4/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/qpid/QpidBrokerImpl.java
----------------------------------------------------------------------
diff --git a/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/qpid/QpidBrokerImpl.java b/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/qpid/QpidBrokerImpl.java
index 67b132c..61cea83 100644
--- a/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/qpid/QpidBrokerImpl.java
+++ b/software/messaging/src/main/java/org/apache/brooklyn/entity/messaging/qpid/QpidBrokerImpl.java
@@ -58,6 +58,7 @@ public class QpidBrokerImpl extends JMSBrokerImpl<QpidQueue, QpidTopic> implemen
     public String getAmqpVersion() { return getAttribute(AMQP_VERSION); }
     public Integer getAmqpPort() { return getAttribute(AMQP_PORT); }
 
+    @Override
     public void setBrokerUrl() {
         String urlFormat = "amqp://guest:guest@/%s?brokerlist='tcp://%s:%d'";
         sensors().set(BROKER_URL, format(urlFormat, getAttribute(VIRTUAL_HOST_NAME), getAttribute(HOSTNAME), getAttribute(AMQP_PORT)));
@@ -69,6 +70,7 @@ public class QpidBrokerImpl extends JMSBrokerImpl<QpidQueue, QpidTopic> implemen
         new JmxSupport(this, null).recommendJmxRmiCustomAgent();
     }
 
+    @Override
     public void waitForServiceUp(long duration, TimeUnit units) {
         super.waitForServiceUp(duration, units);
 
@@ -88,12 +90,14 @@ public class QpidBrokerImpl extends JMSBrokerImpl<QpidQueue, QpidTopic> implemen
         }
     }
     
+    @Override
     public QpidQueue createQueue(Map properties) {
         QpidQueue result = addChild(EntitySpec.create(QpidQueue.class).configure(properties));
         result.create();
         return result;
     }
 
+    @Override
     public QpidTopic createTopic(Map properties) {
         QpidTopic result = addChild(EntitySpec.create(QpidTopic.class).configure(properties));
         result.create();

http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/a86b41c4/software/messaging/src/test/java/org/apache/brooklyn/entity/messaging/storm/LocalhostLiveTest.java
----------------------------------------------------------------------
diff --git a/software/messaging/src/test/java/org/apache/brooklyn/entity/messaging/storm/LocalhostLiveTest.java b/software/messaging/src/test/java/org/apache/brooklyn/entity/messaging/storm/LocalhostLiveTest.java
index 89afe00..b1f69d6 100644
--- a/software/messaging/src/test/java/org/apache/brooklyn/entity/messaging/storm/LocalhostLiveTest.java
+++ b/software/messaging/src/test/java/org/apache/brooklyn/entity/messaging/storm/LocalhostLiveTest.java
@@ -25,6 +25,7 @@ public class LocalhostLiveTest extends StormAbstractCloudLiveTest {
 
     private static final String NAMED_LOCATION = "localhost";
 
+    @Override
     public String getLocation() {
         return NAMED_LOCATION;
     }

http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/a86b41c4/software/monitoring/src/test/java/org/apache/brooklyn/entity/monitoring/monit/MonitIntegrationTest.java
----------------------------------------------------------------------
diff --git a/software/monitoring/src/test/java/org/apache/brooklyn/entity/monitoring/monit/MonitIntegrationTest.java b/software/monitoring/src/test/java/org/apache/brooklyn/entity/monitoring/monit/MonitIntegrationTest.java
index 1305738..b30aa91 100644
--- a/software/monitoring/src/test/java/org/apache/brooklyn/entity/monitoring/monit/MonitIntegrationTest.java
+++ b/software/monitoring/src/test/java/org/apache/brooklyn/entity/monitoring/monit/MonitIntegrationTest.java
@@ -55,6 +55,7 @@ public class MonitIntegrationTest extends BrooklynAppLiveTestSupport {
     LocalhostMachineProvisioningLocation loc;
     Process testProcess;
     
+    @Override
     @BeforeMethod(alwaysRun=true)
     public void setUp() throws Exception {
         super.setUp();

http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/a86b41c4/software/network/src/test/java/org/apache/brooklyn/entity/network/bind/BindDnsServerEc2LiveTest.java
----------------------------------------------------------------------
diff --git a/software/network/src/test/java/org/apache/brooklyn/entity/network/bind/BindDnsServerEc2LiveTest.java b/software/network/src/test/java/org/apache/brooklyn/entity/network/bind/BindDnsServerEc2LiveTest.java
index 7c6391a..4063015 100644
--- a/software/network/src/test/java/org/apache/brooklyn/entity/network/bind/BindDnsServerEc2LiveTest.java
+++ b/software/network/src/test/java/org/apache/brooklyn/entity/network/bind/BindDnsServerEc2LiveTest.java
@@ -26,6 +26,7 @@ import org.apache.brooklyn.entity.AbstractEc2LiveTest;
 public class BindDnsServerEc2LiveTest extends AbstractEc2LiveTest {
     private static final Logger LOG = LoggerFactory.getLogger(BindDnsServerEc2LiveTest.class);
 
+    @Override
     protected void doTest(Location testLocation) throws Exception {
         BindDnsServerLiveTest.testBindStartsAndUpdates(app, testLocation);
     }

http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/a86b41c4/software/network/src/test/java/org/apache/brooklyn/entity/network/bind/BindDnsServerSoftlayerLiveTest.java
----------------------------------------------------------------------
diff --git a/software/network/src/test/java/org/apache/brooklyn/entity/network/bind/BindDnsServerSoftlayerLiveTest.java b/software/network/src/test/java/org/apache/brooklyn/entity/network/bind/BindDnsServerSoftlayerLiveTest.java
index f65672c..015ba93 100644
--- a/software/network/src/test/java/org/apache/brooklyn/entity/network/bind/BindDnsServerSoftlayerLiveTest.java
+++ b/software/network/src/test/java/org/apache/brooklyn/entity/network/bind/BindDnsServerSoftlayerLiveTest.java
@@ -24,6 +24,7 @@ import org.apache.brooklyn.entity.AbstractSoftlayerLiveTest;
 
 public class BindDnsServerSoftlayerLiveTest extends AbstractSoftlayerLiveTest {
 
+    @Override
     @Test(groups = "Live")
     protected void doTest(Location testLocation) throws Exception {
         BindDnsServerLiveTest.testBindStartsAndUpdates(app, testLocation);

http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/a86b41c4/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/couchbase/CouchbaseClusterImpl.java
----------------------------------------------------------------------
diff --git a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/couchbase/CouchbaseClusterImpl.java b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/couchbase/CouchbaseClusterImpl.java
index 4396ed1..db33f50 100644
--- a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/couchbase/CouchbaseClusterImpl.java
+++ b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/couchbase/CouchbaseClusterImpl.java
@@ -116,6 +116,7 @@ public class CouchbaseClusterImpl extends DynamicClusterImpl implements Couchbas
     // so a feed is used to determine when a bucket has finished being created
     private final AtomicReference<HttpFeed> resetBucketCreation = new AtomicReference<HttpFeed>();
 
+    @Override
     public void init() {
         log.info("Initializing the Couchbase cluster...");
         super.init();
@@ -370,6 +371,7 @@ public class CouchbaseClusterImpl extends DynamicClusterImpl implements Couchbas
     }
 
 
+    @Override
     protected EntitySpec<?> getMemberSpec() {
         EntitySpec<?> result = super.getMemberSpec();
         if (result != null) return result;

http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/a86b41c4/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/couchbase/CouchbaseNodeImpl.java
----------------------------------------------------------------------
diff --git a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/couchbase/CouchbaseNodeImpl.java b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/couchbase/CouchbaseNodeImpl.java
index 4dc9bbd..0642bf3 100644
--- a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/couchbase/CouchbaseNodeImpl.java
+++ b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/couchbase/CouchbaseNodeImpl.java
@@ -107,6 +107,7 @@ public class CouchbaseNodeImpl extends SoftwareProcessImpl implements CouchbaseN
         });
     }
 
+    @Override
     protected Map<String, Object> obtainProvisioningFlags(@SuppressWarnings("rawtypes") MachineProvisioningLocation location) {
         ConfigBag result = ConfigBag.newInstance(super.obtainProvisioningFlags(location));
         result.configure(CloudLocationConfig.OS_64_BIT, true);
@@ -201,6 +202,7 @@ public class CouchbaseNodeImpl extends SoftwareProcessImpl implements CouchbaseN
         }
     }
 
+    @Override
     public void connectSensors() {
         super.connectSensors();
         connectServiceUpIsRunning();
@@ -229,6 +231,7 @@ public class CouchbaseNodeImpl extends SoftwareProcessImpl implements CouchbaseN
             .build();
     }
 
+    @Override
     public void disconnectSensors() {
         super.disconnectSensors();
         disconnectServiceUpIsRunning();

http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/a86b41c4/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/riak/RiakClusterImpl.java
----------------------------------------------------------------------
diff --git a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/riak/RiakClusterImpl.java b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/riak/RiakClusterImpl.java
index 3065015..a408459 100644
--- a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/riak/RiakClusterImpl.java
+++ b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/riak/RiakClusterImpl.java
@@ -65,6 +65,7 @@ public class RiakClusterImpl extends DynamicClusterImpl implements RiakCluster {
 
     private transient Object mutex = new Object[0];
 
+    @Override
     public void init() {
         super.init();
         log.info("Initializing the riak cluster...");
@@ -98,6 +99,7 @@ public class RiakClusterImpl extends DynamicClusterImpl implements RiakCluster {
         }
     }
 
+    @Override
     protected EntitySpec<?> getMemberSpec() {
         EntitySpec<?> result = config().get(MEMBER_SPEC);
         if (result!=null) return result;

http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/a86b41c4/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/solr/SolrServerSshDriver.java
----------------------------------------------------------------------
diff --git a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/solr/SolrServerSshDriver.java b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/solr/SolrServerSshDriver.java
index 0b14bf6..47cf15d 100644
--- a/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/solr/SolrServerSshDriver.java
+++ b/software/nosql/src/main/java/org/apache/brooklyn/entity/nosql/solr/SolrServerSshDriver.java
@@ -81,6 +81,7 @@ public class SolrServerSshDriver extends JavaSoftwareProcessSshDriver implements
                 .execute();
     }
 
+    @Override
     public Set<Integer> getPortsUsed() {
         Set<Integer> result = Sets.newLinkedHashSet(super.getPortsUsed());
         result.addAll(getPortMap().values());

http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/a86b41c4/software/nosql/src/test/java/org/apache/brooklyn/entity/nosql/cassandra/CassandraDatacenterRebindIntegrationTest.java
----------------------------------------------------------------------
diff --git a/software/nosql/src/test/java/org/apache/brooklyn/entity/nosql/cassandra/CassandraDatacenterRebindIntegrationTest.java b/software/nosql/src/test/java/org/apache/brooklyn/entity/nosql/cassandra/CassandraDatacenterRebindIntegrationTest.java
index 939ac1d..0e4aab6 100644
--- a/software/nosql/src/test/java/org/apache/brooklyn/entity/nosql/cassandra/CassandraDatacenterRebindIntegrationTest.java
+++ b/software/nosql/src/test/java/org/apache/brooklyn/entity/nosql/cassandra/CassandraDatacenterRebindIntegrationTest.java
@@ -50,6 +50,7 @@ public class CassandraDatacenterRebindIntegrationTest extends RebindTestFixtureW
 
     private LocalhostMachineProvisioningLocation localhostProvisioningLocation;
     
+    @Override
     @BeforeMethod(alwaysRun=true)
     public void setUp() throws Exception {
         CassandraNodeIntegrationTest.assertCassandraPortsAvailableEventually();

http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/a86b41c4/software/nosql/src/test/java/org/apache/brooklyn/entity/nosql/cassandra/CassandraFabricTest.java
----------------------------------------------------------------------
diff --git a/software/nosql/src/test/java/org/apache/brooklyn/entity/nosql/cassandra/CassandraFabricTest.java b/software/nosql/src/test/java/org/apache/brooklyn/entity/nosql/cassandra/CassandraFabricTest.java
index 55104ca..d21e336 100644
--- a/software/nosql/src/test/java/org/apache/brooklyn/entity/nosql/cassandra/CassandraFabricTest.java
+++ b/software/nosql/src/test/java/org/apache/brooklyn/entity/nosql/cassandra/CassandraFabricTest.java
@@ -113,6 +113,7 @@ public class CassandraFabricTest extends BrooklynAppUnitTestSupport {
                         .configure(CassandraDatacenter.MEMBER_SPEC, EntitySpec.create(DummyCassandraNode.class))));
 
         Thread t = new Thread() {
+            @Override
             public void run() {
                 app.start(ImmutableList.of(loc1, loc2));
             }

http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/a86b41c4/software/nosql/src/test/java/org/apache/brooklyn/entity/nosql/mongodb/sharding/MongoDBShardedDeploymentIntegrationTest.java
----------------------------------------------------------------------
diff --git a/software/nosql/src/test/java/org/apache/brooklyn/entity/nosql/mongodb/sharding/MongoDBShardedDeploymentIntegrationTest.java b/software/nosql/src/test/java/org/apache/brooklyn/entity/nosql/mongodb/sharding/MongoDBShardedDeploymentIntegrationTest.java
index 8d11e4d..9abad4a 100644
--- a/software/nosql/src/test/java/org/apache/brooklyn/entity/nosql/mongodb/sharding/MongoDBShardedDeploymentIntegrationTest.java
+++ b/software/nosql/src/test/java/org/apache/brooklyn/entity/nosql/mongodb/sharding/MongoDBShardedDeploymentIntegrationTest.java
@@ -44,6 +44,7 @@ public class MongoDBShardedDeploymentIntegrationTest extends BrooklynAppLiveTest
     
     private LocalhostMachineProvisioningLocation localhostProvisioningLocation;
 
+    @Override
     @BeforeMethod(alwaysRun=true)
     public void setUp() throws Exception {
         super.setUp();

http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/a86b41c4/software/nosql/src/test/java/org/apache/brooklyn/entity/nosql/riak/RiakNodeSoftlayerLiveTest.java
----------------------------------------------------------------------
diff --git a/software/nosql/src/test/java/org/apache/brooklyn/entity/nosql/riak/RiakNodeSoftlayerLiveTest.java b/software/nosql/src/test/java/org/apache/brooklyn/entity/nosql/riak/RiakNodeSoftlayerLiveTest.java
index 6ad4925..2a2038b 100644
--- a/software/nosql/src/test/java/org/apache/brooklyn/entity/nosql/riak/RiakNodeSoftlayerLiveTest.java
+++ b/software/nosql/src/test/java/org/apache/brooklyn/entity/nosql/riak/RiakNodeSoftlayerLiveTest.java
@@ -28,6 +28,7 @@ import com.google.common.collect.ImmutableList;
 
 public class RiakNodeSoftlayerLiveTest extends AbstractSoftlayerLiveTest {
 
+    @Override
     @BeforeMethod(alwaysRun=true)
     public void setUp() throws Exception {
         super.setUp();

http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/a86b41c4/software/osgi/src/test/java/org/apache/brooklyn/entity/osgi/karaf/KarafContainerTest.java
----------------------------------------------------------------------
diff --git a/software/osgi/src/test/java/org/apache/brooklyn/entity/osgi/karaf/KarafContainerTest.java b/software/osgi/src/test/java/org/apache/brooklyn/entity/osgi/karaf/KarafContainerTest.java
index 9d60834..e896809 100644
--- a/software/osgi/src/test/java/org/apache/brooklyn/entity/osgi/karaf/KarafContainerTest.java
+++ b/software/osgi/src/test/java/org/apache/brooklyn/entity/osgi/karaf/KarafContainerTest.java
@@ -49,6 +49,7 @@ public class KarafContainerTest extends BrooklynAppLiveTestSupport {
     LocalhostMachineProvisioningLocation localhost;
     KarafContainer karaf;
 
+    @Override
     @BeforeMethod(alwaysRun=true)
     public void setUp() throws Exception {
         super.setUp();

http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/a86b41c4/software/webapp/src/main/java/org/apache/brooklyn/entity/dns/geoscaling/GeoscalingDnsServiceImpl.java
----------------------------------------------------------------------
diff --git a/software/webapp/src/main/java/org/apache/brooklyn/entity/dns/geoscaling/GeoscalingDnsServiceImpl.java b/software/webapp/src/main/java/org/apache/brooklyn/entity/dns/geoscaling/GeoscalingDnsServiceImpl.java
index 47f684f..00136b2 100644
--- a/software/webapp/src/main/java/org/apache/brooklyn/entity/dns/geoscaling/GeoscalingDnsServiceImpl.java
+++ b/software/webapp/src/main/java/org/apache/brooklyn/entity/dns/geoscaling/GeoscalingDnsServiceImpl.java
@@ -155,6 +155,7 @@ public class GeoscalingDnsServiceImpl extends AbstractGeoDnsServiceImpl implemen
         isConfigured = false;
     }
     
+    @Override
     protected void reconfigureService(Collection<HostGeoInfo> targetHosts) {
         if (!isConfigured) {
             this.rememberedTargetHosts = MutableSet.copyOf(targetHosts);

http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/a86b41c4/software/webapp/src/main/java/org/apache/brooklyn/entity/webapp/JavaWebAppSoftwareProcessImpl.java
----------------------------------------------------------------------
diff --git a/software/webapp/src/main/java/org/apache/brooklyn/entity/webapp/JavaWebAppSoftwareProcessImpl.java b/software/webapp/src/main/java/org/apache/brooklyn/entity/webapp/JavaWebAppSoftwareProcessImpl.java
index 7099276..99e0991 100644
--- a/software/webapp/src/main/java/org/apache/brooklyn/entity/webapp/JavaWebAppSoftwareProcessImpl.java
+++ b/software/webapp/src/main/java/org/apache/brooklyn/entity/webapp/JavaWebAppSoftwareProcessImpl.java
@@ -69,6 +69,7 @@ public abstract class JavaWebAppSoftwareProcessImpl extends SoftwareProcessImpl
     }
     
     //just provide better typing
+    @Override
     public JavaWebAppDriver getDriver() {
         return (JavaWebAppDriver) super.getDriver();
     }

http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/a86b41c4/software/webapp/src/main/java/org/apache/brooklyn/entity/webapp/JavaWebAppSshDriver.java
----------------------------------------------------------------------
diff --git a/software/webapp/src/main/java/org/apache/brooklyn/entity/webapp/JavaWebAppSshDriver.java b/software/webapp/src/main/java/org/apache/brooklyn/entity/webapp/JavaWebAppSshDriver.java
index b2b8620..3c2667d 100644
--- a/software/webapp/src/main/java/org/apache/brooklyn/entity/webapp/JavaWebAppSshDriver.java
+++ b/software/webapp/src/main/java/org/apache/brooklyn/entity/webapp/JavaWebAppSshDriver.java
@@ -42,6 +42,7 @@ public abstract class JavaWebAppSshDriver extends JavaSoftwareProcessSshDriver i
         super(entity, machine);
     }
 
+    @Override
     public JavaWebAppSoftwareProcessImpl getEntity() {
         return (JavaWebAppSoftwareProcessImpl) super.getEntity();
     }

http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/a86b41c4/software/webapp/src/main/java/org/apache/brooklyn/entity/webapp/jboss/JBoss6SshDriver.java
----------------------------------------------------------------------
diff --git a/software/webapp/src/main/java/org/apache/brooklyn/entity/webapp/jboss/JBoss6SshDriver.java b/software/webapp/src/main/java/org/apache/brooklyn/entity/webapp/jboss/JBoss6SshDriver.java
index 769337a..70d6a14 100644
--- a/software/webapp/src/main/java/org/apache/brooklyn/entity/webapp/jboss/JBoss6SshDriver.java
+++ b/software/webapp/src/main/java/org/apache/brooklyn/entity/webapp/jboss/JBoss6SshDriver.java
@@ -53,10 +53,12 @@ public class JBoss6SshDriver extends JavaWebAppSshDriver implements JBoss6Driver
         return (JBoss6ServerImpl) super.getEntity();
     }
     
+    @Override
     protected String getLogFileLocation() {
         return Os.mergePathsUnix(getRunDir(), "server", SERVER_TYPE, "log/server.log");
     }
 
+    @Override
     protected String getDeploySubdir() {
         return Os.mergePathsUnix("server", SERVER_TYPE, "deploy");
     } // FIXME what is this in as6?

http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/a86b41c4/software/webapp/src/main/java/org/apache/brooklyn/entity/webapp/nodejs/NodeJsWebAppSshDriver.java
----------------------------------------------------------------------
diff --git a/software/webapp/src/main/java/org/apache/brooklyn/entity/webapp/nodejs/NodeJsWebAppSshDriver.java b/software/webapp/src/main/java/org/apache/brooklyn/entity/webapp/nodejs/NodeJsWebAppSshDriver.java
index b632e71..4963038 100644
--- a/software/webapp/src/main/java/org/apache/brooklyn/entity/webapp/nodejs/NodeJsWebAppSshDriver.java
+++ b/software/webapp/src/main/java/org/apache/brooklyn/entity/webapp/nodejs/NodeJsWebAppSshDriver.java
@@ -51,6 +51,7 @@ public class NodeJsWebAppSshDriver extends AbstractSoftwareProcessSshDriver impl
         super(entity, machine);
     }
 
+    @Override
     public NodeJsWebAppServiceImpl getEntity() {
         return (NodeJsWebAppServiceImpl) super.getEntity();
     }

http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/a86b41c4/software/webapp/src/test/java/org/apache/brooklyn/entity/dns/geoscaling/GeoscalingWebClientTest.java
----------------------------------------------------------------------
diff --git a/software/webapp/src/test/java/org/apache/brooklyn/entity/dns/geoscaling/GeoscalingWebClientTest.java b/software/webapp/src/test/java/org/apache/brooklyn/entity/dns/geoscaling/GeoscalingWebClientTest.java
index 325cd81..f81b5c7 100644
--- a/software/webapp/src/test/java/org/apache/brooklyn/entity/dns/geoscaling/GeoscalingWebClientTest.java
+++ b/software/webapp/src/test/java/org/apache/brooklyn/entity/dns/geoscaling/GeoscalingWebClientTest.java
@@ -139,6 +139,7 @@ public class GeoscalingWebClientTest extends BrooklynMgmtUnitTestSupport {
         super.setUp();
     }
     
+    @Override
     @AfterMethod(alwaysRun=true)
     public void tearDown() throws Exception {
         if (smartSubdomain != null)

http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/a86b41c4/software/webapp/src/test/java/org/apache/brooklyn/entity/proxy/AbstractControllerTest.java
----------------------------------------------------------------------
diff --git a/software/webapp/src/test/java/org/apache/brooklyn/entity/proxy/AbstractControllerTest.java b/software/webapp/src/test/java/org/apache/brooklyn/entity/proxy/AbstractControllerTest.java
index 94221c4..ea4b4d8 100644
--- a/software/webapp/src/test/java/org/apache/brooklyn/entity/proxy/AbstractControllerTest.java
+++ b/software/webapp/src/test/java/org/apache/brooklyn/entity/proxy/AbstractControllerTest.java
@@ -406,7 +406,7 @@ public class AbstractControllerTest extends BrooklynAppUnitTestSupport {
             sensors().set(Attributes.MAIN_URI_MAPPED_SUBNET, URI.create(machine.getAddress().getHostName()));
             sensors().set(Attributes.MAIN_URI_MAPPED_PUBLIC, URI.create("http://8.8.8.8:" + sensors().get(HTTP_PORT)));
         }
-        
+
         @Override
         public void stop() {
             Maybe<MachineLocation> machine = Machines.findUniqueMachineLocation(getLocations(), MachineLocation.class);

http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/a86b41c4/software/webapp/src/test/java/org/apache/brooklyn/entity/proxy/nginx/NginxRebindIntegrationTest.java
----------------------------------------------------------------------
diff --git a/software/webapp/src/test/java/org/apache/brooklyn/entity/proxy/nginx/NginxRebindIntegrationTest.java b/software/webapp/src/test/java/org/apache/brooklyn/entity/proxy/nginx/NginxRebindIntegrationTest.java
index f3b3019..d710c26 100644
--- a/software/webapp/src/test/java/org/apache/brooklyn/entity/proxy/nginx/NginxRebindIntegrationTest.java
+++ b/software/webapp/src/test/java/org/apache/brooklyn/entity/proxy/nginx/NginxRebindIntegrationTest.java
@@ -78,6 +78,7 @@ public class NginxRebindIntegrationTest extends RebindTestFixtureWithApp {
         return true;
     }
     
+    @Override
     @BeforeMethod(alwaysRun=true)
     public void setUp() throws Exception {
         super.setUp();
@@ -90,6 +91,7 @@ public class NginxRebindIntegrationTest extends RebindTestFixtureWithApp {
         return "classpath://hello-world.war";
     }
 
+    @Override
     @AfterMethod(alwaysRun=true)
     public void tearDown() throws Exception {
         for (WebAppMonitor monitor : webAppMonitors) {

http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/a86b41c4/software/webapp/src/test/java/org/apache/brooklyn/entity/proxy/nginx/NginxRebindWithHaIntegrationTest.java
----------------------------------------------------------------------
diff --git a/software/webapp/src/test/java/org/apache/brooklyn/entity/proxy/nginx/NginxRebindWithHaIntegrationTest.java b/software/webapp/src/test/java/org/apache/brooklyn/entity/proxy/nginx/NginxRebindWithHaIntegrationTest.java
index 3e11c27..cc59721 100644
--- a/software/webapp/src/test/java/org/apache/brooklyn/entity/proxy/nginx/NginxRebindWithHaIntegrationTest.java
+++ b/software/webapp/src/test/java/org/apache/brooklyn/entity/proxy/nginx/NginxRebindWithHaIntegrationTest.java
@@ -87,6 +87,7 @@ public class NginxRebindWithHaIntegrationTest extends RebindTestFixtureWithApp {
         return "classpath://hello-world.war";
     }
 
+    @Override
     @BeforeMethod(alwaysRun=true)
     public void setUp() throws Exception {
         super.setUp();
@@ -99,6 +100,7 @@ public class NginxRebindWithHaIntegrationTest extends RebindTestFixtureWithApp {
         BrooklynFeatureEnablement.setEnablement(BrooklynFeatureEnablement.FEATURE_FEED_REGISTRATION_PROPERTY, true);
     }
 
+    @Override
     @AfterMethod(alwaysRun=true)
     public void tearDown() throws Exception {
         try {

http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/a86b41c4/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/ControlledDynamicWebAppClusterIntegrationTest.java
----------------------------------------------------------------------
diff --git a/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/ControlledDynamicWebAppClusterIntegrationTest.java b/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/ControlledDynamicWebAppClusterIntegrationTest.java
index bb3ef02..bf514ac 100644
--- a/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/ControlledDynamicWebAppClusterIntegrationTest.java
+++ b/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/ControlledDynamicWebAppClusterIntegrationTest.java
@@ -59,6 +59,7 @@ public class ControlledDynamicWebAppClusterIntegrationTest extends BrooklynAppLi
     private LocalhostMachineProvisioningLocation loc;
     private List<LocalhostMachineProvisioningLocation> locs;
     
+    @Override
     @BeforeMethod(alwaysRun=true)
     public void setUp() throws Exception {
         super.setUp();

http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/a86b41c4/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/ControlledDynamicWebAppClusterTest.java
----------------------------------------------------------------------
diff --git a/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/ControlledDynamicWebAppClusterTest.java b/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/ControlledDynamicWebAppClusterTest.java
index daa53fd..ced06bb 100644
--- a/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/ControlledDynamicWebAppClusterTest.java
+++ b/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/ControlledDynamicWebAppClusterTest.java
@@ -55,6 +55,7 @@ public class ControlledDynamicWebAppClusterTest extends BrooklynAppUnitTestSuppo
     private LocalhostMachineProvisioningLocation loc;
     private List<LocalhostMachineProvisioningLocation> locs;
     
+    @Override
     @BeforeMethod(alwaysRun=true)
     public void setUp() throws Exception {
         super.setUp();

http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/a86b41c4/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/EffectorExceptionLoggedTest.java
----------------------------------------------------------------------
diff --git a/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/EffectorExceptionLoggedTest.java b/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/EffectorExceptionLoggedTest.java
index ba41ce7..d059920 100644
--- a/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/EffectorExceptionLoggedTest.java
+++ b/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/EffectorExceptionLoggedTest.java
@@ -68,12 +68,14 @@ public class EffectorExceptionLoggedTest extends BrooklynAppUnitTestSupport {
         }
     }
 
+    @Override
     @BeforeMethod(alwaysRun=true)
     public void setUp() throws Exception {
         super.setUp();
         loc = app.newLocalhostProvisioningLocation();
     }
 
+    @Override
     protected BrooklynProperties getBrooklynProperties() {
         BrooklynProperties result = BrooklynProperties.Factory.newEmpty();
         result.put(Entitlements.GLOBAL_ENTITLEMENT_MANAGER, ThrowingEntitlementManager.class.getName());

http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/a86b41c4/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/jboss/JBoss6ServerNonInheritingIntegrationTest.java
----------------------------------------------------------------------
diff --git a/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/jboss/JBoss6ServerNonInheritingIntegrationTest.java b/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/jboss/JBoss6ServerNonInheritingIntegrationTest.java
index 6201653..bf3affe 100644
--- a/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/jboss/JBoss6ServerNonInheritingIntegrationTest.java
+++ b/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/jboss/JBoss6ServerNonInheritingIntegrationTest.java
@@ -49,6 +49,7 @@ public class JBoss6ServerNonInheritingIntegrationTest extends BrooklynAppLiveTes
 
     private LocalhostMachineProvisioningLocation localhostProvisioningLocation;
     
+    @Override
     @BeforeMethod(alwaysRun=true)
     public void setUp() throws Exception {
         super.setUp();

http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/a86b41c4/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/jboss/JBossServersMultiVersionWebAppFixtureIntegrationTest.java
----------------------------------------------------------------------
diff --git a/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/jboss/JBossServersMultiVersionWebAppFixtureIntegrationTest.java b/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/jboss/JBossServersMultiVersionWebAppFixtureIntegrationTest.java
index f6fd0bc..cfe5a54 100644
--- a/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/jboss/JBossServersMultiVersionWebAppFixtureIntegrationTest.java
+++ b/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/jboss/JBossServersMultiVersionWebAppFixtureIntegrationTest.java
@@ -29,11 +29,13 @@ import org.testng.annotations.Test;
 
 public class JBossServersMultiVersionWebAppFixtureIntegrationTest extends AbstractWebAppFixtureIntegrationTest {
 
+    @Override
     @Test(groups = "Integration", dataProvider = "basicEntities")
     public void testReportsServiceDownWhenKilled(final SoftwareProcess entity) throws Exception {
         super.testReportsServiceDownWhenKilled(entity);
     }
     
+    @Override
     @DataProvider(name = "basicEntities")
     public Object[][] basicEntities() {
         TestApplication jboss6App = newTestApplication();
@@ -52,6 +54,7 @@ public class JBossServersMultiVersionWebAppFixtureIntegrationTest extends Abstra
     }
 
     // to be able to test on this class in Eclipse IDE
+    @Override
     @Test(groups = "Integration", dataProvider = "basicEntities")
     public void canStartAndStop(final SoftwareProcess entity) {
         super.canStartAndStop(entity);

http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/a86b41c4/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/jetty/JettyWebAppFixtureIntegrationTest.java
----------------------------------------------------------------------
diff --git a/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/jetty/JettyWebAppFixtureIntegrationTest.java b/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/jetty/JettyWebAppFixtureIntegrationTest.java
index 38b242b..d4c2301 100644
--- a/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/jetty/JettyWebAppFixtureIntegrationTest.java
+++ b/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/jetty/JettyWebAppFixtureIntegrationTest.java
@@ -32,11 +32,13 @@ public class JettyWebAppFixtureIntegrationTest extends AbstractWebAppFixtureInte
     // FIXME Fails with this is in the jetty log:
     //     Caused by: java.lang.ClassNotFoundException: mx4j.tools.adaptor.http.HttpAdaptor
 
+    @Override
     @Test(groups = "Integration", dataProvider = "basicEntities")
     public void canStartAndStop(final SoftwareProcess entity) {
         super.canStartAndStop(entity);
     }
     
+    @Override
     @DataProvider(name = "basicEntities")
     public Object[][] basicEntities() {
         TestApplication jettyApp = newTestApplication();

http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/a86b41c4/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/tomcat/Tomcat8ServerWebAppFixtureIntegrationTest.java
----------------------------------------------------------------------
diff --git a/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/tomcat/Tomcat8ServerWebAppFixtureIntegrationTest.java b/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/tomcat/Tomcat8ServerWebAppFixtureIntegrationTest.java
index 7ef8d19..fee654c 100644
--- a/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/tomcat/Tomcat8ServerWebAppFixtureIntegrationTest.java
+++ b/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/tomcat/Tomcat8ServerWebAppFixtureIntegrationTest.java
@@ -52,6 +52,7 @@ public class Tomcat8ServerWebAppFixtureIntegrationTest extends AbstractWebAppFix
     @SuppressWarnings("unused")
     private static final Logger log = LoggerFactory.getLogger(Tomcat8ServerWebAppFixtureIntegrationTest.class);
     
+    @Override
     @DataProvider(name = "basicEntities")
     public Object[][] basicEntities() {
         TestApplication tomcatApp = newTestApplication();
@@ -80,10 +81,12 @@ public class Tomcat8ServerWebAppFixtureIntegrationTest extends AbstractWebAppFix
     }
 
     // exists to be able to test on this class from GUI in Eclipse IDE
+    @Override
     @Test(groups = "Integration", dataProvider = "basicEntities")
     public void canStartAndStop(final SoftwareProcess entity) {
         super.canStartAndStop(entity);
     }
+    @Override
     @Test(groups = "Integration", dataProvider = "basicEntities")
     public void testReportsServiceDownWhenKilled(final SoftwareProcess entity) throws Exception {
         super.testReportsServiceDownWhenKilled(entity);

http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/a86b41c4/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/tomcat/TomcatServerWebAppFixtureIntegrationTest.java
----------------------------------------------------------------------
diff --git a/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/tomcat/TomcatServerWebAppFixtureIntegrationTest.java b/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/tomcat/TomcatServerWebAppFixtureIntegrationTest.java
index e824e26..1f86106 100644
--- a/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/tomcat/TomcatServerWebAppFixtureIntegrationTest.java
+++ b/software/webapp/src/test/java/org/apache/brooklyn/entity/webapp/tomcat/TomcatServerWebAppFixtureIntegrationTest.java
@@ -52,6 +52,7 @@ public class TomcatServerWebAppFixtureIntegrationTest extends AbstractWebAppFixt
     @SuppressWarnings("unused")
     private static final Logger log = LoggerFactory.getLogger(TomcatServerWebAppFixtureIntegrationTest.class);
     
+    @Override
     @DataProvider(name = "basicEntities")
     public Object[][] basicEntities() {
         TestApplication tomcatApp = newTestApplication();
@@ -80,11 +81,13 @@ public class TomcatServerWebAppFixtureIntegrationTest extends AbstractWebAppFixt
     }
 
     // exists to be able to test on this class from GUI in Eclipse IDE
+    @Override
     @Test(groups = "Integration", dataProvider = "basicEntities")
     public void canStartAndStop(final SoftwareProcess entity) {
         super.canStartAndStop(entity);
     }
 
+    @Override
     @Test(groups = "Integration", dataProvider = "basicEntities")
     public void testReportsServiceDownWhenKilled(final SoftwareProcess entity) throws Exception {
         super.testReportsServiceDownWhenKilled(entity);


Mime
View raw message