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:06:57 UTC

[47/75] Fix Java and Groovy licensing

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/9b49b760/usage/rest-server/src/test/java/brooklyn/rest/testing/mocks/CapitalizePolicy.java
----------------------------------------------------------------------
diff --git a/usage/rest-server/src/test/java/brooklyn/rest/testing/mocks/CapitalizePolicy.java b/usage/rest-server/src/test/java/brooklyn/rest/testing/mocks/CapitalizePolicy.java
index 61e876d..ceefc6a 100644
--- a/usage/rest-server/src/test/java/brooklyn/rest/testing/mocks/CapitalizePolicy.java
+++ b/usage/rest-server/src/test/java/brooklyn/rest/testing/mocks/CapitalizePolicy.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.testing.mocks;
 
 import brooklyn.entity.basic.EntityLocal;

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/9b49b760/usage/rest-server/src/test/java/brooklyn/rest/testing/mocks/EverythingGroup.java
----------------------------------------------------------------------
diff --git a/usage/rest-server/src/test/java/brooklyn/rest/testing/mocks/EverythingGroup.java b/usage/rest-server/src/test/java/brooklyn/rest/testing/mocks/EverythingGroup.java
index 49ee6a1..70ba657 100644
--- a/usage/rest-server/src/test/java/brooklyn/rest/testing/mocks/EverythingGroup.java
+++ b/usage/rest-server/src/test/java/brooklyn/rest/testing/mocks/EverythingGroup.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.testing.mocks;
 
 import brooklyn.entity.Group;

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/9b49b760/usage/rest-server/src/test/java/brooklyn/rest/testing/mocks/EverythingGroupImpl.java
----------------------------------------------------------------------
diff --git a/usage/rest-server/src/test/java/brooklyn/rest/testing/mocks/EverythingGroupImpl.java b/usage/rest-server/src/test/java/brooklyn/rest/testing/mocks/EverythingGroupImpl.java
index 46e24fa..8f66682 100644
--- a/usage/rest-server/src/test/java/brooklyn/rest/testing/mocks/EverythingGroupImpl.java
+++ b/usage/rest-server/src/test/java/brooklyn/rest/testing/mocks/EverythingGroupImpl.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.testing.mocks;
 
 import brooklyn.entity.basic.DynamicGroupImpl;

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/9b49b760/usage/rest-server/src/test/java/brooklyn/rest/testing/mocks/RestMockApp.java
----------------------------------------------------------------------
diff --git a/usage/rest-server/src/test/java/brooklyn/rest/testing/mocks/RestMockApp.java b/usage/rest-server/src/test/java/brooklyn/rest/testing/mocks/RestMockApp.java
index a88abe3..97915c9 100644
--- a/usage/rest-server/src/test/java/brooklyn/rest/testing/mocks/RestMockApp.java
+++ b/usage/rest-server/src/test/java/brooklyn/rest/testing/mocks/RestMockApp.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.testing.mocks;
 
 import brooklyn.entity.basic.AbstractApplication;

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/9b49b760/usage/rest-server/src/test/java/brooklyn/rest/testing/mocks/RestMockAppBuilder.java
----------------------------------------------------------------------
diff --git a/usage/rest-server/src/test/java/brooklyn/rest/testing/mocks/RestMockAppBuilder.java b/usage/rest-server/src/test/java/brooklyn/rest/testing/mocks/RestMockAppBuilder.java
index c2b4431..82d1ab7 100644
--- a/usage/rest-server/src/test/java/brooklyn/rest/testing/mocks/RestMockAppBuilder.java
+++ b/usage/rest-server/src/test/java/brooklyn/rest/testing/mocks/RestMockAppBuilder.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.testing.mocks;
 
 import brooklyn.entity.Entity;

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/9b49b760/usage/rest-server/src/test/java/brooklyn/rest/testing/mocks/RestMockSimpleEntity.java
----------------------------------------------------------------------
diff --git a/usage/rest-server/src/test/java/brooklyn/rest/testing/mocks/RestMockSimpleEntity.java b/usage/rest-server/src/test/java/brooklyn/rest/testing/mocks/RestMockSimpleEntity.java
index 2d9eedd..10ee1cc 100644
--- a/usage/rest-server/src/test/java/brooklyn/rest/testing/mocks/RestMockSimpleEntity.java
+++ b/usage/rest-server/src/test/java/brooklyn/rest/testing/mocks/RestMockSimpleEntity.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.testing.mocks;
 
 import java.util.Map;

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/9b49b760/usage/rest-server/src/test/java/brooklyn/rest/testing/mocks/RestMockSimplePolicy.java
----------------------------------------------------------------------
diff --git a/usage/rest-server/src/test/java/brooklyn/rest/testing/mocks/RestMockSimplePolicy.java b/usage/rest-server/src/test/java/brooklyn/rest/testing/mocks/RestMockSimplePolicy.java
index 2ced196..785e1db 100644
--- a/usage/rest-server/src/test/java/brooklyn/rest/testing/mocks/RestMockSimplePolicy.java
+++ b/usage/rest-server/src/test/java/brooklyn/rest/testing/mocks/RestMockSimplePolicy.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.testing.mocks;
 
 import java.util.Map;

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/9b49b760/usage/rest-server/src/test/java/brooklyn/rest/util/BrooklynRestResourceUtilsTest.java
----------------------------------------------------------------------
diff --git a/usage/rest-server/src/test/java/brooklyn/rest/util/BrooklynRestResourceUtilsTest.java b/usage/rest-server/src/test/java/brooklyn/rest/util/BrooklynRestResourceUtilsTest.java
index 87eeb9a..2ba7483 100644
--- a/usage/rest-server/src/test/java/brooklyn/rest/util/BrooklynRestResourceUtilsTest.java
+++ b/usage/rest-server/src/test/java/brooklyn/rest/util/BrooklynRestResourceUtilsTest.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.util;
 
 import static org.testng.Assert.assertEquals;

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/9b49b760/usage/rest-server/src/test/java/brooklyn/rest/util/EntityLocationUtilsTest.java
----------------------------------------------------------------------
diff --git a/usage/rest-server/src/test/java/brooklyn/rest/util/EntityLocationUtilsTest.java b/usage/rest-server/src/test/java/brooklyn/rest/util/EntityLocationUtilsTest.java
index d1700a1..10d1a99 100644
--- a/usage/rest-server/src/test/java/brooklyn/rest/util/EntityLocationUtilsTest.java
+++ b/usage/rest-server/src/test/java/brooklyn/rest/util/EntityLocationUtilsTest.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.util;
 
 import static org.testng.Assert.assertEquals;

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/9b49b760/usage/rest-server/src/test/java/brooklyn/rest/util/NullHttpServletRequestProvider.java
----------------------------------------------------------------------
diff --git a/usage/rest-server/src/test/java/brooklyn/rest/util/NullHttpServletRequestProvider.java b/usage/rest-server/src/test/java/brooklyn/rest/util/NullHttpServletRequestProvider.java
index 6ab1fbc..2d6c77b 100644
--- a/usage/rest-server/src/test/java/brooklyn/rest/util/NullHttpServletRequestProvider.java
+++ b/usage/rest-server/src/test/java/brooklyn/rest/util/NullHttpServletRequestProvider.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.util;
 
 import java.lang.reflect.Type;

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/9b49b760/usage/rest-server/src/test/java/brooklyn/rest/util/NullServletConfigProvider.java
----------------------------------------------------------------------
diff --git a/usage/rest-server/src/test/java/brooklyn/rest/util/NullServletConfigProvider.java b/usage/rest-server/src/test/java/brooklyn/rest/util/NullServletConfigProvider.java
index fb4e9c8..cf5759d 100644
--- a/usage/rest-server/src/test/java/brooklyn/rest/util/NullServletConfigProvider.java
+++ b/usage/rest-server/src/test/java/brooklyn/rest/util/NullServletConfigProvider.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.util;
 
 import java.lang.reflect.Type;

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/9b49b760/usage/test-support/src/main/java/brooklyn/test/EntityTestUtils.java
----------------------------------------------------------------------
diff --git a/usage/test-support/src/main/java/brooklyn/test/EntityTestUtils.java b/usage/test-support/src/main/java/brooklyn/test/EntityTestUtils.java
index e2dc102..75dd2d7 100644
--- a/usage/test-support/src/main/java/brooklyn/test/EntityTestUtils.java
+++ b/usage/test-support/src/main/java/brooklyn/test/EntityTestUtils.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.test;
 
 import static org.testng.Assert.assertEquals;

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/9b49b760/usage/test-support/src/main/java/brooklyn/test/HttpTestUtils.java
----------------------------------------------------------------------
diff --git a/usage/test-support/src/main/java/brooklyn/test/HttpTestUtils.java b/usage/test-support/src/main/java/brooklyn/test/HttpTestUtils.java
index c5179ec..097b16e 100644
--- a/usage/test-support/src/main/java/brooklyn/test/HttpTestUtils.java
+++ b/usage/test-support/src/main/java/brooklyn/test/HttpTestUtils.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.test;
 
 import static com.google.common.base.Predicates.instanceOf;

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/9b49b760/usage/test-support/src/main/java/brooklyn/test/TestUtils.groovy
----------------------------------------------------------------------
diff --git a/usage/test-support/src/main/java/brooklyn/test/TestUtils.groovy b/usage/test-support/src/main/java/brooklyn/test/TestUtils.groovy
index 8c1f85c..e163fad 100644
--- a/usage/test-support/src/main/java/brooklyn/test/TestUtils.groovy
+++ b/usage/test-support/src/main/java/brooklyn/test/TestUtils.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.test
 
 import static org.testng.Assert.*

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/9b49b760/usage/test-support/src/main/java/brooklyn/test/TrustingSslSocketFactory.java
----------------------------------------------------------------------
diff --git a/usage/test-support/src/main/java/brooklyn/test/TrustingSslSocketFactory.java b/usage/test-support/src/main/java/brooklyn/test/TrustingSslSocketFactory.java
index ec6d0e3..3cbd94a 100644
--- a/usage/test-support/src/main/java/brooklyn/test/TrustingSslSocketFactory.java
+++ b/usage/test-support/src/main/java/brooklyn/test/TrustingSslSocketFactory.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.test;
 
 import java.io.IOException;

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/9b49b760/usage/test-support/src/main/java/brooklyn/test/WebAppMonitor.java
----------------------------------------------------------------------
diff --git a/usage/test-support/src/main/java/brooklyn/test/WebAppMonitor.java b/usage/test-support/src/main/java/brooklyn/test/WebAppMonitor.java
index 2ee8d7d..a784367 100644
--- a/usage/test-support/src/main/java/brooklyn/test/WebAppMonitor.java
+++ b/usage/test-support/src/main/java/brooklyn/test/WebAppMonitor.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.test;
 
 import java.util.concurrent.atomic.AtomicBoolean;

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/9b49b760/utils/common/src/main/java/brooklyn/config/ConfigKey.java
----------------------------------------------------------------------
diff --git a/utils/common/src/main/java/brooklyn/config/ConfigKey.java b/utils/common/src/main/java/brooklyn/config/ConfigKey.java
index 24bcae1..60bbd2a 100644
--- a/utils/common/src/main/java/brooklyn/config/ConfigKey.java
+++ b/utils/common/src/main/java/brooklyn/config/ConfigKey.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.config;
 
 import java.util.Collection;

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/9b49b760/utils/common/src/main/java/brooklyn/config/ConfigMap.java
----------------------------------------------------------------------
diff --git a/utils/common/src/main/java/brooklyn/config/ConfigMap.java b/utils/common/src/main/java/brooklyn/config/ConfigMap.java
index ed7fe3b..c223b6e 100644
--- a/utils/common/src/main/java/brooklyn/config/ConfigMap.java
+++ b/utils/common/src/main/java/brooklyn/config/ConfigMap.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.config;
 
 import java.util.Map;

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/9b49b760/utils/common/src/main/java/brooklyn/config/StringConfigMap.java
----------------------------------------------------------------------
diff --git a/utils/common/src/main/java/brooklyn/config/StringConfigMap.java b/utils/common/src/main/java/brooklyn/config/StringConfigMap.java
index 44911b1..d292d1a 100644
--- a/utils/common/src/main/java/brooklyn/config/StringConfigMap.java
+++ b/utils/common/src/main/java/brooklyn/config/StringConfigMap.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.config;
 
 import java.util.Map;

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/9b49b760/utils/common/src/main/java/brooklyn/test/Asserts.java
----------------------------------------------------------------------
diff --git a/utils/common/src/main/java/brooklyn/test/Asserts.java b/utils/common/src/main/java/brooklyn/test/Asserts.java
index b56b627..68a414f 100644
--- a/utils/common/src/main/java/brooklyn/test/Asserts.java
+++ b/utils/common/src/main/java/brooklyn/test/Asserts.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.test;
 
 import groovy.lang.Closure;

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/9b49b760/utils/common/src/main/java/brooklyn/util/CommandLineUtil.java
----------------------------------------------------------------------
diff --git a/utils/common/src/main/java/brooklyn/util/CommandLineUtil.java b/utils/common/src/main/java/brooklyn/util/CommandLineUtil.java
index a49f028..6ccdc2f 100644
--- a/utils/common/src/main/java/brooklyn/util/CommandLineUtil.java
+++ b/utils/common/src/main/java/brooklyn/util/CommandLineUtil.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.util;
 
 import java.util.List;

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/9b49b760/utils/common/src/main/java/brooklyn/util/JavaGroovyEquivalents.java
----------------------------------------------------------------------
diff --git a/utils/common/src/main/java/brooklyn/util/JavaGroovyEquivalents.java b/utils/common/src/main/java/brooklyn/util/JavaGroovyEquivalents.java
index 7adbb01..293cd7b 100644
--- a/utils/common/src/main/java/brooklyn/util/JavaGroovyEquivalents.java
+++ b/utils/common/src/main/java/brooklyn/util/JavaGroovyEquivalents.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.util;
 
 import groovy.lang.Closure;

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/9b49b760/utils/common/src/main/java/brooklyn/util/ShellUtils.java
----------------------------------------------------------------------
diff --git a/utils/common/src/main/java/brooklyn/util/ShellUtils.java b/utils/common/src/main/java/brooklyn/util/ShellUtils.java
index be95fe1..2c53f93 100644
--- a/utils/common/src/main/java/brooklyn/util/ShellUtils.java
+++ b/utils/common/src/main/java/brooklyn/util/ShellUtils.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.util;
 
 import groovy.io.GroovyPrintStream;

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/9b49b760/utils/common/src/main/java/brooklyn/util/collections/CollectionFunctionals.java
----------------------------------------------------------------------
diff --git a/utils/common/src/main/java/brooklyn/util/collections/CollectionFunctionals.java b/utils/common/src/main/java/brooklyn/util/collections/CollectionFunctionals.java
index f86faaf..1e7ffb5 100644
--- a/utils/common/src/main/java/brooklyn/util/collections/CollectionFunctionals.java
+++ b/utils/common/src/main/java/brooklyn/util/collections/CollectionFunctionals.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.util.collections;
 
 import java.util.Arrays;

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/9b49b760/utils/common/src/main/java/brooklyn/util/collections/Jsonya.java
----------------------------------------------------------------------
diff --git a/utils/common/src/main/java/brooklyn/util/collections/Jsonya.java b/utils/common/src/main/java/brooklyn/util/collections/Jsonya.java
index f4e289f..2060dac 100644
--- a/utils/common/src/main/java/brooklyn/util/collections/Jsonya.java
+++ b/utils/common/src/main/java/brooklyn/util/collections/Jsonya.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.util.collections;
 
 import java.util.ArrayList;

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/9b49b760/utils/common/src/main/java/brooklyn/util/collections/MutableList.java
----------------------------------------------------------------------
diff --git a/utils/common/src/main/java/brooklyn/util/collections/MutableList.java b/utils/common/src/main/java/brooklyn/util/collections/MutableList.java
index f6cf755..2c00243 100644
--- a/utils/common/src/main/java/brooklyn/util/collections/MutableList.java
+++ b/utils/common/src/main/java/brooklyn/util/collections/MutableList.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.util.collections;
 
 import java.util.ArrayList;

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/9b49b760/utils/common/src/main/java/brooklyn/util/collections/MutableMap.java
----------------------------------------------------------------------
diff --git a/utils/common/src/main/java/brooklyn/util/collections/MutableMap.java b/utils/common/src/main/java/brooklyn/util/collections/MutableMap.java
index d4fb944..f38ba19 100644
--- a/utils/common/src/main/java/brooklyn/util/collections/MutableMap.java
+++ b/utils/common/src/main/java/brooklyn/util/collections/MutableMap.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.util.collections;
 
 import java.util.Iterator;

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/9b49b760/utils/common/src/main/java/brooklyn/util/collections/MutableSet.java
----------------------------------------------------------------------
diff --git a/utils/common/src/main/java/brooklyn/util/collections/MutableSet.java b/utils/common/src/main/java/brooklyn/util/collections/MutableSet.java
index 3c35449..cee4176 100644
--- a/utils/common/src/main/java/brooklyn/util/collections/MutableSet.java
+++ b/utils/common/src/main/java/brooklyn/util/collections/MutableSet.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.util.collections;
 
 import java.util.Collection;

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/9b49b760/utils/common/src/main/java/brooklyn/util/collections/SetFromLiveMap.java
----------------------------------------------------------------------
diff --git a/utils/common/src/main/java/brooklyn/util/collections/SetFromLiveMap.java b/utils/common/src/main/java/brooklyn/util/collections/SetFromLiveMap.java
index e55d525..e6adf5d 100644
--- a/utils/common/src/main/java/brooklyn/util/collections/SetFromLiveMap.java
+++ b/utils/common/src/main/java/brooklyn/util/collections/SetFromLiveMap.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.util.collections;
 
 import java.io.IOException;

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/9b49b760/utils/common/src/main/java/brooklyn/util/collections/TimeWindowedList.java
----------------------------------------------------------------------
diff --git a/utils/common/src/main/java/brooklyn/util/collections/TimeWindowedList.java b/utils/common/src/main/java/brooklyn/util/collections/TimeWindowedList.java
index f32d1b4..598abf7 100644
--- a/utils/common/src/main/java/brooklyn/util/collections/TimeWindowedList.java
+++ b/utils/common/src/main/java/brooklyn/util/collections/TimeWindowedList.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.util.collections;
 
 import java.util.LinkedList;

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/9b49b760/utils/common/src/main/java/brooklyn/util/collections/TimestampedValue.java
----------------------------------------------------------------------
diff --git a/utils/common/src/main/java/brooklyn/util/collections/TimestampedValue.java b/utils/common/src/main/java/brooklyn/util/collections/TimestampedValue.java
index ad09e15..ea19d5f 100644
--- a/utils/common/src/main/java/brooklyn/util/collections/TimestampedValue.java
+++ b/utils/common/src/main/java/brooklyn/util/collections/TimestampedValue.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.util.collections;
 
 import com.google.common.base.Objects;

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/9b49b760/utils/common/src/main/java/brooklyn/util/crypto/SslTrustUtils.java
----------------------------------------------------------------------
diff --git a/utils/common/src/main/java/brooklyn/util/crypto/SslTrustUtils.java b/utils/common/src/main/java/brooklyn/util/crypto/SslTrustUtils.java
index 8a71e2f..b054452 100644
--- a/utils/common/src/main/java/brooklyn/util/crypto/SslTrustUtils.java
+++ b/utils/common/src/main/java/brooklyn/util/crypto/SslTrustUtils.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.util.crypto;
 
 import java.net.URLConnection;

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/9b49b760/utils/common/src/main/java/brooklyn/util/crypto/TrustingSslSocketFactory.java
----------------------------------------------------------------------
diff --git a/utils/common/src/main/java/brooklyn/util/crypto/TrustingSslSocketFactory.java b/utils/common/src/main/java/brooklyn/util/crypto/TrustingSslSocketFactory.java
index a16fd39..8789ac4 100644
--- a/utils/common/src/main/java/brooklyn/util/crypto/TrustingSslSocketFactory.java
+++ b/utils/common/src/main/java/brooklyn/util/crypto/TrustingSslSocketFactory.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.util.crypto;
 
 import java.io.IOException;

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/9b49b760/utils/common/src/main/java/brooklyn/util/exceptions/CompoundRuntimeException.java
----------------------------------------------------------------------
diff --git a/utils/common/src/main/java/brooklyn/util/exceptions/CompoundRuntimeException.java b/utils/common/src/main/java/brooklyn/util/exceptions/CompoundRuntimeException.java
index 3db4b5a..42bd7d7 100644
--- a/utils/common/src/main/java/brooklyn/util/exceptions/CompoundRuntimeException.java
+++ b/utils/common/src/main/java/brooklyn/util/exceptions/CompoundRuntimeException.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.util.exceptions;
 
 import java.util.Collections;

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/9b49b760/utils/common/src/main/java/brooklyn/util/exceptions/Exceptions.java
----------------------------------------------------------------------
diff --git a/utils/common/src/main/java/brooklyn/util/exceptions/Exceptions.java b/utils/common/src/main/java/brooklyn/util/exceptions/Exceptions.java
index 2a8a02e..9a33566 100644
--- a/utils/common/src/main/java/brooklyn/util/exceptions/Exceptions.java
+++ b/utils/common/src/main/java/brooklyn/util/exceptions/Exceptions.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.util.exceptions;
 
 import static com.google.common.base.Preconditions.checkNotNull;

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/9b49b760/utils/common/src/main/java/brooklyn/util/exceptions/FatalConfigurationRuntimeException.java
----------------------------------------------------------------------
diff --git a/utils/common/src/main/java/brooklyn/util/exceptions/FatalConfigurationRuntimeException.java b/utils/common/src/main/java/brooklyn/util/exceptions/FatalConfigurationRuntimeException.java
index 74e7ced..6905fc6 100644
--- a/utils/common/src/main/java/brooklyn/util/exceptions/FatalConfigurationRuntimeException.java
+++ b/utils/common/src/main/java/brooklyn/util/exceptions/FatalConfigurationRuntimeException.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.util.exceptions;
 
 /** As {@link FatalRuntimeException} super, specialized for configuration errors. */

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/9b49b760/utils/common/src/main/java/brooklyn/util/exceptions/FatalRuntimeException.java
----------------------------------------------------------------------
diff --git a/utils/common/src/main/java/brooklyn/util/exceptions/FatalRuntimeException.java b/utils/common/src/main/java/brooklyn/util/exceptions/FatalRuntimeException.java
index 833edcb..28f7828 100644
--- a/utils/common/src/main/java/brooklyn/util/exceptions/FatalRuntimeException.java
+++ b/utils/common/src/main/java/brooklyn/util/exceptions/FatalRuntimeException.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.util.exceptions;
 
 /** Exception indicating a fatal error, typically used in CLI routines.

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/9b49b760/utils/common/src/main/java/brooklyn/util/exceptions/PropagatedRuntimeException.java
----------------------------------------------------------------------
diff --git a/utils/common/src/main/java/brooklyn/util/exceptions/PropagatedRuntimeException.java b/utils/common/src/main/java/brooklyn/util/exceptions/PropagatedRuntimeException.java
index 6d53606..8327d21 100644
--- a/utils/common/src/main/java/brooklyn/util/exceptions/PropagatedRuntimeException.java
+++ b/utils/common/src/main/java/brooklyn/util/exceptions/PropagatedRuntimeException.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.util.exceptions;
 
 /** Indicates a runtime exception which has been propagated via {@link Exceptions#propagate} */

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/9b49b760/utils/common/src/main/java/brooklyn/util/exceptions/RuntimeInterruptedException.java
----------------------------------------------------------------------
diff --git a/utils/common/src/main/java/brooklyn/util/exceptions/RuntimeInterruptedException.java b/utils/common/src/main/java/brooklyn/util/exceptions/RuntimeInterruptedException.java
index 180f985..d9dae6b 100644
--- a/utils/common/src/main/java/brooklyn/util/exceptions/RuntimeInterruptedException.java
+++ b/utils/common/src/main/java/brooklyn/util/exceptions/RuntimeInterruptedException.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.util.exceptions;
 
 /**

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/9b49b760/utils/common/src/main/java/brooklyn/util/git/GithubUrls.java
----------------------------------------------------------------------
diff --git a/utils/common/src/main/java/brooklyn/util/git/GithubUrls.java b/utils/common/src/main/java/brooklyn/util/git/GithubUrls.java
index 71c7ff3..d38b66d 100644
--- a/utils/common/src/main/java/brooklyn/util/git/GithubUrls.java
+++ b/utils/common/src/main/java/brooklyn/util/git/GithubUrls.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.util.git;
 
 import brooklyn.util.net.Urls;

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/9b49b760/utils/common/src/main/java/brooklyn/util/guava/Functionals.java
----------------------------------------------------------------------
diff --git a/utils/common/src/main/java/brooklyn/util/guava/Functionals.java b/utils/common/src/main/java/brooklyn/util/guava/Functionals.java
index cccaf0c..6eb65e5 100644
--- a/utils/common/src/main/java/brooklyn/util/guava/Functionals.java
+++ b/utils/common/src/main/java/brooklyn/util/guava/Functionals.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.util.guava;
 
 import com.google.common.base.Function;

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/9b49b760/utils/common/src/main/java/brooklyn/util/guava/KeyTransformingLoadingCache.java
----------------------------------------------------------------------
diff --git a/utils/common/src/main/java/brooklyn/util/guava/KeyTransformingLoadingCache.java b/utils/common/src/main/java/brooklyn/util/guava/KeyTransformingLoadingCache.java
index 8bb5d44..73ab2f5 100644
--- a/utils/common/src/main/java/brooklyn/util/guava/KeyTransformingLoadingCache.java
+++ b/utils/common/src/main/java/brooklyn/util/guava/KeyTransformingLoadingCache.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.util.guava;
 
 import java.util.concurrent.Callable;

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/9b49b760/utils/common/src/main/java/brooklyn/util/guava/Maybe.java
----------------------------------------------------------------------
diff --git a/utils/common/src/main/java/brooklyn/util/guava/Maybe.java b/utils/common/src/main/java/brooklyn/util/guava/Maybe.java
index 0989b18..9a3ebdb 100644
--- a/utils/common/src/main/java/brooklyn/util/guava/Maybe.java
+++ b/utils/common/src/main/java/brooklyn/util/guava/Maybe.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.util.guava;
 
 import java.io.Serializable;

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/9b49b760/utils/common/src/main/java/brooklyn/util/guava/MaybeFunctions.java
----------------------------------------------------------------------
diff --git a/utils/common/src/main/java/brooklyn/util/guava/MaybeFunctions.java b/utils/common/src/main/java/brooklyn/util/guava/MaybeFunctions.java
index e91268d..2955785 100644
--- a/utils/common/src/main/java/brooklyn/util/guava/MaybeFunctions.java
+++ b/utils/common/src/main/java/brooklyn/util/guava/MaybeFunctions.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.util.guava;
 
 import com.google.common.base.Function;

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/9b49b760/utils/common/src/main/java/brooklyn/util/guava/SerializablePredicate.java
----------------------------------------------------------------------
diff --git a/utils/common/src/main/java/brooklyn/util/guava/SerializablePredicate.java b/utils/common/src/main/java/brooklyn/util/guava/SerializablePredicate.java
index df00ea7..e090320 100644
--- a/utils/common/src/main/java/brooklyn/util/guava/SerializablePredicate.java
+++ b/utils/common/src/main/java/brooklyn/util/guava/SerializablePredicate.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.util.guava;
 
 import java.io.Serializable;

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/9b49b760/utils/common/src/main/java/brooklyn/util/guava/TypeTokens.java
----------------------------------------------------------------------
diff --git a/utils/common/src/main/java/brooklyn/util/guava/TypeTokens.java b/utils/common/src/main/java/brooklyn/util/guava/TypeTokens.java
index 3fc5cb1..ca69a97 100644
--- a/utils/common/src/main/java/brooklyn/util/guava/TypeTokens.java
+++ b/utils/common/src/main/java/brooklyn/util/guava/TypeTokens.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.util.guava;
 
 import javax.annotation.Nullable;

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/9b49b760/utils/common/src/main/java/brooklyn/util/internal/BasicDelegatingSystemProperty.java
----------------------------------------------------------------------
diff --git a/utils/common/src/main/java/brooklyn/util/internal/BasicDelegatingSystemProperty.java b/utils/common/src/main/java/brooklyn/util/internal/BasicDelegatingSystemProperty.java
index da07fe9..a1c766b 100644
--- a/utils/common/src/main/java/brooklyn/util/internal/BasicDelegatingSystemProperty.java
+++ b/utils/common/src/main/java/brooklyn/util/internal/BasicDelegatingSystemProperty.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.util.internal;
 
 public class BasicDelegatingSystemProperty {

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/9b49b760/utils/common/src/main/java/brooklyn/util/internal/BooleanSystemProperty.java
----------------------------------------------------------------------
diff --git a/utils/common/src/main/java/brooklyn/util/internal/BooleanSystemProperty.java b/utils/common/src/main/java/brooklyn/util/internal/BooleanSystemProperty.java
index 314161b..66b119d 100644
--- a/utils/common/src/main/java/brooklyn/util/internal/BooleanSystemProperty.java
+++ b/utils/common/src/main/java/brooklyn/util/internal/BooleanSystemProperty.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.util.internal;
 
 public class BooleanSystemProperty extends BasicDelegatingSystemProperty {

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/9b49b760/utils/common/src/main/java/brooklyn/util/internal/BrooklynSystemProperties.java
----------------------------------------------------------------------
diff --git a/utils/common/src/main/java/brooklyn/util/internal/BrooklynSystemProperties.java b/utils/common/src/main/java/brooklyn/util/internal/BrooklynSystemProperties.java
index d7312ab..9737d48 100644
--- a/utils/common/src/main/java/brooklyn/util/internal/BrooklynSystemProperties.java
+++ b/utils/common/src/main/java/brooklyn/util/internal/BrooklynSystemProperties.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.util.internal;
 
 /** 

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/9b49b760/utils/common/src/main/java/brooklyn/util/internal/DoubleSystemProperty.java
----------------------------------------------------------------------
diff --git a/utils/common/src/main/java/brooklyn/util/internal/DoubleSystemProperty.java b/utils/common/src/main/java/brooklyn/util/internal/DoubleSystemProperty.java
index 76fbd3e..6003148 100644
--- a/utils/common/src/main/java/brooklyn/util/internal/DoubleSystemProperty.java
+++ b/utils/common/src/main/java/brooklyn/util/internal/DoubleSystemProperty.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.util.internal;
 
 public class DoubleSystemProperty extends BasicDelegatingSystemProperty {

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/9b49b760/utils/common/src/main/java/brooklyn/util/internal/IntegerSystemProperty.java
----------------------------------------------------------------------
diff --git a/utils/common/src/main/java/brooklyn/util/internal/IntegerSystemProperty.java b/utils/common/src/main/java/brooklyn/util/internal/IntegerSystemProperty.java
index 811a48f..9150725 100644
--- a/utils/common/src/main/java/brooklyn/util/internal/IntegerSystemProperty.java
+++ b/utils/common/src/main/java/brooklyn/util/internal/IntegerSystemProperty.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.util.internal;
 
 public class IntegerSystemProperty extends BasicDelegatingSystemProperty {

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/9b49b760/utils/common/src/main/java/brooklyn/util/internal/StringSystemProperty.java
----------------------------------------------------------------------
diff --git a/utils/common/src/main/java/brooklyn/util/internal/StringSystemProperty.java b/utils/common/src/main/java/brooklyn/util/internal/StringSystemProperty.java
index fe65e37..b635202 100644
--- a/utils/common/src/main/java/brooklyn/util/internal/StringSystemProperty.java
+++ b/utils/common/src/main/java/brooklyn/util/internal/StringSystemProperty.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.util.internal;
 
 public class StringSystemProperty {

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/9b49b760/utils/common/src/main/java/brooklyn/util/javalang/AggregateClassLoader.java
----------------------------------------------------------------------
diff --git a/utils/common/src/main/java/brooklyn/util/javalang/AggregateClassLoader.java b/utils/common/src/main/java/brooklyn/util/javalang/AggregateClassLoader.java
index c85b2e2..d8d004c 100644
--- a/utils/common/src/main/java/brooklyn/util/javalang/AggregateClassLoader.java
+++ b/utils/common/src/main/java/brooklyn/util/javalang/AggregateClassLoader.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.util.javalang;
 
 import java.net.URL;

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/9b49b760/utils/common/src/main/java/brooklyn/util/javalang/AtomicReferences.java
----------------------------------------------------------------------
diff --git a/utils/common/src/main/java/brooklyn/util/javalang/AtomicReferences.java b/utils/common/src/main/java/brooklyn/util/javalang/AtomicReferences.java
index 4f59e62..baac3a8 100644
--- a/utils/common/src/main/java/brooklyn/util/javalang/AtomicReferences.java
+++ b/utils/common/src/main/java/brooklyn/util/javalang/AtomicReferences.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.util.javalang;
 
 import java.util.concurrent.atomic.AtomicBoolean;

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/9b49b760/utils/common/src/main/java/brooklyn/util/javalang/Boxing.java
----------------------------------------------------------------------
diff --git a/utils/common/src/main/java/brooklyn/util/javalang/Boxing.java b/utils/common/src/main/java/brooklyn/util/javalang/Boxing.java
index 8e309e1..296291e 100644
--- a/utils/common/src/main/java/brooklyn/util/javalang/Boxing.java
+++ b/utils/common/src/main/java/brooklyn/util/javalang/Boxing.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.util.javalang;
 
 import java.lang.reflect.Array;

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/9b49b760/utils/common/src/main/java/brooklyn/util/javalang/Enums.java
----------------------------------------------------------------------
diff --git a/utils/common/src/main/java/brooklyn/util/javalang/Enums.java b/utils/common/src/main/java/brooklyn/util/javalang/Enums.java
index eb56883..9b18bbe 100644
--- a/utils/common/src/main/java/brooklyn/util/javalang/Enums.java
+++ b/utils/common/src/main/java/brooklyn/util/javalang/Enums.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.util.javalang;
 
 import java.util.Arrays;

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/9b49b760/utils/common/src/main/java/brooklyn/util/javalang/JavaClassNames.java
----------------------------------------------------------------------
diff --git a/utils/common/src/main/java/brooklyn/util/javalang/JavaClassNames.java b/utils/common/src/main/java/brooklyn/util/javalang/JavaClassNames.java
index da82bec..1de2c46 100644
--- a/utils/common/src/main/java/brooklyn/util/javalang/JavaClassNames.java
+++ b/utils/common/src/main/java/brooklyn/util/javalang/JavaClassNames.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.util.javalang;
 
 import brooklyn.util.net.Urls;

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/9b49b760/utils/common/src/main/java/brooklyn/util/javalang/LoadedClassLoader.java
----------------------------------------------------------------------
diff --git a/utils/common/src/main/java/brooklyn/util/javalang/LoadedClassLoader.java b/utils/common/src/main/java/brooklyn/util/javalang/LoadedClassLoader.java
index 6205aca..cef27ab 100644
--- a/utils/common/src/main/java/brooklyn/util/javalang/LoadedClassLoader.java
+++ b/utils/common/src/main/java/brooklyn/util/javalang/LoadedClassLoader.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.util.javalang;
 
 import java.util.LinkedHashMap;

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/9b49b760/utils/common/src/main/java/brooklyn/util/javalang/Reflections.java
----------------------------------------------------------------------
diff --git a/utils/common/src/main/java/brooklyn/util/javalang/Reflections.java b/utils/common/src/main/java/brooklyn/util/javalang/Reflections.java
index abf2dd0..9ea35ce 100644
--- a/utils/common/src/main/java/brooklyn/util/javalang/Reflections.java
+++ b/utils/common/src/main/java/brooklyn/util/javalang/Reflections.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.util.javalang;
 
 import static com.google.common.base.Preconditions.checkNotNull;

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/9b49b760/utils/common/src/main/java/brooklyn/util/javalang/Serializers.java
----------------------------------------------------------------------
diff --git a/utils/common/src/main/java/brooklyn/util/javalang/Serializers.java b/utils/common/src/main/java/brooklyn/util/javalang/Serializers.java
index 829943b..b16229f 100644
--- a/utils/common/src/main/java/brooklyn/util/javalang/Serializers.java
+++ b/utils/common/src/main/java/brooklyn/util/javalang/Serializers.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.util.javalang;
 
 import java.io.ByteArrayInputStream;

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/9b49b760/utils/common/src/main/java/brooklyn/util/javalang/StackTraceSimplifier.java
----------------------------------------------------------------------
diff --git a/utils/common/src/main/java/brooklyn/util/javalang/StackTraceSimplifier.java b/utils/common/src/main/java/brooklyn/util/javalang/StackTraceSimplifier.java
index cb22590..2247136 100644
--- a/utils/common/src/main/java/brooklyn/util/javalang/StackTraceSimplifier.java
+++ b/utils/common/src/main/java/brooklyn/util/javalang/StackTraceSimplifier.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.util.javalang;
 
 import java.io.PrintWriter;

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/9b49b760/utils/common/src/main/java/brooklyn/util/javalang/Threads.java
----------------------------------------------------------------------
diff --git a/utils/common/src/main/java/brooklyn/util/javalang/Threads.java b/utils/common/src/main/java/brooklyn/util/javalang/Threads.java
index 95a2f40..1760ae2 100644
--- a/utils/common/src/main/java/brooklyn/util/javalang/Threads.java
+++ b/utils/common/src/main/java/brooklyn/util/javalang/Threads.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.util.javalang;
 
 import org.slf4j.Logger;

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/9b49b760/utils/common/src/main/java/brooklyn/util/logging/LoggingSetup.java
----------------------------------------------------------------------
diff --git a/utils/common/src/main/java/brooklyn/util/logging/LoggingSetup.java b/utils/common/src/main/java/brooklyn/util/logging/LoggingSetup.java
index 5b16d8f..ba89426 100644
--- a/utils/common/src/main/java/brooklyn/util/logging/LoggingSetup.java
+++ b/utils/common/src/main/java/brooklyn/util/logging/LoggingSetup.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.util.logging;
 
 import org.slf4j.bridge.SLF4JBridgeHandler;

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/9b49b760/utils/common/src/main/java/brooklyn/util/logging/SimpleOneLineLogFormatter.java
----------------------------------------------------------------------
diff --git a/utils/common/src/main/java/brooklyn/util/logging/SimpleOneLineLogFormatter.java b/utils/common/src/main/java/brooklyn/util/logging/SimpleOneLineLogFormatter.java
index 893c585..fd24fb7 100644
--- a/utils/common/src/main/java/brooklyn/util/logging/SimpleOneLineLogFormatter.java
+++ b/utils/common/src/main/java/brooklyn/util/logging/SimpleOneLineLogFormatter.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.util.logging;
 
 import java.io.PrintWriter;

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/9b49b760/utils/common/src/main/java/brooklyn/util/math/BitList.java
----------------------------------------------------------------------
diff --git a/utils/common/src/main/java/brooklyn/util/math/BitList.java b/utils/common/src/main/java/brooklyn/util/math/BitList.java
index 75b8731..f145352 100644
--- a/utils/common/src/main/java/brooklyn/util/math/BitList.java
+++ b/utils/common/src/main/java/brooklyn/util/math/BitList.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.util.math;
 
 import java.math.BigInteger;

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/9b49b760/utils/common/src/main/java/brooklyn/util/math/BitUtils.java
----------------------------------------------------------------------
diff --git a/utils/common/src/main/java/brooklyn/util/math/BitUtils.java b/utils/common/src/main/java/brooklyn/util/math/BitUtils.java
index 33960f9..fd3159a 100644
--- a/utils/common/src/main/java/brooklyn/util/math/BitUtils.java
+++ b/utils/common/src/main/java/brooklyn/util/math/BitUtils.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.util.math;
 
 public class BitUtils {

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/9b49b760/utils/common/src/main/java/brooklyn/util/math/MathFunctions.java
----------------------------------------------------------------------
diff --git a/utils/common/src/main/java/brooklyn/util/math/MathFunctions.java b/utils/common/src/main/java/brooklyn/util/math/MathFunctions.java
index 8d010c3..8c35d21 100644
--- a/utils/common/src/main/java/brooklyn/util/math/MathFunctions.java
+++ b/utils/common/src/main/java/brooklyn/util/math/MathFunctions.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.util.math;
 
 import javax.annotation.Nullable;

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/9b49b760/utils/common/src/main/java/brooklyn/util/maven/MavenArtifact.java
----------------------------------------------------------------------
diff --git a/utils/common/src/main/java/brooklyn/util/maven/MavenArtifact.java b/utils/common/src/main/java/brooklyn/util/maven/MavenArtifact.java
index 05d71c5..5e847e5 100644
--- a/utils/common/src/main/java/brooklyn/util/maven/MavenArtifact.java
+++ b/utils/common/src/main/java/brooklyn/util/maven/MavenArtifact.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.util.maven;
 
 import static com.google.common.base.Preconditions.checkNotNull;

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/9b49b760/utils/common/src/main/java/brooklyn/util/maven/MavenRetriever.java
----------------------------------------------------------------------
diff --git a/utils/common/src/main/java/brooklyn/util/maven/MavenRetriever.java b/utils/common/src/main/java/brooklyn/util/maven/MavenRetriever.java
index a362f59..5092285 100644
--- a/utils/common/src/main/java/brooklyn/util/maven/MavenRetriever.java
+++ b/utils/common/src/main/java/brooklyn/util/maven/MavenRetriever.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.util.maven;
 
 import java.io.File;

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/9b49b760/utils/common/src/main/java/brooklyn/util/net/Cidr.java
----------------------------------------------------------------------
diff --git a/utils/common/src/main/java/brooklyn/util/net/Cidr.java b/utils/common/src/main/java/brooklyn/util/net/Cidr.java
index db16da9..aa57d8f 100644
--- a/utils/common/src/main/java/brooklyn/util/net/Cidr.java
+++ b/utils/common/src/main/java/brooklyn/util/net/Cidr.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.util.net;
 
 

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/9b49b760/utils/common/src/main/java/brooklyn/util/net/NetworkMultiAddressUtils.java
----------------------------------------------------------------------
diff --git a/utils/common/src/main/java/brooklyn/util/net/NetworkMultiAddressUtils.java b/utils/common/src/main/java/brooklyn/util/net/NetworkMultiAddressUtils.java
index f0124b2..e1635f2 100644
--- a/utils/common/src/main/java/brooklyn/util/net/NetworkMultiAddressUtils.java
+++ b/utils/common/src/main/java/brooklyn/util/net/NetworkMultiAddressUtils.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.util.net;
 
 import java.util.Collection;

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/9b49b760/utils/common/src/main/java/brooklyn/util/net/Networking.java
----------------------------------------------------------------------
diff --git a/utils/common/src/main/java/brooklyn/util/net/Networking.java b/utils/common/src/main/java/brooklyn/util/net/Networking.java
index 173d399..dde2678 100644
--- a/utils/common/src/main/java/brooklyn/util/net/Networking.java
+++ b/utils/common/src/main/java/brooklyn/util/net/Networking.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.util.net;
 
 import java.io.IOException;

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/9b49b760/utils/common/src/main/java/brooklyn/util/net/Protocol.java
----------------------------------------------------------------------
diff --git a/utils/common/src/main/java/brooklyn/util/net/Protocol.java b/utils/common/src/main/java/brooklyn/util/net/Protocol.java
index 88b42ca..a91b1a3 100644
--- a/utils/common/src/main/java/brooklyn/util/net/Protocol.java
+++ b/utils/common/src/main/java/brooklyn/util/net/Protocol.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.util.net;
 
 public enum Protocol {

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/9b49b760/utils/common/src/main/java/brooklyn/util/net/URLParamEncoder.java
----------------------------------------------------------------------
diff --git a/utils/common/src/main/java/brooklyn/util/net/URLParamEncoder.java b/utils/common/src/main/java/brooklyn/util/net/URLParamEncoder.java
index 1c94290..4ff3620 100644
--- a/utils/common/src/main/java/brooklyn/util/net/URLParamEncoder.java
+++ b/utils/common/src/main/java/brooklyn/util/net/URLParamEncoder.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.util.net;
 
 /**

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/9b49b760/utils/common/src/main/java/brooklyn/util/net/Urls.java
----------------------------------------------------------------------
diff --git a/utils/common/src/main/java/brooklyn/util/net/Urls.java b/utils/common/src/main/java/brooklyn/util/net/Urls.java
index d5846c4..ea11095 100644
--- a/utils/common/src/main/java/brooklyn/util/net/Urls.java
+++ b/utils/common/src/main/java/brooklyn/util/net/Urls.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.util.net;
 
 import java.io.File;

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/9b49b760/utils/common/src/main/java/brooklyn/util/net/UserAndHostAndPort.java
----------------------------------------------------------------------
diff --git a/utils/common/src/main/java/brooklyn/util/net/UserAndHostAndPort.java b/utils/common/src/main/java/brooklyn/util/net/UserAndHostAndPort.java
index 04b614b..49780b4 100644
--- a/utils/common/src/main/java/brooklyn/util/net/UserAndHostAndPort.java
+++ b/utils/common/src/main/java/brooklyn/util/net/UserAndHostAndPort.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.util.net;
 
 import java.io.Serializable;