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:56 UTC

[46/75] Fix Java and Groovy licensing

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

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/9b49b760/utils/common/src/main/java/brooklyn/util/pool/BasicPool.java
----------------------------------------------------------------------
diff --git a/utils/common/src/main/java/brooklyn/util/pool/BasicPool.java b/utils/common/src/main/java/brooklyn/util/pool/BasicPool.java
index 8c3d72f..47acd90 100644
--- a/utils/common/src/main/java/brooklyn/util/pool/BasicPool.java
+++ b/utils/common/src/main/java/brooklyn/util/pool/BasicPool.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.pool;
 
 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/pool/Lease.java
----------------------------------------------------------------------
diff --git a/utils/common/src/main/java/brooklyn/util/pool/Lease.java b/utils/common/src/main/java/brooklyn/util/pool/Lease.java
index b6e1382..72bc422 100644
--- a/utils/common/src/main/java/brooklyn/util/pool/Lease.java
+++ b/utils/common/src/main/java/brooklyn/util/pool/Lease.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.pool;
 
 import java.io.Closeable;

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/9b49b760/utils/common/src/main/java/brooklyn/util/pool/Pool.java
----------------------------------------------------------------------
diff --git a/utils/common/src/main/java/brooklyn/util/pool/Pool.java b/utils/common/src/main/java/brooklyn/util/pool/Pool.java
index eec3281..a5ef584 100644
--- a/utils/common/src/main/java/brooklyn/util/pool/Pool.java
+++ b/utils/common/src/main/java/brooklyn/util/pool/Pool.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.pool;
 
 import java.io.Closeable;

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/9b49b760/utils/common/src/main/java/brooklyn/util/repeat/Repeater.java
----------------------------------------------------------------------
diff --git a/utils/common/src/main/java/brooklyn/util/repeat/Repeater.java b/utils/common/src/main/java/brooklyn/util/repeat/Repeater.java
index 01947fe..71ca099 100644
--- a/utils/common/src/main/java/brooklyn/util/repeat/Repeater.java
+++ b/utils/common/src/main/java/brooklyn/util/repeat/Repeater.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.repeat;
 
 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/ssh/BashCommands.java
----------------------------------------------------------------------
diff --git a/utils/common/src/main/java/brooklyn/util/ssh/BashCommands.java b/utils/common/src/main/java/brooklyn/util/ssh/BashCommands.java
index 7c9858d..448e678 100644
--- a/utils/common/src/main/java/brooklyn/util/ssh/BashCommands.java
+++ b/utils/common/src/main/java/brooklyn/util/ssh/BashCommands.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.ssh;
 
 import static java.lang.String.format;

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/9b49b760/utils/common/src/main/java/brooklyn/util/ssh/IptablesCommands.java
----------------------------------------------------------------------
diff --git a/utils/common/src/main/java/brooklyn/util/ssh/IptablesCommands.java b/utils/common/src/main/java/brooklyn/util/ssh/IptablesCommands.java
index 9c68fd8..b698486 100644
--- a/utils/common/src/main/java/brooklyn/util/ssh/IptablesCommands.java
+++ b/utils/common/src/main/java/brooklyn/util/ssh/IptablesCommands.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.ssh;
 
 import static brooklyn.util.ssh.BashCommands.sudo;

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

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/9b49b760/utils/common/src/main/java/brooklyn/util/stream/IllegalOutputStream.java
----------------------------------------------------------------------
diff --git a/utils/common/src/main/java/brooklyn/util/stream/IllegalOutputStream.java b/utils/common/src/main/java/brooklyn/util/stream/IllegalOutputStream.java
index 8b405b2..827090a 100644
--- a/utils/common/src/main/java/brooklyn/util/stream/IllegalOutputStream.java
+++ b/utils/common/src/main/java/brooklyn/util/stream/IllegalOutputStream.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.stream;
 
 import java.io.OutputStream;

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

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/9b49b760/utils/common/src/main/java/brooklyn/util/stream/KnownSizeInputStream.java
----------------------------------------------------------------------
diff --git a/utils/common/src/main/java/brooklyn/util/stream/KnownSizeInputStream.java b/utils/common/src/main/java/brooklyn/util/stream/KnownSizeInputStream.java
index 6fe71f5..8919af2 100644
--- a/utils/common/src/main/java/brooklyn/util/stream/KnownSizeInputStream.java
+++ b/utils/common/src/main/java/brooklyn/util/stream/KnownSizeInputStream.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.stream;
 
 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/stream/ReaderInputStream.java
