You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by gr...@apache.org on 2014/07/09 16:07:08 UTC

[58/75] Fix Java and Groovy licensing

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/9b49b760/sandbox/dropwizard/src/main/java/brooklyn/cli/commands/CommandExecutionException.java
----------------------------------------------------------------------
diff --git a/sandbox/dropwizard/src/main/java/brooklyn/cli/commands/CommandExecutionException.java b/sandbox/dropwizard/src/main/java/brooklyn/cli/commands/CommandExecutionException.java
index b85813e..4b63222 100644
--- a/sandbox/dropwizard/src/main/java/brooklyn/cli/commands/CommandExecutionException.java
+++ b/sandbox/dropwizard/src/main/java/brooklyn/cli/commands/CommandExecutionException.java
@@ -7,7 +7,7 @@
  * "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
+ *     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
@@ -15,7 +15,7 @@
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
  * under the License.
-*/
+ */
 package brooklyn.cli.commands;
 
 /**

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/9b49b760/sandbox/dropwizard/src/main/java/brooklyn/cli/commands/DeployCommand.java
----------------------------------------------------------------------
diff --git a/sandbox/dropwizard/src/main/java/brooklyn/cli/commands/DeployCommand.java b/sandbox/dropwizard/src/main/java/brooklyn/cli/commands/DeployCommand.java
index 9d45463..695e31f 100644
--- a/sandbox/dropwizard/src/main/java/brooklyn/cli/commands/DeployCommand.java
+++ b/sandbox/dropwizard/src/main/java/brooklyn/cli/commands/DeployCommand.java
@@ -7,7 +7,7 @@
  * "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
+ *     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
@@ -15,7 +15,7 @@
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
  * under the License.
-*/
+ */
 package brooklyn.cli.commands;
 
 import brooklyn.rest.domain.ApplicationSpec;

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/9b49b760/sandbox/dropwizard/src/main/java/brooklyn/cli/commands/HelpCommand.java
----------------------------------------------------------------------
diff --git a/sandbox/dropwizard/src/main/java/brooklyn/cli/commands/HelpCommand.java b/sandbox/dropwizard/src/main/java/brooklyn/cli/commands/HelpCommand.java
index 5e394d2..7ebe80b 100644
--- a/sandbox/dropwizard/src/main/java/brooklyn/cli/commands/HelpCommand.java
+++ b/sandbox/dropwizard/src/main/java/brooklyn/cli/commands/HelpCommand.java
@@ -7,7 +7,7 @@
  * "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
+ *     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
@@ -15,7 +15,7 @@
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
  * under the License.
-*/
+ */
 package brooklyn.cli.commands;
 
 import brooklyn.cli.Client;

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/9b49b760/sandbox/dropwizard/src/main/java/brooklyn/cli/commands/ListApplicationsCommand.java
----------------------------------------------------------------------
diff --git a/sandbox/dropwizard/src/main/java/brooklyn/cli/commands/ListApplicationsCommand.java b/sandbox/dropwizard/src/main/java/brooklyn/cli/commands/ListApplicationsCommand.java
index 3f5d434..6da273e 100644
--- a/sandbox/dropwizard/src/main/java/brooklyn/cli/commands/ListApplicationsCommand.java
+++ b/sandbox/dropwizard/src/main/java/brooklyn/cli/commands/ListApplicationsCommand.java
@@ -7,7 +7,7 @@
  * "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
+ *     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
@@ -15,7 +15,7 @@
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
  * under the License.
-*/
+ */
 package brooklyn.cli.commands;
 
 import brooklyn.rest.domain.ApplicationSummary;

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/9b49b760/sandbox/dropwizard/src/main/java/brooklyn/cli/commands/UndeployCommand.java
----------------------------------------------------------------------
diff --git a/sandbox/dropwizard/src/main/java/brooklyn/cli/commands/UndeployCommand.java b/sandbox/dropwizard/src/main/java/brooklyn/cli/commands/UndeployCommand.java
index 74dfff6..09200dd 100644
--- a/sandbox/dropwizard/src/main/java/brooklyn/cli/commands/UndeployCommand.java
+++ b/sandbox/dropwizard/src/main/java/brooklyn/cli/commands/UndeployCommand.java
@@ -7,7 +7,7 @@
  * "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
+ *     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
@@ -15,7 +15,7 @@
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
  * under the License.
-*/
+ */
 package brooklyn.cli.commands;
 
 import com.sun.jersey.api.client.ClientResponse;

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/9b49b760/sandbox/dropwizard/src/main/java/brooklyn/cli/commands/VersionCommand.java
----------------------------------------------------------------------
diff --git a/sandbox/dropwizard/src/main/java/brooklyn/cli/commands/VersionCommand.java b/sandbox/dropwizard/src/main/java/brooklyn/cli/commands/VersionCommand.java
index 7aefc44..50fe102 100644
--- a/sandbox/dropwizard/src/main/java/brooklyn/cli/commands/VersionCommand.java
+++ b/sandbox/dropwizard/src/main/java/brooklyn/cli/commands/VersionCommand.java
@@ -7,7 +7,7 @@
  * "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
+ *     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
@@ -15,7 +15,7 @@
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
  * under the License.
-*/
+ */
 package brooklyn.cli.commands;
 
 import com.sun.jersey.api.client.ClientResponse;

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/9b49b760/sandbox/dropwizard/src/main/java/brooklyn/rest/BrooklynConfiguration.java
----------------------------------------------------------------------
diff --git a/sandbox/dropwizard/src/main/java/brooklyn/rest/BrooklynConfiguration.java b/sandbox/dropwizard/src/main/java/brooklyn/rest/BrooklynConfiguration.java
index 73ae208..415df16 100644
--- a/sandbox/dropwizard/src/main/java/brooklyn/rest/BrooklynConfiguration.java
+++ b/sandbox/dropwizard/src/main/java/brooklyn/rest/BrooklynConfiguration.java
@@ -7,7 +7,7 @@
  * "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
+ *     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
@@ -15,7 +15,7 @@
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
  * under the License.
-*/
+ */
 package brooklyn.rest;
 
 import brooklyn.management.ManagementContext;

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/9b49b760/sandbox/dropwizard/src/main/java/brooklyn/rest/BrooklynService.java
----------------------------------------------------------------------
diff --git a/sandbox/dropwizard/src/main/java/brooklyn/rest/BrooklynService.java b/sandbox/dropwizard/src/main/java/brooklyn/rest/BrooklynService.java
index a2ab4ef..dc402f8 100644
--- a/sandbox/dropwizard/src/main/java/brooklyn/rest/BrooklynService.java
+++ b/sandbox/dropwizard/src/main/java/brooklyn/rest/BrooklynService.java
@@ -7,7 +7,7 @@
  * "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
+ *     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
@@ -15,7 +15,7 @@
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
  * under the License.
-*/
+ */
 package brooklyn.rest;
 
 import java.util.concurrent.CountDownLatch;

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/9b49b760/sandbox/dropwizard/src/main/java/brooklyn/rest/ExecutorConfiguration.java
----------------------------------------------------------------------
diff --git a/sandbox/dropwizard/src/main/java/brooklyn/rest/ExecutorConfiguration.java b/sandbox/dropwizard/src/main/java/brooklyn/rest/ExecutorConfiguration.java
index 62a84f2..86ac7fd 100644
--- a/sandbox/dropwizard/src/main/java/brooklyn/rest/ExecutorConfiguration.java
+++ b/sandbox/dropwizard/src/main/java/brooklyn/rest/ExecutorConfiguration.java
@@ -7,7 +7,7 @@
  * "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
+ *     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
@@ -15,7 +15,7 @@
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
  * under the License.