----------------------------------------------------------------------
diff --git a/utils/common/src/main/java/brooklyn/util/stream/ReaderInputStream.java b/utils/common/src/main/java/brooklyn/util/stream/ReaderInputStream.java
index 8dea262..a3d5fab 100644
--- a/utils/common/src/main/java/brooklyn/util/stream/ReaderInputStream.java
+++ b/utils/common/src/main/java/brooklyn/util/stream/ReaderInputStream.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.stream;
 
 import java.io.IOException;

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/9b49b760/utils/common/src/main/java/brooklyn/util/stream/StreamGobbler.java
----------------------------------------------------------------------
diff --git a/utils/common/src/main/java/brooklyn/util/stream/StreamGobbler.java b/utils/common/src/main/java/brooklyn/util/stream/StreamGobbler.java
index 504f84c..68c3056 100644
--- a/utils/common/src/main/java/brooklyn/util/stream/StreamGobbler.java
+++ b/utils/common/src/main/java/brooklyn/util/stream/StreamGobbler.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.stream;
 
 import java.io.Closeable;

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/9b49b760/utils/common/src/main/java/brooklyn/util/stream/Streams.java
----------------------------------------------------------------------
diff --git a/utils/common/src/main/java/brooklyn/util/stream/Streams.java b/utils/common/src/main/java/brooklyn/util/stream/Streams.java
index f967e45..3e62e6b 100644
--- a/utils/common/src/main/java/brooklyn/util/stream/Streams.java
+++ b/utils/common/src/main/java/brooklyn/util/stream/Streams.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.stream;
 
 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/stream/ThreadLocalPrintStream.java
----------------------------------------------------------------------
diff --git a/utils/common/src/main/java/brooklyn/util/stream/ThreadLocalPrintStream.java b/utils/common/src/main/java/brooklyn/util/stream/ThreadLocalPrintStream.java
index a0ac0c7..408aad8 100644
--- a/utils/common/src/main/java/brooklyn/util/stream/ThreadLocalPrintStream.java
+++ b/utils/common/src/main/java/brooklyn/util/stream/ThreadLocalPrintStream.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.stream;
 
 import java.io.ByteArrayOutputStream;

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/9b49b760/utils/common/src/main/java/brooklyn/util/text/ByteSizeStrings.java
----------------------------------------------------------------------
diff --git a/utils/common/src/main/java/brooklyn/util/text/ByteSizeStrings.java b/utils/common/src/main/java/brooklyn/util/text/ByteSizeStrings.java
index 65f78e8..ff34c48 100644
--- a/utils/common/src/main/java/brooklyn/util/text/ByteSizeStrings.java
+++ b/utils/common/src/main/java/brooklyn/util/text/ByteSizeStrings.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.text;
 
 import java.util.Formattable;

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

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/9b49b760/utils/common/src/main/java/brooklyn/util/text/FormattedString.java
----------------------------------------------------------------------
diff --git a/utils/common/src/main/java/brooklyn/util/text/FormattedString.java b/utils/common/src/main/java/brooklyn/util/text/FormattedString.java
index 1d84de0..949ab3f 100644
--- a/utils/common/src/main/java/brooklyn/util/text/FormattedString.java
+++ b/utils/common/src/main/java/brooklyn/util/text/FormattedString.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.text;
 
 import com.google.common.base.Preconditions;

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/9b49b760/utils/common/src/main/java/brooklyn/util/text/Identifiers.java
----------------------------------------------------------------------
diff --git a/utils/common/src/main/java/brooklyn/util/text/Identifiers.java b/utils/common/src/main/java/brooklyn/util/text/Identifiers.java
index 6eb5812..0ef34f9 100644
--- a/utils/common/src/main/java/brooklyn/util/text/Identifiers.java
+++ b/utils/common/src/main/java/brooklyn/util/text/Identifiers.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.text;
 
 import java.util.Random;

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

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

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

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

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

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

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

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/9b49b760/utils/common/src/main/java/brooklyn/util/text/Strings.java
----------------------------------------------------------------------
diff --git a/utils/common/src/main/java/brooklyn/util/text/Strings.java b/utils/common/src/main/java/brooklyn/util/text/Strings.java
index a6ed90a..a70c490 100644
--- a/utils/common/src/main/java/brooklyn/util/text/Strings.java
+++ b/utils/common/src/main/java/brooklyn/util/text/Strings.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.text;
 
 import java.text.DecimalFormat;

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

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/9b49b760/utils/common/src/main/java/brooklyn/util/time/CountdownTimer.java
----------------------------------------------------------------------
diff --git a/utils/common/src/main/java/brooklyn/util/time/CountdownTimer.java b/utils/common/src/main/java/brooklyn/util/time/CountdownTimer.java
index 4d72542..0a5aaec 100644
--- a/utils/common/src/main/java/brooklyn/util/time/CountdownTimer.java
+++ b/utils/common/src/main/java/brooklyn/util/time/CountdownTimer.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.time;
 
 import java.util.concurrent.TimeUnit;

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/9b49b760/utils/common/src/main/java/brooklyn/util/time/Duration.java
----------------------------------------------------------------------
diff --git a/utils/common/src/main/java/brooklyn/util/time/Duration.java b/utils/common/src/main/java/brooklyn/util/time/Duration.java
index 4646996..fb3d573 100644
--- a/utils/common/src/main/java/brooklyn/util/time/Duration.java
+++ b/utils/common/src/main/java/brooklyn/util/time/Duration.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.time;
 
 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/time/Durations.java
----------------------------------------------------------------------
diff --git a/utils/common/src/main/java/brooklyn/util/time/Durations.java b/utils/common/src/main/java/brooklyn/util/time/Durations.java
index 861c84e..b1fb6d2 100644
--- a/utils/common/src/main/java/brooklyn/util/time/Durations.java
+++ b/utils/common/src/main/java/brooklyn/util/time/Durations.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.time;
 
 import java.util.concurrent.CountDownLatch;

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/9b49b760/utils/common/src/main/java/brooklyn/util/time/Time.java
----------------------------------------------------------------------
diff --git a/utils/common/src/main/java/brooklyn/util/time/Time.java b/utils/common/src/main/java/brooklyn/util/time/Time.java
index 9dbbe02..27032d9 100644
--- a/utils/common/src/main/java/brooklyn/util/time/Time.java
+++ b/utils/common/src/main/java/brooklyn/util/time/Time.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.time;
 
 import java.text.DateFormat;

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/9b49b760/utils/common/src/test/java/brooklyn/test/AssertsTest.java
----------------------------------------------------------------------
diff --git a/utils/common/src/test/java/brooklyn/test/AssertsTest.java b/utils/common/src/test/java/brooklyn/test/AssertsTest.java
index 1fd73cd..edcdb2d 100644
--- a/utils/common/src/test/java/brooklyn/test/AssertsTest.java
+++ b/utils/common/src/test/java/brooklyn/test/AssertsTest.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.ExecutionException;

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/9b49b760/utils/common/src/test/java/brooklyn/test/FixedLocaleTest.java
----------------------------------------------------------------------
diff --git a/utils/common/src/test/java/brooklyn/test/FixedLocaleTest.java b/utils/common/src/test/java/brooklyn/test/FixedLocaleTest.java
index 5f5516a..d72c5ff 100644
--- a/utils/common/src/test/java/brooklyn/test/FixedLocaleTest.java
+++ b/utils/common/src/test/java/brooklyn/test/FixedLocaleTest.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.Locale;

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/9b49b760/utils/common/src/test/java/brooklyn/util/collections/JsonyaTest.java
----------------------------------------------------------------------
diff --git a/utils/common/src/test/java/brooklyn/util/collections/JsonyaTest.java b/utils/common/src/test/java/brooklyn/util/collections/JsonyaTest.java
index eedcbc1..1ef93a0 100644
--- a/utils/common/src/test/java/brooklyn/util/collections/JsonyaTest.java
+++ b/utils/common/src/test/java/brooklyn/util/collections/JsonyaTest.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/test/java/brooklyn/util/collections/MutableListTest.java
----------------------------------------------------------------------
diff --git a/utils/common/src/test/java/brooklyn/util/collections/MutableListTest.java b/utils/common/src/test/java/brooklyn/util/collections/MutableListTest.java
index 81c4b43..089cfe4 100644
--- a/utils/common/src/test/java/brooklyn/util/collections/MutableListTest.java
+++ b/utils/common/src/test/java/brooklyn/util/collections/MutableListTest.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/test/java/brooklyn/util/collections/MutableMapTest.java
----------------------------------------------------------------------
diff --git a/utils/common/src/test/java/brooklyn/util/collections/MutableMapTest.java b/utils/common/src/test/java/brooklyn/util/collections/MutableMapTest.java
index 69da6c7..8d14d36 100644
--- a/utils/common/src/test/java/brooklyn/util/collections/MutableMapTest.java
+++ b/utils/common/src/test/java/brooklyn/util/collections/MutableMapTest.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/test/java/brooklyn/util/collections/TimeWindowedListTest.java
----------------------------------------------------------------------
diff --git a/utils/common/src/test/java/brooklyn/util/collections/TimeWindowedListTest.java b/utils/common/src/test/java/brooklyn/util/collections/TimeWindowedListTest.java
index 064c942..d1c2293 100644
--- a/utils/common/src/test/java/brooklyn/util/collections/TimeWindowedListTest.java
+++ b/utils/common/src/test/java/brooklyn/util/collections/TimeWindowedListTest.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 static brooklyn.util.time.Duration.ONE_MILLISECOND;

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/9b49b760/utils/common/src/test/java/brooklyn/util/guava/KeyTransformingLoadingCacheTest.java
----------------------------------------------------------------------
diff --git a/utils/common/src/test/java/brooklyn/util/guava/KeyTransformingLoadingCacheTest.java b/utils/common/src/test/java/brooklyn/util/guava/KeyTransformingLoadingCacheTest.java
index 4ad99ea..1f85b23 100644
--- a/utils/common/src/test/java/brooklyn/util/guava/KeyTransformingLoadingCacheTest.java
+++ b/utils/common/src/test/java/brooklyn/util/guava/KeyTransformingLoadingCacheTest.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 static org.testng.Assert.assertEquals;

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/9b49b760/utils/common/src/test/java/brooklyn/util/internal/CommandLineUtilTest.java
----------------------------------------------------------------------
diff --git a/utils/common/src/test/java/brooklyn/util/internal/CommandLineUtilTest.java b/utils/common/src/test/java/brooklyn/util/internal/CommandLineUtilTest.java
index c1bbc50..bac53da 100644
--- a/utils/common/src/test/java/brooklyn/util/internal/CommandLineUtilTest.java
+++ b/utils/common/src/test/java/brooklyn/util/internal/CommandLineUtilTest.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;
 
 import static org.testng.Assert.assertEquals;

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/9b49b760/utils/common/src/test/java/brooklyn/util/internal/JavaClassNamesCallerTest.java
----------------------------------------------------------------------
diff --git a/utils/common/src/test/java/brooklyn/util/internal/JavaClassNamesCallerTest.java b/utils/common/src/test/java/brooklyn/util/internal/JavaClassNamesCallerTest.java
index 07f44a5..1c4359b 100644
--- a/utils/common/src/test/java/brooklyn/util/internal/JavaClassNamesCallerTest.java
+++ b/utils/common/src/test/java/brooklyn/util/internal/JavaClassNamesCallerTest.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;
 
 import org.testng.Assert;

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/9b49b760/utils/common/src/test/java/brooklyn/util/javalang/EnumsTest.java
----------------------------------------------------------------------
diff --git a/utils/common/src/test/java/brooklyn/util/javalang/EnumsTest.java b/utils/common/src/test/java/brooklyn/util/javalang/EnumsTest.java
index 2a07a03..1d9b776 100644
--- a/utils/common/src/test/java/brooklyn/util/javalang/EnumsTest.java
+++ b/utils/common/src/test/java/brooklyn/util/javalang/EnumsTest.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.testng.Assert;

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/9b49b760/utils/common/src/test/java/brooklyn/util/javalang/JavaClassNamesTest.java
----------------------------------------------------------------------
diff --git a/utils/common/src/test/java/brooklyn/util/javalang/JavaClassNamesTest.java b/utils/common/src/test/java/brooklyn/util/javalang/JavaClassNamesTest.java
index ac7a44f..a41c91e 100644
--- a/utils/common/src/test/java/brooklyn/util/javalang/JavaClassNamesTest.java
+++ b/utils/common/src/test/java/brooklyn/util/javalang/JavaClassNamesTest.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.testng.Assert;

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/9b49b760/utils/common/src/test/java/brooklyn/util/javalang/ReflectionsTest.java
----------------------------------------------------------------------
diff --git a/utils/common/src/test/java/brooklyn/util/javalang/ReflectionsTest.java b/utils/common/src/test/java/brooklyn/util/javalang/ReflectionsTest.java
index 1136633..3652b9b 100644
--- a/utils/common/src/test/java/brooklyn/util/javalang/ReflectionsTest.java
+++ b/utils/common/src/test/java/brooklyn/util/javalang/ReflectionsTest.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 org.testng.Assert.assertEquals;

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/9b49b760/utils/common/src/test/java/brooklyn/util/javalang/StackTraceSimplifierTest.java
----------------------------------------------------------------------
diff --git a/utils/common/src/test/java/brooklyn/util/javalang/StackTraceSimplifierTest.java b/utils/common/src/test/java/brooklyn/util/javalang/StackTraceSimplifierTest.java
index c0007fd..3ed7c2b 100644
--- a/utils/common/src/test/java/brooklyn/util/javalang/StackTraceSimplifierTest.java
+++ b/utils/common/src/test/java/brooklyn/util/javalang/StackTraceSimplifierTest.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.testng.Assert;

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/9b49b760/utils/common/src/test/java/brooklyn/util/math/BitListTest.java
----------------------------------------------------------------------
diff --git a/utils/common/src/test/java/brooklyn/util/math/BitListTest.java b/utils/common/src/test/java/brooklyn/util/math/BitListTest.java
index 3060f6a..8525636 100644
--- a/utils/common/src/test/java/brooklyn/util/math/BitListTest.java
+++ b/utils/common/src/test/java/brooklyn/util/math/BitListTest.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/test/java/brooklyn/util/math/BitUtilsTest.java
----------------------------------------------------------------------
diff --git a/utils/common/src/test/java/brooklyn/util/math/BitUtilsTest.java b/utils/common/src/test/java/brooklyn/util/math/BitUtilsTest.java
index 04b6afb..e2785ef 100644
--- a/utils/common/src/test/java/brooklyn/util/math/BitUtilsTest.java
+++ b/utils/common/src/test/java/brooklyn/util/math/BitUtilsTest.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 org.testng.Assert;

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/9b49b760/utils/common/src/test/java/brooklyn/util/math/MathFunctionsTest.java
----------------------------------------------------------------------
diff --git a/utils/common/src/test/java/brooklyn/util/math/MathFunctionsTest.java b/utils/common/src/test/java/brooklyn/util/math/MathFunctionsTest.java
index b6a1ea7..2093123 100644
--- a/utils/common/src/test/java/brooklyn/util/math/MathFunctionsTest.java
+++ b/utils/common/src/test/java/brooklyn/util/math/MathFunctionsTest.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 org.testng.Assert;

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/9b49b760/utils/common/src/test/java/brooklyn/util/maven/MavenArtifactTest.java
----------------------------------------------------------------------
diff --git a/utils/common/src/test/java/brooklyn/util/maven/MavenArtifactTest.java b/utils/common/src/test/java/brooklyn/util/maven/MavenArtifactTest.java
index 2341dd3..c847d8d 100644
--- a/utils/common/src/test/java/brooklyn/util/maven/MavenArtifactTest.java
+++ b/utils/common/src/test/java/brooklyn/util/maven/MavenArtifactTest.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/test/java/brooklyn/util/net/CidrTest.java
----------------------------------------------------------------------
diff --git a/utils/common/src/test/java/brooklyn/util/net/CidrTest.java b/utils/common/src/test/java/brooklyn/util/net/CidrTest.java
index bfeb7cb..07fbe29 100644
--- a/utils/common/src/test/java/brooklyn/util/net/CidrTest.java
+++ b/utils/common/src/test/java/brooklyn/util/net/CidrTest.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.Arrays;

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/9b49b760/utils/common/src/test/java/brooklyn/util/net/NetworkingUtilsTest.java
----------------------------------------------------------------------
diff --git a/utils/common/src/test/java/brooklyn/util/net/NetworkingUtilsTest.java b/utils/common/src/test/java/brooklyn/util/net/NetworkingUtilsTest.java
index 5fa4db2..993da08 100644
--- a/utils/common/src/test/java/brooklyn/util/net/NetworkingUtilsTest.java
+++ b/utils/common/src/test/java/brooklyn/util/net/NetworkingUtilsTest.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 static org.testng.Assert.assertEquals;

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/9b49b760/utils/common/src/test/java/brooklyn/util/net/UrlsTest.java
----------------------------------------------------------------------
diff --git a/utils/common/src/test/java/brooklyn/util/net/UrlsTest.java b/utils/common/src/test/java/brooklyn/util/net/UrlsTest.java
index 71e08f4..017ad3d 100644
--- a/utils/common/src/test/java/brooklyn/util/net/UrlsTest.java
+++ b/utils/common/src/test/java/brooklyn/util/net/UrlsTest.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 static org.testng.Assert.assertEquals;

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/9b49b760/utils/common/src/test/java/brooklyn/util/net/UserAndHostAndPortTest.java
----------------------------------------------------------------------
diff --git a/utils/common/src/test/java/brooklyn/util/net/UserAndHostAndPortTest.java b/utils/common/src/test/java/brooklyn/util/net/UserAndHostAndPortTest.java
index 558a197..cb08064 100644
--- a/utils/common/src/test/java/brooklyn/util/net/UserAndHostAndPortTest.java
+++ b/utils/common/src/test/java/brooklyn/util/net/UserAndHostAndPortTest.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 static org.testng.Assert.assertEquals;

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/9b49b760/utils/common/src/test/java/brooklyn/util/os/OsTest.java
----------------------------------------------------------------------
diff --git a/utils/common/src/test/java/brooklyn/util/os/OsTest.java b/utils/common/src/test/java/brooklyn/util/os/OsTest.java
index 2d80406..841b7ba 100644
--- a/utils/common/src/test/java/brooklyn/util/os/OsTest.java
+++ b/utils/common/src/test/java/brooklyn/util/os/OsTest.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.os;
 
 import static org.testng.Assert.assertEquals;

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/9b49b760/utils/common/src/test/java/brooklyn/util/pool/BasicPoolTest.java
----------------------------------------------------------------------
diff --git a/utils/common/src/test/java/brooklyn/util/pool/BasicPoolTest.java b/utils/common/src/test/java/brooklyn/util/pool/BasicPoolTest.java
index 4a69749..9682566 100644
--- a/utils/common/src/test/java/brooklyn/util/pool/BasicPoolTest.java
+++ b/utils/common/src/test/java/brooklyn/util/pool/BasicPoolTest.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.pool;
 
 import static org.testng.Assert.assertEquals;

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/9b49b760/utils/common/src/test/java/brooklyn/util/repeat/RepeaterTest.java
----------------------------------------------------------------------
diff --git a/utils/common/src/test/java/brooklyn/util/repeat/RepeaterTest.java b/utils/common/src/test/java/brooklyn/util/repeat/RepeaterTest.java
index 1333bc9..1109dec 100644
--- a/utils/common/src/test/java/brooklyn/util/repeat/RepeaterTest.java
+++ b/utils/common/src/test/java/brooklyn/util/repeat/RepeaterTest.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.repeat;
 
 import static org.testng.Assert.assertEquals;

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/9b49b760/utils/common/src/test/java/brooklyn/util/ssh/IptablesCommandsTest.java
----------------------------------------------------------------------
diff --git a/utils/common/src/test/java/brooklyn/util/ssh/IptablesCommandsTest.java b/utils/common/src/test/java/brooklyn/util/ssh/IptablesCommandsTest.java
index 2da17b7..0f15d27 100644
--- a/utils/common/src/test/java/brooklyn/util/ssh/IptablesCommandsTest.java
+++ b/utils/common/src/test/java/brooklyn/util/ssh/IptablesCommandsTest.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.ssh;
 
 import org.testng.Assert;

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/9b49b760/utils/common/src/test/java/brooklyn/util/stream/ThreadLocalStdoutStderrTest.java
----------------------------------------------------------------------
diff --git a/utils/common/src/test/java/brooklyn/util/stream/ThreadLocalStdoutStderrTest.java b/utils/common/src/test/java/brooklyn/util/stream/ThreadLocalStdoutStderrTest.java
index a6cd513..2d49925 100644
--- a/utils/common/src/test/java/brooklyn/util/stream/ThreadLocalStdoutStderrTest.java
+++ b/utils/common/src/test/java/brooklyn/util/stream/ThreadLocalStdoutStderrTest.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.stream;
 
 import org.testng.Assert;

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/9b49b760/utils/common/src/test/java/brooklyn/util/text/ByteSizeStringsTest.java
----------------------------------------------------------------------
diff --git a/utils/common/src/test/java/brooklyn/util/text/ByteSizeStringsTest.java b/utils/common/src/test/java/brooklyn/util/text/ByteSizeStringsTest.java
index 7f729da..8f42d94 100644
--- a/utils/common/src/test/java/brooklyn/util/text/ByteSizeStringsTest.java
+++ b/utils/common/src/test/java/brooklyn/util/text/ByteSizeStringsTest.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.text;
 
 import static org.testng.Assert.assertEquals;

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/9b49b760/utils/common/src/test/java/brooklyn/util/text/ComparableVersionTest.java
----------------------------------------------------------------------
diff --git a/utils/common/src/test/java/brooklyn/util/text/ComparableVersionTest.java b/utils/common/src/test/java/brooklyn/util/text/ComparableVersionTest.java
index 9b4192b..fa710b1 100644
--- a/utils/common/src/test/java/brooklyn/util/text/ComparableVersionTest.java
+++ b/utils/common/src/test/java/brooklyn/util/text/ComparableVersionTest.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.text;
 
 import org.testng.Assert;

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/9b49b760/utils/common/src/test/java/brooklyn/util/text/IdentifiersTest.java
----------------------------------------------------------------------
diff --git a/utils/common/src/test/java/brooklyn/util/text/IdentifiersTest.java b/utils/common/src/test/java/brooklyn/util/text/IdentifiersTest.java
index fafb8f2..fdeaa51 100644
--- a/utils/common/src/test/java/brooklyn/util/text/IdentifiersTest.java
+++ b/utils/common/src/test/java/brooklyn/util/text/IdentifiersTest.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.text;
 
 import org.slf4j.Logger;

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/9b49b760/utils/common/src/test/java/brooklyn/util/text/KeyValueParserTest.java
----------------------------------------------------------------------
diff --git a/utils/common/src/test/java/brooklyn/util/text/KeyValueParserTest.java b/utils/common/src/test/java/brooklyn/util/text/KeyValueParserTest.java
index d07e956..9806d77 100644
--- a/utils/common/src/test/java/brooklyn/util/text/KeyValueParserTest.java
+++ b/utils/common/src/test/java/brooklyn/util/text/KeyValueParserTest.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.text;
 
 import static org.testng.Assert.assertEquals;

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/9b49b760/utils/common/src/test/java/brooklyn/util/text/NaturalOrderComparatorTest.java
----------------------------------------------------------------------
diff --git a/utils/common/src/test/java/brooklyn/util/text/NaturalOrderComparatorTest.java b/utils/common/src/test/java/brooklyn/util/text/NaturalOrderComparatorTest.java
index 575e880..51597d4 100644
--- a/utils/common/src/test/java/brooklyn/util/text/NaturalOrderComparatorTest.java
+++ b/utils/common/src/test/java/brooklyn/util/text/NaturalOrderComparatorTest.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.text;
 
 import org.testng.Assert;

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/9b49b760/utils/common/src/test/java/brooklyn/util/text/QuotedStringTokenizerTest.java
----------------------------------------------------------------------
diff --git a/utils/common/src/test/java/brooklyn/util/text/QuotedStringTokenizerTest.java b/utils/common/src/test/java/brooklyn/util/text/QuotedStringTokenizerTest.java
index aa66ba4..a70e546 100644
--- a/utils/common/src/test/java/brooklyn/util/text/QuotedStringTokenizerTest.java
+++ b/utils/common/src/test/java/brooklyn/util/text/QuotedStringTokenizerTest.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.text;
 
 import static org.testng.Assert.assertEquals;

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/9b49b760/utils/common/src/test/java/brooklyn/util/text/StringEscapesTest.java
----------------------------------------------------------------------
diff --git a/utils/common/src/test/java/brooklyn/util/text/StringEscapesTest.java b/utils/common/src/test/java/brooklyn/util/text/StringEscapesTest.java
index 9c7af14..a9a83b2 100644
--- a/utils/common/src/test/java/brooklyn/util/text/StringEscapesTest.java
+++ b/utils/common/src/test/java/brooklyn/util/text/StringEscapesTest.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.text;
 
 import org.testng.Assert;

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/9b49b760/utils/common/src/test/java/brooklyn/util/text/StringFunctionsTest.java
----------------------------------------------------------------------
diff --git a/utils/common/src/test/java/brooklyn/util/text/StringFunctionsTest.java b/utils/common/src/test/java/brooklyn/util/text/StringFunctionsTest.java
index a1fdbf9..87b4191 100644
--- a/utils/common/src/test/java/brooklyn/util/text/StringFunctionsTest.java
+++ b/utils/common/src/test/java/brooklyn/util/text/StringFunctionsTest.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.text;
 
 import org.testng.Assert;

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/9b49b760/utils/common/src/test/java/brooklyn/util/text/StringShortenerTest.java
----------------------------------------------------------------------
diff --git a/utils/common/src/test/java/brooklyn/util/text/StringShortenerTest.java b/utils/common/src/test/java/brooklyn/util/text/StringShortenerTest.java
index 193b14a..92a7847 100644
--- a/utils/common/src/test/java/brooklyn/util/text/StringShortenerTest.java
+++ b/utils/common/src/test/java/brooklyn/util/text/StringShortenerTest.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.text;
 
 import org.testng.Assert;

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/9b49b760/utils/common/src/test/java/brooklyn/util/text/StringsTest.java
----------------------------------------------------------------------
diff --git a/utils/common/src/test/java/brooklyn/util/text/StringsTest.java b/utils/common/src/test/java/brooklyn/util/text/StringsTest.java
index fc59af6..49d29f8 100644
--- a/utils/common/src/test/java/brooklyn/util/text/StringsTest.java
+++ b/utils/common/src/test/java/brooklyn/util/text/StringsTest.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.text;
 
 import static org.testng.Assert.assertEquals;

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/9b49b760/utils/common/src/test/java/brooklyn/util/text/WildcardGlobsTest.java
----------------------------------------------------------------------
diff --git a/utils/common/src/test/java/brooklyn/util/text/WildcardGlobsTest.java b/utils/common/src/test/java/brooklyn/util/text/WildcardGlobsTest.java
index 8644d9b..95aee44 100644
--- a/utils/common/src/test/java/brooklyn/util/text/WildcardGlobsTest.java
+++ b/utils/common/src/test/java/brooklyn/util/text/WildcardGlobsTest.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.text;
 
 import java.util.Arrays;

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/9b49b760/utils/common/src/test/java/brooklyn/util/time/CountdownTimerTest.java
----------------------------------------------------------------------
diff --git a/utils/common/src/test/java/brooklyn/util/time/CountdownTimerTest.java b/utils/common/src/test/java/brooklyn/util/time/CountdownTimerTest.java
index 91b236c..73488e2 100644
--- a/utils/common/src/test/java/brooklyn/util/time/CountdownTimerTest.java
+++ b/utils/common/src/test/java/brooklyn/util/time/CountdownTimerTest.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.time;
 
 import static org.testng.Assert.assertFalse;

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/9b49b760/utils/common/src/test/java/brooklyn/util/time/DurationTest.java
----------------------------------------------------------------------
diff --git a/utils/common/src/test/java/brooklyn/util/time/DurationTest.java b/utils/common/src/test/java/brooklyn/util/time/DurationTest.java
index 5ee4ece..f5548d2 100644
--- a/utils/common/src/test/java/brooklyn/util/time/DurationTest.java
+++ b/utils/common/src/test/java/brooklyn/util/time/DurationTest.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.time;
 
 import java.util.concurrent.TimeUnit;

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/9b49b760/utils/common/src/test/java/brooklyn/util/time/TimeTest.java
----------------------------------------------------------------------
diff --git a/utils/common/src/test/java/brooklyn/util/time/TimeTest.java b/utils/common/src/test/java/brooklyn/util/time/TimeTest.java
index 86189db..363abce 100644
--- a/utils/common/src/test/java/brooklyn/util/time/TimeTest.java
+++ b/utils/common/src/test/java/brooklyn/util/time/TimeTest.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.time;
 
 import java.util.Date;

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/9b49b760/utils/groovy/src/main/java/brooklyn/util/GroovyJavaMethods.groovy
----------------------------------------------------------------------
diff --git a/utils/groovy/src/main/java/brooklyn/util/GroovyJavaMethods.groovy b/utils/groovy/src/main/java/brooklyn/util/GroovyJavaMethods.groovy
index 5a8b4f7..5867bda 100644
--- a/utils/groovy/src/main/java/brooklyn/util/GroovyJavaMethods.groovy
+++ b/utils/groovy/src/main/java/brooklyn/util/GroovyJavaMethods.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.util;
 
 import static brooklyn.util.GroovyJavaMethods.truth

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/9b49b760/utils/groovy/src/main/java/brooklyn/util/internal/JavadocDummy.java
----------------------------------------------------------------------
diff --git a/utils/groovy/src/main/java/brooklyn/util/internal/JavadocDummy.java b/utils/groovy/src/main/java/brooklyn/util/internal/JavadocDummy.java
index 583bfd3..3ccdce8 100644
--- a/utils/groovy/src/main/java/brooklyn/util/internal/JavadocDummy.java
+++ b/utils/groovy/src/main/java/brooklyn/util/internal/JavadocDummy.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;
 
 /** Maven Central requires javadoc to promote as a release. This seemed to happen when this was built by maven as a bundle,

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/9b49b760/utils/groovy/src/main/java/brooklyn/util/internal/LanguageUtils.groovy
----------------------------------------------------------------------
diff --git a/utils/groovy/src/main/java/brooklyn/util/internal/LanguageUtils.groovy b/utils/groovy/src/main/java/brooklyn/util/internal/LanguageUtils.groovy
index 016a5ac..d59387c 100644
--- a/utils/groovy/src/main/java/brooklyn/util/internal/LanguageUtils.groovy
+++ b/utils/groovy/src/main/java/brooklyn/util/internal/LanguageUtils.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.util.internal
 
 import java.lang.reflect.Field

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/9b49b760/utils/groovy/src/main/java/brooklyn/util/internal/TimeExtras.groovy
----------------------------------------------------------------------
diff --git a/utils/groovy/src/main/java/brooklyn/util/internal/TimeExtras.groovy b/utils/groovy/src/main/java/brooklyn/util/internal/TimeExtras.groovy
index 3f738b4..09fa5ff 100644
--- a/utils/groovy/src/main/java/brooklyn/util/internal/TimeExtras.groovy
+++ b/utils/groovy/src/main/java/brooklyn/util/internal/TimeExtras.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.util.internal
 
 import groovy.time.TimeDuration

http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/9b49b760/utils/groovy/src/test/java/brooklyn/util/internal/LanguageUtilsTest.groovy
----------------------------------------------------------------------
diff --git a/utils/groovy/src/test/java/brooklyn/util/internal/LanguageUtilsTest.groovy b/utils/groovy/src/test/java/brooklyn/util/internal/LanguageUtilsTest.groovy
index 0f0b10b..142e202 100644
--- a/utils/groovy/src/test/java/brooklyn/util/internal/LanguageUtilsTest.groovy
+++ b/utils/groovy/src/test/java/brooklyn/util/internal/LanguageUtilsTest.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.util.internal;
 
 import static org.testng.Assert.*