-*/
+ */
 package brooklyn.rest;
 
 public class ExecutorConfiguration {

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/9b49b760/sandbox/dropwizard/src/main/java/brooklyn/rest/auth/BasicAuthFilter.java
----------------------------------------------------------------------
diff --git a/sandbox/dropwizard/src/main/java/brooklyn/rest/auth/BasicAuthFilter.java b/sandbox/dropwizard/src/main/java/brooklyn/rest/auth/BasicAuthFilter.java
index 225395f..3f013c1 100644
--- a/sandbox/dropwizard/src/main/java/brooklyn/rest/auth/BasicAuthFilter.java
+++ b/sandbox/dropwizard/src/main/java/brooklyn/rest/auth/BasicAuthFilter.java
@@ -7,7 +7,7 @@
  * "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
+ *     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
@@ -15,7 +15,7 @@
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
  * under the License.
-*/
+ */
 package brooklyn.rest.auth;
 
 import com.google.common.base.Optional;

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/9b49b760/sandbox/dropwizard/src/main/java/brooklyn/rest/auth/ConfigBasedAuthenticator.java
----------------------------------------------------------------------
diff --git a/sandbox/dropwizard/src/main/java/brooklyn/rest/auth/ConfigBasedAuthenticator.java b/sandbox/dropwizard/src/main/java/brooklyn/rest/auth/ConfigBasedAuthenticator.java
index 92c8fd2..32cb1f3 100644
--- a/sandbox/dropwizard/src/main/java/brooklyn/rest/auth/ConfigBasedAuthenticator.java
+++ b/sandbox/dropwizard/src/main/java/brooklyn/rest/auth/ConfigBasedAuthenticator.java
@@ -7,7 +7,7 @@
  * "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
+ *     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
@@ -15,7 +15,7 @@
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
  * under the License.
-*/
+ */
 package brooklyn.rest.auth;
 
 import com.google.common.base.Optional;

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/9b49b760/sandbox/dropwizard/src/main/java/brooklyn/rest/auth/User.java
----------------------------------------------------------------------
diff --git a/sandbox/dropwizard/src/main/java/brooklyn/rest/auth/User.java b/sandbox/dropwizard/src/main/java/brooklyn/rest/auth/User.java
index fb116f3..a0b62c6 100644
--- a/sandbox/dropwizard/src/main/java/brooklyn/rest/auth/User.java
+++ b/sandbox/dropwizard/src/main/java/brooklyn/rest/auth/User.java
@@ -7,7 +7,7 @@
  * "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
+ *     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
@@ -15,7 +15,7 @@
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
  * under the License.
-*/
+ */
 package brooklyn.rest.auth;
 
 import java.util.Set;

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/9b49b760/sandbox/dropwizard/src/main/java/brooklyn/rest/commands/BrooklynCommand.java
----------------------------------------------------------------------
diff --git a/sandbox/dropwizard/src/main/java/brooklyn/rest/commands/BrooklynCommand.java b/sandbox/dropwizard/src/main/java/brooklyn/rest/commands/BrooklynCommand.java
index dd9be2c..388f018 100644
--- a/sandbox/dropwizard/src/main/java/brooklyn/rest/commands/BrooklynCommand.java
+++ b/sandbox/dropwizard/src/main/java/brooklyn/rest/commands/BrooklynCommand.java
@@ -7,7 +7,7 @@
  * "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
+ *     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
@@ -15,7 +15,7 @@
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
  * under the License.
-*/
+ */
 package brooklyn.rest.commands;
 
 import com.google.common.annotations.VisibleForTesting;

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/9b49b760/sandbox/dropwizard/src/main/java/brooklyn/rest/commands/applications/DeleteApplicationCommand.java
----------------------------------------------------------------------
diff --git a/sandbox/dropwizard/src/main/java/brooklyn/rest/commands/applications/DeleteApplicationCommand.java b/sandbox/dropwizard/src/main/java/brooklyn/rest/commands/applications/DeleteApplicationCommand.java
index ad00454..180de82 100644
--- a/sandbox/dropwizard/src/main/java/brooklyn/rest/commands/applications/DeleteApplicationCommand.java
+++ b/sandbox/dropwizard/src/main/java/brooklyn/rest/commands/applications/DeleteApplicationCommand.java
@@ -7,7 +7,7 @@
  * "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
+ *     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
@@ -15,7 +15,7 @@
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
  * under the License.
-*/
+ */
 package brooklyn.rest.commands.applications;
 
 import brooklyn.rest.commands.BrooklynCommand;

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/9b49b760/sandbox/dropwizard/src/main/java/brooklyn/rest/commands/applications/InvokeEffectorCommand.java
----------------------------------------------------------------------
diff --git a/sandbox/dropwizard/src/main/java/brooklyn/rest/commands/applications/InvokeEffectorCommand.java b/sandbox/dropwizard/src/main/java/brooklyn/rest/commands/applications/InvokeEffectorCommand.java
index 02db9a6..d207c73 100644
--- a/sandbox/dropwizard/src/main/java/brooklyn/rest/commands/applications/InvokeEffectorCommand.java
+++ b/sandbox/dropwizard/src/main/java/brooklyn/rest/commands/applications/InvokeEffectorCommand.java
@@ -7,7 +7,7 @@
  * "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
+ *     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
@@ -15,7 +15,7 @@
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
  * under the License.
-*/
+ */
 package brooklyn.rest.commands.applications;
 
 

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/9b49b760/sandbox/dropwizard/src/main/java/brooklyn/rest/commands/applications/ListApplicationsCommand.java
----------------------------------------------------------------------
diff --git a/sandbox/dropwizard/src/main/java/brooklyn/rest/commands/applications/ListApplicationsCommand.java b/sandbox/dropwizard/src/main/java/brooklyn/rest/commands/applications/ListApplicationsCommand.java
index 8ace917..55e5cd8 100644
--- a/sandbox/dropwizard/src/main/java/brooklyn/rest/commands/applications/ListApplicationsCommand.java
+++ b/sandbox/dropwizard/src/main/java/brooklyn/rest/commands/applications/ListApplicationsCommand.java
@@ -7,7 +7,7 @@
  * "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
+ *     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
@@ -15,7 +15,7 @@
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
  * under the License.
-*/
+ */
 package brooklyn.rest.commands.applications;
 
 import brooklyn.rest.commands.BrooklynCommand;

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/9b49b760/sandbox/dropwizard/src/main/java/brooklyn/rest/commands/applications/ListEffectorsCommand.java
----------------------------------------------------------------------
diff --git a/sandbox/dropwizard/src/main/java/brooklyn/rest/commands/applications/ListEffectorsCommand.java b/sandbox/dropwizard/src/main/java/brooklyn/rest/commands/applications/ListEffectorsCommand.java
index 7dec764..f0cdeee 100644
--- a/sandbox/dropwizard/src/main/java/brooklyn/rest/commands/applications/ListEffectorsCommand.java
+++ b/sandbox/dropwizard/src/main/java/brooklyn/rest/commands/applications/ListEffectorsCommand.java
@@ -7,7 +7,7 @@
  * "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
+ *     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
@@ -15,7 +15,7 @@
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
  * under the License.
-*/
+ */
 package brooklyn.rest.commands.applications;
 
 import brooklyn.rest.commands.BrooklynCommand;

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/9b49b760/sandbox/dropwizard/src/main/java/brooklyn/rest/commands/applications/QuerySensorsCommand.java
----------------------------------------------------------------------
diff --git a/sandbox/dropwizard/src/main/java/brooklyn/rest/commands/applications/QuerySensorsCommand.java b/sandbox/dropwizard/src/main/java/brooklyn/rest/commands/applications/QuerySensorsCommand.java
index d5b7553..0955593 100644
--- a/sandbox/dropwizard/src/main/java/brooklyn/rest/commands/applications/QuerySensorsCommand.java
+++ b/sandbox/dropwizard/src/main/java/brooklyn/rest/commands/applications/QuerySensorsCommand.java
@@ -7,7 +7,7 @@
  * "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
+ *     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
@@ -15,7 +15,7 @@
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
  * under the License.
-*/
+ */
 package brooklyn.rest.commands.applications;
 
 import brooklyn.rest.commands.BrooklynCommand;

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/9b49b760/sandbox/dropwizard/src/main/java/brooklyn/rest/commands/applications/StartApplicationCommand.java
----------------------------------------------------------------------
diff --git a/sandbox/dropwizard/src/main/java/brooklyn/rest/commands/applications/StartApplicationCommand.java b/sandbox/dropwizard/src/main/java/brooklyn/rest/commands/applications/StartApplicationCommand.java
index 0862dff..9fcaf83 100644
--- a/sandbox/dropwizard/src/main/java/brooklyn/rest/commands/applications/StartApplicationCommand.java
+++ b/sandbox/dropwizard/src/main/java/brooklyn/rest/commands/applications/StartApplicationCommand.java
@@ -7,7 +7,7 @@
  * "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
+ *     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
@@ -15,7 +15,7 @@
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
  * under the License.
-*/
+ */
 package brooklyn.rest.commands.applications;
 
 import brooklyn.rest.commands.BrooklynCommand;

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/9b49b760/sandbox/dropwizard/src/main/java/brooklyn/rest/commands/catalog/CatalogEntityDetailsCommand.java
----------------------------------------------------------------------
diff --git a/sandbox/dropwizard/src/main/java/brooklyn/rest/commands/catalog/CatalogEntityDetailsCommand.java b/sandbox/dropwizard/src/main/java/brooklyn/rest/commands/catalog/CatalogEntityDetailsCommand.java
index 0f19798..74a70aa 100644
--- a/sandbox/dropwizard/src/main/java/brooklyn/rest/commands/catalog/CatalogEntityDetailsCommand.java
+++ b/sandbox/dropwizard/src/main/java/brooklyn/rest/commands/catalog/CatalogEntityDetailsCommand.java
@@ -7,7 +7,7 @@
  * "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
+ *     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
@@ -15,7 +15,7 @@
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
  * under the License.
-*/
+ */
 package brooklyn.rest.commands.catalog;
 
 import static com.google.common.base.Preconditions.checkArgument;

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/9b49b760/sandbox/dropwizard/src/main/java/brooklyn/rest/commands/catalog/ListCatalogEntitiesCommand.java
----------------------------------------------------------------------
diff --git a/sandbox/dropwizard/src/main/java/brooklyn/rest/commands/catalog/ListCatalogEntitiesCommand.java b/sandbox/dropwizard/src/main/java/brooklyn/rest/commands/catalog/ListCatalogEntitiesCommand.java
index 72a0254..4e80d72 100644
--- a/sandbox/dropwizard/src/main/java/brooklyn/rest/commands/catalog/ListCatalogEntitiesCommand.java
+++ b/sandbox/dropwizard/src/main/java/brooklyn/rest/commands/catalog/ListCatalogEntitiesCommand.java
@@ -7,7 +7,7 @@
  * "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
+ *     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
@@ -15,7 +15,7 @@
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
  * under the License.
-*/
+ */
 package brooklyn.rest.commands.catalog;
 
 import brooklyn.rest.commands.BrooklynCommand;

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/9b49b760/sandbox/dropwizard/src/main/java/brooklyn/rest/commands/catalog/ListCatalogPoliciesCommand.java
----------------------------------------------------------------------
diff --git a/sandbox/dropwizard/src/main/java/brooklyn/rest/commands/catalog/ListCatalogPoliciesCommand.java b/sandbox/dropwizard/src/main/java/brooklyn/rest/commands/catalog/ListCatalogPoliciesCommand.java
index bf4fb87..6b7f55a 100644
--- a/sandbox/dropwizard/src/main/java/brooklyn/rest/commands/catalog/ListCatalogPoliciesCommand.java
+++ b/sandbox/dropwizard/src/main/java/brooklyn/rest/commands/catalog/ListCatalogPoliciesCommand.java
@@ -7,7 +7,7 @@
  * "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
+ *     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
@@ -15,7 +15,7 @@
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
  * under the License.
-*/
+ */
 package brooklyn.rest.commands.catalog;
 
 import brooklyn.rest.commands.BrooklynCommand;

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/9b49b760/sandbox/dropwizard/src/main/java/brooklyn/rest/commands/catalog/LoadClassCommand.java
----------------------------------------------------------------------
diff --git a/sandbox/dropwizard/src/main/java/brooklyn/rest/commands/catalog/LoadClassCommand.java b/sandbox/dropwizard/src/main/java/brooklyn/rest/commands/catalog/LoadClassCommand.java
index 2f8deac..b542673 100644
--- a/sandbox/dropwizard/src/main/java/brooklyn/rest/commands/catalog/LoadClassCommand.java
+++ b/sandbox/dropwizard/src/main/java/brooklyn/rest/commands/catalog/LoadClassCommand.java
@@ -7,7 +7,7 @@
  * "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
+ *     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
@@ -15,7 +15,7 @@
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
  * under the License.
-*/
+ */
 package brooklyn.rest.commands.catalog;
 
 import brooklyn.rest.commands.BrooklynCommand;

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/9b49b760/sandbox/dropwizard/src/main/java/brooklyn/rest/commands/locations/AddLocationCommand.java
----------------------------------------------------------------------
diff --git a/sandbox/dropwizard/src/main/java/brooklyn/rest/commands/locations/AddLocationCommand.java b/sandbox/dropwizard/src/main/java/brooklyn/rest/commands/locations/AddLocationCommand.java
index f64431b..c1c17b6 100644
--- a/sandbox/dropwizard/src/main/java/brooklyn/rest/commands/locations/AddLocationCommand.java
+++ b/sandbox/dropwizard/src/main/java/brooklyn/rest/commands/locations/AddLocationCommand.java
@@ -7,7 +7,7 @@
  * "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
+ *     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
@@ -15,7 +15,7 @@
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
  * under the License.
-*/
+ */
 package brooklyn.rest.commands.locations;
 
 import brooklyn.rest.commands.BrooklynCommand;

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/9b49b760/sandbox/dropwizard/src/main/java/brooklyn/rest/commands/locations/ListLocationsCommand.java
----------------------------------------------------------------------
diff --git a/sandbox/dropwizard/src/main/java/brooklyn/rest/commands/locations/ListLocationsCommand.java b/sandbox/dropwizard/src/main/java/brooklyn/rest/commands/locations/ListLocationsCommand.java
index 2463f0b..f3ea9db 100644
--- a/sandbox/dropwizard/src/main/java/brooklyn/rest/commands/locations/ListLocationsCommand.java
+++ b/sandbox/dropwizard/src/main/java/brooklyn/rest/commands/locations/ListLocationsCommand.java
@@ -7,7 +7,7 @@
  * "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
+ *     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
@@ -15,7 +15,7 @@
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
  * under the License.
-*/
+ */
 package brooklyn.rest.commands.locations;
 
 import brooklyn.rest.commands.BrooklynCommand;

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/9b49b760/sandbox/dropwizard/src/main/java/brooklyn/rest/health/GeneralHealthCheck.java
----------------------------------------------------------------------
diff --git a/sandbox/dropwizard/src/main/java/brooklyn/rest/health/GeneralHealthCheck.java b/sandbox/dropwizard/src/main/java/brooklyn/rest/health/GeneralHealthCheck.java
index 6d22040..b190a16 100644
--- a/sandbox/dropwizard/src/main/java/brooklyn/rest/health/GeneralHealthCheck.java
+++ b/sandbox/dropwizard/src/main/java/brooklyn/rest/health/GeneralHealthCheck.java
@@ -7,7 +7,7 @@
  * "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
+ *     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
@@ -15,7 +15,7 @@
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
  * under the License.
-*/
+ */
 package brooklyn.rest.health;
 
 import com.yammer.metrics.core.HealthCheck;

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/9b49b760/sandbox/dropwizard/src/main/java/brooklyn/rest/views/SwaggerUiResource.java
----------------------------------------------------------------------
diff --git a/sandbox/dropwizard/src/main/java/brooklyn/rest/views/SwaggerUiResource.java b/sandbox/dropwizard/src/main/java/brooklyn/rest/views/SwaggerUiResource.java
index 332d220..8573853 100644
--- a/sandbox/dropwizard/src/main/java/brooklyn/rest/views/SwaggerUiResource.java
+++ b/sandbox/dropwizard/src/main/java/brooklyn/rest/views/SwaggerUiResource.java
@@ -7,7 +7,7 @@
  * "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
+ *     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
@@ -15,7 +15,7 @@
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
  * under the License.
-*/
+ */
 package brooklyn.rest.views;
 
 

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/9b49b760/sandbox/dropwizard/src/main/java/brooklyn/rest/views/SwaggerUiView.java
----------------------------------------------------------------------
diff --git a/sandbox/dropwizard/src/main/java/brooklyn/rest/views/SwaggerUiView.java b/sandbox/dropwizard/src/main/java/brooklyn/rest/views/SwaggerUiView.java
index 695b16c..72f95ae 100644
--- a/sandbox/dropwizard/src/main/java/brooklyn/rest/views/SwaggerUiView.java
+++ b/sandbox/dropwizard/src/main/java/brooklyn/rest/views/SwaggerUiView.java
@@ -7,7 +7,7 @@
  * "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
+ *     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
@@ -15,7 +15,7 @@
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
  * under the License.
-*/
+ */
 package brooklyn.rest.views;
 
 

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/9b49b760/sandbox/dropwizard/src/main/java/brooklyn/rest/views/WebClientResource.java
----------------------------------------------------------------------
diff --git a/sandbox/dropwizard/src/main/java/brooklyn/rest/views/WebClientResource.java b/sandbox/dropwizard/src/main/java/brooklyn/rest/views/WebClientResource.java
index 6d04205..92293ef 100644
--- a/sandbox/dropwizard/src/main/java/brooklyn/rest/views/WebClientResource.java
+++ b/sandbox/dropwizard/src/main/java/brooklyn/rest/views/WebClientResource.java
@@ -7,7 +7,7 @@
  * "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
+ *     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
@@ -15,7 +15,7 @@
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
  * under the License.
-*/
+ */
 package brooklyn.rest.views;
 
 import com.google.common.base.Charsets;

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/9b49b760/sandbox/dropwizard/src/main/java/com/yammer/dropwizard/logging/AsyncAppender.java
----------------------------------------------------------------------
diff --git a/sandbox/dropwizard/src/main/java/com/yammer/dropwizard/logging/AsyncAppender.java b/sandbox/dropwizard/src/main/java/com/yammer/dropwizard/logging/AsyncAppender.java
index 7378e01..bd345b2 100644
--- a/sandbox/dropwizard/src/main/java/com/yammer/dropwizard/logging/AsyncAppender.java
+++ b/sandbox/dropwizard/src/main/java/com/yammer/dropwizard/logging/AsyncAppender.java
@@ -7,7 +7,7 @@
  * "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
+ *     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
@@ -15,7 +15,7 @@
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
  * under the License.
-*/
+ */
 package com.yammer.dropwizard.logging;
 
 import ch.qos.logback.classic.spi.ILoggingEvent;

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/9b49b760/sandbox/dropwizard/src/test/java/brooklyn/cli/ClientNoAuthTest.java
----------------------------------------------------------------------
diff --git a/sandbox/dropwizard/src/test/java/brooklyn/cli/ClientNoAuthTest.java b/sandbox/dropwizard/src/test/java/brooklyn/cli/ClientNoAuthTest.java
index 8ada534..f069bc6 100644
--- a/sandbox/dropwizard/src/test/java/brooklyn/cli/ClientNoAuthTest.java
+++ b/sandbox/dropwizard/src/test/java/brooklyn/cli/ClientNoAuthTest.java
@@ -7,7 +7,7 @@
  * "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
+ *     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
@@ -15,7 +15,7 @@
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
  * under the License.
-*/
+ */
 package brooklyn.cli;
 
 import org.testng.annotations.AfterSuite;

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/9b49b760/sandbox/dropwizard/src/test/java/brooklyn/cli/ClientTest.java
----------------------------------------------------------------------
diff --git a/sandbox/dropwizard/src/test/java/brooklyn/cli/ClientTest.java b/sandbox/dropwizard/src/test/java/brooklyn/cli/ClientTest.java
index 6a28116..1069279 100644
--- a/sandbox/dropwizard/src/test/java/brooklyn/cli/ClientTest.java
+++ b/sandbox/dropwizard/src/test/java/brooklyn/cli/ClientTest.java
@@ -7,7 +7,7 @@
  * "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
+ *     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
@@ -15,7 +15,7 @@
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
  * under the License.
-*/
+ */
 package brooklyn.cli;
 
 import static org.hamcrest.MatcherAssert.assertThat;

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/9b49b760/sandbox/dropwizard/src/test/java/brooklyn/cli/ClientWithAuthTest.java
----------------------------------------------------------------------
diff --git a/sandbox/dropwizard/src/test/java/brooklyn/cli/ClientWithAuthTest.java b/sandbox/dropwizard/src/test/java/brooklyn/cli/ClientWithAuthTest.java
index 46dcafb..3c50e13 100644
--- a/sandbox/dropwizard/src/test/java/brooklyn/cli/ClientWithAuthTest.java
+++ b/sandbox/dropwizard/src/test/java/brooklyn/cli/ClientWithAuthTest.java
@@ -7,7 +7,7 @@
  * "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
+ *     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
@@ -15,7 +15,7 @@
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
  * under the License.
-*/
+ */
 package brooklyn.cli;
 
 import com.google.common.collect.Lists;

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/9b49b760/sandbox/dropwizard/src/test/java/brooklyn/cli/ExampleApp.java
----------------------------------------------------------------------
diff --git a/sandbox/dropwizard/src/test/java/brooklyn/cli/ExampleApp.java b/sandbox/dropwizard/src/test/java/brooklyn/cli/ExampleApp.java
index 0cff1d2..c0c11e8 100644
--- a/sandbox/dropwizard/src/test/java/brooklyn/cli/ExampleApp.java
+++ b/sandbox/dropwizard/src/test/java/brooklyn/cli/ExampleApp.java
@@ -7,7 +7,7 @@
  * "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
+ *     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
@@ -15,7 +15,7 @@
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
  * under the License.
-*/
+ */
 package brooklyn.cli;
 
 import brooklyn.entity.Entity;

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/9b49b760/sandbox/dropwizard/src/test/java/brooklyn/cli/commands/DeployCommandTest.java
----------------------------------------------------------------------
diff --git a/sandbox/dropwizard/src/test/java/brooklyn/cli/commands/DeployCommandTest.java b/sandbox/dropwizard/src/test/java/brooklyn/cli/commands/DeployCommandTest.java
index cf295c3..0f64d31 100644
--- a/sandbox/dropwizard/src/test/java/brooklyn/cli/commands/DeployCommandTest.java
+++ b/sandbox/dropwizard/src/test/java/brooklyn/cli/commands/DeployCommandTest.java
@@ -7,7 +7,7 @@
  * "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
+ *     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
@@ -15,7 +15,7 @@
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
  * under the License.
-*/
+ */
 package brooklyn.cli.commands;
 
 import static org.testng.Assert.assertEquals;

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/9b49b760/sandbox/dropwizard/src/test/java/brooklyn/rest/commands/ApplicationCommandsIntegrationTest.java
----------------------------------------------------------------------
diff --git a/sandbox/dropwizard/src/test/java/brooklyn/rest/commands/ApplicationCommandsIntegrationTest.java b/sandbox/dropwizard/src/test/java/brooklyn/rest/commands/ApplicationCommandsIntegrationTest.java
index 876a008..523b2c2 100644
--- a/sandbox/dropwizard/src/test/java/brooklyn/rest/commands/ApplicationCommandsIntegrationTest.java
+++ b/sandbox/dropwizard/src/test/java/brooklyn/rest/commands/ApplicationCommandsIntegrationTest.java
@@ -7,7 +7,7 @@
  * "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
+ *     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
@@ -15,7 +15,7 @@
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
  * under the License.
-*/
+ */
 package brooklyn.rest.commands;
 
 import static org.hamcrest.MatcherAssert.assertThat;

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/9b49b760/sandbox/dropwizard/src/test/java/brooklyn/rest/commands/ApplicationCommandsTest.java
----------------------------------------------------------------------
diff --git a/sandbox/dropwizard/src/test/java/brooklyn/rest/commands/ApplicationCommandsTest.java b/sandbox/dropwizard/src/test/java/brooklyn/rest/commands/ApplicationCommandsTest.java
index 753f963..0555388 100644
--- a/sandbox/dropwizard/src/test/java/brooklyn/rest/commands/ApplicationCommandsTest.java
+++ b/sandbox/dropwizard/src/test/java/brooklyn/rest/commands/ApplicationCommandsTest.java
@@ -7,7 +7,7 @@
  * "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
+ *     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
@@ -15,7 +15,7 @@
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
  * under the License.
-*/
+ */
 package brooklyn.rest.commands;
 
 import static org.hamcrest.MatcherAssert.assertThat;

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/9b49b760/sandbox/dropwizard/src/test/java/brooklyn/rest/commands/BrooklynCommandTest.java
----------------------------------------------------------------------
diff --git a/sandbox/dropwizard/src/test/java/brooklyn/rest/commands/BrooklynCommandTest.java b/sandbox/dropwizard/src/test/java/brooklyn/rest/commands/BrooklynCommandTest.java
index 83e0116..aa536a7 100644
--- a/sandbox/dropwizard/src/test/java/brooklyn/rest/commands/BrooklynCommandTest.java
+++ b/sandbox/dropwizard/src/test/java/brooklyn/rest/commands/BrooklynCommandTest.java
@@ -7,7 +7,7 @@
  * "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
+ *     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
@@ -15,7 +15,7 @@
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
  * under the License.
-*/
+ */
 package brooklyn.rest.commands;
 
 

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/9b49b760/sandbox/dropwizard/src/test/java/brooklyn/rest/commands/CatalogCommandsTest.java
----------------------------------------------------------------------
diff --git a/sandbox/dropwizard/src/test/java/brooklyn/rest/commands/CatalogCommandsTest.java b/sandbox/dropwizard/src/test/java/brooklyn/rest/commands/CatalogCommandsTest.java
index 3dc6c48..8950f79 100644
--- a/sandbox/dropwizard/src/test/java/brooklyn/rest/commands/CatalogCommandsTest.java
+++ b/sandbox/dropwizard/src/test/java/brooklyn/rest/commands/CatalogCommandsTest.java
@@ -7,7 +7,7 @@
  * "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
+ *     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
@@ -15,7 +15,7 @@
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
  * under the License.
-*/
+ */
 package brooklyn.rest.commands;
 
 import brooklyn.rest.commands.catalog.ListCatalogEntitiesCommand;

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/9b49b760/sandbox/dropwizard/src/test/java/brooklyn/rest/commands/LocationCommandsTest.java
----------------------------------------------------------------------
diff --git a/sandbox/dropwizard/src/test/java/brooklyn/rest/commands/LocationCommandsTest.java b/sandbox/dropwizard/src/test/java/brooklyn/rest/commands/LocationCommandsTest.java
index 4844318..cea239f 100644
--- a/sandbox/dropwizard/src/test/java/brooklyn/rest/commands/LocationCommandsTest.java
+++ b/sandbox/dropwizard/src/test/java/brooklyn/rest/commands/LocationCommandsTest.java
@@ -7,7 +7,7 @@
  * "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
+ *     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
@@ -15,7 +15,7 @@
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
  * under the License.
-*/
+ */
 package brooklyn.rest.commands;
 
 import static org.hamcrest.MatcherAssert.assertThat;

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/9b49b760/sandbox/dropwizard/src/test/java/brooklyn/rest/views/SwaggerUiViewTest.java
----------------------------------------------------------------------
diff --git a/sandbox/dropwizard/src/test/java/brooklyn/rest/views/SwaggerUiViewTest.java b/sandbox/dropwizard/src/test/java/brooklyn/rest/views/SwaggerUiViewTest.java
index 643bbaa..62396a9 100644
--- a/sandbox/dropwizard/src/test/java/brooklyn/rest/views/SwaggerUiViewTest.java
+++ b/sandbox/dropwizard/src/test/java/brooklyn/rest/views/SwaggerUiViewTest.java
@@ -7,7 +7,7 @@
  * "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
+ *     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
@@ -15,7 +15,7 @@
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
  * under the License.
-*/
+ */
 package brooklyn.rest.views;
 
 import static org.testng.Assert.assertEquals;

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/9b49b760/sandbox/examples/src/main/java/brooklyn/demo/todo/CustomLocationInfo.groovy
----------------------------------------------------------------------
diff --git a/sandbox/examples/src/main/java/brooklyn/demo/todo/CustomLocationInfo.groovy b/sandbox/examples/src/main/java/brooklyn/demo/todo/CustomLocationInfo.groovy
index ecbb2b1..697406e 100644
--- a/sandbox/examples/src/main/java/brooklyn/demo/todo/CustomLocationInfo.groovy
+++ b/sandbox/examples/src/main/java/brooklyn/demo/todo/CustomLocationInfo.groovy
@@ -7,7 +7,7 @@
  * "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
+ *     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
@@ -15,7 +15,7 @@
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
  * under the License.
-*/
+ */
 package brooklyn.demo.todo;
 
 import java.util.List;

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/9b49b760/sandbox/examples/src/main/java/brooklyn/demo/todo/GemfireExample.groovy
----------------------------------------------------------------------
diff --git a/sandbox/examples/src/main/java/brooklyn/demo/todo/GemfireExample.groovy b/sandbox/examples/src/main/java/brooklyn/demo/todo/GemfireExample.groovy
index 8d2ea68..7337801 100644
--- a/sandbox/examples/src/main/java/brooklyn/demo/todo/GemfireExample.groovy
+++ b/sandbox/examples/src/main/java/brooklyn/demo/todo/GemfireExample.groovy
@@ -7,7 +7,7 @@
  * "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
+ *     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
@@ -15,7 +15,7 @@
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
  * under the License.
-*/
+ */
 package brooklyn.demo.todo
 
 

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/9b49b760/sandbox/examples/src/main/java/brooklyn/demo/todo/PreBuiltImages.groovy
----------------------------------------------------------------------
diff --git a/sandbox/examples/src/main/java/brooklyn/demo/todo/PreBuiltImages.groovy b/sandbox/examples/src/main/java/brooklyn/demo/todo/PreBuiltImages.groovy
index d76a0f0..50d5b00 100644
--- a/sandbox/examples/src/main/java/brooklyn/demo/todo/PreBuiltImages.groovy
+++ b/sandbox/examples/src/main/java/brooklyn/demo/todo/PreBuiltImages.groovy
@@ -7,7 +7,7 @@
  * "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
+ *     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
@@ -15,7 +15,7 @@
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
  * under the License.
-*/
+ */
 package brooklyn.demo.todo;
 
 import java.util.Collection

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/9b49b760/sandbox/examples/src/main/java/brooklyn/demo/todo/WebAppFabricExample.groovy
----------------------------------------------------------------------
diff --git a/sandbox/examples/src/main/java/brooklyn/demo/todo/WebAppFabricExample.groovy b/sandbox/examples/src/main/java/brooklyn/demo/todo/WebAppFabricExample.groovy
index caa0202..15ec764 100644
--- a/sandbox/examples/src/main/java/brooklyn/demo/todo/WebAppFabricExample.groovy
+++ b/sandbox/examples/src/main/java/brooklyn/demo/todo/WebAppFabricExample.groovy
@@ -7,7 +7,7 @@
  * "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
+ *     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
@@ -15,7 +15,7 @@
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
  * under the License.
-*/
+ */
 package brooklyn.demo.todo
 
 import java.util.List

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/9b49b760/sandbox/examples/src/main/java/brooklyn/demo/todo/WebAppWideAreaExample.groovy
----------------------------------------------------------------------
diff --git a/sandbox/examples/src/main/java/brooklyn/demo/todo/WebAppWideAreaExample.groovy b/sandbox/examples/src/main/java/brooklyn/demo/todo/WebAppWideAreaExample.groovy
index baa68a4..f68d0d0 100644
--- a/sandbox/examples/src/main/java/brooklyn/demo/todo/WebAppWideAreaExample.groovy
+++ b/sandbox/examples/src/main/java/brooklyn/demo/todo/WebAppWideAreaExample.groovy
@@ -7,7 +7,7 @@
  * "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
+ *     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
@@ -15,7 +15,7 @@
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
  * under the License.
-*/
+ */
 package brooklyn.demo.todo
 
 import java.util.List

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/9b49b760/sandbox/examples/src/main/java/brooklyn/demo/tomcat/todo/TomcatClusterApp.groovy
----------------------------------------------------------------------
diff --git a/sandbox/examples/src/main/java/brooklyn/demo/tomcat/todo/TomcatClusterApp.groovy b/sandbox/examples/src/main/java/brooklyn/demo/tomcat/todo/TomcatClusterApp.groovy
index 3ce38fc..419fd9f 100644
--- a/sandbox/examples/src/main/java/brooklyn/demo/tomcat/todo/TomcatClusterApp.groovy
+++ b/sandbox/examples/src/main/java/brooklyn/demo/tomcat/todo/TomcatClusterApp.groovy
@@ -7,7 +7,7 @@
  * "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
+ *     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
@@ -15,7 +15,7 @@
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
  * under the License.
-*/
+ */
 package brooklyn.demo.tomcat.todo
 
 import brooklyn.config.BrooklynProperties;

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/9b49b760/sandbox/examples/src/main/java/brooklyn/demo/tomcat/todo/TomcatClusterWithNginxApp.groovy
----------------------------------------------------------------------
diff --git a/sandbox/examples/src/main/java/brooklyn/demo/tomcat/todo/TomcatClusterWithNginxApp.groovy b/sandbox/examples/src/main/java/brooklyn/demo/tomcat/todo/TomcatClusterWithNginxApp.groovy
index 405303d..25e9f93 100644
--- a/sandbox/examples/src/main/java/brooklyn/demo/tomcat/todo/TomcatClusterWithNginxApp.groovy
+++ b/sandbox/examples/src/main/java/brooklyn/demo/tomcat/todo/TomcatClusterWithNginxApp.groovy
@@ -7,7 +7,7 @@
  * "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
+ *     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
@@ -15,7 +15,7 @@
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
  * under the License.
-*/
+ */
 package brooklyn.demo.tomcat.todo
 
 import brooklyn.entity.basic.AbstractApplication

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/9b49b760/sandbox/examples/src/main/java/brooklyn/demo/tomcat/todo/TomcatFabricApp.groovy
----------------------------------------------------------------------
diff --git a/sandbox/examples/src/main/java/brooklyn/demo/tomcat/todo/TomcatFabricApp.groovy b/sandbox/examples/src/main/java/brooklyn/demo/tomcat/todo/TomcatFabricApp.groovy
index 7a46218..150f23a 100644
--- a/sandbox/examples/src/main/java/brooklyn/demo/tomcat/todo/TomcatFabricApp.groovy
+++ b/sandbox/examples/src/main/java/brooklyn/demo/tomcat/todo/TomcatFabricApp.groovy
@@ -7,7 +7,7 @@
  * "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
+ *     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
@@ -15,7 +15,7 @@
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
  * under the License.
-*/
+ */
 package brooklyn.demo.tomcat.todo
 
 import brooklyn.config.BrooklynProperties

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/9b49b760/sandbox/examples/src/main/java/brooklyn/demo/tomcat/todo/TomcatServerApp.groovy
----------------------------------------------------------------------
diff --git a/sandbox/examples/src/main/java/brooklyn/demo/tomcat/todo/TomcatServerApp.groovy b/sandbox/examples/src/main/java/brooklyn/demo/tomcat/todo/TomcatServerApp.groovy
index 92b75dd..5505a50 100644
--- a/sandbox/examples/src/main/java/brooklyn/demo/tomcat/todo/TomcatServerApp.groovy
+++ b/sandbox/examples/src/main/java/brooklyn/demo/tomcat/todo/TomcatServerApp.groovy
@@ -7,7 +7,7 @@
  * "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
+ *     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
@@ -15,7 +15,7 @@
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
  * under the License.
-*/
+ */
 package brooklyn.demo.tomcat.todo;
 
 import brooklyn.config.BrooklynProperties;

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/9b49b760/sandbox/examples/src/main/java/brooklyn/earlythoughts/BigAppBixby.groovy
----------------------------------------------------------------------
diff --git a/sandbox/examples/src/main/java/brooklyn/earlythoughts/BigAppBixby.groovy b/sandbox/examples/src/main/java/brooklyn/earlythoughts/BigAppBixby.groovy
index f79f990..48e7186 100644
--- a/sandbox/examples/src/main/java/brooklyn/earlythoughts/BigAppBixby.groovy
+++ b/sandbox/examples/src/main/java/brooklyn/earlythoughts/BigAppBixby.groovy
@@ -7,7 +7,7 @@
  * "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
+ *     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
@@ -15,7 +15,7 @@
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
  * under the License.
-*/
+ */
 package brooklyn.earlythoughts
 
 import brooklyn.entity.basic.AbstractApplication

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/9b49b760/sandbox/examples/src/main/java/brooklyn/earlythoughts/BigAppBrooklyn.groovy
----------------------------------------------------------------------
diff --git a/sandbox/examples/src/main/java/brooklyn/earlythoughts/BigAppBrooklyn.groovy b/sandbox/examples/src/main/java/brooklyn/earlythoughts/BigAppBrooklyn.groovy
index ca6e107..4a6ac74 100644
--- a/sandbox/examples/src/main/java/brooklyn/earlythoughts/BigAppBrooklyn.groovy
+++ b/sandbox/examples/src/main/java/brooklyn/earlythoughts/BigAppBrooklyn.groovy
@@ -7,7 +7,7 @@
  * "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
+ *     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
@@ -15,7 +15,7 @@
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
  * under the License.
-*/
+ */
 package brooklyn.earlythoughts
 
 import brooklyn.entity.basic.AbstractApplication

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/9b49b760/sandbox/examples/src/main/java/brooklyn/earlythoughts/PretendLocations.groovy
----------------------------------------------------------------------
diff --git a/sandbox/examples/src/main/java/brooklyn/earlythoughts/PretendLocations.groovy b/sandbox/examples/src/main/java/brooklyn/earlythoughts/PretendLocations.groovy
index 10d8fbe..f7bc4eb 100644
--- a/sandbox/examples/src/main/java/brooklyn/earlythoughts/PretendLocations.groovy
+++ b/sandbox/examples/src/main/java/brooklyn/earlythoughts/PretendLocations.groovy
@@ -7,7 +7,7 @@
  * "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
+ *     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
@@ -15,7 +15,7 @@
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
  * under the License.
-*/
+ */
 package brooklyn.earlythoughts;
 
 import java.util.Map

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/9b49b760/sandbox/extra/src/main/java/brooklyn/entity/database/postgresql/PostgreSqlNodeSaltImpl.java
----------------------------------------------------------------------
diff --git a/sandbox/extra/src/main/java/brooklyn/entity/database/postgresql/PostgreSqlNodeSaltImpl.java b/sandbox/extra/src/main/java/brooklyn/entity/database/postgresql/PostgreSqlNodeSaltImpl.java
index 994cc8d..af0845f 100644
--- a/sandbox/extra/src/main/java/brooklyn/entity/database/postgresql/PostgreSqlNodeSaltImpl.java
+++ b/sandbox/extra/src/main/java/brooklyn/entity/database/postgresql/PostgreSqlNodeSaltImpl.java
@@ -7,7 +7,7 @@
  * "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
+ *     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
@@ -15,7 +15,7 @@
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
  * under the License.
-*/
+ */
 package brooklyn.entity.database.postgresql;
 
 import org.slf4j.Logger;

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/9b49b760/sandbox/extra/src/main/java/brooklyn/entity/salt/SaltBashCommands.java
----------------------------------------------------------------------
diff --git a/sandbox/extra/src/main/java/brooklyn/entity/salt/SaltBashCommands.java b/sandbox/extra/src/main/java/brooklyn/entity/salt/SaltBashCommands.java
index c97ac44..70379f7 100644
--- a/sandbox/extra/src/main/java/brooklyn/entity/salt/SaltBashCommands.java
+++ b/sandbox/extra/src/main/java/brooklyn/entity/salt/SaltBashCommands.java
@@ -7,7 +7,7 @@
  * "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
+ *     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
@@ -15,7 +15,7 @@
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
  * under the License.
-*/
+ */
 package brooklyn.entity.salt;
 
 import static brooklyn.util.ssh.BashCommands.downloadToStdout;

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/9b49b760/sandbox/extra/src/main/java/brooklyn/entity/salt/SaltConfig.java
----------------------------------------------------------------------
diff --git a/sandbox/extra/src/main/java/brooklyn/entity/salt/SaltConfig.java b/sandbox/extra/src/main/java/brooklyn/entity/salt/SaltConfig.java
index d1cf0e9..b14ba98 100644
--- a/sandbox/extra/src/main/java/brooklyn/entity/salt/SaltConfig.java
+++ b/sandbox/extra/src/main/java/brooklyn/entity/salt/SaltConfig.java
@@ -7,7 +7,7 @@
  * "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
+ *     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
@@ -15,7 +15,7 @@
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
  * under the License.
-*/
+ */
 package brooklyn.entity.salt;
 
 import brooklyn.config.ConfigKey;

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/9b49b760/sandbox/extra/src/main/java/brooklyn/entity/salt/SaltConfigs.java
----------------------------------------------------------------------
diff --git a/sandbox/extra/src/main/java/brooklyn/entity/salt/SaltConfigs.java b/sandbox/extra/src/main/java/brooklyn/entity/salt/SaltConfigs.java
index cad0ecd..2de0e5d 100644
--- a/sandbox/extra/src/main/java/brooklyn/entity/salt/SaltConfigs.java
+++ b/sandbox/extra/src/main/java/brooklyn/entity/salt/SaltConfigs.java
@@ -7,7 +7,7 @@
  * "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
+ *     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
@@ -15,7 +15,7 @@
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
  * under the License.
-*/
+ */
 package brooklyn.entity.salt;
 
 import java.util.Map;

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/9b49b760/sandbox/extra/src/main/java/brooklyn/entity/salt/SaltLifecycleEffectorTasks.java
----------------------------------------------------------------------
diff --git a/sandbox/extra/src/main/java/brooklyn/entity/salt/SaltLifecycleEffectorTasks.java b/sandbox/extra/src/main/java/brooklyn/entity/salt/SaltLifecycleEffectorTasks.java
index 03597c5..82e1b17 100644
--- a/sandbox/extra/src/main/java/brooklyn/entity/salt/SaltLifecycleEffectorTasks.java
+++ b/sandbox/extra/src/main/java/brooklyn/entity/salt/SaltLifecycleEffectorTasks.java
@@ -7,7 +7,7 @@
  * "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
+ *     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
@@ -15,7 +15,7 @@
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
  * under the License.
-*/
+ */
 package brooklyn.entity.salt;
 
 import org.slf4j.Logger;

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/9b49b760/sandbox/extra/src/main/java/brooklyn/entity/salt/SaltStackMaster.java
----------------------------------------------------------------------
diff --git a/sandbox/extra/src/main/java/brooklyn/entity/salt/SaltStackMaster.java b/sandbox/extra/src/main/java/brooklyn/entity/salt/SaltStackMaster.java
index ecb2408..5af9622 100644
--- a/sandbox/extra/src/main/java/brooklyn/entity/salt/SaltStackMaster.java
+++ b/sandbox/extra/src/main/java/brooklyn/entity/salt/SaltStackMaster.java
@@ -7,7 +7,7 @@
  * "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
+ *     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
@@ -15,7 +15,7 @@
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
  * under the License.
-*/
+ */
 package brooklyn.entity.salt;
 
 import java.util.List;

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/9b49b760/sandbox/extra/src/main/java/brooklyn/entity/salt/SaltStackMasterDriver.java
----------------------------------------------------------------------
diff --git a/sandbox/extra/src/main/java/brooklyn/entity/salt/SaltStackMasterDriver.java b/sandbox/extra/src/main/java/brooklyn/entity/salt/SaltStackMasterDriver.java
index b543333..55d46da 100644
--- a/sandbox/extra/src/main/java/brooklyn/entity/salt/SaltStackMasterDriver.java
+++ b/sandbox/extra/src/main/java/brooklyn/entity/salt/SaltStackMasterDriver.java
@@ -7,7 +7,7 @@
  * "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
+ *     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
@@ -15,7 +15,7 @@
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
  * under the License.
-*/
+ */
 package brooklyn.entity.salt;
 
 import brooklyn.entity.basic.SoftwareProcessDriver;

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/9b49b760/sandbox/extra/src/main/java/brooklyn/entity/salt/SaltStackMasterImpl.java
----------------------------------------------------------------------
diff --git a/sandbox/extra/src/main/java/brooklyn/entity/salt/SaltStackMasterImpl.java b/sandbox/extra/src/main/java/brooklyn/entity/salt/SaltStackMasterImpl.java
index 4cc5ba8..2a6815c 100644
--- a/sandbox/extra/src/main/java/brooklyn/entity/salt/SaltStackMasterImpl.java
+++ b/sandbox/extra/src/main/java/brooklyn/entity/salt/SaltStackMasterImpl.java
@@ -7,7 +7,7 @@
  * "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
+ *     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
@@ -15,7 +15,7 @@
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
  * under the License.
-*/
+ */
 package brooklyn.entity.salt;
 
 import org.slf4j.Logger;

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/9b49b760/sandbox/extra/src/main/java/brooklyn/entity/salt/SaltStackMasterSshDriver.java
----------------------------------------------------------------------
diff --git a/sandbox/extra/src/main/java/brooklyn/entity/salt/SaltStackMasterSshDriver.java b/sandbox/extra/src/main/java/brooklyn/entity/salt/SaltStackMasterSshDriver.java
index 1a2aa09..8a326e7 100644
--- a/sandbox/extra/src/main/java/brooklyn/entity/salt/SaltStackMasterSshDriver.java
+++ b/sandbox/extra/src/main/java/brooklyn/entity/salt/SaltStackMasterSshDriver.java
@@ -7,7 +7,7 @@
  * "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
+ *     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
@@ -15,7 +15,7 @@
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
  * under the License.
-*/
+ */
 package brooklyn.entity.salt;
 
 import brooklyn.entity.basic.Entities;

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/9b49b760/sandbox/extra/src/main/java/brooklyn/entity/salt/SaltTasks.java
----------------------------------------------------------------------
diff --git a/sandbox/extra/src/main/java/brooklyn/entity/salt/SaltTasks.java b/sandbox/extra/src/main/java/brooklyn/entity/salt/SaltTasks.java
index 7af43da..5b4c4ee 100644
--- a/sandbox/extra/src/main/java/brooklyn/entity/salt/SaltTasks.java
+++ b/sandbox/extra/src/main/java/brooklyn/entity/salt/SaltTasks.java
@@ -7,7 +7,7 @@
  * "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
+ *     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
@@ -15,7 +15,7 @@
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
  * under the License.
-*/
+ */
 package brooklyn.entity.salt;
 
 import static brooklyn.util.ssh.BashCommands.INSTALL_CURL;

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/9b49b760/sandbox/extra/src/test/java/brooklyn/entity/database/postgresql/PostgreSqlSaltLiveTest.java
----------------------------------------------------------------------
diff --git a/sandbox/extra/src/test/java/brooklyn/entity/database/postgresql/PostgreSqlSaltLiveTest.java b/sandbox/extra/src/test/java/brooklyn/entity/database/postgresql/PostgreSqlSaltLiveTest.java
index 81cb676..a44efa9 100644
--- a/sandbox/extra/src/test/java/brooklyn/entity/database/postgresql/PostgreSqlSaltLiveTest.java
+++ b/sandbox/extra/src/test/java/brooklyn/entity/database/postgresql/PostgreSqlSaltLiveTest.java
@@ -7,7 +7,7 @@
  * "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
+ *     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
@@ -15,7 +15,7 @@
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
  * under the License.
-*/
+ */
 package brooklyn.entity.database.postgresql;
 
 import java.util.Random;

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/9b49b760/sandbox/extra/src/test/java/brooklyn/entity/salt/SaltConfigsTest.java
----------------------------------------------------------------------
diff --git a/sandbox/extra/src/test/java/brooklyn/entity/salt/SaltConfigsTest.java b/sandbox/extra/src/test/java/brooklyn/entity/salt/SaltConfigsTest.java
index 1bf89f1..6706748 100644
--- a/sandbox/extra/src/test/java/brooklyn/entity/salt/SaltConfigsTest.java
+++ b/sandbox/extra/src/test/java/brooklyn/entity/salt/SaltConfigsTest.java
@@ -7,7 +7,7 @@
  * "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
+ *     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
@@ -15,7 +15,7 @@
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
  * under the License.
-*/
+ */
 package brooklyn.entity.salt;
 
 import java.util.Map;

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/9b49b760/sandbox/extra/src/test/java/brooklyn/entity/salt/SaltLiveTestSupport.java
----------------------------------------------------------------------
diff --git a/sandbox/extra/src/test/java/brooklyn/entity/salt/SaltLiveTestSupport.java b/sandbox/extra/src/test/java/brooklyn/entity/salt/SaltLiveTestSupport.java
index 25bdad9..6cb7409 100644
--- a/sandbox/extra/src/test/java/brooklyn/entity/salt/SaltLiveTestSupport.java
+++ b/sandbox/extra/src/test/java/brooklyn/entity/salt/SaltLiveTestSupport.java
@@ -7,7 +7,7 @@
  * "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
+ *     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
@@ -15,7 +15,7 @@
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
  * under the License.
-*/
+ */
 package brooklyn.entity.salt;
 
 import org.slf4j.Logger;

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/9b49b760/sandbox/monitoring/src/main/java/brooklyn/entity/monitoring/zabbix/ZabbixFeed.java
----------------------------------------------------------------------
diff --git a/sandbox/monitoring/src/main/java/brooklyn/entity/monitoring/zabbix/ZabbixFeed.java b/sandbox/monitoring/src/main/java/brooklyn/entity/monitoring/zabbix/ZabbixFeed.java
index fd0c170..f50db7d 100644
--- a/sandbox/monitoring/src/main/java/brooklyn/entity/monitoring/zabbix/ZabbixFeed.java
+++ b/sandbox/monitoring/src/main/java/brooklyn/entity/monitoring/zabbix/ZabbixFeed.java
@@ -7,7 +7,7 @@
  * "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
+ *     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
@@ -15,7 +15,7 @@
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
  * under the License.
-*/
+ */
 package brooklyn.entity.monitoring.zabbix;
 
 import static com.google.common.base.Preconditions.checkNotNull;

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/9b49b760/sandbox/monitoring/src/main/java/brooklyn/entity/monitoring/zabbix/ZabbixMonitored.java
----------------------------------------------------------------------
diff --git a/sandbox/monitoring/src/main/java/brooklyn/entity/monitoring/zabbix/ZabbixMonitored.java b/sandbox/monitoring/src/main/java/brooklyn/entity/monitoring/zabbix/ZabbixMonitored.java
index 187ff6d..fbaab5d 100644
--- a/sandbox/monitoring/src/main/java/brooklyn/entity/monitoring/zabbix/ZabbixMonitored.java
+++ b/sandbox/monitoring/src/main/java/brooklyn/entity/monitoring/zabbix/ZabbixMonitored.java
@@ -7,7 +7,7 @@
  * "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
+ *     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
@@ -15,7 +15,7 @@
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
  * under the License.
-*/
+ */
 package brooklyn.entity.monitoring.zabbix;
 
 import brooklyn.config.ConfigKey;

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/9b49b760/sandbox/monitoring/src/main/java/brooklyn/entity/monitoring/zabbix/ZabbixPollConfig.java
----------------------------------------------------------------------
diff --git a/sandbox/monitoring/src/main/java/brooklyn/entity/monitoring/zabbix/ZabbixPollConfig.java b/sandbox/monitoring/src/main/java/brooklyn/entity/monitoring/zabbix/ZabbixPollConfig.java
index 1e89727..dc31698 100644
--- a/sandbox/monitoring/src/main/java/brooklyn/entity/monitoring/zabbix/ZabbixPollConfig.java
+++ b/sandbox/monitoring/src/main/java/brooklyn/entity/monitoring/zabbix/ZabbixPollConfig.java
@@ -7,7 +7,7 @@
  * "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
+ *     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
@@ -15,7 +15,7 @@
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
  * under the License.
-*/
+ */
 package brooklyn.entity.monitoring.zabbix;
 
 import javax.annotation.Nullable;

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/9b49b760/sandbox/monitoring/src/main/java/brooklyn/entity/monitoring/zabbix/ZabbixServer.java
----------------------------------------------------------------------
diff --git a/sandbox/monitoring/src/main/java/brooklyn/entity/monitoring/zabbix/ZabbixServer.java b/sandbox/monitoring/src/main/java/brooklyn/entity/monitoring/zabbix/ZabbixServer.java
index 4813ad1..b5987c5 100644
--- a/sandbox/monitoring/src/main/java/brooklyn/entity/monitoring/zabbix/ZabbixServer.java
+++ b/sandbox/monitoring/src/main/java/brooklyn/entity/monitoring/zabbix/ZabbixServer.java
@@ -7,7 +7,7 @@
  * "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
+ *     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
@@ -15,7 +15,7 @@
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
  * under the License.
-*/
+ */
 package brooklyn.entity.monitoring.zabbix;
 
 import brooklyn.config.ConfigKey;

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/9b49b760/sandbox/monitoring/src/main/java/brooklyn/entity/monitoring/zabbix/ZabbixServerImpl.java
----------------------------------------------------------------------
diff --git a/sandbox/monitoring/src/main/java/brooklyn/entity/monitoring/zabbix/ZabbixServerImpl.java b/sandbox/monitoring/src/main/java/brooklyn/entity/monitoring/zabbix/ZabbixServerImpl.java
index 3ed4bc1..43d5f64 100644
--- a/sandbox/monitoring/src/main/java/brooklyn/entity/monitoring/zabbix/ZabbixServerImpl.java
+++ b/sandbox/monitoring/src/main/java/brooklyn/entity/monitoring/zabbix/ZabbixServerImpl.java
@@ -7,7 +7,7 @@
  * "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
+ *     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
@@ -15,7 +15,7 @@
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
  * under the License.
-*/
+ */
 package brooklyn.entity.monitoring.zabbix;
 
 import java.util.List;

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/9b49b760/sandbox/nosql/src/main/java/brooklyn/entity/nosql/infinispan/Infinispan5Driver.java
----------------------------------------------------------------------
diff --git a/sandbox/nosql/src/main/java/brooklyn/entity/nosql/infinispan/Infinispan5Driver.java b/sandbox/nosql/src/main/java/brooklyn/entity/nosql/infinispan/Infinispan5Driver.java
index 7af0dba..ebd5fb8 100644
--- a/sandbox/nosql/src/main/java/brooklyn/entity/nosql/infinispan/Infinispan5Driver.java
+++ b/sandbox/nosql/src/main/java/brooklyn/entity/nosql/infinispan/Infinispan5Driver.java
@@ -7,7 +7,7 @@
  * "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
+ *     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
@@ -15,7 +15,7 @@
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
  * under the License.
-*/
+ */
 package brooklyn.entity.nosql.infinispan;
 
 public interface Infinispan5Driver {

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/9b49b760/sandbox/nosql/src/main/java/brooklyn/entity/nosql/infinispan/Infinispan5Server.java
----------------------------------------------------------------------
diff --git a/sandbox/nosql/src/main/java/brooklyn/entity/nosql/infinispan/Infinispan5Server.java b/sandbox/nosql/src/main/java/brooklyn/entity/nosql/infinispan/Infinispan5Server.java
index b0658f1..eaaee45 100644
--- a/sandbox/nosql/src/main/java/brooklyn/entity/nosql/infinispan/Infinispan5Server.java
+++ b/sandbox/nosql/src/main/java/brooklyn/entity/nosql/infinispan/Infinispan5Server.java
@@ -7,7 +7,7 @@
  * "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
+ *     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
@@ -15,7 +15,7 @@
  * KIND, either express or implied.  See the License for the
  * specific language governing permissions and limitations
  * under the License.
-*/
+ */
 package brooklyn.entity.nosql.infinispan;
 
 import java.util.Map;